gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r24638 - in gnunet: . pkgconfig po src/mesh


From: gnunet
Subject: [GNUnet-SVN] r24638 - in gnunet: . pkgconfig po src/mesh
Date: Wed, 31 Oct 2012 16:21:37 +0100

Author: grothoff
Date: 2012-10-31 16:21:37 +0100 (Wed, 31 Oct 2012)
New Revision: 24638

Added:
   gnunet/pkgconfig/gnunetats.pc.in
   gnunet/pkgconfig/gnunetdns.pc.in
   gnunet/pkgconfig/gnunetdnsparser.pc.in
   gnunet/pkgconfig/gnunetgns.pc.in
   gnunet/pkgconfig/gnunetlockmanager.pc.in
   gnunet/pkgconfig/gnunetmesh.pc.in
   gnunet/pkgconfig/gnunetmysql.pc.in
   gnunet/pkgconfig/gnunetnamestore.pc.in
   gnunet/pkgconfig/gnunetpostgres.pc.in
   gnunet/pkgconfig/gnunetstream.pc.in
   gnunet/pkgconfig/gnunettestbed.pc.in
   gnunet/pkgconfig/gnunettun.pc.in
   gnunet/pkgconfig/gnunetvpn.pc.in
Removed:
   gnunet/pkgconfig/gnunetdhtlog.pc.in
Modified:
   gnunet/configure.ac
   gnunet/pkgconfig/
   gnunet/pkgconfig/Makefile.am
   gnunet/pkgconfig/gnunetcore.pc.in
   gnunet/pkgconfig/gnunetdatacache.pc.in
   gnunet/pkgconfig/gnunetdatastore.pc.in
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/mesh/
Log:
-adding missing pkgconfig files

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-10-31 15:10:17 UTC (rev 24637)
+++ gnunet/configure.ac 2012-10-31 15:21:37 UTC (rev 24638)
@@ -1207,25 +1207,37 @@
 src/vpn/vpn.conf
 src/integration-tests/Makefile
 pkgconfig/Makefile
+pkgconfig/gnunetats.pc
 pkgconfig/gnunetarm.pc
 pkgconfig/gnunetblock.pc
 pkgconfig/gnunetcore.pc
 pkgconfig/gnunetdatacache.pc
 pkgconfig/gnunetdatastore.pc
 pkgconfig/gnunetdht.pc
-pkgconfig/gnunetdhtlog.pc
+pkgconfig/gnunetdns.pc
+pkgconfig/gnunetdnsparser.pc
 pkgconfig/gnunetdv.pc
 pkgconfig/gnunetfragmentation.pc
 pkgconfig/gnunetfs.pc
+pkgconfig/gnunetgns.pc
 pkgconfig/gnunethello.pc
+pkgconfig/gnunetlockmanager.pc
+pkgconfig/gnunetmesh.pc
+pkgconfig/gnunetmysql.pc
+pkgconfig/gnunetnamestore.pc
 pkgconfig/gnunetnat.pc
 pkgconfig/gnunetnse.pc
 pkgconfig/gnunetpeerinfo.pc
+pkgconfig/gnunetpostgres.pc
 pkgconfig/gnunetregex.pc
 pkgconfig/gnunetstatistics.pc
+pkgconfig/gnunetstream.pc
+pkgconfig/gnunettestbed.pc
 pkgconfig/gnunettesting.pc
 pkgconfig/gnunettransport.pc
+pkgconfig/gnunettun.pc
 pkgconfig/gnunetutil.pc
+pkgconfig/gnunetvpn.pc
 ])
 AC_OUTPUT
 

Index: gnunet/pkgconfig
===================================================================
--- gnunet/pkgconfig    2012-10-31 15:10:17 UTC (rev 24637)
+++ gnunet/pkgconfig    2012-10-31 15:21:37 UTC (rev 24638)

Property changes on: gnunet/pkgconfig
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,16 ##
+gnunetgns.pc
+gnunetvpn.pc
+gnunettun.pc
+gnunettestbed.pc
+gnunetstream.pc
+gnunetpostgres.pc
+gnunetnamestore.pc
+gnunetmysql.pc
+gnunetmesh.pc
+gnunetlockmanager.pc
+gnunetdnsparser.pc
+gnunetdns.pc
+gnunetats.pc
 gnunetregex.pc
 gnunetnse.pc
 gnunetnat.pc
Modified: gnunet/pkgconfig/Makefile.am
===================================================================
--- gnunet/pkgconfig/Makefile.am        2012-10-31 15:10:17 UTC (rev 24637)
+++ gnunet/pkgconfig/Makefile.am        2012-10-31 15:21:37 UTC (rev 24638)
@@ -1,22 +1,35 @@
 pcfiles = \
+       gnunetats.pc \
        gnunetarm.pc \
        gnunetblock.pc \
        gnunetcore.pc \
        gnunetdatacache.pc \
        gnunetdatastore.pc \
        gnunetdht.pc \
-       gnunetdhtlog.pc \
+       gnunetdns.pc \
+       gnunetdnsparser.pc \
        gnunetdv.pc \
        gnunetfragmentation.pc \
        gnunetfs.pc \
+       gnunetgns.pc \
        gnunethello.pc \
+       gnunetlockmanager.pc \
+       gnunetmesh.pc \
+       gnunetmysql.pc \
+       gnunetnamestore.pc \
+       gnunetnat.pc \
        gnunetnse.pc \
-       gnunetnat.pc \
        gnunetpeerinfo.pc \
+       gnunetpostgres.pc \
+       gnunetregex.pc \
        gnunetstatistics.pc \
+       gnunetstream.pc \
+       gnunettestbed.pc \
        gnunettesting.pc \
        gnunettransport.pc \
-       gnunetutil.pc
+       gnunettun.pc \
+       gnunetutil.pc \
+       gnunetvpn.pc 
 
 all-local: $(pcfiles)
 
@@ -32,23 +45,36 @@
 
 EXTRA_DIST = \
        gnunetarm.pc.in \
+       gnunetats.pc.in \
        gnunetblock.pc.in \
        gnunetcore.pc.in \
        gnunetdatacache.pc.in \
        gnunetdatastore.pc.in \
        gnunetdht.pc.in \
-       gnunetdhtlog.pc.in \
+       gnunetdns.pc.in \
+       gnunetdnsparser.pc.in \
        gnunetdv.pc.in \
        gnunetfragmentation.pc.in \
        gnunetfs.pc.in \
+       gnunetgns.pc.in \
        gnunethello.pc.in \
+       gnunetlockmanager.pc.in \
+       gnunetmesh.pc.in \
+       gnunetmysql.pc.in \
+       gnunetnamestore.pc.in \
        gnunetnat.pc.in \
        gnunetnse.pc.in \
        gnunetpeerinfo.pc.in \
+       gnunetpostgres.pc.in \
+       gnunetregex.pc.in \
        gnunetstatistics.pc.in \
+       gnunetstream.pc.in \
+       gnunettestbed.pc.in \
        gnunettesting.pc.in \
        gnunettransport.pc.in \
-       gnunetutil.pc.in
+       gnunettun.pc.in \
+       gnunetutil.pc.in \
+       gnunetvpn.pc.in 
 
 CLEANFILES = $(pcfiles)
 INCLUDES = -I$(top_srcdir)/src/include

