gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r22806 - gnunet/po


From: gnunet
Subject: [GNUnet-SVN] r22806 - gnunet/po
Date: Fri, 20 Jul 2012 19:34:02 +0200

Author: bartpolot
Date: 2012-07-20 19:34:01 +0200 (Fri, 20 Jul 2012)
New Revision: 22806

Modified:
   gnunet/po/POTFILES.in
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
Log:
- make po files forget about mesh_new

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2012-07-20 16:57:42 UTC (rev 22805)
+++ gnunet/po/POTFILES.in       2012-07-20 17:34:01 UTC (rev 22806)
@@ -124,7 +124,6 @@
 src/lockmanager/gnunet-service-lockmanager.c
 src/lockmanager/lockmanager_api.c
 src/mesh/gnunet-service-mesh.c
-src/mesh/gnunet-service-mesh_new.c
 src/mesh/mesh_api.c
 src/mesh/mesh_tunnel_tree.c
 src/mesh/plugin_block_mesh.c

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2012-07-20 16:57:42 UTC (rev 22805)
+++ gnunet/po/de.po     2012-07-20 17:34:01 UTC (rev 22806)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-06-02 19:10+0200\n"
+"POT-Creation-Date: 2012-07-20 19:29+0200\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -22,178 +22,186 @@
 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:349
+#: 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:363
+#: 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:432
+#: 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:485
+#: src/arm/arm_api.c:490
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:486
+#: src/arm/arm_api.c:491
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:507
+#: 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:508
+#: 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:540
+#: 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:612
+#: 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:159
+#: src/arm/gnunet-arm.c:166
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:171
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-arm.c:167
+#: src/arm/gnunet-arm.c:174
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "Diese Suche läuft bereits!\n"
 
-#: src/arm/gnunet-arm.c:172
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:182
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-arm.c:179
+#: src/arm/gnunet-arm.c:186
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "Diese Suche läuft bereits!\n"
 
-#: src/arm/gnunet-arm.c:183
+#: src/arm/gnunet-arm.c:190
 #, fuzzy
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr "`%s' fährt herunter.\n"
 
-#: src/arm/gnunet-arm.c:187
+#: src/arm/gnunet-arm.c:194
 #, fuzzy
 msgid "Error communicating with ARM service.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:191
+#: src/arm/gnunet-arm.c:198
 #, fuzzy
 msgid "Timeout communicating with ARM service.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:195
+#: src/arm/gnunet-arm.c:202
 #, fuzzy
 msgid "Operation failed.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:199
+#: src/arm/gnunet-arm.c:206
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222
+#: src/arm/gnunet-arm.c:229
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:225
+#: src/arm/gnunet-arm.c:232
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:249
+#: 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:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
+#: src/arm/gnunet-arm.c:264 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:384
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:280
+#: src/arm/gnunet-arm.c:287
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:286
+#: src/arm/gnunet-arm.c:293
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:407
+#: src/arm/gnunet-arm.c:418
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:409
+#: src/arm/gnunet-arm.c:420
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:411
+#: src/arm/gnunet-arm.c:422
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:413
+#: src/arm/gnunet-arm.c:424
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:416
+#: src/arm/gnunet-arm.c:427
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:430
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:421
+#: src/arm/gnunet-arm.c:432
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:424
+#: src/arm/gnunet-arm.c:435
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
 
-#: src/arm/gnunet-arm.c:426
+#: src/arm/gnunet-arm.c:437
 msgid "List currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:439
+msgid "Don't let gnunet-service-arm inherit standard output"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:441
+msgid "Don't let gnunet-service-arm inherit standard error"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:455
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -293,6 +301,21 @@
 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"
@@ -540,46 +563,67 @@
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:742
+#: src/chat/gnunet-chat.c:746
 msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:267
+#: 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:546
+#: 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:729
+#: 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:907
+#: 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:786
+#: src/core/core_api.c:757
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
+#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
+#: src/core/gnunet-core.c:118 src/core/gnunet-core.c:149
+#: src/transport/gnunet-transport.c:451 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
+#, fuzzy
+msgid "Connected to"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/core/gnunet-core.c:151 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
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
-#: src/core/gnunet-core.c:95
+#: src/core/gnunet-core.c:216 src/transport/gnunet-transport.c:725
 #, fuzzy
+msgid "provide information about all current connections (continuously)"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/core/gnunet-core.c:227
+#, fuzzy
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
@@ -644,7 +688,7 @@
 msgstr "# defragmentierter Nachrichten"
 
 #: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:810
+#: src/transport/gnunet-service-transport_validation.c:812
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
@@ -672,7 +716,7 @@
 msgstr "# Klartext PING Nachrichten gesendet"
 
 #: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1031
+#: src/transport/gnunet-service-transport_validation.c:1096
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -692,58 +736,58 @@
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1381
-#: src/core/gnunet-service-core_kx.c:1398
+#: src/core/gnunet-service-core_kx.c:1383
+#: src/core/gnunet-service-core_kx.c:1400
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1402
+#: src/core/gnunet-service-core_kx.c:1404
 msgid "# REKEY operations performed"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1537
+#: src/core/gnunet-service-core_kx.c:1539
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1577
-#: src/core/gnunet-service-core_kx.c:1602
+#: src/core/gnunet-service-core_kx.c:1579
+#: src/core/gnunet-service-core_kx.c:1604
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1589
+#: src/core/gnunet-service-core_kx.c:1591
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1628
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/core/gnunet-service-core_kx.c:1630
+#: src/core/gnunet-service-core_kx.c:1632
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1638
+#: src/core/gnunet-service-core_kx.c:1640
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1700
+#: src/core/gnunet-service-core_kx.c:1702
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/core/gnunet-service-core_kx.c:1708
+#: 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:1718 src/hostlist/hostlist-server.c:551
+#: 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:611
+#: 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"
@@ -762,23 +806,23 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:418
+#: src/core/gnunet-service-core_neighbours.c:421
 #, fuzzy, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-#: src/dht/gnunet-service-dht_neighbours.c:625
-#: src/dht/gnunet-service-dht_neighbours.c:683
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
+#: 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/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
-#: src/transport/gnunet-service-transport_neighbours.c:874
-#: src/transport/gnunet-service-transport_neighbours.c:1080
-#: src/transport/gnunet-service-transport_neighbours.c:1089
-#: src/transport/gnunet-service-transport_neighbours.c:2568
-#: src/transport/gnunet-service-transport_neighbours.c:2814
+#: src/transport/gnunet-service-transport_neighbours.c:890
+#: src/transport/gnunet-service-transport_neighbours.c:1106
+#: src/transport/gnunet-service-transport_neighbours.c:1115
+#: src/transport/gnunet-service-transport_neighbours.c:2637
+#: src/transport/gnunet-service-transport_neighbours.c:2899
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
@@ -843,9 +887,10 @@
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:525
-#: src/include/gnunet_common.h:532
+#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:535
+#: src/include/gnunet_common.h:542
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1165,6 +1210,7 @@
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
+#: src/namestore/plugin_namestore_postgres.c:654
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1202,7 +1248,7 @@
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1198
-#: src/namestore/plugin_namestore_sqlite.c:829
+#: src/namestore/plugin_namestore_sqlite.c:834
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -1217,33 +1263,31 @@
 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/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-put.c:192
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:182
+#: src/dht/gnunet-dht-get.c:204
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
-#: src/gns/gnunet-gns-lookup.c:185
 msgid "the type of data to look for"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
-#: src/gns/gnunet-gns-lookup.c:188
 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-download.c:271
-#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
-#: src/fs/gnunet-unindex.c:169 src/gns/gnunet-gns-lookup.c:191
-#: src/nse/gnunet-nse-profiler.c:910
+#: 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
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:232
+#: src/dht/gnunet-dht-get.c:236
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1251,7 +1295,7 @@
 msgid "how long to execute? 0 = forever"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321
+#: src/dht/gnunet-dht-monitor.c:324
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
@@ -1304,12 +1348,12 @@
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:223
+#: src/dht/gnunet-dht-put.c:226
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
-#: src/testing/testing.c:1968 src/testing/testing.c:1998
+#: 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
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -1347,17 +1391,17 @@
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:990
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1038
-#: src/dht/gnunet-service-dht_clients.c:1081
+#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-dht_clients.c:1082
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1048
+#: src/dht/gnunet-service-dht_clients.c:1049
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
@@ -1402,95 +1446,102 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:481
+#: src/dht/gnunet-service-dht_neighbours.c:485
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:571
+#: src/dht/gnunet-service-dht_neighbours.c:575
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:717
+#: src/dht/gnunet-service-dht_neighbours.c:721
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/dht/gnunet-service-dht_neighbours.c:772
+#: src/dht/gnunet-service-dht_neighbours.c:776
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:810
+#: src/dht/gnunet-service-dht_neighbours.c:814
 #, fuzzy
 msgid "# Bytes of bandwdith requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1032
-#: src/dht/gnunet-service-dht_neighbours.c:1060
+#: src/dht/gnunet-service-dht_neighbours.c:1036
+#: src/dht/gnunet-service-dht_neighbours.c:1064
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1041
-#: src/dht/gnunet-service-dht_neighbours.c:1075
+#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1079
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1207
+#: src/dht/gnunet-service-dht_neighbours.c:1211
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1236
+#: src/dht/gnunet-service-dht_neighbours.c:1240
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1315
+#: src/dht/gnunet-service-dht_neighbours.c:1247
+#: src/dht/gnunet-service-dht_neighbours.c:1360
+#: src/dht/gnunet-service-dht_neighbours.c:1460
 #, fuzzy
+msgid "# P2P messages dropped due to full queue"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1325
+#, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1342
+#: src/dht/gnunet-service-dht_neighbours.c:1352
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1443
+#: src/dht/gnunet-service-dht_neighbours.c:1467
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1531
+#: src/dht/gnunet-service-dht_neighbours.c:1555
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1671
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1655
+#: src/dht/gnunet-service-dht_neighbours.c:1679
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1746
+#: src/dht/gnunet-service-dht_neighbours.c:1770
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1788
+#: src/dht/gnunet-service-dht_neighbours.c:1812
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1802
+#: src/dht/gnunet-service-dht_neighbours.c:1826
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1876
+#: src/dht/gnunet-service-dht_neighbours.c:1900
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
@@ -1520,10 +1571,15 @@
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:352
+#: src/dht/gnunet-service-dht_routing.c:394
 msgid "# Entries added to routing table"
 msgstr ""
 
+#: src/dht/gnunet-service-dht_routing.c:411
+#, fuzzy
+msgid "# DHT requests combined"
+msgstr "# Client Trace-Anfragen empfangen"
+
 #: src/dht/plugin_block_dht.c:136
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -1538,15 +1594,15 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:337
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:340
+#: src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:348
+#: src/dns/gnunet-dns-monitor.c:370
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -1558,7 +1614,7 @@
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:251
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
@@ -1619,7 +1675,7 @@
 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:1561 src/exit/gnunet-daemon-exit.c:3033
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
@@ -1793,50 +1849,50 @@
 msgid "# UDP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:2882
+#: src/exit/gnunet-daemon-exit.c:2883
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908
+#: src/exit/gnunet-daemon-exit.c:2897 src/exit/gnunet-daemon-exit.c:2909
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2919
+#: src/exit/gnunet-daemon-exit.c:2920
 #, c-format
 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:3049
 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:3057
 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:3064
 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:3070
 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:3076 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3236
+#: src/exit/gnunet-daemon-exit.c:3241
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1895,76 +1951,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/fs_api.c:339
+#: src/fs/fs_api.c:491
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:348
+#: src/fs/fs_api.c:500
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:354
+#: src/fs/fs_api.c:506
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:938
+#: src/fs/fs_api.c:1087
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1395
+#: src/fs/fs_api.c:1546
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1437
+#: src/fs/fs_api.c:1588
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1453
+#: src/fs/fs_api.c:1604
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2106
+#: src/fs/fs_api.c:2254
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2116
+#: src/fs/fs_api.c:2264
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2241 src/fs/fs_api.c:2480
+#: src/fs/fs_api.c:2389 src/fs/fs_api.c:2629
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2258
+#: src/fs/fs_api.c:2406
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2270 src/fs/fs_api.c:2289 src/fs/fs_api.c:2773
+#: src/fs/fs_api.c:2419 src/fs/fs_api.c:2438 src/fs/fs_api.c:2922
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2471
+#: src/fs/fs_api.c:2620
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2717
+#: src/fs/fs_api.c:2866
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2811
+#: src/fs/fs_api.c:2960
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1974,59 +2030,59 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_download.c:311
+#: src/fs/fs_download.c:321
 #, fuzzy
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n"
 
-#: src/fs/fs_download.c:331
+#: src/fs/fs_download.c:341
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
+#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:878
+#: src/fs/fs_download.c:888
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:970
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:986
+#: src/fs/fs_download.c:996
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1009
+#: src/fs/fs_download.c:1019
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1029
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1028
+#: src/fs/fs_download.c:1038
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1125
+#: src/fs/fs_download.c:1136
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/fs_download.c:1888
+#: src/fs/fs_download.c:1920
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -2090,24 +2146,24 @@
 msgid "Failed to write `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:256
+#: src/fs/fs_namespace.c:254
 #, 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:371
+#: src/fs/fs_namespace.c:369
 #, 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:588 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:586 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_namespace.c:631
+#: src/fs/fs_namespace.c:629
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -2119,62 +2175,62 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:621 src/fs/fs_publish.c:638 src/fs/fs_publish.c:677
-#: src/fs/fs_publish.c:697 src/fs/fs_publish.c:722 src/fs/fs_publish.c:862
+#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/fs/fs_publish.c:623
+#: src/fs/fs_publish.c:624
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:635
+#: src/fs/fs_publish.c:636
 #, fuzzy
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:679
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:698
+#: src/fs/fs_publish.c:699
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:724
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:746
+#: src/fs/fs_publish.c:747
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:811
+#: src/fs/fs_publish.c:812
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:817
+#: src/fs/fs_publish.c:818
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:863
+#: src/fs/fs_publish.c:864
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1071
+#: src/fs/fs_publish.c:1090
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1161
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2184,7 +2240,7 @@
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_search.c:829
+#: src/fs/fs_search.c:830
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2329,6 +2385,66 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
+#: src/fs/gnunet-auto-share.c:236
+#, fuzzy, c-format
+msgid "Failed to load state: %s\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
+#: src/fs/gnunet-auto-share.c:309
+#, fuzzy, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:488
+#, fuzzy, c-format
+msgid "Publishing `%s'\n"
+msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
+
+#: src/fs/gnunet-auto-share.c:497
+#, fuzzy, c-format
+msgid "Failed to run `%s'\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/fs/gnunet-auto-share.c:684
+#, 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
+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
+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
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:710
+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
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:767
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr ""
+
 #: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
@@ -2359,97 +2475,97 @@
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-directory.c:179
+#: src/fs/gnunet-directory.c:183
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-download.c:101
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-download.c:110
+#: src/fs/gnunet-download.c:146
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/gnunet-download.c:119
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:129
+#: src/fs/gnunet-download.c:178
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:193
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Upload abgewiesen!"
 
-#: src/fs/gnunet-download.c:152 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:191
 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:177
+#: src/fs/gnunet-download.c:233
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
+#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:625
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/fs/gnunet-download.c:190
+#: src/fs/gnunet-download.c:246
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:197
+#: src/fs/gnunet-download.c:253
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
+#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:603
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-download.c:248 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:285
 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:251
+#: src/fs/gnunet-download.c:307
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
+#: src/fs/gnunet-download.c:313
 msgid "write the file to FILENAME"
 msgstr "Schreibe die Datei in DATEINAME"
 
-#: src/fs/gnunet-download.c:261
+#: src/fs/gnunet-download.c:317
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:265
+#: src/fs/gnunet-download.c:321
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268
+#: src/fs/gnunet-download.c:324
 msgid "download a GNUnet directory recursively"
 msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
 
-#: src/fs/gnunet-download.c:278
+#: src/fs/gnunet-download.c:338
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2459,12 +2575,12 @@
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:124
+#: src/fs/gnunet-fs.c:128
 #, fuzzy
 msgid "Special file-sharing operations"
 msgstr "Alle Optionen anzeigen"
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:167
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:161
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -2475,10 +2591,6 @@
 msgid "Option `%s' ignored\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
-
 #: src/fs/gnunet-pseudonym.c:282
 msgid "create or advertise namespace NAME"
 msgstr ""
@@ -2496,7 +2608,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:697
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:698
 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 "
@@ -2515,10 +2627,6 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
-msgid "set the desired replication LEVEL"
-msgstr ""
-
 #: src/fs/gnunet-pseudonym.c:307
 #, fuzzy
 msgid "specify ID of the root of the namespace"
@@ -2529,7 +2637,7 @@
 msgid "change rating of namespace ID by VALUE"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:318
+#: src/fs/gnunet-pseudonym.c:322
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2553,121 +2661,108 @@
 msgid "URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:187
+#: src/fs/gnunet-publish.c:188
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:305
+#: src/fs/gnunet-publish.c:306
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:307
+#: src/fs/gnunet-publish.c:308
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:358
+#: src/fs/gnunet-publish.c:359 src/fs/gnunet-publish.c:613
 #, fuzzy, c-format
-msgid "Failed to create namespace `%s'\n"
+msgid "Failed to create namespace `%s' (illegal filename?)\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-publish.c:433
+#: src/fs/gnunet-publish.c:434
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:460
+#: src/fs/gnunet-publish.c:461
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:491
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-publish.c:493
+#: src/fs/gnunet-publish.c:494
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-publish.c:498
+#: src/fs/gnunet-publish.c:499
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:503
+#: src/fs/gnunet-publish.c:504
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/fs/gnunet-publish.c:507
+#: src/fs/gnunet-publish.c:508
 #, 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:511
+#: src/fs/gnunet-publish.c:512
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:518
+#: src/fs/gnunet-publish.c:519
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/gnunet-publish.c:552
+#: src/fs/gnunet-publish.c:553
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:560
 #, 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:565
+#: src/fs/gnunet-publish.c:566
 #, 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:573 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:574 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:583 src/fs/gnunet-publish.c:590
-#: src/transport/gnunet-transport.c:560
+#: src/fs/gnunet-publish.c:584 src/fs/gnunet-publish.c:591
+#: src/transport/gnunet-transport.c:624
 #, 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:612
+#: src/fs/gnunet-publish.c:646
 #, fuzzy, c-format
-msgid "Could not create namespace `%s'\n"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
-
-#: src/fs/gnunet-publish.c:645
-#, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-publish.c:657
+#: src/fs/gnunet-publish.c:658
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:682
-msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:685
-msgid "do not use libextractor to add keywords or metadata"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:689
+#: src/fs/gnunet-publish.c:690
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2675,7 +2770,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:693
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2683,7 +2778,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:700
+#: src/fs/gnunet-publish.c:701
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2691,7 +2786,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2699,36 +2794,32 @@
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/fs/gnunet-publish.c:709
-msgid "specify the priority of the content"
-msgstr "Die Priorität des Inhalts angeben"
-
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:714
 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:719
+#: src/fs/gnunet-publish.c:720
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:723
+#: src/fs/gnunet-publish.c:724
 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:727
+#: src/fs/gnunet-publish.c:728
 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:742
+#: src/fs/gnunet-publish.c:747
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2764,7 +2855,7 @@
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:308
+#: src/fs/gnunet-search.c:312
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -2784,95 +2875,95 @@
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:696
+#: src/fs/gnunet-service-fs_cp.c:703
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:700
+#: src/fs/gnunet-service-fs_cp.c:707
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:735
+#: src/fs/gnunet-service-fs_cp.c:742
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:741
+#: src/fs/gnunet-service-fs_cp.c:748
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1324
+#: src/fs/gnunet-service-fs_cp.c:773 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:858
+#: src/fs/gnunet-service-fs_cp.c:865
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:918
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:919
+#: src/fs/gnunet-service-fs_cp.c:926
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:933
+#: src/fs/gnunet-service-fs_cp.c:940
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:971
+#: src/fs/gnunet-service-fs_cp.c:978
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/fs/gnunet-service-fs_cp.c:1045
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1069
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/fs/gnunet-service-fs_cp.c:1079
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1151
+#: src/fs/gnunet-service-fs_cp.c:1158
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/fs/gnunet-service-fs_cp.c:1192
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1207
+#: src/fs/gnunet-service-fs_cp.c:1214
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1267
+#: src/fs/gnunet-service-fs_cp.c:1274
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1293
+#: src/fs/gnunet-service-fs_cp.c:1300
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1322
+#: src/fs/gnunet-service-fs_cp.c:1329
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1687
+#: src/fs/gnunet-service-fs_cp.c:1685
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -2930,8 +3021,8 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:362
-#: src/fs/gnunet-service-fs_lc.c:488
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
+#: src/fs/gnunet-service-fs_lc.c:490
 #, fuzzy
 msgid "# client searches active"
 msgstr "# gap Anfragen insgesamt empfangen"
@@ -2941,12 +3032,12 @@
 msgid "# replies received for local clients"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:321
+#: src/fs/gnunet-service-fs_lc.c:323
 #, fuzzy
 msgid "# client searches received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:356
+#: src/fs/gnunet-service-fs_lc.c:358
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2983,8 +3074,8 @@
 msgid "# requests refreshed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:681
-#: src/fs/gnunet-service-fs_pe.c:748
+#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:684
+#: src/fs/gnunet-service-fs_pe.c:751
 msgid "# query plan entries"
 msgstr ""
 
@@ -2993,104 +3084,104 @@
 msgid "# Pending requests created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:616
+#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:618
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:779
+#: src/fs/gnunet-service-fs_pr.c:781
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:808
+#: src/fs/gnunet-service-fs_pr.c:810
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:822
+#: src/fs/gnunet-service-fs_pr.c:824
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:835
+#: src/fs/gnunet-service-fs_pr.c:837
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:953
+#: src/fs/gnunet-service-fs_pr.c:955
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:980
+#: src/fs/gnunet-service-fs_pr.c:982
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:1015
+#: src/fs/gnunet-service-fs_pr.c:1017
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1106
+#: src/fs/gnunet-service-fs_pr.c:1108
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1127
+#: src/fs/gnunet-service-fs_pr.c:1129
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1174
+#: src/fs/gnunet-service-fs_pr.c:1176
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1190
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1197
+#: src/fs/gnunet-service-fs_pr.c:1199
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1213
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1224
+#: src/fs/gnunet-service-fs_pr.c:1226
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1237
+#: src/fs/gnunet-service-fs_pr.c:1239
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1244
 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:1271 src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1449
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1327
+#: src/fs/gnunet-service-fs_pr.c:1329
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1340
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1426
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1510
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:1601 src/fs/gnunet-service-fs_pr.c:1610
+#: 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"
@@ -3129,41 +3220,46 @@
 msgid "Could not start unindex operation.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/fs/gnunet-unindex.c:176
+#: src/fs/gnunet-unindex.c:180
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/plugin_block_fs.c:131
+#: src/fs/plugin_block_fs.c:130
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:191
+#: src/gns/gnunet-gns.c:267
+#, fuzzy, c-format
+msgid "Key file `%s' for private zone does not exist!\n"
+msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
+
+#: src/gns/gnunet-gns.c:289
 #, fuzzy
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns.c:232
+#: src/gns/gnunet-gns.c:341
 msgid "try to shorten a given GNS name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:235
+#: src/gns/gnunet-gns.c:344
 msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:347
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:241
+#: src/gns/gnunet-gns.c:350
 #, fuzzy
 msgid "Specify the type of the record lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:244
+#: src/gns/gnunet-gns.c:353
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:255
+#: src/gns/gnunet-gns.c:367
 msgid "GNUnet GNS access tool"
 msgstr ""
 
@@ -3197,41 +3293,59 @@
 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:725 src/gns/gnunet-gns-fcfsd.c:737
+#: src/gns/gnunet-gns-fcfsd.c:550
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:558
+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:747 src/namestore/gnunet-namestore.c:299
+#: src/gns/gnunet-gns-fcfsd.c:763 src/namestore/gnunet-namestore.c:365
 #, 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:757 src/namestore/gnunet-namestore.c:310
+#: src/gns/gnunet-gns-fcfsd.c:773 src/namestore/gnunet-namestore.c:376
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
+#: src/gns/gnunet-gns-fcfsd.c:789 src/gns/gnunet-gns-proxy.c:2667
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:804
+#: src/gns/gnunet-gns-fcfsd.c:823
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-lookup.c:210
-msgid "Issue a request to the GNUnet Naming System, prints results."
-msgstr ""
+#: src/gns/gnunet-gns-proxy.c:2300
+#, 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:800
+#: src/gns/gnunet-gns-proxy.c:2329
+#, fuzzy, c-format
+msgid "Unable to import certificate %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/gns/gnunet-gns-proxy.c:3328
 msgid "listen on specified port"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:811
+#: src/gns/gnunet-gns-proxy.c:3331
+msgid "pem file to use as CA"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3346
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3293,7 +3407,7 @@
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
+#: src/hostlist/gnunet-daemon-hostlist.c:344
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3607,22 +3721,22 @@
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1095
-#: src/template/gnunet-template.c:68
+#: src/integration-tests/connection_watchdog.c:1099
+#: src/template/gnunet-template.c:71
 #, fuzzy
 msgid "help text"
 msgstr "Hilfetext für -t"
 
-#: src/mesh/gnunet-service-mesh.c:4590 src/mesh/gnunet-service-mesh_new.c:4618
+#: src/mesh/gnunet-service-mesh.c:5904
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4784 src/mesh/gnunet-service-mesh_new.c:4812
+#: src/mesh/gnunet-service-mesh.c:6116
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:4793 src/mesh/gnunet-service-mesh_new.c:4821
+#: src/mesh/gnunet-service-mesh.c:6125
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -3637,197 +3751,240 @@
 msgid "Could not access file `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/namestore/gnunet-namestore.c:157
+#: src/namestore/gnunet-namestore.c:212
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:183
+#: src/namestore/gnunet-namestore.c:243
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:239
+#: src/namestore/gnunet-namestore.c:304
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:276
-#, c-format
-msgid "Option `%s' not given, but I need a zone key file!\n"
+#: src/namestore/gnunet-namestore.c:320
+msgid "for at least"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:281
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
+#: src/namestore/gnunet-namestore.c:321
+msgid "until"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:291
+#: src/namestore/gnunet-namestore.c:357
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:321
+#: src/namestore/gnunet-namestore.c:387
 #, 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:328 src/namestore/gnunet-namestore.c:350
-#: src/namestore/gnunet-namestore.c:374 src/namestore/gnunet-namestore.c:384
-#: src/namestore/gnunet-namestore.c:409
+#: 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
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/namestore/gnunet-namestore.c:329 src/namestore/gnunet-namestore.c:351
+#: src/namestore/gnunet-namestore.c:396 src/namestore/gnunet-namestore.c:420
 msgid "add/del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:409
 #, 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:366
+#: src/namestore/gnunet-namestore.c:447
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:375 src/namestore/gnunet-namestore.c:385
+#: src/namestore/gnunet-namestore.c:456
+#, 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
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:410
+#: src/namestore/gnunet-namestore.c:497
+#, fuzzy, c-format
+msgid "No valid expiration time for operation `%s'\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/namestore/gnunet-namestore.c:520
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:462
+#: src/namestore/gnunet-namestore.c:570
+#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#, 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
+#, 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
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:682
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:468
+#: src/namestore/gnunet-namestore.c:685
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:471
+#: src/namestore/gnunet-namestore.c:688
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:474
+#: src/namestore/gnunet-namestore.c:691
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:477
+#: src/namestore/gnunet-namestore.c:694
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:480
+#: src/namestore/gnunet-namestore.c:697
+msgid "URI to import into our zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:700
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:483
+#: src/namestore/gnunet-namestore.c:703
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:486
+#: src/namestore/gnunet-namestore.c:706
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:489
+#: src/namestore/gnunet-namestore.c:709
 msgid "filename with the zone key"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:500
+#: src/namestore/gnunet-namestore.c:720
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
 
-#: src/namestore/gnunet-service-namestore.c:143
-#, c-format
-msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
-msgstr ""
+#: src/namestore/gnunet-service-namestore.c:242
+#: src/namestore/gnunet-service-namestore.c:258
+#, fuzzy, c-format
+msgid "Failed to write zone key to file `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/namestore/gnunet-service-namestore.c:154
-#, c-format
-msgid "File zone `%s' containing this key already exists\n"
+#: src/namestore/gnunet-service-namestore.c:244
+msgid "file exists but reading key failed"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:160
-#, c-format
-msgid ""
-"File zone `%s' but different zone key already exists, failed to write! \n"
+#: src/namestore/gnunet-service-namestore.c:260
+msgid "file exists with different key"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:198
+#: src/namestore/gnunet-service-namestore.c:1519
+#, fuzzy
+msgid "Failed to find record to remove\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/namestore/gnunet-service-namestore.c:2133
 #, fuzzy, c-format
-msgid "Stored zonekey for zone `%s' in file `%s'\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Could not parse zone key file `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1909
+#: src/namestore/gnunet-service-namestore.c:2223
 #, fuzzy
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/namestore/gnunet-service-namestore.c:1918
+#: src/namestore/gnunet-service-namestore.c:2233
 #, c-format
 msgid "Creating directory `%s' for zone files failed!\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:315 src/namestore/namestore_api.c:353
-msgid "Namestore added record successfully"
-msgstr ""
-
-#: src/namestore/namestore_api.c:323
+#: src/namestore/namestore_api.c:345
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/namestore/namestore_api.c:361
-msgid "Namestore record already existed"
-msgstr ""
-
-#: src/namestore/namestore_api.c:368
+#: src/namestore/namestore_api.c:371
 msgid "Namestore failed to add record\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:401
+#: src/namestore/namestore_api.c:415
 #, fuzzy
-msgid "Namestore removed record successfully"
-msgstr "Der GNUnet Dienst wurde erfolgreich installiert.\n"
+msgid "Failed to create new signature"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/namestore/namestore_api.c:408
-msgid "No records for entry"
+#: src/namestore/namestore_api.c:419
+#, fuzzy
+msgid "Failed to put new set of records in database"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/namestore/namestore_api.c:423
+#, fuzzy
+msgid "Failed to remove records from database"
 msgstr ""
+"\n"
+"Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/namestore/namestore_api.c:415
+#: src/namestore/namestore_api.c:427
 #, fuzzy
-msgid "Could not find record to remove"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+msgid "Failed to access database"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/namestore/namestore_api.c:422
+#: src/namestore/namestore_api.c:431
 #, fuzzy
-msgid "Failed to create new signature"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+msgid "unknown internal error in namestore"
+msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/namestore/namestore_api.c:429
+#: src/namestore/namestore_api.c:436
+msgid "Protocol error"
+msgstr ""
+
+#: src/namestore/plugin_namestore_postgres.c:95
 #, fuzzy
-msgid "Failed to put new set of records in database"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+msgid "Failed to create indices\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:318
+#: src/nat/gnunet-nat-server.c:321
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
@@ -3872,7 +4029,7 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:928
+#: src/nse/gnunet-nse-profiler.c:915
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
@@ -3902,16 +4059,16 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:203
+#: src/peerinfo/gnunet-service-peerinfo.c:228
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:229
+#: src/peerinfo/gnunet-service-peerinfo.c:267
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:254
+#: src/peerinfo/gnunet-service-peerinfo.c:292
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -3919,38 +4076,38 @@
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:353
+#: src/peerinfo/gnunet-service-peerinfo.c:414
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:710
+#: src/peerinfo/gnunet-service-peerinfo.c:800
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:238
+#: src/peerinfo/peerinfo_api.c:239
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:358
+#: src/peerinfo/peerinfo_api.c:359
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerinfo/peerinfo_api.c:505
+#: src/peerinfo/peerinfo_api.c:509
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/peerinfo/peerinfo_api.c:531 src/peerinfo/peerinfo_api.c:550
-#: src/peerinfo/peerinfo_api.c:565 src/peerinfo/peerinfo_api.c:576
-#: src/peerinfo/peerinfo_api.c:587
+#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
+#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
+#: src/peerinfo/peerinfo_api.c:606
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
 
-#: src/peerinfo/peerinfo_api.c:663
+#: src/peerinfo/peerinfo_api.c:681
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
@@ -4010,11 +4167,6 @@
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:875
-#, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
 #: src/peerinfo-tool/gnunet-peerinfo.c:899
 #, c-format
 msgid "I am peer `%s'.\n"
@@ -4044,7 +4196,7 @@
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:957
+#: src/peerinfo-tool/gnunet-peerinfo.c:961
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -4140,7 +4292,7 @@
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/pt/gnunet-daemon-pt.c:973
+#: src/pt/gnunet-daemon-pt.c:976
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -4154,42 +4306,42 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-statistics.c:122
+#: src/statistics/gnunet-statistics.c:120
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:199
+#: src/statistics/gnunet-statistics.c:193
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:207
+#: src/statistics/gnunet-statistics.c:201
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/statistics/gnunet-statistics.c:227
+#: src/statistics/gnunet-statistics.c:221
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:230
+#: src/statistics/gnunet-statistics.c:224
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:233
+#: src/statistics/gnunet-statistics.c:227
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:236
+#: src/statistics/gnunet-statistics.c:230
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:239
+#: src/statistics/gnunet-statistics.c:233
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:246
+#: src/statistics/gnunet-statistics.c:244
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
@@ -4206,227 +4358,241 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:157
-#, fuzzy
-msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+#: src/testbed/testbed_api.c:204
+#, 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/testing/gnunet-testing.c:131
+#, fuzzy, c-format
+msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/gnunet-testing.c:159
-#, c-format
-msgid "Specified hostkey file `%s' not found!\n"
-msgstr ""
-
-#: src/testing/gnunet-testing.c:273
+#: src/testing/gnunet-testing.c:202
 #, fuzzy
 msgid "create unique configuration files"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:275
-msgid "create hostkey files from pre-computed hostkey list"
+#: src/testing/gnunet-testing.c:204
+msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:277
-msgid "host key file"
-msgstr ""
-
-#: src/testing/gnunet-testing.c:279
+#: src/testing/gnunet-testing.c:206
 #, fuzzy
-msgid "number of unique configuration files or hostkeys to create"
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:281
+#: src/testing/gnunet-testing.c:208
 #, fuzzy
 msgid "configuration template"
 msgstr "GNUnet Konfiguration"
 
-#: src/testing/gnunet-testing.c:287
+#: src/testing/gnunet-testing.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/helper.c:56
+#: src/testing/gnunet-testing-run-service.c:129
+#, c-format
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr ""
+
+#: src/testing/gnunet-testing-run-service.c:186
 #, fuzzy
+msgid "name of the template configuration file to use (optional)"
+msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
+
+#: src/testing/gnunet-testing-run-service.c:189
+msgid "name of the service to run"
+msgstr ""
+
+#: src/testing_old/helper.c:56
+#, fuzzy
 msgid "Peer is lacking HOSTKEY configuration setting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/testing/helper.c:64
+#: src/testing_old/helper.c:64
 #, fuzzy
 msgid "Could not access hostkey.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testing/testing.c:200
+#: src/testing_old/testing.c:200
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:214 src/testing/testing.c:798
+#: 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/testing.c:237
+#: 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/testing.c:238
+#: 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/testing.c:286
+#: 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/testing.c:293
+#: src/testing_old/testing.c:293
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/testing/testing.c:294 src/testing/testing.c:471
+#: 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/testing.c:354
+#: 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/testing.c:358
+#: 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/testing.c:368
+#: 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/testing.c:400
+#: src/testing_old/testing.c:400
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:463
+#: 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/testing.c:470
+#: 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/testing.c:493 src/testing/testing.c:600
+#: src/testing_old/testing.c:493 src/testing_old/testing.c:600
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:494 src/testing/testing.c:601
-#: src/testing/testing.c:621
+#: 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/testing.c:570
+#: src/testing_old/testing.c:570
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:620
+#: src/testing_old/testing.c:620
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:643 src/testing/testing.c:675
+#: 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/testing.c:658 src/testing/testing.c:713
+#: 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/testing.c:786
+#: src/testing_old/testing.c:786
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:948
+#: src/testing_old/testing.c:948
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
+#: src/testing_old/testing.c:1207 src/testing_old/testing_group.c:6155
 #, 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/testing.c:1292 src/testing/testing.c:1359
+#: 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/testing.c:1448
+#: src/testing_old/testing.c:1448
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testing/testing.c:1601
+#: src/testing_old/testing.c:1601
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1609
+#: src/testing_old/testing.c:1609
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/testing/testing.c:1636
+#: 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/testing.c:1639
+#: src/testing_old/testing.c:1639
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/testing/testing.c:1794
+#: src/testing_old/testing.c:1794
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/testing/testing.c:1922
+#: 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/testing.c:2145
+#: src/testing_old/testing.c:2145
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
-#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
-#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
-#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
+#: 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/testing_group.c:2160
+#: src/testing_old/testing_group.c:2161
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
+#: 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 "
@@ -4435,87 +4601,78 @@
 "Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
 "gesetzt, sie wird auf %dm gesetzt.\n"
 
-#: src/testing/testing_group.c:3957
+#: src/testing_old/testing_group.c:3958
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5226
+#: 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/testing_group.c:5944 src/transport/transport-testing.c:636
+#: src/testing_old/testing_group.c:5945
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/testing_group.c:6011
+#: src/testing_old/testing_group.c:6012
 #, 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_new.c:169
-msgid "tmppath cannot be NULL\n"
-msgstr ""
-
-#: src/testing/testing_new.c:356
+#: src/testing/testing.c:188
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing_new.c:365
-#, fuzzy, c-format
-msgid "Could not open hostkeys file: %s\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/testing/testing_new.c:380
+#: src/testing/testing.c:204
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing_new.c:437
+#: src/testing/testing.c:468
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/testing/testing_new.c:446
+#: src/testing/testing.c:477
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/testing/testing_new.c:680
+#: src/testing/testing.c:788
 #, 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_new.c:691
+#: src/testing/testing.c:799
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing_new.c:704
+#: src/testing/testing.c:813
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing_new.c:734
+#: src/testing/testing.c:846
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/testing/testing_new.c:751
+#: src/testing/testing.c:864
 #, 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_new.c:791
+#: src/testing/testing.c:925
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing_new.c:959
+#: src/testing/testing.c:1088
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -4612,7 +4769,7 @@
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1363
+#: src/topology/gnunet-daemon-topology.c:1366
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -4654,30 +4811,30 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:747
+#: src/transport/gnunet-service-transport_blacklist.c:751
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:163
+#: src/transport/gnunet-service-transport.c:167
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:237
+#: src/transport/gnunet-service-transport.c:242
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:284
+#: src/transport/gnunet-service-transport.c:289
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# Bytes entschlüsselt"
 