Added: gnunet/pkgconfig/gnunetats.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetats.pc.in                            (rev 0)
+++ gnunet/pkgconfig/gnunetats.pc.in    2012-10-31 15:21:37 UTC (rev 24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet ATS
+Description: Provides API for allocating bandwidth, expressing preferences for 
certain peers and accessing allocation information
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunetats
+Cflags: -I${includedir}

Modified: gnunet/pkgconfig/gnunetcore.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetcore.pc.in   2012-10-31 15:10:17 UTC (rev 24637)
+++ gnunet/pkgconfig/gnunetcore.pc.in   2012-10-31 15:21:37 UTC (rev 24638)
@@ -4,7 +4,7 @@
 address@hidden@
 
 Name: GNUnet core
-Description: Provides API to access core service
+Description: Provides API for (encrypted) P2P communication
 URL: http://gnunet.org
 Version: @VERSION@
 Requires:

Modified: gnunet/pkgconfig/gnunetdatacache.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetdatacache.pc.in      2012-10-31 15:10:17 UTC (rev 
24637)
+++ gnunet/pkgconfig/gnunetdatacache.pc.in      2012-10-31 15:21:37 UTC (rev 
24638)
@@ -4,7 +4,7 @@
 address@hidden@
 
 Name: GNUnet datacache
-Description: Provides datacache API implementation
+Description: Provides datacache API for temporary storage to disk
 URL: http://gnunet.org
 Version: @VERSION@
 Requires:

Modified: gnunet/pkgconfig/gnunetdatastore.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetdatastore.pc.in      2012-10-31 15:10:17 UTC (rev 
24637)
+++ gnunet/pkgconfig/gnunetdatastore.pc.in      2012-10-31 15:21:37 UTC (rev 
24638)
@@ -4,7 +4,7 @@
 address@hidden@
 
 Name: GNUnet datastore
-Description: Management API for the datastore for files stored on a GNUnet node
+Description: Management API for the datastore for persistant storage to disk
 URL: http://gnunet.org
 Version: @VERSION@
 Requires:

Deleted: gnunet/pkgconfig/gnunetdhtlog.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetdhtlog.pc.in 2012-10-31 15:10:17 UTC (rev 24637)
+++ gnunet/pkgconfig/gnunetdhtlog.pc.in 2012-10-31 15:21:37 UTC (rev 24638)
@@ -1,12 +0,0 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
-
-Name: GNUnet dhtlog
-Description: Library for logging DHT operations via plugins
-URL: http://gnunet.org
-Version: @VERSION@
-Requires:
-Libs: -L${libdir} -lgnunetdhtlog
-Cflags: -I${includedir}

Added: gnunet/pkgconfig/gnunetdns.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetdns.pc.in                            (rev 0)
+++ gnunet/pkgconfig/gnunetdns.pc.in    2012-10-31 15:21:37 UTC (rev 24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet DNS
+Description: Provides API to access GNUnet's DNS service (to intercept and 
manipulate DNS queries)
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunetdns
+Cflags: -I${includedir}

Added: gnunet/pkgconfig/gnunetdnsparser.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetdnsparser.pc.in                              (rev 0)
+++ gnunet/pkgconfig/gnunetdnsparser.pc.in      2012-10-31 15:21:37 UTC (rev 
24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet DNS parser
+Description: Provides API for parsing and serializing DNS packets
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunetdnsparser
+Cflags: -I${includedir}

Added: gnunet/pkgconfig/gnunetgns.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetgns.pc.in                            (rev 0)
+++ gnunet/pkgconfig/gnunetgns.pc.in    2012-10-31 15:21:37 UTC (rev 24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet GNS
+Description: Provides API to access the GNUnet Naming System
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunetgns
+Cflags: -I${includedir}

Added: gnunet/pkgconfig/gnunetlockmanager.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetlockmanager.pc.in                            (rev 0)
+++ gnunet/pkgconfig/gnunetlockmanager.pc.in    2012-10-31 15:21:37 UTC (rev 
24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet Lockmanager
+Description: Provides API for mutual exclusion between GNUnet services
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunetlockmanager
+Cflags: -I${includedir}

Added: gnunet/pkgconfig/gnunetmesh.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetmesh.pc.in                           (rev 0)
+++ gnunet/pkgconfig/gnunetmesh.pc.in   2012-10-31 15:21:37 UTC (rev 24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet Mesh
+Description: API for multicast and multi-hop routing between GNUnet peers
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunetmesh
+Cflags: -I${includedir}

Added: gnunet/pkgconfig/gnunetmysql.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetmysql.pc.in                          (rev 0)
+++ gnunet/pkgconfig/gnunetmysql.pc.in  2012-10-31 15:21:37 UTC (rev 24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet MySQL
+Description: Provides API for common interactions with libmysqlclient
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunetmysql
+Cflags: -I${includedir}

Added: gnunet/pkgconfig/gnunetnamestore.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetnamestore.pc.in                              (rev 0)
+++ gnunet/pkgconfig/gnunetnamestore.pc.in      2012-10-31 15:21:37 UTC (rev 
24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet Namestore
+Description: Provides API for storing GNS records to a database
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunetnamestore
+Cflags: -I${includedir}

Added: gnunet/pkgconfig/gnunetpostgres.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetpostgres.pc.in                               (rev 0)
+++ gnunet/pkgconfig/gnunetpostgres.pc.in       2012-10-31 15:21:37 UTC (rev 
24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet Postgres
+Description: API with common functions for interacting with libpq
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunetpostgres
+Cflags: -I${includedir}

Added: gnunet/pkgconfig/gnunetstream.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetstream.pc.in                         (rev 0)
+++ gnunet/pkgconfig/gnunetstream.pc.in 2012-10-31 15:21:37 UTC (rev 24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet Stream
+Description: Provides API for reliable, in-order communcation between two peers
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunetstream
+Cflags: -I${includedir}

Added: gnunet/pkgconfig/gnunettestbed.pc.in
===================================================================
--- gnunet/pkgconfig/gnunettestbed.pc.in                                (rev 0)
+++ gnunet/pkgconfig/gnunettestbed.pc.in        2012-10-31 15:21:37 UTC (rev 
24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet Testbed
+Description: Provides API for deploying and managing testbeds
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunettestbed
+Cflags: -I${includedir}

Added: gnunet/pkgconfig/gnunettun.pc.in
===================================================================
--- gnunet/pkgconfig/gnunettun.pc.in                            (rev 0)
+++ gnunet/pkgconfig/gnunettun.pc.in    2012-10-31 15:21:37 UTC (rev 24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet TUN
+Description: Provides API for parsing IP packets for Linux TUN interface 
interaction
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunettun
+Cflags: -I${includedir}

Added: gnunet/pkgconfig/gnunetvpn.pc.in
===================================================================
--- gnunet/pkgconfig/gnunetvpn.pc.in                            (rev 0)
+++ gnunet/pkgconfig/gnunetvpn.pc.in    2012-10-31 15:21:37 UTC (rev 24638)
@@ -0,0 +1,12 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+Name: GNUnet VPN
+Description: Provides API for accessing the GNUnet VPN
+URL: http://gnunet.org
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lgnunetvpn
+Cflags: -I${includedir}

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2012-10-31 15:10:17 UTC (rev 24637)
+++ gnunet/po/de.po     2012-10-31 15:21:37 UTC (rev 24638)
@@ -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-10-31 13:48+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -17,60 +17,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:165
+#: src/arm/arm_api.c:162
 #, fuzzy
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/arm/arm_api.c:354
-#, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
-msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\n"
-
-#: src/arm/arm_api.c:368
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\n"
-
-#: src/arm/arm_api.c:437
-#, fuzzy, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
-msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\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': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
-
-#: src/arm/arm_api.c:620
-#, fuzzy, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr "Keine Antwort innerhalb %llums erhalten.\n"
-
 #: src/arm/gnunet-arm.c:166
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
@@ -125,24 +76,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 "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:232
+#: src/arm/gnunet-arm.c:233
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:256
-#, fuzzy, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
-msgstr ""
-"Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in der "
-"Sektion `%s' angegeben werden.\n"
-
-#: 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 ""
 
@@ -156,143 +100,134 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\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 "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in 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 ""
 
-#: src/arm/gnunet-service-arm.c:332
+#: src/arm/gnunet-service-arm.c:326
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:335
+#: src/arm/gnunet-service-arm.c:329
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:361
+#: src/arm/gnunet-service-arm.c:355
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:393
+#: src/arm/gnunet-service-arm.c:387
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:523
+#: src/arm/gnunet-service-arm.c:517
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/arm/gnunet-service-arm.c:545
+#: src/arm/gnunet-service-arm.c:539
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:559
+#: src/arm/gnunet-service-arm.c:553
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:667
+#: src/arm/gnunet-service-arm.c:661
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:878
+#: src/arm/gnunet-service-arm.c:872
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:970
+#: src/arm/gnunet-service-arm.c:965
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:975
+#: src/arm/gnunet-service-arm.c:970
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:980
+#: src/arm/gnunet-service-arm.c:975
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:986
+#: src/arm/gnunet-service-arm.c:981
 #, fuzzy, c-format
-msgid "Service `%s' took %llu ms to terminate\n"
+msgid "Service `%s' took %s to terminate\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-service-arm.c:1021
+#: src/arm/gnunet-service-arm.c:1016
 #, c-format
 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:1210
 #, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\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 "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1224
+#: src/arm/gnunet-service-arm.c:1221
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1238
+#: src/arm/gnunet-service-arm.c:1235
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -301,293 +236,54 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats.c:93
-#, fuzzy
-msgid "list information for the given peer"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/ats/gnunet-ats.c:96
-#, fuzzy
-msgid "list information for all peers"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/ats/gnunet-ats.c:105
-#, fuzzy
-msgid "Print information about ATS state"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/block/block.c:105
-#, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/chat/chat.c:175
-#, fuzzy
-msgid "Could not transmit confirmation receipt\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\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 "Unbekannte Operation `%s'\n"
-
-#: src/chat/chat.c:472
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/chat/chat.c:480
-#, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/chat/chat.c:498
-#, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/chat/chat.c:559
-#, fuzzy
-msgid "Could not serialize metadata\n"
-msgstr "Konnte libgnunetutil nicht initialisieren!\n"
-
-#: src/chat/chat.c:674
-#, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\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 schlug fehl: %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 schlug fehl: %s\n"
-
-#: src/chat/gnunet-chat.c:153
-#, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
-msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
-
-#: src/chat/gnunet-chat.c:156
-#, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/chat/gnunet-chat.c:159
-#, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\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' schlug bei %s:%d mit dem Fehler %s fehl\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' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/chat/gnunet-chat.c:170
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:67
+#, c-format
 msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/chat/gnunet-chat.c:173
-#, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/chat/gnunet-chat.c:176
-#, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
+"Peer `%s' plugin `%s', address `%s', bandwidth out: %u Bytes/s, bandwidth in "
+"%u Bytes/s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:217
+#: src/ats-tool/gnunet-ats.c:129
 #, c-format
-msgid "'%s' acknowledged message #%d\n"
+msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:260
+#: src/ats-tool/gnunet-ats.c:131
 #, c-format
-msgid "`%s' entered the room\n"
+msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:260
+#: src/ats-tool/gnunet-ats.c:142 src/namestore/gnunet-namestore.c:610
+#: src/transport/gnunet-transport.c:617
 #, fuzzy, c-format
-msgid "`%s' left the room\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
+msgid "Service `%s' is not running\n"
+msgstr "`%s' ist keine Datei.\n"
 
-#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
-#, fuzzy
-msgid "Could not change username\n"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
-
-#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
+#: src/ats-tool/gnunet-ats.c:149
 #, fuzzy, c-format
-msgid "Joining room `%s' as user `%s'...\n"
-msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
+msgid "Cannot connect to ATS service, exiting...\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/chat/gnunet-chat.c:373
-#, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
+#: src/ats-tool/gnunet-ats.c:194
+#, fuzzy
+msgid "do not resolve IP addresses to hostnames"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/chat/gnunet-chat.c:388
-#, c-format
-msgid "Users in room `%s': "
+#: src/ats-tool/gnunet-ats.c:197
+msgid "monitor mode"
 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 "Unbekannte 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
+#: src/ats-tool/gnunet-ats.c:206
 #, fuzzy
-msgid "You must specify a nickname\n"
-msgstr "Sie müssen einen Empfänger angeben!\n"
+msgid "Print information about ATS state"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/chat/gnunet-chat.c:688
+#: src/block/block.c:105
 #, fuzzy, c-format
-msgid "Failed to join room `%s'\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
+msgid "Loading block plugin `%s'\n"
+msgstr "Teste Transport(e) %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 "Fehler beim Speichern der Konfiguration!"
-
-#: src/chat/gnunet-service-chat.c:545
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "Fehler beim Abfragen der Netzwerkverkehrsbedingungen von gnunetd.\n"
-
-#: src/chat/gnunet-service-chat.c:728
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "Fehler beim Speichern der Konfiguration!"
-
-#: src/chat/gnunet-service-chat.c:906
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "Fehler beim Speichern der Konfiguration!"
-
-#: src/core/core_api.c:757
+#: src/core/core_api.c:755
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -596,42 +292,58 @@
 msgid "Peer `%s'\n"
 msgstr "Ich bin Peer `%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' hat sich mit `%s' verbunden.\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' hat sich mit `%s' verbunden.\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:825
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\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 "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-core.c:227
+#: src/core/gnunet-core.c:222
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: 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 "Fehler beim Starten der Collection.\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 "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
 #: src/core/gnunet-service-core_clients.c:370
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
@@ -688,7 +400,7 @@
 msgstr "# defragmentierter Nachrichten"
 
 #: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:812
+#: src/transport/gnunet-service-transport_validation.c:813
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
@@ -716,7 +428,7 @@
 msgstr "# Klartext PING Nachrichten gesendet"
 
 #: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1108
+#: src/transport/gnunet-service-transport_validation.c:1109
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -763,7 +475,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 "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/core/gnunet-service-core_kx.c:1632
@@ -776,19 +488,10 @@
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: 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:831
+#: 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 "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
@@ -813,16 +516,16 @@
 
 #: 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:630 src/fs/gnunet-service-fs_cp.c:1544
 #: src/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
-#: src/transport/gnunet-service-transport_neighbours.c:873
+#: src/transport/gnunet-service-transport_neighbours.c:872
 #: src/transport/gnunet-service-transport_neighbours.c:1089
 #: src/transport/gnunet-service-transport_neighbours.c:1098
-#: src/transport/gnunet-service-transport_neighbours.c:2620
-#: src/transport/gnunet-service-transport_neighbours.c:2882
+#: src/transport/gnunet-service-transport_neighbours.c:2635
+#: src/transport/gnunet-service-transport_neighbours.c:2897
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
@@ -888,9 +591,9 @@
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:543
-#: src/include/gnunet_common.h:550
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ecc.c:53
+#: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
+#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -903,17 +606,17 @@
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:410
+#: src/datacache/plugin_datacache_sqlite.c:405
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:443
-#: src/datastore/plugin_datastore_sqlite.c:408
-#: src/namestore/plugin_namestore_sqlite.c:370
+#: src/datacache/plugin_datacache_sqlite.c:438
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namestore/plugin_namestore_sqlite.c:362
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:450
+#: src/datacache/plugin_datacache_sqlite.c:445
 #, fuzzy, c-format
 msgid "Failed to close statement %p: %d\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -922,25 +625,25 @@
 msgid "Template datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:305
+#: src/datastore/datastore_api.c:310
 #, fuzzy
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/datastore/datastore_api.c:388
+#: src/datastore/datastore_api.c:393
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:432
+#: src/datastore/datastore_api.c:437
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:459
+#: src/datastore/datastore_api.c:465
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:477
+#: src/datastore/datastore_api.c:483
 #, fuzzy
 msgid "# Requests dropped from datastore queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -949,73 +652,69 @@
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:548
-msgid "# reconnected to DATASTORE"
-msgstr ""
-
-#: src/datastore/datastore_api.c:612
+#: src/datastore/datastore_api.c:608
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:633
+#: src/datastore/datastore_api.c:630
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# bytes in der Datenbank"
 
-#: src/datastore/datastore_api.c:764
+#: src/datastore/datastore_api.c:762
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:778
+#: src/datastore/datastore_api.c:776
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
+#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/datastore/datastore_api.c:800
+#: src/datastore/datastore_api.c:798
 #, fuzzy
 msgid "# status messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:869
+#: src/datastore/datastore_api.c:867
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:936
+#: src/datastore/datastore_api.c:934
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:997
+#: src/datastore/datastore_api.c:995
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1054
+#: src/datastore/datastore_api.c:1052
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1118
+#: src/datastore/datastore_api.c:1116
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1163
+#: src/datastore/datastore_api.c:1161
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1221
+#: src/datastore/datastore_api.c:1220
 #, fuzzy
 msgid "# Results received"
 msgstr "# Bytes empfangen über TCP"
@@ -1028,7 +727,7 @@
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1409
+#: src/datastore/datastore_api.c:1410
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# dht Anfragen weitergeleitet"
@@ -1043,10 +742,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 ""
 
@@ -1210,7 +911,7 @@
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:654
+#: src/namestore/plugin_namestore_postgres.c:652
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1219,36 +920,30 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:233
-#: src/namestore/plugin_namestore_sqlite.c:204
-#, fuzzy, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:260
-#: src/namestore/plugin_namestore_sqlite.c:229
+#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/namestore/plugin_namestore_sqlite.c:223
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:655
+#: src/datastore/plugin_datastore_sqlite.c:648
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1139
+#: src/datastore/plugin_datastore_sqlite.c:1132
 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:1151
 #, 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/namestore/plugin_namestore_sqlite.c:834
+#: src/datastore/plugin_datastore_sqlite.c:1191
+#: src/namestore/plugin_namestore_sqlite.c:827
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -1262,98 +957,116 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\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 "Es konnte keine Verbindung mit gnunetd hergestellt werden.\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:753
+#: 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 "# gap Anfragen insgesamt empfangen"
 
-#: 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 "# gap Anfragen insgesamt empfangen"
 
-#: 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 "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/dht/gnunet-dht-put.c:157
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\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 "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -1446,102 +1159,102 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Empfangene Client-Nachricht ist ungültig.\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 Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:721
+#: src/dht/gnunet-service-dht_neighbours.c:726
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: 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 des Typs %d übertragen"
 
-#: 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 "# Client Trace-Anfragen empfangen"
 
-#: 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 " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1211
+#: src/dht/gnunet-service-dht_neighbours.c:1216
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: 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 Nachrichten erstellt"
 
-#: 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 "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1325
+#: src/dht/gnunet-service-dht_neighbours.c:1330
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: 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 Nachrichten erstellt"
 
-#: 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 Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1555
+#: src/dht/gnunet-service-dht_neighbours.c:1560
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: 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 "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1812
+#: src/dht/gnunet-service-dht_neighbours.c:1817
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1826
+#: src/dht/gnunet-service-dht_neighbours.c:1831
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1905
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
@@ -1594,6 +1307,42 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
+#: src/dns/dnsparser.c:110
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/dns/dnsparser.c:584
+#, fuzzy, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/dns/dnsstub.c:175
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
+
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/gns/gnunet-service-gns_resolver.c:1669
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s\n"
+msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
+
+#: src/dns/dnsstub.c:299
+#, fuzzy, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/dns/dnsstub.c:368
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
+msgstr ""
+
+#: src/dns/dnsstub.c:440
+#, 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 ""
@@ -1618,73 +1367,59 @@
 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 "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
-
-#: src/dns/gnunet-service-dns.c:639
+#: src/dns/gnunet-service-dns.c:512
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:822
+#: src/dns/gnunet-service-dns.c:659
 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:845
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1168
+#: src/dns/gnunet-service-dns.c:924
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1281
+#: src/dns/gnunet-service-dns.c:1039
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1297
+#: src/dns/gnunet-service-dns.c:1055
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1306
+#: src/dns/gnunet-service-dns.c:1064
 #, 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:1073
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1380
+#: src/dns/gnunet-service-dns.c:1140
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\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:1216 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:1281 src/exit/gnunet-daemon-exit.c:3007
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1581
-msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
-msgstr ""
+#: src/dns/gnunet-service-dns.c:1302
+#, fuzzy
+msgid "need a valid IPv4 or IPv6 address\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/dv/dv_api.c:179
+#: src/dv/dv_api.c:189
 #, fuzzy
 msgid "Failed to connect to the dv service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -1864,35 +1599,35 @@
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3048
+#: src/exit/gnunet-daemon-exit.c:3023
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3056
+#: src/exit/gnunet-daemon-exit.c:3031
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3063
+#: src/exit/gnunet-daemon-exit.c:3038
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3069
+#: src/exit/gnunet-daemon-exit.c:3044
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3050 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3240
+#: src/exit/gnunet-daemon-exit.c:3216
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1914,113 +1649,113 @@
 msgid "# messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:203
+#: src/fragmentation/fragmentation.c:208
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:206
+#: src/fragmentation/fragmentation.c:211
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:232
+#: src/fragmentation/fragmentation.c:237
 #, fuzzy
 msgid "# fragments wrap arounds"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:273
+#: src/fragmentation/fragmentation.c:281
 msgid "# messages fragmented"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:276
+#: src/fragmentation/fragmentation.c:284
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:363
+#: src/fragmentation/fragmentation.c:405
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fragmentation/fragmentation.c:369
+#: src/fragmentation/fragmentation.c:411
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:393
+#: src/fragmentation/fragmentation.c:435
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:450
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:500
+#: src/fs/fs_api.c:459
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:506
+#: src/fs/fs_api.c:465
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1087
+#: src/fs/fs_api.c:1046
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1546
+#: src/fs/fs_api.c:1505
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1588
+#: src/fs/fs_api.c:1547
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1604
+#: src/fs/fs_api.c:1563
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2254
+#: src/fs/fs_api.c:2213
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2264
+#: src/fs/fs_api.c:2223
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2389 src/fs/fs_api.c:2629
+#: src/fs/fs_api.c:2348 src/fs/fs_api.c:2588
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2406
+#: src/fs/fs_api.c:2365
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2419 src/fs/fs_api.c:2438 src/fs/fs_api.c:2922
+#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2397 src/fs/fs_api.c:2881
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2620
+#: src/fs/fs_api.c:2579
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2866
+#: src/fs/fs_api.c:2825
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2960
+#: src/fs/fs_api.c:2919
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2082,12 +1817,12 @@
 msgid "internal error decoding tree"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/fs_download.c:1920
+#: src/fs/fs_download.c:1927
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/fs/fs_getopt.c:191
+#: src/fs/fs_getopt.c:192
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2129,41 +1864,34 @@
 msgid "Failed to connect to datastore service"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\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 ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\n"
-
-#: src/fs/fs_namespace.c:112
-#, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\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 "Es konnte keine Verbindung mit gnunetd hergestellt werden.\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 "Fehler beim Aktualisieren der Daten des Moduls `%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 ""
 "Der Eintrag konnte dem Namespace `%s' nicht hinzugefügt werden (existiert "
 "er?)\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 "Unbekannter Fehler.\n"
 
-#: src/fs/fs_namespace.c:629
+#: src/fs/fs_namespace.c:627
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -2245,11 +1973,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 "Fehler beim Starten der Collection.\n"
-
 #: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
@@ -2277,37 +2000,37 @@
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: 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 "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_unindex.c:356
+#: src/fs/fs_unindex.c:357
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/fs_unindex.c:411
+#: src/fs/fs_unindex.c:416
 #, fuzzy, c-format
 msgid "Failed to remove KBlock: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\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 "Datei `%s' hat 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 "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_unindex.c:631
+#: src/fs/fs_unindex.c:636
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:665
+#: src/fs/fs_unindex.c:670
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -2372,16 +2095,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 "Konfigurationsdatei `%s' konnte nicht geparst werden.\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 "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1148
+#: src/fs/fs_uri.c:1147
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2413,35 +2136,35 @@
 msgid "Failed to run `%s'\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/gnunet-auto-share.c:684
+#: src/fs/gnunet-auto-share.c:686
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-auto-share.c:734 src/fs/gnunet-pseudonym.c:279
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
+#: src/fs/gnunet-publish.c:680
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-auto-share.c:741 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:744 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:747 src/fs/gnunet-publish.c:711
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-pseudonym.c:304
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:304
+#: src/fs/gnunet-publish.c:718
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:767
+#: src/fs/gnunet-auto-share.c:770
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -2485,87 +2208,87 @@
 msgid "Starting download `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-download.c:146
+#: src/fs/gnunet-download.c:147
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Unbekannter Fehler"
 
-#: 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 "Fehler beim Download: %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 "Upload abgewiesen!"
 
-#: 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 "Sie müssen einen Empfänger angeben!\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 "Datei `%s' hat 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 "`%s' Dienst konnte nicht initialisiert werden.\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 "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
-#: 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 "Schreibe die Datei in DATEINAME"
 
-#: 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 "Das GNUnet Verzeichnis rekursiv herunterladen"
 
-#: 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/...)"
@@ -2580,7 +2303,7 @@
 msgid "Special file-sharing operations"
 msgstr "Alle Optionen anzeigen"
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:161
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:198
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -2608,7 +2331,7 @@
 "Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
 "(diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c: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 ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
@@ -2641,128 +2364,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 "Fehler beim Download: %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 "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:188
+#: src/fs/gnunet-publish.c:189
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\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 "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:308
+#: src/fs/gnunet-publish.c:309
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%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 "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-publish.c:434
+#: src/fs/gnunet-publish.c:435
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:461
+#: src/fs/gnunet-publish.c:462
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:493
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-publish.c:494
+#: src/fs/gnunet-publish.c:495
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Collection `%s' begonnen.\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 "GNUnet wurde erfolgreich heruntergefahren.\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 "Daten des Moduls `%s' werden aktualisiert\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 "=\tFehler beim Lesen des Verzeichnisses.\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 "Sie dürfen nur eine Datei zum Deindizieren angeben.\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 "Sie müssen einen Empfänger angeben!\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 "Option `%s' macht keinen Sinn ohne die Option `%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 "Option `%s' macht keinen Sinn ohne die Option `%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 "Datei wurde als `%s' gespeichert.\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"
@@ -2770,7 +2493,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: 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)"
@@ -2778,7 +2501,7 @@
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-publish.c:701
+#: src/fs/gnunet-publish.c:702
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2786,7 +2509,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: 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)"
@@ -2794,229 +2517,223 @@
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/fs/gnunet-publish.c:714
+#: src/fs/gnunet-publish.c:715
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namespace)"
 
-#: src/fs/gnunet-publish.c: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 ""
 "die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namespaces)"
 
-#: 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 "Fehler beim Verlassen der 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 "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-search.c:255
+#: src/fs/gnunet-search.c:257
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\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 ""
 
-#: src/fs/gnunet-service-fs.c:240
+#: src/fs/gnunet-service-fs.c:245
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
+#: src/fs/gnunet-service-fs.c:306 src/fs/gnunet-service-fs.c:496
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: 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/fs/gnunet-service-fs.c:588 src/hostlist/gnunet-daemon-hostlist.c:297
+#: 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' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:703
+#: src/fs/gnunet-service-fs_cp.c:711
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:707
+#: src/fs/gnunet-service-fs_cp.c:715
 #, 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:751
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:748
+#: src/fs/gnunet-service-fs_cp.c:757
 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:782 src/fs/gnunet-service-fs_cp.c:1345
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:865
+#: src/fs/gnunet-service-fs_cp.c:875
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:928
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:926
+#: src/fs/gnunet-service-fs_cp.c:936
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:940
+#: src/fs/gnunet-service-fs_cp.c:950
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:978
+#: src/fs/gnunet-service-fs_cp.c:988
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1045
+#: src/fs/gnunet-service-fs_cp.c:1056
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1069
+#: src/fs/gnunet-service-fs_cp.c:1081
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1079
+#: src/fs/gnunet-service-fs_cp.c:1091
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1158
+#: src/fs/gnunet-service-fs_cp.c:1170
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1192
+#: src/fs/gnunet-service-fs_cp.c:1204
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1214
+#: src/fs/gnunet-service-fs_cp.c:1227
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1274
+#: src/fs/gnunet-service-fs_cp.c:1288
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1300
+#: src/fs/gnunet-service-fs_cp.c:1314
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1343
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1685
+#: src/fs/gnunet-service-fs_cp.c:1713
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
+#: src/fs/gnunet-service-fs_indexing.c:130
+#: src/fs/gnunet-service-fs_indexing.c:181
 #, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\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 "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:137
+#: src/fs/gnunet-service-fs_indexing.c:142
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/fs/gnunet-service-fs_indexing.c:228
+#: src/fs/gnunet-service-fs_indexing.c:237
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:266
+#: src/fs/gnunet-service-fs_indexing.c:275
 #, 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:477
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:539
+#: src/fs/gnunet-service-fs_indexing.c:542
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:557
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:556
+#: src/fs/gnunet-service-fs_indexing.c:559
 #, fuzzy
 msgid "not indexed"
 msgstr "Deindizierung schlug fehl."
 
-#: src/fs/gnunet-service-fs_indexing.c:571
+#: src/fs/gnunet-service-fs_indexing.c:574
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
@@ -3041,156 +2758,148 @@
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:265
+#: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:391
+#: src/fs/gnunet-service-fs_pe.c:397
 #, fuzzy
 msgid "# transmission failed (core has no bandwidth)"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:420
+#: src/fs/gnunet-service-fs_pe.c:426
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/fs/gnunet-service-fs_pe.c:469
+#: src/fs/gnunet-service-fs_pe.c:475
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:476
+#: src/fs/gnunet-service-fs_pe.c:483
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pe.c:538
+#: src/fs/gnunet-service-fs_pe.c:543
 #, fuzzy
 msgid "# requests merged"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pe.c:544
+#: src/fs/gnunet-service-fs_pe.c:551
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:684
-#: src/fs/gnunet-service-fs_pe.c:751
+#: src/fs/gnunet-service-fs_pe.c:605 src/fs/gnunet-service-fs_pe.c:689
+#: src/fs/gnunet-service-fs_pe.c:757
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:285
+#: src/fs/gnunet-service-fs_pr.c:293
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:618
+#: src/fs/gnunet-service-fs_pr.c:385 src/fs/gnunet-service-fs_pr.c:639
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:781
+#: src/fs/gnunet-service-fs_pr.c:802
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:810
+#: src/fs/gnunet-service-fs_pr.c:834
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:824
+#: src/fs/gnunet-service-fs_pr.c:849
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:837
+#: src/fs/gnunet-service-fs_pr.c:862
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:955
+#: src/fs/gnunet-service-fs_pr.c:983
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:982
+#: src/fs/gnunet-service-fs_pr.c:1010
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:1017
+#: src/fs/gnunet-service-fs_pr.c:1045
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1108
+#: src/fs/gnunet-service-fs_pr.c:1136
 #, 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:1156
 #, 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:1203
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1190
+#: src/fs/gnunet-service-fs_pr.c:1218
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1199
+#: src/fs/gnunet-service-fs_pr.c:1227
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1213
+#: src/fs/gnunet-service-fs_pr.c:1242
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1226
+#: src/fs/gnunet-service-fs_pr.c:1256
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1239
+#: src/fs/gnunet-service-fs_pr.c:1269
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1274
 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:1301 src/fs/gnunet-service-fs_pr.c:1341
+#: src/fs/gnunet-service-fs_pr.c:1481
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1329
+#: src/fs/gnunet-service-fs_pr.c:1359
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1340
+#: src/fs/gnunet-service-fs_pr.c:1370
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1426
+#: src/fs/gnunet-service-fs_pr.c:1457
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1510
+#: src/fs/gnunet-service-fs_pr.c:1542
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: 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 "Konfigurationsdatei `%s' wurde erzeugt.\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
@@ -3198,29 +2907,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"
 "Fehler beim Deindizieren der Datei: %s\n"
 
-#: src/fs/gnunet-unindex.c:101
+#: src/fs/gnunet-unindex.c:100
 #, fuzzy
 msgid "Unindexing done.\n"
 msgstr "Dateien deindizieren."
 
-#: 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 "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-unindex.c:148
+#: src/fs/gnunet-unindex.c:147
 #, fuzzy
 msgid "Could not start unindex operation.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\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 ""
 
@@ -3228,128 +2937,182 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:267
+#: src/gns/gns_api.c:598
+#, fuzzy
+msgid "Failed to serialize lookup reply from GNS service!\n"
+msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+
+#: src/gns/gnunet-dns2gns.c:186
+#, fuzzy
+msgid "Failed to pack DNS response into UDP packet!\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/gns/gnunet-dns2gns.c:361
 #, fuzzy, c-format
-msgid "Key file `%s' for private zone does not exist!\n"
-msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
+msgid "Cannot parse DNS request from %s\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\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 hat ungültige Inhalte von `%s' empfangen.\n"
+
+#: src/gns/gnunet-dns2gns.c:385
+#, fuzzy, c-format
+msgid "Received unsupported DNS request from %s\n"
+msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#: src/gns/gnunet-dns2gns.c: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:221
+#, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns.c:358
+#: src/gns/gnunet-gns.c:335
+#, c-format
+msgid "Please specify lookup, shorten or authority operation!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:356
 #, fuzzy
 msgid "try to shorten a given name"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:359
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:364
+#: src/gns/gnunet-gns.c:362
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:367
+#: src/gns/gnunet-gns.c:365
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:370
+#: src/gns/gnunet-gns.c:368
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:384
+#: src/gns/gnunet-gns.c:381
 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' wird nicht unterstützt. Vorgang wird abgebrochen.\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 "Konfigurationsdatei `%s' konnte nicht geparst werden.\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 "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\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 "Fehler beim Aktualisieren der Daten des Moduls `%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 ""
-"Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
-"gesetzt, sie wird auf %dm gesetzt.\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 "Fehler beim Aktualisieren der Daten des Moduls `%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 "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: 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:2857
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Fehler beim Starten der Collection.\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:2494
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/gns/gnunet-gns-proxy.c:2561
+#: src/gns/gnunet-gns-proxy.c:2522
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/gnunet-gns-proxy.c:3578
-msgid "listen on specified port"
+#: src/gns/gnunet-gns-proxy.c:3510
+msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3581
+#: src/gns/gnunet-gns-proxy.c:3513
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3596
+#: src/gns/gnunet-gns-proxy.c:3525
 msgid "GNUnet GNS proxy"
 msgstr ""
 
+#: src/gns/gnunet-service-gns.c:486
+#, c-format
+msgid "Records for name `%s' in zone %s too large to fit into DHT"
+msgstr ""
+
+#: src/gns/gnunet-service-gns.c:1216
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+
+#: src/gns/gnunet-service-gns.c:1277
+#, fuzzy
+msgid "Could not connect to DHT!\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/gns/gnunet-service-gns.c:1288
+#, fuzzy
+msgid "Unable to initialize resolver!\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+
 #: src/hello/gnunet-hello.c:122
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3431,178 +3194,142 @@
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
+#: src/hostlist/hostlist-client.c:469 src/hostlist/hostlist-client.c:680
+#: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
+#: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
+#: src/hostlist/hostlist-client.c:958 src/hostlist/hostlist-client.c:963
+#: src/transport/plugin_transport_http_client.c:1026
+#: src/transport/plugin_transport_http_client.c:1041
 #, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:473 src/hostlist/hostlist-client.c:683
-#: 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
-#, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1325
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:623
+#: src/hostlist/hostlist-client.c:619
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/hostlist-client.c:661
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/hostlist-client.c:799
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/hostlist-client.c:813
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/hostlist-client.c:833
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:839
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/hostlist-client.c:847
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/hostlist-client.c:900
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/hostlist-client.c:908
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
+#: src/hostlist/hostlist-client.c:1035 src/hostlist/hostlist-client.c:1498
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1046
+#: src/hostlist/hostlist-client.c:1043
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1084
-msgid "Scheduled saving of hostlists\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1088
-#, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127
+#: src/hostlist/hostlist-client.c:1107 src/hostlist/hostlist-client.c:1123
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/hostlist-client.c:1242
-#, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
-msgstr ""
-
 #: src/hostlist/hostlist-client.c:1273
-#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1279
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1283
-#, c-format
-msgid "Hostlist file `%s' is not existing\n"
-msgstr ""
+#: src/hostlist/hostlist-client.c:1277
+#, fuzzy, c-format
+msgid "Hostlist file `%s' does not exist\n"
+msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1288
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1327
+#: src/hostlist/hostlist-client.c:1321
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/hostlist-client.c:1323
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1362
-#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/hostlist-client.c:1368
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/hostlist-client.c:1373
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/hostlist-client.c:1397 src/hostlist/hostlist-client.c:1414
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/hostlist-client.c:1409
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1470
+#: src/hostlist/hostlist-client.c:1463
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1473
-#, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1482
+#: src/hostlist/hostlist-client.c:1475
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1494
+#: src/hostlist/hostlist-client.c:1487
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1498
+#: src/hostlist/hostlist-client.c:1491
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
@@ -3642,10 +3369,6 @@
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:273
-msgid "Sending 100 CONTINUE reply\n"
-msgstr ""
-
 #: src/hostlist/hostlist-server.c:279
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
@@ -3683,27 +3406,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 "Ungültige Parameter. Abbruch.\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 "Fehler beim Lesen der Freunde-Liste von `%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' ist nicht verfügbar."
 
-#: 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 "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -3728,30 +3451,155 @@
 msgid "help text"
 msgstr "Hilfetext für -t"
 
-#: src/mesh/gnunet-service-mesh.c:7110
-msgid "Wrong CORE service\n"
+#: src/mesh/gnunet-regex-profiler.c:1126
+#: src/testbed/gnunet-testbed-profiler.c:323
+msgid "An operation has failed while starting peers\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-regex-profiler.c:1192
+#: src/testbed/gnunet-testbed-profiler.c:390
 #, fuzzy, c-format
-msgid "Mesh service is lacking key configuration settings (%s).  Exiting.\n"
-msgstr "GNUnet Konfiguration"
+msgid "Creating a peer failed. Error: %s\n"
+msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
 
-#: src/mesh/gnunet-service-mesh.c:7424 src/mesh/gnunet-service-mesh.c:7435
+#: src/mesh/gnunet-regex-profiler.c:1306
+#: src/testbed/gnunet-testbed-profiler.c:495
+msgid "An operation has failed while starting slaves\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1359
+msgid "An operation has failed while linking\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1486
+#: src/testbed/gnunet-testbed-profiler.c:597
+#, c-format
+msgid "Host registration failed for a host. Error: %s\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1566
+#: src/testbed/gnunet-testbed-profiler.c:676
+msgid "Unable to connect to master controller -- Check config\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1663
+#, c-format
+msgid "No hosts-file specified on command line. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1668
+#: src/regex/gnunet-regex-simulation-profiler.c:498
+#, c-format
+msgid "No policy directory specified on command line. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1674
+#, c-format
+msgid "No hosts loaded. Need at least one host\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1681
+#: src/testbed/gnunet-testbed-profiler.c:723
+#, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1688
+#: src/testbed/gnunet-testbed-profiler.c:730
 #, fuzzy, c-format
+msgid "Exiting\n"
+msgstr ""
+"\n"
+"Abbruch.\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1694
+#, fuzzy, c-format
+msgid "No configuration file given. Exiting\n"
+msgstr "Konfigurationsdatei FILENAME verwenden"
+
+#: src/mesh/gnunet-regex-profiler.c:1711
+#: src/regex/gnunet-regex-simulation-profiler.c:504
+#, c-format
+msgid "Specified policies directory does not exist. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1718
+#, c-format
+msgid "No search strings file given. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1724
+#, c-format
 msgid ""
-"Mesh service is lacking key configuration settings (%s). Using default "
-"(%u).\n"
-msgstr "GNUnet Konfiguration"
+"Error loading search strings. Given file does not contain enough strings. "
+"Exiting.\n"
+msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7446
+#: src/mesh/gnunet-regex-profiler.c:1730
+#, fuzzy, c-format
+msgid "Error loading search strings. Exiting.\n"
+msgstr "Fehler beim Verlassen der DHT.\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1764
 #, fuzzy
+msgid "name of the file for writing statistics"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1767
+msgid "create FACTOR times number of peers random links"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1770
+#: src/testbed/gnunet-testbed-profiler.c:800
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1773
+msgid "wait TIMEOUT before considering a string match as failed"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1776
+msgid "wait DELAY before starting string search"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1779
+msgid "number of search strings to read from search strings file"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1782
+#: src/regex/gnunet-regex-simulation-profiler.c:555
+msgid "maximum path compression length"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1794
+msgid "Profiler for regex/mesh"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:7971
+msgid "Wrong CORE service\n"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:8176
+#, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
+#: src/mesh/gnunet-service-mesh.c:8265 src/mesh/gnunet-service-mesh.c:8277
+#: src/mesh/gnunet-service-mesh.c:8289 src/mesh/gnunet-service-mesh.c:8302
+#: src/mesh/gnunet-service-mesh.c:8317 src/mesh/gnunet-service-mesh.c:8329
+#: src/mesh/gnunet-service-mesh.c:8341 src/mesh/gnunet-service-mesh.c:8353
+#, fuzzy, c-format
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+msgstr "GNUnet Konfiguration"
+
+#: src/mesh/gnunet-service-mesh.c:8365 src/mesh/gnunet-service-mesh.c:8376
+#, fuzzy, c-format
+msgid ""
+"%s service is lacking key configuration settings (%s). Using default (%u).\n"
+msgstr "GNUnet Konfiguration"
+
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -3789,125 +3637,115 @@
 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 "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\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 "Konfigurationsdatei `%s' wurde erzeugt.\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: Symbolwert `%s' ist ungültig 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 "Ungültiger Parameter: `%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 "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/namestore/gnunet-namestore.c:520
+#: src/namestore/gnunet-namestore.c:519
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:570
-#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#: src/namestore/gnunet-namestore.c:569
+#: src/peerinfo-tool/gnunet-peerinfo.c:882
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:611 src/transport/gnunet-transport.c:618
+#: src/namestore/gnunet-namestore.c:625
 #, fuzzy, c-format
-msgid "Service `%s' is not running\n"
-msgstr "`%s' ist keine Datei.\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
-#, fuzzy, c-format
 msgid "Using default zone file `%s'\n"
 msgstr "Collection `%s' begonnen.\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"
@@ -3985,6 +3823,46 @@
 msgid "Protocol error"
 msgstr ""
 
+#: src/namestore/namestore_common.c:494 src/namestore/namestore_common.c:634
+#, fuzzy, c-format
+msgid "Unsupported record type %d\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
+
+#: src/namestore/namestore_common.c:501
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/namestore/namestore_common.c:524
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/namestore/namestore_common.c:547
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/namestore/namestore_common.c:565
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/namestore/namestore_common.c:578
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/namestore/namestore_common.c:599
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/namestore/namestore_common.c:625
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
 #: src/namestore/plugin_namestore_postgres.c:95
 #, fuzzy
 msgid "Failed to create indices\n"
@@ -3999,33 +3877,32 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:799
+#: src/nat/nat.c:795
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:844
+#: src/nat/nat.c:840
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1111
-#, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "Fehler beim Speichern der Konfiguration!"
+#: src/nat/nat.c:1108
+msgid "malformed"
+msgstr ""
 
-#: src/nat/nat.c:1177 src/nat/nat.c:1187
+#: src/nat/nat.c:1173 src/nat/nat.c:1183
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1317
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1332
+#: src/nat/nat.c:1328
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -4040,31 +3917,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 "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+
+#: 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 "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: 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 "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#: src/nse/gnunet-service-nse.c:1403 src/nse/gnunet-service-nse.c:1478
+#: src/nse/gnunet-service-nse.c:1495
 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 "Ungültige Parameter. Abbruch.\n"
 
-#: src/nse/gnunet-service-nse.c:1409
-#, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
-
 #: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
@@ -4168,46 +4082,46 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fehler bei %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:833
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:840
+#: src/peerinfo-tool/gnunet-peerinfo.c:847
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:899
+#: src/peerinfo-tool/gnunet-peerinfo.c:906
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:936
+#: src/peerinfo-tool/gnunet-peerinfo.c:943
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:939
+#: src/peerinfo-tool/gnunet-peerinfo.c:946
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:942
+#: src/peerinfo-tool/gnunet-peerinfo.c:949
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:945
+#: src/peerinfo-tool/gnunet-peerinfo.c:952
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:948
+#: src/peerinfo-tool/gnunet-peerinfo.c:955
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:951
+#: src/peerinfo-tool/gnunet-peerinfo.c:958
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:961
+#: src/peerinfo-tool/gnunet-peerinfo.c:968
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -4307,6 +4221,14 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/regex/gnunet-regex-simulation-profiler.c:552
+msgid "name of the table to write DFAs"
+msgstr ""
+
+#: src/regex/gnunet-regex-simulation-profiler.c:567
+msgid "Profiler for regex library"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:271
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -4317,63 +4239,138 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-statistics.c:120
+#: src/statistics/gnunet-statistics.c:131
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:193
+#: src/statistics/gnunet-statistics.c:133
+#, fuzzy, c-format
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/statistics/gnunet-statistics.c:177
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/statistics/gnunet-statistics.c:183
 #, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:231
+#, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:201
+#: src/statistics/gnunet-statistics.c:239
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/statistics/gnunet-statistics.c:221
+#: src/statistics/gnunet-statistics.c:258
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:224
+#: src/statistics/gnunet-statistics.c:261
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:227
+#: src/statistics/gnunet-statistics.c:264
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:230
+#: src/statistics/gnunet-statistics.c:267
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:233
+#: src/statistics/gnunet-statistics.c:270
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:244
+#: src/statistics/gnunet-statistics.c:273
+msgid "connect to remote host"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:276
+msgid "port for remote host"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:289
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
-#: src/statistics/statistics_api.c:456
+#: src/statistics/statistics_api.c:511
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/statistics/statistics_api.c:999
+#: src/statistics/statistics_api.c:1053
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/testbed_api.c:246
+#: src/testbed/gnunet-testbed-profiler.c:705
+#, c-format
+msgid "No hosts-file specified on command line\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:716
+#, c-format
+msgid "No hosts loaded. Need atleast one host\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:779
+msgid "Only `CLIQUE' and `RANDOM' are permitted.\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:794
+msgid "create COUNT number of peers"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:797
+msgid "create COUNT number of random links"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:803
+msgid ""
+"Try to acheive TOPOLOGY. This options takes either CLIQUE or RANDOM. For "
+"CLIQUE the parameter -n is ignored. The default is to acheive a random graph "
+"topology."
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:818
+msgid "Profiler for testbed"
+msgstr ""
+
+#: src/testbed/testbed_api.c:325
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
+#: src/testbed/testbed_api_hosts.c:326
+#, fuzzy, c-format
+msgid "Hosts file %s not found\n"
+msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
+
+#: src/testbed/testbed_api_hosts.c:334
+#, fuzzy, c-format
+msgid "Hosts file %s has no data\n"
+msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
+
+#: src/testbed/testbed_api_hosts.c:341
+#, fuzzy, c-format
+msgid "Hosts file %s cannot be read\n"
+msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
+
+#: src/testbed/testbed_api_testbed.c: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"
@@ -4421,269 +4418,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 "Konfigurationsdatei `%s' konnte nicht geparst werden.\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' ist zu keinem Knoten verbunden.\n"
-
-#: src/testing_old/testing.c:237
-#, fuzzy
-msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
-msgstr "Fehler beim Starten der Collection.\n"
-
-#: src/testing_old/testing.c:238
-#, fuzzy
-msgid "Failed to create pipe for `ssh' process.\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#: src/testing_old/testing.c:286
-#, fuzzy, c-format
-msgid "Could not start `%s' process to create hostkey.\n"
-msgstr ""
-"IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
-"der Konfigurationsdatei an.\n"
-
-#: src/testing_old/testing.c:293
-#, fuzzy
-msgid "Failed to start `gnunet-peerinfo' process.\n"
-msgstr "Fehler beim Starten der Collection.\n"
-
-#: src/testing_old/testing.c:294 src/testing_old/testing.c:471
-#, fuzzy
-msgid "Failed to start `ssh' process.\n"
-msgstr "Fehler beim Starten der Collection.\n"
-
-#: src/testing_old/testing.c:354
-#, fuzzy, c-format
-msgid "Error reading from gnunet-peerinfo: %s\n"
-msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
-
-#: src/testing_old/testing.c:358
-#, fuzzy
-msgid "Malformed output from gnunet-peerinfo!\n"
-msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
-
-#: src/testing_old/testing.c:368
-#, fuzzy
-msgid "Failed to get hostkey!\n"
-msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\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 ""
-"IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
-"der Konfigurationsdatei an.\n"
-
-#: src/testing_old/testing.c:470
-#, fuzzy
-msgid "Failed to start `gnunet-arm' process.\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\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' ist zu keinem Knoten verbunden.\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 "Collection `%s' begonnen.\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 ""
-"IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
-"der Konfigurationsdatei an.\n"
-
-#: src/testing_old/testing.c:1292 src/testing_old/testing.c:1359
-#, fuzzy, c-format
-msgid "Terminating peer `%4s'\n"
-msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
-
-#: src/testing_old/testing.c:1448
-#, fuzzy, c-format
-msgid "Setting d->dead on peer `%4s'\n"
-msgstr "Collection `%s' begonnen.\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 "Fehler beim Speichern der Konfiguration!"
-
-#: src/testing_old/testing.c:1636
-#, fuzzy, c-format
-msgid "Could not start `%s' process to copy configuration file.\n"
-msgstr ""
-"IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
-"der Konfigurationsdatei an.\n"
-
-#: src/testing_old/testing.c:1639
-#, fuzzy
-msgid "Failed to copy new configuration to remote machine."
-msgstr "Fehler beim Speichern der Konfiguration!"
-
-#: src/testing_old/testing.c:1794
-#, fuzzy
-msgid "Peers failed to connect"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
-
-#: src/testing_old/testing.c:1922
-#, fuzzy
-msgid "Failed to connect to core service of first peer!\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\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 ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\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
-#, fuzzy, c-format
-msgid ""
-"No `%s' specified in peer configuration in section `%s', cannot copy friends "
-"file!\n"
-msgstr ""
-"Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
-"gesetzt, sie wird auf %dm gesetzt.\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 "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
-
-#: src/testing_old/testing_group.c:5962
-#, fuzzy, c-format
-msgid "Could not read hostkeys file `%s'!\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%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 "Auf die Namespace Informationen konnte nicht zugegriffen werden.\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:518
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/testing/testing.c:477
+#: src/testing/testing.c:528
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/testing/testing.c:788
+#: src/testing/testing.c:839
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/testing/testing.c:799
+#: src/testing/testing.c:850
 #, 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:864
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing.c:846
+#: src/testing/testing.c:897
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/testing/testing.c:864
+#: src/testing/testing.c:915
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/testing/testing.c:925
+#: src/testing/testing.c:976
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:1088
+#: src/testing/testing.c:1140
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -4707,168 +4494,164 @@
 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 "Fehler beim Lesen der Freunde-Liste von `%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 "Fehler beim Lesen der Freunde-Liste von `%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 "Fehler beim Lesen der Freunde-Liste von `%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 "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\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 "Syntaxfehler in Topologieangabe, überspringe Bytes `%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 " 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 "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1224
+#: src/topology/gnunet-daemon-topology.c:1223
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: 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 "Fehler beim Lesen der Freunde-Liste von `%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 "Fehler beim Lesen der Freunde-Liste von `%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 "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %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 "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\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 "Syntaxfehler in Topologieangabe, überspringe Bytes `%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:513
 #: src/transport/gnunet-service-transport_blacklist.c:751
 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 "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:242
+#: src/transport/gnunet-service-transport.c:252
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:289
+#: src/transport/gnunet-service-transport.c:299
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# Bytes entschlüsselt"
 
-#: 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 "Auf die Namespace Informationen konnte nicht zugegriffen werden.\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
+#: src/transport/gnunet-service-transport_clients.c:353
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:357
+#: src/transport/gnunet-service-transport_clients.c:358
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_clients.c:509
+#: src/transport/gnunet-service-transport_clients.c:510
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:637
+#: src/transport/gnunet-service-transport_clients.c:651
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:688
+#: src/transport/gnunet-service-transport_clients.c:702
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -4882,112 +4665,112 @@
 msgid "# DISCONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1157
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1170
+#: src/transport/gnunet-service-transport_neighbours.c:1507
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1162
+#: src/transport/gnunet-service-transport_neighbours.c:1175
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1180
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1224
+#: src/transport/gnunet-service-transport_neighbours.c:1237
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1266
+#: src/transport/gnunet-service-transport_neighbours.c:1279
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1290
+#: src/transport/gnunet-service-transport_neighbours.c:1303
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1298
+#: src/transport/gnunet-service-transport_neighbours.c:1311
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1335
+#: src/transport/gnunet-service-transport_neighbours.c:1348
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1344
+#: src/transport/gnunet-service-transport_neighbours.c:1357
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1400
+#: src/transport/gnunet-service-transport_neighbours.c:1413
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1434
+#: src/transport/gnunet-service-transport_neighbours.c:1447
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1450
+#: src/transport/gnunet-service-transport_neighbours.c:1463
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2596
+#: src/transport/gnunet-service-transport_neighbours.c:2611
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2611
-#: src/transport/gnunet-service-transport_neighbours.c:2645
+#: src/transport/gnunet-service-transport_neighbours.c:2626
+#: src/transport/gnunet-service-transport_neighbours.c:2660
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2658
+#: src/transport/gnunet-service-transport_neighbours.c:2673
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2691
+#: src/transport/gnunet-service-transport_neighbours.c:2706
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2875
+#: src/transport/gnunet-service-transport_neighbours.c:2890
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2930
+#: src/transport/gnunet-service-transport_neighbours.c:2945
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2944
+#: src/transport/gnunet-service-transport_neighbours.c:2959
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2975
+#: src/transport/gnunet-service-transport_neighbours.c:2990
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2986
+#: src/transport/gnunet-service-transport_neighbours.c:3001
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3017
+#: src/transport/gnunet-service-transport_neighbours.c:3032
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3112
+#: src/transport/gnunet-service-transport_neighbours.c:3127
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -5016,33 +4799,33 @@
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:807
+#: src/transport/gnunet-service-transport_validation.c:808
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:872
+#: src/transport/gnunet-service-transport_validation.c:873
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1001
+#: src/transport/gnunet-service-transport_validation.c:1002
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1010
+#: src/transport/gnunet-service-transport_validation.c:1011
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1135
+#: src/transport/gnunet-service-transport_validation.c:1136
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1164
+#: src/transport/gnunet-service-transport_validation.c:1166
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1218
+#: src/transport/gnunet-service-transport_validation.c:1220
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
@@ -5057,154 +4840,253 @@
 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 hat ungültige Inhalte von `%s' empfangen.\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 "Fehler beim Lesen der Freunde-Liste von `%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 "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:394
+#: src/transport/gnunet-transport.c:395
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:426
+#: src/transport/gnunet-transport.c:427
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\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 hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/gnunet-transport.c:529
+#: src/transport/gnunet-transport.c:528
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Ich bin Peer `%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 "# verbundener Knoten"
 
-#: src/transport/gnunet-transport.c:633
+#: src/transport/gnunet-transport.c:632
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%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 "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:722
+#: src/transport/gnunet-transport.c:721
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:728
+#: src/transport/gnunet-transport.c:727
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%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 "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_http.c:1119
+#: src/transport/plugin_transport_http.c:817
+#: src/transport/plugin_transport_http_server.c:2528
 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:2296
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/transport/plugin_transport_http.c:1200 src/util/service.c:1051
+#: src/transport/plugin_transport_http.c:898
+#: src/transport/plugin_transport_http_server.c:2328 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_http.c:1217 src/util/service.c:1068
+#: src/transport/plugin_transport_http.c:915
+#: src/transport/plugin_transport_http_server.c:2345 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/plugin_transport_http.c:1322
+#: src/transport/plugin_transport_http.c:1020
+#: src/transport/plugin_transport_http_server.c:2456
 #, 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:2624
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
-#: src/transport/plugin_transport_http.c:1420
+#: src/transport/plugin_transport_http.c:1146
+#: src/transport/plugin_transport_http_server.c:2635
 #, 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:2717
+#, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/transport/plugin_transport_http.c:1228
+msgid "No external hostname configured\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_client.c:1463
 #, 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:1594
+#: src/transport/plugin_transport_http_server.c:2841
+#, fuzzy, c-format
+msgid "Shutting down plugin `%s'\n"
+msgstr "Teste Transport(e) %s\n"
+
+#: src/transport/plugin_transport_http_client.c:1619
+#: src/transport/plugin_transport_http_server.c:2900
+#, fuzzy, c-format
+msgid "Shutdown for plugin `%s' complete\n"
+msgstr ""
+"Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
+"beträgt %8.3f KB/s.\n"
+
+#: src/transport/plugin_transport_http_client.c:1647
+#: src/transport/plugin_transport_http_server.c:2747
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
+
+#: src/transport/plugin_transport_http_server.c:1317
+#, 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:1575
+#, c-format
+msgid "Accepting connection (%u of %u) from `%s'\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:1583
+#, c-format
+msgid ""
+"Server reached maximum number connections (%u), rejecting new connection\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:1884
+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:1908
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
+#: src/transport/plugin_transport_http_server.c:2603
+#, c-format
+msgid "IPv4 support is %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2617
+#, c-format
+msgid "IPv6 support is %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2642
+#, fuzzy, c-format
+msgid "Using port %u\n"
+msgstr "Teste Transport(e) %s\n"
+
+#: src/transport/plugin_transport_http_server.c:2657
+#, fuzzy, c-format
+msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
+msgstr ""
+"Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
+"positive Zahl angeben.\n"
+
+#: src/transport/plugin_transport_http_server.c:2667
+#, fuzzy, c-format
+msgid "Binding to IPv4 address %s\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/transport/plugin_transport_http_server.c:2688
+#, fuzzy, c-format
+msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
+msgstr ""
+"Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
+"positive Zahl angeben.\n"
+
+#: src/transport/plugin_transport_http_server.c:2698
+#, fuzzy, c-format
+msgid "Binding to IPv6 address %s\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/transport/plugin_transport_http_server.c:2733
+#, fuzzy, c-format
+msgid "Notifying transport only about hostname `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
 #: src/transport/plugin_transport_smtp.c:370
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -5264,16 +5146,16 @@
 #: src/transport/plugin_transport_tcp.c:856
 #: src/transport/plugin_transport_tcp.c:906
 #: src/transport/plugin_transport_tcp.c:992
-#: src/transport/plugin_transport_tcp.c:1130
-#: src/transport/plugin_transport_tcp.c:1147
+#: src/transport/plugin_transport_tcp.c:1132
+#: src/transport/plugin_transport_tcp.c:1149
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
-#: src/transport/plugin_transport_tcp.c:1807
-#: src/transport/plugin_transport_tcp.c:2424
+#: src/transport/plugin_transport_tcp.c:1816
+#: src/transport/plugin_transport_tcp.c:2435
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
@@ -5293,54 +5175,49 @@
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1336
+#: src/transport/plugin_transport_tcp.c:1341
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1447
+#: src/transport/plugin_transport_tcp.c:1456
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1848
+#: src/transport/plugin_transport_tcp.c:1857
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2019
+#: src/transport/plugin_transport_tcp.c:2031
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2089
+#: src/transport/plugin_transport_tcp.c:2101
 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:2325 src/util/service.c:948
+#: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2327
+#: src/transport/plugin_transport_tcp.c:2339
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2389
+#: src/transport/plugin_transport_tcp.c:2423
 #, fuzzy, c-format
-msgid "Failed to find option %s in section %s!\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
-
-#: src/transport/plugin_transport_tcp.c:2412
-#, fuzzy, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_tcp.c:2416
+#: src/transport/plugin_transport_tcp.c:2427
 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:2431
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5355,19 +5232,19 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: 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:2317
 #, 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:2331
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5375,118 +5252,108 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2162
+#: src/transport/plugin_transport_udp.c:2572
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2328
+#: src/transport/plugin_transport_udp.c:2648
 #, 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:2691
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_unix.c:1346
+#: src/transport/plugin_transport_unix.c:1333
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_wlan.c:560
+#: src/transport/plugin_transport_wlan.c:580
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:579
+#: src/transport/plugin_transport_wlan.c:599
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: 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:645
+#: src/transport/plugin_transport_wlan.c:695
+#: src/transport/plugin_transport_wlan.c:1754
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:748
+#: src/transport/plugin_transport_wlan.c:770
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:766
+#: src/transport/plugin_transport_wlan.c:794
 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:902
+#: src/transport/plugin_transport_wlan.c:987
+#: src/transport/plugin_transport_wlan.c:1756
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1118
+#: src/transport/plugin_transport_wlan.c:1169
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1139
+#: src/transport/plugin_transport_wlan.c:1190
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1149
+#: src/transport/plugin_transport_wlan.c:1200
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1206
+#: src/transport/plugin_transport_wlan.c:1257
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1305
+#: src/transport/plugin_transport_wlan.c:1358
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1340
+#: src/transport/plugin_transport_wlan.c:1393
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1401
+#: src/transport/plugin_transport_wlan.c:1454
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:1510
+#: src/transport/plugin_transport_wlan.c:1563
 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 "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/transport/plugin_transport_wlan.c:1676
+#: src/transport/plugin_transport_wlan.c:1737
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1686
+#: src/transport/transport_api.c:593
 #, fuzzy, c-format
-msgid "Missing configuration option `%s' in section `%s'\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/transport/transport_api.c:575
-#, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
 
-#: src/transport/transport-testing.c:589
+#: src/transport/transport-testing.c:590
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
@@ -5521,63 +5388,63 @@
 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:276 src/util/client.c:753 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:280 src/util/client.c:757 src/util/service.c:988
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/util/client.c:369
+#: src/util/client.c:371
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:377
+#: src/util/client.c:379
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:695
+#: src/util/client.c:698
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:895
+#: src/util/client.c:898
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/util/client.c:909
+#: src/util/client.c:912
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/util/client.c:1162
+#: src/util/client.c:1168
 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 "DEBUG"
 
-#: 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 "WARNUNG"
 
-#: 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 "FEHLER"
 
-#: 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 ""
 
@@ -5591,20 +5458,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 "Unbekannter Fehler"
 
-#: src/util/common_logging.c:1151
+#: src/util/common_logging.c:1187
 #, fuzzy
 msgid "invalid address"
 msgstr "Ungültige Parameter: "
 
+#: src/util/common_logging.c:1205
+#, fuzzy, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
+
+#: src/util/common_logging.c:1226
+#, fuzzy, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
+
 #: src/util/configuration.c:259
 #, fuzzy, c-format
 msgid "Syntax error while deserializing operation at line %u\n"
@@ -5617,34 +5499,29 @@
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:420
+#: src/util/connection.c:427
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/util/connection.c:435
+#: src/util/connection.c:442
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:550
+#: src/util/connection.c:557
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/util/connection.c:739 src/util/connection.c:909
+#: src/util/connection.c:755 src/util/connection.c:921
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:748
+#: src/util/connection.c:912
 #, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/util/connection.c:900
-#, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
@@ -5655,149 +5532,167 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:284
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
+#: src/util/crypto_ecc.c:448 src/util/crypto_rsa.c:644
+#, fuzzy, c-format
+msgid ""
+"File `%s' does not contain a valid private key (too long, %llu bytes).  "
+"Deleting it.\n"
+msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_random.c:313
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr ""
-"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
-
-#: src/util/crypto_rsa.c:635 src/util/crypto_rsa.c:651
-#: src/util/crypto_rsa.c:833
+#: src/util/crypto_ecc.c:463 src/util/crypto_rsa.c:661
 #, 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 (failed decode, %llu bytes).  "
+"Deleting it.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_rsa.c:731 src/util/crypto_rsa.c:778
+#: src/util/crypto_ecc.c:559 src/util/crypto_ecc.c:603
+#: src/util/crypto_rsa.c:759 src/util/crypto_rsa.c:803
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/crypto_rsa.c:736
+#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:764
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/util/crypto_rsa.c:754
-#, c-format
-msgid "I am host `%s'.  Stored new private key in `%s'.\n"
+#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:807
+#: src/util/crypto_rsa.c:843
+msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:782 src/util/crypto_rsa.c:818
-msgid "This may be ok if someone is currently generating a hostkey.\n"
-msgstr ""
-
-#: src/util/crypto_rsa.c:813
+#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:838
 #, c-format
 msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:851
+#: src/util/crypto_ecc.c:643
+msgid "This may be ok if someone is currently generating a key.\n"
+msgstr ""
+
+#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:858
 #, fuzzy, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
-msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_rsa.c:926
+#: src/util/crypto_ecc.c:780 src/util/crypto_rsa.c:946
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_rsa.c:935
+#: src/util/crypto_ecc.c:791
 #, fuzzy
-msgid "internal error"
-msgstr "Unbekannter Fehler.\n"
+msgid "gnunet-ecc failed"
+msgstr "gnunet-update ausführen"
 
-#: src/util/crypto_rsa.c:944 src/util/crypto_rsa.c:951
+#: src/util/crypto_ecc.c:986
+#, fuzzy, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#: src/util/crypto_ecc.c:1054
+#, fuzzy, c-format
+msgid "ECC signature verification failed at %s:%d: %s\n"
+msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
+
+#: src/util/crypto_random.c:313
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
+msgstr ""
+
+#: src/util/crypto_random.c:342
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr ""
+"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
+
+#: src/util/crypto_rsa.c:957
 #, fuzzy
 msgid "gnunet-rsa failed"
 msgstr "gnunet-update ausführen"
 
-#: src/util/crypto_rsa.c:1332
+#: src/util/crypto_rsa.c:1348
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/disk.c:571
+#: src/util/disk.c:567
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk.c:1140
+#: src/util/disk.c:1136
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1494 src/util/service.c:1665
+#: src/util/disk.c:1490 src/util/service.c:1667
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/util/disk.c:1866
+#: src/util/disk.c:1862
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/util/getopt.c:669
+#: src/util/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/util/getopt.c:693
+#: src/util/getopt.c:594
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:698
+#: src/util/getopt.c:599
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: Option '%c%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:715 src/util/getopt.c:883
+#: src/util/getopt.c:616 src/util/getopt.c:783
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: Option `%s' benötigt einen Parameter\n"
 
-#: src/util/getopt.c:744
+#: src/util/getopt.c:645
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option '--%s'\n"
 
-#: src/util/getopt.c:748
+#: src/util/getopt.c:649
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option '%c%s'\n"
 
-#: src/util/getopt.c:773
+#: src/util/getopt.c:674
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: unerlaubte Option -- %c\n"
 
-#: src/util/getopt.c:775
+#: src/util/getopt.c:676
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: src/util/getopt.c:803 src/util/getopt.c:931
+#: src/util/getopt.c:704 src/util/getopt.c:831
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: Option benötigt einen Parameter -- %c\n"
 
-#: src/util/getopt.c:851
+#: src/util/getopt.c:752
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: Option '-W %s' ist mehrdeutig\n"
 
-#: src/util/getopt.c:869
+#: src/util/getopt.c:770
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:1035
+#: src/util/getopt.c:935
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
@@ -5810,37 +5705,110 @@
 "Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\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 "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
 
-#: src/util/gnunet-resolver.c:148
-msgid "perform a reverse lookup"
+#: src/util/getopt_helpers.c:288
+#, fuzzy, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "Sie müssen eine positive Zahl zu der Option `%s' übergeben.\n"
+
+#: src/util/gnunet-config.c:90
+#, c-format
+msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:158
-msgid "Use build-in GNUnet stub resolver"
+#: src/util/gnunet-config.c:133
+#, c-format
+msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:104
+#: 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 ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
+
+#: src/util/gnunet-ecc.c:107 src/util/gnunet-rsa.c:107
+#, fuzzy, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/util/gnunet-ecc.c:113 src/util/gnunet-rsa.c:113
 #, c-format
+msgid "Generating %u keys, please wait"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:128 src/util/gnunet-rsa.c:137
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/util/gnunet-ecc.c:140 src/util/gnunet-rsa.c:149
+#, fuzzy, c-format
+msgid "Finished!\n"
+msgstr "Fertigstellen"
+
+#: src/util/gnunet-ecc.c:163 src/util/gnunet-rsa.c:172
+#, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:154
+#: src/util/gnunet-ecc.c:220 src/util/gnunet-rsa.c:229
+msgid "create COUNT public-private key pairs (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:223 src/util/gnunet-rsa.c:232
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:157
+#: src/util/gnunet-ecc.c:226 src/util/gnunet-rsa.c:235
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:160
+#: src/util/gnunet-ecc.c:229 src/util/gnunet-rsa.c:238
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:170
+#: src/util/gnunet-ecc.c:232 src/util/gnunet-rsa.c:241
+msgid ""
+"use insecure, weak random number generator for key generation (for testing "
+"only)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:242
+msgid "Manipulate GNUnet private ECC key files"
+msgstr ""
+
+#: src/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
+msgstr ""
+
+#: src/util/gnunet-resolver.c:158
+msgid "Use build-in GNUnet stub resolver"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:251
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5855,55 +5823,64 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %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 "Error reading from `%s': %s\n"
-msgstr "Fehler beim Anlegen des Benutzers"
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/util/helper.c:274
+#: src/util/gnunet-uri.c:102
 #, c-format
-msgid "Got 0 bytes from helper `%s' (EOF)\n"
+msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/helper.c:290
+#: 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 "Got %u bytes from helper `%s'\n"
-msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+msgid "Error reading from `%s': %s\n"
+msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/helper.c:299
+#: src/util/helper.c:305
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/helper.c:337
+#: src/util/helper.c:500
 #, fuzzy, c-format
-msgid "Starting HELPER process `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/util/helper.c:476
-#, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/network.c:99
+#: src/util/network.c:127
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1278
+#: src/util/network.c:1318
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:325
+#: src/util/os_installation.c:416
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:522
+#: src/util/os_installation.c:644
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
@@ -5939,6 +5916,11 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
+#: src/util/program.c:251
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
 #: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
@@ -5977,35 +5959,35 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/scheduler.c:786
+#: src/util/scheduler.c:781
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:916
+#: src/util/scheduler.c:911
 #, c-format
 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' fehlgeschlagen für Laufwerk %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' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\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' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:819
+#: src/util/server.c:835
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+"`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
 #: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
@@ -6034,95 +6016,95 @@
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %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 "Unbekannte 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 "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/service.c:1554
+#: src/util/service.c:1556
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%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 "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/util/service.c:1744
+#: src/util/service.c:1747
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6131,70 +6113,74 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/util/strings.c:145
+#: src/util/strings.c:146
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:385
+#: src/util/strings.c:384 src/util/strings.c:404
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:534
+#: src/util/strings.c:525
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:626
+#: src/util/strings.c:622
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:631
+#: src/util/strings.c:626
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:635
+#: src/util/strings.c:628
+msgid "0 ms"
+msgstr ""
+
+#: src/util/strings.c:634
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:639
+#: src/util/strings.c:640
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:643
+#: src/util/strings.c:646
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:648
+#: src/util/strings.c:653
 #, fuzzy
 msgid "day"
 msgstr " Tage"
 
-#: src/util/strings.c:650
+#: src/util/strings.c:655
 #, fuzzy
 msgid "days"
 msgstr " Tage"
 
-#: src/util/strings.c:674
+#: src/util/strings.c:682
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1063
+#: src/util/strings.c:1070
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1071
+#: src/util/strings.c:1078
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1077
+#: src/util/strings.c:1084
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1084
+#: src/util/strings.c:1091
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1093
+#: src/util/strings.c:1100
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -6294,11 +6280,11 @@
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3139
+#: src/vpn/gnunet-service-vpn.c:3114
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3171
+#: src/vpn/gnunet-service-vpn.c:3146
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -6374,23 +6360,358 @@
 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:579 src/include/gnunet_common.h:584
+#: src/include/gnunet_common.h:590
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:536
+#: src/include/gnunet_common.h:600
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:557 src/include/gnunet_common.h:564
+#: src/include/gnunet_common.h:621 src/include/gnunet_common.h:628
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
+#~ msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Asked to start service `%s' within %llu ms\n"
+#~ msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
+
+#, fuzzy
+#~ msgid "Stopping service `%s' within %llu ms\n"
+#~ msgstr "Keine Antwort innerhalb %llums erhalten.\n"
+
+#, fuzzy
+#~ msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+#~ msgstr ""
+#~ "Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in "
+#~ "der Sektion `%s' angegeben werden.\n"
+
+#, fuzzy
+#~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+#~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#, fuzzy
+#~ msgid "list information for the given peer"
+#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#, fuzzy
+#~ msgid "list information for all peers"
+#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#, fuzzy
+#~ msgid "Could not transmit confirmation receipt\n"
+#~ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#, fuzzy
+#~ msgid "Unknown message type: '%u'\n"
+#~ msgstr "Unbekannte Operation `%s'\n"
+
+#, fuzzy
+#~ msgid "Configuration option `%s' in section `%s' missing\n"
+#~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#, fuzzy
+#~ msgid "Failed to access chat home directory `%s'\n"
+#~ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#, fuzzy
+#~ msgid "Failed to create/open key in file `%s'\n"
+#~ msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#, fuzzy
+#~ msgid "Could not serialize metadata\n"
+#~ msgstr "Konnte libgnunetutil nicht initialisieren!\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the chat service\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said: %s\n"
+#~ msgstr "`%s' %s schlug fehl: %s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you: %s\n"
+#~ msgstr "`%s' %s schlug fehl: %s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said for sure: %s\n"
+#~ msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you for sure: %s\n"
+#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' was confirmed that you received: %s\n"
+#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
+#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
+#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "(%s) `%s' was confirmed that you and only you received from him or her: "
+#~ "%s\n"
+#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said off the record: %s\n"
+#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#, fuzzy
+#~ msgid "`%s' left the room\n"
+#~ msgstr "Fehler beim Binden an UDP Port %d.\n"
+
+#, fuzzy
+#~ msgid "Could not change username\n"
+#~ msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#, fuzzy
+#~ msgid "Joining room `%s' as user `%s'...\n"
+#~ msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Changed username to `%s'\n"
+#~ msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
+
+#, fuzzy
+#~ msgid "Unknown command `%s'\n"
+#~ msgstr "Unbekannte Operation `%s'\n"
+
+#, fuzzy
+#~ msgid "You must specify a nickname\n"
+#~ msgstr "Sie müssen einen Empfänger angeben!\n"
+
+#, fuzzy
+#~ msgid "Failed to join room `%s'\n"
+#~ msgstr "Fehler beim Binden an UDP Port %d.\n"
+
+#, fuzzy
+#~ msgid "Failed to queue a message notification\n"
+#~ msgstr "Fehler beim Speichern der Konfiguration!"
+
+#, fuzzy
+#~ msgid "Failed to queue a join notification\n"
+#~ msgstr "Fehler beim Abfragen der Netzwerkverkehrsbedingungen von gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to queue a confirmation receipt\n"
+#~ msgstr "Fehler beim Speichern der Konfiguration!"
+
+#, fuzzy
+#~ msgid "Failed to queue a leave notification\n"
+#~ msgstr "Fehler beim Speichern der Konfiguration!"
+
+#, fuzzy
+#~ msgid "Option `%s' in section `%s' missing in configuration!\n"
+#~ msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+
+#, fuzzy
+#~ msgid "Connected to %s service!\n"
+#~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
+#~ msgstr ""
+#~ "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein "
+#~ "Verzeichnis angeben, in dem FS Daten gespeichert werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to start daemon: %s\n"
+#~ msgstr "Fehler beim Starten der Collection.\n"
+
+#, fuzzy
+#~ msgid "Configuration option `%s' in section `%s' missing.\n"
+#~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s', assuming default value."
+#~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#, fuzzy
+#~ msgid "Key file `%s' for private zone does not exist!\n"
+#~ msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
+
+#, fuzzy
+#~ msgid "Option `%s' not specified in configuration section `%s'\n"
+#~ msgstr ""
+#~ "Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
+#~ "gesetzt, sie wird auf %dm gesetzt.\n"
+
+#, fuzzy
+#~ msgid "Malformed %s `%s' given in configuration!\n"
+#~ msgstr "Fehler beim Speichern der Konfiguration!"
+
+#, fuzzy
+#~ msgid "Peer is lacking HOSTKEY configuration setting.\n"
+#~ msgstr "GNUnet Konfiguration"
+
+#, fuzzy
+#~ msgid "Could not access hostkey.\n"
+#~ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#, fuzzy
+#~ msgid "`scp' did not complete cleanly.\n"
+#~ msgstr "`%s' ist zu keinem Knoten verbunden.\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+#~ msgstr "Fehler beim Starten der Collection.\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `ssh' process.\n"
+#~ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to create hostkey.\n"
+#~ msgstr ""
+#~ "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
+#~ "in der Konfigurationsdatei an.\n"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
+#~ msgstr "Fehler beim Starten der Collection.\n"
+
+#, fuzzy
+#~ msgid "Failed to start `ssh' process.\n"
+#~ msgstr "Fehler beim Starten der Collection.\n"
+
+#, fuzzy
+#~ msgid "Error reading from gnunet-peerinfo: %s\n"
+#~ msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Malformed output from gnunet-peerinfo!\n"
+#~ msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to get hostkey!\n"
+#~ msgstr ""
+#~ "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to start GNUnet.\n"
+#~ msgstr ""
+#~ "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
+#~ "in der Konfigurationsdatei an.\n"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-arm' process.\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
+#~ msgstr "`%s' ist zu keinem Knoten verbunden.\n"
+
+#, fuzzy
+#~ msgid "Starting service %s for peer `%4s'\n"
+#~ msgstr "Collection `%s' begonnen.\n"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration directory.\n"
+#~ msgstr ""
+#~ "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
+#~ "in der Konfigurationsdatei an.\n"
+
+#, fuzzy
+#~ msgid "Terminating peer `%4s'\n"
+#~ msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Setting d->dead on peer `%4s'\n"
+#~ msgstr "Collection `%s' begonnen.\n"
+
+#, fuzzy
+#~ msgid "Failed to write new configuration to disk."
+#~ msgstr "Fehler beim Speichern der Konfiguration!"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration file.\n"
+#~ msgstr ""
+#~ "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
+#~ "in der Konfigurationsdatei an.\n"
+
+#, fuzzy
+#~ msgid "Failed to copy new configuration to remote machine."
+#~ msgstr "Fehler beim Speichern der Konfiguration!"
+
+#, fuzzy
+#~ msgid "Peers failed to connect"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+
+#, fuzzy
+#~ msgid "Failed to connect to core service of first peer!\n"
+#~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#, fuzzy
+#~ msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+#~ msgstr ""
+#~ "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein "
+#~ "Verzeichnis angeben, in dem FS Daten gespeichert werden.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "No `%s' specified in peer configuration in section `%s', cannot copy "
+#~ "friends file!\n"
+#~ msgstr ""
+#~ "Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
+#~ "gesetzt, sie wird auf %dm gesetzt.\n"
+
+#, fuzzy
+#~ msgid "Unknown topology specification, can't connect peers!\n"
+#~ msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file `%s'!\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
+#~ msgid "Could not create configuration for peer number %u on `%s'!\n"
+#~ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to find option %s in section %s!\n"
+#~ msgstr "Fehler beim Binden an UDP Port %d.\n"
+
+#, fuzzy
+#~ msgid "Invalid configuration option `%s' in section `%s'\n"
+#~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#, fuzzy
+#~ msgid "Missing configuration option `%s' in section `%s'\n"
+#~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#, fuzzy
+#~ msgid "I am host `%s'.  Read private key from `%s'.\n"
+#~ msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
+
+#, fuzzy
+#~ msgid "internal error"
+#~ msgstr "Unbekannter Fehler.\n"
+
+#, fuzzy
+#~ msgid "Got %u bytes from helper `%s'\n"
+#~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "Starting HELPER process `%s'\n"
+#~ msgstr "Collection `%s' begonnen.\n"
+
+#, fuzzy
 #~ msgid "Could not create namespace `%s'\n"
 #~ msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
@@ -6571,9 +6892,6 @@
 #~ msgid "be verbose"
 #~ msgstr "umfangreiche Meldungen ausgeben"
 
-#~ msgid "use configuration file FILENAME"
-#~ msgstr "Konfigurationsdatei FILENAME verwenden"
-
 #, fuzzy
 #~ msgid "Failed to stop service `%s'!\n"
 #~ msgstr "Fehler beim Binden an UDP Port %d.\n"
@@ -7226,10 +7544,6 @@
 #~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
 #, fuzzy
-#~ msgid "Invalid process priority `%s'\n"
-#~ msgstr "Ungültige Antwort auf `%s'.\n"
-
-#, fuzzy
 #~ msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 #~ msgstr "Unerwartete sehr große Allokierung (%u Bytes) bei %s:%d!\n"
 
@@ -8221,9 +8535,6 @@
 #~ msgid "specifies after how many MS to time-out"
 #~ msgstr "Gibt an, nach wievielen MS die Zeit abgelaufen sein soll"
 
-#~ msgid "Testing transport(s) %s\n"
-#~ msgstr "Teste Transport(e) %s\n"
-
 #~ msgid "Available transport(s): %s\n"
 #~ msgstr "Verfügbare(r) Transport(e): %s\n"
 
@@ -8613,9 +8924,6 @@
 #~ msgid "Message received from peer is invalid.\n"
 #~ msgstr "Empfangene Nachricht ist ungültig.\n"
 
-#~ msgid "Maximum number of chat clients reached.\n"
-#~ msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
-
 #~ msgid "Now %d of %d chat clients at this node.\n"
 #~ msgstr "Jetzt sind %d von %d auf diesem Knoten.\n"
 
@@ -8733,9 +9041,6 @@
 #~ msgstr ""
 #~ "Testbed konnte nicht registriert werden, Host `%s' ist nicht bekannt.\n"
 
-#~ msgid "Failed to send HTTP request to host `%s': %s\n"
-#~ msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
-
 #~ msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
 #~ msgstr "Fehler beim Senden der HTTP Anfrage `%s' an Host `%s': %s\n"
 
@@ -8948,9 +9253,6 @@
 #~ msgid "Other settings"
 #~ msgstr "Weitere Einstellungen"
 
-#~ msgid "Finish"
-#~ msgstr "Fertigstellen"
-
 #~ msgid ""
 #~ "Define the user and the group owning the GNUnet service here.\n"
 #~ "\n"
@@ -9315,9 +9617,6 @@
 #~ msgid "Joined DHT.  Press CTRL-C to leave.\n"
 #~ msgstr "Der DHT beigetreten. Drücken Sie STRG-C, um sie zu verlassen.\n"
 
-#~ msgid "`%s' failed: table not found!\n"
-#~ msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
-
 #~ msgid "sendAck failed.  Terminating connection to client.\n"
 #~ msgstr "sendAck fehlgeschlagen. Beende Verbindung zu Client.\n"
 
@@ -9522,9 +9821,6 @@
 #~ msgid "process directories recursively"
 #~ msgstr "Verzeichnisse rekursiv bearbeiten"
 
-#~ msgid "You must pass a positive number to the `%s' option.\n"
-#~ msgstr "Sie müssen eine positive Zahl zu der Option `%s' übergeben.\n"
-
 #~ msgid "Only one file or directory can be specified at a time.\n"
 #~ msgstr "Nur eine Datei oder Verzeichnis kann auf einmal angegeben werden.\n"
 
@@ -9581,13 +9877,6 @@
 #~ msgid "Option `%s' makes no sense without option `%s'."
 #~ msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'."
 
-#~ msgid ""
-#~ "\n"
-#~ "Exiting.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Abbruch.\n"
-
 #~ msgid "Updated data for %d applications.\n"
 #~ msgstr "Daten für %d Anwendungen wurden aktualisiert.\n"
 

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2012-10-31 15:10:17 UTC (rev 24637)
+++ gnunet/po/es.po     2012-10-31 15:21:37 UTC (rev 24638)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-09-27 21:17+0200\n"
+"POT-Creation-Date: 2012-10-31 13:48+0100\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:165
+#: src/arm/arm_api.c:162
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
@@ -148,84 +148,84 @@
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:332
+#: src/arm/gnunet-service-arm.c:326
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/arm/gnunet-service-arm.c:335
+#: src/arm/gnunet-service-arm.c:329
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:361
+#: src/arm/gnunet-service-arm.c:355
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/arm/gnunet-service-arm.c:393
+#: src/arm/gnunet-service-arm.c:387
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/arm/gnunet-service-arm.c:523
+#: src/arm/gnunet-service-arm.c:517
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/arm/gnunet-service-arm.c:545
+#: src/arm/gnunet-service-arm.c:539
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:559
+#: src/arm/gnunet-service-arm.c:553
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:667
+#: src/arm/gnunet-service-arm.c:661
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:878
+#: src/arm/gnunet-service-arm.c:872
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:970
+#: src/arm/gnunet-service-arm.c:965
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:975
+#: src/arm/gnunet-service-arm.c:970
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:980
+#: src/arm/gnunet-service-arm.c:975
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:986
+#: src/arm/gnunet-service-arm.c:981
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-service-arm.c:1021
+#: src/arm/gnunet-service-arm.c:1016
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1214
+#: src/arm/gnunet-service-arm.c:1210
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:1225
+#: src/arm/gnunet-service-arm.c:1221
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1239
+#: src/arm/gnunet-service-arm.c:1235
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -234,17 +234,44 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats.c:93
-#, fuzzy
-msgid "list information for the given peer"
-msgstr "Imprime información de los pares de GNUnet."
+#: src/ats-tool/gnunet-ats.c:67
+#, c-format
+msgid ""
+"Peer `%s' plugin `%s', address `%s', bandwidth out: %u Bytes/s, bandwidth in "
+"%u Bytes/s\n"
+msgstr ""
 
-#: src/ats/gnunet-ats.c:96
+#: src/ats-tool/gnunet-ats.c:129
+#, c-format
+msgid "%u address resolutions had a timeout\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:131
+#, c-format
+msgid "ATS returned results for %u addresses\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:142 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/ats-tool/gnunet-ats.c:149
+#, fuzzy, c-format
+msgid "Cannot connect to ATS service, exiting...\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/ats-tool/gnunet-ats.c:194
 #, fuzzy
-msgid "list information for all peers"
-msgstr "Imprime información de los pares de GNUnet."
+msgid "do not resolve IP addresses to hostnames"
+msgstr "GNUnet usa ahora la dirección IP %u.%u.%u.%u.\n"
 
-#: src/ats/gnunet-ats.c:105
+#: src/ats-tool/gnunet-ats.c:197
+msgid "monitor mode"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:206
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Imprime información de los pares de GNUnet."
@@ -254,7 +281,7 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/core/core_api.c:757
+#: src/core/core_api.c:755
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -279,7 +306,7 @@
 msgid "Disconnected from"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:818
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:825
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Argumentos en la linea de comandos inválidos:\n"
@@ -371,7 +398,7 @@
 msgstr "# mensajes defragmentados"
 
 #: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:812
+#: src/transport/gnunet-service-transport_validation.c:813
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -399,7 +426,7 @@
 msgstr "# mensajes PONG encriptados recibidos"
 
 #: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1108
+#: src/transport/gnunet-service-transport_validation.c:1109
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -460,7 +487,7 @@
 msgstr "# bytes desencriptados"
 
 #: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
-#: src/peerinfo-tool/gnunet-peerinfo.c:824
+#: src/peerinfo-tool/gnunet-peerinfo.c:831
 #: src/transport/gnunet-service-transport.c:627
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
@@ -489,14 +516,14 @@
 #: src/core/gnunet-service-core_sessions.c:269
 #: 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/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
 #: src/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
-#: src/transport/gnunet-service-transport_neighbours.c:873
+#: src/transport/gnunet-service-transport_neighbours.c:872
 #: src/transport/gnunet-service-transport_neighbours.c:1089
 #: src/transport/gnunet-service-transport_neighbours.c:1098
-#: src/transport/gnunet-service-transport_neighbours.c:2620
-#: src/transport/gnunet-service-transport_neighbours.c:2882
+#: src/transport/gnunet-service-transport_neighbours.c:2635
+#: src/transport/gnunet-service-transport_neighbours.c:2897
 #, fuzzy
 msgid "# peers connected"
 msgstr "# de pares conectados"
@@ -561,9 +588,9 @@
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:608
-#: src/include/gnunet_common.h:615
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ecc.c:53
+#: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
+#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
@@ -576,17 +603,17 @@
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:410
+#: src/datacache/plugin_datacache_sqlite.c:405
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:443
-#: src/datastore/plugin_datastore_sqlite.c:406
-#: src/namestore/plugin_namestore_sqlite.c:369
+#: src/datacache/plugin_datacache_sqlite.c:438
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namestore/plugin_namestore_sqlite.c:362
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:450
+#: src/datacache/plugin_datacache_sqlite.c:445
 #, fuzzy, c-format
 msgid "Failed to close statement %p: %d\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
@@ -595,24 +622,24 @@
 msgid "Template datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:305
+#: src/datastore/datastore_api.c:310
 #, fuzzy
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/datastore/datastore_api.c:388
+#: src/datastore/datastore_api.c:393
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:432
+#: src/datastore/datastore_api.c:437
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:459
+#: src/datastore/datastore_api.c:465
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:477
+#: src/datastore/datastore_api.c:483
 #, fuzzy
 msgid "# Requests dropped from datastore queue"
 msgstr "# Anuncios de los pares recibidos"
@@ -621,72 +648,68 @@
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:548
-msgid "# reconnected to DATASTORE"
-msgstr ""
-
-#: src/datastore/datastore_api.c:612
+#: src/datastore/datastore_api.c:608
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/datastore/datastore_api.c:633
+#: src/datastore/datastore_api.c:630
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# bytes en la base de datos"
 
-#: src/datastore/datastore_api.c:764
+#: src/datastore/datastore_api.c:762
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/datastore_api.c:778
+#: src/datastore/datastore_api.c:776
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
+#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/datastore/datastore_api.c:800
+#: src/datastore/datastore_api.c:798
 #, fuzzy
 msgid "# status messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:869
+#: src/datastore/datastore_api.c:867
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:936
+#: src/datastore/datastore_api.c:934
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:997
+#: src/datastore/datastore_api.c:995
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1054
+#: src/datastore/datastore_api.c:1052
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:1118
+#: src/datastore/datastore_api.c:1116
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:1163
+#: src/datastore/datastore_api.c:1161
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1221
+#: src/datastore/datastore_api.c:1220
 #, fuzzy
 msgid "# Results received"
 msgstr "# bytes recibidos por TCP"
@@ -699,7 +722,7 @@
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1409
+#: src/datastore/datastore_api.c:1410
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -883,7 +906,7 @@
 "Fallo al recibir la respuesta de gnunetd.\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:654
+#: src/namestore/plugin_namestore_postgres.c:652
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -892,30 +915,30 @@
 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:258
-#: src/namestore/plugin_namestore_sqlite.c:228
+#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/namestore/plugin_namestore_sqlite.c:223
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:653
+#: src/datastore/plugin_datastore_sqlite.c:648
 #, 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:1137
+#: src/datastore/plugin_datastore_sqlite.c:1132
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1156
+#: src/datastore/plugin_datastore_sqlite.c:1151
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1196
-#: src/namestore/plugin_namestore_sqlite.c:834
+#: src/datastore/plugin_datastore_sqlite.c:1191
+#: src/namestore/plugin_namestore_sqlite.c:827
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "base de datos sqlite"
@@ -971,7 +994,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:750
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:733
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:1033
@@ -1278,23 +1301,38 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
+#: src/dns/dnsparser.c:110
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/dns/dnsparser.c:584
+#, fuzzy, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
 #: 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
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/gns/gnunet-service-gns_resolver.c:1669
 #, 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
+#: src/dns/dnsstub.c:299
+#, fuzzy, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+
+#: src/dns/dnsstub.c:368
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:430
+#: src/dns/dnsstub.c:440
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -1323,58 +1361,59 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:499
+#: src/dns/gnunet-service-dns.c:512
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:639
+#: src/dns/gnunet-service-dns.c:659
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:821
+#: src/dns/gnunet-service-dns.c:845
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:892
+#: src/dns/gnunet-service-dns.c:924
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1005
+#: src/dns/gnunet-service-dns.c:1039
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1021
+#: src/dns/gnunet-service-dns.c:1055
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1030
+#: src/dns/gnunet-service-dns.c:1064
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1039
+#: src/dns/gnunet-service-dns.c:1073
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1104
+#: src/dns/gnunet-service-dns.c:1140
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dns/gnunet-service-dns.c:1180 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1216 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1245 src/exit/gnunet-daemon-exit.c:3032
+#: src/dns/gnunet-service-dns.c:1281 src/exit/gnunet-daemon-exit.c:3007
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1266
-msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
-msgstr ""
+#: src/dns/gnunet-service-dns.c:1302
+#, fuzzy
+msgid "need a valid IPv4 or IPv6 address\n"
+msgstr "Argumento no válido: '%s'\n"
 
-#: src/dv/dv_api.c:179
+#: src/dv/dv_api.c:189
 #, fuzzy
 msgid "Failed to connect to the dv service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
@@ -1554,35 +1593,35 @@
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3048
+#: src/exit/gnunet-daemon-exit.c:3023
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3056
+#: src/exit/gnunet-daemon-exit.c:3031
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3063
+#: src/exit/gnunet-daemon-exit.c:3038
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3069
+#: src/exit/gnunet-daemon-exit.c:3044
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3050 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3241
+#: src/exit/gnunet-daemon-exit.c:3216
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1604,113 +1643,113 @@
 msgid "# messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/fragmentation/fragmentation.c:203
+#: src/fragmentation/fragmentation.c:208
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/fragmentation/fragmentation.c:206
+#: src/fragmentation/fragmentation.c:211
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/fragmentation/fragmentation.c:232
+#: src/fragmentation/fragmentation.c:237
 #, fuzzy
 msgid "# fragments wrap arounds"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/fragmentation/fragmentation.c:273
+#: src/fragmentation/fragmentation.c:281
 msgid "# messages fragmented"
 msgstr "# mensajes fragmentados"
 
-#: src/fragmentation/fragmentation.c:276
+#: src/fragmentation/fragmentation.c:284
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:363
+#: src/fragmentation/fragmentation.c:405
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fragmentation/fragmentation.c:369
+#: src/fragmentation/fragmentation.c:411
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:393
+#: src/fragmentation/fragmentation.c:435
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:450
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:500
+#: src/fs/fs_api.c:459
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:506
+#: src/fs/fs_api.c:465
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1087
+#: src/fs/fs_api.c:1046
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:1546
+#: src/fs/fs_api.c:1505
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1588
+#: src/fs/fs_api.c:1547
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1604
+#: src/fs/fs_api.c:1563
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2254
+#: src/fs/fs_api.c:2213
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2264
+#: src/fs/fs_api.c:2223
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2389 src/fs/fs_api.c:2629
+#: src/fs/fs_api.c:2348 src/fs/fs_api.c:2588
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2406
+#: src/fs/fs_api.c:2365
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2419 src/fs/fs_api.c:2438 src/fs/fs_api.c:2922
+#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2397 src/fs/fs_api.c:2881
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2620
+#: src/fs/fs_api.c:2579
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2866
+#: src/fs/fs_api.c:2825
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2960
+#: src/fs/fs_api.c:2919
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1771,12 +1810,12 @@
 msgid "internal error decoding tree"
 msgstr "=\tError leyendo el directorio.\n"
 
-#: src/fs/fs_download.c:1920
+#: src/fs/fs_download.c:1927
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/fs/fs_getopt.c:191
+#: src/fs/fs_getopt.c:192
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2090,35 +2129,35 @@
 msgid "Failed to run `%s'\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/fs/gnunet-auto-share.c:684
+#: src/fs/gnunet-auto-share.c:686
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 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-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
 #: 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:684
+#: src/fs/gnunet-auto-share.c:741 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:687
+#: src/fs/gnunet-auto-share.c:744 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:711
+#: src/fs/gnunet-auto-share.c:747 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-auto-share.c:750 src/fs/gnunet-pseudonym.c:304
 #: src/fs/gnunet-publish.c:718
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:767
+#: src/fs/gnunet-auto-share.c:770
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -2256,7 +2295,7 @@
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:161
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:198
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
@@ -2533,155 +2572,155 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:240
+#: src/fs/gnunet-service-fs.c:245
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
+#: src/fs/gnunet-service-fs.c:306 src/fs/gnunet-service-fs.c:496
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/fs/gnunet-service-fs.c:588 src/hostlist/gnunet-daemon-hostlist.c:297
 #: 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:704
+#: src/fs/gnunet-service-fs_cp.c:711
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:708
+#: src/fs/gnunet-service-fs_cp.c:715
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:744
+#: src/fs/gnunet-service-fs_cp.c:751
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:750
+#: src/fs/gnunet-service-fs_cp.c:757
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:1333
+#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1345
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:867
+#: src/fs/gnunet-service-fs_cp.c:875
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:928
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:928
+#: src/fs/gnunet-service-fs_cp.c:936
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:942
+#: src/fs/gnunet-service-fs_cp.c:950
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:980
+#: src/fs/gnunet-service-fs_cp.c:988
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1047
+#: src/fs/gnunet-service-fs_cp.c:1056
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1071
+#: src/fs/gnunet-service-fs_cp.c:1081
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1081
+#: src/fs/gnunet-service-fs_cp.c:1091
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1160
+#: src/fs/gnunet-service-fs_cp.c:1170
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1194
+#: src/fs/gnunet-service-fs_cp.c:1204
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1216
+#: src/fs/gnunet-service-fs_cp.c:1227
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1276
+#: src/fs/gnunet-service-fs_cp.c:1288
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1302
+#: src/fs/gnunet-service-fs_cp.c:1314
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:1343
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1687
+#: src/fs/gnunet-service-fs_cp.c:1713
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_indexing.c:120
-#: src/fs/gnunet-service-fs_indexing.c:175
+#: src/fs/gnunet-service-fs_indexing.c:130
+#: src/fs/gnunet-service-fs_indexing.c:181
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:136
+#: src/fs/gnunet-service-fs_indexing.c:142
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Error creando usuario"
 
-#: src/fs/gnunet-service-fs_indexing.c:226
+#: src/fs/gnunet-service-fs_indexing.c:237
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:264
+#: src/fs/gnunet-service-fs_indexing.c:275
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:479
+#: src/fs/gnunet-service-fs_indexing.c:477
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:537
+#: src/fs/gnunet-service-fs_indexing.c:542
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:552
+#: src/fs/gnunet-service-fs_indexing.c:557
 #, 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:554
+#: src/fs/gnunet-service-fs_indexing.c:559
 #, fuzzy
 msgid "not indexed"
 msgstr "El desindexado falló"
 
-#: src/fs/gnunet-service-fs_indexing.c:569
+#: src/fs/gnunet-service-fs_indexing.c:574
 #, 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"
@@ -2706,141 +2745,141 @@
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:265
+#: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:391
+#: src/fs/gnunet-service-fs_pe.c:397
 msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:420
+#: src/fs/gnunet-service-fs_pe.c:426
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/fs/gnunet-service-fs_pe.c:469
+#: src/fs/gnunet-service-fs_pe.c:475
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:476
+#: src/fs/gnunet-service-fs_pe.c:483
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pe.c:538
+#: src/fs/gnunet-service-fs_pe.c:543
 #, fuzzy
 msgid "# requests merged"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pe.c:544
+#: src/fs/gnunet-service-fs_pe.c:551
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:684
-#: src/fs/gnunet-service-fs_pe.c:751
+#: src/fs/gnunet-service-fs_pe.c:605 src/fs/gnunet-service-fs_pe.c:689
+#: src/fs/gnunet-service-fs_pe.c:757
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:285
+#: src/fs/gnunet-service-fs_pr.c:293
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:618
+#: src/fs/gnunet-service-fs_pr.c:385 src/fs/gnunet-service-fs_pr.c:639
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:781
+#: src/fs/gnunet-service-fs_pr.c:802
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# bytes recibidos por TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:810
+#: src/fs/gnunet-service-fs_pr.c:834
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:824
+#: src/fs/gnunet-service-fs_pr.c:849
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:837
+#: src/fs/gnunet-service-fs_pr.c:862
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:955
+#: src/fs/gnunet-service-fs_pr.c:983
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:982
+#: src/fs/gnunet-service-fs_pr.c:1010
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1017
+#: src/fs/gnunet-service-fs_pr.c:1045
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1108
+#: src/fs/gnunet-service-fs_pr.c:1136
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1128
+#: src/fs/gnunet-service-fs_pr.c:1156
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1174
+#: src/fs/gnunet-service-fs_pr.c:1203
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1218
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1197
+#: src/fs/gnunet-service-fs_pr.c:1227
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1242
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1224
+#: src/fs/gnunet-service-fs_pr.c:1256
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1237
+#: src/fs/gnunet-service-fs_pr.c:1269
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1274
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1269 src/fs/gnunet-service-fs_pr.c:1309
-#: src/fs/gnunet-service-fs_pr.c:1447
+#: src/fs/gnunet-service-fs_pr.c:1301 src/fs/gnunet-service-fs_pr.c:1341
+#: src/fs/gnunet-service-fs_pr.c:1481
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1327
+#: src/fs/gnunet-service-fs_pr.c:1359
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1370
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1457
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1542
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -2884,7 +2923,7 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:575
+#: src/gns/gns_api.c:598
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
@@ -2910,7 +2949,7 @@
 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)"
+msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
 #: src/gns/gnunet-dns2gns.c:676
@@ -2925,39 +2964,39 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:182
+#: src/gns/gnunet-gns.c:221
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:293
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid "Please specify lookup, shorten or authority operation!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:315
+#: src/gns/gnunet-gns.c:356
 #, fuzzy
 msgid "try to shorten a given name"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:318
+#: src/gns/gnunet-gns.c:359
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:321
+#: src/gns/gnunet-gns.c:362
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:324
+#: src/gns/gnunet-gns.c:365
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "especifica la prioridad del contenido"
 
-#: src/gns/gnunet-gns.c:327
+#: src/gns/gnunet-gns.c:368
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:341
+#: src/gns/gnunet-gns.c:381
 msgid "GNUnet GNS access tool"
 msgstr ""
 
@@ -3009,7 +3048,7 @@
 msgid "Failed to connect to namestore\n"
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/gns/gnunet-gns-fcfsd.c:936 src/gns/gnunet-gns-proxy.c:2887
+#: src/gns/gnunet-gns-fcfsd.c:936 src/gns/gnunet-gns-proxy.c:2857
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Falló al comenzar la recolección.\n"
@@ -3018,38 +3057,48 @@
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2528
+#: src/gns/gnunet-gns-proxy.c:2494
 #, 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:2556
+#: src/gns/gnunet-gns-proxy.c:2522
 #, 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:3564
+#: src/gns/gnunet-gns-proxy.c:3510
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3567
+#: src/gns/gnunet-gns-proxy.c:3513
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3582
+#: src/gns/gnunet-gns-proxy.c:3525
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:401
+#: src/gns/gnunet-service-gns.c:486
 #, c-format
 msgid "Records for name `%s' in zone %s too large to fit into DHT"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1197
+#: src/gns/gnunet-service-gns.c:1216
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Fallo al conectarse a gnunetd"
 
+#: src/gns/gnunet-service-gns.c:1277
+#, fuzzy
+msgid "Could not connect to DHT!\n"
+msgstr "Imposible conectar con gnunetd.\n"
+
+#: src/gns/gnunet-service-gns.c:1288
+#, fuzzy
+msgid "Unable to initialize resolver!\n"
+msgstr "Imposible inicializar SQLite.\n"
+
 #: src/hello/gnunet-hello.c:122
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3131,178 +3180,142 @@
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# saludos descargados vía HTTP"
 
-#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
-#, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:473 src/hostlist/hostlist-client.c:683
-#: 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:994
-#: src/transport/plugin_transport_http_client.c:1009
+#: src/hostlist/hostlist-client.c:469 src/hostlist/hostlist-client.c:680
+#: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
+#: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
+#: src/hostlist/hostlist-client.c:958 src/hostlist/hostlist-client.c:963
+#: src/transport/plugin_transport_http_client.c:1026
+#: src/transport/plugin_transport_http_client.c:1041
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1325
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:623
+#: src/hostlist/hostlist-client.c:619
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/hostlist-client.c:661
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/hostlist-client.c:799
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/hostlist-client.c:813
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/hostlist-client.c:833
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
 "kbps.\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:839
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
 "kbps.\n"
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/hostlist-client.c:847
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/hostlist-client.c:900
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/hostlist-client.c:908
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
+#: src/hostlist/hostlist-client.c:1035 src/hostlist/hostlist-client.c:1498
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1046
+#: src/hostlist/hostlist-client.c:1043
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1084
-msgid "Scheduled saving of hostlists\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1088
-#, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127
+#: src/hostlist/hostlist-client.c:1107 src/hostlist/hostlist-client.c:1123
 #, fuzzy
 msgid "# active connections"
 msgstr "Configuración de GNUnet"
 
-#: src/hostlist/hostlist-client.c:1242
-#, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
-msgstr ""
-
 #: src/hostlist/hostlist-client.c:1273
 #, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1279
-#, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1283
-#, c-format
-msgid "Hostlist file `%s' is not existing\n"
-msgstr ""
+#: src/hostlist/hostlist-client.c:1277
+#, fuzzy, c-format
+msgid "Hostlist file `%s' does not exist\n"
+msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1288
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:1327
+#: src/hostlist/hostlist-client.c:1321
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/hostlist-client.c:1323
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1362
-#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/hostlist-client.c:1368
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/hostlist-client.c:1373
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/hostlist-client.c:1397 src/hostlist/hostlist-client.c:1414
 #, fuzzy, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error creando usuario"
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/hostlist-client.c:1409
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1470
+#: src/hostlist/hostlist-client.c:1463
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1473
-#, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1482
+#: src/hostlist/hostlist-client.c:1475
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1494
+#: src/hostlist/hostlist-client.c:1487
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1498
+#: src/hostlist/hostlist-client.c:1491
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
@@ -3342,10 +3355,6 @@
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:273
-msgid "Sending 100 CONTINUE reply\n"
-msgstr ""
-
 #: src/hostlist/hostlist-server.c:279
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
@@ -3428,28 +3437,153 @@
 msgid "help text"
 msgstr "texto de ayuda para -t"
 
-#: src/mesh/gnunet-service-mesh.c:7703
+#: src/mesh/gnunet-regex-profiler.c:1126
+#: src/testbed/gnunet-testbed-profiler.c:323
+msgid "An operation has failed while starting peers\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1192
+#: src/testbed/gnunet-testbed-profiler.c:390
+#, fuzzy, c-format
+msgid "Creating a peer failed. Error: %s\n"
+msgstr ""
+"\n"
+"Error subiendo el fichero %s\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1306
+#: src/testbed/gnunet-testbed-profiler.c:495
+msgid "An operation has failed while starting slaves\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1359
+msgid "An operation has failed while linking\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1486
+#: src/testbed/gnunet-testbed-profiler.c:597
+#, c-format
+msgid "Host registration failed for a host. Error: %s\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1566
+#: src/testbed/gnunet-testbed-profiler.c:676
+msgid "Unable to connect to master controller -- Check config\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1663
+#, c-format
+msgid "No hosts-file specified on command line. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1668
+#: src/regex/gnunet-regex-simulation-profiler.c:498
+#, c-format
+msgid "No policy directory specified on command line. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1674
+#, c-format
+msgid "No hosts loaded. Need at least one host\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1681
+#: src/testbed/gnunet-testbed-profiler.c:723
+#, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1688
+#: src/testbed/gnunet-testbed-profiler.c:730
+#, fuzzy, c-format
+msgid "Exiting\n"
+msgstr ""
+"\n"
+"Saliendo.\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1694
+#, fuzzy, c-format
+msgid "No configuration file given. Exiting\n"
+msgstr "usa el fichero de configuración FILENAME"
+
+#: src/mesh/gnunet-regex-profiler.c:1711
+#: src/regex/gnunet-regex-simulation-profiler.c:504
+#, c-format
+msgid "Specified policies directory does not exist. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1718
+#, c-format
+msgid "No search strings file given. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1724
+#, c-format
+msgid ""
+"Error loading search strings. Given file does not contain enough strings. "
+"Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1730
+#, fuzzy, c-format
+msgid "Error loading search strings. Exiting.\n"
+msgstr "Error abandonando DHT.\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1764
+#, fuzzy
+msgid "name of the file for writing statistics"
+msgstr "Fallo en las estadísticas del tráfico.\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1767
+msgid "create FACTOR times number of peers random links"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1770
+#: src/testbed/gnunet-testbed-profiler.c:800
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1773
+msgid "wait TIMEOUT before considering a string match as failed"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1776
+msgid "wait DELAY before starting string search"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1779
+msgid "number of search strings to read from search strings file"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1782
+#: src/regex/gnunet-regex-simulation-profiler.c:555
+msgid "maximum path compression length"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1794
+msgid "Profiler for regex/mesh"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:7971
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7908
+#: src/mesh/gnunet-service-mesh.c:8176
 #, 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
+#: src/mesh/gnunet-service-mesh.c:8265 src/mesh/gnunet-service-mesh.c:8277
+#: src/mesh/gnunet-service-mesh.c:8289 src/mesh/gnunet-service-mesh.c:8302
+#: src/mesh/gnunet-service-mesh.c:8317 src/mesh/gnunet-service-mesh.c:8329
+#: src/mesh/gnunet-service-mesh.c:8341 src/mesh/gnunet-service-mesh.c:8353
 #, fuzzy, c-format
-msgid "Mesh service is lacking key configuration settings (%s).  Exiting.\n"
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/mesh/gnunet-service-mesh.c:8093 src/mesh/gnunet-service-mesh.c:8104
+#: src/mesh/gnunet-service-mesh.c:8365 src/mesh/gnunet-service-mesh.c:8376
 #, fuzzy, c-format
 msgid ""
-"Mesh service is lacking key configuration settings (%s). Using default "
-"(%u).\n"
+"%s service is lacking key configuration settings (%s). Using default (%u).\n"
 msgstr "Configuración de GNUnet"
 
 #: src/mysql/mysql.c:174
@@ -3542,16 +3676,11 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#: src/peerinfo-tool/gnunet-peerinfo.c:882
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: 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:625
 #, fuzzy, c-format
 msgid "Using default zone file `%s'\n"
@@ -3680,6 +3809,46 @@
 msgid "Protocol error"
 msgstr ""
 
+#: src/namestore/namestore_common.c:494 src/namestore/namestore_common.c:634
+#, fuzzy, c-format
+msgid "Unsupported record type %d\n"
+msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
+
+#: src/namestore/namestore_common.c:501
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/namestore/namestore_common.c:524
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/namestore/namestore_common.c:547
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/namestore/namestore_common.c:565
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/namestore/namestore_common.c:578
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/namestore/namestore_common.c:599
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
+
+#: src/namestore/namestore_common.c:625
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
+
 #: src/namestore/plugin_namestore_postgres.c:95
 #, fuzzy
 msgid "Failed to create indices\n"
@@ -3694,33 +3863,32 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:799
+#: src/nat/nat.c:795
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:844
+#: src/nat/nat.c:840
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/nat/nat.c:1111
-#, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "Imposible guardar la configuración"
+#: src/nat/nat.c:1108
+msgid "malformed"
+msgstr ""
 
-#: src/nat/nat.c:1177 src/nat/nat.c:1187
+#: src/nat/nat.c:1173 src/nat/nat.c:1183
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1317
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1332
+#: src/nat/nat.c:1328
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -3900,46 +4068,46 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fallo en %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:834
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 #, 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"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:840
+#: src/peerinfo-tool/gnunet-peerinfo.c:847
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:899
+#: src/peerinfo-tool/gnunet-peerinfo.c:906
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:936
+#: src/peerinfo-tool/gnunet-peerinfo.c:943
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:939
+#: src/peerinfo-tool/gnunet-peerinfo.c:946
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:942
+#: src/peerinfo-tool/gnunet-peerinfo.c:949
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:945
+#: src/peerinfo-tool/gnunet-peerinfo.c:952
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:948
+#: src/peerinfo-tool/gnunet-peerinfo.c:955
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:951
+#: src/peerinfo-tool/gnunet-peerinfo.c:958
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:961
+#: src/peerinfo-tool/gnunet-peerinfo.c:968
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Imprime información de los pares de GNUnet."
@@ -4039,6 +4207,14 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/regex/gnunet-regex-simulation-profiler.c:552
+msgid "name of the table to write DFAs"
+msgstr ""
+
+#: src/regex/gnunet-regex-simulation-profiler.c:567
+msgid "Profiler for regex library"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:271
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -4049,61 +4225,132 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/statistics/gnunet-statistics.c:120
+#: src/statistics/gnunet-statistics.c:131
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/statistics/gnunet-statistics.c:193
+#: src/statistics/gnunet-statistics.c:133
+#, fuzzy, c-format
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgstr "Fallo en las estadísticas del tráfico.\n"
+
+#: src/statistics/gnunet-statistics.c:177
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/statistics/gnunet-statistics.c:183
 #, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:231
+#, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:201
+#: src/statistics/gnunet-statistics.c:239
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/statistics/gnunet-statistics.c:221
+#: src/statistics/gnunet-statistics.c:258
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:224
+#: src/statistics/gnunet-statistics.c:261
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:227
+#: src/statistics/gnunet-statistics.c:264
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:230
+#: src/statistics/gnunet-statistics.c:267
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:233
+#: src/statistics/gnunet-statistics.c:270
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:244
+#: src/statistics/gnunet-statistics.c:273
+msgid "connect to remote host"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:276
+msgid "port for remote host"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:289
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
-#: src/statistics/statistics_api.c:456
+#: src/statistics/statistics_api.c:511
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/statistics/statistics_api.c:999
+#: src/statistics/statistics_api.c:1053
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/testbed_api.c:252
+#: src/testbed/gnunet-testbed-profiler.c:705
+#, c-format
+msgid "No hosts-file specified on command line\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:716
+#, c-format
+msgid "No hosts loaded. Need atleast one host\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:779
+msgid "Only `CLIQUE' and `RANDOM' are permitted.\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:794
+msgid "create COUNT number of peers"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:797
+msgid "create COUNT number of random links"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:803
+msgid ""
+"Try to acheive TOPOLOGY. This options takes either CLIQUE or RANDOM. For "
+"CLIQUE the parameter -n is ignored. The default is to acheive a random graph "
+"topology."
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:818
+msgid "Profiler for testbed"
+msgstr ""
+
+#: src/testbed/testbed_api.c:325
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
+#: src/testbed/testbed_api_hosts.c:326
+#, fuzzy, c-format
+msgid "Hosts file %s not found\n"
+msgstr "'%s' falló: ¡tabla no encontrada!\n"
+
+#: src/testbed/testbed_api_hosts.c:334
+#, fuzzy, c-format
+msgid "Hosts file %s has no data\n"
+msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
+
+#: src/testbed/testbed_api_hosts.c:341
+#, fuzzy, c-format
+msgid "Hosts file %s cannot be read\n"
+msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
+
 #: src/testbed/testbed_api_testbed.c:271
 msgid "Some operations are still pending. Cancelling them\n"
 msgstr ""
@@ -4162,49 +4409,49 @@
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:509
+#: src/testing/testing.c:518
 #, 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:518
+#: src/testing/testing.c:528
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Error descargando: %s\n"
 
-#: src/testing/testing.c:829
+#: src/testing/testing.c:839
 #, 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:840
+#: src/testing/testing.c:850
 #, 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:854
+#: src/testing/testing.c:864
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/testing/testing.c:887
+#: src/testing/testing.c:897
 #, 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:905
+#: src/testing/testing.c:915
 #, 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:966
+#: src/testing/testing.c:976
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:1129
+#: src/testing/testing.c:1140
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
@@ -4340,7 +4587,7 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:513
-#: src/transport/gnunet-service-transport_blacklist.c:750
+#: src/transport/gnunet-service-transport_blacklist.c:751
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -4368,26 +4615,26 @@
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:352
+#: src/transport/gnunet-service-transport_clients.c:353
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:357
+#: src/transport/gnunet-service-transport_clients.c:358
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport_clients.c:509
+#: src/transport/gnunet-service-transport_clients.c:510
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:637
+#: src/transport/gnunet-service-transport_clients.c:651
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:688
+#: src/transport/gnunet-service-transport_clients.c:702
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -4401,111 +4648,111 @@
 msgid "# DISCONNECT messages sent"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1157
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1170
+#: src/transport/gnunet-service-transport_neighbours.c:1507
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1162
+#: src/transport/gnunet-service-transport_neighbours.c:1175
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1180
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1224
+#: src/transport/gnunet-service-transport_neighbours.c:1237
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1266
+#: src/transport/gnunet-service-transport_neighbours.c:1279
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1290
+#: src/transport/gnunet-service-transport_neighbours.c:1303
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1298
+#: src/transport/gnunet-service-transport_neighbours.c:1311
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1335
+#: src/transport/gnunet-service-transport_neighbours.c:1348
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1344
+#: src/transport/gnunet-service-transport_neighbours.c:1357
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1400
+#: src/transport/gnunet-service-transport_neighbours.c:1413
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1434
+#: src/transport/gnunet-service-transport_neighbours.c:1447
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1450
+#: src/transport/gnunet-service-transport_neighbours.c:1463
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2596
+#: src/transport/gnunet-service-transport_neighbours.c:2611
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2611
-#: src/transport/gnunet-service-transport_neighbours.c:2645
+#: src/transport/gnunet-service-transport_neighbours.c:2626
+#: src/transport/gnunet-service-transport_neighbours.c:2660
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2658
+#: src/transport/gnunet-service-transport_neighbours.c:2673
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2691
+#: src/transport/gnunet-service-transport_neighbours.c:2706
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2875
+#: src/transport/gnunet-service-transport_neighbours.c:2890
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# de pares conectados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2930
+#: src/transport/gnunet-service-transport_neighbours.c:2945
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2944
+#: src/transport/gnunet-service-transport_neighbours.c:2959
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2975
+#: src/transport/gnunet-service-transport_neighbours.c:2990
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2986
+#: src/transport/gnunet-service-transport_neighbours.c:3001
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3017
+#: src/transport/gnunet-service-transport_neighbours.c:3032
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3112
+#: src/transport/gnunet-service-transport_neighbours.c:3127
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# Anuncios de los pares recibidos"
@@ -4534,33 +4781,33 @@
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:807
+#: src/transport/gnunet-service-transport_validation.c:808
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-service-transport_validation.c:872
+#: src/transport/gnunet-service-transport_validation.c:873
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1001
+#: src/transport/gnunet-service-transport_validation.c:1002
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1010
+#: src/transport/gnunet-service-transport_validation.c:1011
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1135
+#: src/transport/gnunet-service-transport_validation.c:1136
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1164
+#: src/transport/gnunet-service-transport_validation.c:1166
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1218
+#: src/transport/gnunet-service-transport_validation.c:1220
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Imposible obtener la dirección del par '%s'.\n"
@@ -4656,42 +4903,42 @@
 msgstr "Fallo al conectar a gnunetd.\n"
 
 #: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2513
+#: src/transport/plugin_transport_http_server.c:2528
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2281
+#: src/transport/plugin_transport_http_server.c:2296
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
 #: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2313 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2328 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
 #: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2330 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2345 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
 #: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2441
+#: src/transport/plugin_transport_http_server.c:2456
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2609
+#: src/transport/plugin_transport_http_server.c:2624
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "¡Advertencias de la red desconectadas por configuración!\n"
 
 #: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2620
+#: src/transport/plugin_transport_http_server.c:2635
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
@@ -4715,7 +4962,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2702
+#: src/transport/plugin_transport_http_server.c:2717
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
@@ -4724,99 +4971,99 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1419
+#: src/transport/plugin_transport_http_client.c:1463
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1550
-#: src/transport/plugin_transport_http_server.c:2826
+#: src/transport/plugin_transport_http_client.c:1594
+#: src/transport/plugin_transport_http_server.c:2841
 #, 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
+#: src/transport/plugin_transport_http_client.c:1619
+#: src/transport/plugin_transport_http_server.c:2900
 #, 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
+#: src/transport/plugin_transport_http_client.c:1647
+#: src/transport/plugin_transport_http_server.c:2747
 #, 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
+#: src/transport/plugin_transport_http_server.c:1317
 #, 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
+#: src/transport/plugin_transport_http_server.c:1575
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1568
+#: src/transport/plugin_transport_http_server.c:1583
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1869
+#: src/transport/plugin_transport_http_server.c:1884
 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:1893
+#: src/transport/plugin_transport_http_server.c:1908
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2588
+#: src/transport/plugin_transport_http_server.c:2603
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2602
+#: src/transport/plugin_transport_http_server.c:2617
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2627
+#: src/transport/plugin_transport_http_server.c:2642
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2642
+#: src/transport/plugin_transport_http_server.c:2657
 #, 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
+#: src/transport/plugin_transport_http_server.c:2667
 #, 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
+#: src/transport/plugin_transport_http_server.c:2688
 #, 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
+#: src/transport/plugin_transport_http_server.c:2698
 #, 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
+#: src/transport/plugin_transport_http_server.c:2733
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Probando transporte(s) %s\n"
@@ -4875,16 +5122,16 @@
 #: src/transport/plugin_transport_tcp.c:856
 #: src/transport/plugin_transport_tcp.c:906
 #: src/transport/plugin_transport_tcp.c:992
-#: src/transport/plugin_transport_tcp.c:1130
-#: src/transport/plugin_transport_tcp.c:1147
+#: src/transport/plugin_transport_tcp.c:1132
+#: src/transport/plugin_transport_tcp.c:1149
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes enviados por TCP"
 
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
-#: src/transport/plugin_transport_tcp.c:1807
-#: src/transport/plugin_transport_tcp.c:2423
+#: src/transport/plugin_transport_tcp.c:1816
+#: src/transport/plugin_transport_tcp.c:2435
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# claves de la sesión aceptadas"
@@ -4904,49 +5151,49 @@
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:1336
+#: src/transport/plugin_transport_tcp.c:1341
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1447
+#: src/transport/plugin_transport_tcp.c:1456
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1848
+#: src/transport/plugin_transport_tcp.c:1857
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2019
+#: src/transport/plugin_transport_tcp.c:2031
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2089
+#: src/transport/plugin_transport_tcp.c:2101
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2325 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2327
+#: src/transport/plugin_transport_tcp.c:2339
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/transport/plugin_transport_tcp.c:2411
+#: src/transport/plugin_transport_tcp.c:2423
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2415
+#: src/transport/plugin_transport_tcp.c:2427
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2419
+#: src/transport/plugin_transport_tcp.c:2431
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -4966,14 +5213,14 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1965
+#: src/transport/plugin_transport_udp.c:2317
 #, 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:1979
+#: src/transport/plugin_transport_udp.c:2331
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -4981,103 +5228,103 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2192
+#: src/transport/plugin_transport_udp.c:2572
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_udp.c:2268
+#: src/transport/plugin_transport_udp.c:2648
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2311
+#: src/transport/plugin_transport_udp.c:2691
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/transport/plugin_transport_unix.c:1355
+#: src/transport/plugin_transport_unix.c:1333
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_wlan.c:560
+#: src/transport/plugin_transport_wlan.c:580
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:579
+#: src/transport/plugin_transport_wlan.c:599
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:625
-#: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:1720
+#: src/transport/plugin_transport_wlan.c:645
+#: src/transport/plugin_transport_wlan.c:695
+#: src/transport/plugin_transport_wlan.c:1754
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_wlan.c:749
+#: src/transport/plugin_transport_wlan.c:770
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# mensajes fragmentados"
 
-#: src/transport/plugin_transport_wlan.c:773
+#: src/transport/plugin_transport_wlan.c:794
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:873
-#: src/transport/plugin_transport_wlan.c:954
-#: src/transport/plugin_transport_wlan.c:1722
+#: src/transport/plugin_transport_wlan.c:902
+#: src/transport/plugin_transport_wlan.c:987
+#: src/transport/plugin_transport_wlan.c:1756
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1135
+#: src/transport/plugin_transport_wlan.c:1169
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1156
+#: src/transport/plugin_transport_wlan.c:1190
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:1166
+#: src/transport/plugin_transport_wlan.c:1200
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_wlan.c:1223
+#: src/transport/plugin_transport_wlan.c:1257
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:1324
+#: src/transport/plugin_transport_wlan.c:1358
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1359
+#: src/transport/plugin_transport_wlan.c:1393
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1420
+#: src/transport/plugin_transport_wlan.c:1454
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# bytes enviados vía UDP"
 
-#: src/transport/plugin_transport_wlan.c:1529
+#: src/transport/plugin_transport_wlan.c:1563
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1703
+#: src/transport/plugin_transport_wlan.c:1737
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:575
+#: src/transport/transport_api.c:593
 #, 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"
@@ -5117,43 +5364,43 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:984
+#: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:988
+#: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/util/client.c:369
+#: src/util/client.c:371
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:377
+#: src/util/client.c:379
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:695
+#: src/util/client.c:698
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:895
+#: src/util/client.c:898
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/util/client.c:909
+#: src/util/client.c:912
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/util/client.c:1162
+#: src/util/client.c:1168
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -5229,34 +5476,29 @@
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:420
+#: src/util/connection.c:427
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/util/connection.c:435
+#: src/util/connection.c:442
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:550
+#: src/util/connection.c:557
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
 
-#: src/util/connection.c:739 src/util/connection.c:909
+#: src/util/connection.c:755 src/util/connection.c:921
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/connection.c:748
+#: src/util/connection.c:912
 #, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/util/connection.c:900
-#, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
@@ -5267,157 +5509,167 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:313
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
-
-#: 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:640
+#: src/util/crypto_ecc.c:448 src/util/crypto_rsa.c:644
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 "Deleting it.\n"
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/util/crypto_rsa.c:657
+#: src/util/crypto_ecc.c:463 src/util/crypto_rsa.c:661
 #, 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
+#: src/util/crypto_ecc.c:559 src/util/crypto_ecc.c:603
+#: src/util/crypto_rsa.c:759 src/util/crypto_rsa.c:803
 #, 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:760
+#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:764
 #, 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:778
-#, c-format
-msgid "I am host `%s'.  Stored new private key in `%s'.\n"
+#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:807
+#: src/util/crypto_rsa.c:843
+msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: 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:837
+#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:838
 #, c-format
 msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:857
+#: src/util/crypto_ecc.c:643
+msgid "This may be ok if someone is currently generating a key.\n"
+msgstr ""
+
+#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:858
 #, 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
+#: src/util/crypto_ecc.c:780 src/util/crypto_rsa.c:946
+msgid "interrupted by shutdown"
+msgstr ""
+
+#: src/util/crypto_ecc.c:791
+#, fuzzy
+msgid "gnunet-ecc failed"
+msgstr "gnunet-setup"
+
+#: src/util/crypto_ecc.c:986
 #, fuzzy, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
-msgstr "Llamada a '%s' con la clave '%s'.\n"
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/util/crypto_rsa.c:948
-msgid "interrupted by shutdown"
+#: src/util/crypto_ecc.c:1054
+#, fuzzy, c-format
+msgid "ECC signature verification failed at %s:%d: %s\n"
+msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
+
+#: src/util/crypto_random.c:313
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:959
+#: 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:957
 #, fuzzy
 msgid "gnunet-rsa failed"
 msgstr "gnunet-setup"
 
-#: src/util/crypto_rsa.c:1347
+#: src/util/crypto_rsa.c:1348
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/util/disk.c:571
+#: src/util/disk.c:567
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/disk.c:1140
+#: src/util/disk.c:1136
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/util/disk.c:1494 src/util/service.c:1667
+#: src/util/disk.c:1490 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"
 
-#: src/util/disk.c:1866
+#: src/util/disk.c:1862
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/util/getopt.c:669
+#: src/util/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/util/getopt.c:693
+#: src/util/getopt.c:594
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: la opción '--%s' no permite un argumento\n"
 
-#: src/util/getopt.c:698
+#: src/util/getopt.c:599
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: la opción '%c%s' no permite un argumento\n"
 
-#: src/util/getopt.c:715 src/util/getopt.c:883
+#: src/util/getopt.c:616 src/util/getopt.c:783
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción '%s' requiere un argumento\n"
 
-#: src/util/getopt.c:744
+#: src/util/getopt.c:645
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción no reconocida '--%s'\n"
 
-#: src/util/getopt.c:748
+#: src/util/getopt.c:649
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción no reconocida '%c%s'\n"
 
-#: src/util/getopt.c:773
+#: src/util/getopt.c:674
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción ilegal -- %c\n"
 
-#: src/util/getopt.c:775
+#: src/util/getopt.c:676
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción no válida -- %c\n"
 
-#: src/util/getopt.c:803 src/util/getopt.c:931
+#: src/util/getopt.c:704 src/util/getopt.c:831
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción requiere un argumento --%c\n"
 
-#: src/util/getopt.c:851
+#: src/util/getopt.c:752
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción '-W %s' es ambigua\n"
 
-#: src/util/getopt.c:869
+#: src/util/getopt.c:770
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: la opción '-W %s' no permite un argumento\n"
 
-#: src/util/getopt.c:1035
+#: src/util/getopt.c:935
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Usar --help para obtener una lista de opciones.\n"
@@ -5469,64 +5721,69 @@
 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 ""
-
-#: src/util/gnunet-resolver.c:158
-msgid "Use build-in GNUnet stub resolver"
-msgstr ""
-
-#: src/util/gnunet-rsa.c:114
+#: src/util/gnunet-ecc.c:107 src/util/gnunet-rsa.c:107
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/util/gnunet-rsa.c:120
+#: src/util/gnunet-ecc.c:113 src/util/gnunet-rsa.c:113
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:138
+#: src/util/gnunet-ecc.c:128 src/util/gnunet-rsa.c:137
 #, 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
+#: src/util/gnunet-ecc.c:140 src/util/gnunet-rsa.c:149
 #, fuzzy, c-format
 msgid "Finished!\n"
 msgstr "Finalizar"
 
-#: src/util/gnunet-rsa.c:173
+#: src/util/gnunet-ecc.c:163 src/util/gnunet-rsa.c:172
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:230
+#: src/util/gnunet-ecc.c:220 src/util/gnunet-rsa.c:229
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:233
+#: src/util/gnunet-ecc.c:223 src/util/gnunet-rsa.c:232
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:236
+#: src/util/gnunet-ecc.c:226 src/util/gnunet-rsa.c:235
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:239
+#: src/util/gnunet-ecc.c:229 src/util/gnunet-rsa.c:238
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:242
+#: src/util/gnunet-ecc.c:232 src/util/gnunet-rsa.c:241
 msgid ""
 "use insecure, weak random number generator for key generation (for testing "
 "only)"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:252
+#: src/util/gnunet-ecc.c:242
+#, fuzzy
+msgid "Manipulate GNUnet private ECC key files"
+msgstr "Imposible guardar el fichero de configuración '%s':"
+
+#: src/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
+msgstr ""
+
+#: src/util/gnunet-resolver.c:158
+msgid "Use build-in GNUnet stub resolver"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:251
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5570,50 +5827,35 @@
 msgid "Error reading from `%s': %s\n"
 msgstr "Error creando usuario"
 
-#: src/util/helper.c:280
-#, c-format
-msgid "Got 0 bytes from helper `%s' (EOF)\n"
-msgstr ""
-
-#: 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: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:343
+#: src/util/helper.c:500
 #, fuzzy, c-format
-msgid "Starting HELPER process `%s'\n"
-msgstr "Iniciada colección '%s'.\n"
-
-#: src/util/helper.c:496
-#, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error creando usuario"
 
-#: src/util/network.c:99
+#: src/util/network.c:127
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1278
+#: src/util/network.c:1318
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:325
+#: src/util/os_installation.c:416
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:522
+#: src/util/os_installation.c:644
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
@@ -5648,6 +5890,11 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Imposible determinar mi dirección IPv6 pública.\n"
 
+#: src/util/program.c:251
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "Imposible pasar el fichero de configuración '%s'.\n"
+
 #: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
@@ -5686,11 +5933,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/util/scheduler.c:786
+#: src/util/scheduler.c:781
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:916
+#: src/util/scheduler.c:911
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -5712,11 +5959,11 @@
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:836
+#: src/util/server.c:835
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+"`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
 #: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
@@ -5833,7 +6080,7 @@
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/util/service.c:1746
+#: src/util/service.c:1747
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5842,70 +6089,74 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "La llamada a '%s' devuelve %d.\n"
 
-#: src/util/strings.c:145
+#: src/util/strings.c:146
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:385
+#: src/util/strings.c:384 src/util/strings.c:404
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:534
+#: src/util/strings.c:525
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:631
+#: src/util/strings.c:622
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:635
+#: src/util/strings.c:626
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:641
+#: src/util/strings.c:628
+msgid "0 ms"
+msgstr ""
+
+#: src/util/strings.c:634
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:647
+#: src/util/strings.c:640
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:653
+#: src/util/strings.c:646
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:660
+#: src/util/strings.c:653
 #, fuzzy
 msgid "day"
 msgstr " días"
 
-#: src/util/strings.c:662
+#: src/util/strings.c:655
 #, fuzzy
 msgid "days"
 msgstr " días"
 
-#: src/util/strings.c:689
+#: src/util/strings.c:682
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1078
+#: src/util/strings.c:1070
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1086
+#: src/util/strings.c:1078
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1092
+#: src/util/strings.c:1084
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1099
+#: src/util/strings.c:1091
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1108
+#: src/util/strings.c:1100
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Argumento no válido: '%s'\n"
@@ -6005,11 +6256,11 @@
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3139
+#: src/vpn/gnunet-service-vpn.c:3114
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3171
+#: src/vpn/gnunet-service-vpn.c:3146
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -6085,23 +6336,47 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
-#: src/include/gnunet_common.h:591
+#: src/include/gnunet_common.h:579 src/include/gnunet_common.h:584
+#: src/include/gnunet_common.h:590
 #, 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:601
+#: src/include/gnunet_common.h:600
 #, 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:622 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:621 src/include/gnunet_common.h:628
 #, 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 "list information for the given peer"
+#~ msgstr "Imprime información de los pares de GNUnet."
+
+#, fuzzy
+#~ msgid "list information for all peers"
+#~ msgstr "Imprime información de los pares de GNUnet."
+
+#, fuzzy
+#~ msgid "Malformed %s `%s' given in configuration!\n"
+#~ msgstr "Imposible guardar la configuración"
+
+#, fuzzy
+#~ msgid "I am host `%s'.  Read private key from `%s'.\n"
+#~ msgstr "Llamada a '%s' con la clave '%s'.\n"
+
+#, fuzzy
+#~ msgid "Got %u bytes from helper `%s'\n"
+#~ msgstr "GAP recibido contenido no válido de '%s'\n"
+
+#, fuzzy
+#~ msgid "Starting HELPER process `%s'\n"
+#~ msgstr "Iniciada colección '%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"
 
@@ -6562,10 +6837,6 @@
 #~ msgstr "imprime el número de versión"
 
 #, fuzzy
-#~ msgid "use configuration file FILENAME"
-#~ msgstr "usa el fichero de configuración FILENAME"
-
-#, fuzzy
 #~ msgid "Failed to stop service `%s'!\n"
 #~ msgstr "Fichero almacenado en '%s'.\n"
 
@@ -8974,9 +9245,6 @@
 #~ msgid "Joined DHT.  Press CTRL-C to leave.\n"
 #~ msgstr "Unido a DHT.  Pulsa CTRL-C para abandonarlo.\n"
 
-#~ msgid "`%s' failed: table not found!\n"
-#~ msgstr "'%s' falló: ¡tabla no encontrada!\n"
-
 #~ msgid "sendAck failed.  Terminating connection to client.\n"
 #~ msgstr "sendAck falló. Finalizando conexión con el cliente.\n"
 
@@ -9143,13 +9411,6 @@
 #~ msgid "Option `%s' makes no sense without option `%s'."
 #~ msgstr "La opción '%s' no tiene ningún sentido sin la opción '%s'."
 
-#~ msgid ""
-#~ "\n"
-#~ "Exiting.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Saliendo.\n"
-
 #~ msgid "Updated data for %d applications.\n"
 #~ msgstr "Actualizados los datos para %d aplicaciones.\n"
 

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2012-10-31 15:10:17 UTC (rev 24637)
+++ gnunet/po/sv.po     2012-10-31 15:21:37 UTC (rev 24638)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-09-27 21:17+0200\n"
+"POT-Creation-Date: 2012-10-31 13:48+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:165
+#: src/arm/arm_api.c:162
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
@@ -145,85 +145,85 @@
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:332
+#: src/arm/gnunet-service-arm.c:326
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:335
+#: src/arm/gnunet-service-arm.c:329
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:361
+#: src/arm/gnunet-service-arm.c:355
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:393
+#: src/arm/gnunet-service-arm.c:387
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:523
+#: src/arm/gnunet-service-arm.c:517
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/arm/gnunet-service-arm.c:545
+#: src/arm/gnunet-service-arm.c:539
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:559
+#: src/arm/gnunet-service-arm.c:553
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:667
+#: src/arm/gnunet-service-arm.c:661
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:878
+#: src/arm/gnunet-service-arm.c:872
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:970
+#: src/arm/gnunet-service-arm.c:965
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:975
+#: src/arm/gnunet-service-arm.c:970
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:980
+#: src/arm/gnunet-service-arm.c:975
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:986
+#: src/arm/gnunet-service-arm.c:981
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1021
+#: src/arm/gnunet-service-arm.c:1016
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1214
+#: src/arm/gnunet-service-arm.c:1210
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1225
+#: src/arm/gnunet-service-arm.c:1221
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1239
+#: src/arm/gnunet-service-arm.c:1235
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -232,17 +232,44 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats.c:93
-#, fuzzy
-msgid "list information for the given peer"
-msgstr "Skriv ut information om GNUnets motparter."
+#: src/ats-tool/gnunet-ats.c:67
+#, c-format
+msgid ""
+"Peer `%s' plugin `%s', address `%s', bandwidth out: %u Bytes/s, bandwidth in "
+"%u Bytes/s\n"
+msgstr ""
 
-#: src/ats/gnunet-ats.c:96
+#: src/ats-tool/gnunet-ats.c:129
+#, c-format
+msgid "%u address resolutions had a timeout\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:131
+#, c-format
+msgid "ATS returned results for %u addresses\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:142 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/ats-tool/gnunet-ats.c:149
+#, fuzzy, c-format
+msgid "Cannot connect to ATS service, exiting...\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/ats-tool/gnunet-ats.c:194
 #, fuzzy
-msgid "list information for all peers"
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "do not resolve IP addresses to hostnames"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/ats/gnunet-ats.c:105
+#: src/ats-tool/gnunet-ats.c:197
+msgid "monitor mode"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:206
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -252,7 +279,7 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/core/core_api.c:757
+#: src/core/core_api.c:755
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -277,7 +304,7 @@
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:818
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:825
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
@@ -368,7 +395,7 @@
 msgstr "# PING-meddelanden skapade"
 
 #: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:812
+#: src/transport/gnunet-service-transport_validation.c:813
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
@@ -396,7 +423,7 @@
 msgstr "# PING-meddelanden i klartext skickade"
 
 #: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1108
+#: src/transport/gnunet-service-transport_validation.c:1109
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -457,7 +484,7 @@
 msgstr "# byte dekrypterade"
 
 #: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
-#: src/peerinfo-tool/gnunet-peerinfo.c:824
+#: src/peerinfo-tool/gnunet-peerinfo.c:831
 #: src/transport/gnunet-service-transport.c:627
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
@@ -486,14 +513,14 @@
 #: src/core/gnunet-service-core_sessions.c:269
 #: 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/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
 #: src/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
-#: src/transport/gnunet-service-transport_neighbours.c:873
+#: src/transport/gnunet-service-transport_neighbours.c:872
 #: src/transport/gnunet-service-transport_neighbours.c:1089
 #: src/transport/gnunet-service-transport_neighbours.c:1098
-#: src/transport/gnunet-service-transport_neighbours.c:2620
-#: src/transport/gnunet-service-transport_neighbours.c:2882
+#: src/transport/gnunet-service-transport_neighbours.c:2635
+#: src/transport/gnunet-service-transport_neighbours.c:2897
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
@@ -558,9 +585,9 @@
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:608
-#: src/include/gnunet_common.h:615
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ecc.c:53
+#: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
+#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -573,17 +600,17 @@
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:410
+#: src/datacache/plugin_datacache_sqlite.c:405
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:443
-#: src/datastore/plugin_datastore_sqlite.c:406
-#: src/namestore/plugin_namestore_sqlite.c:369
+#: src/datacache/plugin_datacache_sqlite.c:438
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namestore/plugin_namestore_sqlite.c:362
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:450
+#: src/datacache/plugin_datacache_sqlite.c:445
 #, fuzzy, c-format
 msgid "Failed to close statement %p: %d\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -592,25 +619,25 @@
 msgid "Template datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:305
+#: src/datastore/datastore_api.c:310
 #, fuzzy
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/datastore/datastore_api.c:388
+#: src/datastore/datastore_api.c:393
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:432
+#: src/datastore/datastore_api.c:437
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:459
+#: src/datastore/datastore_api.c:465
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/datastore/datastore_api.c:477
+#: src/datastore/datastore_api.c:483
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
@@ -619,65 +646,61 @@
 msgid "# datastore connections (re)created"
 msgstr "Nätverksanslutning"
 
-#: src/datastore/datastore_api.c:548
-msgid "# reconnected to DATASTORE"
-msgstr ""
-
-#: src/datastore/datastore_api.c:612
+#: src/datastore/datastore_api.c:608
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:633
+#: src/datastore/datastore_api.c:630
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# byte krypterade"
 
-#: src/datastore/datastore_api.c:764
+#: src/datastore/datastore_api.c:762
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/datastore_api.c:778
+#: src/datastore/datastore_api.c:776
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
+#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/datastore/datastore_api.c:800
+#: src/datastore/datastore_api.c:798
 #, fuzzy
 msgid "# status messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:869
+#: src/datastore/datastore_api.c:867
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:936
+#: src/datastore/datastore_api.c:934
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:997
+#: src/datastore/datastore_api.c:995
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1054
+#: src/datastore/datastore_api.c:1052
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1118
+#: src/datastore/datastore_api.c:1116
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1163
+#: src/datastore/datastore_api.c:1161
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/datastore_api.c:1221
+#: src/datastore/datastore_api.c:1220
 #, fuzzy
 msgid "# Results received"
 msgstr "# byte mottogs via TCP"
@@ -690,7 +713,7 @@
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1409
+#: src/datastore/datastore_api.c:1410
 msgid "# GET requests executed"
 msgstr ""
 
@@ -869,7 +892,7 @@
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:654
+#: src/namestore/plugin_namestore_postgres.c:652
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -878,29 +901,29 @@
 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:258
-#: src/namestore/plugin_namestore_sqlite.c:228
+#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/namestore/plugin_namestore_sqlite.c:223
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:653
+#: src/datastore/plugin_datastore_sqlite.c:648
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1137
+#: src/datastore/plugin_datastore_sqlite.c:1132
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1156
+#: src/datastore/plugin_datastore_sqlite.c:1151
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1196
-#: src/namestore/plugin_namestore_sqlite.c:834
+#: src/datastore/plugin_datastore_sqlite.c:1191
+#: src/namestore/plugin_namestore_sqlite.c:827
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -955,7 +978,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:750
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:733
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:1033
@@ -1261,23 +1284,38 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
+#: src/dns/dnsparser.c:110
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/dns/dnsparser.c:584
+#, fuzzy, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
 #: src/dns/dnsstub.c:175
 #, 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
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/gns/gnunet-service-gns_resolver.c:1669
 #, 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
+#: src/dns/dnsstub.c:299
+#, fuzzy, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/dns/dnsstub.c:368
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:430
+#: src/dns/dnsstub.c:440
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -1306,58 +1344,59 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:499
+#: src/dns/gnunet-service-dns.c:512
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:639
+#: src/dns/gnunet-service-dns.c:659
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:821
+#: src/dns/gnunet-service-dns.c:845
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:892
+#: src/dns/gnunet-service-dns.c:924
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1005
+#: src/dns/gnunet-service-dns.c:1039
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1021
+#: src/dns/gnunet-service-dns.c:1055
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1030
+#: src/dns/gnunet-service-dns.c:1064
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1039
+#: src/dns/gnunet-service-dns.c:1073
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1104
+#: src/dns/gnunet-service-dns.c:1140
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1180 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1216 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1245 src/exit/gnunet-daemon-exit.c:3032
+#: src/dns/gnunet-service-dns.c:1281 src/exit/gnunet-daemon-exit.c:3007
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1266
-msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
-msgstr ""
+#: src/dns/gnunet-service-dns.c:1302
+#, fuzzy
+msgid "need a valid IPv4 or IPv6 address\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/dv/dv_api.c:179
+#: src/dv/dv_api.c:189
 #, fuzzy
 msgid "Failed to connect to the dv service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -1536,35 +1575,35 @@
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3048
+#: src/exit/gnunet-daemon-exit.c:3023
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3056
+#: src/exit/gnunet-daemon-exit.c:3031
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3063
+#: src/exit/gnunet-daemon-exit.c:3038
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3069
+#: src/exit/gnunet-daemon-exit.c:3044
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3050 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3241
+#: src/exit/gnunet-daemon-exit.c:3216
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1586,112 +1625,112 @@
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:203
+#: src/fragmentation/fragmentation.c:208
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:206
+#: src/fragmentation/fragmentation.c:211
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:232
+#: src/fragmentation/fragmentation.c:237
 #, fuzzy
 msgid "# fragments wrap arounds"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:273
+#: src/fragmentation/fragmentation.c:281
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:276
+#: src/fragmentation/fragmentation.c:284
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:363
+#: src/fragmentation/fragmentation.c:405
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:369
+#: src/fragmentation/fragmentation.c:411
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:393
+#: src/fragmentation/fragmentation.c:435
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:450
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:500
+#: src/fs/fs_api.c:459
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:506
+#: src/fs/fs_api.c:465
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1087
+#: src/fs/fs_api.c:1046
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1546
+#: src/fs/fs_api.c:1505
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1588
+#: src/fs/fs_api.c:1547
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1604
+#: src/fs/fs_api.c:1563
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2254
+#: src/fs/fs_api.c:2213
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2264
+#: src/fs/fs_api.c:2223
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2389 src/fs/fs_api.c:2629
+#: src/fs/fs_api.c:2348 src/fs/fs_api.c:2588
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2406
+#: src/fs/fs_api.c:2365
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2419 src/fs/fs_api.c:2438 src/fs/fs_api.c:2922
+#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2397 src/fs/fs_api.c:2881
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2620
+#: src/fs/fs_api.c:2579
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2866
+#: src/fs/fs_api.c:2825
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2960
+#: src/fs/fs_api.c:2919
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1752,12 +1791,12 @@
 msgid "internal error decoding tree"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_download.c:1920
+#: src/fs/fs_download.c:1927
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
 
-#: src/fs/fs_getopt.c:191
+#: src/fs/fs_getopt.c:192
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2068,35 +2107,35 @@
 msgid "Failed to run `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/gnunet-auto-share.c:684
+#: src/fs/gnunet-auto-share.c:686
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-auto-share.c:734 src/fs/gnunet-pseudonym.c:279
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
 #: 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:684
+#: src/fs/gnunet-auto-share.c:741 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:687
+#: src/fs/gnunet-auto-share.c:744 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:711
+#: src/fs/gnunet-auto-share.c:747 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-auto-share.c:750 src/fs/gnunet-pseudonym.c:304
 #: src/fs/gnunet-publish.c:718
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:767
+#: src/fs/gnunet-auto-share.c:770
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -2235,7 +2274,7 @@
 msgid "Special file-sharing operations"
 msgstr "Visa alla alternativ"
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:161
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:198
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
@@ -2495,151 +2534,151 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:240
+#: src/fs/gnunet-service-fs.c:245
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
+#: src/fs/gnunet-service-fs.c:306 src/fs/gnunet-service-fs.c:496
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/fs/gnunet-service-fs.c:588 src/hostlist/gnunet-daemon-hostlist.c:297
 #: 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:704
+#: src/fs/gnunet-service-fs_cp.c:711
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:708
+#: src/fs/gnunet-service-fs_cp.c:715
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:744
+#: src/fs/gnunet-service-fs_cp.c:751
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:750
+#: src/fs/gnunet-service-fs_cp.c:757
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:1333
+#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1345
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:867
+#: src/fs/gnunet-service-fs_cp.c:875
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:928
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:928
+#: src/fs/gnunet-service-fs_cp.c:936
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:942
+#: src/fs/gnunet-service-fs_cp.c:950
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:980
+#: src/fs/gnunet-service-fs_cp.c:988
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1047
+#: src/fs/gnunet-service-fs_cp.c:1056
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1071
+#: src/fs/gnunet-service-fs_cp.c:1081
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1081
+#: src/fs/gnunet-service-fs_cp.c:1091
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1160
+#: src/fs/gnunet-service-fs_cp.c:1170
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1194
+#: src/fs/gnunet-service-fs_cp.c:1204
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1216
+#: src/fs/gnunet-service-fs_cp.c:1227
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1276
+#: src/fs/gnunet-service-fs_cp.c:1288
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1302
+#: src/fs/gnunet-service-fs_cp.c:1314
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:1343
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1687
+#: src/fs/gnunet-service-fs_cp.c:1713
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_indexing.c:120
-#: src/fs/gnunet-service-fs_indexing.c:175
+#: src/fs/gnunet-service-fs_indexing.c:130
+#: src/fs/gnunet-service-fs_indexing.c:181
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:136
+#: src/fs/gnunet-service-fs_indexing.c:142
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/fs/gnunet-service-fs_indexing.c:226
+#: src/fs/gnunet-service-fs_indexing.c:237
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:264
+#: src/fs/gnunet-service-fs_indexing.c:275
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:479
+#: src/fs/gnunet-service-fs_indexing.c:477
 #, 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:537
+#: src/fs/gnunet-service-fs_indexing.c:542
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:552
+#: src/fs/gnunet-service-fs_indexing.c:557
 #, 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:554
+#: src/fs/gnunet-service-fs_indexing.c:559
 #, fuzzy
 msgid "not indexed"
 msgstr "Avindexering misslyckades."
 
-#: src/fs/gnunet-service-fs_indexing.c:569
+#: src/fs/gnunet-service-fs_indexing.c:574
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
@@ -2664,140 +2703,140 @@
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:265
+#: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:391
+#: src/fs/gnunet-service-fs_pe.c:397
 #, fuzzy
 msgid "# transmission failed (core has no bandwidth)"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:420
+#: src/fs/gnunet-service-fs_pe.c:426
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_pe.c:469
+#: src/fs/gnunet-service-fs_pe.c:475
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:476
+#: src/fs/gnunet-service-fs_pe.c:483
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:538
+#: src/fs/gnunet-service-fs_pe.c:543
 #, fuzzy
 msgid "# requests merged"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:544
+#: src/fs/gnunet-service-fs_pe.c:551
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:684
-#: src/fs/gnunet-service-fs_pe.c:751
+#: src/fs/gnunet-service-fs_pe.c:605 src/fs/gnunet-service-fs_pe.c:689
+#: src/fs/gnunet-service-fs_pe.c:757
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:285
+#: src/fs/gnunet-service-fs_pr.c:293
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:618
+#: src/fs/gnunet-service-fs_pr.c:385 src/fs/gnunet-service-fs_pr.c:639
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:781
+#: src/fs/gnunet-service-fs_pr.c:802
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:810
+#: src/fs/gnunet-service-fs_pr.c:834
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:824
+#: src/fs/gnunet-service-fs_pr.c:849
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:837
+#: src/fs/gnunet-service-fs_pr.c:862
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:955
+#: src/fs/gnunet-service-fs_pr.c:983
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:982
+#: src/fs/gnunet-service-fs_pr.c:1010
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1017
+#: src/fs/gnunet-service-fs_pr.c:1045
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1108
+#: src/fs/gnunet-service-fs_pr.c:1136
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1128
+#: src/fs/gnunet-service-fs_pr.c:1156
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1174
+#: src/fs/gnunet-service-fs_pr.c:1203
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1218
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1197
+#: src/fs/gnunet-service-fs_pr.c:1227
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1242
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1224
+#: src/fs/gnunet-service-fs_pr.c:1256
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1237
+#: src/fs/gnunet-service-fs_pr.c:1269
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1274
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1269 src/fs/gnunet-service-fs_pr.c:1309
-#: src/fs/gnunet-service-fs_pr.c:1447
+#: src/fs/gnunet-service-fs_pr.c:1301 src/fs/gnunet-service-fs_pr.c:1341
+#: src/fs/gnunet-service-fs_pr.c:1481
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1327
+#: src/fs/gnunet-service-fs_pr.c:1359
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1370
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1457
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1542
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2841,7 +2880,7 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:575
+#: src/gns/gns_api.c:598
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
@@ -2867,7 +2906,7 @@
 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)"
+msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
 #: src/gns/gnunet-dns2gns.c:676
@@ -2882,39 +2921,39 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:182
+#: src/gns/gnunet-gns.c:221
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:293
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid "Please specify lookup, shorten or authority operation!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:315
+#: src/gns/gnunet-gns.c:356
 #, fuzzy
 msgid "try to shorten a given name"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:318
+#: src/gns/gnunet-gns.c:359
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:321
+#: src/gns/gnunet-gns.c:362
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:324
+#: src/gns/gnunet-gns.c:365
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:327
+#: src/gns/gnunet-gns.c:368
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:341
+#: src/gns/gnunet-gns.c:381
 msgid "GNUnet GNS access tool"
 msgstr ""
 
@@ -2966,7 +3005,7 @@
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:936 src/gns/gnunet-gns-proxy.c:2887
+#: src/gns/gnunet-gns-fcfsd.c:936 src/gns/gnunet-gns-proxy.c:2857
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
@@ -2975,38 +3014,48 @@
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2528
+#: src/gns/gnunet-gns-proxy.c:2494
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/gns/gnunet-gns-proxy.c:2556
+#: src/gns/gnunet-gns-proxy.c:2522
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:3564
+#: src/gns/gnunet-gns-proxy.c:3510
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3567
+#: src/gns/gnunet-gns-proxy.c:3513
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3582
+#: src/gns/gnunet-gns-proxy.c:3525
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:401
+#: src/gns/gnunet-service-gns.c:486
 #, c-format
 msgid "Records for name `%s' in zone %s too large to fit into DHT"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1197
+#: src/gns/gnunet-service-gns.c:1216
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
+#: src/gns/gnunet-service-gns.c:1277
+#, fuzzy
+msgid "Could not connect to DHT!\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/gns/gnunet-service-gns.c:1288
+#, fuzzy
+msgid "Unable to initialize resolver!\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
 #: src/hello/gnunet-hello.c:122
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3086,176 +3135,140 @@
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
-#, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:473 src/hostlist/hostlist-client.c:683
-#: 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:994
-#: src/transport/plugin_transport_http_client.c:1009
+#: src/hostlist/hostlist-client.c:469 src/hostlist/hostlist-client.c:680
+#: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
+#: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
+#: src/hostlist/hostlist-client.c:958 src/hostlist/hostlist-client.c:963
+#: src/transport/plugin_transport_http_client.c:1026
+#: src/transport/plugin_transport_http_client.c:1041
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1325
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:623
+#: src/hostlist/hostlist-client.c:619
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/hostlist-client.c:661
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/hostlist-client.c:799
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/hostlist-client.c:813
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/hostlist-client.c:833
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:839
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/hostlist-client.c:847
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/hostlist-client.c:900
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/hostlist-client.c:908
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
+#: src/hostlist/hostlist-client.c:1035 src/hostlist/hostlist-client.c:1498
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1046
+#: src/hostlist/hostlist-client.c:1043
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1084
-msgid "Scheduled saving of hostlists\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1088
-#, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127
+#: src/hostlist/hostlist-client.c:1107 src/hostlist/hostlist-client.c:1123
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/hostlist-client.c:1242
-#, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
-msgstr ""
-
 #: src/hostlist/hostlist-client.c:1273
-#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1279
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1283
-#, c-format
-msgid "Hostlist file `%s' is not existing\n"
-msgstr ""
+#: src/hostlist/hostlist-client.c:1277
+#, fuzzy, c-format
+msgid "Hostlist file `%s' does not exist\n"
+msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1288
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1327
+#: src/hostlist/hostlist-client.c:1321
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/hostlist-client.c:1323
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1362
-#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/hostlist-client.c:1368
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/hostlist-client.c:1373
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/hostlist-client.c:1397 src/hostlist/hostlist-client.c:1414
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/hostlist-client.c:1409
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1470
+#: src/hostlist/hostlist-client.c:1463
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1473
-#, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1482
+#: src/hostlist/hostlist-client.c:1475
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1494
+#: src/hostlist/hostlist-client.c:1487
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1498
+#: src/hostlist/hostlist-client.c:1491
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -3294,10 +3307,6 @@
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:273
-msgid "Sending 100 CONTINUE reply\n"
-msgstr ""
-
 #: src/hostlist/hostlist-server.c:279
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
@@ -3376,28 +3385,153 @@
 msgid "help text"
 msgstr "hjälptext för -t"
 
-#: src/mesh/gnunet-service-mesh.c:7703
+#: src/mesh/gnunet-regex-profiler.c:1126
+#: src/testbed/gnunet-testbed-profiler.c:323
+msgid "An operation has failed while starting peers\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1192
+#: src/testbed/gnunet-testbed-profiler.c:390
+#, fuzzy, c-format
+msgid "Creating a peer failed. Error: %s\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1306
+#: src/testbed/gnunet-testbed-profiler.c:495
+msgid "An operation has failed while starting slaves\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1359
+msgid "An operation has failed while linking\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1486
+#: src/testbed/gnunet-testbed-profiler.c:597
+#, c-format
+msgid "Host registration failed for a host. Error: %s\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1566
+#: src/testbed/gnunet-testbed-profiler.c:676
+msgid "Unable to connect to master controller -- Check config\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1663
+#, c-format
+msgid "No hosts-file specified on command line. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1668
+#: src/regex/gnunet-regex-simulation-profiler.c:498
+#, c-format
+msgid "No policy directory specified on command line. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1674
+#, c-format
+msgid "No hosts loaded. Need at least one host\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1681
+#: src/testbed/gnunet-testbed-profiler.c:723
+#, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1688
+#: src/testbed/gnunet-testbed-profiler.c:730
+#, fuzzy, c-format
+msgid "Exiting\n"
+msgstr ""
+"\n"
+"Avslutar.\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1694
+#, fuzzy, c-format
+msgid "No configuration file given. Exiting\n"
+msgstr "använd konfigurationsfil FILNAMN"
+
+#: src/mesh/gnunet-regex-profiler.c:1711
+#: src/regex/gnunet-regex-simulation-profiler.c:504
+#, c-format
+msgid "Specified policies directory does not exist. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1718
+#, c-format
+msgid "No search strings file given. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1724
+#, c-format
+msgid ""
+"Error loading search strings. Given file does not contain enough strings. "
+"Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1730
+#, fuzzy, c-format
+msgid "Error loading search strings. Exiting.\n"
+msgstr "Fel vid lämning av DHT.\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1764
+#, fuzzy
+msgid "name of the file for writing statistics"
+msgstr "Visa värde av alternativet"
+
+#: src/mesh/gnunet-regex-profiler.c:1767
+msgid "create FACTOR times number of peers random links"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1770
+#: src/testbed/gnunet-testbed-profiler.c:800
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1773
+msgid "wait TIMEOUT before considering a string match as failed"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1776
+msgid "wait DELAY before starting string search"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1779
+msgid "number of search strings to read from search strings file"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1782
+#: src/regex/gnunet-regex-simulation-profiler.c:555
+msgid "maximum path compression length"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1794
+msgid "Profiler for regex/mesh"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:7971
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7908
+#: src/mesh/gnunet-service-mesh.c:8176
 #, 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
+#: src/mesh/gnunet-service-mesh.c:8265 src/mesh/gnunet-service-mesh.c:8277
+#: src/mesh/gnunet-service-mesh.c:8289 src/mesh/gnunet-service-mesh.c:8302
+#: src/mesh/gnunet-service-mesh.c:8317 src/mesh/gnunet-service-mesh.c:8329
+#: src/mesh/gnunet-service-mesh.c:8341 src/mesh/gnunet-service-mesh.c:8353
 #, fuzzy, c-format
-msgid "Mesh service is lacking key configuration settings (%s).  Exiting.\n"
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:8093 src/mesh/gnunet-service-mesh.c:8104
+#: src/mesh/gnunet-service-mesh.c:8365 src/mesh/gnunet-service-mesh.c:8376
 #, fuzzy, c-format
 msgid ""
-"Mesh service is lacking key configuration settings (%s). Using default "
-"(%u).\n"
+"%s service is lacking key configuration settings (%s). Using default (%u).\n"
 msgstr "GNUnet-konfiguration"
 
 #: src/mysql/mysql.c:174
@@ -3490,16 +3624,11 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#: src/peerinfo-tool/gnunet-peerinfo.c:882
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: 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:625
 #, fuzzy, c-format
 msgid "Using default zone file `%s'\n"
@@ -3626,6 +3755,46 @@
 msgid "Protocol error"
 msgstr ""
 
+#: src/namestore/namestore_common.c:494 src/namestore/namestore_common.c:634
+#, fuzzy, c-format
+msgid "Unsupported record type %d\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/namestore/namestore_common.c:501
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
+
+#: src/namestore/namestore_common.c:524
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/namestore/namestore_common.c:547
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/namestore/namestore_common.c:565
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
+
+#: src/namestore/namestore_common.c:578
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/namestore/namestore_common.c:599
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/namestore/namestore_common.c:625
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
 #: src/namestore/plugin_namestore_postgres.c:95
 #, fuzzy
 msgid "Failed to create indices\n"
@@ -3640,33 +3809,32 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:799
+#: src/nat/nat.c:795
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:844
+#: src/nat/nat.c:840
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1111
-#, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "Kunde inte spara konfiguration!"
+#: src/nat/nat.c:1108
+msgid "malformed"
+msgstr ""
 
-#: src/nat/nat.c:1177 src/nat/nat.c:1187
+#: src/nat/nat.c:1173 src/nat/nat.c:1183
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1317
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1332
+#: src/nat/nat.c:1328
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -3844,46 +4012,46 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:834
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:840
+#: src/peerinfo-tool/gnunet-peerinfo.c:847
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:899
+#: src/peerinfo-tool/gnunet-peerinfo.c:906
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:936
+#: src/peerinfo-tool/gnunet-peerinfo.c:943
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:939
+#: src/peerinfo-tool/gnunet-peerinfo.c:946
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:942
+#: src/peerinfo-tool/gnunet-peerinfo.c:949
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:945
+#: src/peerinfo-tool/gnunet-peerinfo.c:952
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:948
+#: src/peerinfo-tool/gnunet-peerinfo.c:955
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:951
+#: src/peerinfo-tool/gnunet-peerinfo.c:958
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:961
+#: src/peerinfo-tool/gnunet-peerinfo.c:968
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -3982,6 +4150,15 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/regex/gnunet-regex-simulation-profiler.c:552
+#, fuzzy
+msgid "name of the table to write DFAs"
+msgstr "Visa värde av alternativet"
+
+#: src/regex/gnunet-regex-simulation-profiler.c:567
+msgid "Profiler for regex library"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:271
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -3992,61 +4169,132 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-statistics.c:120
+#: src/statistics/gnunet-statistics.c:131
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:193
+#: src/statistics/gnunet-statistics.c:133
+#, fuzzy, c-format
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+#: src/statistics/gnunet-statistics.c:177
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#: src/statistics/gnunet-statistics.c:183
 #, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:231
+#, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:201
+#: src/statistics/gnunet-statistics.c:239
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/statistics/gnunet-statistics.c:221
+#: src/statistics/gnunet-statistics.c:258
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:224
+#: src/statistics/gnunet-statistics.c:261
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:227
+#: src/statistics/gnunet-statistics.c:264
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:230
+#: src/statistics/gnunet-statistics.c:267
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:233
+#: src/statistics/gnunet-statistics.c:270
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:244
+#: src/statistics/gnunet-statistics.c:273
+msgid "connect to remote host"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:276
+msgid "port for remote host"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:289
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
-#: src/statistics/statistics_api.c:456
+#: src/statistics/statistics_api.c:511
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/statistics/statistics_api.c:999
+#: src/statistics/statistics_api.c:1053
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/testbed_api.c:252
+#: src/testbed/gnunet-testbed-profiler.c:705
+#, c-format
+msgid "No hosts-file specified on command line\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:716
+#, c-format
+msgid "No hosts loaded. Need atleast one host\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:779
+msgid "Only `CLIQUE' and `RANDOM' are permitted.\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:794
+msgid "create COUNT number of peers"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:797
+msgid "create COUNT number of random links"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:803
+msgid ""
+"Try to acheive TOPOLOGY. This options takes either CLIQUE or RANDOM. For "
+"CLIQUE the parameter -n is ignored. The default is to acheive a random graph "
+"topology."
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:818
+msgid "Profiler for testbed"
+msgstr ""
+
+#: src/testbed/testbed_api.c:325
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
+#: src/testbed/testbed_api_hosts.c:326
+#, fuzzy, c-format
+msgid "Hosts file %s not found\n"
+msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
+
+#: src/testbed/testbed_api_hosts.c:334
+#, c-format
+msgid "Hosts file %s has no data\n"
+msgstr ""
+
+#: src/testbed/testbed_api_hosts.c:341
+#, c-format
+msgid "Hosts file %s cannot be read\n"
+msgstr ""
+
 #: src/testbed/testbed_api_testbed.c:271
 msgid "Some operations are still pending. Cancelling them\n"
 msgstr ""
@@ -4105,49 +4353,49 @@
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:509
+#: src/testing/testing.c:518
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing.c:518
+#: src/testing/testing.c:528
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/testing/testing.c:829
+#: src/testing/testing.c:839
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing.c:840
+#: src/testing/testing.c:850
 #, 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:854
+#: src/testing/testing.c:864
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing.c:887
+#: src/testing/testing.c:897
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing.c:905
+#: src/testing/testing.c:915
 #, 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:966
+#: src/testing/testing.c:976
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1129
+#: src/testing/testing.c:1140
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -4280,7 +4528,7 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:513
-#: src/transport/gnunet-service-transport_blacklist.c:750
+#: src/transport/gnunet-service-transport_blacklist.c:751
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -4308,25 +4556,25 @@
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:352
+#: src/transport/gnunet-service-transport_clients.c:353
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:357
+#: src/transport/gnunet-service-transport_clients.c:358
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:509
+#: src/transport/gnunet-service-transport_clients.c:510
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:637
+#: src/transport/gnunet-service-transport_clients.c:651
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:688
+#: src/transport/gnunet-service-transport_clients.c:702
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -4340,110 +4588,110 @@
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1157
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1170
+#: src/transport/gnunet-service-transport_neighbours.c:1507
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1162
+#: src/transport/gnunet-service-transport_neighbours.c:1175
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1180
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1224
+#: src/transport/gnunet-service-transport_neighbours.c:1237
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1266
+#: src/transport/gnunet-service-transport_neighbours.c:1279
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1290
+#: src/transport/gnunet-service-transport_neighbours.c:1303
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1298
+#: src/transport/gnunet-service-transport_neighbours.c:1311
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1335
+#: src/transport/gnunet-service-transport_neighbours.c:1348
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1344
+#: src/transport/gnunet-service-transport_neighbours.c:1357
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1400
+#: src/transport/gnunet-service-transport_neighbours.c:1413
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1434
+#: src/transport/gnunet-service-transport_neighbours.c:1447
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1450
+#: src/transport/gnunet-service-transport_neighbours.c:1463
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2596
+#: src/transport/gnunet-service-transport_neighbours.c:2611
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2611
-#: src/transport/gnunet-service-transport_neighbours.c:2645
+#: src/transport/gnunet-service-transport_neighbours.c:2626
+#: src/transport/gnunet-service-transport_neighbours.c:2660
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2658
+#: src/transport/gnunet-service-transport_neighbours.c:2673
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2691
+#: src/transport/gnunet-service-transport_neighbours.c:2706
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2875
+#: src/transport/gnunet-service-transport_neighbours.c:2890
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2930
+#: src/transport/gnunet-service-transport_neighbours.c:2945
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2944
+#: src/transport/gnunet-service-transport_neighbours.c:2959
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2975
+#: src/transport/gnunet-service-transport_neighbours.c:2990
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2986
+#: src/transport/gnunet-service-transport_neighbours.c:3001
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3017
+#: src/transport/gnunet-service-transport_neighbours.c:3032
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3112
+#: src/transport/gnunet-service-transport_neighbours.c:3127
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -4472,33 +4720,33 @@
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:807
+#: src/transport/gnunet-service-transport_validation.c:808
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:872
+#: src/transport/gnunet-service-transport_validation.c:873
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1001
+#: src/transport/gnunet-service-transport_validation.c:1002
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1010
+#: src/transport/gnunet-service-transport_validation.c:1011
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1135
+#: src/transport/gnunet-service-transport_validation.c:1136
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1164
+#: src/transport/gnunet-service-transport_validation.c:1166
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1218
+#: src/transport/gnunet-service-transport_validation.c:1220
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
@@ -4595,41 +4843,41 @@
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2513
+#: src/transport/plugin_transport_http_server.c:2528
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2281
+#: src/transport/plugin_transport_http_server.c:2296
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
 #: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2313 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2328 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
 #: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2330 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2345 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
 #: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2441
+#: src/transport/plugin_transport_http_server.c:2456
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2609
+#: src/transport/plugin_transport_http_server.c:2624
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2620
+#: src/transport/plugin_transport_http_server.c:2635
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
@@ -4653,7 +4901,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2702
+#: src/transport/plugin_transport_http_server.c:2717
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
@@ -4662,98 +4910,98 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1419
+#: src/transport/plugin_transport_http_client.c:1463
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1550
-#: src/transport/plugin_transport_http_server.c:2826
+#: src/transport/plugin_transport_http_client.c:1594
+#: src/transport/plugin_transport_http_server.c:2841
 #, 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
+#: src/transport/plugin_transport_http_client.c:1619
+#: src/transport/plugin_transport_http_server.c:2900
 #, 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
+#: src/transport/plugin_transport_http_client.c:1647
+#: src/transport/plugin_transport_http_server.c:2747
 #, 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
+#: src/transport/plugin_transport_http_server.c:1317
 #, 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
+#: src/transport/plugin_transport_http_server.c:1575
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1568
+#: src/transport/plugin_transport_http_server.c:1583
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1869
+#: src/transport/plugin_transport_http_server.c:1884
 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:1893
+#: src/transport/plugin_transport_http_server.c:1908
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2588
+#: src/transport/plugin_transport_http_server.c:2603
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2602
+#: src/transport/plugin_transport_http_server.c:2617
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2627
+#: src/transport/plugin_transport_http_server.c:2642
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2642
+#: src/transport/plugin_transport_http_server.c:2657
 #, 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
+#: src/transport/plugin_transport_http_server.c:2667
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2673
+#: src/transport/plugin_transport_http_server.c:2688
 #, 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
+#: src/transport/plugin_transport_http_server.c:2698
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2718
+#: src/transport/plugin_transport_http_server.c:2733
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -4815,16 +5063,16 @@
 #: src/transport/plugin_transport_tcp.c:856
 #: src/transport/plugin_transport_tcp.c:906
 #: src/transport/plugin_transport_tcp.c:992
-#: src/transport/plugin_transport_tcp.c:1130
-#: src/transport/plugin_transport_tcp.c:1147
+#: src/transport/plugin_transport_tcp.c:1132
+#: src/transport/plugin_transport_tcp.c:1149
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
-#: src/transport/plugin_transport_tcp.c:1807
-#: src/transport/plugin_transport_tcp.c:2423
+#: src/transport/plugin_transport_tcp.c:1816
+#: src/transport/plugin_transport_tcp.c:2435
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
@@ -4844,49 +5092,49 @@
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1336
+#: src/transport/plugin_transport_tcp.c:1341
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1447
+#: src/transport/plugin_transport_tcp.c:1456
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1848
+#: src/transport/plugin_transport_tcp.c:1857
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2019
+#: src/transport/plugin_transport_tcp.c:2031
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2089
+#: src/transport/plugin_transport_tcp.c:2101
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2325 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2327
+#: src/transport/plugin_transport_tcp.c:2339
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2411
+#: src/transport/plugin_transport_tcp.c:2423
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2415
+#: src/transport/plugin_transport_tcp.c:2427
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2419
+#: src/transport/plugin_transport_tcp.c:2431
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -4906,14 +5154,14 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1965
+#: src/transport/plugin_transport_udp.c:2317
 #, 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:1979
+#: src/transport/plugin_transport_udp.c:2331
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -4921,103 +5169,103 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2192
+#: src/transport/plugin_transport_udp.c:2572
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2268
+#: src/transport/plugin_transport_udp.c:2648
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2311
+#: src/transport/plugin_transport_udp.c:2691
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_unix.c:1355
+#: src/transport/plugin_transport_unix.c:1333
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_wlan.c:560
+#: src/transport/plugin_transport_wlan.c:580
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:579
+#: src/transport/plugin_transport_wlan.c:599
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/plugin_transport_wlan.c:625
-#: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:1720
+#: src/transport/plugin_transport_wlan.c:645
+#: src/transport/plugin_transport_wlan.c:695
+#: src/transport/plugin_transport_wlan.c:1754
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:749
+#: src/transport/plugin_transport_wlan.c:770
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:773
+#: src/transport/plugin_transport_wlan.c:794
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:873
-#: src/transport/plugin_transport_wlan.c:954
-#: src/transport/plugin_transport_wlan.c:1722
+#: src/transport/plugin_transport_wlan.c:902
+#: src/transport/plugin_transport_wlan.c:987
+#: src/transport/plugin_transport_wlan.c:1756
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1135
+#: src/transport/plugin_transport_wlan.c:1169
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1156
+#: src/transport/plugin_transport_wlan.c:1190
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1166
+#: src/transport/plugin_transport_wlan.c:1200
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1223
+#: src/transport/plugin_transport_wlan.c:1257
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1324
+#: src/transport/plugin_transport_wlan.c:1358
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1359
+#: src/transport/plugin_transport_wlan.c:1393
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1420
+#: src/transport/plugin_transport_wlan.c:1454
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1529
+#: src/transport/plugin_transport_wlan.c:1563
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1703
+#: src/transport/plugin_transport_wlan.c:1737
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:575
+#: src/transport/transport_api.c:593
 #, 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"
@@ -5057,43 +5305,43 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:984
+#: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:988
+#: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/client.c:369
+#: src/util/client.c:371
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:377
+#: src/util/client.c:379
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:695
+#: src/util/client.c:698
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:895
+#: src/util/client.c:898
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/client.c:909
+#: src/util/client.c:912
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/client.c:1162
+#: src/util/client.c:1168
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -5162,34 +5410,29 @@
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:420
+#: src/util/connection.c:427
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/connection.c:435
+#: src/util/connection.c:442
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:550
+#: src/util/connection.c:557
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/connection.c:739 src/util/connection.c:909
+#: src/util/connection.c:755 src/util/connection.c:921
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/connection.c:748
+#: src/util/connection.c:912
 #, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-
-#: src/util/connection.c:900
-#, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Anslutning misslyckades\n"
 
@@ -5200,157 +5443,167 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:313
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
-
-#: 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:640
+#: src/util/crypto_ecc.c:448 src/util/crypto_rsa.c:644
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 "Deleting it.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/util/crypto_rsa.c:657
+#: src/util/crypto_ecc.c:463 src/util/crypto_rsa.c:661
 #, 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
+#: src/util/crypto_ecc.c:559 src/util/crypto_ecc.c:603
+#: src/util/crypto_rsa.c:759 src/util/crypto_rsa.c:803
 #, 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:760
+#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:764
 #, 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:778
-#, c-format
-msgid "I am host `%s'.  Stored new private key in `%s'.\n"
+#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:807
+#: src/util/crypto_rsa.c:843
+msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: 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:837
+#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:838
 #, c-format
 msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:857
+#: src/util/crypto_ecc.c:643
+msgid "This may be ok if someone is currently generating a key.\n"
+msgstr ""
+
+#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:858
 #, 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
+#: src/util/crypto_ecc.c:780 src/util/crypto_rsa.c:946
+msgid "interrupted by shutdown"
+msgstr ""
+
+#: src/util/crypto_ecc.c:791
+#, fuzzy
+msgid "gnunet-ecc failed"
+msgstr "gnunet-update misslyckades!"
+
+#: src/util/crypto_ecc.c:986
 #, fuzzy, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
-msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_rsa.c:948
-msgid "interrupted by shutdown"
+#: src/util/crypto_ecc.c:1054
+#, fuzzy, c-format
+msgid "ECC signature verification failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/util/crypto_random.c:313
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:959
+#: 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:957
 #, fuzzy
 msgid "gnunet-rsa failed"
 msgstr "gnunet-update misslyckades!"
 
-#: src/util/crypto_rsa.c:1347
+#: src/util/crypto_rsa.c:1348
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/disk.c:571
+#: src/util/disk.c:567
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk.c:1140
+#: src/util/disk.c:1136
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk.c:1494 src/util/service.c:1667
+#: src/util/disk.c:1490 src/util/service.c:1667
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:1866
+#: src/util/disk.c:1862
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/util/getopt.c:669
+#: src/util/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/getopt.c:693
+#: src/util/getopt.c:594
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:698
+#: src/util/getopt.c:599
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:715 src/util/getopt.c:883
+#: src/util/getopt.c:616 src/util/getopt.c:783
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flagga \"%s\" kräver ett argument\n"
 
-#: src/util/getopt.c:744
+#: src/util/getopt.c:645
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: src/util/getopt.c:748
+#: src/util/getopt.c:649
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: src/util/getopt.c:773
+#: src/util/getopt.c:674
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: otillåten flagga -- %c\n"
 
-#: src/util/getopt.c:775
+#: src/util/getopt.c:676
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: src/util/getopt.c:803 src/util/getopt.c:931
+#: src/util/getopt.c:704 src/util/getopt.c:831
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: flagga kräver ett argument -- %c\n"
 
-#: src/util/getopt.c:851
+#: src/util/getopt.c:752
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flagga \"-W %s\" är tvetydig\n"
 
-#: src/util/getopt.c:869
+#: src/util/getopt.c:770
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:1035
+#: src/util/getopt.c:935
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Använd --help för att få en lista på flaggor.\n"
@@ -5405,64 +5658,69 @@
 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 ""
-
-#: src/util/gnunet-resolver.c:158
-msgid "Use build-in GNUnet stub resolver"
-msgstr ""
-
-#: src/util/gnunet-rsa.c:114
+#: src/util/gnunet-ecc.c:107 src/util/gnunet-rsa.c:107
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/gnunet-rsa.c:120
+#: src/util/gnunet-ecc.c:113 src/util/gnunet-rsa.c:113
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:138
+#: src/util/gnunet-ecc.c:128 src/util/gnunet-rsa.c:137
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/gnunet-rsa.c:150
+#: src/util/gnunet-ecc.c:140 src/util/gnunet-rsa.c:149
 #, fuzzy, c-format
 msgid "Finished!\n"
 msgstr "Slutför"
 
-#: src/util/gnunet-rsa.c:173
+#: src/util/gnunet-ecc.c:163 src/util/gnunet-rsa.c:172
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:230
+#: src/util/gnunet-ecc.c:220 src/util/gnunet-rsa.c:229
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:233
+#: src/util/gnunet-ecc.c:223 src/util/gnunet-rsa.c:232
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:236
+#: src/util/gnunet-ecc.c:226 src/util/gnunet-rsa.c:235
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:239
+#: src/util/gnunet-ecc.c:229 src/util/gnunet-rsa.c:238
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:242
+#: src/util/gnunet-ecc.c:232 src/util/gnunet-rsa.c:241
 msgid ""
 "use insecure, weak random number generator for key generation (for testing "
 "only)"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:252
+#: src/util/gnunet-ecc.c:242
+#, fuzzy
+msgid "Manipulate GNUnet private ECC key files"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
+#: src/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
+msgstr ""
+
+#: src/util/gnunet-resolver.c:158
+msgid "Use build-in GNUnet stub resolver"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:251
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5506,50 +5764,35 @@
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/helper.c:280
-#, c-format
-msgid "Got 0 bytes from helper `%s' (EOF)\n"
-msgstr ""
-
-#: src/util/helper.c:296
-#, c-format
-msgid "Got %u bytes from helper `%s'\n"
-msgstr ""
-
 #: 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:343
+#: src/util/helper.c:500
 #, fuzzy, c-format
-msgid "Starting HELPER process `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/util/helper.c:496
-#, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/network.c:99
+#: src/util/network.c:127
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1278
+#: src/util/network.c:1318
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:325
+#: src/util/os_installation.c:416
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:522
+#: src/util/os_installation.c:644
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
@@ -5584,6 +5827,11 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
+#: src/util/program.c:251
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
 #: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
@@ -5622,11 +5870,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/scheduler.c:786
+#: src/util/scheduler.c:781
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:916
+#: src/util/scheduler.c:911
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -5647,11 +5895,11 @@
 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:836
+#: src/util/server.c:835
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+"`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
 #: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
@@ -5768,7 +6016,7 @@
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/service.c:1746
+#: src/util/service.c:1747
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5777,70 +6025,74 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Anrop till \"%s\" returnerade %d.\n"
 
-#: src/util/strings.c:145
+#: src/util/strings.c:146
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:385
+#: src/util/strings.c:384 src/util/strings.c:404
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:534
+#: src/util/strings.c:525
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:631
+#: src/util/strings.c:622
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:635
+#: src/util/strings.c:626
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:641
+#: src/util/strings.c:628
+msgid "0 ms"
+msgstr ""
+
+#: src/util/strings.c:634
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:647
+#: src/util/strings.c:640
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:653
+#: src/util/strings.c:646
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:660
+#: src/util/strings.c:653
 #, fuzzy
 msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:662
+#: src/util/strings.c:655
 #, fuzzy
 msgid "days"
 msgstr " dagar"
 
-#: src/util/strings.c:689
+#: src/util/strings.c:682
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1078
+#: src/util/strings.c:1070
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1086
+#: src/util/strings.c:1078
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1092
+#: src/util/strings.c:1084
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1099
+#: src/util/strings.c:1091
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1108
+#: src/util/strings.c:1100
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
@@ -5939,11 +6191,11 @@
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3139
+#: src/vpn/gnunet-service-vpn.c:3114
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3171
+#: src/vpn/gnunet-service-vpn.c:3146
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -6019,23 +6271,43 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
-#: src/include/gnunet_common.h:591
+#: src/include/gnunet_common.h:579 src/include/gnunet_common.h:584
+#: src/include/gnunet_common.h:590
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:601
+#: src/include/gnunet_common.h:600
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:621 src/include/gnunet_common.h:628
 #, 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 "list information for the given peer"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "list information for all peers"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Malformed %s `%s' given in configuration!\n"
+#~ msgstr "Kunde inte spara konfiguration!"
+
+#, fuzzy
+#~ msgid "I am host `%s'.  Read private key from `%s'.\n"
+#~ msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Starting HELPER process `%s'\n"
+#~ msgstr "Startade samling \"%s\".\n"
+
+#, fuzzy
 #~ msgid "Asked to start service `%s' within %llu ms\n"
 #~ msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
 
@@ -6162,10 +6434,6 @@
 #~ 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"
 
@@ -6451,9 +6719,6 @@
 #~ msgid "be verbose"
 #~ msgstr "var informativ"
 
-#~ msgid "use configuration file FILENAME"
-#~ msgstr "använd konfigurationsfil FILNAMN"
-
 #, fuzzy
 #~ msgid "Failed to stop service `%s'!\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -6531,10 +6796,6 @@
 #~ msgstr "Kunde inte slå upp \"%s\": %s\n"
 
 #, fuzzy
-#~ msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
-#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-
-#, fuzzy
 #~ msgid "Misconfigured address to bind to in configuration!\n"
 #~ msgstr "Inga applikationer definierade i konfiguration!\n"
 
@@ -7423,9 +7684,6 @@
 #~ msgid "Database failed to delete `%s'.\n"
 #~ msgstr "Databas misslyckades att ta bort \"%s\".\n"
 
-#~ msgid "`%s' failed: table not found!\n"
-#~ msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
-
 #~ msgid "`%s' failed.  Terminating connection to client.\n"
 #~ msgstr "\"%s\" misslyckades.  Terminerar anslutning till klient.\n"
 
@@ -7748,13 +8006,6 @@
 #~ msgid "You must specify a non-empty set of transports to test!\n"
 #~ msgstr "Du måste ange en icke-tom uppsättning av transporter att testa!\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "Exiting.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Avslutar.\n"
-
 #~ msgid "Updated data for %d applications.\n"
 #~ msgstr "Uppdaterade data för %d program.\n"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2012-10-31 15:10:17 UTC (rev 24637)
+++ gnunet/po/vi.po     2012-10-31 15:21:37 UTC (rev 24638)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-09-27 21:17+0200\n"
+"POT-Creation-Date: 2012-10-31 13:48+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -19,7 +19,7 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/arm/arm_api.c:165
+#: src/arm/arm_api.c:162
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
@@ -153,84 +153,84 @@
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:332
+#: src/arm/gnunet-service-arm.c:326
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-service-arm.c:335
+#: src/arm/gnunet-service-arm.c:329
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:361
+#: src/arm/gnunet-service-arm.c:355
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:393
+#: src/arm/gnunet-service-arm.c:387
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:523
+#: src/arm/gnunet-service-arm.c:517
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/arm/gnunet-service-arm.c:545
+#: src/arm/gnunet-service-arm.c:539
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:559
+#: src/arm/gnunet-service-arm.c:553
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:667
+#: src/arm/gnunet-service-arm.c:661
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:878
+#: src/arm/gnunet-service-arm.c:872
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:970
+#: src/arm/gnunet-service-arm.c:965
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:975
+#: src/arm/gnunet-service-arm.c:970
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:980
+#: src/arm/gnunet-service-arm.c:975
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:986
+#: src/arm/gnunet-service-arm.c:981
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:1021
+#: src/arm/gnunet-service-arm.c:1016
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1214
+#: src/arm/gnunet-service-arm.c:1210
 #, 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:1225
+#: src/arm/gnunet-service-arm.c:1221
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1239
+#: src/arm/gnunet-service-arm.c:1235
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -239,17 +239,44 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats.c:93
-#, fuzzy
-msgid "list information for the given peer"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
+#: src/ats-tool/gnunet-ats.c:67
+#, c-format
+msgid ""
+"Peer `%s' plugin `%s', address `%s', bandwidth out: %u Bytes/s, bandwidth in "
+"%u Bytes/s\n"
+msgstr ""
 
-#: src/ats/gnunet-ats.c:96
+#: src/ats-tool/gnunet-ats.c:129
+#, c-format
+msgid "%u address resolutions had a timeout\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:131
+#, c-format
+msgid "ATS returned results for %u addresses\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:142 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/ats-tool/gnunet-ats.c:149
+#, fuzzy, c-format
+msgid "Cannot connect to ATS service, exiting...\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/ats-tool/gnunet-ats.c:194
 #, fuzzy
-msgid "list information for all peers"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
+msgid "do not resolve IP addresses to hostnames"
+msgstr "không quyết định các tên máy"
 
-#: src/ats/gnunet-ats.c:105
+#: src/ats-tool/gnunet-ats.c:197
+msgid "monitor mode"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:206
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -259,7 +286,7 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/core/core_api.c:757
+#: src/core/core_api.c:755
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -284,7 +311,7 @@
 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:818
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:825
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -376,7 +403,7 @@
 msgstr "# các thông báo được chắp liền"
 
 #: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:812
+#: src/transport/gnunet-service-transport_validation.c:813
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
@@ -404,7 +431,7 @@
 msgstr "# các thông báo PING nhập thô được gửi"
 
 #: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1108
+#: src/transport/gnunet-service-transport_validation.c:1109
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -465,7 +492,7 @@
 msgstr "# các byte đã giải mã"
 
 #: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
-#: src/peerinfo-tool/gnunet-peerinfo.c:824
+#: src/peerinfo-tool/gnunet-peerinfo.c:831
 #: src/transport/gnunet-service-transport.c:627
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
@@ -494,14 +521,14 @@
 #: src/core/gnunet-service-core_sessions.c:269
 #: 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/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
 #: src/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
-#: src/transport/gnunet-service-transport_neighbours.c:873
+#: src/transport/gnunet-service-transport_neighbours.c:872
 #: src/transport/gnunet-service-transport_neighbours.c:1089
 #: src/transport/gnunet-service-transport_neighbours.c:1098
-#: src/transport/gnunet-service-transport_neighbours.c:2620
-#: src/transport/gnunet-service-transport_neighbours.c:2882
+#: src/transport/gnunet-service-transport_neighbours.c:2635
+#: src/transport/gnunet-service-transport_neighbours.c:2897
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
@@ -567,9 +594,9 @@
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:608
-#: src/include/gnunet_common.h:615
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ecc.c:53
+#: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
+#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
 #, c-format
 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"
@@ -582,17 +609,17 @@
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:410
+#: src/datacache/plugin_datacache_sqlite.c:405
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:443
-#: src/datastore/plugin_datastore_sqlite.c:406
-#: src/namestore/plugin_namestore_sqlite.c:369
+#: src/datacache/plugin_datacache_sqlite.c:438
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namestore/plugin_namestore_sqlite.c:362
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:450
+#: src/datacache/plugin_datacache_sqlite.c:445
 #, fuzzy, c-format
 msgid "Failed to close statement %p: %d\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -601,24 +628,24 @@
 msgid "Template datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:305
+#: src/datastore/datastore_api.c:310
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:388
+#: src/datastore/datastore_api.c:393
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:432
+#: src/datastore/datastore_api.c:437
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:459
+#: src/datastore/datastore_api.c:465
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/datastore/datastore_api.c:477
+#: src/datastore/datastore_api.c:483
 #, fuzzy
 msgid "# Requests dropped from datastore queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
@@ -628,73 +655,69 @@
 msgid "# datastore connections (re)created"
 msgstr "# các kết nối dht"
 
-#: src/datastore/datastore_api.c:548
-msgid "# reconnected to DATASTORE"
-msgstr ""
-
-#: src/datastore/datastore_api.c:612
+#: src/datastore/datastore_api.c:608
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/datastore/datastore_api.c:633
+#: src/datastore/datastore_api.c:630
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datastore/datastore_api.c:764
+#: src/datastore/datastore_api.c:762
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:778
+#: src/datastore/datastore_api.c:776
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
+#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/datastore/datastore_api.c:800
+#: src/datastore/datastore_api.c:798
 #, fuzzy
 msgid "# status messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/datastore/datastore_api.c:869
+#: src/datastore/datastore_api.c:867
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:936
+#: src/datastore/datastore_api.c:934
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:997
+#: src/datastore/datastore_api.c:995
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1054
+#: src/datastore/datastore_api.c:1052
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1118
+#: src/datastore/datastore_api.c:1116
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1163
+#: src/datastore/datastore_api.c:1161
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1221
+#: src/datastore/datastore_api.c:1220
 #, fuzzy
 msgid "# Results received"
 msgstr "# các kết quả dht được nhận"
@@ -707,7 +730,7 @@
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1409
+#: src/datastore/datastore_api.c:1410
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
@@ -891,7 +914,7 @@
 "Không nhận được đáp ứng từ gnunetd.\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:654
+#: src/namestore/plugin_namestore_postgres.c:652
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -900,30 +923,30 @@
 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:258
-#: src/namestore/plugin_namestore_sqlite.c:228
+#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/namestore/plugin_namestore_sqlite.c:223
 #, 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:653
+#: src/datastore/plugin_datastore_sqlite.c:648
 #, 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:1137
+#: src/datastore/plugin_datastore_sqlite.c:1132
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1156
+#: src/datastore/plugin_datastore_sqlite.c:1151
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1196
-#: src/namestore/plugin_namestore_sqlite.c:834
+#: src/datastore/plugin_datastore_sqlite.c:1191
+#: src/namestore/plugin_namestore_sqlite.c:827
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -979,7 +1002,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:750
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:733
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:1033
@@ -1286,23 +1309,38 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
+#: src/dns/dnsparser.c:110
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/dns/dnsparser.c:584
+#, fuzzy, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
 #: 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
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/gns/gnunet-service-gns_resolver.c:1669
 #, 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
+#: src/dns/dnsstub.c:299
+#, fuzzy, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/dns/dnsstub.c:368
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:430
+#: src/dns/dnsstub.c:440
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -1331,58 +1369,59 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:499
+#: src/dns/gnunet-service-dns.c:512
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:639
+#: src/dns/gnunet-service-dns.c:659
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:821
+#: src/dns/gnunet-service-dns.c:845
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:892
+#: src/dns/gnunet-service-dns.c:924
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1005
+#: src/dns/gnunet-service-dns.c:1039
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1021
+#: src/dns/gnunet-service-dns.c:1055
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1030
+#: src/dns/gnunet-service-dns.c:1064
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1039
+#: src/dns/gnunet-service-dns.c:1073
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1104
+#: src/dns/gnunet-service-dns.c:1140
 #, 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:1180 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1216 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1245 src/exit/gnunet-daemon-exit.c:3032
+#: src/dns/gnunet-service-dns.c:1281 src/exit/gnunet-daemon-exit.c:3007
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1266
-msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
-msgstr ""
+#: src/dns/gnunet-service-dns.c:1302
+#, fuzzy
+msgid "need a valid IPv4 or IPv6 address\n"
+msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/dv/dv_api.c:179
+#: src/dv/dv_api.c:189
 #, fuzzy
 msgid "Failed to connect to the dv service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -1562,35 +1601,35 @@
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3048
+#: src/exit/gnunet-daemon-exit.c:3023
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3056
+#: src/exit/gnunet-daemon-exit.c:3031
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3063
+#: src/exit/gnunet-daemon-exit.c:3038
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3069
+#: src/exit/gnunet-daemon-exit.c:3044
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3050 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3241
+#: src/exit/gnunet-daemon-exit.c:3216
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1612,113 +1651,113 @@
 msgid "# messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/fragmentation/fragmentation.c:203
+#: src/fragmentation/fragmentation.c:208
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:206
+#: src/fragmentation/fragmentation.c:211
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:232
+#: src/fragmentation/fragmentation.c:237
 #, fuzzy
 msgid "# fragments wrap arounds"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:273
+#: src/fragmentation/fragmentation.c:281
 msgid "# messages fragmented"
 msgstr "# các thông báo bị tế phân"
 
-#: src/fragmentation/fragmentation.c:276
+#: src/fragmentation/fragmentation.c:284
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:363
+#: src/fragmentation/fragmentation.c:405
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Các quảng cáo đồng đẳng được nhận"
 
-#: src/fragmentation/fragmentation.c:369
+#: src/fragmentation/fragmentation.c:411
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:393
+#: src/fragmentation/fragmentation.c:435
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:450
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:500
+#: src/fs/fs_api.c:459
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:506
+#: src/fs/fs_api.c:465
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1087
+#: src/fs/fs_api.c:1046
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1546
+#: src/fs/fs_api.c:1505
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1588
+#: src/fs/fs_api.c:1547
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1604
+#: src/fs/fs_api.c:1563
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2254
+#: src/fs/fs_api.c:2213
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2264
+#: src/fs/fs_api.c:2223
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2389 src/fs/fs_api.c:2629
+#: src/fs/fs_api.c:2348 src/fs/fs_api.c:2588
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2406
+#: src/fs/fs_api.c:2365
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2419 src/fs/fs_api.c:2438 src/fs/fs_api.c:2922
+#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2397 src/fs/fs_api.c:2881
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2620
+#: src/fs/fs_api.c:2579
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2866
+#: src/fs/fs_api.c:2825
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2960
+#: src/fs/fs_api.c:2919
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1779,12 +1818,12 @@
 msgid "internal error decoding tree"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_download.c:1920
+#: src/fs/fs_download.c:1927
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/fs/fs_getopt.c:191
+#: src/fs/fs_getopt.c:192
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2090,35 +2129,35 @@
 msgid "Failed to run `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/gnunet-auto-share.c:684
+#: src/fs/gnunet-auto-share.c:686
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-auto-share.c:734 src/fs/gnunet-pseudonym.c:279
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
 #: 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:684
+#: src/fs/gnunet-auto-share.c:741 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:687
+#: src/fs/gnunet-auto-share.c:744 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:711
+#: src/fs/gnunet-auto-share.c:747 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-auto-share.c:750 src/fs/gnunet-pseudonym.c:304
 #: src/fs/gnunet-publish.c:718
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:767
+#: src/fs/gnunet-auto-share.c:770
 #, fuzzy
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Tự động chia sẻ một thư mục."
@@ -2261,7 +2300,7 @@
 msgid "Special file-sharing operations"
 msgstr "Tùy chọn chia sẻ tập tin"
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:161
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:198
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -2540,158 +2579,158 @@
 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"
 
-#: src/fs/gnunet-service-fs.c:240
+#: src/fs/gnunet-service-fs.c:245
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
+#: src/fs/gnunet-service-fs.c:306 src/fs/gnunet-service-fs.c:496
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
-#: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/fs/gnunet-service-fs.c:588 src/hostlist/gnunet-daemon-hostlist.c:297
 #: 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:704
+#: src/fs/gnunet-service-fs_cp.c:711
 #, 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:708
+#: src/fs/gnunet-service-fs_cp.c:715
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:744
+#: src/fs/gnunet-service-fs_cp.c:751
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/fs/gnunet-service-fs_cp.c:750
+#: src/fs/gnunet-service-fs_cp.c:757
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:1333
+#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1345
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:867
+#: src/fs/gnunet-service-fs_cp.c:875
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:928
 #, 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:928
+#: src/fs/gnunet-service-fs_cp.c:936
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:942
+#: src/fs/gnunet-service-fs_cp.c:950
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:980
+#: src/fs/gnunet-service-fs_cp.c:988
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1047
+#: src/fs/gnunet-service-fs_cp.c:1056
 #, 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:1071
+#: src/fs/gnunet-service-fs_cp.c:1081
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1081
+#: src/fs/gnunet-service-fs_cp.c:1091
 #, 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:1160
+#: src/fs/gnunet-service-fs_cp.c:1170
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1194
+#: src/fs/gnunet-service-fs_cp.c:1204
 #, 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:1216
+#: src/fs/gnunet-service-fs_cp.c:1227
 #, 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:1276
+#: src/fs/gnunet-service-fs_cp.c:1288
 #, 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:1302
+#: src/fs/gnunet-service-fs_cp.c:1314
 #, 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:1331
+#: src/fs/gnunet-service-fs_cp.c:1343
 #, 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:1687
+#: src/fs/gnunet-service-fs_cp.c:1713
 #, 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:120
-#: src/fs/gnunet-service-fs_indexing.c:175
+#: src/fs/gnunet-service-fs_indexing.c:130
+#: src/fs/gnunet-service-fs_indexing.c:181
 #, 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:136
+#: src/fs/gnunet-service-fs_indexing.c:142
 #, 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:226
+#: src/fs/gnunet-service-fs_indexing.c:237
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:264
+#: src/fs/gnunet-service-fs_indexing.c:275
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:479
+#: src/fs/gnunet-service-fs_indexing.c:477
 #, 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:537
+#: src/fs/gnunet-service-fs_indexing.c:542
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:552
+#: src/fs/gnunet-service-fs_indexing.c:557
 #, 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:554
+#: src/fs/gnunet-service-fs_indexing.c:559
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:569
+#: src/fs/gnunet-service-fs_indexing.c:574
 #, 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"
@@ -2716,144 +2755,144 @@
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:265
+#: src/fs/gnunet-service-fs_pe.c:269
 #, fuzzy
 msgid "# average retransmission delay (ms)"
 msgstr "# thời gian trung bình còn kết nối (theo miligiây)"
 
-#: src/fs/gnunet-service-fs_pe.c:391
+#: src/fs/gnunet-service-fs_pe.c:397
 #, fuzzy
 msgid "# transmission failed (core has no bandwidth)"
 msgstr "Lỗi thử gửi, kiểu truyền tải %d không được hỗ trợ\n"
 
-#: src/fs/gnunet-service-fs_pe.c:420
+#: src/fs/gnunet-service-fs_pe.c:426
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/fs/gnunet-service-fs_pe.c:469
+#: src/fs/gnunet-service-fs_pe.c:475
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:476
+#: src/fs/gnunet-service-fs_pe.c:483
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_pe.c:538
+#: src/fs/gnunet-service-fs_pe.c:543
 #, fuzzy
 msgid "# requests merged"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:544
+#: src/fs/gnunet-service-fs_pe.c:551
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:684
-#: src/fs/gnunet-service-fs_pe.c:751
+#: src/fs/gnunet-service-fs_pe.c:605 src/fs/gnunet-service-fs_pe.c:689
+#: src/fs/gnunet-service-fs_pe.c:757
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:285
+#: src/fs/gnunet-service-fs_pr.c:293
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:618
+#: src/fs/gnunet-service-fs_pr.c:385 src/fs/gnunet-service-fs_pr.c:639
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:781
+#: src/fs/gnunet-service-fs_pr.c:802
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:810
+#: src/fs/gnunet-service-fs_pr.c:834
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:824
+#: src/fs/gnunet-service-fs_pr.c:849
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:837
+#: src/fs/gnunet-service-fs_pr.c:862
 #, fuzzy
 msgid "# results found locally"
 msgstr "# nội dung lỗ hổng được tìm cục bộ"
 
-#: src/fs/gnunet-service-fs_pr.c:955
+#: src/fs/gnunet-service-fs_pr.c:983
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:982
+#: src/fs/gnunet-service-fs_pr.c:1010
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_pr.c:1017
+#: src/fs/gnunet-service-fs_pr.c:1045
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1108
+#: src/fs/gnunet-service-fs_pr.c:1136
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1128
+#: src/fs/gnunet-service-fs_pr.c:1156
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1174
+#: src/fs/gnunet-service-fs_pr.c:1203
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1218
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1197
+#: src/fs/gnunet-service-fs_pr.c:1227
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1242
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1224
+#: src/fs/gnunet-service-fs_pr.c:1256
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1237
+#: src/fs/gnunet-service-fs_pr.c:1269
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1274
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1269 src/fs/gnunet-service-fs_pr.c:1309
-#: src/fs/gnunet-service-fs_pr.c:1447
+#: src/fs/gnunet-service-fs_pr.c:1301 src/fs/gnunet-service-fs_pr.c:1341
+#: src/fs/gnunet-service-fs_pr.c:1481
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1327
+#: src/fs/gnunet-service-fs_pr.c:1359
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1370
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1457
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1542
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -2897,7 +2936,7 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:575
+#: src/gns/gns_api.c:598
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr ""
@@ -2925,7 +2964,7 @@
 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)"
+msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
 #: src/gns/gnunet-dns2gns.c:676
@@ -2940,39 +2979,39 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:182
+#: src/gns/gnunet-gns.c:221
 #, 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:293
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid "Please specify lookup, shorten or authority operation!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:315
+#: src/gns/gnunet-gns.c:356
 #, fuzzy
 msgid "try to shorten a given name"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:318
+#: src/gns/gnunet-gns.c:359
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:321
+#: src/gns/gnunet-gns.c:362
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:324
+#: src/gns/gnunet-gns.c:365
 #, 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:327
+#: src/gns/gnunet-gns.c:368
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:341
+#: src/gns/gnunet-gns.c:381
 msgid "GNUnet GNS access tool"
 msgstr ""
 
@@ -3024,7 +3063,7 @@
 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:936 src/gns/gnunet-gns-proxy.c:2887
+#: src/gns/gnunet-gns-fcfsd.c:936 src/gns/gnunet-gns-proxy.c:2857
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
@@ -3033,38 +3072,48 @@
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2528
+#: src/gns/gnunet-gns-proxy.c:2494
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/gns/gnunet-gns-proxy.c:2556
+#: src/gns/gnunet-gns-proxy.c:2522
 #, 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:3564
+#: src/gns/gnunet-gns-proxy.c:3510
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3567
+#: src/gns/gnunet-gns-proxy.c:3513
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3582
+#: src/gns/gnunet-gns-proxy.c:3525
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:401
+#: src/gns/gnunet-service-gns.c:486
 #, c-format
 msgid "Records for name `%s' in zone %s too large to fit into DHT"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1197
+#: src/gns/gnunet-service-gns.c:1216
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
+#: src/gns/gnunet-service-gns.c:1277
+#, fuzzy
+msgid "Could not connect to DHT!\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/gns/gnunet-service-gns.c:1288
+#, fuzzy
+msgid "Unable to initialize resolver!\n"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
+
 #: src/hello/gnunet-hello.c:122
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3150,179 +3199,140 @@
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
-#, fuzzy, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
-msgstr ""
-"Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
-
-#: src/hostlist/hostlist-client.c:473 src/hostlist/hostlist-client.c:683
-#: 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:994
-#: src/transport/plugin_transport_http_client.c:1009
+#: src/hostlist/hostlist-client.c:469 src/hostlist/hostlist-client.c:680
+#: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
+#: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
+#: src/hostlist/hostlist-client.c:958 src/hostlist/hostlist-client.c:963
+#: src/transport/plugin_transport_http_client.c:1026
+#: src/transport/plugin_transport_http_client.c:1041
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1325
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:623
+#: src/hostlist/hostlist-client.c:619
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/hostlist-client.c:661
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/hostlist-client.c:799
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/hostlist-client.c:813
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/hostlist-client.c:833
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:839
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/hostlist-client.c:847
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/hostlist-client.c:900
 #, fuzzy, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/hostlist-client.c:908
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
+#: src/hostlist/hostlist-client.c:1035 src/hostlist/hostlist-client.c:1498
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1046
+#: src/hostlist/hostlist-client.c:1043
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1084
-msgid "Scheduled saving of hostlists\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1088
-#, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127
+#: src/hostlist/hostlist-client.c:1107 src/hostlist/hostlist-client.c:1123
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/hostlist-client.c:1242
-#, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
-msgstr ""
-
 #: src/hostlist/hostlist-client.c:1273
 #, fuzzy, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
-msgstr ""
-"Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
-
-#: src/hostlist/hostlist-client.c:1279
-#, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:1283
-#, c-format
-msgid "Hostlist file `%s' is not existing\n"
-msgstr ""
+#: src/hostlist/hostlist-client.c:1277
+#, fuzzy, c-format
+msgid "Hostlist file `%s' does not exist\n"
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1288
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1327
+#: src/hostlist/hostlist-client.c:1321
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/hostlist-client.c:1323
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1362
+#: src/hostlist/hostlist-client.c:1368
 #, fuzzy, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
-msgstr ""
-"Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
-
-#: src/hostlist/hostlist-client.c:1376
-#, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/hostlist-client.c:1373
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/hostlist-client.c:1397 src/hostlist/hostlist-client.c:1414
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/hostlist-client.c:1409
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1470
+#: src/hostlist/hostlist-client.c:1463
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1473
-#, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1482
+#: src/hostlist/hostlist-client.c:1475
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1494
+#: src/hostlist/hostlist-client.c:1487
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1498
+#: src/hostlist/hostlist-client.c:1491
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
@@ -3362,10 +3372,6 @@
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:273
-msgid "Sending 100 CONTINUE reply\n"
-msgstr ""
-
 #: src/hostlist/hostlist-server.c:279
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
@@ -3448,28 +3454,149 @@
 msgid "help text"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7703
+#: src/mesh/gnunet-regex-profiler.c:1126
+#: src/testbed/gnunet-testbed-profiler.c:323
+msgid "An operation has failed while starting peers\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1192
+#: src/testbed/gnunet-testbed-profiler.c:390
+#, fuzzy, c-format
+msgid "Creating a peer failed. Error: %s\n"
+msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1306
+#: src/testbed/gnunet-testbed-profiler.c:495
+msgid "An operation has failed while starting slaves\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1359
+msgid "An operation has failed while linking\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1486
+#: src/testbed/gnunet-testbed-profiler.c:597
+#, c-format
+msgid "Host registration failed for a host. Error: %s\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1566
+#: src/testbed/gnunet-testbed-profiler.c:676
+msgid "Unable to connect to master controller -- Check config\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1663
+#, c-format
+msgid "No hosts-file specified on command line. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1668
+#: src/regex/gnunet-regex-simulation-profiler.c:498
+#, c-format
+msgid "No policy directory specified on command line. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1674
+#, c-format
+msgid "No hosts loaded. Need at least one host\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1681
+#: src/testbed/gnunet-testbed-profiler.c:723
+#, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1688
+#: src/testbed/gnunet-testbed-profiler.c:730
+#, fuzzy, c-format
+msgid "Exiting\n"
+msgstr "Thoát"
+
+#: src/mesh/gnunet-regex-profiler.c:1694
+#, fuzzy, c-format
+msgid "No configuration file given. Exiting\n"
+msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
+
+#: src/mesh/gnunet-regex-profiler.c:1711
+#: src/regex/gnunet-regex-simulation-profiler.c:504
+#, c-format
+msgid "Specified policies directory does not exist. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1718
+#, c-format
+msgid "No search strings file given. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1724
+#, c-format
+msgid ""
+"Error loading search strings. Given file does not contain enough strings. "
+"Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1730
+#, fuzzy, c-format
+msgid "Error loading search strings. Exiting.\n"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1764
+#, fuzzy
+msgid "name of the file for writing statistics"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1767
+msgid "create FACTOR times number of peers random links"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1770
+#: src/testbed/gnunet-testbed-profiler.c:800
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1773
+msgid "wait TIMEOUT before considering a string match as failed"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1776
+msgid "wait DELAY before starting string search"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1779
+msgid "number of search strings to read from search strings file"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1782
+#: src/regex/gnunet-regex-simulation-profiler.c:555
+msgid "maximum path compression length"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1794
+msgid "Profiler for regex/mesh"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:7971
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7908
+#: src/mesh/gnunet-service-mesh.c:8176
 #, 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
+#: src/mesh/gnunet-service-mesh.c:8265 src/mesh/gnunet-service-mesh.c:8277
+#: src/mesh/gnunet-service-mesh.c:8289 src/mesh/gnunet-service-mesh.c:8302
+#: src/mesh/gnunet-service-mesh.c:8317 src/mesh/gnunet-service-mesh.c:8329
+#: src/mesh/gnunet-service-mesh.c:8341 src/mesh/gnunet-service-mesh.c:8353
 #, fuzzy, c-format
-msgid "Mesh service is lacking key configuration settings (%s).  Exiting.\n"
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/mesh/gnunet-service-mesh.c:8093 src/mesh/gnunet-service-mesh.c:8104
+#: src/mesh/gnunet-service-mesh.c:8365 src/mesh/gnunet-service-mesh.c:8376
 #, fuzzy, c-format
 msgid ""
-"Mesh service is lacking key configuration settings (%s). Using default "
-"(%u).\n"
+"%s service is lacking key configuration settings (%s). Using default (%u).\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
 #: src/mysql/mysql.c:174
@@ -3558,16 +3685,11 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#: src/peerinfo-tool/gnunet-peerinfo.c:882
 #, 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: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:625
 #, fuzzy, c-format
 msgid "Using default zone file `%s'\n"
@@ -3699,6 +3821,46 @@
 msgid "Protocol error"
 msgstr ""
 
+#: src/namestore/namestore_common.c:494 src/namestore/namestore_common.c:634
+#, fuzzy, c-format
+msgid "Unsupported record type %d\n"
+msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+
+#: src/namestore/namestore_common.c:501
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+
+#: src/namestore/namestore_common.c:524
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/namestore/namestore_common.c:547
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/namestore/namestore_common.c:565
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+
+#: src/namestore/namestore_common.c:578
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/namestore/namestore_common.c:599
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/namestore/namestore_common.c:625
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
 #: src/namestore/plugin_namestore_postgres.c:95
 #, fuzzy
 msgid "Failed to create indices\n"
@@ -3713,33 +3875,32 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:799
+#: src/nat/nat.c:795
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:844
+#: src/nat/nat.c:840
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:1111
-#, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "Lỗi lưu cấu hình."
+#: src/nat/nat.c:1108
+msgid "malformed"
+msgstr ""
 
-#: src/nat/nat.c:1177 src/nat/nat.c:1187
+#: src/nat/nat.c:1173 src/nat/nat.c:1183
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1317
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1332
+#: src/nat/nat.c:1328
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -3922,47 +4083,47 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:834
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:840
+#: src/peerinfo-tool/gnunet-peerinfo.c:847
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:899
+#: src/peerinfo-tool/gnunet-peerinfo.c:906
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:936
+#: src/peerinfo-tool/gnunet-peerinfo.c:943
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:939
+#: src/peerinfo-tool/gnunet-peerinfo.c:946
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:942
+#: src/peerinfo-tool/gnunet-peerinfo.c:949
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:945
+#: src/peerinfo-tool/gnunet-peerinfo.c:952
 #, fuzzy
 msgid "list all known peers"
 msgstr "liệt kê mọi bộ tiếp hợp mạng"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:948
+#: src/peerinfo-tool/gnunet-peerinfo.c:955
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:951
+#: src/peerinfo-tool/gnunet-peerinfo.c:958
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:961
+#: src/peerinfo-tool/gnunet-peerinfo.c:968
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -4061,6 +4222,14 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/regex/gnunet-regex-simulation-profiler.c:552
+msgid "name of the table to write DFAs"
+msgstr ""
+
+#: src/regex/gnunet-regex-simulation-profiler.c:567
+msgid "Profiler for regex library"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:271
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -4071,61 +4240,132 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:120
+#: src/statistics/gnunet-statistics.c:131
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:193
+#: src/statistics/gnunet-statistics.c:133
 #, fuzzy, c-format
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/statistics/gnunet-statistics.c:177
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/statistics/gnunet-statistics.c:183
+#, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:231
+#, fuzzy, c-format
 msgid "No subsystem or name given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/statistics/gnunet-statistics.c:201
+#: src/statistics/gnunet-statistics.c:239
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:221
+#: src/statistics/gnunet-statistics.c:258
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:224
+#: src/statistics/gnunet-statistics.c:261
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:227
+#: src/statistics/gnunet-statistics.c:264
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:230
+#: src/statistics/gnunet-statistics.c:267
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:233
+#: src/statistics/gnunet-statistics.c:270
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:244
+#: src/statistics/gnunet-statistics.c:273
+msgid "connect to remote host"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:276
+msgid "port for remote host"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:289
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
-#: src/statistics/statistics_api.c:456
+#: src/statistics/statistics_api.c:511
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/statistics/statistics_api.c:999
+#: src/statistics/statistics_api.c:1053
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/testbed_api.c:252
+#: src/testbed/gnunet-testbed-profiler.c:705
+#, c-format
+msgid "No hosts-file specified on command line\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:716
+#, c-format
+msgid "No hosts loaded. Need atleast one host\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:779
+msgid "Only `CLIQUE' and `RANDOM' are permitted.\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:794
+msgid "create COUNT number of peers"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:797
+msgid "create COUNT number of random links"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:803
+msgid ""
+"Try to acheive TOPOLOGY. This options takes either CLIQUE or RANDOM. For "
+"CLIQUE the parameter -n is ignored. The default is to acheive a random graph "
+"topology."
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:818
+msgid "Profiler for testbed"
+msgstr ""
+
+#: src/testbed/testbed_api.c:325
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "« %s » thất bại với mã lỗi %d: %s\n"
 
+#: src/testbed/testbed_api_hosts.c:326
+#, fuzzy, c-format
+msgid "Hosts file %s not found\n"
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/testbed/testbed_api_hosts.c:334
+#, fuzzy, c-format
+msgid "Hosts file %s has no data\n"
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#: src/testbed/testbed_api_hosts.c:341
+#, fuzzy, c-format
+msgid "Hosts file %s cannot be read\n"
+msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
 #: src/testbed/testbed_api_testbed.c:271
 msgid "Some operations are still pending. Cancelling them\n"
 msgstr ""
@@ -4184,49 +4424,49 @@
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:509
+#: src/testing/testing.c:518
 #, 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:518
+#: src/testing/testing.c:528
 #, 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:829
+#: src/testing/testing.c:839
 #, 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:840
+#: src/testing/testing.c:850
 #, 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:854
+#: src/testing/testing.c:864
 #, 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:887
+#: src/testing/testing.c:897
 #, 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:905
+#: src/testing/testing.c:915
 #, 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:966
+#: src/testing/testing.c:976
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1129
+#: src/testing/testing.c:1140
 #, 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 »:"
@@ -4367,7 +4607,7 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:513
-#: src/transport/gnunet-service-transport_blacklist.c:750
+#: src/transport/gnunet-service-transport_blacklist.c:751
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -4395,26 +4635,26 @@
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:352
+#: src/transport/gnunet-service-transport_clients.c:353
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:357
+#: src/transport/gnunet-service-transport_clients.c:358
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_clients.c:509
+#: src/transport/gnunet-service-transport_clients.c:510
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:637
+#: src/transport/gnunet-service-transport_clients.c:651
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:688
+#: src/transport/gnunet-service-transport_clients.c:702
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -4428,112 +4668,112 @@
 msgid "# DISCONNECT messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1157
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1170
+#: src/transport/gnunet-service-transport_neighbours.c:1507
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1162
+#: src/transport/gnunet-service-transport_neighbours.c:1175
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1180
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1224
+#: src/transport/gnunet-service-transport_neighbours.c:1237
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1266
+#: src/transport/gnunet-service-transport_neighbours.c:1279
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1290
+#: src/transport/gnunet-service-transport_neighbours.c:1303
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1298
+#: src/transport/gnunet-service-transport_neighbours.c:1311
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1335
+#: src/transport/gnunet-service-transport_neighbours.c:1348
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1344
+#: src/transport/gnunet-service-transport_neighbours.c:1357
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1400
+#: src/transport/gnunet-service-transport_neighbours.c:1413
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1434
+#: src/transport/gnunet-service-transport_neighbours.c:1447
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "theo dõi gnunetd sử dụng dải thông"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1450
+#: src/transport/gnunet-service-transport_neighbours.c:1463
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2596
+#: src/transport/gnunet-service-transport_neighbours.c:2611
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2611
-#: src/transport/gnunet-service-transport_neighbours.c:2645
+#: src/transport/gnunet-service-transport_neighbours.c:2626
+#: src/transport/gnunet-service-transport_neighbours.c:2660
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2658
+#: src/transport/gnunet-service-transport_neighbours.c:2673
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2691
+#: src/transport/gnunet-service-transport_neighbours.c:2706
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2875
+#: src/transport/gnunet-service-transport_neighbours.c:2890
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2930
+#: src/transport/gnunet-service-transport_neighbours.c:2945
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2944
+#: src/transport/gnunet-service-transport_neighbours.c:2959
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2975
+#: src/transport/gnunet-service-transport_neighbours.c:2990
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2986
+#: src/transport/gnunet-service-transport_neighbours.c:3001
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3017
+#: src/transport/gnunet-service-transport_neighbours.c:3032
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3112
+#: src/transport/gnunet-service-transport_neighbours.c:3127
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
@@ -4562,33 +4802,33 @@
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:807
+#: src/transport/gnunet-service-transport_validation.c:808
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_validation.c:872
+#: src/transport/gnunet-service-transport_validation.c:873
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1001
+#: src/transport/gnunet-service-transport_validation.c:1002
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1010
+#: src/transport/gnunet-service-transport_validation.c:1011
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1135
+#: src/transport/gnunet-service-transport_validation.c:1136
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1164
+#: src/transport/gnunet-service-transport_validation.c:1166
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1218
+#: src/transport/gnunet-service-transport_validation.c:1220
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
@@ -4685,41 +4925,41 @@
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2513
+#: src/transport/plugin_transport_http_server.c:2528
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2281
+#: src/transport/plugin_transport_http_server.c:2296
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
 #: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2313 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2328 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
 #: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2330 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2345 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
 #: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2441
+#: src/transport/plugin_transport_http_server.c:2456
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2609
+#: src/transport/plugin_transport_http_server.c:2624
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2620
+#: src/transport/plugin_transport_http_server.c:2635
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -4745,7 +4985,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2702
+#: src/transport/plugin_transport_http_server.c:2717
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
@@ -4754,93 +4994,93 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1419
+#: src/transport/plugin_transport_http_client.c:1463
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1550
-#: src/transport/plugin_transport_http_server.c:2826
+#: src/transport/plugin_transport_http_client.c:1594
+#: src/transport/plugin_transport_http_server.c:2841
 #, 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
+#: src/transport/plugin_transport_http_client.c:1619
+#: src/transport/plugin_transport_http_server.c:2900
 #, 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
+#: src/transport/plugin_transport_http_client.c:1647
+#: src/transport/plugin_transport_http_server.c:2747
 #, 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
+#: src/transport/plugin_transport_http_server.c:1317
 #, 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
+#: src/transport/plugin_transport_http_server.c:1575
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1568
+#: src/transport/plugin_transport_http_server.c:1583
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1869
+#: src/transport/plugin_transport_http_server.c:1884
 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:1893
+#: src/transport/plugin_transport_http_server.c:1908
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2588
+#: src/transport/plugin_transport_http_server.c:2603
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2602
+#: src/transport/plugin_transport_http_server.c:2617
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2627
+#: src/transport/plugin_transport_http_server.c:2642
 #, 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
+#: src/transport/plugin_transport_http_server.c:2657
 #, 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
+#: src/transport/plugin_transport_http_server.c:2667
 #, 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
+#: src/transport/plugin_transport_http_server.c:2688
 #, 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
+#: src/transport/plugin_transport_http_server.c:2698
 #, 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
+#: src/transport/plugin_transport_http_server.c:2733
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
@@ -4896,16 +5136,16 @@
 #: src/transport/plugin_transport_tcp.c:856
 #: src/transport/plugin_transport_tcp.c:906
 #: src/transport/plugin_transport_tcp.c:992
-#: src/transport/plugin_transport_tcp.c:1130
-#: src/transport/plugin_transport_tcp.c:1147
+#: src/transport/plugin_transport_tcp.c:1132
+#: src/transport/plugin_transport_tcp.c:1149
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
-#: src/transport/plugin_transport_tcp.c:1807
-#: src/transport/plugin_transport_tcp.c:2423
+#: src/transport/plugin_transport_tcp.c:1816
+#: src/transport/plugin_transport_tcp.c:2435
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -4925,49 +5165,49 @@
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1336
+#: src/transport/plugin_transport_tcp.c:1341
 #, fuzzy, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:1447
+#: src/transport/plugin_transport_tcp.c:1456
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1848
+#: src/transport/plugin_transport_tcp.c:1857
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_tcp.c:2019
+#: src/transport/plugin_transport_tcp.c:2031
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2089
+#: src/transport/plugin_transport_tcp.c:2101
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2325 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2327
+#: src/transport/plugin_transport_tcp.c:2339
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2411
+#: src/transport/plugin_transport_tcp.c:2423
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2415
+#: src/transport/plugin_transport_tcp.c:2427
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2419
+#: src/transport/plugin_transport_tcp.c:2431
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -4987,14 +5227,14 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1965
+#: src/transport/plugin_transport_udp.c:2317
 #, 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:1979
+#: src/transport/plugin_transport_udp.c:2331
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5002,103 +5242,103 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2192
+#: src/transport/plugin_transport_udp.c:2572
 #, 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:2268
+#: src/transport/plugin_transport_udp.c:2648
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2311
+#: src/transport/plugin_transport_udp.c:2691
 #, 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:1355
+#: src/transport/plugin_transport_unix.c:1333
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_wlan.c:560
+#: src/transport/plugin_transport_wlan.c:580
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:579
+#: src/transport/plugin_transport_wlan.c:599
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:625
-#: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:1720
+#: src/transport/plugin_transport_wlan.c:645
+#: src/transport/plugin_transport_wlan.c:695
+#: src/transport/plugin_transport_wlan.c:1754
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:749
+#: src/transport/plugin_transport_wlan.c:770
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_wlan.c:773
+#: src/transport/plugin_transport_wlan.c:794
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:873
-#: src/transport/plugin_transport_wlan.c:954
-#: src/transport/plugin_transport_wlan.c:1722
+#: src/transport/plugin_transport_wlan.c:902
+#: src/transport/plugin_transport_wlan.c:987
+#: src/transport/plugin_transport_wlan.c:1756
 #, 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:1135
+#: src/transport/plugin_transport_wlan.c:1169
 #, 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:1156
+#: src/transport/plugin_transport_wlan.c:1190
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:1166
+#: src/transport/plugin_transport_wlan.c:1200
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1223
+#: src/transport/plugin_transport_wlan.c:1257
 #, 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:1324
+#: src/transport/plugin_transport_wlan.c:1358
 #, 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:1359
+#: src/transport/plugin_transport_wlan.c:1393
 #, 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:1420
+#: src/transport/plugin_transport_wlan.c:1454
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1529
+#: src/transport/plugin_transport_wlan.c:1563
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1703
+#: src/transport/plugin_transport_wlan.c:1737
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:575
+#: src/transport/transport_api.c:593
 #, 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"
@@ -5137,43 +5377,43 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:984
+#: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:988
+#: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/util/client.c:369
+#: src/util/client.c:371
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:377
+#: src/util/client.c:379
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:695
+#: src/util/client.c:698
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:895
+#: src/util/client.c:898
 #, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:909
+#: src/util/client.c:912
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/client.c:1162
+#: src/util/client.c:1168
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -5246,34 +5486,29 @@
 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
 "tập hợp các sự chọn được phép\n"
 
-#: src/util/connection.c:420
+#: src/util/connection.c:427
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/util/connection.c:435
+#: src/util/connection.c:442
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:550
+#: src/util/connection.c:557
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
 
-#: src/util/connection.c:739 src/util/connection.c:909
+#: src/util/connection.c:755 src/util/connection.c:921
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/connection.c:748
+#: src/util/connection.c:912
 #, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/util/connection.c:900
-#, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Lỗi kết nối\n"
 
@@ -5284,155 +5519,164 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:313
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
-
-#: 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:640
+#: src/util/crypto_ecc.c:448 src/util/crypto_rsa.c:644
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 "Deleting it.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/util/crypto_rsa.c:657
+#: src/util/crypto_ecc.c:463 src/util/crypto_rsa.c:661
 #, 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
+#: src/util/crypto_ecc.c:559 src/util/crypto_ecc.c:603
+#: src/util/crypto_rsa.c:759 src/util/crypto_rsa.c:803
 #, 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:760
+#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:764
 #, 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:778
-#, c-format
-msgid "I am host `%s'.  Stored new private key in `%s'.\n"
+#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:807
+#: src/util/crypto_rsa.c:843
+msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: 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:837
+#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:838
 #, c-format
 msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:857
+#: src/util/crypto_ecc.c:643
+msgid "This may be ok if someone is currently generating a key.\n"
+msgstr ""
+
+#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:858
 #, 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"
+#: src/util/crypto_ecc.c:780 src/util/crypto_rsa.c:946
+msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_rsa.c:948
-msgid "interrupted by shutdown"
+#: src/util/crypto_ecc.c:791
+msgid "gnunet-ecc failed"
 msgstr ""
 
-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_ecc.c:986
+#, fuzzy, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+
+#: src/util/crypto_ecc.c:1054
+#, fuzzy, c-format
+msgid "ECC signature verification failed at %s:%d: %s\n"
+msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
+
+#: src/util/crypto_random.c:313
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
+msgstr ""
+
+#: 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:957
 msgid "gnunet-rsa failed"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1347
+#: src/util/crypto_rsa.c:1348
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/disk.c:571
+#: src/util/disk.c:567
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/disk.c:1140
+#: src/util/disk.c:1136
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/disk.c:1494 src/util/service.c:1667
+#: src/util/disk.c:1490 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"
 
-#: src/util/disk.c:1866
+#: src/util/disk.c:1862
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/util/getopt.c:669
+#: src/util/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/util/getopt.c:693
+#: src/util/getopt.c:594
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
 
-#: src/util/getopt.c:698
+#: src/util/getopt.c:599
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
 
-#: src/util/getopt.c:715 src/util/getopt.c:883
+#: src/util/getopt.c:616 src/util/getopt.c:783
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tùy chọn « %s » cần thiết đối số\n"
 
-#: src/util/getopt.c:744
+#: src/util/getopt.c:645
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: không nhận ra tùy chọn « --%s »\n"
 
-#: src/util/getopt.c:748
+#: src/util/getopt.c:649
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
 
-#: src/util/getopt.c:773
+#: src/util/getopt.c:674
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: tùy chọn không được phép -- %c\n"
 
-#: src/util/getopt.c:775
+#: src/util/getopt.c:676
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: tùy chọn không hợp lệ -- %c\n"
 
-#: src/util/getopt.c:803 src/util/getopt.c:931
+#: src/util/getopt.c:704 src/util/getopt.c:831
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: tùy chọn cần thiết đối số -- %c\n"
 
-#: src/util/getopt.c:851
+#: src/util/getopt.c:752
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 
-#: src/util/getopt.c:869
+#: src/util/getopt.c:770
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
 
-#: src/util/getopt.c:1035
+#: src/util/getopt.c:935
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr ""
@@ -5487,64 +5731,69 @@
 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 ""
-
-#: src/util/gnunet-resolver.c:158
-msgid "Use build-in GNUnet stub resolver"
-msgstr ""
-
-#: src/util/gnunet-rsa.c:114
+#: src/util/gnunet-ecc.c:107 src/util/gnunet-rsa.c:107
 #, 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
+#: src/util/gnunet-ecc.c:113 src/util/gnunet-rsa.c:113
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:138
+#: src/util/gnunet-ecc.c:128 src/util/gnunet-rsa.c:137
 #, 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
+#: src/util/gnunet-ecc.c:140 src/util/gnunet-rsa.c:149
 #, c-format
 msgid "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:173
+#: src/util/gnunet-ecc.c:163 src/util/gnunet-rsa.c:172
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:230
+#: src/util/gnunet-ecc.c:220 src/util/gnunet-rsa.c:229
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:233
+#: src/util/gnunet-ecc.c:223 src/util/gnunet-rsa.c:232
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:236
+#: src/util/gnunet-ecc.c:226 src/util/gnunet-rsa.c:235
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:239
+#: src/util/gnunet-ecc.c:229 src/util/gnunet-rsa.c:238
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:242
+#: src/util/gnunet-ecc.c:232 src/util/gnunet-rsa.c:241
 msgid ""
 "use insecure, weak random number generator for key generation (for testing "
 "only)"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:252
+#: src/util/gnunet-ecc.c:242
+#, fuzzy
+msgid "Manipulate GNUnet private ECC key files"
+msgstr "cập nhật một giá trị trong tập tin cấu hình"
+
+#: src/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
+msgstr ""
+
+#: src/util/gnunet-resolver.c:158
+msgid "Use build-in GNUnet stub resolver"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:251
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5588,50 +5837,35 @@
 msgid "Error reading from `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/helper.c:280
-#, c-format
-msgid "Got 0 bytes from helper `%s' (EOF)\n"
-msgstr ""
-
-#: 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: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:343
+#: src/util/helper.c:500
 #, fuzzy, c-format
-msgid "Starting HELPER process `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
-#: 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"
 
-#: src/util/network.c:99
+#: src/util/network.c:127
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1278
+#: src/util/network.c:1318
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:325
+#: src/util/os_installation.c:416
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:522
+#: src/util/os_installation.c:644
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
@@ -5666,6 +5900,11 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
+#: src/util/program.c:251
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
 #: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
@@ -5701,11 +5940,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/scheduler.c:786
+#: src/util/scheduler.c:781
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:916
+#: src/util/scheduler.c:911
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -5725,11 +5964,11 @@
 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:836
+#: src/util/server.c:835
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+"`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
 #: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
@@ -5846,7 +6085,7 @@
 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:1746
+#: src/util/service.c:1747
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5855,71 +6094,75 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/strings.c:145
+#: src/util/strings.c:146
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:385
+#: src/util/strings.c:384 src/util/strings.c:404
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:534
+#: src/util/strings.c:525
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
 
-#: src/util/strings.c:631
+#: src/util/strings.c:622
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:635
+#: src/util/strings.c:626
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:641
+#: src/util/strings.c:628
+msgid "0 ms"
+msgstr ""
+
+#: src/util/strings.c:634
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:647
+#: src/util/strings.c:640
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:653
+#: src/util/strings.c:646
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:660
+#: src/util/strings.c:653
 #, fuzzy
 msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:662
+#: src/util/strings.c:655
 #, fuzzy
 msgid "days"
 msgstr " ngày"
 
-#: src/util/strings.c:689
+#: src/util/strings.c:682
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1078
+#: src/util/strings.c:1070
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1086
+#: src/util/strings.c:1078
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1092
+#: src/util/strings.c:1084
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1099
+#: src/util/strings.c:1091
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1108
+#: src/util/strings.c:1100
 #, 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"
@@ -6018,11 +6261,11 @@
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3139
+#: src/vpn/gnunet-service-vpn.c:3114
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3171
+#: src/vpn/gnunet-service-vpn.c:3146
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -6098,23 +6341,64 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
-#: src/include/gnunet_common.h:591
+#: src/include/gnunet_common.h:579 src/include/gnunet_common.h:584
+#: src/include/gnunet_common.h:590
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:601
+#: src/include/gnunet_common.h:600
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:621 src/include/gnunet_common.h:628
 #, 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 "list information for the given peer"
+#~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#, fuzzy
+#~ msgid "list information for all peers"
+#~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#, fuzzy
+#~ msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
+#~ msgstr ""
+#~ "Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi "
+#~ "động.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "No `%s' specified in `%s' configuration, cannot load hostlists from "
+#~ "file.\n"
+#~ msgstr ""
+#~ "Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi "
+#~ "động.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+#~ msgstr ""
+#~ "Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi "
+#~ "động.\n"
+
+#, fuzzy
+#~ msgid "Malformed %s `%s' given in configuration!\n"
+#~ msgstr "Lỗi lưu cấu hình."
+
+#, fuzzy
+#~ msgid "Got %u bytes from helper `%s'\n"
+#~ msgstr "Nhận yêu cầu định tuyến\n"
+
+#, fuzzy
+#~ msgid "Starting HELPER process `%s'\n"
+#~ msgstr "Đang bắt đầu tài về « %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"
 
@@ -6669,9 +6953,6 @@
 #~ msgid "be verbose"
 #~ msgstr "xuất chi tiết"
 
-#~ msgid "use configuration file FILENAME"
-#~ msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
-
 #, fuzzy
 #~ msgid "Failed to stop service `%s'!\n"
 #~ msgstr "Lỗi vào phòng « %s »\n"
@@ -7049,9 +7330,6 @@
 #~ msgid "Back"
 #~ msgstr "Lùi"
 
-#~ msgid "Exit"
-#~ msgstr "Thoát"
-
 #~ msgid "Up"
 #~ msgstr "Lên"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2012-10-31 15:10:17 UTC (rev 24637)
+++ gnunet/po/zh_CN.po  2012-10-31 15:21:37 UTC (rev 24638)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-09-27 21:17+0200\n"
+"POT-Creation-Date: 2012-10-31 13:48+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:165
+#: src/arm/arm_api.c:162
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
@@ -145,84 +145,84 @@
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:332
+#: src/arm/gnunet-service-arm.c:326
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:335
+#: src/arm/gnunet-service-arm.c:329
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:361
+#: src/arm/gnunet-service-arm.c:355
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:393
+#: src/arm/gnunet-service-arm.c:387
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/arm/gnunet-service-arm.c:523
+#: src/arm/gnunet-service-arm.c:517
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户:"
 
-#: src/arm/gnunet-service-arm.c:545
+#: src/arm/gnunet-service-arm.c:539
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:559
+#: src/arm/gnunet-service-arm.c:553
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:667
+#: src/arm/gnunet-service-arm.c:661
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:878
+#: src/arm/gnunet-service-arm.c:872
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:970
+#: src/arm/gnunet-service-arm.c:965
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:975
+#: src/arm/gnunet-service-arm.c:970
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:980
+#: src/arm/gnunet-service-arm.c:975
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:986
+#: src/arm/gnunet-service-arm.c:981
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1021
+#: src/arm/gnunet-service-arm.c:1016
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1214
+#: src/arm/gnunet-service-arm.c:1210
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1225
+#: src/arm/gnunet-service-arm.c:1221
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1239
+#: src/arm/gnunet-service-arm.c:1235
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -231,17 +231,44 @@
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats.c:93
-#, fuzzy
-msgid "list information for the given peer"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
+#: src/ats-tool/gnunet-ats.c:67
+#, c-format
+msgid ""
+"Peer `%s' plugin `%s', address `%s', bandwidth out: %u Bytes/s, bandwidth in "
+"%u Bytes/s\n"
+msgstr ""
 
-#: src/ats/gnunet-ats.c:96
+#: src/ats-tool/gnunet-ats.c:129
+#, c-format
+msgid "%u address resolutions had a timeout\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:131
+#, c-format
+msgid "ATS returned results for %u addresses\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:142 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/ats-tool/gnunet-ats.c:149
+#, fuzzy, c-format
+msgid "Cannot connect to ATS service, exiting...\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/ats-tool/gnunet-ats.c:194
 #, fuzzy
-msgid "list information for all peers"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
+msgid "do not resolve IP addresses to hostnames"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats/gnunet-ats.c:105
+#: src/ats-tool/gnunet-ats.c:197
+msgid "monitor mode"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:206
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -251,7 +278,7 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/core/core_api.c:757
+#: src/core/core_api.c:755
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -276,7 +303,7 @@
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:818
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:825
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
@@ -361,7 +388,7 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:812
+#: src/transport/gnunet-service-transport_validation.c:813
 msgid "# PING messages received"
 msgstr ""
 
@@ -385,7 +412,7 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1108
+#: src/transport/gnunet-service-transport_validation.c:1109
 msgid "# PONG messages received"
 msgstr ""
 
@@ -437,7 +464,7 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
-#: src/peerinfo-tool/gnunet-peerinfo.c:824
+#: src/peerinfo-tool/gnunet-peerinfo.c:831
 #: src/transport/gnunet-service-transport.c:627
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
@@ -464,14 +491,14 @@
 #: src/core/gnunet-service-core_sessions.c:269
 #: 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/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
 #: src/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
-#: src/transport/gnunet-service-transport_neighbours.c:873
+#: src/transport/gnunet-service-transport_neighbours.c:872
 #: src/transport/gnunet-service-transport_neighbours.c:1089
 #: src/transport/gnunet-service-transport_neighbours.c:1098
-#: src/transport/gnunet-service-transport_neighbours.c:2620
-#: src/transport/gnunet-service-transport_neighbours.c:2882
+#: src/transport/gnunet-service-transport_neighbours.c:2635
+#: src/transport/gnunet-service-transport_neighbours.c:2897
 msgid "# peers connected"
 msgstr ""
 
@@ -532,9 +559,9 @@
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:608
-#: src/include/gnunet_common.h:615
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ecc.c:53
+#: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
+#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
@@ -547,17 +574,17 @@
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:410
+#: src/datacache/plugin_datacache_sqlite.c:405
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:443
-#: src/datastore/plugin_datastore_sqlite.c:406
-#: src/namestore/plugin_namestore_sqlite.c:369
+#: src/datacache/plugin_datacache_sqlite.c:438
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namestore/plugin_namestore_sqlite.c:362
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:450
+#: src/datacache/plugin_datacache_sqlite.c:445
 #, fuzzy, c-format
 msgid "Failed to close statement %p: %d\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -566,23 +593,23 @@
 msgid "Template datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:305
+#: src/datastore/datastore_api.c:310
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:388
+#: src/datastore/datastore_api.c:393
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:432
+#: src/datastore/datastore_api.c:437
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:459
+#: src/datastore/datastore_api.c:465
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:477
+#: src/datastore/datastore_api.c:483
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
@@ -590,59 +617,55 @@
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:548
-msgid "# reconnected to DATASTORE"
-msgstr ""
-
-#: src/datastore/datastore_api.c:612
+#: src/datastore/datastore_api.c:608
 msgid "# transmission request failures"
 msgstr ""
 
-#: src/datastore/datastore_api.c:633
+#: src/datastore/datastore_api.c:630
 msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/datastore/datastore_api.c:764
+#: src/datastore/datastore_api.c:762
 msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/datastore/datastore_api.c:778
+#: src/datastore/datastore_api.c:776
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
+#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
 msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:800
+#: src/datastore/datastore_api.c:798
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:869
+#: src/datastore/datastore_api.c:867
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:936
+#: src/datastore/datastore_api.c:934
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:997
+#: src/datastore/datastore_api.c:995
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1054
+#: src/datastore/datastore_api.c:1052
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1118
+#: src/datastore/datastore_api.c:1116
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1163
+#: src/datastore/datastore_api.c:1161
 msgid "Failed to receive response from database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1221
+#: src/datastore/datastore_api.c:1220
 msgid "# Results received"
 msgstr ""
 
@@ -654,7 +677,7 @@
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1409
+#: src/datastore/datastore_api.c:1410
 msgid "# GET requests executed"
 msgstr ""
 
@@ -828,7 +851,7 @@
 msgstr "发送消息失败。\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:654
+#: src/namestore/plugin_namestore_postgres.c:652
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -837,30 +860,30 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:258
-#: src/namestore/plugin_namestore_sqlite.c:228
+#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/namestore/plugin_namestore_sqlite.c:223
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:653
+#: src/datastore/plugin_datastore_sqlite.c:648
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1137
+#: src/datastore/plugin_datastore_sqlite.c:1132
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1156
+#: src/datastore/plugin_datastore_sqlite.c:1151
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1196
-#: src/namestore/plugin_namestore_sqlite.c:834
+#: src/datastore/plugin_datastore_sqlite.c:1191
+#: src/namestore/plugin_namestore_sqlite.c:827
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -916,7 +939,7 @@
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:750
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:733
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:1033
@@ -1196,23 +1219,38 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
+#: src/dns/dnsparser.c:110
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/dns/dnsparser.c:584
+#, fuzzy, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
 #: 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
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/gns/gnunet-service-gns_resolver.c:1669
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/dns/dnsstub.c:360
+#: src/dns/dnsstub.c:299
+#, fuzzy, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/dns/dnsstub.c:368
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:430
+#: src/dns/dnsstub.c:440
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -1241,57 +1279,58 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:499
+#: src/dns/gnunet-service-dns.c:512
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:639
+#: src/dns/gnunet-service-dns.c:659
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:821
+#: src/dns/gnunet-service-dns.c:845
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:892
+#: src/dns/gnunet-service-dns.c:924
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1005
+#: src/dns/gnunet-service-dns.c:1039
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1021
+#: src/dns/gnunet-service-dns.c:1055
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1030
+#: src/dns/gnunet-service-dns.c:1064
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1039
+#: src/dns/gnunet-service-dns.c:1073
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1104
+#: src/dns/gnunet-service-dns.c:1140
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1180 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1216 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1245 src/exit/gnunet-daemon-exit.c:3032
+#: src/dns/gnunet-service-dns.c:1281 src/exit/gnunet-daemon-exit.c:3007
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1266
-msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
-msgstr ""
+#: src/dns/gnunet-service-dns.c:1302
+#, fuzzy
+msgid "need a valid IPv4 or IPv6 address\n"
+msgstr "无效的进程优先级“%s”\n"
 
-#: src/dv/dv_api.c:179
+#: src/dv/dv_api.c:189
 #, fuzzy
 msgid "Failed to connect to the dv service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1454,35 +1493,35 @@
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3048
+#: src/exit/gnunet-daemon-exit.c:3023
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3056
+#: src/exit/gnunet-daemon-exit.c:3031
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3063
+#: src/exit/gnunet-daemon-exit.c:3038
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3069
+#: src/exit/gnunet-daemon-exit.c:3044
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3050 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3241
+#: src/exit/gnunet-daemon-exit.c:3216
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1502,108 +1541,108 @@
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:203
+#: src/fragmentation/fragmentation.c:208
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:206
+#: src/fragmentation/fragmentation.c:211
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:232
+#: src/fragmentation/fragmentation.c:237
 msgid "# fragments wrap arounds"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:273
+#: src/fragmentation/fragmentation.c:281
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:276
+#: src/fragmentation/fragmentation.c:284
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:363
+#: src/fragmentation/fragmentation.c:405
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:369
+#: src/fragmentation/fragmentation.c:411
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:393
+#: src/fragmentation/fragmentation.c:435
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:491
+#: src/fs/fs_api.c:450
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:500
+#: src/fs/fs_api.c:459
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/fs_api.c:506
+#: src/fs/fs_api.c:465
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1087
+#: src/fs/fs_api.c:1046
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:1546
+#: src/fs/fs_api.c:1505
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1588
+#: src/fs/fs_api.c:1547
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1604
+#: src/fs/fs_api.c:1563
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2254
+#: src/fs/fs_api.c:2213
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2264
+#: src/fs/fs_api.c:2223
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2389 src/fs/fs_api.c:2629
+#: src/fs/fs_api.c:2348 src/fs/fs_api.c:2588
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2406
+#: src/fs/fs_api.c:2365
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2419 src/fs/fs_api.c:2438 src/fs/fs_api.c:2922
+#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2397 src/fs/fs_api.c:2881
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2620
+#: src/fs/fs_api.c:2579
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2866
+#: src/fs/fs_api.c:2825
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2960
+#: src/fs/fs_api.c:2919
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1663,12 +1702,12 @@
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1920
+#: src/fs/fs_download.c:1927
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
 
-#: src/fs/fs_getopt.c:191
+#: src/fs/fs_getopt.c:192
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -1967,35 +2006,35 @@
 msgid "Failed to run `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/gnunet-auto-share.c:684
+#: src/fs/gnunet-auto-share.c:686
 #, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:734 src/fs/gnunet-pseudonym.c:279
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
 #: 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:684
+#: src/fs/gnunet-auto-share.c:741 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:687
+#: src/fs/gnunet-auto-share.c:744 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:711
+#: src/fs/gnunet-auto-share.c:747 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-auto-share.c:750 src/fs/gnunet-pseudonym.c:304
 #: src/fs/gnunet-publish.c:718
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:767
+#: src/fs/gnunet-auto-share.c:770
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -2133,7 +2172,7 @@
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:161
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:198
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
@@ -2387,144 +2426,144 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:240
+#: src/fs/gnunet-service-fs.c:245
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
+#: src/fs/gnunet-service-fs.c:306 src/fs/gnunet-service-fs.c:496
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/fs/gnunet-service-fs.c:588 src/hostlist/gnunet-daemon-hostlist.c:297
 #: 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:704
+#: src/fs/gnunet-service-fs_cp.c:711
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:708
+#: src/fs/gnunet-service-fs_cp.c:715
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:744
+#: src/fs/gnunet-service-fs_cp.c:751
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:750
+#: src/fs/gnunet-service-fs_cp.c:757
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:1333
+#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1345
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:867
+#: src/fs/gnunet-service-fs_cp.c:875
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:928
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:928
+#: src/fs/gnunet-service-fs_cp.c:936
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:942
+#: src/fs/gnunet-service-fs_cp.c:950
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:980
+#: src/fs/gnunet-service-fs_cp.c:988
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1047
+#: src/fs/gnunet-service-fs_cp.c:1056
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1071
+#: src/fs/gnunet-service-fs_cp.c:1081
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1081
+#: src/fs/gnunet-service-fs_cp.c:1091
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1160
+#: src/fs/gnunet-service-fs_cp.c:1170
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1194
+#: src/fs/gnunet-service-fs_cp.c:1204
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1216
+#: src/fs/gnunet-service-fs_cp.c:1227
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1276
+#: src/fs/gnunet-service-fs_cp.c:1288
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1302
+#: src/fs/gnunet-service-fs_cp.c:1314
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1687
+#: src/fs/gnunet-service-fs_cp.c:1713
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:120
-#: src/fs/gnunet-service-fs_indexing.c:175
+#: src/fs/gnunet-service-fs_indexing.c:130
+#: src/fs/gnunet-service-fs_indexing.c:181
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:136
+#: src/fs/gnunet-service-fs_indexing.c:142
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-service-fs_indexing.c:226
+#: src/fs/gnunet-service-fs_indexing.c:237
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:264
+#: src/fs/gnunet-service-fs_indexing.c:275
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:479
+#: src/fs/gnunet-service-fs_indexing.c:477
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:537
+#: src/fs/gnunet-service-fs_indexing.c:542
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:552
+#: src/fs/gnunet-service-fs_indexing.c:557
 #, 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:554
+#: src/fs/gnunet-service-fs_indexing.c:559
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:569
+#: src/fs/gnunet-service-fs_indexing.c:574
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
@@ -2546,132 +2585,132 @@
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:265
+#: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:391
+#: src/fs/gnunet-service-fs_pe.c:397
 msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:420
+#: src/fs/gnunet-service-fs_pe.c:426
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:469
+#: src/fs/gnunet-service-fs_pe.c:475
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:476
+#: src/fs/gnunet-service-fs_pe.c:483
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:538
+#: src/fs/gnunet-service-fs_pe.c:543
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:544
+#: src/fs/gnunet-service-fs_pe.c:551
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:684
-#: src/fs/gnunet-service-fs_pe.c:751
+#: src/fs/gnunet-service-fs_pe.c:605 src/fs/gnunet-service-fs_pe.c:689
+#: src/fs/gnunet-service-fs_pe.c:757
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:285
+#: src/fs/gnunet-service-fs_pr.c:293
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:618
+#: src/fs/gnunet-service-fs_pr.c:385 src/fs/gnunet-service-fs_pr.c:639
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:781
+#: src/fs/gnunet-service-fs_pr.c:802
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:810
+#: src/fs/gnunet-service-fs_pr.c:834
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:824
+#: src/fs/gnunet-service-fs_pr.c:849
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:837
+#: src/fs/gnunet-service-fs_pr.c:862
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:955
+#: src/fs/gnunet-service-fs_pr.c:983
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:982
+#: src/fs/gnunet-service-fs_pr.c:1010
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1017
+#: src/fs/gnunet-service-fs_pr.c:1045
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1108
+#: src/fs/gnunet-service-fs_pr.c:1136
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1128
+#: src/fs/gnunet-service-fs_pr.c:1156
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1174
+#: src/fs/gnunet-service-fs_pr.c:1203
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1218
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1197
+#: src/fs/gnunet-service-fs_pr.c:1227
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1242
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1224
+#: src/fs/gnunet-service-fs_pr.c:1256
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1237
+#: src/fs/gnunet-service-fs_pr.c:1269
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1274
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1269 src/fs/gnunet-service-fs_pr.c:1309
-#: src/fs/gnunet-service-fs_pr.c:1447
+#: src/fs/gnunet-service-fs_pr.c:1301 src/fs/gnunet-service-fs_pr.c:1341
+#: src/fs/gnunet-service-fs_pr.c:1481
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1327
+#: src/fs/gnunet-service-fs_pr.c:1359
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1370
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1457
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1542
 msgid "# GAP PUT messages received"
 msgstr ""
 
@@ -2710,7 +2749,7 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:575
+#: src/gns/gns_api.c:598
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -2736,7 +2775,7 @@
 msgstr ""
 
 #: src/gns/gnunet-dns2gns.c:673
-msgid "IP of recursive dns resolver to use (required)"
+msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
 #: src/gns/gnunet-dns2gns.c:676
@@ -2751,38 +2790,38 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:182
+#: src/gns/gnunet-gns.c:221
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns.c:293
+#: src/gns/gnunet-gns.c:335
 #, c-format
 msgid "Please specify lookup, shorten or authority operation!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:315
+#: src/gns/gnunet-gns.c:356
 #, fuzzy
 msgid "try to shorten a given name"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns.c:318
+#: src/gns/gnunet-gns.c:359
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:321
+#: src/gns/gnunet-gns.c:362
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:324
+#: src/gns/gnunet-gns.c:365
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:327
+#: src/gns/gnunet-gns.c:368
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:341
+#: src/gns/gnunet-gns.c:381
 msgid "GNUnet GNS access tool"
 msgstr ""
 
@@ -2834,7 +2873,7 @@
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:936 src/gns/gnunet-gns-proxy.c:2887
+#: src/gns/gnunet-gns-fcfsd.c:936 src/gns/gnunet-gns-proxy.c:2857
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -2843,38 +2882,48 @@
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2528
+#: src/gns/gnunet-gns-proxy.c:2494
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户:"
 
-#: src/gns/gnunet-gns-proxy.c:2556
+#: src/gns/gnunet-gns-proxy.c:2522
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "无法保存配置文件“%s”:"
 
-#: src/gns/gnunet-gns-proxy.c:3564
+#: src/gns/gnunet-gns-proxy.c:3510
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3567
+#: src/gns/gnunet-gns-proxy.c:3513
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3582
+#: src/gns/gnunet-gns-proxy.c:3525
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:401
+#: src/gns/gnunet-service-gns.c:486
 #, c-format
 msgid "Records for name `%s' in zone %s too large to fit into DHT"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1197
+#: src/gns/gnunet-service-gns.c:1216
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
+#: src/gns/gnunet-service-gns.c:1277
+#, fuzzy
+msgid "Could not connect to DHT!\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/gns/gnunet-service-gns.c:1288
+#, fuzzy
+msgid "Unable to initialize resolver!\n"
+msgstr "无法初始化 SQLite:%s。\n"
+
 #: src/hello/gnunet-hello.c:122
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -2954,173 +3003,137 @@
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
+#: src/hostlist/hostlist-client.c:469 src/hostlist/hostlist-client.c:680
+#: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
+#: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
+#: src/hostlist/hostlist-client.c:958 src/hostlist/hostlist-client.c:963
+#: src/transport/plugin_transport_http_client.c:1026
+#: src/transport/plugin_transport_http_client.c:1041
 #, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:473 src/hostlist/hostlist-client.c:683
-#: 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:994
-#: src/transport/plugin_transport_http_client.c:1009
-#, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1325
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:623
+#: src/hostlist/hostlist-client.c:619
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/hostlist-client.c:661
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/hostlist-client.c:799
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/hostlist-client.c:813
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/hostlist-client.c:833
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:839
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/hostlist-client.c:847
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/hostlist-client.c:900
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/hostlist-client.c:908
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
+#: src/hostlist/hostlist-client.c:1035 src/hostlist/hostlist-client.c:1498
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1046
+#: src/hostlist/hostlist-client.c:1043
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1084
-msgid "Scheduled saving of hostlists\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1088
-#, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127
+#: src/hostlist/hostlist-client.c:1107 src/hostlist/hostlist-client.c:1123
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1242
-#, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
-msgstr ""
-
 #: src/hostlist/hostlist-client.c:1273
 #, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1279
-#, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1283
+#: src/hostlist/hostlist-client.c:1277
 #, c-format
-msgid "Hostlist file `%s' is not existing\n"
+msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1288
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/hostlist-client.c:1327
+#: src/hostlist/hostlist-client.c:1321
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/hostlist-client.c:1323
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1362
-#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/hostlist-client.c:1368
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/hostlist-client.c:1373
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/hostlist-client.c:1397 src/hostlist/hostlist-client.c:1414
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/hostlist-client.c:1409
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1470
+#: src/hostlist/hostlist-client.c:1463
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1473
-#, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1482
+#: src/hostlist/hostlist-client.c:1475
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1494
+#: src/hostlist/hostlist-client.c:1487
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1498
+#: src/hostlist/hostlist-client.c:1491
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -3158,10 +3171,6 @@
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:273
-msgid "Sending 100 CONTINUE reply\n"
-msgstr ""
-
 #: src/hostlist/hostlist-server.c:279
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
@@ -3239,28 +3248,149 @@
 msgid "help text"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7703
+#: src/mesh/gnunet-regex-profiler.c:1126
+#: src/testbed/gnunet-testbed-profiler.c:323
+msgid "An operation has failed while starting peers\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1192
+#: src/testbed/gnunet-testbed-profiler.c:390
+#, fuzzy, c-format
+msgid "Creating a peer failed. Error: %s\n"
+msgstr "“%s”以错误码 %d 失败:%s\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1306
+#: src/testbed/gnunet-testbed-profiler.c:495
+msgid "An operation has failed while starting slaves\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1359
+msgid "An operation has failed while linking\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1486
+#: src/testbed/gnunet-testbed-profiler.c:597
+#, c-format
+msgid "Host registration failed for a host. Error: %s\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1566
+#: src/testbed/gnunet-testbed-profiler.c:676
+msgid "Unable to connect to master controller -- Check config\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1663
+#, c-format
+msgid "No hosts-file specified on command line. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1668
+#: src/regex/gnunet-regex-simulation-profiler.c:498
+#, c-format
+msgid "No policy directory specified on command line. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1674
+#, c-format
+msgid "No hosts loaded. Need at least one host\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1681
+#: src/testbed/gnunet-testbed-profiler.c:723
+#, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1688
+#: src/testbed/gnunet-testbed-profiler.c:730
+#, fuzzy, c-format
+msgid "Exiting\n"
+msgstr "退出"
+
+#: src/mesh/gnunet-regex-profiler.c:1694
+#, c-format
+msgid "No configuration file given. Exiting\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1711
+#: src/regex/gnunet-regex-simulation-profiler.c:504
+#, c-format
+msgid "Specified policies directory does not exist. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1718
+#, c-format
+msgid "No search strings file given. Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1724
+#, c-format
+msgid ""
+"Error loading search strings. Given file does not contain enough strings. "
+"Exiting.\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1730
+#, fuzzy, c-format
+msgid "Error loading search strings. Exiting.\n"
+msgstr "创建用户出错"
+
+#: src/mesh/gnunet-regex-profiler.c:1764
+#, fuzzy
+msgid "name of the file for writing statistics"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1767
+msgid "create FACTOR times number of peers random links"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1770
+#: src/testbed/gnunet-testbed-profiler.c:800
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1773
+msgid "wait TIMEOUT before considering a string match as failed"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1776
+msgid "wait DELAY before starting string search"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1779
+msgid "number of search strings to read from search strings file"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1782
+#: src/regex/gnunet-regex-simulation-profiler.c:555
+msgid "maximum path compression length"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1794
+msgid "Profiler for regex/mesh"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:7971
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7908
+#: src/mesh/gnunet-service-mesh.c:8176
 #, 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
+#: src/mesh/gnunet-service-mesh.c:8265 src/mesh/gnunet-service-mesh.c:8277
+#: src/mesh/gnunet-service-mesh.c:8289 src/mesh/gnunet-service-mesh.c:8302
+#: src/mesh/gnunet-service-mesh.c:8317 src/mesh/gnunet-service-mesh.c:8329
+#: src/mesh/gnunet-service-mesh.c:8341 src/mesh/gnunet-service-mesh.c:8353
 #, fuzzy, c-format
-msgid "Mesh service is lacking key configuration settings (%s).  Exiting.\n"
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/mesh/gnunet-service-mesh.c:8093 src/mesh/gnunet-service-mesh.c:8104
+#: src/mesh/gnunet-service-mesh.c:8365 src/mesh/gnunet-service-mesh.c:8376
 #, fuzzy, c-format
 msgid ""
-"Mesh service is lacking key configuration settings (%s). Using default "
-"(%u).\n"
+"%s service is lacking key configuration settings (%s). Using default (%u).\n"
 msgstr "立即保存配置?"
 
 #: src/mysql/mysql.c:174
@@ -3349,16 +3479,11 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#: src/peerinfo-tool/gnunet-peerinfo.c:882
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: 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:625
 #, fuzzy, c-format
 msgid "Using default zone file `%s'\n"
@@ -3483,6 +3608,46 @@
 msgid "Protocol error"
 msgstr ""
 
+#: src/namestore/namestore_common.c:494 src/namestore/namestore_common.c:634
+#, fuzzy, c-format
+msgid "Unsupported record type %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/namestore/namestore_common.c:501
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/namestore/namestore_common.c:524
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/namestore_common.c:547
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/namestore_common.c:565
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/namestore/namestore_common.c:578
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/namestore_common.c:599
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/namestore_common.c:625
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/namestore/plugin_namestore_postgres.c:95
 #, fuzzy
 msgid "Failed to create indices\n"
@@ -3497,33 +3662,32 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:799
+#: src/nat/nat.c:795
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:844
+#: src/nat/nat.c:840
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/nat/nat.c:1111
-#, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "保存配置失败。"
+#: src/nat/nat.c:1108
+msgid "malformed"
+msgstr ""
 
-#: src/nat/nat.c:1177 src/nat/nat.c:1187
+#: src/nat/nat.c:1173 src/nat/nat.c:1183
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1317
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1332
+#: src/nat/nat.c:1328
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
@@ -3696,47 +3860,47 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:834
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:840
+#: src/peerinfo-tool/gnunet-peerinfo.c:847
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:899
+#: src/peerinfo-tool/gnunet-peerinfo.c:906
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:936
+#: src/peerinfo-tool/gnunet-peerinfo.c:943
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:939
+#: src/peerinfo-tool/gnunet-peerinfo.c:946
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:942
+#: src/peerinfo-tool/gnunet-peerinfo.c:949
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:945
+#: src/peerinfo-tool/gnunet-peerinfo.c:952
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:948
+#: src/peerinfo-tool/gnunet-peerinfo.c:955
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:951
+#: src/peerinfo-tool/gnunet-peerinfo.c:958
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:961
+#: src/peerinfo-tool/gnunet-peerinfo.c:968
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -3827,6 +3991,14 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/regex/gnunet-regex-simulation-profiler.c:552
+msgid "name of the table to write DFAs"
+msgstr ""
+
+#: src/regex/gnunet-regex-simulation-profiler.c:567
+msgid "Profiler for regex library"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:271
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -3837,61 +4009,132 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:120
+#: src/statistics/gnunet-statistics.c:131
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:193
+#: src/statistics/gnunet-statistics.c:133
+#, fuzzy, c-format
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/statistics/gnunet-statistics.c:177
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/statistics/gnunet-statistics.c:183
 #, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:231
+#, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:201
+#: src/statistics/gnunet-statistics.c:239
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:221
+#: src/statistics/gnunet-statistics.c:258
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:224
+#: src/statistics/gnunet-statistics.c:261
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:227
+#: src/statistics/gnunet-statistics.c:264
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:230
+#: src/statistics/gnunet-statistics.c:267
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:233
+#: src/statistics/gnunet-statistics.c:270
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:244
+#: src/statistics/gnunet-statistics.c:273
+msgid "connect to remote host"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:276
+msgid "port for remote host"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:289
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:456
+#: src/statistics/statistics_api.c:511
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/statistics_api.c:999
+#: src/statistics/statistics_api.c:1053
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/testbed_api.c:252
+#: src/testbed/gnunet-testbed-profiler.c:705
+#, c-format
+msgid "No hosts-file specified on command line\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:716
+#, c-format
+msgid "No hosts loaded. Need atleast one host\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:779
+msgid "Only `CLIQUE' and `RANDOM' are permitted.\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:794
+msgid "create COUNT number of peers"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:797
+msgid "create COUNT number of random links"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:803
+msgid ""
+"Try to acheive TOPOLOGY. This options takes either CLIQUE or RANDOM. For "
+"CLIQUE the parameter -n is ignored. The default is to acheive a random graph "
+"topology."
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:818
+msgid "Profiler for testbed"
+msgstr ""
+
+#: src/testbed/testbed_api.c:325
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "“%s”以错误码 %d 失败:%s\n"
 
+#: src/testbed/testbed_api_hosts.c:326
+#, c-format
+msgid "Hosts file %s not found\n"
+msgstr ""
+
+#: src/testbed/testbed_api_hosts.c:334
+#, c-format
+msgid "Hosts file %s has no data\n"
+msgstr ""
+
+#: src/testbed/testbed_api_hosts.c:341
+#, c-format
+msgid "Hosts file %s cannot be read\n"
+msgstr ""
+
 #: src/testbed/testbed_api_testbed.c:271
 msgid "Some operations are still pending. Cancelling them\n"
 msgstr ""
@@ -3950,49 +4193,49 @@
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:509
+#: src/testing/testing.c:518
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:518
+#: src/testing/testing.c:528
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/testing/testing.c:829
+#: src/testing/testing.c:839
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:840
+#: src/testing/testing.c:850
 #, 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:854
+#: src/testing/testing.c:864
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:887
+#: src/testing/testing.c:897
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:905
+#: src/testing/testing.c:915
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:966
+#: src/testing/testing.c:976
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/testing/testing.c:1129
+#: src/testing/testing.c:1140
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4126,7 +4369,7 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:513
-#: src/transport/gnunet-service-transport_blacklist.c:750
+#: src/transport/gnunet-service-transport_blacklist.c:751
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -4151,25 +4394,25 @@
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:352
+#: src/transport/gnunet-service-transport_clients.c:353
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:357
+#: src/transport/gnunet-service-transport_clients.c:358
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:509
+#: src/transport/gnunet-service-transport_clients.c:510
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:637
+#: src/transport/gnunet-service-transport_clients.c:651
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:688
+#: src/transport/gnunet-service-transport_clients.c:702
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
@@ -4181,97 +4424,97 @@
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1157
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1170
+#: src/transport/gnunet-service-transport_neighbours.c:1507
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1162
+#: src/transport/gnunet-service-transport_neighbours.c:1175
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1180
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1224
+#: src/transport/gnunet-service-transport_neighbours.c:1237
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1266
+#: src/transport/gnunet-service-transport_neighbours.c:1279
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1290
+#: src/transport/gnunet-service-transport_neighbours.c:1303
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1298
+#: src/transport/gnunet-service-transport_neighbours.c:1311
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1335
+#: src/transport/gnunet-service-transport_neighbours.c:1348
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1344
+#: src/transport/gnunet-service-transport_neighbours.c:1357
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1400
+#: src/transport/gnunet-service-transport_neighbours.c:1413
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1434
+#: src/transport/gnunet-service-transport_neighbours.c:1447
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1450
+#: src/transport/gnunet-service-transport_neighbours.c:1463
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2596
+#: src/transport/gnunet-service-transport_neighbours.c:2611
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2611
-#: src/transport/gnunet-service-transport_neighbours.c:2645
+#: src/transport/gnunet-service-transport_neighbours.c:2626
+#: src/transport/gnunet-service-transport_neighbours.c:2660
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2658
+#: src/transport/gnunet-service-transport_neighbours.c:2673
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2691
+#: src/transport/gnunet-service-transport_neighbours.c:2706
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2875
+#: src/transport/gnunet-service-transport_neighbours.c:2890
 msgid "# unexpected SESSION ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2930
+#: src/transport/gnunet-service-transport_neighbours.c:2945
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2944
+#: src/transport/gnunet-service-transport_neighbours.c:2959
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2975
+#: src/transport/gnunet-service-transport_neighbours.c:2990
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2986
+#: src/transport/gnunet-service-transport_neighbours.c:3001
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3017
+#: src/transport/gnunet-service-transport_neighbours.c:3032
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3112
+#: src/transport/gnunet-service-transport_neighbours.c:3127
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -4298,32 +4541,32 @@
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:807
+#: src/transport/gnunet-service-transport_validation.c:808
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:872
+#: src/transport/gnunet-service-transport_validation.c:873
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1001
+#: src/transport/gnunet-service-transport_validation.c:1002
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1010
+#: src/transport/gnunet-service-transport_validation.c:1011
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1135
+#: src/transport/gnunet-service-transport_validation.c:1136
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1164
+#: src/transport/gnunet-service-transport_validation.c:1166
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1218
+#: src/transport/gnunet-service-transport_validation.c:1220
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
@@ -4420,41 +4663,41 @@
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2513
+#: src/transport/plugin_transport_http_server.c:2528
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2281
+#: src/transport/plugin_transport_http_server.c:2296
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
 #: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2313 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2328 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
 #: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2330 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2345 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2441
+#: src/transport/plugin_transport_http_server.c:2456
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2609
+#: src/transport/plugin_transport_http_server.c:2624
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2620
+#: src/transport/plugin_transport_http_server.c:2635
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -4480,7 +4723,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2702
+#: src/transport/plugin_transport_http_server.c:2717
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
@@ -4489,93 +4732,93 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1419
+#: src/transport/plugin_transport_http_client.c:1463
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1550
-#: src/transport/plugin_transport_http_server.c:2826
+#: src/transport/plugin_transport_http_client.c:1594
+#: src/transport/plugin_transport_http_server.c:2841
 #, 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
+#: src/transport/plugin_transport_http_client.c:1619
+#: src/transport/plugin_transport_http_server.c:2900
 #, 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
+#: src/transport/plugin_transport_http_client.c:1647
+#: src/transport/plugin_transport_http_server.c:2747
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1302
+#: src/transport/plugin_transport_http_server.c:1317
 #, 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
+#: src/transport/plugin_transport_http_server.c:1575
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1568
+#: src/transport/plugin_transport_http_server.c:1583
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1869
+#: src/transport/plugin_transport_http_server.c:1884
 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:1893
+#: src/transport/plugin_transport_http_server.c:1908
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2588
+#: src/transport/plugin_transport_http_server.c:2603
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2602
+#: src/transport/plugin_transport_http_server.c:2617
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2627
+#: src/transport/plugin_transport_http_server.c:2642
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2642
+#: src/transport/plugin_transport_http_server.c:2657
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2652
+#: src/transport/plugin_transport_http_server.c:2667
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2673
+#: src/transport/plugin_transport_http_server.c:2688
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2683
+#: src/transport/plugin_transport_http_server.c:2698
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2718
+#: src/transport/plugin_transport_http_server.c:2733
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
@@ -4631,15 +4874,15 @@
 #: src/transport/plugin_transport_tcp.c:856
 #: src/transport/plugin_transport_tcp.c:906
 #: src/transport/plugin_transport_tcp.c:992
-#: src/transport/plugin_transport_tcp.c:1130
-#: src/transport/plugin_transport_tcp.c:1147
+#: src/transport/plugin_transport_tcp.c:1132
+#: src/transport/plugin_transport_tcp.c:1149
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
-#: src/transport/plugin_transport_tcp.c:1807
-#: src/transport/plugin_transport_tcp.c:2423
+#: src/transport/plugin_transport_tcp.c:1816
+#: src/transport/plugin_transport_tcp.c:2435
 msgid "# TCP sessions active"
 msgstr ""
 
@@ -4655,48 +4898,48 @@
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1336
+#: src/transport/plugin_transport_tcp.c:1341
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1447
+#: src/transport/plugin_transport_tcp.c:1456
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1848
+#: src/transport/plugin_transport_tcp.c:1857
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2019
+#: src/transport/plugin_transport_tcp.c:2031
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2089
+#: src/transport/plugin_transport_tcp.c:2101
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2325 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2327
+#: src/transport/plugin_transport_tcp.c:2339
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2411
+#: src/transport/plugin_transport_tcp.c:2423
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2415
+#: src/transport/plugin_transport_tcp.c:2427
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2419
+#: src/transport/plugin_transport_tcp.c:2431
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -4714,14 +4957,14 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1965
+#: src/transport/plugin_transport_udp.c:2317
 #, 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:1979
+#: src/transport/plugin_transport_udp.c:2331
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -4729,92 +4972,92 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2192
+#: src/transport/plugin_transport_udp.c:2572
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:2268
+#: src/transport/plugin_transport_udp.c:2648
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2311
+#: src/transport/plugin_transport_udp.c:2691
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_unix.c:1355
+#: src/transport/plugin_transport_unix.c:1333
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_wlan.c:560
+#: src/transport/plugin_transport_wlan.c:580
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:579
+#: src/transport/plugin_transport_wlan.c:599
 msgid "# WLAN messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:625
-#: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:1720
+#: src/transport/plugin_transport_wlan.c:645
+#: src/transport/plugin_transport_wlan.c:695
+#: src/transport/plugin_transport_wlan.c:1754
 msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:749
+#: src/transport/plugin_transport_wlan.c:770
 msgid "# WLAN message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:773
+#: src/transport/plugin_transport_wlan.c:794
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:873
-#: src/transport/plugin_transport_wlan.c:954
-#: src/transport/plugin_transport_wlan.c:1722
+#: src/transport/plugin_transport_wlan.c:902
+#: src/transport/plugin_transport_wlan.c:987
+#: src/transport/plugin_transport_wlan.c:1756
 msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1135
+#: src/transport/plugin_transport_wlan.c:1169
 msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1156
+#: src/transport/plugin_transport_wlan.c:1190
 msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1166
+#: src/transport/plugin_transport_wlan.c:1200
 msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1223
+#: src/transport/plugin_transport_wlan.c:1257
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1324
+#: src/transport/plugin_transport_wlan.c:1358
 msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1359
+#: src/transport/plugin_transport_wlan.c:1393
 msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1420
+#: src/transport/plugin_transport_wlan.c:1454
 msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1529
+#: src/transport/plugin_transport_wlan.c:1563
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1703
+#: src/transport/plugin_transport_wlan.c:1737
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:575
+#: src/transport/transport_api.c:593
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
@@ -4853,43 +5096,43 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:984
+#: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:988
+#: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/util/client.c:369
+#: src/util/client.c:371
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:377
+#: src/util/client.c:379
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:695
+#: src/util/client.c:698
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:895
+#: src/util/client.c:898
 #, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:909
+#: src/util/client.c:912
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1162
+#: src/util/client.c:1168
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -4958,33 +5201,28 @@
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:420
+#: src/util/connection.c:427
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/util/connection.c:435
+#: src/util/connection.c:442
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:550
+#: src/util/connection.c:557
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/util/connection.c:739 src/util/connection.c:909
+#: src/util/connection.c:755 src/util/connection.c:921
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/util/connection.c:748
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "无法连接到 %s:%u:%s\n"
-
-#: src/util/connection.c:900
+#: src/util/connection.c:912
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
@@ -4996,155 +5234,164 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:313
+#: src/util/crypto_ecc.c:448 src/util/crypto_rsa.c:644
 #, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
-
-#: 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:640
-#, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 "Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:657
+#: src/util/crypto_ecc.c:463 src/util/crypto_rsa.c:661
 #, 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
+#: src/util/crypto_ecc.c:559 src/util/crypto_ecc.c:603
+#: src/util/crypto_rsa.c:759 src/util/crypto_rsa.c:803
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/crypto_rsa.c:760
+#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:764
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_rsa.c:778
-#, c-format
-msgid "I am host `%s'.  Stored new private key in `%s'.\n"
+#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:807
+#: src/util/crypto_rsa.c:843
+msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: 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:837
+#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:838
 #, c-format
 msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:857
+#: src/util/crypto_ecc.c:643
+msgid "This may be ok if someone is currently generating a key.\n"
+msgstr ""
+
+#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:858
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:875
+#: src/util/crypto_ecc.c:780 src/util/crypto_rsa.c:946
+msgid "interrupted by shutdown"
+msgstr ""
+
+#: src/util/crypto_ecc.c:791
+msgid "gnunet-ecc failed"
+msgstr ""
+
+#: src/util/crypto_ecc.c:986
+#, fuzzy, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+
+#: src/util/crypto_ecc.c:1054
 #, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
+msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:948
-msgid "interrupted by shutdown"
+#: src/util/crypto_random.c:313
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:959
+#: 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:957
 msgid "gnunet-rsa failed"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1347
+#: src/util/crypto_rsa.c:1348
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:571
+#: src/util/disk.c:567
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/disk.c:1140
+#: src/util/disk.c:1136
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/disk.c:1494 src/util/service.c:1667
+#: src/util/disk.c:1490 src/util/service.c:1667
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/util/disk.c:1866
+#: src/util/disk.c:1862
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/util/getopt.c:669
+#: src/util/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/util/getopt.c:693
+#: src/util/getopt.c:594
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s:选项“--%s”不允许有参数\n"
 
-#: src/util/getopt.c:698
+#: src/util/getopt.c:599
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s:选项“%c%s”不允许有参数\n"
 
-#: src/util/getopt.c:715 src/util/getopt.c:883
+#: src/util/getopt.c:616 src/util/getopt.c:783
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s:选项“%s”要求有一个参数\n"
 
-#: src/util/getopt.c:744
+#: src/util/getopt.c:645
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s:无法识别的选项“--%s”\n"
 
-#: src/util/getopt.c:748
+#: src/util/getopt.c:649
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s:无法识别的选项“%c%s”\n"
 
-#: src/util/getopt.c:773
+#: src/util/getopt.c:674
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s:非法选项 -- %c\n"
 
-#: src/util/getopt.c:775
+#: src/util/getopt.c:676
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s:无效选项 -- %c\n"
 
-#: src/util/getopt.c:803 src/util/getopt.c:931
+#: src/util/getopt.c:704 src/util/getopt.c:831
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s:选项要求有一个参数 -- %c\n"
 
-#: src/util/getopt.c:851
+#: src/util/getopt.c:752
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s:选项“-W %s”有歧义\n"
 
-#: src/util/getopt.c:869
+#: src/util/getopt.c:770
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s:选项“-W %s” 不允许有参数\n"
 
-#: src/util/getopt.c:1035
+#: src/util/getopt.c:935
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "请使用 --help 获取选项列表。\n"
@@ -5196,64 +5443,69 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-resolver.c:148
-msgid "perform a reverse lookup"
-msgstr ""
-
-#: src/util/gnunet-resolver.c:158
-msgid "Use build-in GNUnet stub resolver"
-msgstr ""
-
-#: src/util/gnunet-rsa.c:114
+#: src/util/gnunet-ecc.c:107 src/util/gnunet-rsa.c:107
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/gnunet-rsa.c:120
+#: src/util/gnunet-ecc.c:113 src/util/gnunet-rsa.c:113
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:138
+#: src/util/gnunet-ecc.c:128 src/util/gnunet-rsa.c:137
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/util/gnunet-rsa.c:150
+#: src/util/gnunet-ecc.c:140 src/util/gnunet-rsa.c:149
 #, c-format
 msgid "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:173
+#: src/util/gnunet-ecc.c:163 src/util/gnunet-rsa.c:172
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:230
+#: src/util/gnunet-ecc.c:220 src/util/gnunet-rsa.c:229
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:233
+#: src/util/gnunet-ecc.c:223 src/util/gnunet-rsa.c:232
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:236
+#: src/util/gnunet-ecc.c:226 src/util/gnunet-rsa.c:235
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:239
+#: src/util/gnunet-ecc.c:229 src/util/gnunet-rsa.c:238
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:242
+#: src/util/gnunet-ecc.c:232 src/util/gnunet-rsa.c:241
 msgid ""
 "use insecure, weak random number generator for key generation (for testing "
 "only)"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:252
+#: src/util/gnunet-ecc.c:242
+#, fuzzy
+msgid "Manipulate GNUnet private ECC key files"
+msgstr "更改配置文件中的一个值"
+
+#: src/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
+msgstr ""
+
+#: src/util/gnunet-resolver.c:158
+msgid "Use build-in GNUnet stub resolver"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:251
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5297,50 +5549,35 @@
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:280
-#, c-format
-msgid "Got 0 bytes from helper `%s' (EOF)\n"
-msgstr ""
-
-#: src/util/helper.c:296
-#, c-format
-msgid "Got %u bytes from helper `%s'\n"
-msgstr ""
-
 #: 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:343
+#: src/util/helper.c:500
 #, fuzzy, c-format
-msgid "Starting HELPER process `%s'\n"
-msgstr "卸载 GNUnet 服务"
-
-#: src/util/helper.c:496
-#, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/network.c:99
+#: src/util/network.c:127
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1278
+#: src/util/network.c:1318
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:325
+#: src/util/os_installation.c:416
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:522
+#: src/util/os_installation.c:644
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
@@ -5375,6 +5612,11 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
+#: src/util/program.c:251
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
 #: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
@@ -5410,11 +5652,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/scheduler.c:786
+#: src/util/scheduler.c:781
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:916
+#: src/util/scheduler.c:911
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -5434,11 +5676,11 @@
 msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/server.c:836
+#: src/util/server.c:835
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+"`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
 #: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
@@ -5555,7 +5797,7 @@
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”:%s\n"
 
-#: src/util/service.c:1746
+#: src/util/service.c:1747
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5564,70 +5806,74 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/strings.c:145
+#: src/util/strings.c:146
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:385
+#: src/util/strings.c:384 src/util/strings.c:404
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:534
+#: src/util/strings.c:525
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败:没有设置环境变量“HOME”"
 
-#: src/util/strings.c:631
+#: src/util/strings.c:622
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:635
+#: src/util/strings.c:626
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:641
+#: src/util/strings.c:628
+msgid "0 ms"
+msgstr ""
+
+#: src/util/strings.c:634
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:647
+#: src/util/strings.c:640
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:653
+#: src/util/strings.c:646
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:660
+#: src/util/strings.c:653
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:662
+#: src/util/strings.c:655
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:689
+#: src/util/strings.c:682
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1078
+#: src/util/strings.c:1070
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1086
+#: src/util/strings.c:1078
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1092
+#: src/util/strings.c:1084
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1099
+#: src/util/strings.c:1091
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1108
+#: src/util/strings.c:1100
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
@@ -5719,11 +5965,11 @@
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3139
+#: src/vpn/gnunet-service-vpn.c:3114
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3171
+#: src/vpn/gnunet-service-vpn.c:3146
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -5797,23 +6043,39 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
-#: src/include/gnunet_common.h:591
+#: src/include/gnunet_common.h:579 src/include/gnunet_common.h:584
+#: src/include/gnunet_common.h:590
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:601
+#: src/include/gnunet_common.h:600
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:621 src/include/gnunet_common.h:628
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "list information for the given peer"
+#~ msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#, fuzzy
+#~ msgid "list information for all peers"
+#~ msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#, fuzzy
+#~ msgid "Malformed %s `%s' given in configuration!\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Starting HELPER process `%s'\n"
+#~ msgstr "卸载 GNUnet 服务"
+
+#, fuzzy
 #~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 #~ msgstr "配置文件“%s”已写入。\n"
 
@@ -6070,10 +6332,6 @@
 #~ "按任意键继续\n"
 
 #, fuzzy
-#~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
-#~ msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
-
-#, fuzzy
 #~ msgid "Unable to initialize Postgres with configuration `%s': %s"
 #~ msgstr "无法保存配置文件“%s”:"
 
@@ -6379,9 +6637,6 @@
 #~ msgid "Back"
 #~ msgstr "后退"
 
-#~ msgid "Exit"
-#~ msgstr "退出"
-
 #~ msgid "Up"
 #~ msgstr "向上"
 

Index: gnunet/src/mesh
===================================================================
--- gnunet/src/mesh     2012-10-31 15:10:17 UTC (rev 24637)
+++ gnunet/src/mesh     2012-10-31 15:21:37 UTC (rev 24638)

Property changes on: gnunet/src/mesh
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,4 ##
+gnunet-service-mesh-new
 gnunet-service-mesh_new
 mesh.conf
 test_mesh_path_api



reply via email to

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