-#: src/transport/gnunet-service-transport.c:582
+#: src/transport/gnunet-service-transport.c:590
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:591
+#: src/transport/gnunet-service-transport.c:599
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -4691,16 +4848,16 @@
 msgid "# messages dropped due to slow client"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_clients.c:503
+#: src/transport/gnunet-service-transport_clients.c:509
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:631
+#: src/transport/gnunet-service-transport_clients.c:637
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:682
+#: src/transport/gnunet-service-transport_clients.c:688
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -4709,117 +4866,117 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1032
+#: src/transport/gnunet-service-transport_neighbours.c:1057
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1148
-#: src/transport/gnunet-service-transport_neighbours.c:1482
+#: src/transport/gnunet-service-transport_neighbours.c:1174
+#: src/transport/gnunet-service-transport_neighbours.c:1511
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1153
+#: src/transport/gnunet-service-transport_neighbours.c:1179
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1158
+#: src/transport/gnunet-service-transport_neighbours.c:1184
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1215
+#: src/transport/gnunet-service-transport_neighbours.c:1241
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1254
+#: src/transport/gnunet-service-transport_neighbours.c:1283
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1278
+#: src/transport/gnunet-service-transport_neighbours.c:1307
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1286
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1323
+#: src/transport/gnunet-service-transport_neighbours.c:1352
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1332
+#: src/transport/gnunet-service-transport_neighbours.c:1361
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1388
+#: src/transport/gnunet-service-transport_neighbours.c:1417
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1422
+#: src/transport/gnunet-service-transport_neighbours.c:1451
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1438
+#: src/transport/gnunet-service-transport_neighbours.c:1467
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2544
+#: src/transport/gnunet-service-transport_neighbours.c:2613
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2559
-#: src/transport/gnunet-service-transport_neighbours.c:2585
+#: src/transport/gnunet-service-transport_neighbours.c:2628
+#: src/transport/gnunet-service-transport_neighbours.c:2662
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2675
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2627
+#: src/transport/gnunet-service-transport_neighbours.c:2708
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2807
+#: src/transport/gnunet-service-transport_neighbours.c:2892
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2856
+#: src/transport/gnunet-service-transport_neighbours.c:2947
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2870
+#: src/transport/gnunet-service-transport_neighbours.c:2961
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2901
+#: src/transport/gnunet-service-transport_neighbours.c:2992
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2912
+#: src/transport/gnunet-service-transport_neighbours.c:3003
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2943
+#: src/transport/gnunet-service-transport_neighbours.c:3034
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3020
+#: src/transport/gnunet-service-transport_neighbours.c:3129
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -4828,213 +4985,201 @@
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:414
+#: src/transport/gnunet-service-transport_validation.c:415
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:463
+#: src/transport/gnunet-service-transport_validation.c:464
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:512
+#: src/transport/gnunet-service-transport_validation.c:513
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_validation.c:570
+#: src/transport/gnunet-service-transport_validation.c:571
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:805
+#: src/transport/gnunet-service-transport_validation.c:807
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:840
+#: src/transport/gnunet-service-transport_validation.c:872
 #, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:924
+#: src/transport/gnunet-service-transport_validation.c:989
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/transport/gnunet-service-transport_validation.c:998
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1055
+#: src/transport/gnunet-service-transport_validation.c:1120
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1080
+#: src/transport/gnunet-service-transport_validation.c:1145
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1136
+#: src/transport/gnunet-service-transport_validation.c:1199
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-transport.c:260
+#: src/transport/gnunet-transport.c:265
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:273
+#: src/transport/gnunet-transport.c:278
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:323
+#: src/transport/gnunet-transport.c:328
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:330
+#: 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:363
+#: src/transport/gnunet-transport.c:374
 #, 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:383
+#: src/transport/gnunet-transport.c:394
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:414
+#: src/transport/gnunet-transport.c:426
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:443
+#: src/transport/gnunet-transport.c:506
 #, 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:466
+#: src/transport/gnunet-transport.c:529
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:473
+#: src/transport/gnunet-transport.c:536
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:501
+#: src/transport/gnunet-transport.c:564
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# verbundener Knoten"
 
-#: src/transport/gnunet-transport.c:569
+#: src/transport/gnunet-transport.c:633
 #, 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:618
+#: src/transport/gnunet-transport.c:716
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:719
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:624
+#: src/transport/gnunet-transport.c:722
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:627
+#: src/transport/gnunet-transport.c:728
 #, fuzzy
-msgid "provide information about all current connections (continuously)"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/transport/gnunet-transport.c:630
-#, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:634
+#: src/transport/gnunet-transport.c:732
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:637
+#: src/transport/gnunet-transport.c:735
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:645
+#: src/transport/gnunet-transport.c:746
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_http.c:1100
+#: src/transport/plugin_transport_http.c:1119
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1149
+#: src/transport/plugin_transport_http.c:1168
 #, 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:1174 src/util/service.c:1036
+#: src/transport/plugin_transport_http.c:1200 src/util/service.c:1051
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_http.c:1191 src/util/service.c:1053
+#: src/transport/plugin_transport_http.c:1217 src/util/service.c:1068
 #, 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:1296
+#: src/transport/plugin_transport_http.c:1322
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1309
-#, c-format
-msgid "FREEING %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1386
+#: src/transport/plugin_transport_http.c:1407
 #, 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:1399
+#: src/transport/plugin_transport_http.c:1420
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/transport/plugin_transport_http.c:1410
+#: src/transport/plugin_transport_http.c:1431
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1430
+#: src/transport/plugin_transport_http.c:1451
 #, 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:1460
+#: src/transport/plugin_transport_http.c:1481
 #, 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:624
+#: src/transport/plugin_transport_http_client.c:621
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -5099,91 +5244,92 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:591
+#: src/transport/plugin_transport_tcp.c:590
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:767
-#: 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:1086
-#: src/transport/plugin_transport_tcp.c:1103
+#: src/transport/plugin_transport_tcp.c:766
+#: src/transport/plugin_transport_tcp.c:855
+#: src/transport/plugin_transport_tcp.c:905
+#: src/transport/plugin_transport_tcp.c:991
+#: src/transport/plugin_transport_tcp.c:1129
+#: src/transport/plugin_transport_tcp.c:1146
 #, 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:1761
-#: src/transport/plugin_transport_tcp.c:2390
+#: src/transport/plugin_transport_tcp.c:773
+#: src/transport/plugin_transport_tcp.c:962
+#: src/transport/plugin_transport_tcp.c:1806
+#: src/transport/plugin_transport_tcp.c:2423
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:860
+#: src/transport/plugin_transport_tcp.c:859
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:908
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:996
+#: src/transport/plugin_transport_tcp.c:995
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1290
+#: src/transport/plugin_transport_tcp.c:1335
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1401
+#: src/transport/plugin_transport_tcp.c:1446
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1802
+#: src/transport/plugin_transport_tcp.c:1847
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:1973
+#: src/transport/plugin_transport_tcp.c:2018
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2043
+#: src/transport/plugin_transport_tcp.c:2088
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2279 src/util/service.c:940
+#: src/transport/plugin_transport_tcp.c:2312 src/util/service.c:946
+#: src/util/service.c:952
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2293
+#: src/transport/plugin_transport_tcp.c:2326
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2355
+#: src/transport/plugin_transport_tcp.c:2388
 #, 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:2378
+#: src/transport/plugin_transport_tcp.c:2411
 #, 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:2382
+#: src/transport/plugin_transport_tcp.c:2415
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:2419
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5198,129 +5344,142 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:367
+#: src/transport/plugin_transport_udp_broadcasting.c:392
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1894
+#: src/transport/plugin_transport_udp.c:1903
 #, c-format
 msgid ""
-"UDP could not message to `%s': `%s'. Please check your network configuration "
-"and disable IPv6 if your connection does not have a global IPv6 address\n"
+"UDP could not transmit message to `%s': Network seems down, please check "
+"your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2138
+#: src/transport/plugin_transport_udp.c:1917
+#, c-format
+msgid ""
+"UDP could not transmit message to `%s': Please check your network "
+"configuration and disable IPv6 if your connection does not have a global "
+"IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2162
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2306
+#: src/transport/plugin_transport_udp.c:2328
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2349
+#: src/transport/plugin_transport_udp.c:2371
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_unix.c:1356
+#: src/transport/plugin_transport_unix.c:1351
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_wlan.c:561
+#: src/transport/plugin_transport_wlan.c:560
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:580
+#: src/transport/plugin_transport_wlan.c:579
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:626
-#: src/transport/plugin_transport_wlan.c:676
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:625
+#: src/transport/plugin_transport_wlan.c:675
+#: src/transport/plugin_transport_wlan.c:1695
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:749
+#: src/transport/plugin_transport_wlan.c:748
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:767
+#: src/transport/plugin_transport_wlan.c:766
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:867
-#: src/transport/plugin_transport_wlan.c:948
-#: src/transport/plugin_transport_wlan.c:1698
+#: src/transport/plugin_transport_wlan.c:866
+#: src/transport/plugin_transport_wlan.c:947
+#: src/transport/plugin_transport_wlan.c:1697
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1119
+#: src/transport/plugin_transport_wlan.c:1118
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1140
+#: src/transport/plugin_transport_wlan.c:1139
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1150
+#: src/transport/plugin_transport_wlan.c:1149
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1207
+#: src/transport/plugin_transport_wlan.c:1206
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1306
+#: src/transport/plugin_transport_wlan.c:1305
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1341
+#: src/transport/plugin_transport_wlan.c:1340
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1402
+#: src/transport/plugin_transport_wlan.c:1401
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:1511
+#: src/transport/plugin_transport_wlan.c:1510
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1668
+#: 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:1677
+#: src/transport/plugin_transport_wlan.c:1676
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1687
+#: src/transport/plugin_transport_wlan.c:1686
 #, fuzzy, c-format
 msgid "Missing configuration option `%s' in section `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/transport/transport_api.c:570
+#: 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
+#, fuzzy
+msgid "Failed to initialize testing library!\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
 #: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
@@ -5351,91 +5510,96 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:359
+#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:982
 #, 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
+#, fuzzy, c-format
+msgid "Using `%s' instead\n"
+msgstr "%s: Option `%s' ist mehrdeutig\n"
+
+#: src/util/client.c:369
+#, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:367
+#: src/util/client.c:377
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:685
+#: src/util/client.c:695
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:740 src/util/service.c:970
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:882
+#: src/util/client.c:895
 #, 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:896
+#: src/util/client.c:909
 #, 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:1149
+#: src/util/client.c:1162
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:890
+#: src/util/common_logging.c:258 src/util/common_logging.c:1008
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:888
+#: src/util/common_logging.c:260 src/util/common_logging.c:1006
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:886
+#: src/util/common_logging.c:262 src/util/common_logging.c:1004
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:884
+#: src/util/common_logging.c:264 src/util/common_logging.c:1002
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:892
+#: src/util/common_logging.c:266 src/util/common_logging.c:1010
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:610
+#: src/util/common_logging.c:395
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/common_logging.c:725
+#: src/util/common_logging.c:819
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:893
+#: src/util/common_logging.c:1011
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:992
+#: src/util/common_logging.c:1113
 #, fuzzy
 msgid "unknown address"
 msgstr "Unbekannter Fehler"
 
-#: src/util/common_logging.c:1030
+#: src/util/common_logging.c:1151
 #, fuzzy
 msgid "invalid address"
 msgstr "Ungültige Parameter: "
 
-#: src/util/configuration.c:244
+#: src/util/configuration.c:259
 #, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgid "Syntax error while deserializing operation at line %u\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:816
+#: src/util/configuration.c:938
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -5480,74 +5644,89 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:280
+#: src/util/crypto_random.c:284
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:309
+#: 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:661 src/util/crypto_rsa.c:708
+#: src/util/crypto_rsa.c:635 src/util/crypto_rsa.c:651
+#: src/util/crypto_rsa.c:833
 #, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %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:731 src/util/crypto_rsa.c:778
+#, 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:666
+#: src/util/crypto_rsa.c:736
 #, 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:684
+#: src/util/crypto_rsa.c:754
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
+#: 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:743
+#: src/util/crypto_rsa.c:813
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:763
+#: src/util/crypto_rsa.c:851
 #, fuzzy, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
-msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
-
-#: src/util/crypto_rsa.c:781
-#, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
 
-#: src/util/crypto_rsa.c:1032
+#: src/util/crypto_rsa.c:926
+msgid "interrupted by shutdown"
+msgstr ""
+
+#: src/util/crypto_rsa.c:935
+#, fuzzy
+msgid "internal error"
+msgstr "Unbekannter Fehler.\n"
+
+#: src/util/crypto_rsa.c:944 src/util/crypto_rsa.c:951
+#, fuzzy
+msgid "gnunet-rsa failed"
+msgstr "gnunet-update ausführen"
+
+#: src/util/crypto_rsa.c:1332
 #, 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:498
+#: src/util/disk.c:571
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk.c:1062
+#: src/util/disk.c:1135
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1416 src/util/service.c:1650
+#: src/util/disk.c:1489 src/util/service.c:1665
 #, 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:1734
+#: src/util/disk.c:1861
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
@@ -5629,28 +5808,28 @@
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:154
+#: src/util/gnunet-resolver.c:158
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:64
+#: src/util/gnunet-rsa.c:104
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:112
+#: src/util/gnunet-rsa.c:154
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:115
+#: src/util/gnunet-rsa.c:157
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:118
+#: src/util/gnunet-rsa.c:160
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:124
+#: src/util/gnunet-rsa.c:170
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5665,70 +5844,65 @@
 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:244
+#: src/util/helper.c:254
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/helper.c:259
+#: src/util/helper.c:274
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:269
+#: src/util/helper.c:290
 #, fuzzy, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/util/helper.c:278
+#: src/util/helper.c:299
 #, 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:310
+#: src/util/helper.c:337
 #, fuzzy, c-format
 msgid "Starting HELPER process `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/util/helper.c:440
+#: 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:1200
+#: src/util/network.c:99
 #, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr ""
+
+#: src/util/network.c:1278
+#, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:299
+#: src/util/os_installation.c:329
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:526
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/util/os_installation.c:492
+#: src/util/os_priority.c:302
 #, fuzzy, c-format
-msgid "access (%s, X_OK) failed: %s\n"
-msgstr "`%s' schlug fehl: %s\n"
-
-#: src/util/os_installation.c:507
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "`%s' schlug fehl: %s\n"
-
-#: src/util/os_priority.c:305
-#, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/os_priority.c:306
+#: src/util/os_priority.c:303
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -5801,143 +5975,143 @@
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:483
+#: src/util/server.c:468
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/server.c:492
+#: src/util/server.c:477
 #, 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:497
+#: src/util/server.c:488
 #, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
+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:827
+#: src/util/server.c:819
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
-#: src/util/service.c:225 src/util/service.c:232
+#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
+#: src/util/service.c:232 src/util/service.c:239
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/service.c:188
+#: src/util/service.c:195
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/service.c:281
+#: src/util/service.c:288
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
 
-#: src/util/service.c:313
+#: src/util/service.c:320
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/service.c:343
+#: src/util/service.c:350
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
-#: src/util/service.c:698
+#: src/util/service.c:705
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:703
+#: src/util/service.c:710
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/util/service.c:710
+#: src/util/service.c:717
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:765
+#: src/util/service.c:772
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:802
+#: src/util/service.c:809
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:920
+#: src/util/service.c:927
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:990
+#: src/util/service.c:1005
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1007
+#: src/util/service.c:1022
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1241
+#: src/util/service.c:1256
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1292 src/util/service.c:1310
+#: src/util/service.c:1307 src/util/service.c:1325
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1337
+#: src/util/service.c:1352
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1506
+#: src/util/service.c:1521
 #, 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:1539
+#: src/util/service.c:1554
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1588
+#: src/util/service.c:1603
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1592
+#: src/util/service.c:1607
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1596
+#: src/util/service.c:1611
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1651
+#: src/util/service.c:1666
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1664
+#: src/util/service.c:1679
 #, 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:1729
+#: src/util/service.c:1744
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5946,64 +6120,70 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/util/strings.c:144
+#: src/util/strings.c:145
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:334
+#: src/util/strings.c:385
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:481
+#: src/util/strings.c:534
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:573
+#: src/util/strings.c:626
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:578
-msgid "eternity"
+#: src/util/strings.c:631
+msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:582
+#: src/util/strings.c:635
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:586
+#: src/util/strings.c:639
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:590
+#: src/util/strings.c:643
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:594
-msgid " days"
+#: src/util/strings.c:648
+#, fuzzy
+msgid "day"
 msgstr " Tage"
 
-#: src/util/strings.c:618
+#: src/util/strings.c:650
+#, fuzzy
+msgid "days"
+msgstr " Tage"
+
+#: src/util/strings.c:674
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1012
+#: src/util/strings.c:1063
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1020
+#: src/util/strings.c:1071
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1026
+#: src/util/strings.c:1077
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1033
+#: src/util/strings.c:1084
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1042
+#: src/util/strings.c:1093
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -6179,27 +6359,55 @@
 msgid "service is offered via UDP"
 msgstr "# Bytes empfangen über UDP"
 
-#: src/vpn/gnunet-vpn.c:329
+#: src/vpn/gnunet-vpn.c:333
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:497 src/include/gnunet_common.h:502
-#: src/include/gnunet_common.h:508
+#: src/include/gnunet_common.h:507 src/include/gnunet_common.h:512
+#: src/include/gnunet_common.h:518
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:518
+#: src/include/gnunet_common.h:528
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:539 src/include/gnunet_common.h:546
+#: src/include/gnunet_common.h:549 src/include/gnunet_common.h:556
 #, 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 "Could not create namespace `%s'\n"
+#~ msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#, fuzzy
+#~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
+#~ msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#, fuzzy
+#~ msgid "Namestore removed record successfully"
+#~ msgstr "Der GNUnet Dienst wurde erfolgreich installiert.\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
+#~ msgid "Could not open hostkeys file: %s\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
+#~ msgid "access (%s, X_OK) failed: %s\n"
+#~ msgstr "`%s' schlug fehl: %s\n"
+
+#, fuzzy
+#~ msgid "stat (%s) failed: %s\n"
+#~ msgstr "`%s' schlug fehl: %s\n"
+
+#, fuzzy
 #~ msgid "# Peers connected"
 #~ msgstr "# verbundener Knoten"
 
@@ -6364,10 +6572,6 @@
 #~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
 #, fuzzy
-#~ msgid "Service `%s' is not running.\n"
-#~ msgstr "`%s' ist keine Datei.\n"
-
-#, fuzzy
 #~ msgid "Binary implementing service `%s' not known!\n"
 #~ msgstr ""
 #~ "Signatur kann nicht verifiziert werden, der Knoten `%s' ist uns nicht "
@@ -6378,10 +6582,6 @@
 #~ msgstr "Dienst gelöscht.\n"
 
 #, fuzzy
-#~ msgid "Unable to start service `%s': %s\n"
-#~ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#, fuzzy
 #~ msgid "Unable to accept connection for service `%s': %s\n"
 #~ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
@@ -7023,10 +7223,6 @@
 #~ msgstr "Unerwartete sehr große Allokierung (%u Bytes) bei %s:%d!\n"
 
 #, fuzzy
-#~ msgid "`%s' failed with error code %d: %s\n"
-#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#, fuzzy
 #~ msgid "Deadlock due to `%s'.\n"
 #~ msgstr "Durch `%s' ist ein Deadlock bei %s:%d entstanden\n"
 
@@ -8144,11 +8340,6 @@
 #~ msgstr "Wert der Option anzeigen"
 
 #, fuzzy
-#~ msgid "What is the path to the configuration file for gnunetd?"
-#~ msgstr ""
-#~ "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
-
-#, fuzzy
 #~ msgid "General options"
 #~ msgstr "Weitere Einstellungen"
 
@@ -8784,10 +8975,6 @@
 #~ msgstr "Gruppe:"
 
 #, fuzzy
-#~ msgid "gnunet-setup"
-#~ msgstr "gnunet-update ausführen"
-
-#, fuzzy
 #~ msgid "Save configuration"
 #~ msgstr "GNUnet Konfiguration"
 

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2012-07-20 16:57:42 UTC (rev 22805)
+++ gnunet/po/es.po     2012-07-20 17:34:01 UTC (rev 22806)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-06-02 19:10+0200\n"
+"POT-Creation-Date: 2012-07-20 19:29+0200\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -21,176 +21,184 @@
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:349
+#: src/arm/arm_api.c:354
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/arm/arm_api.c:363
+#: src/arm/arm_api.c:368
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/arm/arm_api.c:432
+#: src/arm/arm_api.c:437
 #, fuzzy, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
 
-#: src/arm/arm_api.c:485
+#: src/arm/arm_api.c:490
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:486
+#: src/arm/arm_api.c:491
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:507
+#: 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:508
+#: 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:540
+#: src/arm/arm_api.c:547
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
 
-#: src/arm/arm_api.c:612
+#: src/arm/arm_api.c:620
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "No se ha recibido una respuesta en %llums.\n"
 
-#: src/arm/gnunet-arm.c:159
+#: src/arm/gnunet-arm.c:166
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "El espacio '%s' ha sido valorado con un %d.\n"
 
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:171
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-arm.c:167
+#: src/arm/gnunet-arm.c:174
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "¡Esta búsqueda está aún pendiente!\n"
 
-#: src/arm/gnunet-arm.c:172
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:182
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-arm.c:179
+#: src/arm/gnunet-arm.c:186
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "¡Esta búsqueda está aún pendiente!\n"
 
-#: src/arm/gnunet-arm.c:183
+#: src/arm/gnunet-arm.c:190
 #, fuzzy
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr "'%s' se esta cerrando.\n"
 
-#: src/arm/gnunet-arm.c:187
+#: src/arm/gnunet-arm.c:194
 #, fuzzy
 msgid "Error communicating with ARM service.\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/arm/gnunet-arm.c:191
+#: src/arm/gnunet-arm.c:198
 #, fuzzy
 msgid "Timeout communicating with ARM service.\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/arm/gnunet-arm.c:195
+#: src/arm/gnunet-arm.c:202
 #, fuzzy
 msgid "Operation failed.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/arm/gnunet-arm.c:199
+#: src/arm/gnunet-arm.c:206
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222
+#: src/arm/gnunet-arm.c:229
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/arm/gnunet-arm.c:225
+#: src/arm/gnunet-arm.c:232
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-arm.c:249
+#: src/arm/gnunet-arm.c:256
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
+#: src/arm/gnunet-arm.c:264 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:384
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:280
+#: src/arm/gnunet-arm.c:287
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/arm/gnunet-arm.c:286
+#: src/arm/gnunet-arm.c:293
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/arm/gnunet-arm.c:407
+#: src/arm/gnunet-arm.c:418
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:409
+#: src/arm/gnunet-arm.c:420
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:411
+#: src/arm/gnunet-arm.c:422
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:413
+#: src/arm/gnunet-arm.c:424
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:416
+#: src/arm/gnunet-arm.c:427
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:430
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:421
+#: src/arm/gnunet-arm.c:432
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:424
+#: src/arm/gnunet-arm.c:435
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "tiempo para esperar hasta completar una iteración (en ms)"
 
-#: src/arm/gnunet-arm.c:426
+#: src/arm/gnunet-arm.c:437
 msgid "List currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:439
+msgid "Don't let gnunet-service-arm inherit standard output"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:441
+msgid "Don't let gnunet-service-arm inherit standard error"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:455
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -289,6 +297,21 @@
 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/gnunet-ats.c:96
+#, fuzzy
+msgid "list information for all peers"
+msgstr "Imprime información de los pares de GNUnet."
+
+#: src/ats/gnunet-ats.c:105
+#, fuzzy
+msgid "Print information about ATS state"
+msgstr "Imprime información de los pares de GNUnet."
+
 #: src/block/block.c:105
 #, fuzzy, c-format
 msgid "Loading block plugin `%s'\n"
@@ -536,46 +559,67 @@
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:742
+#: src/chat/gnunet-chat.c:746
 msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:267
+#: src/chat/gnunet-service-chat.c:266
 #, fuzzy
 msgid "Failed to queue a message notification\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/chat/gnunet-service-chat.c:546
+#: src/chat/gnunet-service-chat.c:545
 #, fuzzy
 msgid "Failed to queue a join notification\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/chat/gnunet-service-chat.c:729
+#: src/chat/gnunet-service-chat.c:728
 #, fuzzy
 msgid "Failed to queue a confirmation receipt\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/chat/gnunet-service-chat.c:907
+#: src/chat/gnunet-service-chat.c:906
 #, fuzzy
 msgid "Failed to queue a leave notification\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/core/core_api.c:786
+#: src/core/core_api.c:757
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
+#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
+#: src/core/gnunet-core.c:118 src/core/gnunet-core.c:149
+#: src/transport/gnunet-transport.c:451 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
+#, fuzzy
+msgid "Connected to"
+msgstr "'%s' conectado a '%s'.\n"
+
+#: src/core/gnunet-core.c:151 src/transport/gnunet-transport.c:479
+#, fuzzy
+msgid "Disconnected from"
+msgstr "'%s' conectado a '%s'.\n"
+
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Argumentos en la linea de comandos inválidos:\n"
 
-#: src/core/gnunet-core.c:95
+#: src/core/gnunet-core.c:216 src/transport/gnunet-transport.c:725
 #, fuzzy
+msgid "provide information about all current connections (continuously)"
+msgstr "Imprime información de los pares de GNUnet."
+
+#: src/core/gnunet-core.c:227
+#, fuzzy
 msgid "Print information about connected peers."
 msgstr "Imprime información de los pares de GNUnet."
 
@@ -640,7 +684,7 @@
 msgstr "# mensajes defragmentados"
 
 #: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:810
+#: src/transport/gnunet-service-transport_validation.c:812
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -668,7 +712,7 @@
 msgstr "# mensajes PONG encriptados recibidos"
 
 #: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1031
+#: src/transport/gnunet-service-transport_validation.c:1096
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -688,58 +732,58 @@
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1381
-#: src/core/gnunet-service-core_kx.c:1398
+#: src/core/gnunet-service-core_kx.c:1383
+#: src/core/gnunet-service-core_kx.c:1400
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/core/gnunet-service-core_kx.c:1402
+#: src/core/gnunet-service-core_kx.c:1404
 msgid "# REKEY operations performed"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1537
+#: src/core/gnunet-service-core_kx.c:1539
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1577
-#: src/core/gnunet-service-core_kx.c:1602
+#: src/core/gnunet-service-core_kx.c:1579
+#: src/core/gnunet-service-core_kx.c:1604
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1589
+#: src/core/gnunet-service-core_kx.c:1591
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1628
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/core/gnunet-service-core_kx.c:1630
+#: src/core/gnunet-service-core_kx.c:1632
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1638
+#: src/core/gnunet-service-core_kx.c:1640
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/core/gnunet-service-core_kx.c:1700
+#: src/core/gnunet-service-core_kx.c:1702
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/core/gnunet-service-core_kx.c:1708
+#: 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:1718 src/hostlist/hostlist-server.c:551
+#: 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:611
+#: src/transport/gnunet-service-transport.c:619
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
@@ -758,23 +802,23 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:418
+#: src/core/gnunet-service-core_neighbours.c:421
 #, fuzzy, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-#: src/dht/gnunet-service-dht_neighbours.c:625
-#: src/dht/gnunet-service-dht_neighbours.c:683
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
+#: 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/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
-#: src/transport/gnunet-service-transport_neighbours.c:874
-#: src/transport/gnunet-service-transport_neighbours.c:1080
-#: src/transport/gnunet-service-transport_neighbours.c:1089
-#: src/transport/gnunet-service-transport_neighbours.c:2568
-#: src/transport/gnunet-service-transport_neighbours.c:2814
+#: src/transport/gnunet-service-transport_neighbours.c:890
+#: src/transport/gnunet-service-transport_neighbours.c:1106
+#: src/transport/gnunet-service-transport_neighbours.c:1115
+#: src/transport/gnunet-service-transport_neighbours.c:2637
+#: src/transport/gnunet-service-transport_neighbours.c:2899
 #, fuzzy
 msgid "# peers connected"
 msgstr "# de pares conectados"
@@ -838,9 +882,10 @@
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:525
-#: src/include/gnunet_common.h:532
+#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:535
+#: src/include/gnunet_common.h:542
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
@@ -1158,6 +1203,7 @@
 "Fallo al recibir la respuesta de gnunetd.\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
+#: src/namestore/plugin_namestore_postgres.c:654
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1195,7 +1241,7 @@
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1198
-#: src/namestore/plugin_namestore_sqlite.c:829
+#: src/namestore/plugin_namestore_sqlite.c:834
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "base de datos sqlite"
@@ -1210,33 +1256,31 @@
 msgstr "Fallo al conectar a gnunetd.\n"
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
-#: src/dht/gnunet-dht-put.c:192 src/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-put.c:192
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:182
+#: src/dht/gnunet-dht-get.c:204
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
-#: src/gns/gnunet-gns-lookup.c:185
 msgid "the type of data to look for"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
-#: src/gns/gnunet-gns-lookup.c:188
 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-download.c:271
-#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
-#: src/fs/gnunet-unindex.c:169 src/gns/gnunet-gns-lookup.c:191
-#: src/nse/gnunet-nse-profiler.c:910
+#: 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
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:232
+#: src/dht/gnunet-dht-get.c:236
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1244,7 +1288,7 @@
 msgid "how long to execute? 0 = forever"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321
+#: src/dht/gnunet-dht-monitor.c:324
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
@@ -1296,12 +1340,12 @@
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:223
+#: src/dht/gnunet-dht-put.c:226
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
-#: src/testing/testing.c:1968 src/testing/testing.c:1998
+#: 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
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
@@ -1339,17 +1383,17 @@
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:990
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1038
-#: src/dht/gnunet-service-dht_clients.c:1081
+#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-dht_clients.c:1082
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1048
+#: src/dht/gnunet-service-dht_clients.c:1049
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
@@ -1394,94 +1438,101 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:481
+#: src/dht/gnunet-service-dht_neighbours.c:485
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:571
+#: src/dht/gnunet-service-dht_neighbours.c:575
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes fragmentados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:717
+#: src/dht/gnunet-service-dht_neighbours.c:721
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# mensajes defragmentados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:772
+#: src/dht/gnunet-service-dht_neighbours.c:776
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# bytes recibidos por TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:810
+#: src/dht/gnunet-service-dht_neighbours.c:814
 #, fuzzy
 msgid "# Bytes of bandwdith requested from core"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1032
-#: src/dht/gnunet-service-dht_neighbours.c:1060
+#: src/dht/gnunet-service-dht_neighbours.c:1036
+#: src/dht/gnunet-service-dht_neighbours.c:1064
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1041
-#: src/dht/gnunet-service-dht_neighbours.c:1075
+#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1079
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "Conexión fallida\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1207
+#: src/dht/gnunet-service-dht_neighbours.c:1211
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1236
+#: src/dht/gnunet-service-dht_neighbours.c:1240
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1315
+#: src/dht/gnunet-service-dht_neighbours.c:1247
+#: src/dht/gnunet-service-dht_neighbours.c:1360
+#: src/dht/gnunet-service-dht_neighbours.c:1460
 #, fuzzy
+msgid "# P2P messages dropped due to full queue"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1325
+#, fuzzy
 msgid "# GET requests routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1342
+#: src/dht/gnunet-service-dht_neighbours.c:1352
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1443
+#: src/dht/gnunet-service-dht_neighbours.c:1467
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1531
+#: src/dht/gnunet-service-dht_neighbours.c:1555
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1671
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1655
+#: src/dht/gnunet-service-dht_neighbours.c:1679
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1746
+#: src/dht/gnunet-service-dht_neighbours.c:1770
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1788
+#: src/dht/gnunet-service-dht_neighbours.c:1812
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1802
+#: src/dht/gnunet-service-dht_neighbours.c:1826
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1876
+#: src/dht/gnunet-service-dht_neighbours.c:1900
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# bytes recibidos por TCP"
@@ -1511,10 +1562,15 @@
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:352
+#: src/dht/gnunet-service-dht_routing.c:394
 msgid "# Entries added to routing table"
 msgstr ""
 
+#: src/dht/gnunet-service-dht_routing.c:411
+#, fuzzy
+msgid "# DHT requests combined"
+msgstr "# mensajes PONG encriptados recibidos"
+
 #: src/dht/plugin_block_dht.c:136
 #, c-format
 msgid "Block not of type %u\n"
@@ -1529,15 +1585,15 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:337
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:340
+#: src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:348
+#: src/dns/gnunet-dns-monitor.c:370
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -1549,7 +1605,7 @@
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:251
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
@@ -1610,7 +1666,7 @@
 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:1561 src/exit/gnunet-daemon-exit.c:3033
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
@@ -1784,50 +1840,50 @@
 msgid "# UDP requests dropped (no such service)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:2882
+#: src/exit/gnunet-daemon-exit.c:2883
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908
+#: src/exit/gnunet-daemon-exit.c:2897 src/exit/gnunet-daemon-exit.c:2909
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2919
+#: src/exit/gnunet-daemon-exit.c:2920
 #, c-format
 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:3049
 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:3057
 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:3064
 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:3070
 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:3076 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3236
+#: src/exit/gnunet-daemon-exit.c:3241
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1886,76 +1942,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/fs/fs_api.c:339
+#: src/fs/fs_api.c:491
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:348
+#: src/fs/fs_api.c:500
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:354
+#: src/fs/fs_api.c:506
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:938
+#: src/fs/fs_api.c:1087
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:1395
+#: src/fs/fs_api.c:1546
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1437
+#: src/fs/fs_api.c:1588
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1453
+#: src/fs/fs_api.c:1604
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2106
+#: src/fs/fs_api.c:2254
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2116
+#: src/fs/fs_api.c:2264
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2241 src/fs/fs_api.c:2480
+#: src/fs/fs_api.c:2389 src/fs/fs_api.c:2629
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2258
+#: src/fs/fs_api.c:2406
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2270 src/fs/fs_api.c:2289 src/fs/fs_api.c:2773
+#: src/fs/fs_api.c:2419 src/fs/fs_api.c:2438 src/fs/fs_api.c:2922
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2471
+#: src/fs/fs_api.c:2620
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2717
+#: src/fs/fs_api.c:2866
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2811
+#: src/fs/fs_api.c:2960
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1965,58 +2021,58 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/fs_download.c:311
+#: src/fs/fs_download.c:321
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:331
+#: src/fs/fs_download.c:341
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
+#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:878
+#: src/fs/fs_download.c:888
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:970
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:986
+#: src/fs/fs_download.c:996
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1009
+#: src/fs/fs_download.c:1019
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1029
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:1028
+#: src/fs/fs_download.c:1038
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:1125
+#: src/fs/fs_download.c:1136
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tError leyendo el directorio.\n"
 
-#: src/fs/fs_download.c:1888
+#: src/fs/fs_download.c:1920
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Argumento no válido: '%s'\n"
@@ -2082,22 +2138,22 @@
 msgid "Failed to write `%s': %s\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/fs_namespace.c:256
+#: src/fs/fs_namespace.c:254
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_namespace.c:371
+#: src/fs/fs_namespace.c:369
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr "Fallo al añadir la entrada al espacio '%s' (¿existe?)\n"
 
-#: src/fs/fs_namespace.c:588 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:586 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "Error desconocido.\n"
 
-#: src/fs/fs_namespace.c:631
+#: src/fs/fs_namespace.c:629
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Fallo al conectarse a gnunetd"
@@ -2109,62 +2165,62 @@
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:621 src/fs/fs_publish.c:638 src/fs/fs_publish.c:677
-#: src/fs/fs_publish.c:697 src/fs/fs_publish.c:722 src/fs/fs_publish.c:862
+#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
 
-#: src/fs/fs_publish.c:623
+#: src/fs/fs_publish.c:624
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:635
+#: src/fs/fs_publish.c:636
 #, fuzzy
 msgid "unknown error"
 msgstr "Error desconocido"
 
-#: src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:679
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:698
+#: src/fs/fs_publish.c:699
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:724
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/fs_publish.c:746
+#: src/fs/fs_publish.c:747
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_publish.c:811
+#: src/fs/fs_publish.c:812
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/fs/fs_publish.c:817
+#: src/fs/fs_publish.c:818
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:863
+#: src/fs/fs_publish.c:864
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "'%s' no es un fichero regular.\n"
 
-#: src/fs/fs_publish.c:1071
+#: src/fs/fs_publish.c:1090
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1161
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2174,7 +2230,7 @@
 msgid "Could not connect to datastore."
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/fs_search.c:829
+#: src/fs/fs_search.c:830
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2319,6 +2375,66 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
+#: src/fs/gnunet-auto-share.c:236
+#, fuzzy, c-format
+msgid "Failed to load state: %s\n"
+msgstr "Falló al comenzar la recolección.\n"
+
+#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
+#: src/fs/gnunet-auto-share.c:309
+#, fuzzy, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
+
+#: src/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:488
+#, fuzzy, c-format
+msgid "Publishing `%s'\n"
+msgstr ""
+"\n"
+"Error subiendo el fichero %s\n"
+
+#: src/fs/gnunet-auto-share.c:497
+#, fuzzy, c-format
+msgid "Failed to run `%s'\n"
+msgstr "Falló al comenzar la recolección.\n"
+
+#: src/fs/gnunet-auto-share.c:684
+#, 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-publish.c:679
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr "seleccione el NIVEL deseado de anonimato al enviar"
+
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:683
+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
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:710
+msgid "specify the priority of the content"
+msgstr "especifica la prioridad del contenido"
+
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-pseudonym.c:304
+#: src/fs/gnunet-publish.c:717
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:767
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr ""
+
 #: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
@@ -2349,97 +2465,97 @@
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-directory.c:179
+#: src/fs/gnunet-directory.c:183
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-download.c:101
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/gnunet-download.c:110
+#: src/fs/gnunet-download.c:146
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Error desconocido"
 
-#: src/fs/gnunet-download.c:119
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:129
+#: src/fs/gnunet-download.c:178
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Error descargando: %s\n"
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:193
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "¡Subida rechazada!"
 
-#: src/fs/gnunet-download.c:152 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:191
 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Estado de descarga inesperado."
 
-#: src/fs/gnunet-download.c:177
+#: src/fs/gnunet-download.c:233
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
+#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:625
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "El fichero '%s' tiene la URI: '%s'\n"
 
-#: src/fs/gnunet-download.c:190
+#: src/fs/gnunet-download.c:246
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:197
+#: src/fs/gnunet-download.c:253
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
+#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:603
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/gnunet-download.c:248 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimidad-del-receptor"
 
-#: src/fs/gnunet-download.c:251
+#: src/fs/gnunet-download.c:307
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
+#: src/fs/gnunet-download.c:313
 msgid "write the file to FILENAME"
 msgstr "escribe el fichero al FICHERO"
 
-#: src/fs/gnunet-download.c:261
+#: src/fs/gnunet-download.c:317
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:265
+#: src/fs/gnunet-download.c:321
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268
+#: src/fs/gnunet-download.c:324
 msgid "download a GNUnet directory recursively"
 msgstr "descarga un directorio de GNUnet recursivamente"
 
-#: src/fs/gnunet-download.c:278
+#: src/fs/gnunet-download.c:338
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2449,11 +2565,11 @@
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:124
+#: src/fs/gnunet-fs.c:128
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:167
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:161
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
@@ -2464,10 +2580,6 @@
 msgid "Option `%s' ignored\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr "seleccione el NIVEL deseado de anonimato al enviar"
-
 #: src/fs/gnunet-pseudonym.c:282
 msgid "create or advertise namespace NAME"
 msgstr ""
@@ -2485,7 +2597,7 @@
 "añade una clave adicional para todos los ficheros y directorios (esta opción "
 "puede ser especificada varias veces)"
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:697
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:698
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "cambia el meta-dato para el TIPO dado al VALOR dado"
 
@@ -2502,10 +2614,6 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
-msgid "set the desired replication LEVEL"
-msgstr ""
-
 #: src/fs/gnunet-pseudonym.c:307
 #, fuzzy
 msgid "specify ID of the root of the namespace"
@@ -2516,7 +2624,7 @@
 msgid "change rating of namespace ID by VALUE"
 msgstr "cambia la valoración de un espacio"
 
-#: src/fs/gnunet-pseudonym.c:318
+#: src/fs/gnunet-pseudonym.c:322
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2540,121 +2648,108 @@
 msgid "URI is `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/fs/gnunet-publish.c:187
+#: src/fs/gnunet-publish.c:188
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "'%s' comienzo completo.\n"
 
-#: src/fs/gnunet-publish.c:305
+#: src/fs/gnunet-publish.c:306
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-publish.c:307
+#: src/fs/gnunet-publish.c:308
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/fs/gnunet-publish.c:358
+#: src/fs/gnunet-publish.c:359 src/fs/gnunet-publish.c:613
 #, fuzzy, c-format
-msgid "Failed to create namespace `%s'\n"
+msgid "Failed to create namespace `%s' (illegal filename?)\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:433
+#: src/fs/gnunet-publish.c:434
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/fs/gnunet-publish.c:460
+#: src/fs/gnunet-publish.c:461
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/fs/gnunet-publish.c:491
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-publish.c:493
+#: src/fs/gnunet-publish.c:494
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/gnunet-publish.c:498
+#: src/fs/gnunet-publish.c:499
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:503
+#: src/fs/gnunet-publish.c:504
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Cierre completado.\n"
 
-#: src/fs/gnunet-publish.c:507
+#: src/fs/gnunet-publish.c:508
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-publish.c:511
+#: src/fs/gnunet-publish.c:512
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:518
+#: src/fs/gnunet-publish.c:519
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tError leyendo el directorio.\n"
 
-#: src/fs/gnunet-publish.c:552
+#: src/fs/gnunet-publish.c:553
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:560
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:566
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-publish.c:573 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:574 src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/fs/gnunet-publish.c:583 src/fs/gnunet-publish.c:590
-#: src/transport/gnunet-transport.c:560
+#: src/fs/gnunet-publish.c:584 src/fs/gnunet-publish.c:591
+#: src/transport/gnunet-transport.c:624
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/fs/gnunet-publish.c:612
+#: src/fs/gnunet-publish.c:646
 #, fuzzy, c-format
-msgid "Could not create namespace `%s'\n"
-msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
-
-#: src/fs/gnunet-publish.c:645
-#, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-publish.c:657
+#: src/fs/gnunet-publish.c:658
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:682
-msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:685
-msgid "do not use libextractor to add keywords or metadata"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:689
+#: src/fs/gnunet-publish.c:690
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2662,7 +2757,7 @@
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/fs/gnunet-publish.c:693
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2670,7 +2765,7 @@
 "añade una clave adicional para el fichero del nivel más alto o el directorio "
 "(esta opción puede ser especificada varias veces)"
 
-#: src/fs/gnunet-publish.c:700
+#: src/fs/gnunet-publish.c:701
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2678,7 +2773,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "encriptada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2686,36 +2781,32 @@
 "especifica la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:709
-msgid "specify the priority of the content"
-msgstr "especifica la prioridad del contenido"
-
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:714
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publica los ficheros bajo el pseudónimo NOMBRE (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:719
+#: src/fs/gnunet-publish.c:720
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:723
+#: src/fs/gnunet-publish.c:724
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "cambia la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:727
+#: src/fs/gnunet-publish.c:728
 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:742
+#: src/fs/gnunet-publish.c:747
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2751,7 +2842,7 @@
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:308
+#: src/fs/gnunet-search.c:312
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -2770,93 +2861,93 @@
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:696
+#: src/fs/gnunet-service-fs_cp.c:703
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:700
+#: src/fs/gnunet-service-fs_cp.c:707
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:735
+#: src/fs/gnunet-service-fs_cp.c:742
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:741
+#: src/fs/gnunet-service-fs_cp.c:748
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1324
+#: src/fs/gnunet-service-fs_cp.c:773 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:858
+#: src/fs/gnunet-service-fs_cp.c:865
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:918
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:919
+#: src/fs/gnunet-service-fs_cp.c:926
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:933
+#: src/fs/gnunet-service-fs_cp.c:940
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:971
+#: src/fs/gnunet-service-fs_cp.c:978
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/fs/gnunet-service-fs_cp.c:1045
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1069
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/fs/gnunet-service-fs_cp.c:1079
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1151
+#: src/fs/gnunet-service-fs_cp.c:1158
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/fs/gnunet-service-fs_cp.c:1192
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1207
+#: src/fs/gnunet-service-fs_cp.c:1214
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1267
+#: src/fs/gnunet-service-fs_cp.c:1274
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1293
+#: src/fs/gnunet-service-fs_cp.c:1300
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1322
+#: src/fs/gnunet-service-fs_cp.c:1329
 #, 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:1685
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -2914,8 +3005,8 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "La indexación de los datos falló en la posición %i.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:362
-#: src/fs/gnunet-service-fs_lc.c:488
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
+#: src/fs/gnunet-service-fs_lc.c:490
 #, fuzzy
 msgid "# client searches active"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -2925,12 +3016,12 @@
 msgid "# replies received for local clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/fs/gnunet-service-fs_lc.c:321
+#: src/fs/gnunet-service-fs_lc.c:323
 #, fuzzy
 msgid "# client searches received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_lc.c:356
+#: src/fs/gnunet-service-fs_lc.c:358
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2966,8 +3057,8 @@
 msgid "# requests refreshed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:681
-#: src/fs/gnunet-service-fs_pe.c:748
+#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:684
+#: src/fs/gnunet-service-fs_pe.c:751
 msgid "# query plan entries"
 msgstr ""
 
@@ -2976,104 +3067,104 @@
 msgid "# Pending requests created"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:616
+#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:618
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:779
+#: src/fs/gnunet-service-fs_pr.c:781
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# bytes recibidos por TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:808
+#: src/fs/gnunet-service-fs_pr.c:810
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:822
+#: src/fs/gnunet-service-fs_pr.c:824
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:835
+#: src/fs/gnunet-service-fs_pr.c:837
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:953
+#: src/fs/gnunet-service-fs_pr.c:955
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:980
+#: src/fs/gnunet-service-fs_pr.c:982
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1015
+#: src/fs/gnunet-service-fs_pr.c:1017
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1106
+#: src/fs/gnunet-service-fs_pr.c:1108
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1127
+#: src/fs/gnunet-service-fs_pr.c:1129
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1174
+#: src/fs/gnunet-service-fs_pr.c:1176
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1190
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1197
+#: src/fs/gnunet-service-fs_pr.c:1199
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1213
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1224
+#: src/fs/gnunet-service-fs_pr.c:1226
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1237
+#: src/fs/gnunet-service-fs_pr.c:1239
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1244
 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:1271 src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1449
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1327
+#: src/fs/gnunet-service-fs_pr.c:1329
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1340
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1426
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1510
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1601 src/fs/gnunet-service-fs_pr.c:1610
+#: src/fs/gnunet-service-fs_pr.c:1603 src/fs/gnunet-service-fs_pr.c:1612
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Fichero de configuración '%s' creado.\n"
@@ -3112,41 +3203,46 @@
 msgid "Could not start unindex operation.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/fs/gnunet-unindex.c:176
+#: src/fs/gnunet-unindex.c:180
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/plugin_block_fs.c:131
+#: src/fs/plugin_block_fs.c:130
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:191
+#: src/gns/gnunet-gns.c:267
+#, fuzzy, c-format
+msgid "Key file `%s' for private zone does not exist!\n"
+msgstr "número de mensajes a usar por iteración"
+
+#: src/gns/gnunet-gns.c:289
 #, fuzzy
 msgid "Failed to connect to GNS\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:232
+#: src/gns/gnunet-gns.c:341
 msgid "try to shorten a given GNS name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:235
+#: src/gns/gnunet-gns.c:344
 msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:347
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:241
+#: src/gns/gnunet-gns.c:350
 #, fuzzy
 msgid "Specify the type of the record lookup"
 msgstr "especifica la prioridad del contenido"
 
-#: src/gns/gnunet-gns.c:244
+#: src/gns/gnunet-gns.c:353
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:255
+#: src/gns/gnunet-gns.c:367
 msgid "GNUnet GNS access tool"
 msgstr ""
 
@@ -3180,39 +3276,57 @@
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:725 src/gns/gnunet-gns-fcfsd.c:737
+#: src/gns/gnunet-gns-fcfsd.c:550
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:558
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:741 src/gns/gnunet-gns-fcfsd.c:753
 #, fuzzy, c-format
 msgid "Option `%s' not specified in configuration section `%s'\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:747 src/namestore/gnunet-namestore.c:299
+#: src/gns/gnunet-gns-fcfsd.c:763 src/namestore/gnunet-namestore.c:365
 #, fuzzy
 msgid "Failed to read or create private zone key\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:757 src/namestore/gnunet-namestore.c:310
+#: src/gns/gnunet-gns-fcfsd.c:773 src/namestore/gnunet-namestore.c:376
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
+#: src/gns/gnunet-gns-fcfsd.c:789 src/gns/gnunet-gns-proxy.c:2667
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:804
+#: src/gns/gnunet-gns-fcfsd.c:823
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-lookup.c:210
-msgid "Issue a request to the GNUnet Naming System, prints results."
-msgstr ""
+#: src/gns/gnunet-gns-proxy.c:2300
+#, 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:800
+#: src/gns/gnunet-gns-proxy.c:2329
+#, 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:3328
 msgid "listen on specified port"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:811
+#: src/gns/gnunet-gns-proxy.c:3331
+msgid "pem file to use as CA"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3346
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3274,7 +3388,7 @@
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
+#: src/hostlist/gnunet-daemon-hostlist.c:344
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3588,23 +3702,22 @@
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1095
-#: src/template/gnunet-template.c:68
+#: src/integration-tests/connection_watchdog.c:1099
+#: src/template/gnunet-template.c:71
 #, fuzzy
 msgid "help text"
 msgstr "texto de ayuda para -t"
 
-#: src/mesh/gnunet-service-mesh.c:4590 src/mesh/gnunet-service-mesh_new.c:4618
-#, fuzzy
+#: src/mesh/gnunet-service-mesh.c:5904
 msgid "Wrong CORE service\n"
-msgstr "Deteniendo cron\n"
+msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4784 src/mesh/gnunet-service-mesh_new.c:4812
+#: src/mesh/gnunet-service-mesh.c:6116
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/mesh/gnunet-service-mesh.c:4793 src/mesh/gnunet-service-mesh_new.c:4821
+#: src/mesh/gnunet-service-mesh.c:6125
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
@@ -3619,197 +3732,240 @@
 msgid "Could not access file `%s': %s\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/namestore/gnunet-namestore.c:157
+#: src/namestore/gnunet-namestore.c:212
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/namestore/gnunet-namestore.c:183
+#: src/namestore/gnunet-namestore.c:243
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/namestore/gnunet-namestore.c:239
+#: src/namestore/gnunet-namestore.c:304
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:276
-#, c-format
-msgid "Option `%s' not given, but I need a zone key file!\n"
+#: src/namestore/gnunet-namestore.c:320
+msgid "for at least"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:281
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "Iniciada colección '%s'.\n"
+#: src/namestore/gnunet-namestore.c:321
+msgid "until"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:291
+#: src/namestore/gnunet-namestore.c:357
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:321
+#: src/namestore/gnunet-namestore.c:387
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/namestore/gnunet-namestore.c:328 src/namestore/gnunet-namestore.c:350
-#: src/namestore/gnunet-namestore.c:374 src/namestore/gnunet-namestore.c:384
-#: src/namestore/gnunet-namestore.c:409
+#: 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
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/namestore/gnunet-namestore.c:329 src/namestore/gnunet-namestore.c:351
+#: src/namestore/gnunet-namestore.c:396 src/namestore/gnunet-namestore.c:420
 msgid "add/del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:409
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: valor del símbolo '%s' no válido para %s\n"
 
-#: src/namestore/gnunet-namestore.c:366
+#: src/namestore/gnunet-namestore.c:447
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/namestore/gnunet-namestore.c:375 src/namestore/gnunet-namestore.c:385
+#: src/namestore/gnunet-namestore.c:456
+#, 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
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:410
+#: src/namestore/gnunet-namestore.c:497
+#, fuzzy, c-format
+msgid "No valid expiration time for operation `%s'\n"
+msgstr "Fichero de configuración '%s' creado.\n"
+
+#: src/namestore/gnunet-namestore.c:520
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:462
+#: src/namestore/gnunet-namestore.c:570
+#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/namestore/gnunet-namestore.c:611 src/transport/gnunet-transport.c:618
+#, fuzzy, c-format
+msgid "Service `%s' is not running\n"
+msgstr "'%s' no es un fichero.\n"
+
+#: src/namestore/gnunet-namestore.c:622
+#, c-format
+msgid "Option `%s' not given, but I need a zone key file!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:627
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/namestore/gnunet-namestore.c:679
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:682
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:468
+#: src/namestore/gnunet-namestore.c:685
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:471
+#: src/namestore/gnunet-namestore.c:688
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:474
+#: src/namestore/gnunet-namestore.c:691
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:477
+#: src/namestore/gnunet-namestore.c:694
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:480
+#: src/namestore/gnunet-namestore.c:697
+msgid "URI to import into our zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:700
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:483
+#: src/namestore/gnunet-namestore.c:703
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:486
+#: src/namestore/gnunet-namestore.c:706
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:489
+#: src/namestore/gnunet-namestore.c:709
 msgid "filename with the zone key"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:500
+#: src/namestore/gnunet-namestore.c:720
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Configuración de GNUnet"
 
-#: src/namestore/gnunet-service-namestore.c:143
-#, c-format
-msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
-msgstr ""
+#: src/namestore/gnunet-service-namestore.c:242
+#: src/namestore/gnunet-service-namestore.c:258
+#, fuzzy, c-format
+msgid "Failed to write zone key to file `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/namestore/gnunet-service-namestore.c:154
-#, c-format
-msgid "File zone `%s' containing this key already exists\n"
+#: src/namestore/gnunet-service-namestore.c:244
+msgid "file exists but reading key failed"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:160
-#, c-format
-msgid ""
-"File zone `%s' but different zone key already exists, failed to write! \n"
+#: src/namestore/gnunet-service-namestore.c:260
+msgid "file exists with different key"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:198
+#: src/namestore/gnunet-service-namestore.c:1519
+#, fuzzy
+msgid "Failed to find record to remove\n"
+msgstr "Imposible conectar con gnunetd.\n"
+
+#: src/namestore/gnunet-service-namestore.c:2133
 #, fuzzy, c-format
-msgid "Stored zonekey for zone `%s' in file `%s'\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Could not parse zone key file `%s'\n"
+msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1909
+#: src/namestore/gnunet-service-namestore.c:2223
 #, fuzzy
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/namestore/gnunet-service-namestore.c:1918
+#: src/namestore/gnunet-service-namestore.c:2233
 #, c-format
 msgid "Creating directory `%s' for zone files failed!\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:315 src/namestore/namestore_api.c:353
-msgid "Namestore added record successfully"
-msgstr ""
-
-#: src/namestore/namestore_api.c:323
+#: src/namestore/namestore_api.c:345
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/namestore/namestore_api.c:361
-msgid "Namestore record already existed"
-msgstr ""
-
-#: src/namestore/namestore_api.c:368
+#: src/namestore/namestore_api.c:371
 msgid "Namestore failed to add record\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:401
+#: src/namestore/namestore_api.c:415
 #, fuzzy
-msgid "Namestore removed record successfully"
-msgstr "Servicio de GNUnet instalado satisfactoriamente.\n"
+msgid "Failed to create new signature"
+msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/namestore/namestore_api.c:408
-msgid "No records for entry"
+#: src/namestore/namestore_api.c:419
+#, fuzzy
+msgid "Failed to put new set of records in database"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+
+#: src/namestore/namestore_api.c:423
+#, fuzzy
+msgid "Failed to remove records from database"
 msgstr ""
+"\n"
+"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/namestore/namestore_api.c:415
+#: src/namestore/namestore_api.c:427
 #, fuzzy
-msgid "Could not find record to remove"
-msgstr "Imposible conectar con gnunetd.\n"
+msgid "Failed to access database"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/namestore/namestore_api.c:422
+#: src/namestore/namestore_api.c:431
 #, fuzzy
-msgid "Failed to create new signature"
-msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+msgid "unknown internal error in namestore"
+msgstr "=\tError leyendo el directorio.\n"
 
-#: src/namestore/namestore_api.c:429
+#: src/namestore/namestore_api.c:436
+msgid "Protocol error"
+msgstr ""
+
+#: src/namestore/plugin_namestore_postgres.c:95
 #, fuzzy
-msgid "Failed to put new set of records in database"
-msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+msgid "Failed to create indices\n"
+msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:318
+#: src/nat/gnunet-nat-server.c:321
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
@@ -3854,7 +4010,7 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:928
+#: src/nse/gnunet-nse-profiler.c:915
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Imposible acceder al servicio"
@@ -3884,16 +4040,16 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:203
+#: src/peerinfo/gnunet-service-peerinfo.c:228
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:229
+#: src/peerinfo/gnunet-service-peerinfo.c:267
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:254
+#: src/peerinfo/gnunet-service-peerinfo.c:292
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -3901,38 +4057,38 @@
 "El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
 "Eliminando.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:353
+#: src/peerinfo/gnunet-service-peerinfo.c:414
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:710
+#: src/peerinfo/gnunet-service-peerinfo.c:800
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:238
+#: src/peerinfo/peerinfo_api.c:239
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:358
+#: src/peerinfo/peerinfo_api.c:359
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/peerinfo/peerinfo_api.c:505
+#: src/peerinfo/peerinfo_api.c:509
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:531 src/peerinfo/peerinfo_api.c:550
-#: src/peerinfo/peerinfo_api.c:565 src/peerinfo/peerinfo_api.c:576
-#: src/peerinfo/peerinfo_api.c:587
+#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
+#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
+#: src/peerinfo/peerinfo_api.c:606
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "Recibido mensaje UDP6 inválido de %s:%d, omitiendo.\n"
 
-#: src/peerinfo/peerinfo_api.c:663
+#: src/peerinfo/peerinfo_api.c:681
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Falló al inicializar el servicio '%s'.\n"
@@ -3992,11 +4148,6 @@
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:875
-#, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "Argumento no válido: '%s'\n"
-
 #: src/peerinfo-tool/gnunet-peerinfo.c:899
 #, c-format
 msgid "I am peer `%s'.\n"
@@ -4026,7 +4177,7 @@
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:957
+#: src/peerinfo-tool/gnunet-peerinfo.c:961
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Imprime información de los pares de GNUnet."
@@ -4122,7 +4273,7 @@
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/pt/gnunet-daemon-pt.c:973
+#: src/pt/gnunet-daemon-pt.c:976
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -4136,42 +4287,42 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/statistics/gnunet-statistics.c:122
+#: src/statistics/gnunet-statistics.c:120
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/statistics/gnunet-statistics.c:199
+#: src/statistics/gnunet-statistics.c:193
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:207
+#: src/statistics/gnunet-statistics.c:201
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/statistics/gnunet-statistics.c:227
+#: src/statistics/gnunet-statistics.c:221
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:230
+#: src/statistics/gnunet-statistics.c:224
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:233
+#: src/statistics/gnunet-statistics.c:227
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:236
+#: src/statistics/gnunet-statistics.c:230
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:239
+#: src/statistics/gnunet-statistics.c:233
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:246
+#: src/statistics/gnunet-statistics.c:244
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
@@ -4186,303 +4337,307 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:157
-#, fuzzy
-msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+#: src/testbed/testbed_api.c:204
+#, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "'%s' falló con el código de error %d: %s"
+
+#: src/testing/gnunet-testing.c:131
+#, fuzzy, c-format
+msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/testing/gnunet-testing.c:159
-#, c-format
-msgid "Specified hostkey file `%s' not found!\n"
-msgstr ""
-
-#: src/testing/gnunet-testing.c:273
+#: src/testing/gnunet-testing.c:202
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/testing/gnunet-testing.c:275
-msgid "create hostkey files from pre-computed hostkey list"
+#: src/testing/gnunet-testing.c:204
+msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:277
-msgid "host key file"
-msgstr ""
-
-#: src/testing/gnunet-testing.c:279
+#: src/testing/gnunet-testing.c:206
 #, fuzzy
-msgid "number of unique configuration files or hostkeys to create"
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/testing/gnunet-testing.c:281
+#: src/testing/gnunet-testing.c:208
 #, fuzzy
 msgid "configuration template"
 msgstr "Configuración de GNUnet"
 
-#: src/testing/gnunet-testing.c:287
+#: src/testing/gnunet-testing.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/helper.c:56
+#: src/testing/gnunet-testing-run-service.c:129
+#, c-format
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr ""
+
+#: src/testing/gnunet-testing-run-service.c:186
 #, fuzzy
+msgid "name of the template configuration file to use (optional)"
+msgstr "Esta es la herramienta de configuración de GNUnet."
+
+#: src/testing/gnunet-testing-run-service.c:189
+msgid "name of the service to run"
+msgstr ""
+
+#: src/testing_old/helper.c:56
+#, fuzzy
 msgid "Peer is lacking HOSTKEY configuration setting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/testing/helper.c:64
+#: src/testing_old/helper.c:64
 #, fuzzy
 msgid "Could not access hostkey.\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/testing/testing.c:200
+#: src/testing_old/testing.c:200
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:214 src/testing/testing.c:798
+#: src/testing_old/testing.c:214 src/testing_old/testing.c:798
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "'%s' no esta conectado a ningún par.\n"
 
-#: src/testing/testing.c:237
+#: src/testing_old/testing.c:237
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/testing/testing.c:238
+#: src/testing_old/testing.c:238
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/testing/testing.c:286
+#: src/testing_old/testing.c:286
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/testing/testing.c:293
+#: src/testing_old/testing.c:293
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/testing/testing.c:294 src/testing/testing.c:471
+#: src/testing_old/testing.c:294 src/testing_old/testing.c:471
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/testing/testing.c:354
+#: src/testing_old/testing.c:354
 #, fuzzy, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
-#: src/testing/testing.c:358
+#: src/testing_old/testing.c:358
 #, fuzzy
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
-#: src/testing/testing.c:368
+#: src/testing_old/testing.c:368
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/testing/testing.c:400
+#: src/testing_old/testing.c:400
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:463
+#: src/testing_old/testing.c:463
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/testing/testing.c:470
+#: src/testing_old/testing.c:470
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:493 src/testing/testing.c:600
+#: src/testing_old/testing.c:493 src/testing_old/testing.c:600
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:494 src/testing/testing.c:601
-#: src/testing/testing.c:621
+#: 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/testing.c:570
+#: src/testing_old/testing.c:570
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:620
+#: src/testing_old/testing.c:620
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:643 src/testing/testing.c:675
+#: 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/testing.c:658 src/testing/testing.c:713
+#: src/testing_old/testing.c:658 src/testing_old/testing.c:713
 #, fuzzy
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr "'%s' no esta conectado a ningún par.\n"
 
-#: src/testing/testing.c:786
+#: src/testing_old/testing.c:786
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:948
+#: src/testing_old/testing.c:948
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
+#: src/testing_old/testing.c:1207 src/testing_old/testing_group.c:6155
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/testing/testing.c:1292 src/testing/testing.c:1359
+#: src/testing_old/testing.c:1292 src/testing_old/testing.c:1359
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/testing/testing.c:1448
+#: src/testing_old/testing.c:1448
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/testing/testing.c:1601
+#: src/testing_old/testing.c:1601
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1609
+#: src/testing_old/testing.c:1609
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Imposible guardar la configuración"
 
-#: src/testing/testing.c:1636
+#: src/testing_old/testing.c:1636
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/testing/testing.c:1639
+#: src/testing_old/testing.c:1639
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Imposible guardar la configuración"
 
-#: src/testing/testing.c:1794
+#: src/testing_old/testing.c:1794
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:1922
+#: src/testing_old/testing.c:1922
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:2145
+#: src/testing_old/testing.c:2145
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
-#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
-#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
-#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
+#: src/testing_old/testing_group.c:1895 src/testing_old/testing_group.c:1907
+#: src/testing_old/testing_group.c:2009 src/testing_old/testing_group.c:2066
+#: src/testing_old/testing_group.c:2153 src/testing_old/testing_group.c:2173
+#: src/testing_old/testing_group.c:2303
+#: src/testing_old/testing_peergroup.c:950
 #, fuzzy, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/testing/testing_group.c:2160
+#: src/testing_old/testing_group.c:2161
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
+#: src/testing_old/testing_group.c:2878 src/testing_old/testing_group.c:3064
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3957
+#: src/testing_old/testing_group.c:3958
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5226
+#: src/testing_old/testing_group.c:5227
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5944 src/transport/transport-testing.c:636
+#: src/testing_old/testing_group.c:5945
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/testing/testing_group.c:6011
+#: src/testing_old/testing_group.c:6012
 #, fuzzy, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/testing/testing_new.c:169
-msgid "tmppath cannot be NULL\n"
-msgstr ""
-
-#: src/testing/testing_new.c:356
+#: src/testing/testing.c:188
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing_new.c:365
-#, fuzzy, c-format
-msgid "Could not open hostkeys file: %s\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#: src/testing/testing_new.c:380
+#: src/testing/testing.c:204
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing_new.c:437
+#: src/testing/testing.c:468
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "número de mensajes a usar por iteración"
 
-#: src/testing/testing_new.c:446
+#: src/testing/testing.c:477
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Error descargando: %s\n"
 
-#: src/testing/testing_new.c:680
+#: src/testing/testing.c:788
 #, 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_new.c:691
+#: src/testing/testing.c:799
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing_new.c:704
+#: src/testing/testing.c:813
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/testing/testing_new.c:734
+#: src/testing/testing.c:846
 #, 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_new.c:751
+#: src/testing/testing.c:864
 #, 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_new.c:791
+#: src/testing/testing.c:925
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing_new.c:959
+#: src/testing/testing.c:1088
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
@@ -4579,7 +4734,7 @@
 msgid "# HELLO messages gossipped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/topology/gnunet-daemon-topology.c:1363
+#: src/topology/gnunet-daemon-topology.c:1366
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -4623,30 +4778,30 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:747
+#: src/transport/gnunet-service-transport_blacklist.c:751
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:163
+#: src/transport/gnunet-service-transport.c:167
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport.c:237
+#: src/transport/gnunet-service-transport.c:242
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# bytes en la base de datos"
 
-#: src/transport/gnunet-service-transport.c:284
+#: src/transport/gnunet-service-transport.c:289
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# bytes desencriptados"
 
-#: src/transport/gnunet-service-transport.c:582
+#: src/transport/gnunet-service-transport.c:590
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:591
+#: src/transport/gnunet-service-transport.c:599
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -4660,16 +4815,16 @@
 msgid "# messages dropped due to slow client"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport_clients.c:503
+#: src/transport/gnunet-service-transport_clients.c:509
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:631
+#: src/transport/gnunet-service-transport_clients.c:637
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:682
+#: src/transport/gnunet-service-transport_clients.c:688
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -4678,116 +4833,116 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1032
+#: src/transport/gnunet-service-transport_neighbours.c:1057
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1148
-#: src/transport/gnunet-service-transport_neighbours.c:1482
+#: src/transport/gnunet-service-transport_neighbours.c:1174
+#: src/transport/gnunet-service-transport_neighbours.c:1511
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1153
+#: src/transport/gnunet-service-transport_neighbours.c:1179
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1158
+#: src/transport/gnunet-service-transport_neighbours.c:1184
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1215
+#: src/transport/gnunet-service-transport_neighbours.c:1241
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1254
+#: src/transport/gnunet-service-transport_neighbours.c:1283
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1278
+#: src/transport/gnunet-service-transport_neighbours.c:1307
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1286
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1323
+#: src/transport/gnunet-service-transport_neighbours.c:1352
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1332
+#: src/transport/gnunet-service-transport_neighbours.c:1361
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1388
+#: src/transport/gnunet-service-transport_neighbours.c:1417
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1422
+#: src/transport/gnunet-service-transport_neighbours.c:1451
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1438
+#: src/transport/gnunet-service-transport_neighbours.c:1467
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2544
+#: src/transport/gnunet-service-transport_neighbours.c:2613
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2559
-#: src/transport/gnunet-service-transport_neighbours.c:2585
+#: src/transport/gnunet-service-transport_neighbours.c:2628
+#: src/transport/gnunet-service-transport_neighbours.c:2662
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2675
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2627
+#: src/transport/gnunet-service-transport_neighbours.c:2708
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2807
+#: src/transport/gnunet-service-transport_neighbours.c:2892
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# de pares conectados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2856
+#: src/transport/gnunet-service-transport_neighbours.c:2947
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2870
+#: src/transport/gnunet-service-transport_neighbours.c:2961
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2901
+#: src/transport/gnunet-service-transport_neighbours.c:2992
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2912
+#: src/transport/gnunet-service-transport_neighbours.c:3003
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2943
+#: src/transport/gnunet-service-transport_neighbours.c:3034
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3020
+#: src/transport/gnunet-service-transport_neighbours.c:3129
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# Anuncios de los pares recibidos"
@@ -4796,212 +4951,200 @@
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:414
+#: src/transport/gnunet-service-transport_validation.c:415
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:463
+#: src/transport/gnunet-service-transport_validation.c:464
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:512
+#: src/transport/gnunet-service-transport_validation.c:513
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/transport/gnunet-service-transport_validation.c:570
+#: src/transport/gnunet-service-transport_validation.c:571
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:805
+#: src/transport/gnunet-service-transport_validation.c:807
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-service-transport_validation.c:840
+#: src/transport/gnunet-service-transport_validation.c:872
 #, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:924
+#: src/transport/gnunet-service-transport_validation.c:989
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/transport/gnunet-service-transport_validation.c:998
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1055
+#: src/transport/gnunet-service-transport_validation.c:1120
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1080
+#: src/transport/gnunet-service-transport_validation.c:1145
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1136
+#: src/transport/gnunet-service-transport_validation.c:1199
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Imposible obtener la dirección del par '%s'.\n"
 
-#: src/transport/gnunet-transport.c:260
+#: src/transport/gnunet-transport.c:265
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:273
+#: src/transport/gnunet-transport.c:278
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:323
+#: src/transport/gnunet-transport.c:328
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:330
+#: 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:363
+#: src/transport/gnunet-transport.c:374
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:383
+#: src/transport/gnunet-transport.c:394
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/transport/gnunet-transport.c:414
+#: src/transport/gnunet-transport.c:426
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/transport/gnunet-transport.c:443
+#: src/transport/gnunet-transport.c:506
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/transport/gnunet-transport.c:466
+#: src/transport/gnunet-transport.c:529
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/transport/gnunet-transport.c:473
+#: src/transport/gnunet-transport.c:536
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:501
+#: src/transport/gnunet-transport.c:564
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# de pares conectados"
 
-#: src/transport/gnunet-transport.c:569
+#: src/transport/gnunet-transport.c:633
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/transport/gnunet-transport.c:618
+#: src/transport/gnunet-transport.c:716
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:719
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:624
+#: src/transport/gnunet-transport.c:722
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/transport/gnunet-transport.c:627
-#, fuzzy
-msgid "provide information about all current connections (continuously)"
-msgstr "Imprime información de los pares de GNUnet."
-
-#: src/transport/gnunet-transport.c:630
+#: src/transport/gnunet-transport.c:728
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:634
+#: src/transport/gnunet-transport.c:732
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:637
+#: src/transport/gnunet-transport.c:735
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:645
+#: src/transport/gnunet-transport.c:746
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:1100
+#: src/transport/plugin_transport_http.c:1119
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1149
+#: src/transport/plugin_transport_http.c:1168
 #, 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:1174 src/util/service.c:1036
+#: src/transport/plugin_transport_http.c:1200 src/util/service.c:1051
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_http.c:1191 src/util/service.c:1053
+#: src/transport/plugin_transport_http.c:1217 src/util/service.c:1068
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:1296
+#: src/transport/plugin_transport_http.c:1322
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1309
-#, c-format
-msgid "FREEING %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1386
+#: src/transport/plugin_transport_http.c:1407
 #, 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:1399
+#: src/transport/plugin_transport_http.c:1420
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/transport/plugin_transport_http.c:1410
+#: src/transport/plugin_transport_http.c:1431
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1430
+#: src/transport/plugin_transport_http.c:1451
 #, 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:1460
+#: src/transport/plugin_transport_http.c:1481
 #, 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:624
+#: src/transport/plugin_transport_http_client.c:621
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -5061,91 +5204,92 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:591
+#: src/transport/plugin_transport_tcp.c:590
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:767
-#: 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:1086
-#: src/transport/plugin_transport_tcp.c:1103
+#: src/transport/plugin_transport_tcp.c:766
+#: src/transport/plugin_transport_tcp.c:855
+#: src/transport/plugin_transport_tcp.c:905
+#: src/transport/plugin_transport_tcp.c:991
+#: src/transport/plugin_transport_tcp.c:1129
+#: src/transport/plugin_transport_tcp.c:1146
 #, 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:1761
-#: src/transport/plugin_transport_tcp.c:2390
+#: src/transport/plugin_transport_tcp.c:773
+#: src/transport/plugin_transport_tcp.c:962
+#: src/transport/plugin_transport_tcp.c:1806
+#: src/transport/plugin_transport_tcp.c:2423
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_tcp.c:860
+#: src/transport/plugin_transport_tcp.c:859
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:908
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes desencriptados"
 
-#: src/transport/plugin_transport_tcp.c:996
+#: src/transport/plugin_transport_tcp.c:995
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:1290
+#: src/transport/plugin_transport_tcp.c:1335
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1401
+#: src/transport/plugin_transport_tcp.c:1446
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1802
+#: src/transport/plugin_transport_tcp.c:1847
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_tcp.c:1973
+#: src/transport/plugin_transport_tcp.c:2018
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2043
+#: src/transport/plugin_transport_tcp.c:2088
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2279 src/util/service.c:940
+#: src/transport/plugin_transport_tcp.c:2312 src/util/service.c:946
+#: src/util/service.c:952
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2293
+#: src/transport/plugin_transport_tcp.c:2326
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/transport/plugin_transport_tcp.c:2355
+#: src/transport/plugin_transport_tcp.c:2388
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_tcp.c:2378
+#: src/transport/plugin_transport_tcp.c:2411
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2382
+#: src/transport/plugin_transport_tcp.c:2415
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:2419
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5160,129 +5304,142 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:367
+#: src/transport/plugin_transport_udp_broadcasting.c:392
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1894
+#: src/transport/plugin_transport_udp.c:1903
 #, c-format
 msgid ""
-"UDP could not message to `%s': `%s'. Please check your network configuration "
-"and disable IPv6 if your connection does not have a global IPv6 address\n"
+"UDP could not transmit message to `%s': Network seems down, please check "
+"your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2138
+#: src/transport/plugin_transport_udp.c:1917
+#, c-format
+msgid ""
+"UDP could not transmit message to `%s': Please check your network "
+"configuration and disable IPv6 if your connection does not have a global "
+"IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2162
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_udp.c:2306
+#: src/transport/plugin_transport_udp.c:2328
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2349
+#: src/transport/plugin_transport_udp.c:2371
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/transport/plugin_transport_unix.c:1356
+#: src/transport/plugin_transport_unix.c:1351
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_wlan.c:561
+#: src/transport/plugin_transport_wlan.c:560
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:580
+#: src/transport/plugin_transport_wlan.c:579
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:626
-#: src/transport/plugin_transport_wlan.c:676
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:625
+#: src/transport/plugin_transport_wlan.c:675
+#: src/transport/plugin_transport_wlan.c:1695
 #, 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:748
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# mensajes fragmentados"
 
-#: src/transport/plugin_transport_wlan.c:767
+#: src/transport/plugin_transport_wlan.c:766
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:867
-#: src/transport/plugin_transport_wlan.c:948
-#: src/transport/plugin_transport_wlan.c:1698
+#: src/transport/plugin_transport_wlan.c:866
+#: src/transport/plugin_transport_wlan.c:947
+#: src/transport/plugin_transport_wlan.c:1697
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1119
+#: src/transport/plugin_transport_wlan.c:1118
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1140
+#: src/transport/plugin_transport_wlan.c:1139
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:1150
+#: src/transport/plugin_transport_wlan.c:1149
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_wlan.c:1207
+#: src/transport/plugin_transport_wlan.c:1206
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:1306
+#: src/transport/plugin_transport_wlan.c:1305
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1341
+#: src/transport/plugin_transport_wlan.c:1340
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1402
+#: src/transport/plugin_transport_wlan.c:1401
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# bytes enviados vía UDP"
 
-#: src/transport/plugin_transport_wlan.c:1511
+#: src/transport/plugin_transport_wlan.c:1510
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1668
+#: src/transport/plugin_transport_wlan.c:1667
 #, fuzzy, c-format
 msgid "Invalid configuration option `%s' in section `%s'\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/transport/plugin_transport_wlan.c:1677
+#: src/transport/plugin_transport_wlan.c:1676
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1687
+#: src/transport/plugin_transport_wlan.c:1686
 #, fuzzy, c-format
 msgid "Missing configuration option `%s' in section `%s'\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/transport/transport_api.c:570
+#: src/transport/transport_api.c:575
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
 
+#: src/transport/transport-testing.c:589
+#, fuzzy
+msgid "Failed to initialize testing library!\n"
+msgstr "Imposible inicializar SQLite.\n"
+
 #: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
@@ -5313,92 +5470,97 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:359
+#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:982
 #, 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
+#, fuzzy, c-format
+msgid "Using `%s' instead\n"
+msgstr "%s: la opción '%s' es ambigua\n"
+
+#: src/util/client.c:369
+#, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:367
+#: src/util/client.c:377
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:685
+#: src/util/client.c:695
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:740 src/util/service.c:970
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:882
+#: src/util/client.c:895
 #, 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:896
+#: src/util/client.c:909
 #, 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:1149
+#: src/util/client.c:1162
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:890
+#: src/util/common_logging.c:258 src/util/common_logging.c:1008
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:888
+#: src/util/common_logging.c:260 src/util/common_logging.c:1006
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:886
+#: src/util/common_logging.c:262 src/util/common_logging.c:1004
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:884
+#: src/util/common_logging.c:264 src/util/common_logging.c:1002
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:892
+#: src/util/common_logging.c:266 src/util/common_logging.c:1010
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:610
+#: src/util/common_logging.c:395
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/util/common_logging.c:725
+#: src/util/common_logging.c:819
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:893
+#: src/util/common_logging.c:1011
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:992
+#: src/util/common_logging.c:1113
 #, fuzzy
 msgid "unknown address"
 msgstr "desconocido"
 
-#: src/util/common_logging.c:1030
+#: src/util/common_logging.c:1151
 #, fuzzy
 msgid "invalid address"
 msgstr "Argumentos inválidos: "
 
-#: src/util/configuration.c:244
+#: src/util/configuration.c:259
 #, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgid "Syntax error while deserializing operation at line %u\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/util/configuration.c:816
+#: src/util/configuration.c:938
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -5443,74 +5605,89 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:280
+#: src/util/crypto_random.c:284
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:309
+#: src/util/crypto_random.c:313
 #, 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:661 src/util/crypto_rsa.c:708
+#: src/util/crypto_rsa.c:635 src/util/crypto_rsa.c:651
+#: src/util/crypto_rsa.c:833
 #, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %s...\n"
+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:731 src/util/crypto_rsa.c:778
+#, 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:666
+#: src/util/crypto_rsa.c:736
 #, 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:684
+#: src/util/crypto_rsa.c:754
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
+#: 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:743
+#: src/util/crypto_rsa.c:813
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:763
+#: src/util/crypto_rsa.c:851
 #, 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:781
-#, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Llamada a '%s' con la clave '%s'.\n"
 
-#: src/util/crypto_rsa.c:1032
+#: src/util/crypto_rsa.c:926
+msgid "interrupted by shutdown"
+msgstr ""
+
+#: src/util/crypto_rsa.c:935
+#, fuzzy
+msgid "internal error"
+msgstr "Error desconocido.\n"
+
+#: src/util/crypto_rsa.c:944 src/util/crypto_rsa.c:951
+#, fuzzy
+msgid "gnunet-rsa failed"
+msgstr "gnunet-setup"
+
+#: src/util/crypto_rsa.c:1332
 #, 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:498
+#: src/util/disk.c:571
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/disk.c:1062
+#: src/util/disk.c:1135
 #, 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:1416 src/util/service.c:1650
+#: src/util/disk.c:1489 src/util/service.c:1665
 #, 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:1734
+#: src/util/disk.c:1861
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
@@ -5590,28 +5767,28 @@
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:154
+#: src/util/gnunet-resolver.c:158
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:64
+#: src/util/gnunet-rsa.c:104
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:112
+#: src/util/gnunet-rsa.c:154
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:115
+#: src/util/gnunet-rsa.c:157
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:118
+#: src/util/gnunet-rsa.c:160
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:124
+#: src/util/gnunet-rsa.c:170
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5626,70 +5803,65 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/util/helper.c:244
+#: src/util/helper.c:254
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Error creando usuario"
 
-#: src/util/helper.c:259
+#: src/util/helper.c:274
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:269
+#: src/util/helper.c:290
 #, 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:278
+#: src/util/helper.c:299
 #, 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:310
+#: src/util/helper.c:337
 #, fuzzy, c-format
 msgid "Starting HELPER process `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/util/helper.c:440
+#: src/util/helper.c:476
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error creando usuario"
 
-#: src/util/network.c:1200
+#: src/util/network.c:99
 #, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr ""
+
+#: src/util/network.c:1278
+#, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:299
+#: src/util/os_installation.c:329
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:526
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/util/os_installation.c:492
+#: src/util/os_priority.c:302
 #, fuzzy, c-format
-msgid "access (%s, X_OK) failed: %s\n"
-msgstr "'%s' %s falló: %s\n"
-
-#: src/util/os_installation.c:507
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "'%s' %s falló: %s\n"
-
-#: src/util/os_priority.c:305
-#, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/util/os_priority.c:306
+#: src/util/os_priority.c:303
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
@@ -5761,145 +5933,145 @@
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:483
+#: src/util/server.c:468
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/server.c:492
+#: src/util/server.c:477
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:497
+#: src/util/server.c:488
 #, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
+msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:827
+#: src/util/server.c:819
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
-#: src/util/service.c:225 src/util/service.c:232
+#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
+#: src/util/service.c:232 src/util/service.c:239
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: '%s'\n"
 
-#: src/util/service.c:188
+#: src/util/service.c:195
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida ('/%d' no es válido en IPv4 CIDR)."
 
-#: src/util/service.c:281
+#: src/util/service.c:288
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con ';': '%s')\n"
 
-#: src/util/service.c:313
+#: src/util/service.c:320
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato '%s' erróneo para la máscara de red: %s\n"
 
-#: src/util/service.c:343
+#: src/util/service.c:350
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato '%s' erróneo para la red: %s\n"
 
-#: src/util/service.c:698
+#: src/util/service.c:705
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:703
+#: src/util/service.c:710
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/util/service.c:710
+#: src/util/service.c:717
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:765
+#: src/util/service.c:772
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:802
+#: src/util/service.c:809
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:920
+#: src/util/service.c:927
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:990
+#: src/util/service.c:1005
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1007
+#: src/util/service.c:1022
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1241
+#: src/util/service.c:1256
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1292 src/util/service.c:1310
+#: src/util/service.c:1307 src/util/service.c:1325
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1337
+#: src/util/service.c:1352
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1506
+#: src/util/service.c:1521
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/service.c:1539
+#: src/util/service.c:1554
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/util/service.c:1588
+#: src/util/service.c:1603
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1592
+#: src/util/service.c:1607
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1596
+#: src/util/service.c:1611
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1651
+#: src/util/service.c:1666
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1664
+#: src/util/service.c:1679
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/util/service.c:1729
+#: src/util/service.c:1744
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5908,64 +6080,70 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "La llamada a '%s' devuelve %d.\n"
 
-#: src/util/strings.c:144
+#: src/util/strings.c:145
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:334
+#: src/util/strings.c:385
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:481
+#: src/util/strings.c:534
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:573
+#: src/util/strings.c:626
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:578
-msgid "eternity"
+#: src/util/strings.c:631
+msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:582
+#: src/util/strings.c:635
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:586
+#: src/util/strings.c:639
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:590
+#: src/util/strings.c:643
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:594
-msgid " days"
+#: src/util/strings.c:648
+#, fuzzy
+msgid "day"
 msgstr " días"
 
-#: src/util/strings.c:618
+#: src/util/strings.c:650
+#, fuzzy
+msgid "days"
+msgstr " días"
+
+#: src/util/strings.c:674
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1012
+#: src/util/strings.c:1063
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1020
+#: src/util/strings.c:1071
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1026
+#: src/util/strings.c:1077
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1033
+#: src/util/strings.c:1084
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1042
+#: src/util/strings.c:1093
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Argumento no válido: '%s'\n"
@@ -6141,27 +6319,55 @@
 msgid "service is offered via UDP"
 msgstr "# bytes recibidos vía UDP"
 
-#: src/vpn/gnunet-vpn.c:329
+#: src/vpn/gnunet-vpn.c:333
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:497 src/include/gnunet_common.h:502
-#: src/include/gnunet_common.h:508
+#: src/include/gnunet_common.h:507 src/include/gnunet_common.h:512
+#: src/include/gnunet_common.h:518
 #, 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:518
+#: src/include/gnunet_common.h:528
 #, 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:539 src/include/gnunet_common.h:546
+#: src/include/gnunet_common.h:549 src/include/gnunet_common.h:556
 #, 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 "Could not create namespace `%s'\n"
+#~ msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+
+#, fuzzy
+#~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
+#~ msgstr "Fichero almacenado en '%s'.\n"
+
+#, fuzzy
+#~ msgid "Namestore removed record successfully"
+#~ msgstr "Servicio de GNUnet instalado satisfactoriamente.\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+#~ msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#, fuzzy
+#~ msgid "Could not open hostkeys file: %s\n"
+#~ msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#, fuzzy
+#~ msgid "access (%s, X_OK) failed: %s\n"
+#~ msgstr "'%s' %s falló: %s\n"
+
+#, fuzzy
+#~ msgid "stat (%s) failed: %s\n"
+#~ msgstr "'%s' %s falló: %s\n"
+
+#, fuzzy
 #~ msgid "# Peers connected"
 #~ msgstr "# de pares conectados"
 
@@ -6324,10 +6530,6 @@
 #~ msgstr "Falló al comenzar la recolección.\n"
 
 #, fuzzy
-#~ msgid "Service `%s' is not running.\n"
-#~ msgstr "'%s' no es un fichero.\n"
-
-#, fuzzy
 #~ msgid "Binary implementing service `%s' not known!\n"
 #~ msgstr "La verificación de la firma falló: el par '%s' no es conocido.\n"
 
@@ -6336,10 +6538,6 @@
 #~ msgstr "Servicio eliminado.\n"
 
 #, fuzzy
-#~ msgid "Unable to start service `%s': %s\n"
-#~ msgstr "Imposible guardar el fichero de configuración '%s':"
-
-#, fuzzy
 #~ msgid "Unable to accept connection for service `%s': %s\n"
 #~ msgstr "Imposible guardar el fichero de configuración '%s':"
 
@@ -6944,10 +7142,6 @@
 #~ msgid "Invalid process priority `%s'\n"
 #~ msgstr "Respuesta inválida a '%s'.\n"
 
-#, fuzzy
-#~ msgid "`%s' failed with error code %d: %s\n"
-#~ msgstr "'%s' falló con el código de error %d: %s"
-
 #~ msgid "Availability test failed for `%s' at %s:%d.\n"
 #~ msgstr "Test de disponibilidad fallido para '%s' en %s:%d.\n"
 
@@ -7920,10 +8114,6 @@
 #~ msgstr "Muestra el valor de la opción"
 
 #, fuzzy
-#~ msgid "What is the path to the configuration file for gnunetd?"
-#~ msgstr "Esta es la herramienta de configuración de GNUnet."
-
-#, fuzzy
 #~ msgid "General options"
 #~ msgstr "Otras configuraciones"
 
@@ -7953,10 +8143,6 @@
 #~ "El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
 #~ "Eliminando.\n"
 
-#, fuzzy
-#~ msgid "You must specify one and only one directory for sharing.\n"
-#~ msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
-
 #~ msgid ""
 #~ "set interval for availability of updates to SECONDS (for namespace "
 #~ "insertions only)"
@@ -8228,9 +8414,6 @@
 #~ msgid "Group:"
 #~ msgstr "Grupo:"
 
-#~ msgid "gnunet-setup"
-#~ msgstr "gnunet-setup"
-
 #, fuzzy
 #~ msgid "Save configuration"
 #~ msgstr "Configuración de GNUnet"

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2012-07-20 16:57:42 UTC (rev 22805)
+++ gnunet/po/sv.po     2012-07-20 17:34:01 UTC (rev 22806)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-06-02 19:10+0200\n"
+"POT-Creation-Date: 2012-07-20 19:29+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -20,170 +20,178 @@
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:349
+#: src/arm/arm_api.c:354
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/arm/arm_api.c:363
+#: src/arm/arm_api.c:368
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/arm/arm_api.c:432
+#: src/arm/arm_api.c:437
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:485
+#: src/arm/arm_api.c:490
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:486
+#: src/arm/arm_api.c:491
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:507
+#: 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:508
+#: 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:540
+#: src/arm/arm_api.c:547
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
 
-#: src/arm/arm_api.c:612
+#: src/arm/arm_api.c:620
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "Inget svar mottaget inom %llums.\n"
 
-#: src/arm/gnunet-arm.c:159
+#: src/arm/gnunet-arm.c:166
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:171
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-arm.c:167
+#: src/arm/gnunet-arm.c:174
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:172
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:182
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-arm.c:179
+#: src/arm/gnunet-arm.c:186
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:183
+#: src/arm/gnunet-arm.c:190
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:187
+#: src/arm/gnunet-arm.c:194
 #, fuzzy
 msgid "Error communicating with ARM service.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:191
+#: src/arm/gnunet-arm.c:198
 #, fuzzy
 msgid "Timeout communicating with ARM service.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:195
+#: src/arm/gnunet-arm.c:202
 #, fuzzy
 msgid "Operation failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:199
+#: src/arm/gnunet-arm.c:206
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222
+#: src/arm/gnunet-arm.c:229
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:225
+#: src/arm/gnunet-arm.c:232
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:249
+#: src/arm/gnunet-arm.c:256
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
+#: src/arm/gnunet-arm.c:264 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:384
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:280
+#: src/arm/gnunet-arm.c:287
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:286
+#: src/arm/gnunet-arm.c:293
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:407
+#: src/arm/gnunet-arm.c:418
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:409
+#: src/arm/gnunet-arm.c:420
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:411
+#: src/arm/gnunet-arm.c:422
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:413
+#: src/arm/gnunet-arm.c:424
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:416
+#: src/arm/gnunet-arm.c:427
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:430
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:421
+#: src/arm/gnunet-arm.c:432
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:424
+#: src/arm/gnunet-arm.c:435
 msgid "timeout for completing current operation"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:426
+#: src/arm/gnunet-arm.c:437
 msgid "List currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:439
+msgid "Don't let gnunet-service-arm inherit standard output"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:441
+msgid "Don't let gnunet-service-arm inherit standard error"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:455
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -283,6 +291,21 @@
 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/gnunet-ats.c:96
+#, fuzzy
+msgid "list information for all peers"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/ats/gnunet-ats.c:105
+#, fuzzy
+msgid "Print information about ATS state"
+msgstr "Skriv ut information om GNUnets motparter."
+
 #: src/block/block.c:105
 #, fuzzy, c-format
 msgid "Loading block plugin `%s'\n"
@@ -532,46 +555,67 @@
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:742
+#: src/chat/gnunet-chat.c:746
 msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:267
+#: src/chat/gnunet-service-chat.c:266
 #, fuzzy
 msgid "Failed to queue a message notification\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/chat/gnunet-service-chat.c:546
+#: src/chat/gnunet-service-chat.c:545
 #, fuzzy
 msgid "Failed to queue a join notification\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/chat/gnunet-service-chat.c:729
+#: src/chat/gnunet-service-chat.c:728
 #, fuzzy
 msgid "Failed to queue a confirmation receipt\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/chat/gnunet-service-chat.c:907
+#: src/chat/gnunet-service-chat.c:906
 #, fuzzy
 msgid "Failed to queue a leave notification\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/core/core_api.c:786
+#: src/core/core_api.c:757
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
+#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
+#: src/core/gnunet-core.c:118 src/core/gnunet-core.c:149
+#: src/transport/gnunet-transport.c:451 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
+#, fuzzy
+msgid "Connected to"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/core/gnunet-core.c:151 src/transport/gnunet-transport.c:479
+#, fuzzy
+msgid "Disconnected from"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core.c:95
+#: src/core/gnunet-core.c:216 src/transport/gnunet-transport.c:725
 #, fuzzy
+msgid "provide information about all current connections (continuously)"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/core/gnunet-core.c:227
+#, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
@@ -635,7 +679,7 @@
 msgstr "# PING-meddelanden skapade"
 
 #: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:810
+#: src/transport/gnunet-service-transport_validation.c:812
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
@@ -663,7 +707,7 @@
 msgstr "# PING-meddelanden i klartext skickade"
 
 #: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1031
+#: src/transport/gnunet-service-transport_validation.c:1096
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -683,58 +727,58 @@
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1381
-#: src/core/gnunet-service-core_kx.c:1398
+#: src/core/gnunet-service-core_kx.c:1383
+#: src/core/gnunet-service-core_kx.c:1400
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1402
+#: src/core/gnunet-service-core_kx.c:1404
 msgid "# REKEY operations performed"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1537
+#: src/core/gnunet-service-core_kx.c:1539
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1577
-#: src/core/gnunet-service-core_kx.c:1602
+#: src/core/gnunet-service-core_kx.c:1579
+#: src/core/gnunet-service-core_kx.c:1604
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1589
+#: src/core/gnunet-service-core_kx.c:1591
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1628
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/core/gnunet-service-core_kx.c:1630
+#: src/core/gnunet-service-core_kx.c:1632
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1638
+#: src/core/gnunet-service-core_kx.c:1640
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1700
+#: src/core/gnunet-service-core_kx.c:1702
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core_kx.c:1708
+#: 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:1718 src/hostlist/hostlist-server.c:551
+#: 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:611
+#: src/transport/gnunet-service-transport.c:619
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -753,23 +797,23 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:418
+#: src/core/gnunet-service-core_neighbours.c:421
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-#: src/dht/gnunet-service-dht_neighbours.c:625
-#: src/dht/gnunet-service-dht_neighbours.c:683
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
+#: 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/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
-#: src/transport/gnunet-service-transport_neighbours.c:874
-#: src/transport/gnunet-service-transport_neighbours.c:1080
-#: src/transport/gnunet-service-transport_neighbours.c:1089
-#: src/transport/gnunet-service-transport_neighbours.c:2568
-#: src/transport/gnunet-service-transport_neighbours.c:2814
+#: src/transport/gnunet-service-transport_neighbours.c:890
+#: src/transport/gnunet-service-transport_neighbours.c:1106
+#: src/transport/gnunet-service-transport_neighbours.c:1115
+#: src/transport/gnunet-service-transport_neighbours.c:2637
+#: src/transport/gnunet-service-transport_neighbours.c:2899
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
@@ -833,9 +877,10 @@
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:525
-#: src/include/gnunet_common.h:532
+#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:535
+#: src/include/gnunet_common.h:542
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -1142,6 +1187,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
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1178,7 +1224,7 @@
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1198
-#: src/namestore/plugin_namestore_sqlite.c:829
+#: src/namestore/plugin_namestore_sqlite.c:834
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1192,33 +1238,31 @@
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
-#: src/dht/gnunet-dht-put.c:192 src/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-put.c:192
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:182
+#: src/dht/gnunet-dht-get.c:204
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
-#: src/gns/gnunet-gns-lookup.c:185
 msgid "the type of data to look for"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
-#: src/gns/gnunet-gns-lookup.c:188
 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-download.c:271
-#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
-#: src/fs/gnunet-unindex.c:169 src/gns/gnunet-gns-lookup.c:191
-#: src/nse/gnunet-nse-profiler.c:910
+#: 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
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:232
+#: src/dht/gnunet-dht-get.c:236
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1226,7 +1270,7 @@
 msgid "how long to execute? 0 = forever"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321
+#: src/dht/gnunet-dht-monitor.c:324
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
@@ -1278,12 +1322,12 @@
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:223
+#: src/dht/gnunet-dht-put.c:226
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
-#: src/testing/testing.c:1968 src/testing/testing.c:1998
+#: 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
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -1321,17 +1365,17 @@
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:990
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1038
-#: src/dht/gnunet-service-dht_clients.c:1081
+#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-dht_clients.c:1082
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1048
+#: src/dht/gnunet-service-dht_clients.c:1049
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
@@ -1376,93 +1420,100 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:481
+#: src/dht/gnunet-service-dht_neighbours.c:485
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:571
+#: src/dht/gnunet-service-dht_neighbours.c:575
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:717
+#: src/dht/gnunet-service-dht_neighbours.c:721
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:772
+#: src/dht/gnunet-service-dht_neighbours.c:776
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/dht/gnunet-service-dht_neighbours.c:810
+#: src/dht/gnunet-service-dht_neighbours.c:814
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1032
-#: src/dht/gnunet-service-dht_neighbours.c:1060
+#: src/dht/gnunet-service-dht_neighbours.c:1036
+#: src/dht/gnunet-service-dht_neighbours.c:1064
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1041
-#: src/dht/gnunet-service-dht_neighbours.c:1075
+#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1079
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1207
+#: src/dht/gnunet-service-dht_neighbours.c:1211
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1236
+#: src/dht/gnunet-service-dht_neighbours.c:1240
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1315
+#: src/dht/gnunet-service-dht_neighbours.c:1247
+#: src/dht/gnunet-service-dht_neighbours.c:1360
+#: src/dht/gnunet-service-dht_neighbours.c:1460
 #, fuzzy
+msgid "# P2P messages dropped due to full queue"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1325
+#, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1342
+#: src/dht/gnunet-service-dht_neighbours.c:1352
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1443
+#: src/dht/gnunet-service-dht_neighbours.c:1467
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1531
+#: src/dht/gnunet-service-dht_neighbours.c:1555
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1671
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1655
+#: src/dht/gnunet-service-dht_neighbours.c:1679
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1746
+#: src/dht/gnunet-service-dht_neighbours.c:1770
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1788
+#: src/dht/gnunet-service-dht_neighbours.c:1812
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1802
+#: src/dht/gnunet-service-dht_neighbours.c:1826
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1876
+#: src/dht/gnunet-service-dht_neighbours.c:1900
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1492,10 +1543,15 @@
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:352
+#: src/dht/gnunet-service-dht_routing.c:394
 msgid "# Entries added to routing table"
 msgstr ""
 
+#: src/dht/gnunet-service-dht_routing.c:411
+#, fuzzy
+msgid "# DHT requests combined"
+msgstr "# byte mottogs via TCP"
+
 #: src/dht/plugin_block_dht.c:136
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -1510,15 +1566,15 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:337
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:340
+#: src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:348
+#: src/dns/gnunet-dns-monitor.c:370
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -1530,7 +1586,7 @@
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:251
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
@@ -1591,7 +1647,7 @@
 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:1561 src/exit/gnunet-daemon-exit.c:3033
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
@@ -1764,50 +1820,50 @@
 msgid "# UDP requests dropped (no such service)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2882
+#: src/exit/gnunet-daemon-exit.c:2883
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908
+#: src/exit/gnunet-daemon-exit.c:2897 src/exit/gnunet-daemon-exit.c:2909
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2919
+#: src/exit/gnunet-daemon-exit.c:2920
 #, c-format
 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:3049
 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:3057
 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:3064
 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:3070
 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:3076 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3236
+#: src/exit/gnunet-daemon-exit.c:3241
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1865,76 +1921,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_api.c:339
+#: src/fs/fs_api.c:491
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:348
+#: src/fs/fs_api.c:500
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:354
+#: src/fs/fs_api.c:506
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:938
+#: src/fs/fs_api.c:1087
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1395
+#: src/fs/fs_api.c:1546
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1437
+#: src/fs/fs_api.c:1588
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1453
+#: src/fs/fs_api.c:1604
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2106
+#: src/fs/fs_api.c:2254
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2116
+#: src/fs/fs_api.c:2264
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2241 src/fs/fs_api.c:2480
+#: src/fs/fs_api.c:2389 src/fs/fs_api.c:2629
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2258
+#: src/fs/fs_api.c:2406
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2270 src/fs/fs_api.c:2289 src/fs/fs_api.c:2773
+#: src/fs/fs_api.c:2419 src/fs/fs_api.c:2438 src/fs/fs_api.c:2922
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2471
+#: src/fs/fs_api.c:2620
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2717
+#: src/fs/fs_api.c:2866
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2811
+#: src/fs/fs_api.c:2960
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1944,58 +2000,58 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_download.c:311
+#: src/fs/fs_download.c:321
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:331
+#: src/fs/fs_download.c:341
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
+#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:878
+#: src/fs/fs_download.c:888
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:970
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:986
+#: src/fs/fs_download.c:996
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1009
+#: src/fs/fs_download.c:1019
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1029
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1028
+#: src/fs/fs_download.c:1038
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1125
+#: src/fs/fs_download.c:1136
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_download.c:1888
+#: src/fs/fs_download.c:1920
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
@@ -2057,22 +2113,22 @@
 msgid "Failed to write `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:256
+#: src/fs/fs_namespace.c:254
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_namespace.c:371
+#: src/fs/fs_namespace.c:369
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:588 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:586 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_namespace.c:631
+#: src/fs/fs_namespace.c:629
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2084,61 +2140,61 @@
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:621 src/fs/fs_publish.c:638 src/fs/fs_publish.c:677
-#: src/fs/fs_publish.c:697 src/fs/fs_publish.c:722 src/fs/fs_publish.c:862
+#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/fs_publish.c:623
+#: src/fs/fs_publish.c:624
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:635
+#: src/fs/fs_publish.c:636
 #, fuzzy
 msgid "unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:679
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:698
+#: src/fs/fs_publish.c:699
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:724
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:746
+#: src/fs/fs_publish.c:747
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:811
+#: src/fs/fs_publish.c:812
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:817
+#: src/fs/fs_publish.c:818
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:863
+#: src/fs/fs_publish.c:864
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1071
+#: src/fs/fs_publish.c:1090
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1161
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2148,7 +2204,7 @@
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_search.c:829
+#: src/fs/fs_search.c:830
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2293,6 +2349,66 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
+#: src/fs/gnunet-auto-share.c:236
+#, fuzzy, c-format
+msgid "Failed to load state: %s\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
+#: src/fs/gnunet-auto-share.c:309
+#, fuzzy, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:488
+#, fuzzy, c-format
+msgid "Publishing `%s'\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/fs/gnunet-auto-share.c:497
+#, fuzzy, c-format
+msgid "Failed to run `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/fs/gnunet-auto-share.c:684
+#, 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-publish.c:679
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:683
+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
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:710
+msgid "specify the priority of the content"
+msgstr "ange prioritet för innehållet"
+
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-pseudonym.c:304
+#: src/fs/gnunet-publish.c:717
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:767
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr ""
+
 #: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
@@ -2323,97 +2439,97 @@
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/gnunet-directory.c:179
+#: src/fs/gnunet-directory.c:183
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/gnunet-download.c:101
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-download.c:110
+#: src/fs/gnunet-download.c:146
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Okänt fel"
 
-#: src/fs/gnunet-download.c:119
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:129
+#: src/fs/gnunet-download.c:178
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:193
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
-#: src/fs/gnunet-download.c:152 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:191
 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:177
+#: src/fs/gnunet-download.c:233
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
+#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:625
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/gnunet-download.c:190
+#: src/fs/gnunet-download.c:246
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:197
+#: src/fs/gnunet-download.c:253
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
+#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:603
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-download.c:248 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:251
+#: src/fs/gnunet-download.c:307
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
+#: src/fs/gnunet-download.c:313
 msgid "write the file to FILENAME"
 msgstr "skriv filen till FILNAMN"
 
-#: src/fs/gnunet-download.c:261
+#: src/fs/gnunet-download.c:317
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:265
+#: src/fs/gnunet-download.c:321
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268
+#: src/fs/gnunet-download.c:324
 msgid "download a GNUnet directory recursively"
 msgstr "hämta en GNUnet-katalog rekursivt"
 
-#: src/fs/gnunet-download.c:278
+#: src/fs/gnunet-download.c:338
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2423,12 +2539,12 @@
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:124
+#: src/fs/gnunet-fs.c:128
 #, fuzzy
 msgid "Special file-sharing operations"
 msgstr "Visa alla alternativ"
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:167
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:161
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
@@ -2439,10 +2555,6 @@
 msgid "Option `%s' ignored\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr ""
-
 #: src/fs/gnunet-pseudonym.c:282
 msgid "create or advertise namespace NAME"
 msgstr ""
@@ -2457,7 +2569,7 @@
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:697
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:698
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
@@ -2473,10 +2585,6 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
-msgid "set the desired replication LEVEL"
-msgstr ""
-
 #: src/fs/gnunet-pseudonym.c:307
 #, fuzzy
 msgid "specify ID of the root of the namespace"
@@ -2486,7 +2594,7 @@
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:318
+#: src/fs/gnunet-pseudonym.c:322
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2510,170 +2618,153 @@
 msgid "URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:187
+#: src/fs/gnunet-publish.c:188
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/fs/gnunet-publish.c:305
+#: src/fs/gnunet-publish.c:306
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:307
+#: src/fs/gnunet-publish.c:308
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:358
+#: src/fs/gnunet-publish.c:359 src/fs/gnunet-publish.c:613
 #, fuzzy, c-format
-msgid "Failed to create namespace `%s'\n"
+msgid "Failed to create namespace `%s' (illegal filename?)\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-publish.c:433
+#: src/fs/gnunet-publish.c:434
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:460
+#: src/fs/gnunet-publish.c:461
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:491
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:493
+#: src/fs/gnunet-publish.c:494
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:498
+#: src/fs/gnunet-publish.c:499
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:503
+#: src/fs/gnunet-publish.c:504
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Nedstängning klar.\n"
 
-#: src/fs/gnunet-publish.c:507
+#: src/fs/gnunet-publish.c:508
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:511
+#: src/fs/gnunet-publish.c:512
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:518
+#: src/fs/gnunet-publish.c:519
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/gnunet-publish.c:552
+#: src/fs/gnunet-publish.c:553
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:560
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:566
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:573 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:574 src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/fs/gnunet-publish.c:583 src/fs/gnunet-publish.c:590
-#: src/transport/gnunet-transport.c:560
+#: src/fs/gnunet-publish.c:584 src/fs/gnunet-publish.c:591
+#: src/transport/gnunet-transport.c:624
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:612
+#: src/fs/gnunet-publish.c:646
 #, fuzzy, c-format
-msgid "Could not create namespace `%s'\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/fs/gnunet-publish.c:645
-#, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-publish.c:657
+#: src/fs/gnunet-publish.c:658
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:682
-msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:685
-msgid "do not use libextractor to add keywords or metadata"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:689
+#: src/fs/gnunet-publish.c:690
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:693
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:700
+#: src/fs/gnunet-publish.c:701
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:709
-msgid "specify the priority of the content"
-msgstr "ange prioritet för innehållet"
-
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:714
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:719
+#: src/fs/gnunet-publish.c:720
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:723
+#: src/fs/gnunet-publish.c:724
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:727
+#: src/fs/gnunet-publish.c:728
 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:742
+#: src/fs/gnunet-publish.c:747
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2709,7 +2800,7 @@
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:308
+#: src/fs/gnunet-search.c:312
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -2728,89 +2819,89 @@
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-service-fs_cp.c:696
+#: src/fs/gnunet-service-fs_cp.c:703
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:700
+#: src/fs/gnunet-service-fs_cp.c:707
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:735
+#: src/fs/gnunet-service-fs_cp.c:742
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:741
+#: src/fs/gnunet-service-fs_cp.c:748
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1324
+#: src/fs/gnunet-service-fs_cp.c:773 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:858
+#: src/fs/gnunet-service-fs_cp.c:865
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:918
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:919
+#: src/fs/gnunet-service-fs_cp.c:926
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:933
+#: src/fs/gnunet-service-fs_cp.c:940
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:971
+#: src/fs/gnunet-service-fs_cp.c:978
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/fs/gnunet-service-fs_cp.c:1045
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1069
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/fs/gnunet-service-fs_cp.c:1079
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1151
+#: src/fs/gnunet-service-fs_cp.c:1158
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/fs/gnunet-service-fs_cp.c:1192
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1207
+#: src/fs/gnunet-service-fs_cp.c:1214
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1267
+#: src/fs/gnunet-service-fs_cp.c:1274
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1293
+#: src/fs/gnunet-service-fs_cp.c:1300
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1322
+#: src/fs/gnunet-service-fs_cp.c:1329
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1687
+#: src/fs/gnunet-service-fs_cp.c:1685
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2868,8 +2959,8 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:362
-#: src/fs/gnunet-service-fs_lc.c:488
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
+#: src/fs/gnunet-service-fs_lc.c:490
 #, fuzzy
 msgid "# client searches active"
 msgstr "# klartext PONG-meddelanden mottagna"
@@ -2879,12 +2970,12 @@
 msgid "# replies received for local clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:321
+#: src/fs/gnunet-service-fs_lc.c:323
 #, fuzzy
 msgid "# client searches received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_lc.c:356
+#: src/fs/gnunet-service-fs_lc.c:358
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2920,8 +3011,8 @@
 msgid "# requests refreshed"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:681
-#: src/fs/gnunet-service-fs_pe.c:748
+#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:684
+#: src/fs/gnunet-service-fs_pe.c:751
 msgid "# query plan entries"
 msgstr ""
 
@@ -2930,103 +3021,103 @@
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:616
+#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:618
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:779
+#: src/fs/gnunet-service-fs_pr.c:781
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:808
+#: src/fs/gnunet-service-fs_pr.c:810
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:822
+#: src/fs/gnunet-service-fs_pr.c:824
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:835
+#: src/fs/gnunet-service-fs_pr.c:837
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:953
+#: src/fs/gnunet-service-fs_pr.c:955
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:980
+#: src/fs/gnunet-service-fs_pr.c:982
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1015
+#: src/fs/gnunet-service-fs_pr.c:1017
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1106
+#: src/fs/gnunet-service-fs_pr.c:1108
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1127
+#: src/fs/gnunet-service-fs_pr.c:1129
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1174
+#: src/fs/gnunet-service-fs_pr.c:1176
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1190
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1197
+#: src/fs/gnunet-service-fs_pr.c:1199
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1213
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1224
+#: src/fs/gnunet-service-fs_pr.c:1226
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1237
+#: src/fs/gnunet-service-fs_pr.c:1239
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1244
 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:1271 src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1449
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1327
+#: src/fs/gnunet-service-fs_pr.c:1329
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1340
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1426
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1510
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_pr.c:1601 src/fs/gnunet-service-fs_pr.c:1610
+#: src/fs/gnunet-service-fs_pr.c:1603 src/fs/gnunet-service-fs_pr.c:1612
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
@@ -3065,41 +3156,46 @@
 msgid "Could not start unindex operation.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/fs/gnunet-unindex.c:176
+#: src/fs/gnunet-unindex.c:180
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/plugin_block_fs.c:131
+#: src/fs/plugin_block_fs.c:130
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:191
+#: src/gns/gnunet-gns.c:267
+#, fuzzy, c-format
+msgid "Key file `%s' for private zone does not exist!\n"
+msgstr "antal meddelanden att använda per iteration"
+
+#: src/gns/gnunet-gns.c:289
 #, fuzzy
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:232
+#: src/gns/gnunet-gns.c:341
 msgid "try to shorten a given GNS name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:235
+#: src/gns/gnunet-gns.c:344
 msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:347
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:241
+#: src/gns/gnunet-gns.c:350
 #, fuzzy
 msgid "Specify the type of the record lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:244
+#: src/gns/gnunet-gns.c:353
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:255
+#: src/gns/gnunet-gns.c:367
 msgid "GNUnet GNS access tool"
 msgstr ""
 
@@ -3133,39 +3229,57 @@
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:725 src/gns/gnunet-gns-fcfsd.c:737
+#: src/gns/gnunet-gns-fcfsd.c:550
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:558
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:741 src/gns/gnunet-gns-fcfsd.c:753
 #, fuzzy, c-format
 msgid "Option `%s' not specified in configuration section `%s'\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:747 src/namestore/gnunet-namestore.c:299
+#: src/gns/gnunet-gns-fcfsd.c:763 src/namestore/gnunet-namestore.c:365
 #, fuzzy
 msgid "Failed to read or create private zone key\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:757 src/namestore/gnunet-namestore.c:310
+#: src/gns/gnunet-gns-fcfsd.c:773 src/namestore/gnunet-namestore.c:376
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
+#: src/gns/gnunet-gns-fcfsd.c:789 src/gns/gnunet-gns-proxy.c:2667
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:804
+#: src/gns/gnunet-gns-fcfsd.c:823
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-lookup.c:210
-msgid "Issue a request to the GNUnet Naming System, prints results."
-msgstr ""
+#: src/gns/gnunet-gns-proxy.c:2300
+#, 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:800
+#: src/gns/gnunet-gns-proxy.c:2329
+#, fuzzy, c-format
+msgid "Unable to import certificate %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/gns/gnunet-gns-proxy.c:3328
 msgid "listen on specified port"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:811
+#: src/gns/gnunet-gns-proxy.c:3331
+msgid "pem file to use as CA"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3346
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3227,7 +3341,7 @@
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
+#: src/hostlist/gnunet-daemon-hostlist.c:344
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3532,22 +3646,22 @@
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1095
-#: src/template/gnunet-template.c:68
+#: src/integration-tests/connection_watchdog.c:1099
+#: src/template/gnunet-template.c:71
 #, fuzzy
 msgid "help text"
 msgstr "hjälptext för -t"
 
-#: src/mesh/gnunet-service-mesh.c:4590 src/mesh/gnunet-service-mesh_new.c:4618
+#: src/mesh/gnunet-service-mesh.c:5904
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4784 src/mesh/gnunet-service-mesh_new.c:4812
+#: src/mesh/gnunet-service-mesh.c:6116
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:4793 src/mesh/gnunet-service-mesh_new.c:4821
+#: src/mesh/gnunet-service-mesh.c:6125
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -3562,196 +3676,238 @@
 msgid "Could not access file `%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/namestore/gnunet-namestore.c:157
+#: src/namestore/gnunet-namestore.c:212
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:183
+#: src/namestore/gnunet-namestore.c:243
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:239
+#: src/namestore/gnunet-namestore.c:304
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:276
-#, c-format
-msgid "Option `%s' not given, but I need a zone key file!\n"
+#: src/namestore/gnunet-namestore.c:320
+msgid "for at least"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:281
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "Startade samling \"%s\".\n"
+#: src/namestore/gnunet-namestore.c:321
+msgid "until"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:291
+#: src/namestore/gnunet-namestore.c:357
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:321
+#: src/namestore/gnunet-namestore.c:387
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:328 src/namestore/gnunet-namestore.c:350
-#: src/namestore/gnunet-namestore.c:374 src/namestore/gnunet-namestore.c:384
-#: src/namestore/gnunet-namestore.c:409
+#: 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
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:329 src/namestore/gnunet-namestore.c:351
+#: src/namestore/gnunet-namestore.c:396 src/namestore/gnunet-namestore.c:420
 msgid "add/del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:409
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
 
-#: src/namestore/gnunet-namestore.c:366
+#: src/namestore/gnunet-namestore.c:447
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:375 src/namestore/gnunet-namestore.c:385
+#: src/namestore/gnunet-namestore.c:456
+#, 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
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:410
+#: src/namestore/gnunet-namestore.c:497
+#, fuzzy, c-format
+msgid "No valid expiration time for operation `%s'\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/namestore/gnunet-namestore.c:520
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:462
+#: src/namestore/gnunet-namestore.c:570
+#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Ogiltiga argument: "
+
+#: src/namestore/gnunet-namestore.c:611 src/transport/gnunet-transport.c:618
+#, fuzzy, c-format
+msgid "Service `%s' is not running\n"
+msgstr "\"%s\" är inte en fil.\n"
+
+#: src/namestore/gnunet-namestore.c:622
+#, c-format
+msgid "Option `%s' not given, but I need a zone key file!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:627
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/namestore/gnunet-namestore.c:679
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:682
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:468
+#: src/namestore/gnunet-namestore.c:685
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:471
+#: src/namestore/gnunet-namestore.c:688
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:474
+#: src/namestore/gnunet-namestore.c:691
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:477
+#: src/namestore/gnunet-namestore.c:694
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:480
+#: src/namestore/gnunet-namestore.c:697
+msgid "URI to import into our zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:700
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:483
+#: src/namestore/gnunet-namestore.c:703
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:486
+#: src/namestore/gnunet-namestore.c:706
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:489
+#: src/namestore/gnunet-namestore.c:709
 msgid "filename with the zone key"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:500
+#: src/namestore/gnunet-namestore.c:720
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
 
-#: src/namestore/gnunet-service-namestore.c:143
-#, c-format
-msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
-msgstr ""
+#: src/namestore/gnunet-service-namestore.c:242
+#: src/namestore/gnunet-service-namestore.c:258
+#, fuzzy, c-format
+msgid "Failed to write zone key to file `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/namestore/gnunet-service-namestore.c:154
-#, c-format
-msgid "File zone `%s' containing this key already exists\n"
+#: src/namestore/gnunet-service-namestore.c:244
+msgid "file exists but reading key failed"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:160
-#, c-format
-msgid ""
-"File zone `%s' but different zone key already exists, failed to write! \n"
+#: src/namestore/gnunet-service-namestore.c:260
+msgid "file exists with different key"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:198
+#: src/namestore/gnunet-service-namestore.c:1519
+#, fuzzy
+msgid "Failed to find record to remove\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-service-namestore.c:2133
 #, fuzzy, c-format
-msgid "Stored zonekey for zone `%s' in file `%s'\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Could not parse zone key file `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/namestore/gnunet-service-namestore.c:1909
+#: src/namestore/gnunet-service-namestore.c:2223
 #, fuzzy
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/namestore/gnunet-service-namestore.c:1918
+#: src/namestore/gnunet-service-namestore.c:2233
 #, c-format
 msgid "Creating directory `%s' for zone files failed!\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:315 src/namestore/namestore_api.c:353
-msgid "Namestore added record successfully"
-msgstr ""
-
-#: src/namestore/namestore_api.c:323
+#: src/namestore/namestore_api.c:345
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/namestore/namestore_api.c:361
-msgid "Namestore record already existed"
-msgstr ""
-
-#: src/namestore/namestore_api.c:368
+#: src/namestore/namestore_api.c:371
 msgid "Namestore failed to add record\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:401
-msgid "Namestore removed record successfully"
-msgstr ""
-
-#: src/namestore/namestore_api.c:408
-msgid "No records for entry"
-msgstr ""
-
 #: src/namestore/namestore_api.c:415
 #, fuzzy
-msgid "Could not find record to remove"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/namestore/namestore_api.c:422
-#, fuzzy
 msgid "Failed to create new signature"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/namestore_api.c:429
+#: src/namestore/namestore_api.c:419
 #, fuzzy
 msgid "Failed to put new set of records in database"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
+#: src/namestore/namestore_api.c:423
+#, fuzzy
+msgid "Failed to remove records from database"
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#: src/namestore/namestore_api.c:427
+#, fuzzy
+msgid "Failed to access database"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/namestore/namestore_api.c:431
+#, fuzzy
+msgid "unknown internal error in namestore"
+msgstr "=\tFel vid läsning av katalog.\n"
+
+#: src/namestore/namestore_api.c:436
+msgid "Protocol error"
+msgstr ""
+
+#: src/namestore/plugin_namestore_postgres.c:95
+#, fuzzy
+msgid "Failed to create indices\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:318
+#: src/nat/gnunet-nat-server.c:321
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
@@ -3796,7 +3952,7 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:928
+#: src/nse/gnunet-nse-profiler.c:915
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
@@ -3826,53 +3982,53 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:203
+#: src/peerinfo/gnunet-service-peerinfo.c:228
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:229
+#: src/peerinfo/gnunet-service-peerinfo.c:267
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:254
+#: src/peerinfo/gnunet-service-peerinfo.c:292
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:353
+#: src/peerinfo/gnunet-service-peerinfo.c:414
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:710
+#: src/peerinfo/gnunet-service-peerinfo.c:800
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:238
+#: src/peerinfo/peerinfo_api.c:239
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:358
+#: src/peerinfo/peerinfo_api.c:359
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/peerinfo/peerinfo_api.c:505
+#: src/peerinfo/peerinfo_api.c:509
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:531 src/peerinfo/peerinfo_api.c:550
-#: src/peerinfo/peerinfo_api.c:565 src/peerinfo/peerinfo_api.c:576
-#: src/peerinfo/peerinfo_api.c:587
+#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
+#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
+#: src/peerinfo/peerinfo_api.c:606
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
 
-#: src/peerinfo/peerinfo_api.c:663
+#: src/peerinfo/peerinfo_api.c:681
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -3932,11 +4088,6 @@
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:875
-#, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "Ogiltiga argument: "
-
 #: src/peerinfo-tool/gnunet-peerinfo.c:899
 #, c-format
 msgid "I am peer `%s'.\n"
@@ -3966,7 +4117,7 @@
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:957
+#: src/peerinfo-tool/gnunet-peerinfo.c:961
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -4061,7 +4212,7 @@
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/pt/gnunet-daemon-pt.c:973
+#: src/pt/gnunet-daemon-pt.c:976
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -4075,42 +4226,42 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-statistics.c:122
+#: src/statistics/gnunet-statistics.c:120
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:199
+#: src/statistics/gnunet-statistics.c:193
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:207
+#: src/statistics/gnunet-statistics.c:201
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/statistics/gnunet-statistics.c:227
+#: src/statistics/gnunet-statistics.c:221
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:230
+#: src/statistics/gnunet-statistics.c:224
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:233
+#: src/statistics/gnunet-statistics.c:227
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:236
+#: src/statistics/gnunet-statistics.c:230
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:239
+#: src/statistics/gnunet-statistics.c:233
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:246
+#: src/statistics/gnunet-statistics.c:244
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
@@ -4125,301 +4276,305 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:157
-#, fuzzy
-msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+#: src/testbed/testbed_api.c:204
+#, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/testing/gnunet-testing.c:131
+#, fuzzy, c-format
+msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/gnunet-testing.c:159
-#, c-format
-msgid "Specified hostkey file `%s' not found!\n"
-msgstr ""
-
-#: src/testing/gnunet-testing.c:273
+#: src/testing/gnunet-testing.c:202
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:275
-msgid "create hostkey files from pre-computed hostkey list"
+#: src/testing/gnunet-testing.c:204
+msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:277
-msgid "host key file"
-msgstr ""
-
-#: src/testing/gnunet-testing.c:279
+#: src/testing/gnunet-testing.c:206
 #, fuzzy
-msgid "number of unique configuration files or hostkeys to create"
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:281
+#: src/testing/gnunet-testing.c:208
 #, fuzzy
 msgid "configuration template"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/testing/gnunet-testing.c:287
+#: src/testing/gnunet-testing.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/helper.c:56
+#: src/testing/gnunet-testing-run-service.c:129
+#, c-format
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr ""
+
+#: src/testing/gnunet-testing-run-service.c:186
 #, fuzzy
+msgid "name of the template configuration file to use (optional)"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
+#: src/testing/gnunet-testing-run-service.c:189
+msgid "name of the service to run"
+msgstr ""
+
+#: src/testing_old/helper.c:56
+#, fuzzy
 msgid "Peer is lacking HOSTKEY configuration setting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/testing/helper.c:64
+#: src/testing_old/helper.c:64
 #, fuzzy
 msgid "Could not access hostkey.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testing/testing.c:200
+#: src/testing_old/testing.c:200
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:214 src/testing/testing.c:798
+#: src/testing_old/testing.c:214 src/testing_old/testing.c:798
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
-#: src/testing/testing.c:237
+#: src/testing_old/testing.c:237
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:238
+#: src/testing_old/testing.c:238
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/testing/testing.c:286
+#: src/testing_old/testing.c:286
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:293
+#: src/testing_old/testing.c:293
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:294 src/testing/testing.c:471
+#: src/testing_old/testing.c:294 src/testing_old/testing.c:471
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:354
+#: src/testing_old/testing.c:354
 #, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:358
+#: src/testing_old/testing.c:358
 #, fuzzy
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:368
+#: src/testing_old/testing.c:368
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:400
+#: src/testing_old/testing.c:400
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:463
+#: src/testing_old/testing.c:463
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:470
+#: src/testing_old/testing.c:470
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testing/testing.c:493 src/testing/testing.c:600
+#: src/testing_old/testing.c:493 src/testing_old/testing.c:600
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:494 src/testing/testing.c:601
-#: src/testing/testing.c:621
+#: 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/testing.c:570
+#: src/testing_old/testing.c:570
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:620
+#: src/testing_old/testing.c:620
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:643 src/testing/testing.c:675
+#: 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/testing.c:658 src/testing/testing.c:713
+#: src/testing_old/testing.c:658 src/testing_old/testing.c:713
 #, fuzzy
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
-#: src/testing/testing.c:786
+#: src/testing_old/testing.c:786
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:948
+#: src/testing_old/testing.c:948
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
+#: src/testing_old/testing.c:1207 src/testing_old/testing_group.c:6155
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:1292 src/testing/testing.c:1359
+#: src/testing_old/testing.c:1292 src/testing_old/testing.c:1359
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/testing/testing.c:1448
+#: src/testing_old/testing.c:1448
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/testing/testing.c:1601
+#: src/testing_old/testing.c:1601
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1609
+#: src/testing_old/testing.c:1609
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/testing/testing.c:1636
+#: src/testing_old/testing.c:1636
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:1639
+#: src/testing_old/testing.c:1639
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/testing/testing.c:1794
+#: src/testing_old/testing.c:1794
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testing/testing.c:1922
+#: src/testing_old/testing.c:1922
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:2145
+#: src/testing_old/testing.c:2145
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
-#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
-#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
-#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
+#: src/testing_old/testing_group.c:1895 src/testing_old/testing_group.c:1907
+#: src/testing_old/testing_group.c:2009 src/testing_old/testing_group.c:2066
+#: src/testing_old/testing_group.c:2153 src/testing_old/testing_group.c:2173
+#: src/testing_old/testing_group.c:2303
+#: src/testing_old/testing_peergroup.c:950
 #, fuzzy, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/testing/testing_group.c:2160
+#: src/testing_old/testing_group.c:2161
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
+#: src/testing_old/testing_group.c:2878 src/testing_old/testing_group.c:3064
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3957
+#: src/testing_old/testing_group.c:3958
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5226
+#: src/testing_old/testing_group.c:5227
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5944 src/transport/transport-testing.c:636
+#: src/testing_old/testing_group.c:5945
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing_group.c:6011
+#: src/testing_old/testing_group.c:6012
 #, fuzzy, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing_new.c:169
-msgid "tmppath cannot be NULL\n"
-msgstr ""
-
-#: src/testing/testing_new.c:356
+#: src/testing/testing.c:188
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing_new.c:365
-#, fuzzy, c-format
-msgid "Could not open hostkeys file: %s\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/testing/testing_new.c:380
+#: src/testing/testing.c:204
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing_new.c:437
+#: src/testing/testing.c:468
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing_new.c:446
+#: src/testing/testing.c:477
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/testing/testing_new.c:680
+#: src/testing/testing.c:788
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing_new.c:691
+#: src/testing/testing.c:799
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing_new.c:704
+#: src/testing/testing.c:813
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing_new.c:734
+#: src/testing/testing.c:846
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing_new.c:751
+#: src/testing/testing.c:864
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/testing/testing_new.c:791
+#: src/testing/testing.c:925
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing_new.c:959
+#: src/testing/testing.c:1088
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -4515,7 +4670,7 @@
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1363
+#: src/topology/gnunet-daemon-topology.c:1366
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -4557,30 +4712,30 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:747
+#: src/transport/gnunet-service-transport_blacklist.c:751
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:163
+#: src/transport/gnunet-service-transport.c:167
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:237
+#: src/transport/gnunet-service-transport.c:242
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:284
+#: src/transport/gnunet-service-transport.c:289
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:582
+#: src/transport/gnunet-service-transport.c:590
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:591
+#: src/transport/gnunet-service-transport.c:599
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -4593,16 +4748,16 @@
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:503
+#: src/transport/gnunet-service-transport_clients.c:509
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:631
+#: src/transport/gnunet-service-transport_clients.c:637
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:682
+#: src/transport/gnunet-service-transport_clients.c:688
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -4611,115 +4766,115 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1032
+#: src/transport/gnunet-service-transport_neighbours.c:1057
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1148
-#: src/transport/gnunet-service-transport_neighbours.c:1482
+#: src/transport/gnunet-service-transport_neighbours.c:1174
+#: src/transport/gnunet-service-transport_neighbours.c:1511
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1153
+#: src/transport/gnunet-service-transport_neighbours.c:1179
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1158
+#: src/transport/gnunet-service-transport_neighbours.c:1184
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1215
+#: src/transport/gnunet-service-transport_neighbours.c:1241
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1254
+#: src/transport/gnunet-service-transport_neighbours.c:1283
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1278
+#: src/transport/gnunet-service-transport_neighbours.c:1307
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1286
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1323
+#: src/transport/gnunet-service-transport_neighbours.c:1352
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1332
+#: src/transport/gnunet-service-transport_neighbours.c:1361
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1388
+#: src/transport/gnunet-service-transport_neighbours.c:1417
 #, 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:1422
+#: src/transport/gnunet-service-transport_neighbours.c:1451
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1438
+#: src/transport/gnunet-service-transport_neighbours.c:1467
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2544
+#: src/transport/gnunet-service-transport_neighbours.c:2613
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2559
-#: src/transport/gnunet-service-transport_neighbours.c:2585
+#: src/transport/gnunet-service-transport_neighbours.c:2628
+#: src/transport/gnunet-service-transport_neighbours.c:2662
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2675
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2627
+#: src/transport/gnunet-service-transport_neighbours.c:2708
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2807
+#: src/transport/gnunet-service-transport_neighbours.c:2892
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2856
+#: src/transport/gnunet-service-transport_neighbours.c:2947
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2870
+#: src/transport/gnunet-service-transport_neighbours.c:2961
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2901
+#: src/transport/gnunet-service-transport_neighbours.c:2992
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2912
+#: src/transport/gnunet-service-transport_neighbours.c:3003
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2943
+#: src/transport/gnunet-service-transport_neighbours.c:3034
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3020
+#: src/transport/gnunet-service-transport_neighbours.c:3129
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -4728,212 +4883,200 @@
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:414
+#: src/transport/gnunet-service-transport_validation.c:415
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:463
+#: src/transport/gnunet-service-transport_validation.c:464
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:512
+#: src/transport/gnunet-service-transport_validation.c:513
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/transport/gnunet-service-transport_validation.c:570
+#: src/transport/gnunet-service-transport_validation.c:571
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:805
+#: src/transport/gnunet-service-transport_validation.c:807
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:840
+#: src/transport/gnunet-service-transport_validation.c:872
 #, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:924
+#: src/transport/gnunet-service-transport_validation.c:989
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/transport/gnunet-service-transport_validation.c:998
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1055
+#: src/transport/gnunet-service-transport_validation.c:1120
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1080
+#: src/transport/gnunet-service-transport_validation.c:1145
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1136
+#: src/transport/gnunet-service-transport_validation.c:1199
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:260
+#: src/transport/gnunet-transport.c:265
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:273
+#: src/transport/gnunet-transport.c:278
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:323
+#: src/transport/gnunet-transport.c:328
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:330
+#: 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:363
+#: src/transport/gnunet-transport.c:374
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:383
+#: src/transport/gnunet-transport.c:394
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:414
+#: src/transport/gnunet-transport.c:426
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:443
+#: src/transport/gnunet-transport.c:506
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:466
+#: src/transport/gnunet-transport.c:529
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:473
+#: src/transport/gnunet-transport.c:536
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:501
+#: src/transport/gnunet-transport.c:564
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-transport.c:569
+#: src/transport/gnunet-transport.c:633
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:618
+#: src/transport/gnunet-transport.c:716
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:719
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:624
+#: src/transport/gnunet-transport.c:722
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:627
+#: src/transport/gnunet-transport.c:728
 #, fuzzy
-msgid "provide information about all current connections (continuously)"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/transport/gnunet-transport.c:630
-#, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:634
+#: src/transport/gnunet-transport.c:732
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:637
+#: src/transport/gnunet-transport.c:735
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:645
+#: src/transport/gnunet-transport.c:746
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:1100
+#: src/transport/plugin_transport_http.c:1119
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1149
+#: src/transport/plugin_transport_http.c:1168
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/transport/plugin_transport_http.c:1174 src/util/service.c:1036
+#: src/transport/plugin_transport_http.c:1200 src/util/service.c:1051
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_http.c:1191 src/util/service.c:1053
+#: src/transport/plugin_transport_http.c:1217 src/util/service.c:1068
 #, 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:1296
+#: src/transport/plugin_transport_http.c:1322
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1309
-#, c-format
-msgid "FREEING %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1386
+#: src/transport/plugin_transport_http.c:1407
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1399
+#: src/transport/plugin_transport_http.c:1420
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http.c:1410
+#: src/transport/plugin_transport_http.c:1431
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1430
+#: src/transport/plugin_transport_http.c:1451
 #, 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:1460
+#: src/transport/plugin_transport_http.c:1481
 #, 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:624
+#: src/transport/plugin_transport_http_client.c:621
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -4996,91 +5139,92 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:591
+#: src/transport/plugin_transport_tcp.c:590
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:767
-#: 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:1086
-#: src/transport/plugin_transport_tcp.c:1103
+#: src/transport/plugin_transport_tcp.c:766
+#: src/transport/plugin_transport_tcp.c:855
+#: src/transport/plugin_transport_tcp.c:905
+#: src/transport/plugin_transport_tcp.c:991
+#: src/transport/plugin_transport_tcp.c:1129
+#: src/transport/plugin_transport_tcp.c:1146
 #, 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:1761
-#: src/transport/plugin_transport_tcp.c:2390
+#: src/transport/plugin_transport_tcp.c:773
+#: src/transport/plugin_transport_tcp.c:962
+#: src/transport/plugin_transport_tcp.c:1806
+#: src/transport/plugin_transport_tcp.c:2423
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:860
+#: src/transport/plugin_transport_tcp.c:859
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:908
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:996
+#: src/transport/plugin_transport_tcp.c:995
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1290
+#: src/transport/plugin_transport_tcp.c:1335
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1401
+#: src/transport/plugin_transport_tcp.c:1446
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1802
+#: src/transport/plugin_transport_tcp.c:1847
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:1973
+#: src/transport/plugin_transport_tcp.c:2018
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2043
+#: src/transport/plugin_transport_tcp.c:2088
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2279 src/util/service.c:940
+#: src/transport/plugin_transport_tcp.c:2312 src/util/service.c:946
+#: src/util/service.c:952
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2293
+#: src/transport/plugin_transport_tcp.c:2326
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2355
+#: src/transport/plugin_transport_tcp.c:2388
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2378
+#: src/transport/plugin_transport_tcp.c:2411
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2382
+#: src/transport/plugin_transport_tcp.c:2415
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:2419
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5095,129 +5239,142 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:367
+#: src/transport/plugin_transport_udp_broadcasting.c:392
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1894
+#: src/transport/plugin_transport_udp.c:1903
 #, c-format
 msgid ""
-"UDP could not message to `%s': `%s'. Please check your network configuration "
-"and disable IPv6 if your connection does not have a global IPv6 address\n"
+"UDP could not transmit message to `%s': Network seems down, please check "
+"your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2138
+#: src/transport/plugin_transport_udp.c:1917
+#, c-format
+msgid ""
+"UDP could not transmit message to `%s': Please check your network "
+"configuration and disable IPv6 if your connection does not have a global "
+"IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2162
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2306
+#: src/transport/plugin_transport_udp.c:2328
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2349
+#: src/transport/plugin_transport_udp.c:2371
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_unix.c:1356
+#: src/transport/plugin_transport_unix.c:1351
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_wlan.c:561
+#: src/transport/plugin_transport_wlan.c:560
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:580
+#: src/transport/plugin_transport_wlan.c:579
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/plugin_transport_wlan.c:626
-#: src/transport/plugin_transport_wlan.c:676
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:625
+#: src/transport/plugin_transport_wlan.c:675
+#: src/transport/plugin_transport_wlan.c:1695
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:749
+#: src/transport/plugin_transport_wlan.c:748
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:767
+#: src/transport/plugin_transport_wlan.c:766
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:867
-#: src/transport/plugin_transport_wlan.c:948
-#: src/transport/plugin_transport_wlan.c:1698
+#: src/transport/plugin_transport_wlan.c:866
+#: src/transport/plugin_transport_wlan.c:947
+#: src/transport/plugin_transport_wlan.c:1697
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1119
+#: src/transport/plugin_transport_wlan.c:1118
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1140
+#: src/transport/plugin_transport_wlan.c:1139
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1150
+#: src/transport/plugin_transport_wlan.c:1149
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1207
+#: src/transport/plugin_transport_wlan.c:1206
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1306
+#: src/transport/plugin_transport_wlan.c:1305
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1341
+#: src/transport/plugin_transport_wlan.c:1340
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1402
+#: src/transport/plugin_transport_wlan.c:1401
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1511
+#: src/transport/plugin_transport_wlan.c:1510
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1668
+#: src/transport/plugin_transport_wlan.c:1667
 #, fuzzy, c-format
 msgid "Invalid configuration option `%s' in section `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/plugin_transport_wlan.c:1677
+#: src/transport/plugin_transport_wlan.c:1676
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1687
+#: src/transport/plugin_transport_wlan.c:1686
 #, fuzzy, c-format
 msgid "Missing configuration option `%s' in section `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/transport_api.c:570
+#: src/transport/transport_api.c:575
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
+#: src/transport/transport-testing.c:589
+#, fuzzy
+msgid "Failed to initialize testing library!\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
 #: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
@@ -5248,89 +5405,94 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:359
+#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:982
 #, 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
+#, fuzzy, c-format
+msgid "Using `%s' instead\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/util/client.c:369
+#, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:367
+#: src/util/client.c:377
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:685
+#: src/util/client.c:695
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:740 src/util/service.c:970
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:882
+#: src/util/client.c:895
 #, 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:896
+#: src/util/client.c:909
 #, 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:1149
+#: src/util/client.c:1162
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:890
+#: src/util/common_logging.c:258 src/util/common_logging.c:1008
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:888
+#: src/util/common_logging.c:260 src/util/common_logging.c:1006
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:886
+#: src/util/common_logging.c:262 src/util/common_logging.c:1004
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:884
+#: src/util/common_logging.c:264 src/util/common_logging.c:1002
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:892
+#: src/util/common_logging.c:266 src/util/common_logging.c:1010
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:610
+#: src/util/common_logging.c:395
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/common_logging.c:725
+#: src/util/common_logging.c:819
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:893
+#: src/util/common_logging.c:1011
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:992
+#: src/util/common_logging.c:1113
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1030
+#: src/util/common_logging.c:1151
 msgid "invalid address"
 msgstr ""
 
-#: src/util/configuration.c:244
+#: src/util/configuration.c:259
 #, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgid "Syntax error while deserializing operation at line %u\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:816
+#: src/util/configuration.c:938
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -5375,74 +5537,89 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:280
+#: src/util/crypto_random.c:284
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:309
+#: src/util/crypto_random.c:313
 #, 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:661 src/util/crypto_rsa.c:708
+#: src/util/crypto_rsa.c:635 src/util/crypto_rsa.c:651
+#: src/util/crypto_rsa.c:833
 #, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %s...\n"
+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:731 src/util/crypto_rsa.c:778
+#, 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:666
+#: src/util/crypto_rsa.c:736
 #, 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:684
+#: src/util/crypto_rsa.c:754
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
+#: 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:743
+#: src/util/crypto_rsa.c:813
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:763
+#: src/util/crypto_rsa.c:851
 #, 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:781
-#, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
 
-#: src/util/crypto_rsa.c:1032
+#: src/util/crypto_rsa.c:926
+msgid "interrupted by shutdown"
+msgstr ""
+
+#: src/util/crypto_rsa.c:935
+#, fuzzy
+msgid "internal error"
+msgstr "Okänt fel.\n"
+
+#: src/util/crypto_rsa.c:944 src/util/crypto_rsa.c:951
+#, fuzzy
+msgid "gnunet-rsa failed"
+msgstr "gnunet-update misslyckades!"
+
+#: src/util/crypto_rsa.c:1332
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/disk.c:498
+#: src/util/disk.c:571
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk.c:1062
+#: src/util/disk.c:1135
 #, 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:1416 src/util/service.c:1650
+#: src/util/disk.c:1489 src/util/service.c:1665
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:1734
+#: src/util/disk.c:1861
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
@@ -5524,28 +5701,28 @@
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:154
+#: src/util/gnunet-resolver.c:158
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:64
+#: src/util/gnunet-rsa.c:104
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:112
+#: src/util/gnunet-rsa.c:154
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:115
+#: src/util/gnunet-rsa.c:157
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:118
+#: src/util/gnunet-rsa.c:160
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:124
+#: src/util/gnunet-rsa.c:170
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5560,70 +5737,65 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/helper.c:244
+#: src/util/helper.c:254
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/helper.c:259
+#: src/util/helper.c:274
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:269
+#: src/util/helper.c:290
 #, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:278
+#: src/util/helper.c:299
 #, 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:310
+#: src/util/helper.c:337
 #, fuzzy, c-format
 msgid "Starting HELPER process `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/util/helper.c:440
+#: src/util/helper.c:476
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/network.c:1200
+#: src/util/network.c:99
 #, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr ""
+
+#: src/util/network.c:1278
+#, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:299
+#: src/util/os_installation.c:329
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:526
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/util/os_installation.c:492
+#: src/util/os_priority.c:302
 #, fuzzy, c-format
-msgid "access (%s, X_OK) failed: %s\n"
-msgstr "\"%s\" %s misslyckades: %s\n"
-
-#: src/util/os_installation.c:507
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "\"%s\" %s misslyckades: %s\n"
-
-#: src/util/os_priority.c:305
-#, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/os_priority.c:306
+#: src/util/os_priority.c:303
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -5696,143 +5868,143 @@
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/server.c:483
+#: src/util/server.c:468
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/server.c:492
+#: src/util/server.c:477
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:497
+#: src/util/server.c:488
 #, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
+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:827
+#: src/util/server.c:819
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
-#: src/util/service.c:225 src/util/service.c:232
+#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
+#: src/util/service.c:232 src/util/service.c:239
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/service.c:188
+#: src/util/service.c:195
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/util/service.c:281
+#: src/util/service.c:288
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/service.c:313
+#: src/util/service.c:320
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/service.c:343
+#: src/util/service.c:350
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
 
-#: src/util/service.c:698
+#: src/util/service.c:705
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:703
+#: src/util/service.c:710
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/util/service.c:710
+#: src/util/service.c:717
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:765
+#: src/util/service.c:772
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:802
+#: src/util/service.c:809
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:920
+#: src/util/service.c:927
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:990
+#: src/util/service.c:1005
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1007
+#: src/util/service.c:1022
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1241
+#: src/util/service.c:1256
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1292 src/util/service.c:1310
+#: src/util/service.c:1307 src/util/service.c:1325
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1337
+#: src/util/service.c:1352
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1506
+#: src/util/service.c:1521
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1539
+#: src/util/service.c:1554
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/util/service.c:1588
+#: src/util/service.c:1603
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1592
+#: src/util/service.c:1607
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1596
+#: src/util/service.c:1611
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1651
+#: src/util/service.c:1666
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1664
+#: src/util/service.c:1679
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/service.c:1729
+#: src/util/service.c:1744
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5841,64 +6013,70 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Anrop till \"%s\" returnerade %d.\n"
 
-#: src/util/strings.c:144
+#: src/util/strings.c:145
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:334
+#: src/util/strings.c:385
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:481
+#: src/util/strings.c:534
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:573
+#: src/util/strings.c:626
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:578
-msgid "eternity"
+#: src/util/strings.c:631
+msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:582
+#: src/util/strings.c:635
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:586
+#: src/util/strings.c:639
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:590
+#: src/util/strings.c:643
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:594
-msgid " days"
+#: src/util/strings.c:648
+#, fuzzy
+msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:618
+#: src/util/strings.c:650
+#, fuzzy
+msgid "days"
+msgstr " dagar"
+
+#: src/util/strings.c:674
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1012
+#: src/util/strings.c:1063
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1020
+#: src/util/strings.c:1071
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1026
+#: src/util/strings.c:1077
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1033
+#: src/util/strings.c:1084
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1042
+#: src/util/strings.c:1093
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
@@ -6073,27 +6251,51 @@
 msgid "service is offered via UDP"
 msgstr "# byte mottagna via UDP"
 
-#: src/vpn/gnunet-vpn.c:329
+#: src/vpn/gnunet-vpn.c:333
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:497 src/include/gnunet_common.h:502
-#: src/include/gnunet_common.h:508
+#: src/include/gnunet_common.h:507 src/include/gnunet_common.h:512
+#: src/include/gnunet_common.h:518
 #, 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:518
+#: src/include/gnunet_common.h:528
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:539 src/include/gnunet_common.h:546
+#: src/include/gnunet_common.h:549 src/include/gnunet_common.h:556
 #, 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 "Could not create namespace `%s'\n"
+#~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#, fuzzy
+#~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Could not open hostkeys file: %s\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "access (%s, X_OK) failed: %s\n"
+#~ msgstr "\"%s\" %s misslyckades: %s\n"
+
+#, fuzzy
+#~ msgid "stat (%s) failed: %s\n"
+#~ msgstr "\"%s\" %s misslyckades: %s\n"
+
+#, fuzzy
 #~ msgid "# Peers connected"
 #~ msgstr "# av anslutna parter"
 
@@ -6251,10 +6453,6 @@
 #~ msgstr "Tjänst borttagen.\n"
 
 #, fuzzy
-#~ msgid "Unable to start service `%s': %s\n"
-#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#, fuzzy
 #~ msgid "Unable to accept connection for service `%s': %s\n"
 #~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
@@ -6612,10 +6810,6 @@
 #~ msgstr "Icke-förväntad mycket stor allokering (%u byte) vid %s:%d!\n"
 
 #, fuzzy
-#~ msgid "`%s' failed with error code %d: %s\n"
-#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#, fuzzy
 #~ msgid "GNUnet error log"
 #~ msgstr "Spåra GNUnets nätverkstopologi."
 
@@ -7189,10 +7383,6 @@
 #~ msgstr "Nätverksgränssnitt:"
 
 #, fuzzy
-#~ msgid "What is the path to the configuration file for gnunetd?"
-#~ msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-
-#, fuzzy
 #~ msgid "General options"
 #~ msgstr "Visa alla alternativ"
 
@@ -7559,9 +7749,6 @@
 #~ msgid "User account:"
 #~ msgstr "Användarkonto:"
 
-#~ msgid "gnunet-update failed!"
-#~ msgstr "gnunet-update misslyckades!"
-
 #~ 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"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2012-07-20 16:57:42 UTC (rev 22805)
+++ gnunet/po/vi.po     2012-07-20 17:34:01 UTC (rev 22806)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-06-02 19:10+0200\n"
+"POT-Creation-Date: 2012-07-20 19:29+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -23,177 +23,185 @@
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:349
+#: src/arm/arm_api.c:354
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/arm/arm_api.c:363
+#: src/arm/arm_api.c:368
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/arm/arm_api.c:432
+#: src/arm/arm_api.c:437
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:485
+#: src/arm/arm_api.c:490
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:486
+#: src/arm/arm_api.c:491
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:507
+#: 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:508
+#: 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:540
+#: src/arm/arm_api.c:547
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "« %s »: Chưa nhận thông báo sau %llu miligiây.\n"
 
-#: src/arm/arm_api.c:612
+#: src/arm/arm_api.c:620
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:159
+#: src/arm/gnunet-arm.c:166
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:171
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-arm.c:167
+#: src/arm/gnunet-arm.c:174
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:172
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:182
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-arm.c:179
+#: src/arm/gnunet-arm.c:186
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/arm/gnunet-arm.c:183
+#: src/arm/gnunet-arm.c:190
 #, fuzzy
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:187
+#: src/arm/gnunet-arm.c:194
 #, fuzzy
 msgid "Error communicating with ARM service.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:191
+#: src/arm/gnunet-arm.c:198
 #, fuzzy
 msgid "Timeout communicating with ARM service.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:195
+#: src/arm/gnunet-arm.c:202
 #, fuzzy
 msgid "Operation failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:199
+#: src/arm/gnunet-arm.c:206
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222
+#: src/arm/gnunet-arm.c:229
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:225
+#: src/arm/gnunet-arm.c:232
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:249
+#: src/arm/gnunet-arm.c:256
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
+#: src/arm/gnunet-arm.c:264 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:384
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:280
+#: src/arm/gnunet-arm.c:287
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/arm/gnunet-arm.c:286
+#: src/arm/gnunet-arm.c:293
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/arm/gnunet-arm.c:407
+#: src/arm/gnunet-arm.c:418
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:409
+#: src/arm/gnunet-arm.c:420
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:411
+#: src/arm/gnunet-arm.c:422
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:413
+#: src/arm/gnunet-arm.c:424
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:416
+#: src/arm/gnunet-arm.c:427
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:430
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:421
+#: src/arm/gnunet-arm.c:432
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:424
+#: src/arm/gnunet-arm.c:435
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
 
-#: src/arm/gnunet-arm.c:426
+#: src/arm/gnunet-arm.c:437
 msgid "List currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:439
+msgid "Don't let gnunet-service-arm inherit standard output"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:441
+msgid "Don't let gnunet-service-arm inherit standard error"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:455
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -292,6 +300,21 @@
 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/gnunet-ats.c:96
+#, fuzzy
+msgid "list information for all peers"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/ats/gnunet-ats.c:105
+#, fuzzy
+msgid "Print information about ATS state"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
 #: src/block/block.c:105
 #, fuzzy, c-format
 msgid "Loading block plugin `%s'\n"
@@ -550,46 +573,67 @@
 msgid "set the chat room to join"
 msgstr "đặt phòng trò chuyện cần vào"
 
-#: src/chat/gnunet-chat.c:742
+#: src/chat/gnunet-chat.c:746
 msgid "Join a chat on GNUnet."
 msgstr "Vào phòng trò chuyện trên GNUnet."
 
-#: src/chat/gnunet-service-chat.c:267
+#: src/chat/gnunet-service-chat.c:266
 #, fuzzy
 msgid "Failed to queue a message notification\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/chat/gnunet-service-chat.c:546
+#: src/chat/gnunet-service-chat.c:545
 #, fuzzy
 msgid "Failed to queue a join notification\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/chat/gnunet-service-chat.c:729
+#: src/chat/gnunet-service-chat.c:728
 #, fuzzy
 msgid "Failed to queue a confirmation receipt\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/chat/gnunet-service-chat.c:907
+#: src/chat/gnunet-service-chat.c:906
 #, fuzzy
 msgid "Failed to queue a leave notification\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/core/core_api.c:786
+#: src/core/core_api.c:757
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
+#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
+#: src/core/gnunet-core.c:118 src/core/gnunet-core.c:149
+#: src/transport/gnunet-transport.c:451 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
+#, fuzzy
+msgid "Connected to"
+msgstr "« %s » được kết nối tới « %s ».\n"
+
+#: src/core/gnunet-core.c:151 src/transport/gnunet-transport.c:479
+#, fuzzy
+msgid "Disconnected from"
+msgstr "« %.*s » được kết nối tới « %.*s ».\n"
+
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/core/gnunet-core.c:95
+#: src/core/gnunet-core.c:216 src/transport/gnunet-transport.c:725
 #, fuzzy
+msgid "provide information about all current connections (continuously)"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/core/gnunet-core.c:227
+#, fuzzy
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
@@ -654,7 +698,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:810
+#: src/transport/gnunet-service-transport_validation.c:812
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
@@ -682,7 +726,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:1031
+#: src/transport/gnunet-service-transport_validation.c:1096
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -702,58 +746,58 @@
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1381
-#: src/core/gnunet-service-core_kx.c:1398
+#: src/core/gnunet-service-core_kx.c:1383
+#: src/core/gnunet-service-core_kx.c:1400
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1402
+#: src/core/gnunet-service-core_kx.c:1404
 msgid "# REKEY operations performed"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1537
+#: src/core/gnunet-service-core_kx.c:1539
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1577
-#: src/core/gnunet-service-core_kx.c:1602
+#: src/core/gnunet-service-core_kx.c:1579
+#: src/core/gnunet-service-core_kx.c:1604
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1589
+#: src/core/gnunet-service-core_kx.c:1591
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1628
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
 
-#: src/core/gnunet-service-core_kx.c:1630
+#: src/core/gnunet-service-core_kx.c:1632
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1638
+#: src/core/gnunet-service-core_kx.c:1640
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1700
+#: src/core/gnunet-service-core_kx.c:1702
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/core/gnunet-service-core_kx.c:1708
+#: 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:1718 src/hostlist/hostlist-server.c:551
+#: 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:611
+#: src/transport/gnunet-service-transport.c:619
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -772,23 +816,23 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:418
+#: src/core/gnunet-service-core_neighbours.c:421
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-#: src/dht/gnunet-service-dht_neighbours.c:625
-#: src/dht/gnunet-service-dht_neighbours.c:683
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
+#: 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/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
-#: src/transport/gnunet-service-transport_neighbours.c:874
-#: src/transport/gnunet-service-transport_neighbours.c:1080
-#: src/transport/gnunet-service-transport_neighbours.c:1089
-#: src/transport/gnunet-service-transport_neighbours.c:2568
-#: src/transport/gnunet-service-transport_neighbours.c:2814
+#: src/transport/gnunet-service-transport_neighbours.c:890
+#: src/transport/gnunet-service-transport_neighbours.c:1106
+#: src/transport/gnunet-service-transport_neighbours.c:1115
+#: src/transport/gnunet-service-transport_neighbours.c:2637
+#: src/transport/gnunet-service-transport_neighbours.c:2899
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
@@ -853,9 +897,10 @@
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:525
-#: src/include/gnunet_common.h:532
+#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:535
+#: src/include/gnunet_common.h:542
 #, 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"
@@ -1175,6 +1220,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
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1212,7 +1258,7 @@
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1198
-#: src/namestore/plugin_namestore_sqlite.c:829
+#: src/namestore/plugin_namestore_sqlite.c:834
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -1227,33 +1273,31 @@
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
-#: src/dht/gnunet-dht-put.c:192 src/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-put.c:192
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:182
+#: src/dht/gnunet-dht-get.c:204
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
-#: src/gns/gnunet-gns-lookup.c:185
 msgid "the type of data to look for"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
-#: src/gns/gnunet-gns-lookup.c:188
 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-download.c:271
-#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
-#: src/fs/gnunet-unindex.c:169 src/gns/gnunet-gns-lookup.c:191
-#: src/nse/gnunet-nse-profiler.c:910
+#: 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
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:232
+#: src/dht/gnunet-dht-get.c:236
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1261,7 +1305,7 @@
 msgid "how long to execute? 0 = forever"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321
+#: src/dht/gnunet-dht-monitor.c:324
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
@@ -1314,12 +1358,12 @@
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:223
+#: src/dht/gnunet-dht-put.c:226
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
-#: src/testing/testing.c:1968 src/testing/testing.c:1998
+#: 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
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -1357,16 +1401,16 @@
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:990
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1038
-#: src/dht/gnunet-service-dht_clients.c:1081
+#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-dht_clients.c:1082
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1048
+#: src/dht/gnunet-service-dht_clients.c:1049
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1410,96 +1454,103 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:481
+#: src/dht/gnunet-service-dht_neighbours.c:485
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:571
+#: src/dht/gnunet-service-dht_neighbours.c:575
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:717
+#: src/dht/gnunet-service-dht_neighbours.c:721
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/dht/gnunet-service-dht_neighbours.c:772
+#: src/dht/gnunet-service-dht_neighbours.c:776
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/dht/gnunet-service-dht_neighbours.c:810
+#: src/dht/gnunet-service-dht_neighbours.c:814
 #, fuzzy
 msgid "# Bytes of bandwdith requested from core"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1032
-#: src/dht/gnunet-service-dht_neighbours.c:1060
+#: src/dht/gnunet-service-dht_neighbours.c:1036
+#: src/dht/gnunet-service-dht_neighbours.c:1064
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1041
-#: src/dht/gnunet-service-dht_neighbours.c:1075
+#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1079
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "# các cuộc gọi HTTP select (lựa chọn)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1207
+#: src/dht/gnunet-service-dht_neighbours.c:1211
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1236
+#: src/dht/gnunet-service-dht_neighbours.c:1240
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1315
+#: src/dht/gnunet-service-dht_neighbours.c:1247
+#: src/dht/gnunet-service-dht_neighbours.c:1360
+#: src/dht/gnunet-service-dht_neighbours.c:1460
 #, fuzzy
+msgid "# P2P messages dropped due to full queue"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1325
+#, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1342
+#: src/dht/gnunet-service-dht_neighbours.c:1352
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1443
+#: src/dht/gnunet-service-dht_neighbours.c:1467
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1531
+#: src/dht/gnunet-service-dht_neighbours.c:1555
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1671
 #, fuzzy
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1655
+#: src/dht/gnunet-service-dht_neighbours.c:1679
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1746
+#: src/dht/gnunet-service-dht_neighbours.c:1770
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1788
+#: src/dht/gnunet-service-dht_neighbours.c:1812
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1802
+#: src/dht/gnunet-service-dht_neighbours.c:1826
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1876
+#: src/dht/gnunet-service-dht_neighbours.c:1900
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -1529,10 +1580,15 @@
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:352
+#: src/dht/gnunet-service-dht_routing.c:394
 msgid "# Entries added to routing table"
 msgstr ""
 
+#: src/dht/gnunet-service-dht_routing.c:411
+#, fuzzy
+msgid "# DHT requests combined"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
 #: src/dht/plugin_block_dht.c:136
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -1547,15 +1603,15 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:337
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:340
+#: src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:348
+#: src/dns/gnunet-dns-monitor.c:370
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -1567,7 +1623,7 @@
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:251
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
@@ -1628,7 +1684,7 @@
 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:1561 src/exit/gnunet-daemon-exit.c:3033
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
@@ -1802,50 +1858,50 @@
 msgid "# UDP requests dropped (no such service)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:2882
+#: src/exit/gnunet-daemon-exit.c:2883
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908
+#: src/exit/gnunet-daemon-exit.c:2897 src/exit/gnunet-daemon-exit.c:2909
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2919
+#: src/exit/gnunet-daemon-exit.c:2920
 #, c-format
 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:3049
 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:3057
 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:3064
 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:3070
 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:3076 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3236
+#: src/exit/gnunet-daemon-exit.c:3241
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1904,76 +1960,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/fs/fs_api.c:339
+#: src/fs/fs_api.c:491
 #, 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:348
+#: src/fs/fs_api.c:500
 #, 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:354
+#: src/fs/fs_api.c:506
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:938
+#: src/fs/fs_api.c:1087
 #, 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:1395
+#: src/fs/fs_api.c:1546
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1437
+#: src/fs/fs_api.c:1588
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1453
+#: src/fs/fs_api.c:1604
 #, 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:2106
+#: src/fs/fs_api.c:2254
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2116
+#: src/fs/fs_api.c:2264
 #, 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:2241 src/fs/fs_api.c:2480
+#: src/fs/fs_api.c:2389 src/fs/fs_api.c:2629
 #, 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:2258
+#: src/fs/fs_api.c:2406
 #, 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:2270 src/fs/fs_api.c:2289 src/fs/fs_api.c:2773
+#: src/fs/fs_api.c:2419 src/fs/fs_api.c:2438 src/fs/fs_api.c:2922
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2471
+#: src/fs/fs_api.c:2620
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2717
+#: src/fs/fs_api.c:2866
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2811
+#: src/fs/fs_api.c:2960
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1983,58 +2039,58 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/fs_download.c:311
+#: src/fs/fs_download.c:321
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:331
+#: src/fs/fs_download.c:341
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
+#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:878
+#: src/fs/fs_download.c:888
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:970
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:986
+#: src/fs/fs_download.c:996
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1009
+#: src/fs/fs_download.c:1019
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1029
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1028
+#: src/fs/fs_download.c:1038
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1125
+#: src/fs/fs_download.c:1136
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_download.c:1888
+#: src/fs/fs_download.c:1920
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -2098,22 +2154,22 @@
 msgid "Failed to write `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:256
+#: src/fs/fs_namespace.c:254
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_namespace.c:371
+#: src/fs/fs_namespace.c:369
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr "Lỗi thêm mục nhập vào không gian tên « %s » (có chưa ?)\n"
 
-#: src/fs/fs_namespace.c:588 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:586 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_namespace.c:631
+#: src/fs/fs_namespace.c:629
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -2123,59 +2179,59 @@
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:621 src/fs/fs_publish.c:638 src/fs/fs_publish.c:677
-#: src/fs/fs_publish.c:697 src/fs/fs_publish.c:722 src/fs/fs_publish.c:862
+#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
 
-#: src/fs/fs_publish.c:623
+#: src/fs/fs_publish.c:624
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:635
+#: src/fs/fs_publish.c:636
 #, fuzzy
 msgid "unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:679
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:698
+#: src/fs/fs_publish.c:699
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:724
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:746
+#: src/fs/fs_publish.c:747
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_publish.c:811
+#: src/fs/fs_publish.c:812
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/fs/fs_publish.c:817
+#: src/fs/fs_publish.c:818
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:863
+#: src/fs/fs_publish.c:864
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1071
+#: src/fs/fs_publish.c:1090
 #, fuzzy, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr "Không đủ quyền truy cập cho « %s »: %s\n"
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1161
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2185,7 +2241,7 @@
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs_search.c:829
+#: src/fs/fs_search.c:830
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2329,6 +2385,65 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
+#: src/fs/gnunet-auto-share.c:236
+#, fuzzy, c-format
+msgid "Failed to load state: %s\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
+#: src/fs/gnunet-auto-share.c:309
+#, fuzzy, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:488
+#, fuzzy, c-format
+msgid "Publishing `%s'\n"
+msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+
+#: src/fs/gnunet-auto-share.c:497
+#, fuzzy, c-format
+msgid "Failed to run `%s'\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/fs/gnunet-auto-share.c:684
+#, 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-publish.c:679
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
+
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:683
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
+
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:686
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:710
+msgid "specify the priority of the content"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-pseudonym.c:304
+#: src/fs/gnunet-publish.c:717
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:767
+#, fuzzy
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr "Tự động chia sẻ một thư mục."
+
 #: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
@@ -2359,100 +2474,100 @@
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/gnunet-directory.c:179
+#: src/fs/gnunet-directory.c:183
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/gnunet-download.c:101
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-download.c:110
+#: src/fs/gnunet-download.c:146
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Lỗi không rõ"
 
-#: src/fs/gnunet-download.c:119
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:129
+#: src/fs/gnunet-download.c:178
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:193
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
-#: src/fs/gnunet-download.c:152 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:191
 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/fs/gnunet-download.c:177
+#: src/fs/gnunet-download.c:233
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
+#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:625
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/gnunet-download.c:190
+#: src/fs/gnunet-download.c:246
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:197
+#: src/fs/gnunet-download.c:253
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
+#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:603
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-download.c:248 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:285
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-download.c:251
+#: src/fs/gnunet-download.c:307
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
 
-#: src/fs/gnunet-download.c:254 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
+#: src/fs/gnunet-download.c:313
 msgid "write the file to FILENAME"
 msgstr "ghi tập tin vào TÊN_TẬP_TIN"
 
-#: src/fs/gnunet-download.c:261
+#: src/fs/gnunet-download.c:317
 #, fuzzy
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:265
+#: src/fs/gnunet-download.c:321
 #, fuzzy
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:268
+#: src/fs/gnunet-download.c:324
 msgid "download a GNUnet directory recursively"
 msgstr "tải xuống đệ quy một thư mục GNUnet"
 
-#: src/fs/gnunet-download.c:278
+#: src/fs/gnunet-download.c:338
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2462,12 +2577,12 @@
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:124
+#: src/fs/gnunet-fs.c:128
 #, fuzzy
 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:167
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:161
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -2478,10 +2593,6 @@
 msgid "Option `%s' ignored\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
-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-pseudonym.c:282
 msgid "create or advertise namespace NAME"
 msgstr ""
@@ -2499,7 +2610,7 @@
 "thêm một từ khóa bổ sung cho tất cả tập tin và thư mục (có thể chỉ ra tùy "
 "chọn này nhiều lần)"
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:697
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:698
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
 
@@ -2516,10 +2627,6 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
-msgid "set the desired replication LEVEL"
-msgstr ""
-
 #: src/fs/gnunet-pseudonym.c:307
 #, fuzzy
 msgid "specify ID of the root of the namespace"
@@ -2530,7 +2637,7 @@
 msgid "change rating of namespace ID by VALUE"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:318
+#: src/fs/gnunet-pseudonym.c:322
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2554,120 +2661,107 @@
 msgid "URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:187
+#: src/fs/gnunet-publish.c:188
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:305
+#: src/fs/gnunet-publish.c:306
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:307
+#: src/fs/gnunet-publish.c:308
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:358
+#: src/fs/gnunet-publish.c:359 src/fs/gnunet-publish.c:613
 #, fuzzy, c-format
-msgid "Failed to create namespace `%s'\n"
+msgid "Failed to create namespace `%s' (illegal filename?)\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-publish.c:433
+#: src/fs/gnunet-publish.c:434
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:460
+#: src/fs/gnunet-publish.c:461
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/fs/gnunet-publish.c:491
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-publish.c:493
+#: src/fs/gnunet-publish.c:494
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-publish.c:498
+#: src/fs/gnunet-publish.c:499
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:503
+#: src/fs/gnunet-publish.c:504
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:507
+#: src/fs/gnunet-publish.c:508
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:511
+#: src/fs/gnunet-publish.c:512
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:518
+#: src/fs/gnunet-publish.c:519
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/gnunet-publish.c:552
+#: src/fs/gnunet-publish.c:553
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "Không thể trích siêu dữ liệu ra một địa chỉ URI.\n"
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:560
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:566
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-publish.c:573 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:574 src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:583 src/fs/gnunet-publish.c:590
-#: src/transport/gnunet-transport.c:560
+#: src/fs/gnunet-publish.c:584 src/fs/gnunet-publish.c:591
+#: src/transport/gnunet-transport.c:624
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:612
+#: src/fs/gnunet-publish.c:646
 #, fuzzy, c-format
-msgid "Could not create namespace `%s'\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/fs/gnunet-publish.c:645
-#, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:657
+#: src/fs/gnunet-publish.c:658
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:682
-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-publish.c:685
-msgid "do not use libextractor to add keywords or metadata"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:689
+#: src/fs/gnunet-publish.c:690
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2675,7 +2769,7 @@
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/fs/gnunet-publish.c:693
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2683,7 +2777,7 @@
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/fs/gnunet-publish.c:700
+#: src/fs/gnunet-publish.c:701
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2691,7 +2785,7 @@
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2699,16 +2793,12 @@
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:709
-msgid "specify the priority of the content"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:714
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
 
-#: src/fs/gnunet-publish.c:719
+#: src/fs/gnunet-publish.c:720
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -2716,13 +2806,13 @@
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:723
+#: src/fs/gnunet-publish.c:724
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:727
+#: src/fs/gnunet-publish.c:728
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -2730,7 +2820,7 @@
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/fs/gnunet-publish.c:742
+#: src/fs/gnunet-publish.c:747
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2766,7 +2856,7 @@
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:308
+#: src/fs/gnunet-search.c:312
 #, fuzzy
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
@@ -2787,96 +2877,96 @@
 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:696
+#: src/fs/gnunet-service-fs_cp.c:703
 #, 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:700
+#: src/fs/gnunet-service-fs_cp.c:707
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:735
+#: src/fs/gnunet-service-fs_cp.c:742
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/fs/gnunet-service-fs_cp.c:741
+#: src/fs/gnunet-service-fs_cp.c:748
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1324
+#: src/fs/gnunet-service-fs_cp.c:773 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:858
+#: src/fs/gnunet-service-fs_cp.c:865
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:918
 #, 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:919
+#: src/fs/gnunet-service-fs_cp.c:926
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:933
+#: src/fs/gnunet-service-fs_cp.c:940
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:971
+#: src/fs/gnunet-service-fs_cp.c:978
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/fs/gnunet-service-fs_cp.c:1045
 #, 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:1062
+#: src/fs/gnunet-service-fs_cp.c:1069
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/fs/gnunet-service-fs_cp.c:1079
 #, 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:1151
+#: src/fs/gnunet-service-fs_cp.c:1158
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/fs/gnunet-service-fs_cp.c:1192
 #, 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:1207
+#: src/fs/gnunet-service-fs_cp.c:1214
 #, 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:1267
+#: src/fs/gnunet-service-fs_cp.c:1274
 #, 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:1293
+#: src/fs/gnunet-service-fs_cp.c:1300
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1322
+#: src/fs/gnunet-service-fs_cp.c:1329
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1687
+#: src/fs/gnunet-service-fs_cp.c:1685
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -2933,8 +3023,8 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:362
-#: src/fs/gnunet-service-fs_lc.c:488
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
+#: src/fs/gnunet-service-fs_lc.c:490
 #, fuzzy
 msgid "# client searches active"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
@@ -2944,12 +3034,12 @@
 msgid "# replies received for local clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/fs/gnunet-service-fs_lc.c:321
+#: src/fs/gnunet-service-fs_lc.c:323
 #, fuzzy
 msgid "# client searches received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs_lc.c:356
+#: src/fs/gnunet-service-fs_lc.c:358
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2987,8 +3077,8 @@
 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:681
-#: src/fs/gnunet-service-fs_pe.c:748
+#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:684
+#: src/fs/gnunet-service-fs_pe.c:751
 msgid "# query plan entries"
 msgstr ""
 
@@ -2997,105 +3087,105 @@
 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:616
+#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:618
 #, 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:779
+#: src/fs/gnunet-service-fs_pr.c:781
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:808
+#: src/fs/gnunet-service-fs_pr.c:810
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:822
+#: src/fs/gnunet-service-fs_pr.c:824
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:835
+#: src/fs/gnunet-service-fs_pr.c:837
 #, 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:953
+#: src/fs/gnunet-service-fs_pr.c:955
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:980
+#: src/fs/gnunet-service-fs_pr.c:982
 #, 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:1015
+#: src/fs/gnunet-service-fs_pr.c:1017
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1106
+#: src/fs/gnunet-service-fs_pr.c:1108
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1127
+#: src/fs/gnunet-service-fs_pr.c:1129
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1174
+#: src/fs/gnunet-service-fs_pr.c:1176
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1190
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1197
+#: src/fs/gnunet-service-fs_pr.c:1199
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1213
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1224
+#: src/fs/gnunet-service-fs_pr.c:1226
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1237
+#: src/fs/gnunet-service-fs_pr.c:1239
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1244
 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:1271 src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1449
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1327
+#: src/fs/gnunet-service-fs_pr.c:1329
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1340
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1426
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1510
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:1601 src/fs/gnunet-service-fs_pr.c:1610
+#: src/fs/gnunet-service-fs_pr.c:1603 src/fs/gnunet-service-fs_pr.c:1612
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
@@ -3134,41 +3224,46 @@
 msgid "Could not start unindex operation.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/fs/gnunet-unindex.c:176
+#: src/fs/gnunet-unindex.c:180
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/plugin_block_fs.c:131
+#: src/fs/plugin_block_fs.c:130
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:191
+#: src/gns/gnunet-gns.c:267
+#, fuzzy, c-format
+msgid "Key file `%s' for private zone does not exist!\n"
+msgstr "đặt số trình nền cần khởi chạy"
+
+#: src/gns/gnunet-gns.c:289
 #, fuzzy
 msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:232
+#: src/gns/gnunet-gns.c:341
 msgid "try to shorten a given GNS name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:235
+#: src/gns/gnunet-gns.c:344
 msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:347
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:241
+#: src/gns/gnunet-gns.c:350
 #, fuzzy
 msgid "Specify the type of the record lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:244
+#: src/gns/gnunet-gns.c:353
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:255
+#: src/gns/gnunet-gns.c:367
 msgid "GNUnet GNS access tool"
 msgstr ""
 
@@ -3202,40 +3297,58 @@
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:725 src/gns/gnunet-gns-fcfsd.c:737
+#: src/gns/gnunet-gns-fcfsd.c:550
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:558
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:741 src/gns/gnunet-gns-fcfsd.c:753
 #, fuzzy, c-format
 msgid "Option `%s' not specified in configuration section `%s'\n"
 msgstr ""
 "Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:747 src/namestore/gnunet-namestore.c:299
+#: src/gns/gnunet-gns-fcfsd.c:763 src/namestore/gnunet-namestore.c:365
 #, fuzzy
 msgid "Failed to read or create private zone key\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:757 src/namestore/gnunet-namestore.c:310
+#: src/gns/gnunet-gns-fcfsd.c:773 src/namestore/gnunet-namestore.c:376
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
+#: src/gns/gnunet-gns-fcfsd.c:789 src/gns/gnunet-gns-proxy.c:2667
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:804
+#: src/gns/gnunet-gns-fcfsd.c:823
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-lookup.c:210
-msgid "Issue a request to the GNUnet Naming System, prints results."
-msgstr ""
+#: src/gns/gnunet-gns-proxy.c:2300
+#, 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:800
+#: src/gns/gnunet-gns-proxy.c:2329
+#, 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:3328
 msgid "listen on specified port"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:811
+#: src/gns/gnunet-gns-proxy.c:3331
+msgid "pem file to use as CA"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3346
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3300,7 +3413,7 @@
 msgid "provide a hostlist server"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
+#: src/hostlist/gnunet-daemon-hostlist.c:344
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3617,21 +3730,21 @@
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1095
-#: src/template/gnunet-template.c:68
+#: src/integration-tests/connection_watchdog.c:1099
+#: src/template/gnunet-template.c:71
 msgid "help text"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4590 src/mesh/gnunet-service-mesh_new.c:4618
+#: src/mesh/gnunet-service-mesh.c:5904
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4784 src/mesh/gnunet-service-mesh_new.c:4812
+#: src/mesh/gnunet-service-mesh.c:6116
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/mesh/gnunet-service-mesh.c:4793 src/mesh/gnunet-service-mesh_new.c:4821
+#: src/mesh/gnunet-service-mesh.c:6125
 #, 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"
@@ -3646,195 +3759,239 @@
 msgid "Could not access file `%s': %s\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/namestore/gnunet-namestore.c:157
+#: src/namestore/gnunet-namestore.c:212
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:183
+#: src/namestore/gnunet-namestore.c:243
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:239
+#: src/namestore/gnunet-namestore.c:304
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:276
-#, c-format
-msgid "Option `%s' not given, but I need a zone key file!\n"
+#: src/namestore/gnunet-namestore.c:320
+msgid "for at least"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:281
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
+#: src/namestore/gnunet-namestore.c:321
+msgid "until"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:291
+#: src/namestore/gnunet-namestore.c:357
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:321
+#: src/namestore/gnunet-namestore.c:387
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/gnunet-namestore.c:328 src/namestore/gnunet-namestore.c:350
-#: src/namestore/gnunet-namestore.c:374 src/namestore/gnunet-namestore.c:384
-#: src/namestore/gnunet-namestore.c:409
+#: 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
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/namestore/gnunet-namestore.c:329 src/namestore/gnunet-namestore.c:351
+#: src/namestore/gnunet-namestore.c:396 src/namestore/gnunet-namestore.c:420
 msgid "add/del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:409
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:366
+#: src/namestore/gnunet-namestore.c:447
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:375 src/namestore/gnunet-namestore.c:385
+#: src/namestore/gnunet-namestore.c:456
+#, 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
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:410
+#: src/namestore/gnunet-namestore.c:497
+#, fuzzy, c-format
+msgid "No valid expiration time for operation `%s'\n"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#: src/namestore/gnunet-namestore.c:520
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:462
+#: src/namestore/gnunet-namestore.c:570
+#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Dữ liệu nhập không hợp lệ.\n"
+
+#: src/namestore/gnunet-namestore.c:611 src/transport/gnunet-transport.c:618
+#, fuzzy, c-format
+msgid "Service `%s' is not running\n"
+msgstr "« %s » không phải là một tập tin.\n"
+
+#: src/namestore/gnunet-namestore.c:622
+#, c-format
+msgid "Option `%s' not given, but I need a zone key file!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:627
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/namestore/gnunet-namestore.c:679
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:682
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:468
+#: src/namestore/gnunet-namestore.c:685
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:471
+#: src/namestore/gnunet-namestore.c:688
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:474
+#: src/namestore/gnunet-namestore.c:691
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:477
+#: src/namestore/gnunet-namestore.c:694
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:480
+#: src/namestore/gnunet-namestore.c:697
+msgid "URI to import into our zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:700
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:483
+#: src/namestore/gnunet-namestore.c:703
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:486
+#: src/namestore/gnunet-namestore.c:706
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:489
+#: src/namestore/gnunet-namestore.c:709
 #, fuzzy
 msgid "filename with the zone key"
 msgstr "tên tập tin"
 
-#: src/namestore/gnunet-namestore.c:500
+#: src/namestore/gnunet-namestore.c:720
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
 
-#: src/namestore/gnunet-service-namestore.c:143
-#, c-format
-msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
-msgstr ""
+#: src/namestore/gnunet-service-namestore.c:242
+#: src/namestore/gnunet-service-namestore.c:258
+#, fuzzy, c-format
+msgid "Failed to write zone key to file `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/namestore/gnunet-service-namestore.c:154
-#, c-format
-msgid "File zone `%s' containing this key already exists\n"
+#: src/namestore/gnunet-service-namestore.c:244
+msgid "file exists but reading key failed"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:160
-#, c-format
-msgid ""
-"File zone `%s' but different zone key already exists, failed to write! \n"
-msgstr ""
+#: src/namestore/gnunet-service-namestore.c:260
+#, fuzzy
+msgid "file exists with different key"
+msgstr "tên tập tin"
 
-#: src/namestore/gnunet-service-namestore.c:198
+#: src/namestore/gnunet-service-namestore.c:1519
+#, fuzzy
+msgid "Failed to find record to remove\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/namestore/gnunet-service-namestore.c:2133
 #, fuzzy, c-format
-msgid "Stored zonekey for zone `%s' in file `%s'\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+msgid "Could not parse zone key file `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/namestore/gnunet-service-namestore.c:1909
+#: src/namestore/gnunet-service-namestore.c:2223
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:1918
+#: src/namestore/gnunet-service-namestore.c:2233
 #, c-format
 msgid "Creating directory `%s' for zone files failed!\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:315 src/namestore/namestore_api.c:353
-msgid "Namestore added record successfully"
-msgstr ""
-
-#: src/namestore/namestore_api.c:323
+#: src/namestore/namestore_api.c:345
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/namestore/namestore_api.c:361
-msgid "Namestore record already existed"
-msgstr ""
-
-#: src/namestore/namestore_api.c:368
+#: src/namestore/namestore_api.c:371
 msgid "Namestore failed to add record\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:401
-#, fuzzy
-msgid "Namestore removed record successfully"
-msgstr "Dịch vụ GNUnet đã được cài đặt.\n"
-
-#: src/namestore/namestore_api.c:408
-msgid "No records for entry"
-msgstr ""
-
 #: src/namestore/namestore_api.c:415
 #, fuzzy
-msgid "Could not find record to remove"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/namestore/namestore_api.c:422
-#, fuzzy
 msgid "Failed to create new signature"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namestore/namestore_api.c:429
+#: src/namestore/namestore_api.c:419
 #, fuzzy
 msgid "Failed to put new set of records in database"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
+#: src/namestore/namestore_api.c:423
+#, fuzzy
+msgid "Failed to remove records from database"
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
+
+#: src/namestore/namestore_api.c:427
+#, fuzzy
+msgid "Failed to access database"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/namestore/namestore_api.c:431
+#, fuzzy
+msgid "unknown internal error in namestore"
+msgstr "=\tLỗi đọc thư mục.\n"
+
+#: src/namestore/namestore_api.c:436
+msgid "Protocol error"
+msgstr ""
+
+#: src/namestore/plugin_namestore_postgres.c:95
+#, fuzzy
+msgid "Failed to create indices\n"
+msgstr "Không thể tạo miền tên.\n"
+
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:318
+#: src/nat/gnunet-nat-server.c:321
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
@@ -3879,7 +4036,7 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:928
+#: src/nse/gnunet-nse-profiler.c:915
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
@@ -3908,16 +4065,16 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:203
+#: src/peerinfo/gnunet-service-peerinfo.c:228
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:229
+#: src/peerinfo/gnunet-service-peerinfo.c:267
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:254
+#: src/peerinfo/gnunet-service-peerinfo.c:292
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -3925,42 +4082,42 @@
 "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
 "bỏ.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:353
+#: src/peerinfo/gnunet-service-peerinfo.c:414
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:710
+#: src/peerinfo/gnunet-service-peerinfo.c:800
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:238
+#: src/peerinfo/peerinfo_api.c:239
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:358
+#: src/peerinfo/peerinfo_api.c:359
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/peerinfo_api.c:505
+#: src/peerinfo/peerinfo_api.c:509
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:531 src/peerinfo/peerinfo_api.c:550
-#: src/peerinfo/peerinfo_api.c:565 src/peerinfo/peerinfo_api.c:576
-#: src/peerinfo/peerinfo_api.c:587
+#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
+#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
+#: src/peerinfo/peerinfo_api.c:606
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:663
+#: src/peerinfo/peerinfo_api.c:681
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -4020,11 +4177,6 @@
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:875
-#, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "Dữ liệu nhập không hợp lệ.\n"
-
 #: src/peerinfo-tool/gnunet-peerinfo.c:899
 #, c-format
 msgid "I am peer `%s'.\n"
@@ -4055,7 +4207,7 @@
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:957
+#: src/peerinfo-tool/gnunet-peerinfo.c:961
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -4150,7 +4302,7 @@
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/pt/gnunet-daemon-pt.c:973
+#: src/pt/gnunet-daemon-pt.c:976
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -4164,42 +4316,42 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:122
+#: src/statistics/gnunet-statistics.c:120
 #, 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:199
+#: src/statistics/gnunet-statistics.c:193
 #, fuzzy, c-format
 msgid "No subsystem or name given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/statistics/gnunet-statistics.c:207
+#: src/statistics/gnunet-statistics.c:201
 #, 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:227
+#: src/statistics/gnunet-statistics.c:221
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:230
+#: src/statistics/gnunet-statistics.c:224
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:233
+#: src/statistics/gnunet-statistics.c:227
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:236
+#: src/statistics/gnunet-statistics.c:230
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:239
+#: src/statistics/gnunet-statistics.c:233
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:246
+#: src/statistics/gnunet-statistics.c:244
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
@@ -4214,215 +4366,228 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:157
-#, fuzzy
-msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+#: src/testbed/testbed_api.c:204
+#, 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/testing/gnunet-testing.c:131
+#, fuzzy, c-format
+msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/gnunet-testing.c:159
-#, c-format
-msgid "Specified hostkey file `%s' not found!\n"
-msgstr ""
-
-#: src/testing/gnunet-testing.c:273
+#: src/testing/gnunet-testing.c:202
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/testing/gnunet-testing.c:275
-msgid "create hostkey files from pre-computed hostkey list"
+#: src/testing/gnunet-testing.c:204
+msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:277
-msgid "host key file"
-msgstr ""
-
-#: src/testing/gnunet-testing.c:279
+#: src/testing/gnunet-testing.c:206
 #, fuzzy
-msgid "number of unique configuration files or hostkeys to create"
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
 msgstr "in ra đầu ra tiêu chuẩn một giá trị từ tập tin cấu hình"
 
-#: src/testing/gnunet-testing.c:281
+#: src/testing/gnunet-testing.c:208
 #, fuzzy
 msgid "configuration template"
 msgstr "Cấu hình đã được lưu."
 
-#: src/testing/gnunet-testing.c:287
+#: src/testing/gnunet-testing.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/helper.c:56
+#: src/testing/gnunet-testing-run-service.c:129
+#, c-format
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr ""
+
+#: src/testing/gnunet-testing-run-service.c:186
 #, fuzzy
+msgid "name of the template configuration file to use (optional)"
+msgstr "Tập tin cấu hình gnunetd có đường dẫn nào?"
+
+#: src/testing/gnunet-testing-run-service.c:189
+msgid "name of the service to run"
+msgstr ""
+
+#: src/testing_old/helper.c:56
+#, fuzzy
 msgid "Peer is lacking HOSTKEY configuration setting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/testing/helper.c:64
+#: src/testing_old/helper.c:64
 #, fuzzy
 msgid "Could not access hostkey.\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testing/testing.c:200
+#: src/testing_old/testing.c:200
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:214 src/testing/testing.c:798
+#: src/testing_old/testing.c:214 src/testing_old/testing.c:798
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
 
-#: src/testing/testing.c:237
+#: src/testing_old/testing.c:237
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:238
+#: src/testing_old/testing.c:238
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/testing/testing.c:286
+#: src/testing_old/testing.c:286
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:293
+#: src/testing_old/testing.c:293
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:294 src/testing/testing.c:471
+#: src/testing_old/testing.c:294 src/testing_old/testing.c:471
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:354
+#: src/testing_old/testing.c:354
 #, fuzzy, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
 
-#: src/testing/testing.c:358
+#: src/testing_old/testing.c:358
 #, fuzzy
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
 
-#: src/testing/testing.c:368
+#: src/testing_old/testing.c:368
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/testing/testing.c:400
+#: src/testing_old/testing.c:400
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:463
+#: src/testing_old/testing.c:463
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/testing/testing.c:470
+#: src/testing_old/testing.c:470
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Lỗi dừng chạy gnunet-auto-share.\n"
 
-#: src/testing/testing.c:493 src/testing/testing.c:600
+#: src/testing_old/testing.c:493 src/testing_old/testing.c:600
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:494 src/testing/testing.c:601
-#: src/testing/testing.c:621
+#: 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/testing.c:570
+#: src/testing_old/testing.c:570
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:620
+#: src/testing_old/testing.c:620
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:643 src/testing/testing.c:675
+#: 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/testing.c:658 src/testing/testing.c:713
+#: src/testing_old/testing.c:658 src/testing_old/testing.c:713
 #, fuzzy
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
 
-#: src/testing/testing.c:786
+#: src/testing_old/testing.c:786
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:948
+#: src/testing_old/testing.c:948
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
+#: src/testing_old/testing.c:1207 src/testing_old/testing_group.c:6155
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/testing/testing.c:1292 src/testing/testing.c:1359
+#: src/testing_old/testing.c:1292 src/testing_old/testing.c:1359
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/testing/testing.c:1448
+#: src/testing_old/testing.c:1448
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/testing/testing.c:1601
+#: src/testing_old/testing.c:1601
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1609
+#: src/testing_old/testing.c:1609
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Lỗi lưu cấu hình."
 
-#: src/testing/testing.c:1636
+#: src/testing_old/testing.c:1636
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/testing/testing.c:1639
+#: src/testing_old/testing.c:1639
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Lỗi lưu cấu hình."
 
-#: src/testing/testing.c:1794
+#: src/testing_old/testing.c:1794
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/testing/testing.c:1922
+#: src/testing_old/testing.c:1922
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Lỗi nạp dịch vụ sqstore. Hãy kiểm tra lại cấu hình.\n"
 
-#: src/testing/testing.c:2145
+#: src/testing_old/testing.c:2145
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
-#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
-#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
-#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
+#: src/testing_old/testing_group.c:1895 src/testing_old/testing_group.c:1907
+#: src/testing_old/testing_group.c:2009 src/testing_old/testing_group.c:2066
+#: src/testing_old/testing_group.c:2153 src/testing_old/testing_group.c:2173
+#: src/testing_old/testing_group.c:2303
+#: src/testing_old/testing_peergroup.c:950
 #, fuzzy, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/testing/testing_group.c:2160
+#: src/testing_old/testing_group.c:2161
 #, fuzzy, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
+#: 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 "
@@ -4430,87 +4595,78 @@
 msgstr ""
 "Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
 
-#: src/testing/testing_group.c:3957
+#: src/testing_old/testing_group.c:3958
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5226
+#: src/testing_old/testing_group.c:5227
 #, fuzzy
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/testing/testing_group.c:5944 src/transport/transport-testing.c:636
+#: src/testing_old/testing_group.c:5945
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/testing_group.c:6011
+#: src/testing_old/testing_group.c:6012
 #, fuzzy, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/testing/testing_new.c:169
-msgid "tmppath cannot be NULL\n"
-msgstr ""
-
-#: src/testing/testing_new.c:356
+#: src/testing/testing.c:188
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing_new.c:365
-#, fuzzy, c-format
-msgid "Could not open hostkeys file: %s\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#: src/testing/testing_new.c:380
+#: src/testing/testing.c:204
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing_new.c:437
+#: src/testing/testing.c:468
 #, 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_new.c:446
+#: src/testing/testing.c:477
 #, 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_new.c:680
+#: src/testing/testing.c:788
 #, 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_new.c:691
+#: src/testing/testing.c:799
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing_new.c:704
+#: src/testing/testing.c:813
 #, 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_new.c:734
+#: src/testing/testing.c:846
 #, 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_new.c:751
+#: src/testing/testing.c:864
 #, 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_new.c:791
+#: src/testing/testing.c:925
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing_new.c:959
+#: src/testing/testing.c:1088
 #, 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 »:"
@@ -4613,7 +4769,7 @@
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại bỏ"
 
-#: src/topology/gnunet-daemon-topology.c:1363
+#: src/topology/gnunet-daemon-topology.c:1366
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -4656,30 +4812,30 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:747
+#: src/transport/gnunet-service-transport_blacklist.c:751
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:163
+#: src/transport/gnunet-service-transport.c:167
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:237
+#: src/transport/gnunet-service-transport.c:242
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:284
+#: src/transport/gnunet-service-transport.c:289
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:582
+#: src/transport/gnunet-service-transport.c:590
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:591
+#: src/transport/gnunet-service-transport.c:599
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -4693,16 +4849,16 @@
 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:503
+#: src/transport/gnunet-service-transport_clients.c:509
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:631
+#: src/transport/gnunet-service-transport_clients.c:637
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:682
+#: src/transport/gnunet-service-transport_clients.c:688
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -4711,117 +4867,117 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1032
+#: src/transport/gnunet-service-transport_neighbours.c:1057
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1148
-#: src/transport/gnunet-service-transport_neighbours.c:1482
+#: src/transport/gnunet-service-transport_neighbours.c:1174
+#: src/transport/gnunet-service-transport_neighbours.c:1511
 #, 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:1153
+#: src/transport/gnunet-service-transport_neighbours.c:1179
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1158
+#: src/transport/gnunet-service-transport_neighbours.c:1184
 #, 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:1215
+#: src/transport/gnunet-service-transport_neighbours.c:1241
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1254
+#: src/transport/gnunet-service-transport_neighbours.c:1283
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1278
+#: src/transport/gnunet-service-transport_neighbours.c:1307
 #, 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:1286
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 #, 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:1323
+#: src/transport/gnunet-service-transport_neighbours.c:1352
 #, 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:1332
+#: src/transport/gnunet-service-transport_neighbours.c:1361
 #, 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:1388
+#: src/transport/gnunet-service-transport_neighbours.c:1417
 #, 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:1422
+#: src/transport/gnunet-service-transport_neighbours.c:1451
 #, 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:1438
+#: src/transport/gnunet-service-transport_neighbours.c:1467
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2544
+#: src/transport/gnunet-service-transport_neighbours.c:2613
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2559
-#: src/transport/gnunet-service-transport_neighbours.c:2585
+#: src/transport/gnunet-service-transport_neighbours.c:2628
+#: src/transport/gnunet-service-transport_neighbours.c:2662
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2675
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2627
+#: src/transport/gnunet-service-transport_neighbours.c:2708
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2807
+#: src/transport/gnunet-service-transport_neighbours.c:2892
 #, 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:2856
+#: src/transport/gnunet-service-transport_neighbours.c:2947
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2870
+#: src/transport/gnunet-service-transport_neighbours.c:2961
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2901
+#: src/transport/gnunet-service-transport_neighbours.c:2992
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2912
+#: src/transport/gnunet-service-transport_neighbours.c:3003
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2943
+#: src/transport/gnunet-service-transport_neighbours.c:3034
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3020
+#: src/transport/gnunet-service-transport_neighbours.c:3129
 #, 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"
@@ -4830,214 +4986,202 @@
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:414
+#: src/transport/gnunet-service-transport_validation.c:415
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:463
+#: src/transport/gnunet-service-transport_validation.c:464
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:512
+#: src/transport/gnunet-service-transport_validation.c:513
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# các thông báo PONG nhập thô được gửi"
 
-#: src/transport/gnunet-service-transport_validation.c:570
+#: src/transport/gnunet-service-transport_validation.c:571
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:805
+#: src/transport/gnunet-service-transport_validation.c:807
 #, 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:840
+#: src/transport/gnunet-service-transport_validation.c:872
 #, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:924
+#: src/transport/gnunet-service-transport_validation.c:989
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/transport/gnunet-service-transport_validation.c:998
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1055
+#: src/transport/gnunet-service-transport_validation.c:1120
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1080
+#: src/transport/gnunet-service-transport_validation.c:1145
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1136
+#: src/transport/gnunet-service-transport_validation.c:1199
 #, 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"
 
-#: src/transport/gnunet-transport.c:260
+#: src/transport/gnunet-transport.c:265
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:273
+#: src/transport/gnunet-transport.c:278
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:323
+#: src/transport/gnunet-transport.c:328
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:330
+#: 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:363
+#: src/transport/gnunet-transport.c:374
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:383
+#: src/transport/gnunet-transport.c:394
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:414
+#: src/transport/gnunet-transport.c:426
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:443
+#: src/transport/gnunet-transport.c:506
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:466
+#: src/transport/gnunet-transport.c:529
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:473
+#: src/transport/gnunet-transport.c:536
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:501
+#: src/transport/gnunet-transport.c:564
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/gnunet-transport.c:569
+#: src/transport/gnunet-transport.c:633
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/gnunet-transport.c:618
+#: src/transport/gnunet-transport.c:716
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:719
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:624
+#: src/transport/gnunet-transport.c:722
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:627
+#: src/transport/gnunet-transport.c:728
 #, fuzzy
-msgid "provide information about all current connections (continuously)"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
-#: src/transport/gnunet-transport.c:630
-#, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:634
+#: src/transport/gnunet-transport.c:732
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:637
+#: src/transport/gnunet-transport.c:735
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:645
+#: src/transport/gnunet-transport.c:746
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:1100
+#: src/transport/plugin_transport_http.c:1119
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1149
+#: src/transport/plugin_transport_http.c:1168
 #, 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:1174 src/util/service.c:1036
+#: src/transport/plugin_transport_http.c:1200 src/util/service.c:1051
 #, 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:1191 src/util/service.c:1053
+#: src/transport/plugin_transport_http.c:1217 src/util/service.c:1068
 #, 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:1296
+#: src/transport/plugin_transport_http.c:1322
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1309
-#, c-format
-msgid "FREEING %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1386
+#: src/transport/plugin_transport_http.c:1407
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1399
+#: src/transport/plugin_transport_http.c:1420
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/transport/plugin_transport_http.c:1410
+#: src/transport/plugin_transport_http.c:1431
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1430
+#: src/transport/plugin_transport_http.c:1451
 #, 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:1460
+#: src/transport/plugin_transport_http.c:1481
 #, 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:624
+#: src/transport/plugin_transport_http_client.c:621
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -5094,91 +5238,92 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:591
+#: src/transport/plugin_transport_tcp.c:590
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:767
-#: 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:1086
-#: src/transport/plugin_transport_tcp.c:1103
+#: src/transport/plugin_transport_tcp.c:766
+#: src/transport/plugin_transport_tcp.c:855
+#: src/transport/plugin_transport_tcp.c:905
+#: src/transport/plugin_transport_tcp.c:991
+#: src/transport/plugin_transport_tcp.c:1129
+#: src/transport/plugin_transport_tcp.c:1146
 #, 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:1761
-#: src/transport/plugin_transport_tcp.c:2390
+#: src/transport/plugin_transport_tcp.c:773
+#: src/transport/plugin_transport_tcp.c:962
+#: src/transport/plugin_transport_tcp.c:1806
+#: src/transport/plugin_transport_tcp.c:2423
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:860
+#: src/transport/plugin_transport_tcp.c:859
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:908
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:996
+#: src/transport/plugin_transport_tcp.c:995
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1290
+#: src/transport/plugin_transport_tcp.c:1335
 #, 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:1401
+#: src/transport/plugin_transport_tcp.c:1446
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1802
+#: src/transport/plugin_transport_tcp.c:1847
 #, 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:1973
+#: src/transport/plugin_transport_tcp.c:2018
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2043
+#: src/transport/plugin_transport_tcp.c:2088
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2279 src/util/service.c:940
+#: src/transport/plugin_transport_tcp.c:2312 src/util/service.c:946
+#: src/util/service.c:952
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2293
+#: src/transport/plugin_transport_tcp.c:2326
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2355
+#: src/transport/plugin_transport_tcp.c:2388
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2378
+#: src/transport/plugin_transport_tcp.c:2411
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2382
+#: src/transport/plugin_transport_tcp.c:2415
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:2419
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5193,129 +5338,142 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:367
+#: src/transport/plugin_transport_udp_broadcasting.c:392
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1894
+#: src/transport/plugin_transport_udp.c:1903
 #, c-format
 msgid ""
-"UDP could not message to `%s': `%s'. Please check your network configuration "
-"and disable IPv6 if your connection does not have a global IPv6 address\n"
+"UDP could not transmit message to `%s': Network seems down, please check "
+"your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2138
+#: src/transport/plugin_transport_udp.c:1917
+#, c-format
+msgid ""
+"UDP could not transmit message to `%s': Please check your network "
+"configuration and disable IPv6 if your connection does not have a global "
+"IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2162
 #, 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:2306
+#: src/transport/plugin_transport_udp.c:2328
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2349
+#: src/transport/plugin_transport_udp.c:2371
 #, 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:1356
+#: src/transport/plugin_transport_unix.c:1351
 #, 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:561
+#: src/transport/plugin_transport_wlan.c:560
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:580
+#: src/transport/plugin_transport_wlan.c:579
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:626
-#: src/transport/plugin_transport_wlan.c:676
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:625
+#: src/transport/plugin_transport_wlan.c:675
+#: src/transport/plugin_transport_wlan.c:1695
 #, 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:748
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_wlan.c:767
+#: src/transport/plugin_transport_wlan.c:766
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:867
-#: src/transport/plugin_transport_wlan.c:948
-#: src/transport/plugin_transport_wlan.c:1698
+#: src/transport/plugin_transport_wlan.c:866
+#: src/transport/plugin_transport_wlan.c:947
+#: src/transport/plugin_transport_wlan.c:1697
 #, 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:1119
+#: src/transport/plugin_transport_wlan.c:1118
 #, 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:1140
+#: src/transport/plugin_transport_wlan.c:1139
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:1150
+#: src/transport/plugin_transport_wlan.c:1149
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1207
+#: src/transport/plugin_transport_wlan.c:1206
 #, 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:1306
+#: src/transport/plugin_transport_wlan.c:1305
 #, 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:1341
+#: src/transport/plugin_transport_wlan.c:1340
 #, 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:1402
+#: src/transport/plugin_transport_wlan.c:1401
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1511
+#: src/transport/plugin_transport_wlan.c:1510
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1668
+#: src/transport/plugin_transport_wlan.c:1667
 #, fuzzy, c-format
 msgid "Invalid configuration option `%s' in section `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/transport/plugin_transport_wlan.c:1677
+#: src/transport/plugin_transport_wlan.c:1676
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1687
+#: src/transport/plugin_transport_wlan.c:1686
 #, fuzzy, c-format
 msgid "Missing configuration option `%s' in section `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/transport/transport_api.c:570
+#: src/transport/transport_api.c:575
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
 
+#: src/transport/transport-testing.c:589
+#, fuzzy
+msgid "Failed to initialize testing library!\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
 #: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
@@ -5345,89 +5503,94 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:359
+#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:982
 #, 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
+#, fuzzy, c-format
+msgid "Using `%s' instead\n"
+msgstr "%s: tùy chọn « %s » là mơ hồ\n"
+
+#: src/util/client.c:369
+#, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:367
+#: src/util/client.c:377
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:685
+#: src/util/client.c:695
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:740 src/util/service.c:970
+#: src/util/client.c:895
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:882
-#, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:896
+#: src/util/client.c:909
 #, 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:1149
+#: src/util/client.c:1162
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:890
+#: src/util/common_logging.c:258 src/util/common_logging.c:1008
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:888
+#: src/util/common_logging.c:260 src/util/common_logging.c:1006
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:886
+#: src/util/common_logging.c:262 src/util/common_logging.c:1004
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:884
+#: src/util/common_logging.c:264 src/util/common_logging.c:1002
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:892
+#: src/util/common_logging.c:266 src/util/common_logging.c:1010
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:610
+#: src/util/common_logging.c:395
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/common_logging.c:725
+#: src/util/common_logging.c:819
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
 
-#: src/util/common_logging.c:893
+#: src/util/common_logging.c:1011
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:992
+#: src/util/common_logging.c:1113
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1030
+#: src/util/common_logging.c:1151
 msgid "invalid address"
 msgstr ""
 
-#: src/util/configuration.c:244
+#: src/util/configuration.c:259
 #, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgid "Syntax error while deserializing operation at line %u\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/util/configuration.c:816
+#: src/util/configuration.c:938
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -5474,73 +5637,87 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:280
+#: src/util/crypto_random.c:284
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:309
+#: src/util/crypto_random.c:313
 #, 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:661 src/util/crypto_rsa.c:708
+#: src/util/crypto_rsa.c:635 src/util/crypto_rsa.c:651
+#: src/util/crypto_rsa.c:833
 #, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %s...\n"
+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:731 src/util/crypto_rsa.c:778
+#, 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:666
+#: src/util/crypto_rsa.c:736
 #, 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:684
+#: src/util/crypto_rsa.c:754
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
+#: 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:743
+#: src/util/crypto_rsa.c:813
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:763
-#, 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:781
+#: src/util/crypto_rsa.c:851
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1032
+#: src/util/crypto_rsa.c:926
+msgid "interrupted by shutdown"
+msgstr ""
+
+#: src/util/crypto_rsa.c:935
+#, fuzzy
+msgid "internal error"
+msgstr "Lỗi VR."
+
+#: src/util/crypto_rsa.c:944 src/util/crypto_rsa.c:951
+msgid "gnunet-rsa failed"
+msgstr ""
+
+#: src/util/crypto_rsa.c:1332
 #, 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:498
+#: src/util/disk.c:571
 #, 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:1062
+#: src/util/disk.c:1135
 #, 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:1416 src/util/service.c:1650
+#: src/util/disk.c:1489 src/util/service.c:1665
 #, 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:1734
+#: src/util/disk.c:1861
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -5623,28 +5800,28 @@
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:154
+#: src/util/gnunet-resolver.c:158
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:64
+#: src/util/gnunet-rsa.c:104
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:112
+#: src/util/gnunet-rsa.c:154
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:115
+#: src/util/gnunet-rsa.c:157
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:118
+#: src/util/gnunet-rsa.c:160
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:124
+#: src/util/gnunet-rsa.c:170
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5659,70 +5836,65 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/util/helper.c:244
+#: src/util/helper.c:254
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/helper.c:259
+#: src/util/helper.c:274
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:269
+#: src/util/helper.c:290
 #, 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:278
+#: src/util/helper.c:299
 #, 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:310
+#: src/util/helper.c:337
 #, fuzzy, c-format
 msgid "Starting HELPER process `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/util/helper.c:440
+#: src/util/helper.c:476
 #, 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:1200
+#: src/util/network.c:99
 #, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr ""
+
+#: src/util/network.c:1278
+#, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:299
+#: src/util/os_installation.c:329
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:526
 #, 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"
 
-#: src/util/os_installation.c:492
+#: src/util/os_priority.c:302
 #, fuzzy, c-format
-msgid "access (%s, X_OK) failed: %s\n"
-msgstr "SMTP: « %s » bị lỗi: %s\n"
-
-#: src/util/os_installation.c:507
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "SMTP: « %s » bị lỗi: %s\n"
-
-#: src/util/os_priority.c:305
-#, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/os_priority.c:306
+#: src/util/os_priority.c:303
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -5791,143 +5963,143 @@
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:483
+#: src/util/server.c:468
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/server.c:492
+#: src/util/server.c:477
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:497
+#: src/util/server.c:488
 #, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
+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:827
+#: src/util/server.c:819
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
-#: src/util/service.c:225 src/util/service.c:232
+#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
+#: src/util/service.c:232 src/util/service.c:239
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/service.c:188
+#: src/util/service.c:195
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/util/service.c:281
+#: src/util/service.c:288
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/service.c:313
+#: src/util/service.c:320
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/service.c:343
+#: src/util/service.c:350
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/service.c:698
+#: src/util/service.c:705
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:703
+#: src/util/service.c:710
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
 
-#: src/util/service.c:710
+#: src/util/service.c:717
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:765
+#: src/util/service.c:772
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:802
+#: src/util/service.c:809
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:920
+#: src/util/service.c:927
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:990
+#: src/util/service.c:1005
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1007
+#: src/util/service.c:1022
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1241
+#: src/util/service.c:1256
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1292 src/util/service.c:1310
+#: src/util/service.c:1307 src/util/service.c:1325
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1337
+#: src/util/service.c:1352
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1506
+#: src/util/service.c:1521
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1539
+#: src/util/service.c:1554
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
 
-#: src/util/service.c:1588
+#: src/util/service.c:1603
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1592
+#: src/util/service.c:1607
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1596
+#: src/util/service.c:1611
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1651
+#: src/util/service.c:1666
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1664
+#: src/util/service.c:1679
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
 
-#: src/util/service.c:1729
+#: src/util/service.c:1744
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5936,65 +6108,71 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/strings.c:144
+#: src/util/strings.c:145
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:334
+#: src/util/strings.c:385
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:481
+#: src/util/strings.c:534
 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:573
+#: src/util/strings.c:626
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:578
-msgid "eternity"
+#: src/util/strings.c:631
+msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:582
+#: src/util/strings.c:635
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:586
+#: src/util/strings.c:639
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:590
+#: src/util/strings.c:643
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:594
-msgid " days"
+#: src/util/strings.c:648
+#, fuzzy
+msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:618
+#: src/util/strings.c:650
+#, fuzzy
+msgid "days"
+msgstr " ngày"
+
+#: src/util/strings.c:674
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1012
+#: src/util/strings.c:1063
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1020
+#: src/util/strings.c:1071
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1026
+#: src/util/strings.c:1077
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1033
+#: src/util/strings.c:1084
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1042
+#: src/util/strings.c:1093
 #, 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"
@@ -6169,27 +6347,55 @@
 msgid "service is offered via UDP"
 msgstr "# các byte đã nhận qua UDP"
 
-#: src/vpn/gnunet-vpn.c:329
+#: src/vpn/gnunet-vpn.c:333
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:497 src/include/gnunet_common.h:502
-#: src/include/gnunet_common.h:508
+#: src/include/gnunet_common.h:507 src/include/gnunet_common.h:512
+#: src/include/gnunet_common.h:518
 #, 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:518
+#: src/include/gnunet_common.h:528
 #, 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:539 src/include/gnunet_common.h:546
+#: src/include/gnunet_common.h:549 src/include/gnunet_common.h:556
 #, 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 "Could not create namespace `%s'\n"
+#~ msgstr "Không thể tạo miền tên.\n"
+
+#, fuzzy
+#~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
+#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#, fuzzy
+#~ msgid "Namestore removed record successfully"
+#~ msgstr "Dịch vụ GNUnet đã được cài đặt.\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#, fuzzy
+#~ msgid "Could not open hostkeys file: %s\n"
+#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#, fuzzy
+#~ msgid "access (%s, X_OK) failed: %s\n"
+#~ msgstr "SMTP: « %s » bị lỗi: %s\n"
+
+#, fuzzy
+#~ msgid "stat (%s) failed: %s\n"
+#~ msgstr "SMTP: « %s » bị lỗi: %s\n"
+
+#, fuzzy
 #~ msgid "# Peers connected"
 #~ msgstr "# của các đồng đẳng đã kết nối"
 
@@ -6373,10 +6579,6 @@
 #~ msgstr "Dịch vụ đã bị xoá.\n"
 
 #, fuzzy
-#~ msgid "Unable to start service `%s': %s\n"
-#~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#, fuzzy
 #~ msgid "Unable to accept connection for service `%s': %s\n"
 #~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
@@ -7099,9 +7301,6 @@
 #~ msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 #~ msgstr "Xâm phạm khoảng đợi thời gian thực (%llu miligiây) tại %s:%u\n"
 
-#~ msgid "`%s' failed with error code %d: %s\n"
-#~ msgstr "« %s » thất bại với mã lỗi %d: %s\n"
-
 #~ msgid "Deadlock due to `%s'.\n"
 #~ msgstr "Bế tắc do « %s ».\n"
 
@@ -7613,9 +7812,6 @@
 #~ "đừng dùng libextractor để thêm các tham chiếu bổ sung vào mục nhập thư "
 #~ "mục và/hay tập tin công bố"
 
-#~ msgid "Automatically share a directory."
-#~ msgstr "Tự động chia sẻ một thư mục."
-
 #~ msgid "Unknown keyword type `%s' in metadata configuration\n"
 #~ msgstr "Không rõ kiểu từ khoá « %s » trong cấu hình siêu dữ liệu\n"
 
@@ -9544,9 +9740,6 @@
 #~ msgid "This is equivalent to the -H option.  The format is IP:PORT."
 #~ msgstr "Đây tương đương với tùy chọn « -H ». Định dạng là « IP:CỔNG »."
 
-#~ msgid "What is the path to the configuration file for gnunetd?"
-#~ msgstr "Tập tin cấu hình gnunetd có đường dẫn nào?"
-
 #~ msgid "This option is used when clients need to start gnunetd."
 #~ msgstr "Tùy chọn này dùng khi ứng dụng khách cần khởi chạy gnunetd."
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2012-07-20 16:57:42 UTC (rev 22805)
+++ gnunet/po/zh_CN.po  2012-07-20 17:34:01 UTC (rev 22806)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-06-02 19:10+0200\n"
+"POT-Creation-Date: 2012-07-20 19:29+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -20,170 +20,178 @@
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:349
+#: src/arm/arm_api.c:354
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/arm/arm_api.c:363
+#: src/arm/arm_api.c:368
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/arm/arm_api.c:432
+#: src/arm/arm_api.c:437
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:485
+#: src/arm/arm_api.c:490
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:486
+#: src/arm/arm_api.c:491
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:507
+#: 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:508
+#: 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:540
+#: src/arm/arm_api.c:547
 #, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/arm_api.c:612
+#: src/arm/arm_api.c:620
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:159
+#: src/arm/gnunet-arm.c:166
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:171
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:167
+#: src/arm/gnunet-arm.c:174
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:172
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:182
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:179
+#: src/arm/gnunet-arm.c:186
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:183
+#: src/arm/gnunet-arm.c:190
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:187
+#: src/arm/gnunet-arm.c:194
 msgid "Error communicating with ARM service.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:191
+#: src/arm/gnunet-arm.c:198
 msgid "Timeout communicating with ARM service.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:195
+#: src/arm/gnunet-arm.c:202
 msgid "Operation failed.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:199
+#: src/arm/gnunet-arm.c:206
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222
+#: src/arm/gnunet-arm.c:229
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
-#: src/arm/gnunet-arm.c:225
+#: src/arm/gnunet-arm.c:232
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:249
+#: src/arm/gnunet-arm.c:256
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
+#: src/arm/gnunet-arm.c:264 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:384
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:280
+#: src/arm/gnunet-arm.c:287
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:286
+#: src/arm/gnunet-arm.c:293
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:407
+#: src/arm/gnunet-arm.c:418
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:409
+#: src/arm/gnunet-arm.c:420
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:411
+#: src/arm/gnunet-arm.c:422
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:413
+#: src/arm/gnunet-arm.c:424
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:416
+#: src/arm/gnunet-arm.c:427
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:430
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:421
+#: src/arm/gnunet-arm.c:432
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:424
+#: src/arm/gnunet-arm.c:435
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:426
+#: src/arm/gnunet-arm.c:437
 msgid "List currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:439
+msgid "Don't let gnunet-service-arm inherit standard output"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:441
+msgid "Don't let gnunet-service-arm inherit standard error"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:455
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -282,6 +290,21 @@
 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/gnunet-ats.c:96
+#, fuzzy
+msgid "list information for all peers"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/ats/gnunet-ats.c:105
+#, fuzzy
+msgid "Print information about ATS state"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
 #: src/block/block.c:105
 #, fuzzy, c-format
 msgid "Loading block plugin `%s'\n"
@@ -526,45 +549,65 @@
 msgid "set the chat room to join"
 msgstr "设置要加入的聊天室"
 
-#: src/chat/gnunet-chat.c:742
+#: src/chat/gnunet-chat.c:746
 msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:267
+#: src/chat/gnunet-service-chat.c:266
 #, fuzzy
 msgid "Failed to queue a message notification\n"
 msgstr "保存配置失败。"
 
-#: src/chat/gnunet-service-chat.c:546
+#: src/chat/gnunet-service-chat.c:545
 #, fuzzy
 msgid "Failed to queue a join notification\n"
 msgstr "保存配置失败。"
 
-#: src/chat/gnunet-service-chat.c:729
+#: src/chat/gnunet-service-chat.c:728
 #, fuzzy
 msgid "Failed to queue a confirmation receipt\n"
 msgstr "保存配置失败。"
 
-#: src/chat/gnunet-service-chat.c:907
+#: src/chat/gnunet-service-chat.c:906
 #, fuzzy
 msgid "Failed to queue a leave notification\n"
 msgstr "保存配置失败。"
 
-#: src/core/core_api.c:786
+#: src/core/core_api.c:757
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
+#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:286
 #, c-format
 msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
+#: src/core/gnunet-core.c:118 src/core/gnunet-core.c:149
+#: src/transport/gnunet-transport.c:451 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
+#, fuzzy
+msgid "Connected to"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/core/gnunet-core.c:151 src/transport/gnunet-transport.c:479
+#, fuzzy
+msgid "Disconnected from"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:95
+#: src/core/gnunet-core.c:216 src/transport/gnunet-transport.c:725
+msgid "provide information about all current connections (continuously)"
+msgstr ""
+
+#: src/core/gnunet-core.c:227
 msgid "Print information about connected peers."
 msgstr ""
 
@@ -624,7 +667,7 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:810
+#: src/transport/gnunet-service-transport_validation.c:812
 msgid "# PING messages received"
 msgstr ""
 
@@ -648,7 +691,7 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1031
+#: src/transport/gnunet-service-transport_validation.c:1096
 msgid "# PONG messages received"
 msgstr ""
 
@@ -664,53 +707,53 @@
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1381
-#: src/core/gnunet-service-core_kx.c:1398
+#: src/core/gnunet-service-core_kx.c:1383
+#: src/core/gnunet-service-core_kx.c:1400
 msgid "# SET_KEY and PING messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1402
+#: src/core/gnunet-service-core_kx.c:1404
 msgid "# REKEY operations performed"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1537
+#: src/core/gnunet-service-core_kx.c:1539
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1577
-#: src/core/gnunet-service-core_kx.c:1602
+#: src/core/gnunet-service-core_kx.c:1579
+#: src/core/gnunet-service-core_kx.c:1604
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1589
+#: src/core/gnunet-service-core_kx.c:1591
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1628
 #, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1630
+#: src/core/gnunet-service-core_kx.c:1632
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1638
+#: src/core/gnunet-service-core_kx.c:1640
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1700
+#: src/core/gnunet-service-core_kx.c:1702
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/core/gnunet-service-core_kx.c:1708
+#: 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:1718 src/hostlist/hostlist-server.c:551
+#: 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:611
+#: src/transport/gnunet-service-transport.c:619
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -727,23 +770,23 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:418
+#: src/core/gnunet-service-core_neighbours.c:421
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-#: src/dht/gnunet-service-dht_neighbours.c:625
-#: src/dht/gnunet-service-dht_neighbours.c:683
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
+#: 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/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
-#: src/transport/gnunet-service-transport_neighbours.c:874
-#: src/transport/gnunet-service-transport_neighbours.c:1080
-#: src/transport/gnunet-service-transport_neighbours.c:1089
-#: src/transport/gnunet-service-transport_neighbours.c:2568
-#: src/transport/gnunet-service-transport_neighbours.c:2814
+#: src/transport/gnunet-service-transport_neighbours.c:890
+#: src/transport/gnunet-service-transport_neighbours.c:1106
+#: src/transport/gnunet-service-transport_neighbours.c:1115
+#: src/transport/gnunet-service-transport_neighbours.c:2637
+#: src/transport/gnunet-service-transport_neighbours.c:2899
 msgid "# peers connected"
 msgstr ""
 
@@ -803,9 +846,10 @@
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:525
-#: src/include/gnunet_common.h:532
+#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:535
+#: src/include/gnunet_common.h:542
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
@@ -1097,6 +1141,7 @@
 msgstr "发送消息失败。\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
+#: src/namestore/plugin_namestore_postgres.c:654
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1134,7 +1179,7 @@
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1198
-#: src/namestore/plugin_namestore_sqlite.c:829
+#: src/namestore/plugin_namestore_sqlite.c:834
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -1149,33 +1194,31 @@
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
-#: src/dht/gnunet-dht-put.c:192 src/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-put.c:192
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:182
+#: src/dht/gnunet-dht-get.c:204
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
-#: src/gns/gnunet-gns-lookup.c:185
 msgid "the type of data to look for"
 msgstr ""
 
 #: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
-#: src/gns/gnunet-gns-lookup.c:188
 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-download.c:271
-#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
-#: src/fs/gnunet-unindex.c:169 src/gns/gnunet-gns-lookup.c:191
-#: src/nse/gnunet-nse-profiler.c:910
+#: 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
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:232
+#: src/dht/gnunet-dht-get.c:236
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1183,7 +1226,7 @@
 msgid "how long to execute? 0 = forever"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:321
+#: src/dht/gnunet-dht-monitor.c:324
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
@@ -1234,12 +1277,12 @@
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:223
+#: src/dht/gnunet-dht-put.c:226
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
-#: src/testing/testing.c:1968 src/testing/testing.c:1998
+#: 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
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1273,16 +1316,16 @@
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:990
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1038
-#: src/dht/gnunet-service-dht_clients.c:1081
+#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-dht_clients.c:1082
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1048
+#: src/dht/gnunet-service-dht_clients.c:1049
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1324,81 +1367,87 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:481
+#: src/dht/gnunet-service-dht_neighbours.c:485
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:571
+#: src/dht/gnunet-service-dht_neighbours.c:575
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:717
+#: src/dht/gnunet-service-dht_neighbours.c:721
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:772
+#: src/dht/gnunet-service-dht_neighbours.c:776
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:810
+#: src/dht/gnunet-service-dht_neighbours.c:814
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1032
-#: src/dht/gnunet-service-dht_neighbours.c:1060
+#: src/dht/gnunet-service-dht_neighbours.c:1036
+#: src/dht/gnunet-service-dht_neighbours.c:1064
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1041
-#: src/dht/gnunet-service-dht_neighbours.c:1075
+#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1079
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1207
+#: src/dht/gnunet-service-dht_neighbours.c:1211
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1236
+#: src/dht/gnunet-service-dht_neighbours.c:1240
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1315
+#: src/dht/gnunet-service-dht_neighbours.c:1247
+#: src/dht/gnunet-service-dht_neighbours.c:1360
+#: src/dht/gnunet-service-dht_neighbours.c:1460
+msgid "# P2P messages dropped due to full queue"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1325
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1342
+#: src/dht/gnunet-service-dht_neighbours.c:1352
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1443
+#: src/dht/gnunet-service-dht_neighbours.c:1467
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1531
+#: src/dht/gnunet-service-dht_neighbours.c:1555
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1671
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1655
+#: src/dht/gnunet-service-dht_neighbours.c:1679
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1746
+#: src/dht/gnunet-service-dht_neighbours.c:1770
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1788
+#: src/dht/gnunet-service-dht_neighbours.c:1812
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1802
+#: src/dht/gnunet-service-dht_neighbours.c:1826
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1876
+#: src/dht/gnunet-service-dht_neighbours.c:1900
 msgid "# P2P RESULTS received"
 msgstr ""
 
@@ -1426,10 +1475,14 @@
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:352
+#: src/dht/gnunet-service-dht_routing.c:394
 msgid "# Entries added to routing table"
 msgstr ""
 
+#: src/dht/gnunet-service-dht_routing.c:411
+msgid "# DHT requests combined"
+msgstr ""
+
 #: src/dht/plugin_block_dht.c:136
 #, c-format
 msgid "Block not of type %u\n"
@@ -1444,15 +1497,15 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:337
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:340
+#: src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:348
+#: src/dns/gnunet-dns-monitor.c:370
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -1464,7 +1517,7 @@
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:251
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
@@ -1524,7 +1577,7 @@
 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:1561 src/exit/gnunet-daemon-exit.c:3033
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
@@ -1681,50 +1734,50 @@
 msgid "# UDP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2882
+#: src/exit/gnunet-daemon-exit.c:2883
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908
+#: src/exit/gnunet-daemon-exit.c:2897 src/exit/gnunet-daemon-exit.c:2909
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2919
+#: src/exit/gnunet-daemon-exit.c:2920
 #, c-format
 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:3049
 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:3057
 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:3064
 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:3070
 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:3076 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3236
+#: src/exit/gnunet-daemon-exit.c:3241
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1776,76 +1829,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:339
+#: src/fs/fs_api.c:491
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:348
+#: src/fs/fs_api.c:500
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/fs_api.c:354
+#: src/fs/fs_api.c:506
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:938
+#: src/fs/fs_api.c:1087
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:1395
+#: src/fs/fs_api.c:1546
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1437
+#: src/fs/fs_api.c:1588
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1453
+#: src/fs/fs_api.c:1604
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2106
+#: src/fs/fs_api.c:2254
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2116
+#: src/fs/fs_api.c:2264
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2241 src/fs/fs_api.c:2480
+#: src/fs/fs_api.c:2389 src/fs/fs_api.c:2629
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2258
+#: src/fs/fs_api.c:2406
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2270 src/fs/fs_api.c:2289 src/fs/fs_api.c:2773
+#: src/fs/fs_api.c:2419 src/fs/fs_api.c:2438 src/fs/fs_api.c:2922
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2471
+#: src/fs/fs_api.c:2620
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2717
+#: src/fs/fs_api.c:2866
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2811
+#: src/fs/fs_api.c:2960
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1854,58 +1907,58 @@
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:311
+#: src/fs/fs_download.c:321
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:331
+#: src/fs/fs_download.c:341
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
+#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:878
+#: src/fs/fs_download.c:888
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:970
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:986
+#: src/fs/fs_download.c:996
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1009
+#: src/fs/fs_download.c:1019
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1029
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:1028
+#: src/fs/fs_download.c:1038
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_download.c:1125
+#: src/fs/fs_download.c:1136
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1888
+#: src/fs/fs_download.c:1920
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
@@ -1967,22 +2020,22 @@
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/fs_namespace.c:256
+#: src/fs/fs_namespace.c:254
 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:371
+#: src/fs/fs_namespace.c:369
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:588 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:586 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_namespace.c:631
+#: src/fs/fs_namespace.c:629
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -1991,58 +2044,58 @@
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:621 src/fs/fs_publish.c:638 src/fs/fs_publish.c:677
-#: src/fs/fs_publish.c:697 src/fs/fs_publish.c:722 src/fs/fs_publish.c:862
+#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:623
+#: src/fs/fs_publish.c:624
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:635
+#: src/fs/fs_publish.c:636
 #, fuzzy
 msgid "unknown error"
 msgstr "未知错误"
 
-#: src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:679
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:698
+#: src/fs/fs_publish.c:699
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:724
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:746
+#: src/fs/fs_publish.c:747
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:811
+#: src/fs/fs_publish.c:812
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:817
+#: src/fs/fs_publish.c:818
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:863
+#: src/fs/fs_publish.c:864
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1071
+#: src/fs/fs_publish.c:1090
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1161
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2051,7 +2104,7 @@
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_search.c:829
+#: src/fs/fs_search.c:830
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2193,6 +2246,64 @@
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
+#: src/fs/gnunet-auto-share.c:236
+#, fuzzy, c-format
+msgid "Failed to load state: %s\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
+#: src/fs/gnunet-auto-share.c:309
+#, fuzzy, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:488
+#, c-format
+msgid "Publishing `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:497
+#, fuzzy, c-format
+msgid "Failed to run `%s'\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/fs/gnunet-auto-share.c:684
+#, 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-publish.c:679
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:683
+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
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:710
+msgid "specify the priority of the content"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-pseudonym.c:304
+#: src/fs/gnunet-publish.c:717
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:767
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr ""
+
 #: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
@@ -2223,97 +2334,97 @@
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/fs/gnunet-directory.c:179
+#: src/fs/gnunet-directory.c:183
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/fs/gnunet-download.c:101
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-download.c:110
+#: src/fs/gnunet-download.c:146
 #, fuzzy
 msgid "<unknown time>"
 msgstr "未知错误"
 
-#: src/fs/gnunet-download.c:119
+#: src/fs/gnunet-download.c:155
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:129
+#: src/fs/gnunet-download.c:178
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:193
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:152 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:191
 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:177
+#: src/fs/gnunet-download.c:233
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
+#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:625
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/gnunet-download.c:190
+#: src/fs/gnunet-download.c:246
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:197
+#: src/fs/gnunet-download.c:253
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
+#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:603
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-download.c:248 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:251
+#: src/fs/gnunet-download.c:307
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
+#: src/fs/gnunet-download.c:313
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:261
+#: src/fs/gnunet-download.c:317
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:265
+#: src/fs/gnunet-download.c:321
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268
+#: src/fs/gnunet-download.c:324
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:278
+#: src/fs/gnunet-download.c:338
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2323,11 +2434,11 @@
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:124
+#: src/fs/gnunet-fs.c:128
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:167
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:161
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
@@ -2338,10 +2449,6 @@
 msgid "Option `%s' ignored\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr ""
-
 #: src/fs/gnunet-pseudonym.c:282
 msgid "create or advertise namespace NAME"
 msgstr ""
@@ -2356,7 +2463,7 @@
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:697
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:698
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
@@ -2372,10 +2479,6 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
-msgid "set the desired replication LEVEL"
-msgstr ""
-
 #: src/fs/gnunet-pseudonym.c:307
 msgid "specify ID of the root of the namespace"
 msgstr ""
@@ -2384,7 +2487,7 @@
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:318
+#: src/fs/gnunet-pseudonym.c:322
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2408,167 +2511,150 @@
 msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:187
+#: src/fs/gnunet-publish.c:188
 msgid "Cleanup after abort complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:305
+#: src/fs/gnunet-publish.c:306
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-publish.c:307
+#: src/fs/gnunet-publish.c:308
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-publish.c:358
+#: src/fs/gnunet-publish.c:359 src/fs/gnunet-publish.c:613
 #, fuzzy, c-format
-msgid "Failed to create namespace `%s'\n"
+msgid "Failed to create namespace `%s' (illegal filename?)\n"
 msgstr "发送消息失败。\n"
 
-#: src/fs/gnunet-publish.c:433
+#: src/fs/gnunet-publish.c:434
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-publish.c:460
+#: src/fs/gnunet-publish.c:461
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:491
+#: src/fs/gnunet-publish.c:492
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:493
+#: src/fs/gnunet-publish.c:494
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-publish.c:498
+#: src/fs/gnunet-publish.c:499
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:503
+#: src/fs/gnunet-publish.c:504
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:507
+#: src/fs/gnunet-publish.c:508
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-publish.c:511
+#: src/fs/gnunet-publish.c:512
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:518
+#: src/fs/gnunet-publish.c:519
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:552
+#: src/fs/gnunet-publish.c:553
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:560
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:566
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:573 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:574 src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:583 src/fs/gnunet-publish.c:590
-#: src/transport/gnunet-transport.c:560
+#: src/fs/gnunet-publish.c:584 src/fs/gnunet-publish.c:591
+#: src/transport/gnunet-transport.c:624
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:612
+#: src/fs/gnunet-publish.c:646
 #, fuzzy, c-format
-msgid "Could not create namespace `%s'\n"
-msgstr "无法解析“%s”(%s):%s\n"
-
-#: src/fs/gnunet-publish.c:645
-#, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-publish.c:657
+#: src/fs/gnunet-publish.c:658
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:682
-msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:685
-msgid "do not use libextractor to add keywords or metadata"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:689
+#: src/fs/gnunet-publish.c:690
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:693
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:700
+#: src/fs/gnunet-publish.c:701
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:706
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:709
-msgid "specify the priority of the content"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:714
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:719
+#: src/fs/gnunet-publish.c:720
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:723
+#: src/fs/gnunet-publish.c:724
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:727
+#: src/fs/gnunet-publish.c:728
 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:742
+#: src/fs/gnunet-publish.c:747
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2602,7 +2688,7 @@
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:308
+#: src/fs/gnunet-search.c:312
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -2621,84 +2707,84 @@
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_cp.c:696
+#: src/fs/gnunet-service-fs_cp.c:703
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:700
+#: src/fs/gnunet-service-fs_cp.c:707
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:735
+#: src/fs/gnunet-service-fs_cp.c:742
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:741
+#: src/fs/gnunet-service-fs_cp.c:748
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1324
+#: src/fs/gnunet-service-fs_cp.c:773 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:858
+#: src/fs/gnunet-service-fs_cp.c:865
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:918
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:919
+#: src/fs/gnunet-service-fs_cp.c:926
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:933
+#: src/fs/gnunet-service-fs_cp.c:940
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:971
+#: src/fs/gnunet-service-fs_cp.c:978
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/fs/gnunet-service-fs_cp.c:1045
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1069
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/fs/gnunet-service-fs_cp.c:1079
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1151
+#: src/fs/gnunet-service-fs_cp.c:1158
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/fs/gnunet-service-fs_cp.c:1192
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1207
+#: src/fs/gnunet-service-fs_cp.c:1214
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1267
+#: src/fs/gnunet-service-fs_cp.c:1274
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1293
+#: src/fs/gnunet-service-fs_cp.c:1300
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1322
+#: src/fs/gnunet-service-fs_cp.c:1329
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1687
+#: src/fs/gnunet-service-fs_cp.c:1685
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -2754,8 +2840,8 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:362
-#: src/fs/gnunet-service-fs_lc.c:488
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
+#: src/fs/gnunet-service-fs_lc.c:490
 msgid "# client searches active"
 msgstr ""
 
@@ -2763,11 +2849,11 @@
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:321
+#: src/fs/gnunet-service-fs_lc.c:323
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:356
+#: src/fs/gnunet-service-fs_lc.c:358
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2799,8 +2885,8 @@
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:681
-#: src/fs/gnunet-service-fs_pe.c:748
+#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:684
+#: src/fs/gnunet-service-fs_pe.c:751
 msgid "# query plan entries"
 msgstr ""
 
@@ -2808,99 +2894,99 @@
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:616
+#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:618
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:779
+#: src/fs/gnunet-service-fs_pr.c:781
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:808
+#: src/fs/gnunet-service-fs_pr.c:810
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:822
+#: src/fs/gnunet-service-fs_pr.c:824
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:835
+#: src/fs/gnunet-service-fs_pr.c:837
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:953
+#: src/fs/gnunet-service-fs_pr.c:955
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:980
+#: src/fs/gnunet-service-fs_pr.c:982
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1015
+#: src/fs/gnunet-service-fs_pr.c:1017
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1106
+#: src/fs/gnunet-service-fs_pr.c:1108
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1127
+#: src/fs/gnunet-service-fs_pr.c:1129
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1174
+#: src/fs/gnunet-service-fs_pr.c:1176
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1190
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1197
+#: src/fs/gnunet-service-fs_pr.c:1199
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1213
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1224
+#: src/fs/gnunet-service-fs_pr.c:1226
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1237
+#: src/fs/gnunet-service-fs_pr.c:1239
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1244
 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:1271 src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1449
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1327
+#: src/fs/gnunet-service-fs_pr.c:1329
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1340
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1426
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1510
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1601 src/fs/gnunet-service-fs_pr.c:1610
+#: src/fs/gnunet-service-fs_pr.c:1603 src/fs/gnunet-service-fs_pr.c:1612
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "配置文件“%s”已写入。\n"
@@ -2935,40 +3021,45 @@
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:176
+#: src/fs/gnunet-unindex.c:180
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/plugin_block_fs.c:131
+#: src/fs/plugin_block_fs.c:130
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:191
+#: src/gns/gnunet-gns.c:267
+#, c-format
+msgid "Key file `%s' for private zone does not exist!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:289
 #, fuzzy
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns.c:232
+#: src/gns/gnunet-gns.c:341
 msgid "try to shorten a given GNS name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:235
+#: src/gns/gnunet-gns.c:344
 msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:347
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:241
+#: src/gns/gnunet-gns.c:350
 msgid "Specify the type of the record lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:244
+#: src/gns/gnunet-gns.c:353
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:255
+#: src/gns/gnunet-gns.c:367
 msgid "GNUnet GNS access tool"
 msgstr ""
 
@@ -3002,39 +3093,57 @@
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:725 src/gns/gnunet-gns-fcfsd.c:737
+#: src/gns/gnunet-gns-fcfsd.c:550
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:558
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:741 src/gns/gnunet-gns-fcfsd.c:753
 #, fuzzy, c-format
 msgid "Option `%s' not specified in configuration section `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:747 src/namestore/gnunet-namestore.c:299
+#: src/gns/gnunet-gns-fcfsd.c:763 src/namestore/gnunet-namestore.c:365
 #, fuzzy
 msgid "Failed to read or create private zone key\n"
 msgstr "无法为守护程序创建用户账户。"
 
-#: src/gns/gnunet-gns-fcfsd.c:757 src/namestore/gnunet-namestore.c:310
+#: src/gns/gnunet-gns-fcfsd.c:773 src/namestore/gnunet-namestore.c:376
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
+#: src/gns/gnunet-gns-fcfsd.c:789 src/gns/gnunet-gns-proxy.c:2667
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:804
+#: src/gns/gnunet-gns-fcfsd.c:823
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-lookup.c:210
-msgid "Issue a request to the GNUnet Naming System, prints results."
-msgstr ""
+#: src/gns/gnunet-gns-proxy.c:2300
+#, fuzzy, c-format
+msgid "Unable to import private key from file `%s'\n"
+msgstr "无法创建用户账户:"
 
-#: src/gns/gnunet-gns-proxy.c:800
+#: src/gns/gnunet-gns-proxy.c:2329
+#, fuzzy, c-format
+msgid "Unable to import certificate %s\n"
+msgstr "无法保存配置文件“%s”:"
+
+#: src/gns/gnunet-gns-proxy.c:3328
 msgid "listen on specified port"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:811
+#: src/gns/gnunet-gns-proxy.c:3331
+msgid "pem file to use as CA"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3346
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -3096,7 +3205,7 @@
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
+#: src/hostlist/gnunet-daemon-hostlist.c:344
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3397,21 +3506,21 @@
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1095
-#: src/template/gnunet-template.c:68
+#: src/integration-tests/connection_watchdog.c:1099
+#: src/template/gnunet-template.c:71
 msgid "help text"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4590 src/mesh/gnunet-service-mesh_new.c:4618
+#: src/mesh/gnunet-service-mesh.c:5904
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4784 src/mesh/gnunet-service-mesh_new.c:4812
+#: src/mesh/gnunet-service-mesh.c:6116
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/mesh/gnunet-service-mesh.c:4793 src/mesh/gnunet-service-mesh_new.c:4821
+#: src/mesh/gnunet-service-mesh.c:6125
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -3426,191 +3535,232 @@
 msgid "Could not access file `%s': %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/namestore/gnunet-namestore.c:157
+#: src/namestore/gnunet-namestore.c:212
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:183
+#: src/namestore/gnunet-namestore.c:243
 #, c-format
 msgid "Deleting record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:239
+#: src/namestore/gnunet-namestore.c:304
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:276
-#, c-format
-msgid "Option `%s' not given, but I need a zone key file!\n"
+#: src/namestore/gnunet-namestore.c:320
+msgid "for at least"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:281
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "卸载 GNUnet 服务"
+#: src/namestore/gnunet-namestore.c:321
+msgid "until"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:291
+#: src/namestore/gnunet-namestore.c:357
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:321
+#: src/namestore/gnunet-namestore.c:387
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:328 src/namestore/gnunet-namestore.c:350
-#: src/namestore/gnunet-namestore.c:374 src/namestore/gnunet-namestore.c:384
-#: src/namestore/gnunet-namestore.c:409
+#: 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
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:329 src/namestore/gnunet-namestore.c:351
+#: src/namestore/gnunet-namestore.c:396 src/namestore/gnunet-namestore.c:420
 msgid "add/del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:409
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:366
+#: src/namestore/gnunet-namestore.c:447
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:375 src/namestore/gnunet-namestore.c:385
+#: src/namestore/gnunet-namestore.c:456
+#, 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
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:410
+#: src/namestore/gnunet-namestore.c:497
+#, fuzzy, c-format
+msgid "No valid expiration time for operation `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/namestore/gnunet-namestore.c:520
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:462
+#: src/namestore/gnunet-namestore.c:570
+#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/namestore/gnunet-namestore.c:611 src/transport/gnunet-transport.c:618
+#, fuzzy, c-format
+msgid "Service `%s' is not running\n"
+msgstr "服务已删除。\n"
+
+#: src/namestore/gnunet-namestore.c:622
+#, c-format
+msgid "Option `%s' not given, but I need a zone key file!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:627
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/namestore/gnunet-namestore.c:679
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:682
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:468
+#: src/namestore/gnunet-namestore.c:685
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:471
+#: src/namestore/gnunet-namestore.c:688
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:474
+#: src/namestore/gnunet-namestore.c:691
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:477
+#: src/namestore/gnunet-namestore.c:694
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:480
+#: src/namestore/gnunet-namestore.c:697
+msgid "URI to import into our zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:700
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:483
+#: src/namestore/gnunet-namestore.c:703
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:486
+#: src/namestore/gnunet-namestore.c:706
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:489
+#: src/namestore/gnunet-namestore.c:709
 msgid "filename with the zone key"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:500
+#: src/namestore/gnunet-namestore.c:720
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
 
-#: src/namestore/gnunet-service-namestore.c:143
-#, c-format
-msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
-msgstr ""
+#: src/namestore/gnunet-service-namestore.c:242
+#: src/namestore/gnunet-service-namestore.c:258
+#, fuzzy, c-format
+msgid "Failed to write zone key to file `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/namestore/gnunet-service-namestore.c:154
-#, c-format
-msgid "File zone `%s' containing this key already exists\n"
+#: src/namestore/gnunet-service-namestore.c:244
+msgid "file exists but reading key failed"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:160
-#, c-format
-msgid ""
-"File zone `%s' but different zone key already exists, failed to write! \n"
+#: src/namestore/gnunet-service-namestore.c:260
+msgid "file exists with different key"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:198
+#: src/namestore/gnunet-service-namestore.c:1519
+#, fuzzy
+msgid "Failed to find record to remove\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/namestore/gnunet-service-namestore.c:2133
 #, fuzzy, c-format
-msgid "Stored zonekey for zone `%s' in file `%s'\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+msgid "Could not parse zone key file `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/namestore/gnunet-service-namestore.c:1909
+#: src/namestore/gnunet-service-namestore.c:2223
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:1918
+#: src/namestore/gnunet-service-namestore.c:2233
 #, c-format
 msgid "Creating directory `%s' for zone files failed!\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:315 src/namestore/namestore_api.c:353
-msgid "Namestore added record successfully"
-msgstr ""
-
-#: src/namestore/namestore_api.c:323
+#: src/namestore/namestore_api.c:345
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/namestore/namestore_api.c:361
-msgid "Namestore record already existed"
-msgstr ""
-
-#: src/namestore/namestore_api.c:368
+#: src/namestore/namestore_api.c:371
 msgid "Namestore failed to add record\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:401
+#: src/namestore/namestore_api.c:415
 #, fuzzy
-msgid "Namestore removed record successfully"
-msgstr "GNUnet 服务安装成功。\n"
+msgid "Failed to create new signature"
+msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_api.c:408
-msgid "No records for entry"
+#: src/namestore/namestore_api.c:419
+msgid "Failed to put new set of records in database"
 msgstr ""
 
-#: src/namestore/namestore_api.c:415
+#: src/namestore/namestore_api.c:423
 #, fuzzy
-msgid "Could not find record to remove"
-msgstr "无法连接到 %s:%u:%s\n"
+msgid "Failed to remove records from database"
+msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_api.c:422
+#: src/namestore/namestore_api.c:427
 #, fuzzy
-msgid "Failed to create new signature"
-msgstr "发送消息失败。\n"
+msgid "Failed to access database"
+msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/namestore/namestore_api.c:429
-msgid "Failed to put new set of records in database"
+#: src/namestore/namestore_api.c:431
+#, fuzzy
+msgid "unknown internal error in namestore"
+msgstr "未知错误。\n"
+
+#: src/namestore/namestore_api.c:436
+msgid "Protocol error"
 msgstr ""
 
+#: src/namestore/plugin_namestore_postgres.c:95
+#, fuzzy
+msgid "Failed to create indices\n"
+msgstr "发送消息失败。\n"
+
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:318
+#: src/nat/gnunet-nat-server.c:321
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
@@ -3654,7 +3804,7 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:928
+#: src/nse/gnunet-nse-profiler.c:915
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
@@ -3683,52 +3833,52 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:203
+#: src/peerinfo/gnunet-service-peerinfo.c:228
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:229
+#: src/peerinfo/gnunet-service-peerinfo.c:267
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:254
+#: src/peerinfo/gnunet-service-peerinfo.c:292
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:353
+#: src/peerinfo/gnunet-service-peerinfo.c:414
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:710
+#: src/peerinfo/gnunet-service-peerinfo.c:800
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:238
+#: src/peerinfo/peerinfo_api.c:239
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:358
+#: src/peerinfo/peerinfo_api.c:359
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/peerinfo/peerinfo_api.c:505
+#: src/peerinfo/peerinfo_api.c:509
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:531 src/peerinfo/peerinfo_api.c:550
-#: src/peerinfo/peerinfo_api.c:565 src/peerinfo/peerinfo_api.c:576
-#: src/peerinfo/peerinfo_api.c:587
+#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
+#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
+#: src/peerinfo/peerinfo_api.c:606
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/peerinfo/peerinfo_api.c:663
+#: src/peerinfo/peerinfo_api.c:681
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "初始化“%s”服务失败。\n"
@@ -3787,11 +3937,6 @@
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:875
-#, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "无效条目。\n"
-
 #: src/peerinfo-tool/gnunet-peerinfo.c:899
 #, c-format
 msgid "I am peer `%s'.\n"
@@ -3822,7 +3967,7 @@
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:957
+#: src/peerinfo-tool/gnunet-peerinfo.c:961
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -3909,7 +4054,7 @@
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:973
+#: src/pt/gnunet-daemon-pt.c:976
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -3923,42 +4068,42 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:122
+#: src/statistics/gnunet-statistics.c:120
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:199
+#: src/statistics/gnunet-statistics.c:193
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:207
+#: src/statistics/gnunet-statistics.c:201
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:227
+#: src/statistics/gnunet-statistics.c:221
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:230
+#: src/statistics/gnunet-statistics.c:224
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:233
+#: src/statistics/gnunet-statistics.c:227
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:236
+#: src/statistics/gnunet-statistics.c:230
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:239
+#: src/statistics/gnunet-statistics.c:233
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:246
+#: src/statistics/gnunet-statistics.c:244
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -3973,300 +4118,304 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:157
-#, fuzzy
-msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+#: src/testbed/testbed_api.c:204
+#, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "“%s”以错误码 %d 失败:%s\n"
+
+#: src/testing/gnunet-testing.c:131
+#, fuzzy, c-format
+msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/gnunet-testing.c:159
-#, c-format
-msgid "Specified hostkey file `%s' not found!\n"
-msgstr ""
-
-#: src/testing/gnunet-testing.c:273
+#: src/testing/gnunet-testing.c:202
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/testing/gnunet-testing.c:275
-msgid "create hostkey files from pre-computed hostkey list"
+#: src/testing/gnunet-testing.c:204
+msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:277
-msgid "host key file"
-msgstr ""
-
-#: src/testing/gnunet-testing.c:279
+#: src/testing/gnunet-testing.c:206
 #, fuzzy
-msgid "number of unique configuration files or hostkeys to create"
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
 msgstr "打印配置文件中的一个值到标准输出"
 
-#: src/testing/gnunet-testing.c:281
+#: src/testing/gnunet-testing.c:208
 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
 
-#: src/testing/gnunet-testing.c:287
+#: src/testing/gnunet-testing.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/helper.c:56
+#: src/testing/gnunet-testing-run-service.c:129
+#, c-format
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr ""
+
+#: src/testing/gnunet-testing-run-service.c:186
 #, fuzzy
+msgid "name of the template configuration file to use (optional)"
+msgstr "打印配置文件中的一个值到标准输出"
+
+#: src/testing/gnunet-testing-run-service.c:189
+msgid "name of the service to run"
+msgstr ""
+
+#: src/testing_old/helper.c:56
+#, fuzzy
 msgid "Peer is lacking HOSTKEY configuration setting.\n"
 msgstr "立即保存配置?"
 
-#: src/testing/helper.c:64
+#: src/testing_old/helper.c:64
 #, fuzzy
 msgid "Could not access hostkey.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing.c:200
+#: src/testing_old/testing.c:200
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:214 src/testing/testing.c:798
+#: src/testing_old/testing.c:214 src/testing_old/testing.c:798
 msgid "`scp' did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:237
+#: src/testing_old/testing.c:237
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:238
+#: src/testing_old/testing.c:238
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:286
+#: src/testing_old/testing.c:286
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:293
+#: src/testing_old/testing.c:293
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:294 src/testing/testing.c:471
+#: src/testing_old/testing.c:294 src/testing_old/testing.c:471
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:354
+#: src/testing_old/testing.c:354
 #, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:358
+#: src/testing_old/testing.c:358
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/testing/testing.c:368
+#: src/testing_old/testing.c:368
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:400
+#: src/testing_old/testing.c:400
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:463
+#: src/testing_old/testing.c:463
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:470
+#: src/testing_old/testing.c:470
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:493 src/testing/testing.c:600
+#: src/testing_old/testing.c:493 src/testing_old/testing.c:600
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:494 src/testing/testing.c:601
-#: src/testing/testing.c:621
+#: 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/testing.c:570
+#: src/testing_old/testing.c:570
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:620
+#: src/testing_old/testing.c:620
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:643 src/testing/testing.c:675
+#: 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/testing.c:658 src/testing/testing.c:713
+#: src/testing_old/testing.c:658 src/testing_old/testing.c:713
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:786
+#: src/testing_old/testing.c:786
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:948
+#: src/testing_old/testing.c:948
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
+#: src/testing_old/testing.c:1207 src/testing_old/testing_group.c:6155
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/testing/testing.c:1292 src/testing/testing.c:1359
+#: src/testing_old/testing.c:1292 src/testing_old/testing.c:1359
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/testing/testing.c:1448
+#: src/testing_old/testing.c:1448
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/testing/testing.c:1601
+#: src/testing_old/testing.c:1601
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1609
+#: src/testing_old/testing.c:1609
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "保存配置失败。"
 
-#: src/testing/testing.c:1636
+#: src/testing_old/testing.c:1636
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/testing/testing.c:1639
+#: src/testing_old/testing.c:1639
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "保存配置失败。"
 
-#: src/testing/testing.c:1794
+#: src/testing_old/testing.c:1794
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/testing/testing.c:1922
+#: src/testing_old/testing.c:1922
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "加载 sqstore 服务失败。检查您的配置!\n"
 
-#: src/testing/testing.c:2145
+#: src/testing_old/testing.c:2145
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
-#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
-#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
-#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
+#: src/testing_old/testing_group.c:1895 src/testing_old/testing_group.c:1907
+#: src/testing_old/testing_group.c:2009 src/testing_old/testing_group.c:2066
+#: src/testing_old/testing_group.c:2153 src/testing_old/testing_group.c:2173
+#: src/testing_old/testing_group.c:2303
+#: src/testing_old/testing_peergroup.c:950
 #, fuzzy, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/testing/testing_group.c:2160
+#: src/testing_old/testing_group.c:2161
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
+#: src/testing_old/testing_group.c:2878 src/testing_old/testing_group.c:3064
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3957
+#: src/testing_old/testing_group.c:3958
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5226
+#: src/testing_old/testing_group.c:5227
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5944 src/transport/transport-testing.c:636
+#: src/testing_old/testing_group.c:5945
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing_group.c:6011
+#: src/testing_old/testing_group.c:6012
 #, fuzzy, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing_new.c:169
-msgid "tmppath cannot be NULL\n"
-msgstr ""
-
-#: src/testing/testing_new.c:356
+#: src/testing/testing.c:188
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing_new.c:365
-#, fuzzy, c-format
-msgid "Could not open hostkeys file: %s\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/testing/testing_new.c:380
+#: src/testing/testing.c:204
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing_new.c:437
+#: src/testing/testing.c:468
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing_new.c:446
+#: src/testing/testing.c:477
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/testing/testing_new.c:680
+#: src/testing/testing.c:788
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing_new.c:691
+#: src/testing/testing.c:799
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing_new.c:704
+#: src/testing/testing.c:813
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing_new.c:734
+#: src/testing/testing.c:846
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing_new.c:751
+#: src/testing/testing.c:864
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing_new.c:791
+#: src/testing/testing.c:925
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/testing/testing_new.c:959
+#: src/testing/testing.c:1088
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4363,7 +4512,7 @@
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1363
+#: src/topology/gnunet-daemon-topology.c:1366
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -4405,27 +4554,27 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:747
+#: src/transport/gnunet-service-transport_blacklist.c:751
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:163
+#: src/transport/gnunet-service-transport.c:167
 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:237
+#: src/transport/gnunet-service-transport.c:242
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:284
+#: src/transport/gnunet-service-transport.c:289
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:582
+#: src/transport/gnunet-service-transport.c:590
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:591
+#: src/transport/gnunet-service-transport.c:599
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -4438,16 +4587,16 @@
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:503
+#: src/transport/gnunet-service-transport_clients.c:509
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:631
+#: src/transport/gnunet-service-transport_clients.c:637
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:682
+#: src/transport/gnunet-service-transport_clients.c:688
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
@@ -4455,101 +4604,101 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1032
+#: src/transport/gnunet-service-transport_neighbours.c:1057
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1148
-#: src/transport/gnunet-service-transport_neighbours.c:1482
+#: src/transport/gnunet-service-transport_neighbours.c:1174
+#: src/transport/gnunet-service-transport_neighbours.c:1511
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1153
+#: src/transport/gnunet-service-transport_neighbours.c:1179
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1158
+#: src/transport/gnunet-service-transport_neighbours.c:1184
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1215
+#: src/transport/gnunet-service-transport_neighbours.c:1241
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1254
+#: src/transport/gnunet-service-transport_neighbours.c:1283
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1278
+#: src/transport/gnunet-service-transport_neighbours.c:1307
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1286
+#: src/transport/gnunet-service-transport_neighbours.c:1315
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1323
+#: src/transport/gnunet-service-transport_neighbours.c:1352
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1332
+#: src/transport/gnunet-service-transport_neighbours.c:1361
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1388
+#: src/transport/gnunet-service-transport_neighbours.c:1417
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1422
+#: src/transport/gnunet-service-transport_neighbours.c:1451
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1438
+#: src/transport/gnunet-service-transport_neighbours.c:1467
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2544
+#: src/transport/gnunet-service-transport_neighbours.c:2613
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2559
-#: src/transport/gnunet-service-transport_neighbours.c:2585
+#: src/transport/gnunet-service-transport_neighbours.c:2628
+#: src/transport/gnunet-service-transport_neighbours.c:2662
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2675
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2627
+#: src/transport/gnunet-service-transport_neighbours.c:2708
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2807
+#: src/transport/gnunet-service-transport_neighbours.c:2892
 msgid "# unexpected SESSION ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2856
+#: src/transport/gnunet-service-transport_neighbours.c:2947
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2870
+#: src/transport/gnunet-service-transport_neighbours.c:2961
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2901
+#: src/transport/gnunet-service-transport_neighbours.c:2992
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2912
+#: src/transport/gnunet-service-transport_neighbours.c:3003
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2943
+#: src/transport/gnunet-service-transport_neighbours.c:3034
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3020
+#: src/transport/gnunet-service-transport_neighbours.c:3129
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -4557,211 +4706,200 @@
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:414
+#: src/transport/gnunet-service-transport_validation.c:415
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:463
+#: src/transport/gnunet-service-transport_validation.c:464
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:512
+#: src/transport/gnunet-service-transport_validation.c:513
 msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:570
+#: src/transport/gnunet-service-transport_validation.c:571
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:805
+#: src/transport/gnunet-service-transport_validation.c:807
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:840
+#: src/transport/gnunet-service-transport_validation.c:872
 #, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:924
+#: src/transport/gnunet-service-transport_validation.c:989
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/transport/gnunet-service-transport_validation.c:998
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1055
+#: src/transport/gnunet-service-transport_validation.c:1120
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1080
+#: src/transport/gnunet-service-transport_validation.c:1145
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1136
+#: src/transport/gnunet-service-transport_validation.c:1199
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:260
+#: src/transport/gnunet-transport.c:265
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:273
+#: src/transport/gnunet-transport.c:278
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:323
+#: src/transport/gnunet-transport.c:328
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:330
+#: 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:363
+#: src/transport/gnunet-transport.c:374
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:383
+#: src/transport/gnunet-transport.c:394
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:414
+#: src/transport/gnunet-transport.c:426
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:443
+#: src/transport/gnunet-transport.c:506
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:466
+#: src/transport/gnunet-transport.c:529
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-transport.c:473
+#: src/transport/gnunet-transport.c:536
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:501
+#: src/transport/gnunet-transport.c:564
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/gnunet-transport.c:569
+#: src/transport/gnunet-transport.c:633
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-transport.c:618
+#: src/transport/gnunet-transport.c:716
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:719
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:624
+#: src/transport/gnunet-transport.c:722
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:627
-msgid "provide information about all current connections (continuously)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:630
+#: src/transport/gnunet-transport.c:728
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:634
+#: src/transport/gnunet-transport.c:732
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:637
+#: src/transport/gnunet-transport.c:735
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:645
+#: src/transport/gnunet-transport.c:746
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_http.c:1100
+#: src/transport/plugin_transport_http.c:1119
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1149
+#: src/transport/plugin_transport_http.c:1168
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http.c:1174 src/util/service.c:1036
+#: src/transport/plugin_transport_http.c:1200 src/util/service.c:1051
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_http.c:1191 src/util/service.c:1053
+#: src/transport/plugin_transport_http.c:1217 src/util/service.c:1068
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/plugin_transport_http.c:1296
+#: src/transport/plugin_transport_http.c:1322
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1309
-#, c-format
-msgid "FREEING %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1386
+#: src/transport/plugin_transport_http.c:1407
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1399
+#: src/transport/plugin_transport_http.c:1420
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http.c:1410
+#: src/transport/plugin_transport_http.c:1431
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1430
+#: src/transport/plugin_transport_http.c:1451
 #, 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:1460
+#: src/transport/plugin_transport_http.c:1481
 #, 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:624
+#: src/transport/plugin_transport_http_client.c:621
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
@@ -4818,85 +4956,86 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:591
+#: src/transport/plugin_transport_tcp.c:590
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:767
-#: 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:1086
-#: src/transport/plugin_transport_tcp.c:1103
+#: src/transport/plugin_transport_tcp.c:766
+#: src/transport/plugin_transport_tcp.c:855
+#: src/transport/plugin_transport_tcp.c:905
+#: src/transport/plugin_transport_tcp.c:991
+#: src/transport/plugin_transport_tcp.c:1129
+#: src/transport/plugin_transport_tcp.c:1146
 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:1761
-#: src/transport/plugin_transport_tcp.c:2390
+#: src/transport/plugin_transport_tcp.c:773
+#: src/transport/plugin_transport_tcp.c:962
+#: src/transport/plugin_transport_tcp.c:1806
+#: src/transport/plugin_transport_tcp.c:2423
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:860
+#: src/transport/plugin_transport_tcp.c:859
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:908
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:996
+#: src/transport/plugin_transport_tcp.c:995
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1290
+#: src/transport/plugin_transport_tcp.c:1335
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1401
+#: src/transport/plugin_transport_tcp.c:1446
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1802
+#: src/transport/plugin_transport_tcp.c:1847
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1973
+#: src/transport/plugin_transport_tcp.c:2018
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2043
+#: src/transport/plugin_transport_tcp.c:2088
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2279 src/util/service.c:940
+#: src/transport/plugin_transport_tcp.c:2312 src/util/service.c:946
+#: src/util/service.c:952
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2293
+#: src/transport/plugin_transport_tcp.c:2326
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2355
+#: src/transport/plugin_transport_tcp.c:2388
 #, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2378
+#: src/transport/plugin_transport_tcp.c:2411
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2382
+#: src/transport/plugin_transport_tcp.c:2415
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:2419
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -4909,118 +5048,131 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:367
+#: src/transport/plugin_transport_udp_broadcasting.c:392
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1894
+#: src/transport/plugin_transport_udp.c:1903
 #, c-format
 msgid ""
-"UDP could not message to `%s': `%s'. Please check your network configuration "
-"and disable IPv6 if your connection does not have a global IPv6 address\n"
+"UDP could not transmit message to `%s': Network seems down, please check "
+"your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2138
+#: src/transport/plugin_transport_udp.c:1917
+#, c-format
+msgid ""
+"UDP could not transmit message to `%s': Please check your network "
+"configuration and disable IPv6 if your connection does not have a global "
+"IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2162
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:2306
+#: src/transport/plugin_transport_udp.c:2328
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2349
+#: src/transport/plugin_transport_udp.c:2371
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_unix.c:1356
+#: src/transport/plugin_transport_unix.c:1351
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_wlan.c:561
+#: src/transport/plugin_transport_wlan.c:560
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:580
+#: src/transport/plugin_transport_wlan.c:579
 msgid "# WLAN messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:626
-#: src/transport/plugin_transport_wlan.c:676
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:625
+#: src/transport/plugin_transport_wlan.c:675
+#: src/transport/plugin_transport_wlan.c:1695
 msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:749
+#: src/transport/plugin_transport_wlan.c:748
 msgid "# WLAN message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:767
+#: src/transport/plugin_transport_wlan.c:766
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:867
-#: src/transport/plugin_transport_wlan.c:948
-#: src/transport/plugin_transport_wlan.c:1698
+#: src/transport/plugin_transport_wlan.c:866
+#: src/transport/plugin_transport_wlan.c:947
+#: src/transport/plugin_transport_wlan.c:1697
 msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1119
+#: src/transport/plugin_transport_wlan.c:1118
 msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1140
+#: src/transport/plugin_transport_wlan.c:1139
 msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1150
+#: src/transport/plugin_transport_wlan.c:1149
 msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1207
+#: src/transport/plugin_transport_wlan.c:1206
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1306
+#: src/transport/plugin_transport_wlan.c:1305
 msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1341
+#: src/transport/plugin_transport_wlan.c:1340
 msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1402
+#: src/transport/plugin_transport_wlan.c:1401
 msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1511
+#: src/transport/plugin_transport_wlan.c:1510
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1668
+#: src/transport/plugin_transport_wlan.c:1667
 #, fuzzy, c-format
 msgid "Invalid configuration option `%s' in section `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/plugin_transport_wlan.c:1677
+#: src/transport/plugin_transport_wlan.c:1676
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1687
+#: src/transport/plugin_transport_wlan.c:1686
 #, fuzzy, c-format
 msgid "Missing configuration option `%s' in section `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/transport_api.c:570
+#: src/transport/transport_api.c:575
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
+#: src/transport/transport-testing.c:589
+#, fuzzy
+msgid "Failed to initialize testing library!\n"
+msgstr "初始化“%s”服务失败。\n"
+
 #: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
@@ -5050,89 +5202,94 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:359
+#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:982
 #, 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
+#, fuzzy, c-format
+msgid "Using `%s' instead\n"
+msgstr "%s:选项“%s”有歧义\n"
+
+#: src/util/client.c:369
+#, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:367
+#: src/util/client.c:377
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:685
+#: src/util/client.c:695
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:740 src/util/service.c:970
+#: src/util/client.c:895
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:882
-#, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:896
+#: src/util/client.c:909
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1149
+#: src/util/client.c:1162
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:890
+#: src/util/common_logging.c:258 src/util/common_logging.c:1008
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:888
+#: src/util/common_logging.c:260 src/util/common_logging.c:1006
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:886
+#: src/util/common_logging.c:262 src/util/common_logging.c:1004
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:884
+#: src/util/common_logging.c:264 src/util/common_logging.c:1002
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:892
+#: src/util/common_logging.c:266 src/util/common_logging.c:1010
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:610
+#: src/util/common_logging.c:395
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/common_logging.c:725
+#: src/util/common_logging.c:819
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:893
+#: src/util/common_logging.c:1011
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:992
+#: src/util/common_logging.c:1113
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1030
+#: src/util/common_logging.c:1151
 msgid "invalid address"
 msgstr ""
 
-#: src/util/configuration.c:244
+#: src/util/configuration.c:259
 #, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgid "Syntax error while deserializing operation at line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:816
+#: src/util/configuration.c:938
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -5177,73 +5334,87 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:280
+#: src/util/crypto_random.c:284
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:309
+#: src/util/crypto_random.c:313
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
+#: src/util/crypto_rsa.c:635 src/util/crypto_rsa.c:651
+#: src/util/crypto_rsa.c:833
+#, c-format
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgstr ""
+
+#: src/util/crypto_rsa.c:731 src/util/crypto_rsa.c:778
 #, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %s...\n"
+msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/crypto_rsa.c:666
+#: src/util/crypto_rsa.c:736
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_rsa.c:684
+#: src/util/crypto_rsa.c:754
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
+#: 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:743
+#: src/util/crypto_rsa.c:813
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:763
+#: src/util/crypto_rsa.c:851
 #, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:781
-#, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
+#: src/util/crypto_rsa.c:926
+msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1032
+#: src/util/crypto_rsa.c:935
+#, fuzzy
+msgid "internal error"
+msgstr "未知错误。\n"
+
+#: src/util/crypto_rsa.c:944 src/util/crypto_rsa.c:951
+msgid "gnunet-rsa failed"
+msgstr ""
+
+#: src/util/crypto_rsa.c:1332
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:498
+#: src/util/disk.c:571
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/disk.c:1062
+#: src/util/disk.c:1135
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/disk.c:1416 src/util/service.c:1650
+#: src/util/disk.c:1489 src/util/service.c:1665
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/util/disk.c:1734
+#: src/util/disk.c:1861
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -5323,28 +5494,28 @@
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:154
+#: src/util/gnunet-resolver.c:158
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:64
+#: src/util/gnunet-rsa.c:104
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:112
+#: src/util/gnunet-rsa.c:154
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:115
+#: src/util/gnunet-rsa.c:157
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:118
+#: src/util/gnunet-rsa.c:160
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:124
+#: src/util/gnunet-rsa.c:170
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5359,70 +5530,65 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/util/helper.c:244
+#: src/util/helper.c:254
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:259
+#: src/util/helper.c:274
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:269
+#: src/util/helper.c:290
 #, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:278
+#: src/util/helper.c:299
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/helper.c:310
+#: src/util/helper.c:337
 #, fuzzy, c-format
 msgid "Starting HELPER process `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/util/helper.c:440
+#: src/util/helper.c:476
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/network.c:1200
+#: src/util/network.c:99
 #, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr ""
+
+#: src/util/network.c:1278
+#, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:299
+#: src/util/os_installation.c:329
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:526
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/util/os_installation.c:492
+#: src/util/os_priority.c:302
 #, fuzzy, c-format
-msgid "access (%s, X_OK) failed: %s\n"
-msgstr "“%s”说:%s\n"
-
-#: src/util/os_installation.c:507
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "“%s”说:%s\n"
-
-#: src/util/os_priority.c:305
-#, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/os_priority.c:306
+#: src/util/os_priority.c:303
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -5491,143 +5657,143 @@
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:483
+#: src/util/server.c:468
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/server.c:492
+#: src/util/server.c:477
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:497
+#: src/util/server.c:488
 #, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
+msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/server.c:827
+#: src/util/server.c:819
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
-#: src/util/service.c:225 src/util/service.c:232
+#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
+#: src/util/service.c:232 src/util/service.c:239
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/util/service.c:188
+#: src/util/service.c:195
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/service.c:281
+#: src/util/service.c:288
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
 
-#: src/util/service.c:313
+#: src/util/service.c:320
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/service.c:343
+#: src/util/service.c:350
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 
-#: src/util/service.c:698
+#: src/util/service.c:705
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:703
+#: src/util/service.c:710
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/util/service.c:710
+#: src/util/service.c:717
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:765
+#: src/util/service.c:772
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:802
+#: src/util/service.c:809
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:920
+#: src/util/service.c:927
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:990
+#: src/util/service.c:1005
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1007
+#: src/util/service.c:1022
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1241
+#: src/util/service.c:1256
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1292 src/util/service.c:1310
+#: src/util/service.c:1307 src/util/service.c:1325
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1337
+#: src/util/service.c:1352
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1506
+#: src/util/service.c:1521
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/util/service.c:1539
+#: src/util/service.c:1554
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1588
+#: src/util/service.c:1603
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1592
+#: src/util/service.c:1607
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1596
+#: src/util/service.c:1611
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1651
+#: src/util/service.c:1666
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1664
+#: src/util/service.c:1679
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”:%s\n"
 
-#: src/util/service.c:1729
+#: src/util/service.c:1744
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5636,64 +5802,70 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/strings.c:144
+#: src/util/strings.c:145
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:334
+#: src/util/strings.c:385
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:481
+#: src/util/strings.c:534
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败:没有设置环境变量“HOME”"
 
-#: src/util/strings.c:573
+#: src/util/strings.c:626
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:578
-msgid "eternity"
+#: src/util/strings.c:631
+msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:582
+#: src/util/strings.c:635
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:586
+#: src/util/strings.c:639
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:590
+#: src/util/strings.c:643
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:594
-msgid " days"
+#: src/util/strings.c:648
+#, fuzzy
+msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:618
+#: src/util/strings.c:650
+#, fuzzy
+msgid "days"
+msgstr " 天"
+
+#: src/util/strings.c:674
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1012
+#: src/util/strings.c:1063
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1020
+#: src/util/strings.c:1071
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1026
+#: src/util/strings.c:1077
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1033
+#: src/util/strings.c:1084
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1042
+#: src/util/strings.c:1093
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
@@ -5859,27 +6031,55 @@
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:329
+#: src/vpn/gnunet-vpn.c:333
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:497 src/include/gnunet_common.h:502
-#: src/include/gnunet_common.h:508
+#: src/include/gnunet_common.h:507 src/include/gnunet_common.h:512
+#: src/include/gnunet_common.h:518
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:518
+#: src/include/gnunet_common.h:528
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:539 src/include/gnunet_common.h:546
+#: src/include/gnunet_common.h:549 src/include/gnunet_common.h:556
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not create namespace `%s'\n"
+#~ msgstr "无法解析“%s”(%s):%s\n"
+
+#, fuzzy
+#~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
+
+#, fuzzy
+#~ msgid "Namestore removed record successfully"
+#~ msgstr "GNUnet 服务安装成功。\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Could not open hostkeys file: %s\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "access (%s, X_OK) failed: %s\n"
+#~ msgstr "“%s”说:%s\n"
+
+#, fuzzy
+#~ msgid "stat (%s) failed: %s\n"
+#~ msgstr "“%s”说:%s\n"
+
+#, fuzzy
 #~ msgid "# Peers connected"
 #~ msgstr ""
 #~ "\n"
@@ -5947,10 +6147,6 @@
 #~ msgstr "服务已删除。\n"
 
 #, fuzzy
-#~ msgid "Unable to start service `%s': %s\n"
-#~ msgstr "无法保存配置文件“%s”:"
-
-#, fuzzy
 #~ msgid "Unable to accept connection for service `%s': %s\n"
 #~ msgstr "无法保存配置文件“%s”:"
 
@@ -6511,9 +6707,6 @@
 #~ msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 #~ msgstr "实时延迟冲突(%llu 毫秒),于 %s:%u\n"
 
-#~ msgid "`%s' failed with error code %d: %s\n"
-#~ msgstr "“%s”以错误码 %d 失败:%s\n"
-
 #~ msgid "Deadlock due to `%s'.\n"
 #~ msgstr "“%s”造成了死锁。\n"
 




reply via email to

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