[GNUnet-SVN] r18843 - in gnunet: po src/integration-tests

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18843 - in gnunet: po src/integration-tests

From:	gnunet
Subject:	[GNUnet-SVN] r18843 - in gnunet: po src/integration-tests
Date:	Mon, 26 Dec 2011 22:22:07 +0100
Author: grothoff
Date: 2011-12-26 22:22:07 +0100 (Mon, 26 Dec 2011)
New Revision: 18843

Modified:
   gnunet/po/POTFILES.in
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/integration-tests/Makefile.am
Log:
-cleaning up for disting

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2011-12-26 21:20:00 UTC (rev 18842)
+++ gnunet/po/POTFILES.in       2011-12-26 21:22:07 UTC (rev 18843)
@@ -293,7 +293,6 @@
 src/include/gnunet_directories.h
 src/include/gnunet_mesh_service.h
 src/include/gnunet_chat_service.h
-src/include/gnunet_upnp_service.h
 src/include/gnunet_client_lib.h
 src/include/gnunet_container_lib.h
 src/include/gnunet_signatures.h

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2011-12-26 21:20:00 UTC (rev 18842)
+++ gnunet/po/de.po     2011-12-26 21:22:07 UTC (rev 18843)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-11-30 16:20+0100\n"
+"POT-Creation-Date: 2011-12-26 22:22+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -22,16 +22,18 @@
 #: src/datastore/plugin_datastore_mysql.c:146
 #: src/datastore/plugin_datastore_mysql.c:613
 #: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:90 src/datacache/plugin_datacache_sqlite.c:71
+#: src/datastore/plugin_datastore_mysql.c:685
+#: src/datastore/plugin_datastore_mysql.c:1362
+#: src/datastore/plugin_datastore_mysql.c:1376 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:92 src/datacache/plugin_datacache_sqlite.c:71
 #: src/datacache/plugin_datacache_sqlite.c:74
 #: src/datacache/plugin_datacache_mysql.c:103
 #: src/datacache/plugin_datacache_mysql.c:110
 #: src/datacache/plugin_datacache_mysql.c:517
 #: src/datacache/plugin_datacache_mysql.c:526
 #: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:394
-#: src/include/gnunet_common.h:401
+#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:458
+#: src/include/gnunet_common.h:465
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -61,18 +63,18 @@
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1124
+#: src/datastore/plugin_datastore_sqlite.c:1161
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1143
+#: src/datastore/plugin_datastore_sqlite.c:1180
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1182
+#: src/datastore/plugin_datastore_sqlite.c:1220
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -90,16 +92,18 @@
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
 #: src/datastore/plugin_datastore_mysql.c:529
+#: src/datastore/plugin_datastore_mysql.c:1336
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
 #: src/datastore/plugin_datastore_mysql.c:622
+#: src/datastore/plugin_datastore_mysql.c:1346
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1500
+#: src/datastore/plugin_datastore_mysql.c:1581
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -114,7 +118,7 @@
 msgid "Unable to initialize Postgres with configuration `%s': %s"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/datastore/plugin_datastore_postgres.c:979
+#: src/datastore/plugin_datastore_postgres.c:1017
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -159,72 +163,72 @@
 msgid "# bytes sent to datastore"
 msgstr "# bytes in der Datenbank"
 
-#: src/datastore/datastore_api.c:768
+#: src/datastore/datastore_api.c:772
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:781
+#: src/datastore/datastore_api.c:786
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
+#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/datastore/datastore_api.c:805
+#: src/datastore/datastore_api.c:810
 #, fuzzy
 msgid "# status messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:876
+#: src/datastore/datastore_api.c:883
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:947
+#: src/datastore/datastore_api.c:954
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1012
+#: src/datastore/datastore_api.c:1019
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1073
+#: src/datastore/datastore_api.c:1080
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1141
+#: src/datastore/datastore_api.c:1148
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1186
+#: src/datastore/datastore_api.c:1193
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1246
+#: src/datastore/datastore_api.c:1253
 #, fuzzy
 msgid "# Results received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/datastore/datastore_api.c:1317
+#: src/datastore/datastore_api.c:1324
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1384
+#: src/datastore/datastore_api.c:1391
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1448
+#: src/datastore/datastore_api.c:1455
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# dht Anfragen weitergeleitet"
@@ -233,152 +237,170 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:52
+#: src/datastore/gnunet-service-datastore.c:347
 #, fuzzy
-msgid "# bytes used in file-sharing datastore"
-msgstr "# bytes erlaubt in der Datenbank"
-
-#: src/datastore/gnunet-service-datastore.c:331
-#, fuzzy
 msgid "# bytes expired"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/datastore/gnunet-service-datastore.c:397
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:457
+#: src/datastore/gnunet-service-datastore.c:480
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:610
+#: src/datastore/gnunet-service-datastore.c:634
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:655
+#: src/datastore/gnunet-service-datastore.c:679
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:666
+#: src/datastore/gnunet-service-datastore.c:690
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:670
+#: src/datastore/gnunet-service-datastore.c:694
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:676
+#: src/datastore/gnunet-service-datastore.c:700
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:681
-#: src/datastore/gnunet-service-datastore.c:735
-#: src/datastore/gnunet-service-datastore.c:956
-#: src/datastore/gnunet-service-datastore.c:1441
+#: src/datastore/gnunet-service-datastore.c:705
+#: src/datastore/gnunet-service-datastore.c:759
+#: src/datastore/gnunet-service-datastore.c:980
+#: src/datastore/gnunet-service-datastore.c:1459
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:750
+#: src/datastore/gnunet-service-datastore.c:774
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
-#: src/datacache/datacache.c:248
+#: src/datastore/gnunet-service-datastore.c:848 src/datacache/datacache.c:118
+#: src/datacache/datacache.c:255
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# bytes in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datastore/gnunet-service-datastore.c:862
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1004
+#: src/datastore/gnunet-service-datastore.c:1028
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1042
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
+#: src/datastore/gnunet-service-datastore.c:1070
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:1104
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1115
+#: src/datastore/gnunet-service-datastore.c:1139
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1142
+#: src/datastore/gnunet-service-datastore.c:1166
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1152
+#: src/datastore/gnunet-service-datastore.c:1176
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1210
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1230
+#: src/datastore/gnunet-service-datastore.c:1254
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
-#: src/datacache/datacache.c:151
-#, fuzzy, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
-
-#: src/datastore/gnunet-service-datastore.c:1303
+#: src/datastore/gnunet-service-datastore.c:1317
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1312
+#: src/datastore/gnunet-service-datastore.c:1326
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/datastore/gnunet-service-datastore.c:1525
+#: src/datastore/gnunet-service-datastore.c:1536 src/datacache/datacache.c:144
+#: src/datacache/datacache.c:151
+#, fuzzy, c-format
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+
+#: src/datastore/gnunet-service-datastore.c:1530
+#, fuzzy, c-format
+msgid "# bytes used in file-sharing datastore `%s'"
+msgstr "# bytes erlaubt in der Datenbank"
+
+#: src/datastore/gnunet-service-datastore.c:1541
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1493
+#: src/datastore/gnunet-service-datastore.c:1543
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1556
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1516
+#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1590
+#, fuzzy, c-format
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/datastore/gnunet-service-datastore.c:1620
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
+#: src/datastore/gnunet-service-datastore.c:1649
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1654
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1657
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
 #: src/core/gnunet-service-core_sessions.c:208
 #: src/core/gnunet-service-core_sessions.c:273
 msgid "# entries in session map"
@@ -464,137 +486,137 @@
 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_kx.c:491
+#: src/core/gnunet-service-core_kx.c:493
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:541
+#: src/core/gnunet-service-core_kx.c:543
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
+#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
 #: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-service-core_kx.c:618
+#: src/core/gnunet-service-core_kx.c:620
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:668
+#: src/core/gnunet-service-core_kx.c:670
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:689
+#: src/core/gnunet-service-core_kx.c:691
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:741
+#: src/core/gnunet-service-core_kx.c:743
 #, fuzzy
 msgid "# session keys received"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/core/gnunet-service-core_kx.c:760
+#: src/core/gnunet-service-core_kx.c:762
 #, fuzzy, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
 
-#: src/core/gnunet-service-core_kx.c:798
+#: src/core/gnunet-service-core_kx.c:800
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:878
-#: src/transport/gnunet-service-transport_validation.c:778
+#: src/core/gnunet-service-core_kx.c:880
+#: src/transport/gnunet-service-transport_validation.c:780
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:912
+#: src/core/gnunet-service-core_kx.c:914
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:935
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1021
+#: src/core/gnunet-service-core_kx.c:1023
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1032
+#: src/core/gnunet-service-core_kx.c:1034
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1090
-#: src/transport/gnunet-service-transport_validation.c:983
+#: src/core/gnunet-service-core_kx.c:1092
+#: src/transport/gnunet-service-transport_validation.c:985
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1120
+#: src/core/gnunet-service-core_kx.c:1122
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1152
+#: src/core/gnunet-service-core_kx.c:1154
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1218
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1357
+#: src/core/gnunet-service-core_kx.c:1359
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1399
-#: src/core/gnunet-service-core_kx.c:1424
+#: src/core/gnunet-service-core_kx.c:1401
+#: src/core/gnunet-service-core_kx.c:1426
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1411
+#: src/core/gnunet-service-core_kx.c:1413
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1448
+#: src/core/gnunet-service-core_kx.c:1450
 #, 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:1452
+#: src/core/gnunet-service-core_kx.c:1454
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1460
+#: src/core/gnunet-service-core_kx.c:1462
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1523
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/core/gnunet-service-core_kx.c:1529
+#: src/core/gnunet-service-core_kx.c:1531
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1539
-#: src/transport/gnunet-service-transport.c:542
+#: src/core/gnunet-service-core_kx.c:1541
+#: src/transport/gnunet-service-transport.c:578
 #: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
 #, fuzzy, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
@@ -626,46 +648,46 @@
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:860
+#: src/util/common_logging.c:239 src/util/common_logging.c:890
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:858
+#: src/util/common_logging.c:241 src/util/common_logging.c:888
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:856
+#: src/util/common_logging.c:243 src/util/common_logging.c:886
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:854
+#: src/util/common_logging.c:245 src/util/common_logging.c:884
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:862
+#: src/util/common_logging.c:247 src/util/common_logging.c:892
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:578
+#: src/util/common_logging.c:610
 #, 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:695
+#: src/util/common_logging.c:725
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:863
+#: src/util/common_logging.c:893
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:945
+#: src/util/common_logging.c:975
 #, fuzzy
 msgid "unknown address"
 msgstr "Unbekannter Fehler"
 
-#: src/util/common_logging.c:983
+#: src/util/common_logging.c:1013
 #, fuzzy
 msgid "invalid address"
 msgstr "Ungültige Parameter: "
@@ -820,7 +842,7 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/util/network.c:1197
+#: src/util/network.c:1204
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -833,12 +855,12 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:477
+#: src/util/os_installation.c:482
 #, 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:483
+#: src/util/os_installation.c:488
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
@@ -847,40 +869,40 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:355
+#: src/util/strings.c:354
 #, c-format
-msgid "Character set requested was `%s'\n"
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:433
+#: src/util/strings.c:462
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:525
+#: src/util/strings.c:554
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:530
+#: src/util/strings.c:559
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:534
+#: src/util/strings.c:563
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:538
+#: src/util/strings.c:567
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:542
+#: src/util/strings.c:571
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:546
+#: src/util/strings.c:575
 msgid " days"
 msgstr " Tage"
 
-#: src/util/strings.c:570
+#: src/util/strings.c:599
 msgid "end of time"
 msgstr ""
 
@@ -917,22 +939,22 @@
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/disk.c:434
+#: src/util/disk.c:466
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk.c:834
+#: src/util/disk.c:866
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1186 src/util/service.c:1452
+#: src/util/disk.c:1218 src/util/service.c:1541
 #, 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:1491
+#: src/util/disk.c:1523
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
@@ -994,7 +1016,7 @@
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:2228
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -1016,58 +1038,62 @@
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:947 src/transport/plugin_transport_http.c:996
+#: src/util/service.c:947 src/transport/plugin_transport_http.c:1057
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/service.c:964 src/transport/plugin_transport_http.c:1013
+#: src/util/service.c:964 src/transport/plugin_transport_http.c:1074
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/util/service.c:1120 src/util/service.c:1138
+#: src/util/service.c:1152
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+
+#: src/util/service.c:1203 src/util/service.c:1221
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/service.c:1248
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1314
+#: src/util/service.c:1403
 #, 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:1347
+#: src/util/service.c:1436
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1393
+#: src/util/service.c:1482
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1397
+#: src/util/service.c:1486
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1401
+#: src/util/service.c:1490
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1453
+#: src/util/service.c:1542
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1466
+#: src/util/service.c:1555
 #, 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:1529
+#: src/util/service.c:1618
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1075,8 +1101,15 @@
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_priority.c:114
+#: src/util/container_bloomfilter.c:507
 #, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+
+#: src/util/os_priority.c:116
+#, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
@@ -1128,12 +1161,12 @@
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:266
+#: src/util/pseudonym.c:273
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/util/pseudonym.c:330
+#: src/util/pseudonym.c:337
 #, fuzzy
 msgid "no-name"
 msgstr "Name anzeigen"
@@ -1219,75 +1252,75 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
+#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/crypto_rsa.c:621
+#: src/util/crypto_rsa.c:623
 #, 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:639
+#: src/util/crypto_rsa.c:641
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
+#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:698
+#: src/util/crypto_rsa.c:700
 #, 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:718
+#: src/util/crypto_rsa.c:720
 #, 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:736
+#: src/util/crypto_rsa.c:738
 #, 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:957
+#: src/util/crypto_rsa.c:959
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/nse/gnunet-nse-profiler.c:634 src/dht/gnunet-dht-get.c:213
+#: src/nse/gnunet-nse-profiler.c:882 src/dht/gnunet-dht-get.c:213
 #: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:596
 #: src/fs/gnunet-download.c:263
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:652
+#: src/nse/gnunet-nse-profiler.c:900
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:903
+#: src/nse/gnunet-service-nse.c:935
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1328 src/nse/gnunet-service-nse.c:1347
-#: src/nse/gnunet-service-nse.c:1368
+#: src/nse/gnunet-service-nse.c:1390 src/nse/gnunet-service-nse.c:1409
+#: src/nse/gnunet-service-nse.c:1430
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1335
+#: src/nse/gnunet-service-nse.c:1397
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/nse/gnunet-service-nse.c:1356
+#: src/nse/gnunet-service-nse.c:1418
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -1347,22 +1380,22 @@
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/datacache.c:176
+#: src/datacache/datacache.c:183
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:184
+#: src/datacache/datacache.c:191
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/datacache/datacache.c:274
+#: src/datacache/datacache.c:281
 #, fuzzy
 msgid "# requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datacache/datacache.c:284
+#: src/datacache/datacache.c:291
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
@@ -1383,101 +1416,101 @@
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:479
+#: src/dht/gnunet-service-dht_neighbours.c:481
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:571
+#: src/dht/gnunet-service-dht_neighbours.c:573
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:627
-#: src/dht/gnunet-service-dht_neighbours.c:687
+#: src/dht/gnunet-service-dht_neighbours.c:629
+#: src/dht/gnunet-service-dht_neighbours.c:689
 #, fuzzy
 msgid "# Peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/dht/gnunet-service-dht_neighbours.c:721
+#: src/dht/gnunet-service-dht_neighbours.c:723
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/dht/gnunet-service-dht_neighbours.c:776
+#: src/dht/gnunet-service-dht_neighbours.c:778
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:814
+#: src/dht/gnunet-service-dht_neighbours.c:816
 #, fuzzy
 msgid "# Bytes of bandwdith requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1038
-#: src/dht/gnunet-service-dht_neighbours.c:1066
+#: src/dht/gnunet-service-dht_neighbours.c:1040
+#: src/dht/gnunet-service-dht_neighbours.c:1068
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1047
-#: src/dht/gnunet-service-dht_neighbours.c:1083
+#: src/dht/gnunet-service-dht_neighbours.c:1049
+#: src/dht/gnunet-service-dht_neighbours.c:1085
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1219
+#: src/dht/gnunet-service-dht_neighbours.c:1221
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1250
+#: src/dht/gnunet-service-dht_neighbours.c:1252
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1331
+#: src/dht/gnunet-service-dht_neighbours.c:1333
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1362
+#: src/dht/gnunet-service-dht_neighbours.c:1364
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1465
+#: 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:1553
+#: 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:1662
+#: src/dht/gnunet-service-dht_neighbours.c:1664
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1670
+#: src/dht/gnunet-service-dht_neighbours.c:1672
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1761
+#: src/dht/gnunet-service-dht_neighbours.c:1763
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1805
+#: src/dht/gnunet-service-dht_neighbours.c:1807
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1819
+#: src/dht/gnunet-service-dht_neighbours.c:1821
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1885
+#: src/dht/gnunet-service-dht_neighbours.c:1887
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
@@ -1675,293 +1708,268 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/arm/gnunet-arm.c:161
+#: src/arm/gnunet-arm.c:149
 #, fuzzy, c-format
+msgid "Service `%s' is unknown to ARM.\n"
+msgstr "Namespace `%s' hat das Rating %d.\n"
+
+#: src/arm/gnunet-arm.c:154
+#, fuzzy, c-format
+msgid "Service `%s' has been stopped.\n"
+msgstr "Dienst gelöscht.\n"
+
+#: src/arm/gnunet-arm.c:157
+#, fuzzy, c-format
+msgid "Service `%s' was already running.\n"
+msgstr "Diese Suche läuft bereits!\n"
+
+#: src/arm/gnunet-arm.c:162
+#, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Dienst gelöscht.\n"
 
 #: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "Failed to stop service `%s'!\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
+msgid "Service `%s' was already being stopped.\n"
+msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-arm.c:171
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Dienst gelöscht.\n"
+msgid "Service `%s' was already not running.\n"
+msgstr "Diese Suche läuft bereits!\n"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:173
 #, fuzzy, c-format
-msgid "Failed to start service `%s'!\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+msgid "Request ignored as ARM is shutting down.\n"
+msgstr "`%s' fährt herunter.\n"
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:177
 #, fuzzy, c-format
-msgid "Some error communicating with service `%s'.\n"
+msgid "Error communicating with ARM service.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:207
+#: src/arm/gnunet-arm.c:181
 #, fuzzy, c-format
-msgid "Service `%s' is running.\n"
-msgstr "Namespace `%s' hat das Rating %d.\n"
+msgid "Timeout communicating with ARM service.\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:212
+#: src/arm/gnunet-arm.c:185
 #, fuzzy, c-format
-msgid "Service `%s' is not running.\n"
-msgstr "`%s' ist keine Datei.\n"
+msgid "Operation failed.\n"
+msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:238
+#: src/arm/gnunet-arm.c:189
+#, c-format
+msgid "Unknown response code from ARM.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:216
 #, 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:246 src/arm/gnunet-arm.c:356
+#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:269
+#: src/arm/gnunet-arm.c:247
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:275
+#: src/arm/gnunet-arm.c:253
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:387
+#: src/arm/gnunet-arm.c:355
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:389
+#: src/arm/gnunet-arm.c:357
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:359
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:393
+#: src/arm/gnunet-arm.c:361
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:396
+#: src/arm/gnunet-arm.c:364
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:399
-msgid "test if a particular service is running"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:402
+#: src/arm/gnunet-arm.c:367
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:404
+#: src/arm/gnunet-arm.c:369
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:407
+#: src/arm/gnunet-arm.c:372
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:383
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:957
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
+#: src/arm/mockup-service.c:46
 msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
+#: src/arm/mockup-service.c:69
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:206
-#, c-format
-msgid "Restarting service `%s' due to configuration file change.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:234
-#, fuzzy
-msgid "Could not send status result to client\n"
-msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
-
-#: src/arm/gnunet-service-arm.c:268
-msgid "Not sending status result to client: no client known\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:406
+#: src/arm/gnunet-service-arm.c:320
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:409
+#: src/arm/gnunet-service-arm.c:323
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:435
-#, c-format
-msgid "ARM is shutting down, service `%s' not started.\n"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:349
+#, fuzzy
+msgid "Could not send status result to client\n"
+msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:443
+#: src/arm/gnunet-service-arm.c:476
 #, fuzzy, c-format
-msgid "Service `%s' already running.\n"
-msgstr "Diese Suche läuft bereits!\n"
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/arm/gnunet-service-arm.c:453
-#, fuzzy, c-format
-msgid "Binary implementing service `%s' not known!\n"
+#: src/arm/gnunet-service-arm.c:498
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
-"Signatur kann nicht verifiziert werden, der Knoten `%s' ist uns nicht "
-"bekannt!\n"
 
-#: src/arm/gnunet-service-arm.c:464
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not known!\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+#: src/arm/gnunet-service-arm.c:512
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:498
+#: src/arm/gnunet-service-arm.c:620
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:666
-msgid "Stopping all services\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:723
+#: src/arm/gnunet-service-arm.c:774
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:796
+#: src/arm/gnunet-service-arm.c:868
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:801
+#: src/arm/gnunet-service-arm.c:873
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:806
+#: src/arm/gnunet-service-arm.c:878
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:813
+#: src/arm/gnunet-service-arm.c:912
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1050
 #, fuzzy, c-format
-msgid "Service `%s' stopped\n"
-msgstr "Dienst gelöscht.\n"
+msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/arm/gnunet-service-arm.c:827
+#: src/arm/gnunet-service-arm.c:1052
+msgid "option missing"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1129
+#, fuzzy, c-format
+msgid "Starting default services `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/arm/gnunet-service-arm.c:1140
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
+msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/arm_api.c:201
+#: src/arm/gnunet-service-arm.c:1154
+msgid ""
+"No default services configured, GNUnet will not really start right now.\n"
+msgstr ""
+
+#: src/arm/arm_api.c:187
 #, fuzzy
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/arm/arm_api.c:389
+#: src/arm/arm_api.c:378
 #, 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:403
+#: src/arm/arm_api.c:392
 #, 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:467
+#: src/arm/arm_api.c:465
 #, 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:536
+#: src/arm/arm_api.c:521
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:537
+#: src/arm/arm_api.c:522
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:559
+#: src/arm/arm_api.c:544
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:560
+#: src/arm/arm_api.c:546
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:592
+#: src/arm/arm_api.c:579
 #, 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:664
+#: src/arm/arm_api.c:652
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "Keine Antwort innerhalb %llums erhalten.\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:803
-#, c-format
-msgid "Unable to forward to service `%s': shutdown\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:812
-#, c-format
-msgid "Unable to forward to service `%s': timeout before connect\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:868
-#, fuzzy, c-format
-msgid "Unable to start service `%s': %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#: src/arm/gnunet-service-arm_interceptor.c:936
-#, fuzzy, c-format
-msgid "Unable to accept connection for service `%s': %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#: src/arm/gnunet-service-arm_interceptor.c:952
-#, fuzzy, c-format
-msgid "Service `%s' started\n"
-msgstr "Dienst gelöscht.\n"
-
-#: src/arm/gnunet-service-arm_interceptor.c:1080
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Fehler beim Anlegen des Benutzerkontos:"
-
-#: src/arm/gnunet-service-arm_interceptor.c:1102
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:1116
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
-msgstr ""
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -2022,34 +2030,38 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/statistics_api.c:327
+#: src/statistics/statistics_api.c:390
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:89
+#: src/statistics/gnunet-statistics.c:98
 #, fuzzy, c-format
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#: src/statistics/gnunet-statistics.c:126 src/fs/gnunet-pseudonym.c:151
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/statistics/gnunet-statistics.c:155
-msgid "limit output to statistcs for the given NAME"
+#: src/statistics/gnunet-statistics.c:164
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:158
+#: src/statistics/gnunet-statistics.c:167
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:161
+#: src/statistics/gnunet-statistics.c:170
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
+#: src/statistics/gnunet-statistics.c:173
+msgid "just print the statistics value"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:180
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
@@ -2071,7 +2083,7 @@
 msgstr "Dateien deindizieren."
 
 #: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
-#: src/fs/gnunet-publish.c:158 src/fs/gnunet-download.c:144
+#: src/fs/gnunet-publish.c:163 src/fs/gnunet-download.c:144
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -2082,7 +2094,7 @@
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
 #: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
-#: src/fs/gnunet-publish.c:412 src/fs/gnunet-download.c:203
+#: src/fs/gnunet-publish.c:417 src/fs/gnunet-download.c:203
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
@@ -2107,7 +2119,7 @@
 msgid "Option `%s' ignored\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:538
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:543
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
@@ -2128,7 +2140,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:282 src/fs/gnunet-publish.c:557
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:562
 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 "
@@ -2147,7 +2159,7 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:576
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:581
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2182,39 +2194,39 @@
 msgid "Failed to write `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:335
+#: src/fs/fs_namespace.c:338
 #, fuzzy
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
+#: src/fs/fs_namespace.c:427 src/fs/fs_namespace.c:448
 #, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_namespace.c:464
+#: src/fs/fs_namespace.c:467
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:507
+#: src/fs/fs_namespace.c:510
 #, 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:609
+#: src/fs/fs_namespace.c:612
 #, 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:834 src/fs/fs_publish.c:1523
+#: src/fs/fs_namespace.c:840 src/fs/fs_publish.c:1535
 #, fuzzy
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_namespace.c:878
+#: src/fs/fs_namespace.c:884
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -2328,11 +2340,11 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
+#: src/fs/fs_uri.c:1109 src/fs/fs_uri.c:1136
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1265
+#: src/fs/fs_uri.c:1142
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2356,81 +2368,86 @@
 msgid "URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:267
+#: src/fs/gnunet-publish.c:160
 #, fuzzy, c-format
+msgid "Cleanup after abort complete.\n"
+msgstr "`%s' Startvorgang abgeschlossen.\n"
+
+#: src/fs/gnunet-publish.c:272
+#, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:269
+#: src/fs/gnunet-publish.c:274
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:320
+#: src/fs/gnunet-publish.c:325
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-publish.c:362
+#: src/fs/gnunet-publish.c:367
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:369
+#: src/fs/gnunet-publish.c:374
 #, 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:375
+#: src/fs/gnunet-publish.c:380
 #, 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:383
+#: src/fs/gnunet-publish.c:388
 #, 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:393 src/fs/gnunet-publish.c:400
-#: src/transport/gnunet-transport.c:506
+#: src/fs/gnunet-publish.c:398 src/fs/gnunet-publish.c:405
+#: src/transport/gnunet-transport.c:502
 #, 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:422
+#: src/fs/gnunet-publish.c:427
 #, 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:434 src/fs/gnunet-download.c:175
+#: src/fs/gnunet-publish.c:439 src/fs/gnunet-download.c:175
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/fs/gnunet-publish.c:467
+#: src/fs/gnunet-publish.c:472
 #, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:497
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:515
+#: src/fs/gnunet-publish.c:520
 #, fuzzy, c-format
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:547
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:545
+#: src/fs/gnunet-publish.c:550
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:549
+#: src/fs/gnunet-publish.c:554
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2438,7 +2455,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:558
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2446,7 +2463,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:560
+#: src/fs/gnunet-publish.c:565
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2454,7 +2471,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:570
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2462,40 +2479,40 @@
 "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:569
+#: src/fs/gnunet-publish.c:574
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-publish.c:573
+#: src/fs/gnunet-publish.c:578
 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:579
+#: src/fs/gnunet-publish.c:584
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:583
+#: src/fs/gnunet-publish.c:588
 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:587
+#: src/fs/gnunet-publish.c:592
 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:600
+#: src/fs/gnunet-publish.c:605
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:803
+#: src/fs/fs_search.c:810
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2565,104 +2582,104 @@
 msgid "# Pending requests created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:368 src/fs/gnunet-service-fs_pr.c:622
+#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:623
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:786
+#: src/fs/gnunet-service-fs_pr.c:787
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:813
+#: src/fs/gnunet-service-fs_pr.c:814
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:830
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:845
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:936
+#: src/fs/gnunet-service-fs_pr.c:965
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:963
+#: src/fs/gnunet-service-fs_pr.c:992
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:998
+#: src/fs/gnunet-service-fs_pr.c:1027
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1088
+#: src/fs/gnunet-service-fs_pr.c:1120
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1109
+#: src/fs/gnunet-service-fs_pr.c:1141
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1156
+#: src/fs/gnunet-service-fs_pr.c:1188
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1170
+#: src/fs/gnunet-service-fs_pr.c:1202
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1179
+#: src/fs/gnunet-service-fs_pr.c:1211
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1195
+#: src/fs/gnunet-service-fs_pr.c:1227
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1212
+#: src/fs/gnunet-service-fs_pr.c:1244
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1225
+#: src/fs/gnunet-service-fs_pr.c:1257
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1230
+#: src/fs/gnunet-service-fs_pr.c:1262
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
-#: src/fs/gnunet-service-fs_pr.c:1437
+#: src/fs/gnunet-service-fs_pr.c:1289 src/fs/gnunet-service-fs_pr.c:1329
+#: src/fs/gnunet-service-fs_pr.c:1469
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1315
+#: src/fs/gnunet-service-fs_pr.c:1347
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1328
+#: src/fs/gnunet-service-fs_pr.c:1360
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1414
+#: src/fs/gnunet-service-fs_pr.c:1446
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1495
+#: src/fs/gnunet-service-fs_pr.c:1530
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:1586 src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1629 src/fs/gnunet-service-fs_pr.c:1638
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
@@ -2705,12 +2722,12 @@
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
-#: src/transport/gnunet-service-transport_neighbours.c:934
-#: src/transport/gnunet-service-transport_neighbours.c:939
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1541
+#: src/transport/gnunet-service-transport_neighbours.c:936
 #: src/transport/gnunet-service-transport_neighbours.c:1263
-#: src/transport/gnunet-service-transport_neighbours.c:2364
-#: src/transport/gnunet-service-transport_neighbours.c:2430
+#: src/transport/gnunet-service-transport_neighbours.c:1735
+#: src/transport/gnunet-service-transport_neighbours.c:2369
+#: src/transport/gnunet-service-transport_neighbours.c:2437
 #: src/topology/gnunet-daemon-topology.c:654
 #: src/topology/gnunet-daemon-topology.c:756
 #, fuzzy
@@ -2736,71 +2753,75 @@
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
-#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
+#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:843
+#: src/fs/gnunet-service-fs_cp.c:858
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:916
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:930
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:968
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1025
+#: src/fs/gnunet-service-fs_cp.c:1035
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1049
+#: src/fs/gnunet-service-fs_cp.c:1059
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1059
+#: src/fs/gnunet-service-fs_cp.c:1069
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1138
+#: src/fs/gnunet-service-fs_cp.c:1148
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1172
+#: src/fs/gnunet-service-fs_cp.c:1182
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1196
+#: src/fs/gnunet-service-fs_cp.c:1206
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1262
+#: src/fs/gnunet-service-fs_cp.c:1272
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1290
+#: 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:1331
+#: 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:1696
+#, fuzzy
+msgid "# migration stop messages sent"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
+
 #: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
@@ -2837,26 +2858,26 @@
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:487
+#: src/fs/gnunet-service-fs_indexing.c:490
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:545
+#: src/fs/gnunet-service-fs_indexing.c:548
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:560
+#: src/fs/gnunet-service-fs_indexing.c:563
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:562
+#: src/fs/gnunet-service-fs_indexing.c:565
 #, fuzzy
 msgid "not indexed"
 msgstr "Deindizierung schlug fehl."
 
-#: src/fs/gnunet-service-fs_indexing.c:577
+#: src/fs/gnunet-service-fs_indexing.c:580
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
@@ -2885,35 +2906,35 @@
 msgid "Failed to read file"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/fs/fs_unindex.c:235
+#: src/fs/fs_unindex.c:236
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:243
+#: src/fs/fs_unindex.c:244
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:251
+#: src/fs/fs_unindex.c:252
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/fs/fs_unindex.c:296
+#: src/fs/fs_unindex.c:297
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:331
+#: src/fs/fs_unindex.c:332
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_unindex.c:344
+#: src/fs/fs_unindex.c:345
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:378
+#: src/fs/fs_unindex.c:379
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -2986,74 +3007,74 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:150 src/fs/fs_publish.c:421
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
-#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
+#: src/fs/fs_publish.c:658 src/fs/fs_publish.c:675 src/fs/fs_publish.c:714
+#: src/fs/fs_publish.c:734 src/fs/fs_publish.c:761 src/fs/fs_publish.c:909
 #, 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:654
+#: src/fs/fs_publish.c:660
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:666
+#: src/fs/fs_publish.c:672
 #, fuzzy
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:709
+#: src/fs/fs_publish.c:715
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:729
+#: src/fs/fs_publish.c:735
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:756
+#: src/fs/fs_publish.c:762
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:780
+#: src/fs/fs_publish.c:786
 #, 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:850
+#: src/fs/fs_publish.c:856
 #, 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:856
+#: src/fs/fs_publish.c:862
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:904
+#: src/fs/fs_publish.c:910
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1083
+#: src/fs/fs_publish.c:1092
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1154
+#: src/fs/fs_publish.c:1163
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1487
+#: src/fs/fs_publish.c:1499
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -3093,41 +3114,41 @@
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1984
+#: src/fs/fs_api.c:1992
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1994
+#: src/fs/fs_api.c:2002
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2107 src/fs/fs_api.c:2346
+#: src/fs/fs_api.c:2128 src/fs/fs_api.c:2367
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2124
+#: src/fs/fs_api.c:2145
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
+#: src/fs/fs_api.c:2157 src/fs/fs_api.c:2176 src/fs/fs_api.c:2652
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2337
+#: src/fs/fs_api.c:2358
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2583
+#: src/fs/fs_api.c:2604
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2669
+#: src/fs/fs_api.c:2690
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3188,28 +3209,28 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/fs/gnunet-service-fs.c:581 src/topology/gnunet-daemon-topology.c:1290
+#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
 #: src/topology/gnunet-daemon-topology.c:1297
-#: src/hostlist/gnunet-daemon-hostlist.c:295
+#: src/hostlist/gnunet-daemon-hostlist.c:297
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_file_information.c:350
+#: src/fs/fs_file_information.c:349
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s': %s"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:466
+#: src/transport/gnunet-service-transport_neighbours.c:468
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:855
+#: src/transport/gnunet-service-transport_neighbours.c:859
 #, fuzzy
 msgid "# peers disconnected due to external request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -3219,88 +3240,88 @@
 msgid "# fast reconnects failed"
 msgstr "# verbundener Knoten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:997
+#: src/transport/gnunet-service-transport_neighbours.c:998
 #, fuzzy
 msgid "# peers disconnected due to timeout"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1022
+#: src/transport/gnunet-service-transport_neighbours.c:1023
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1064
+#: src/transport/gnunet-service-transport_neighbours.c:1065
 #, fuzzy
 msgid "# peers disconnected due to global disconnect"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1778
-#: src/transport/gnunet-service-transport_neighbours.c:1799
+#: src/transport/gnunet-service-transport_neighbours.c:1781
+#: src/transport/gnunet-service-transport_neighbours.c:1802
 #, fuzzy
 msgid "# messages not sent (no such peer or not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1815
+#: src/transport/gnunet-service-transport_neighbours.c:1818
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1867
+#: src/transport/gnunet-service-transport_neighbours.c:1870
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1903
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1921
+#: src/transport/gnunet-service-transport_neighbours.c:1924
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1950
+#: src/transport/gnunet-service-transport_neighbours.c:1953
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2002
+#: src/transport/gnunet-service-transport_neighbours.c:2005
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2010
+#: src/transport/gnunet-service-transport_neighbours.c:2013
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2076
+#: src/transport/gnunet-service-transport_neighbours.c:2079
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2094
+#: src/transport/gnunet-service-transport_neighbours.c:2097
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2212
+#: src/transport/gnunet-service-transport_neighbours.c:2215
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2225
+#: src/transport/gnunet-service-transport_neighbours.c:2228
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2302
+#: src/transport/gnunet-service-transport_neighbours.c:2305
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2319
+#: src/transport/gnunet-service-transport_neighbours.c:2322
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2410
+#: src/transport/gnunet-service-transport_neighbours.c:2415
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
@@ -3361,35 +3382,35 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1529
+#: src/transport/plugin_transport_udp.c:1567
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp.c:1567
+#: src/transport/plugin_transport_udp.c:1610
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp.c:2063
-#: src/transport/plugin_transport_udp_new.c:1218
+#: src/transport/plugin_transport_udp.c:2106
+#: src/transport/plugin_transport_udp_new.c:1220
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2114
-#: src/transport/plugin_transport_udp_new.c:1268
+#: src/transport/plugin_transport_udp.c:2157
+#: src/transport/plugin_transport_udp_new.c:1270
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_udp.c:2258
+#: src/transport/plugin_transport_udp.c:2301
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2325
-#: src/transport/plugin_transport_udp_new.c:1396
+#: src/transport/plugin_transport_udp.c:2372
+#: src/transport/plugin_transport_udp_new.c:1398
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
@@ -3409,332 +3430,336 @@
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:504
+#: src/transport/plugin_transport_tcp.c:514
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:590
-#: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:731
-#: src/transport/plugin_transport_tcp.c:820
-#: src/transport/plugin_transport_tcp.c:1156
+#: src/transport/plugin_transport_tcp.c:601
+#: src/transport/plugin_transport_tcp.c:690
+#: src/transport/plugin_transport_tcp.c:742
+#: src/transport/plugin_transport_tcp.c:831
+#: src/transport/plugin_transport_tcp.c:1173
+#: src/transport/plugin_transport_tcp.c:1254
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:846
-#: src/transport/plugin_transport_tcp.c:1544
+#: src/transport/plugin_transport_tcp.c:607
+#: src/transport/plugin_transport_tcp.c:857
+#: src/transport/plugin_transport_tcp.c:1828
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:683
+#: src/transport/plugin_transport_tcp.c:694
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:734
+#: src/transport/plugin_transport_tcp.c:745
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:824
+#: src/transport/plugin_transport_tcp.c:835
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:945
+#: src/transport/plugin_transport_tcp.c:956
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:996
+#: src/transport/plugin_transport_tcp.c:1007
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1039
+#: src/transport/plugin_transport_tcp.c:1050
+#: src/transport/plugin_transport_tcp.c:1368
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1056
+#: src/transport/plugin_transport_tcp.c:1067
+#: src/transport/plugin_transport_tcp.c:1404
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1107
+#: src/transport/plugin_transport_tcp.c:1118
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1224
+#: src/transport/plugin_transport_tcp.c:1508
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1587
+#: src/transport/plugin_transport_tcp.c:1871
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:1732
+#: src/transport/plugin_transport_tcp.c:2021
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:1796
+#: src/transport/plugin_transport_tcp.c:2089
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1949
+#: src/transport/plugin_transport_tcp.c:2242
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2009
+#: src/transport/plugin_transport_tcp.c:2307
 #, 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:2032
+#: src/transport/plugin_transport_tcp.c:2330
 #, 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:2036
+#: src/transport/plugin_transport_tcp.c:2334
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2040
+#: src/transport/plugin_transport_tcp.c:2338
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:923
+#: src/transport/plugin_transport_http.c:984
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:971
+#: src/transport/plugin_transport_http.c:1032
 #, 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:1118
+#: src/transport/plugin_transport_http.c:1179
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1131
+#: src/transport/plugin_transport_http.c:1192
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1206
+#: src/transport/plugin_transport_http.c:1267
 #, 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:1219
+#: src/transport/plugin_transport_http.c:1280
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/transport/plugin_transport_http.c:1230
+#: src/transport/plugin_transport_http.c:1291
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1250
+#: src/transport/plugin_transport_http.c:1311
 #, 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:1280
+#: src/transport/plugin_transport_http.c:1341
 #, 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_unix.c:1087
+#: src/transport/plugin_transport_unix.c:1096
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_smtp.c:367
+#: src/transport/plugin_transport_smtp.c:370
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 "Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n"
 
-#: src/transport/plugin_transport_smtp.c:454
+#: src/transport/plugin_transport_smtp.c:457
 #, fuzzy
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
 
-#: src/transport/plugin_transport_smtp.c:463
+#: src/transport/plugin_transport_smtp.c:466
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
 
-#: src/transport/plugin_transport_smtp.c:558
-#: src/transport/plugin_transport_smtp.c:568
-#: src/transport/plugin_transport_smtp.c:581
-#: src/transport/plugin_transport_smtp.c:600
-#: src/transport/plugin_transport_smtp.c:623
-#: src/transport/plugin_transport_smtp.c:631
-#: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:655
+#: src/transport/plugin_transport_smtp.c:561
+#: src/transport/plugin_transport_smtp.c:571
+#: src/transport/plugin_transport_smtp.c:584
+#: src/transport/plugin_transport_smtp.c:603
+#: src/transport/plugin_transport_smtp.c:626
+#: src/transport/plugin_transport_smtp.c:634
+#: src/transport/plugin_transport_smtp.c:647
+#: src/transport/plugin_transport_smtp.c:658
 #, fuzzy, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:798
+#: src/transport/plugin_transport_smtp.c:801
 #, fuzzy
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 "Kein Filter für E-Mail angegeben, es kann keine Bekanntmachung erstellt "
 "werden.\n"
 
-#: src/transport/plugin_transport_smtp.c:810
+#: src/transport/plugin_transport_smtp.c:813
 #, fuzzy
 msgid "# bytes received via SMTP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_smtp.c:811
+#: src/transport/plugin_transport_smtp.c:814
 #, fuzzy
 msgid "# bytes sent via SMTP"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_smtp.c:813
+#: src/transport/plugin_transport_smtp.c:816
 #, fuzzy
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/gnunet-service-transport_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:111
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:116
+#: src/transport/gnunet-service-transport_plugins.c:118
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:122
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:147
+#: src/transport/gnunet-service-transport_plugins.c:150
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/plugin_transport_wlan.c:884
+#: src/transport/plugin_transport_wlan.c:880
 #, fuzzy
 msgid "# wlan session timeouts"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:908
+#: src/transport/plugin_transport_wlan.c:904
 #, fuzzy
 msgid "# wlan session created"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:992
-#: src/transport/plugin_transport_wlan.c:1155
-#: src/transport/plugin_transport_wlan.c:1176
-#: src/transport/plugin_transport_wlan.c:1207
-#: src/transport/plugin_transport_wlan.c:2412
-#: src/transport/plugin_transport_wlan.c:3273
+#: src/transport/plugin_transport_wlan.c:988
+#: src/transport/plugin_transport_wlan.c:1151
+#: src/transport/plugin_transport_wlan.c:1172
+#: src/transport/plugin_transport_wlan.c:1203
+#: src/transport/plugin_transport_wlan.c:2378
+#: src/transport/plugin_transport_wlan.c:3240
 msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1250
-#: src/transport/plugin_transport_wlan.c:1967
+#: src/transport/plugin_transport_wlan.c:1246
+#: src/transport/plugin_transport_wlan.c:1933
 #, fuzzy
 msgid "# wlan pending fragments"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1441
+#: src/transport/plugin_transport_wlan.c:1407
 #, c-format
-msgid "Finished reading from wlan-helper stdout with code: %d\n"
+msgid ""
+"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1808
+#: src/transport/plugin_transport_wlan.c:1774
 msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1841
-#: src/transport/plugin_transport_wlan.c:2056
-#: src/transport/plugin_transport_wlan.c:2151
+#: src/transport/plugin_transport_wlan.c:1807
+#: src/transport/plugin_transport_wlan.c:2022
+#: src/transport/plugin_transport_wlan.c:2117
 #, c-format
 msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2042
+#: src/transport/plugin_transport_wlan.c:2008
 msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2113
+#: src/transport/plugin_transport_wlan.c:2079
 #, fuzzy
 msgid "# wlan fragments send"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:2279
+#: src/transport/plugin_transport_wlan.c:2245
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2284
+#: src/transport/plugin_transport_wlan.c:2250
 #, fuzzy
 msgid "# wlan messages queued"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2373
-#: src/transport/plugin_transport_wlan.c:3029
-#: src/transport/plugin_transport_wlan.c:3276
+#: src/transport/plugin_transport_wlan.c:2339
+#: src/transport/plugin_transport_wlan.c:2996
+#: src/transport/plugin_transport_wlan.c:3243
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2601
+#: src/transport/plugin_transport_wlan.c:2567
 #, fuzzy
 msgid "# wlan whole messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2803
+#: src/transport/plugin_transport_wlan.c:2770
 #, fuzzy
 msgid "# wlan hello messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2840
+#: src/transport/plugin_transport_wlan.c:2807
 #, fuzzy
 msgid "# wlan fragments received"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:2892
+#: src/transport/plugin_transport_wlan.c:2859
 #, fuzzy
 msgid "# wlan acks received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2989
+#: src/transport/plugin_transport_wlan.c:2956
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3013
+#: src/transport/plugin_transport_wlan.c:2980
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:3071
+#: src/transport/plugin_transport_wlan.c:3038
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3127
+#: src/transport/plugin_transport_wlan.c:3094
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:3138
+#: src/transport/plugin_transport_wlan.c:3105
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -3781,110 +3806,110 @@
 
 #: src/transport/gnunet-transport.c:447
 #, fuzzy, c-format
-msgid "Peer `%s': %s\n"
+msgid "Peer `%s': %s %s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:515
+#: src/transport/gnunet-transport.c:511
 #, 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:552
+#: src/transport/gnunet-transport.c:548
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:555
+#: src/transport/gnunet-transport.c:551
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:558
+#: src/transport/gnunet-transport.c:554
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:562
+#: src/transport/gnunet-transport.c:558
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
+#: src/transport/gnunet-transport.c:561
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:568
+#: src/transport/gnunet-transport.c:564
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:576
+#: src/transport/gnunet-transport.c:572
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:408
+#: src/transport/gnunet-service-transport_validation.c:410
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:457
+#: src/transport/gnunet-service-transport_validation.c:459
 #, 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:494
+#: src/transport/gnunet-service-transport_validation.c:496
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_validation.c:552
+#: src/transport/gnunet-service-transport_validation.c:554
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:773
+#: src/transport/gnunet-service-transport_validation.c:775
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:808
+#: src/transport/gnunet-service-transport_validation.c:810
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:876
+#: src/transport/gnunet-service-transport_validation.c:878
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:885
+#: src/transport/gnunet-service-transport_validation.c:887
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1007
+#: src/transport/gnunet-service-transport_validation.c:1009
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1032
+#: src/transport/gnunet-service-transport_validation.c:1034
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1091
+#: src/transport/gnunet-service-transport_validation.c:1093
 #, 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-service-transport_clients.c:254
+#: src/transport/gnunet-service-transport_clients.c:253
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:259
+#: src/transport/gnunet-service-transport_clients.c:258
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_clients.c:406
+#: src/transport/gnunet-service-transport_clients.c:405
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
@@ -3913,11 +3938,11 @@
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:519
+#: src/transport/gnunet-service-transport.c:555
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:528
+#: src/transport/gnunet-service-transport.c:564
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -4568,31 +4593,31 @@
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:262
+#: src/hostlist/gnunet-daemon-hostlist.c:264
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:315
+#: src/hostlist/gnunet-daemon-hostlist.c:317
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:322
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:325
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:327
+#: src/hostlist/gnunet-daemon-hostlist.c:329
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:339
+#: src/hostlist/gnunet-daemon-hostlist.c:341
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4736,23 +4761,57 @@
 msgid "use configuration file FILENAME"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/include/gnunet_common.h:366 src/include/gnunet_common.h:371
-#: src/include/gnunet_common.h:377
+#: src/include/gnunet_common.h:430 src/include/gnunet_common.h:435
+#: src/include/gnunet_common.h:441
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:387
+#: src/include/gnunet_common.h:451
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:408 src/include/gnunet_common.h:415
+#: src/include/gnunet_common.h:472 src/include/gnunet_common.h:479
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to stop service `%s'!\n"
+#~ msgstr "Fehler beim Binden an UDP Port %d.\n"
+
+#, fuzzy
+#~ msgid "Failed to start service `%s'!\n"
+#~ 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 "
+#~ "bekannt!\n"
+
+#, fuzzy
+#~ msgid "Service `%s' stopped\n"
+#~ 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':"
+
+#, fuzzy
+#~ msgid "Service `%s' started\n"
+#~ msgstr "Dienst gelöscht.\n"
+
+#, fuzzy
 #~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
 #~ msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
@@ -6409,12 +6468,6 @@
 #~ "Im Benuter-Modus laufen (um benutzerspezifische "
 #~ "Konfigurationseinstellungen zu holen"
 
-#~ msgid "`%s' startup complete.\n"
-#~ msgstr "`%s' Startvorgang abgeschlossen.\n"
-
-#~ msgid "`%s' is shutting down.\n"
-#~ msgstr "`%s' fährt herunter.\n"
-
 #~ msgid ""
 #~ "run in debug mode; gnunetd will not daemonize and error messages will be "
 #~ "written to stderr instead of a logfile"

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2011-12-26 21:20:00 UTC (rev 18842)
+++ gnunet/po/es.po     2011-12-26 21:22:07 UTC (rev 18843)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-11-30 16:20+0100\n"
+"POT-Creation-Date: 2011-12-26 22:22+0100\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -22,16 +22,18 @@
 #: src/datastore/plugin_datastore_mysql.c:146
 #: src/datastore/plugin_datastore_mysql.c:613
 #: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:90 src/datacache/plugin_datacache_sqlite.c:71
+#: src/datastore/plugin_datastore_mysql.c:685
+#: src/datastore/plugin_datastore_mysql.c:1362
+#: src/datastore/plugin_datastore_mysql.c:1376 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:92 src/datacache/plugin_datacache_sqlite.c:71
 #: src/datacache/plugin_datacache_sqlite.c:74
 #: src/datacache/plugin_datacache_mysql.c:103
 #: src/datacache/plugin_datacache_mysql.c:110
 #: src/datacache/plugin_datacache_mysql.c:517
 #: src/datacache/plugin_datacache_mysql.c:526
 #: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:394
-#: src/include/gnunet_common.h:401
+#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:458
+#: src/include/gnunet_common.h:465
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
@@ -61,18 +63,18 @@
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1124
+#: src/datastore/plugin_datastore_sqlite.c:1161
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1143
+#: src/datastore/plugin_datastore_sqlite.c:1180
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1182
+#: src/datastore/plugin_datastore_sqlite.c:1220
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "base de datos sqlite"
@@ -90,16 +92,18 @@
 msgstr "Imposible ejecutar '%s': %s\n"
 
 #: src/datastore/plugin_datastore_mysql.c:529
+#: src/datastore/plugin_datastore_mysql.c:1336
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
 #: src/datastore/plugin_datastore_mysql.c:622
+#: src/datastore/plugin_datastore_mysql.c:1346
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' a '%s' falló en %s: %d con error %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1500
+#: src/datastore/plugin_datastore_mysql.c:1581
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -114,7 +118,7 @@
 msgid "Unable to initialize Postgres with configuration `%s': %s"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/datastore/plugin_datastore_postgres.c:979
+#: src/datastore/plugin_datastore_postgres.c:1017
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -158,71 +162,71 @@
 msgid "# bytes sent to datastore"
 msgstr "# bytes en la base de datos"
 
-#: src/datastore/datastore_api.c:768
+#: src/datastore/datastore_api.c:772
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/datastore_api.c:781
+#: src/datastore/datastore_api.c:786
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
+#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/datastore/datastore_api.c:805
+#: src/datastore/datastore_api.c:810
 #, fuzzy
 msgid "# status messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:876
+#: src/datastore/datastore_api.c:883
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:947
+#: src/datastore/datastore_api.c:954
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1012
+#: src/datastore/datastore_api.c:1019
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1073
+#: src/datastore/datastore_api.c:1080
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:1141
+#: src/datastore/datastore_api.c:1148
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:1186
+#: src/datastore/datastore_api.c:1193
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1246
+#: src/datastore/datastore_api.c:1253
 #, fuzzy
 msgid "# Results received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/datastore/datastore_api.c:1317
+#: src/datastore/datastore_api.c:1324
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1384
+#: src/datastore/datastore_api.c:1391
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1448
+#: src/datastore/datastore_api.c:1455
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -231,152 +235,170 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:52
+#: src/datastore/gnunet-service-datastore.c:347
 #, fuzzy
-msgid "# bytes used in file-sharing datastore"
-msgstr "# bytes en la base de datos"
-
-#: src/datastore/gnunet-service-datastore.c:331
-#, fuzzy
 msgid "# bytes expired"
 msgstr "# bytes recibidos por TCP"
 
-#: src/datastore/gnunet-service-datastore.c:397
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:457
+#: src/datastore/gnunet-service-datastore.c:480
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:610
+#: src/datastore/gnunet-service-datastore.c:634
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:655
+#: src/datastore/gnunet-service-datastore.c:679
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:666
+#: src/datastore/gnunet-service-datastore.c:690
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:670
+#: src/datastore/gnunet-service-datastore.c:694
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:676
+#: src/datastore/gnunet-service-datastore.c:700
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:681
-#: src/datastore/gnunet-service-datastore.c:735
-#: src/datastore/gnunet-service-datastore.c:956
-#: src/datastore/gnunet-service-datastore.c:1441
+#: src/datastore/gnunet-service-datastore.c:705
+#: src/datastore/gnunet-service-datastore.c:759
+#: src/datastore/gnunet-service-datastore.c:980
+#: src/datastore/gnunet-service-datastore.c:1459
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:750
+#: src/datastore/gnunet-service-datastore.c:774
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
-#: src/datacache/datacache.c:248
+#: src/datastore/gnunet-service-datastore.c:848 src/datacache/datacache.c:118
+#: src/datacache/datacache.c:255
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# bytes en la base de datos"
 
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datastore/gnunet-service-datastore.c:862
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1004
+#: src/datastore/gnunet-service-datastore.c:1028
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1042
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
+#: src/datastore/gnunet-service-datastore.c:1070
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:1104
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1115
+#: src/datastore/gnunet-service-datastore.c:1139
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1142
+#: src/datastore/gnunet-service-datastore.c:1166
 #, fuzzy
 msgid "Content not found"
 msgstr "¡Comando '%s' no encontrado!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1152
+#: src/datastore/gnunet-service-datastore.c:1176
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1210
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1230
+#: src/datastore/gnunet-service-datastore.c:1254
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
-#: src/datacache/datacache.c:151
-#, fuzzy, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
-
-#: src/datastore/gnunet-service-datastore.c:1303
+#: src/datastore/gnunet-service-datastore.c:1317
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1312
+#: src/datastore/gnunet-service-datastore.c:1326
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/datastore/gnunet-service-datastore.c:1525
+#: src/datastore/gnunet-service-datastore.c:1536 src/datacache/datacache.c:144
+#: src/datacache/datacache.c:151
+#, fuzzy, c-format
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
+
+#: src/datastore/gnunet-service-datastore.c:1530
+#, fuzzy, c-format
+msgid "# bytes used in file-sharing datastore `%s'"
+msgstr "# bytes en la base de datos"
+
+#: src/datastore/gnunet-service-datastore.c:1541
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1493
+#: src/datastore/gnunet-service-datastore.c:1543
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1556
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1516
+#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1590
+#, fuzzy, c-format
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "Imposible guardar el fichero de configuración '%s':"
+
+#: src/datastore/gnunet-service-datastore.c:1620
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
+#: src/datastore/gnunet-service-datastore.c:1649
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1654
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1657
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
 #: src/core/gnunet-service-core_sessions.c:208
 #: src/core/gnunet-service-core_sessions.c:273
 msgid "# entries in session map"
@@ -461,137 +483,137 @@
 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_kx.c:491
+#: src/core/gnunet-service-core_kx.c:493
 msgid "# bytes encrypted"
 msgstr "# bytes encriptados"
 
-#: src/core/gnunet-service-core_kx.c:541
+#: src/core/gnunet-service-core_kx.c:543
 msgid "# bytes decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
+#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
 #: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/core/gnunet-service-core_kx.c:618
+#: src/core/gnunet-service-core_kx.c:620
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:668
+#: src/core/gnunet-service-core_kx.c:670
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:689
+#: src/core/gnunet-service-core_kx.c:691
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:741
+#: src/core/gnunet-service-core_kx.c:743
 #, fuzzy
 msgid "# session keys received"
 msgstr "# claves de la sesión rechazadas"
 
-#: src/core/gnunet-service-core_kx.c:760
+#: src/core/gnunet-service-core_kx.c:762
 #, fuzzy, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr "el tamaño del '%s' mensaje es demasiado corto. Ignorandolo.\n"
 
-#: src/core/gnunet-service-core_kx.c:798
+#: src/core/gnunet-service-core_kx.c:800
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core_kx.c:878
-#: src/transport/gnunet-service-transport_validation.c:778
+#: src/core/gnunet-service-core_kx.c:880
+#: src/transport/gnunet-service-transport_validation.c:780
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_kx.c:912
+#: src/core/gnunet-service-core_kx.c:914
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:935
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# mensajes fragmentados"
 
-#: src/core/gnunet-service-core_kx.c:1021
+#: src/core/gnunet-service-core_kx.c:1023
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1032
+#: src/core/gnunet-service-core_kx.c:1034
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1090
-#: src/transport/gnunet-service-transport_validation.c:983
+#: src/core/gnunet-service-core_kx.c:1092
+#: src/transport/gnunet-service-transport_validation.c:985
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1120
+#: src/core/gnunet-service-core_kx.c:1122
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core_kx.c:1152
+#: src/core/gnunet-service-core_kx.c:1154
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1218
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/core/gnunet-service-core_kx.c:1357
+#: src/core/gnunet-service-core_kx.c:1359
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1399
-#: src/core/gnunet-service-core_kx.c:1424
+#: src/core/gnunet-service-core_kx.c:1401
+#: src/core/gnunet-service-core_kx.c:1426
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1411
+#: src/core/gnunet-service-core_kx.c:1413
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1448
+#: src/core/gnunet-service-core_kx.c:1450
 #, 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:1452
+#: src/core/gnunet-service-core_kx.c:1454
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1460
+#: src/core/gnunet-service-core_kx.c:1462
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1523
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/core/gnunet-service-core_kx.c:1529
+#: src/core/gnunet-service-core_kx.c:1531
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1539
-#: src/transport/gnunet-service-transport.c:542
+#: src/core/gnunet-service-core_kx.c:1541
+#: src/transport/gnunet-service-transport.c:578
 #: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
 #, fuzzy, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
@@ -621,46 +643,46 @@
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción '%s'.\n"
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:860
+#: src/util/common_logging.c:239 src/util/common_logging.c:890
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:858
+#: src/util/common_logging.c:241 src/util/common_logging.c:888
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:856
+#: src/util/common_logging.c:243 src/util/common_logging.c:886
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:854
+#: src/util/common_logging.c:245 src/util/common_logging.c:884
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:862
+#: src/util/common_logging.c:247 src/util/common_logging.c:892
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:578
+#: src/util/common_logging.c:610
 #, 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:695
+#: src/util/common_logging.c:725
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:863
+#: src/util/common_logging.c:893
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:945
+#: src/util/common_logging.c:975
 #, fuzzy
 msgid "unknown address"
 msgstr "desconocido"
 
-#: src/util/common_logging.c:983
+#: src/util/common_logging.c:1013
 #, fuzzy
 msgid "invalid address"
 msgstr "Argumentos inválidos: "
@@ -815,7 +837,7 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "La llamada a '%s' devuelve %d.\n"
 
-#: src/util/network.c:1197
+#: src/util/network.c:1204
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -828,12 +850,12 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:477
+#: src/util/os_installation.c:482
 #, 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:483
+#: src/util/os_installation.c:488
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "'%s' %s falló: %s\n"
@@ -842,40 +864,40 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:355
+#: src/util/strings.c:354
 #, c-format
-msgid "Character set requested was `%s'\n"
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:433
+#: src/util/strings.c:462
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:525
+#: src/util/strings.c:554
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:530
+#: src/util/strings.c:559
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:534
+#: src/util/strings.c:563
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:538
+#: src/util/strings.c:567
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:542
+#: src/util/strings.c:571
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:546
+#: src/util/strings.c:575
 msgid " days"
 msgstr " días"
 
-#: src/util/strings.c:570
+#: src/util/strings.c:599
 msgid "end of time"
 msgstr ""
 
@@ -914,22 +936,22 @@
 msgstr ""
 "libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/disk.c:434
+#: src/util/disk.c:466
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/disk.c:834
+#: src/util/disk.c:866
 #, 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:1186 src/util/service.c:1452
+#: src/util/disk.c:1218 src/util/service.c:1541
 #, 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:1491
+#: src/util/disk.c:1523
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
@@ -991,7 +1013,7 @@
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:2228
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -1013,58 +1035,62 @@
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:947 src/transport/plugin_transport_http.c:996
+#: src/util/service.c:947 src/transport/plugin_transport_http.c:1057
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/util/service.c:964 src/transport/plugin_transport_http.c:1013
+#: src/util/service.c:964 src/transport/plugin_transport_http.c:1074
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/service.c:1120 src/util/service.c:1138
+#: src/util/service.c:1152
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+
+#: src/util/service.c:1203 src/util/service.c:1221
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/service.c:1248
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1314
+#: src/util/service.c:1403
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/service.c:1347
+#: src/util/service.c:1436
 #, 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:1393
+#: src/util/service.c:1482
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1397
+#: src/util/service.c:1486
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1401
+#: src/util/service.c:1490
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1453
+#: src/util/service.c:1542
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1466
+#: src/util/service.c:1555
 #, 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:1529
+#: src/util/service.c:1618
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1072,8 +1098,15 @@
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_priority.c:114
+#: src/util/container_bloomfilter.c:507
 #, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+
+#: src/util/os_priority.c:116
+#, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
@@ -1125,12 +1158,12 @@
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:266
+#: src/util/pseudonym.c:273
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/util/pseudonym.c:330
+#: src/util/pseudonym.c:337
 #, fuzzy
 msgid "no-name"
 msgstr "Mostrar el nombre"
@@ -1216,75 +1249,75 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
+#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Imposible escribir PID al fichero '%s': %s.\n"
 
-#: src/util/crypto_rsa.c:621
+#: src/util/crypto_rsa.c:623
 #, 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:639
+#: src/util/crypto_rsa.c:641
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
+#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:698
+#: src/util/crypto_rsa.c:700
 #, 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:718
+#: src/util/crypto_rsa.c:720
 #, 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:736
+#: src/util/crypto_rsa.c:738
 #, 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:957
+#: src/util/crypto_rsa.c:959
 #, 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/nse/gnunet-nse-profiler.c:634 src/dht/gnunet-dht-get.c:213
+#: src/nse/gnunet-nse-profiler.c:882 src/dht/gnunet-dht-get.c:213
 #: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:596
 #: src/fs/gnunet-download.c:263
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:652
+#: src/nse/gnunet-nse-profiler.c:900
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Imposible acceder al servicio"
 
-#: src/nse/gnunet-service-nse.c:903
+#: src/nse/gnunet-service-nse.c:935
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1328 src/nse/gnunet-service-nse.c:1347
-#: src/nse/gnunet-service-nse.c:1368
+#: src/nse/gnunet-service-nse.c:1390 src/nse/gnunet-service-nse.c:1409
+#: src/nse/gnunet-service-nse.c:1430
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1335
+#: src/nse/gnunet-service-nse.c:1397
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/nse/gnunet-service-nse.c:1356
+#: src/nse/gnunet-service-nse.c:1418
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
@@ -1344,22 +1377,22 @@
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/datacache.c:176
+#: src/datacache/datacache.c:183
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:184
+#: src/datacache/datacache.c:191
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/datacache/datacache.c:274
+#: src/datacache/datacache.c:281
 #, fuzzy
 msgid "# requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datacache/datacache.c:284
+#: src/datacache/datacache.c:291
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
@@ -1380,100 +1413,100 @@
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:479
+#: src/dht/gnunet-service-dht_neighbours.c:481
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:571
+#: src/dht/gnunet-service-dht_neighbours.c:573
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes fragmentados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:627
-#: src/dht/gnunet-service-dht_neighbours.c:687
+#: src/dht/gnunet-service-dht_neighbours.c:629
+#: src/dht/gnunet-service-dht_neighbours.c:689
 #, fuzzy
 msgid "# Peers connected"
 msgstr "# de pares conectados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:721
+#: src/dht/gnunet-service-dht_neighbours.c:723
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# mensajes defragmentados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:776
+#: src/dht/gnunet-service-dht_neighbours.c:778
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# bytes recibidos por TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:814
+#: src/dht/gnunet-service-dht_neighbours.c:816
 #, fuzzy
 msgid "# Bytes of bandwdith requested from core"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1038
-#: src/dht/gnunet-service-dht_neighbours.c:1066
+#: src/dht/gnunet-service-dht_neighbours.c:1040
+#: src/dht/gnunet-service-dht_neighbours.c:1068
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1047
-#: src/dht/gnunet-service-dht_neighbours.c:1083
+#: src/dht/gnunet-service-dht_neighbours.c:1049
+#: src/dht/gnunet-service-dht_neighbours.c:1085
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "Conexión fallida\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1219
+#: src/dht/gnunet-service-dht_neighbours.c:1221
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1250
+#: src/dht/gnunet-service-dht_neighbours.c:1252
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1331
+#: src/dht/gnunet-service-dht_neighbours.c:1333
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1362
+#: src/dht/gnunet-service-dht_neighbours.c:1364
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1465
+#: src/dht/gnunet-service-dht_neighbours.c:1467
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1553
+#: 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:1662
+#: src/dht/gnunet-service-dht_neighbours.c:1664
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1670
+#: src/dht/gnunet-service-dht_neighbours.c:1672
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1761
+#: src/dht/gnunet-service-dht_neighbours.c:1763
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1805
+#: src/dht/gnunet-service-dht_neighbours.c:1807
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1819
+#: src/dht/gnunet-service-dht_neighbours.c:1821
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1885
+#: src/dht/gnunet-service-dht_neighbours.c:1887
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# bytes recibidos por TCP"
@@ -1671,288 +1704,264 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/arm/gnunet-arm.c:161
+#: src/arm/gnunet-arm.c:149
 #, 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:154
+#, fuzzy, c-format
+msgid "Service `%s' has been stopped.\n"
+msgstr "Servicio eliminado.\n"
+
+#: src/arm/gnunet-arm.c:157
+#, fuzzy, c-format
+msgid "Service `%s' was already running.\n"
+msgstr "¡Esta búsqueda está aún pendiente!\n"
+
+#: src/arm/gnunet-arm.c:162
+#, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Servicio eliminado.\n"
 
 #: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "Failed to stop service `%s'!\n"
-msgstr "Fichero almacenado en '%s'.\n"
+msgid "Service `%s' was already being stopped.\n"
+msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-arm.c:171
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Servicio eliminado.\n"
+msgid "Service `%s' was already not running.\n"
+msgstr "¡Esta búsqueda está aún pendiente!\n"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:173
 #, fuzzy, c-format
-msgid "Failed to start service `%s'!\n"
-msgstr "Falló al comenzar la recolección.\n"
+msgid "Request ignored as ARM is shutting down.\n"
+msgstr "'%s' se esta cerrando.\n"
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:177
 #, fuzzy, c-format
-msgid "Some error communicating with service `%s'.\n"
+msgid "Error communicating with ARM service.\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/arm/gnunet-arm.c:207
+#: src/arm/gnunet-arm.c:181
 #, fuzzy, c-format
-msgid "Service `%s' is running.\n"
-msgstr "El espacio '%s' ha sido valorado con un %d.\n"
+msgid "Timeout communicating with ARM service.\n"
+msgstr "Imprime información de los pares de GNUnet."
 
-#: src/arm/gnunet-arm.c:212
+#: src/arm/gnunet-arm.c:185
 #, fuzzy, c-format
-msgid "Service `%s' is not running.\n"
-msgstr "'%s' no es un fichero.\n"
+msgid "Operation failed.\n"
+msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/arm/gnunet-arm.c:238
+#: src/arm/gnunet-arm.c:189
 #, c-format
+msgid "Unknown response code from ARM.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:216
+#, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
+#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:269
+#: src/arm/gnunet-arm.c:247
 #, 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:275
+#: src/arm/gnunet-arm.c:253
 #, 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:387
+#: src/arm/gnunet-arm.c:355
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:389
+#: src/arm/gnunet-arm.c:357
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:359
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:393
+#: src/arm/gnunet-arm.c:361
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:396
+#: src/arm/gnunet-arm.c:364
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:399
-msgid "test if a particular service is running"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:402
+#: src/arm/gnunet-arm.c:367
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:404
+#: src/arm/gnunet-arm.c:369
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:407
+#: src/arm/gnunet-arm.c:372
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "tiempo para esperar hasta completar una iteración (en ms)"
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:383
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:957
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
+#: src/arm/mockup-service.c:46
 msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
+#: src/arm/mockup-service.c:69
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:206
-#, c-format
-msgid "Restarting service `%s' due to configuration file change.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:234
-#, fuzzy
-msgid "Could not send status result to client\n"
-msgstr "Imposible mandar el mensaje a gnunetd\n"
-
-#: src/arm/gnunet-service-arm.c:268
-msgid "Not sending status result to client: no client known\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:406
+#: src/arm/gnunet-service-arm.c:320
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/arm/gnunet-service-arm.c:409
+#: src/arm/gnunet-service-arm.c:323
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:435
-#, c-format
-msgid "ARM is shutting down, service `%s' not started.\n"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:349
+#, fuzzy
+msgid "Could not send status result to client\n"
+msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/arm/gnunet-service-arm.c:443
+#: src/arm/gnunet-service-arm.c:476
 #, fuzzy, c-format
-msgid "Service `%s' already running.\n"
-msgstr "¡Esta búsqueda está aún pendiente!\n"
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/arm/gnunet-service-arm.c:453
-#, fuzzy, c-format
-msgid "Binary implementing service `%s' not known!\n"
-msgstr "La verificación de la firma falló: el par '%s' no es conocido.\n"
+#: src/arm/gnunet-service-arm.c:498
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:464
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not known!\n"
-msgstr "Fichero de configuración '%s' creado.\n"
+#: src/arm/gnunet-service-arm.c:512
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:498
+#: src/arm/gnunet-service-arm.c:620
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:666
-#, fuzzy
-msgid "Stopping all services\n"
-msgstr "Deteniendo cron\n"
-
-#: src/arm/gnunet-service-arm.c:723
+#: src/arm/gnunet-service-arm.c:774
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:796
+#: src/arm/gnunet-service-arm.c:868
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:801
+#: src/arm/gnunet-service-arm.c:873
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:806
+#: src/arm/gnunet-service-arm.c:878
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:813
+#: src/arm/gnunet-service-arm.c:912
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1050
 #, fuzzy, c-format
-msgid "Service `%s' stopped\n"
-msgstr "Servicio eliminado.\n"
+msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/arm/gnunet-service-arm.c:827
+#: src/arm/gnunet-service-arm.c:1052
+msgid "option missing"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1129
+#, fuzzy, c-format
+msgid "Starting default services `%s'\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/arm/gnunet-service-arm.c:1140
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
+msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/arm_api.c:201
+#: src/arm/gnunet-service-arm.c:1154
+msgid ""
+"No default services configured, GNUnet will not really start right now.\n"
+msgstr ""
+
+#: src/arm/arm_api.c:187
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:389
+#: src/arm/arm_api.c:378
 #, 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:403
+#: src/arm/arm_api.c:392
 #, 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:467
+#: src/arm/arm_api.c:465
 #, 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:536
+#: src/arm/arm_api.c:521
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:537
+#: src/arm/arm_api.c:522
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:559
+#: src/arm/arm_api.c:544
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:560
+#: src/arm/arm_api.c:546
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:592
+#: src/arm/arm_api.c:579
 #, 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:664
+#: src/arm/arm_api.c:652
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "No se ha recibido una respuesta en %llums.\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:803
-#, c-format
-msgid "Unable to forward to service `%s': shutdown\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:812
-#, c-format
-msgid "Unable to forward to service `%s': timeout before connect\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:868
-#, fuzzy, c-format
-msgid "Unable to start service `%s': %s\n"
-msgstr "Imposible guardar el fichero de configuración '%s':"
-
-#: src/arm/gnunet-service-arm_interceptor.c:936
-#, fuzzy, c-format
-msgid "Unable to accept connection for service `%s': %s\n"
-msgstr "Imposible guardar el fichero de configuración '%s':"
-
-#: src/arm/gnunet-service-arm_interceptor.c:952
-#, fuzzy, c-format
-msgid "Service `%s' started\n"
-msgstr "Servicio eliminado.\n"
-
-#: src/arm/gnunet-service-arm_interceptor.c:1080
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Imposible crear la cuenta de usuario:"
-
-#: src/arm/gnunet-service-arm_interceptor.c:1102
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:1116
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
-msgstr ""
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -2013,34 +2022,38 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/statistics/statistics_api.c:327
+#: src/statistics/statistics_api.c:390
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/statistics/gnunet-statistics.c:89
+#: src/statistics/gnunet-statistics.c:98
 #, fuzzy, c-format
 msgid "Failed to obtain statistics.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#: src/statistics/gnunet-statistics.c:126 src/fs/gnunet-pseudonym.c:151
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/statistics/gnunet-statistics.c:155
-msgid "limit output to statistcs for the given NAME"
+#: src/statistics/gnunet-statistics.c:164
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:158
+#: src/statistics/gnunet-statistics.c:167
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:161
+#: src/statistics/gnunet-statistics.c:170
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
+#: src/statistics/gnunet-statistics.c:173
+msgid "just print the statistics value"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:180
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
@@ -2062,7 +2075,7 @@
 msgstr "Desindexar los ficheros."
 
 #: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
-#: src/fs/gnunet-publish.c:158 src/fs/gnunet-download.c:144
+#: src/fs/gnunet-publish.c:163 src/fs/gnunet-download.c:144
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Estado de descarga inesperado."
@@ -2073,7 +2086,7 @@
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
 #: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
-#: src/fs/gnunet-publish.c:412 src/fs/gnunet-download.c:203
+#: src/fs/gnunet-publish.c:417 src/fs/gnunet-download.c:203
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
@@ -2098,7 +2111,7 @@
 msgid "Option `%s' ignored\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:538
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:543
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimato al enviar"
 
@@ -2119,7 +2132,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:282 src/fs/gnunet-publish.c:557
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:562
 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"
 
@@ -2136,7 +2149,7 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:576
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:581
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2171,37 +2184,37 @@
 msgid "Failed to write `%s': %s\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/fs_namespace.c:335
+#: src/fs/fs_namespace.c:338
 #, fuzzy
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
+#: src/fs/fs_namespace.c:427 src/fs/fs_namespace.c:448
 #, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/fs/fs_namespace.c:464
+#: src/fs/fs_namespace.c:467
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/fs_namespace.c:507
+#: src/fs/fs_namespace.c:510
 #, 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:609
+#: src/fs/fs_namespace.c:612
 #, 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:834 src/fs/fs_publish.c:1523
+#: src/fs/fs_namespace.c:840 src/fs/fs_publish.c:1535
 #, fuzzy
 msgid "Internal error."
 msgstr "Error desconocido.\n"
 
-#: src/fs/fs_namespace.c:878
+#: src/fs/fs_namespace.c:884
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Fallo al conectarse a gnunetd"
@@ -2315,11 +2328,11 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
+#: src/fs/fs_uri.c:1109 src/fs/fs_uri.c:1136
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna clave especificada!\n"
 
-#: src/fs/fs_uri.c:1265
+#: src/fs/fs_uri.c:1142
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2343,81 +2356,86 @@
 msgid "URI is `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/fs/gnunet-publish.c:267
+#: src/fs/gnunet-publish.c:160
 #, fuzzy, c-format
+msgid "Cleanup after abort complete.\n"
+msgstr "'%s' comienzo completo.\n"
+
+#: src/fs/gnunet-publish.c:272
+#, 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:269
+#: src/fs/gnunet-publish.c:274
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/fs/gnunet-publish.c:320
+#: src/fs/gnunet-publish.c:325
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:362
+#: src/fs/gnunet-publish.c:367
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:369
+#: src/fs/gnunet-publish.c:374
 #, 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:375
+#: src/fs/gnunet-publish.c:380
 #, 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:383
+#: src/fs/gnunet-publish.c:388
 #, 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:393 src/fs/gnunet-publish.c:400
-#: src/transport/gnunet-transport.c:506
+#: src/fs/gnunet-publish.c:398 src/fs/gnunet-publish.c:405
+#: src/transport/gnunet-transport.c:502
 #, 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:422
+#: src/fs/gnunet-publish.c:427
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:434 src/fs/gnunet-download.c:175
+#: src/fs/gnunet-publish.c:439 src/fs/gnunet-download.c:175
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "El fichero '%s' tiene la URI: '%s'\n"
 
-#: src/fs/gnunet-publish.c:467
+#: src/fs/gnunet-publish.c:472
 #, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:497
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/fs/gnunet-publish.c:515
+#: src/fs/gnunet-publish.c:520
 #, fuzzy, c-format
 msgid "Could not start publishing.\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:547
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:545
+#: src/fs/gnunet-publish.c:550
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:549
+#: src/fs/gnunet-publish.c:554
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2425,7 +2443,7 @@
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:558
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2433,7 +2451,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:560
+#: src/fs/gnunet-publish.c:565
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2441,7 +2459,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:565
+#: src/fs/gnunet-publish.c:570
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2449,40 +2467,40 @@
 "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:569
+#: src/fs/gnunet-publish.c:574
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
-#: src/fs/gnunet-publish.c:573
+#: src/fs/gnunet-publish.c:578
 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:579
+#: src/fs/gnunet-publish.c:584
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:583
+#: src/fs/gnunet-publish.c:588
 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:587
+#: src/fs/gnunet-publish.c:592
 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:600
+#: src/fs/gnunet-publish.c:605
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:803
+#: src/fs/fs_search.c:810
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2552,104 +2570,104 @@
 msgid "# Pending requests created"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:368 src/fs/gnunet-service-fs_pr.c:622
+#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:623
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:786
+#: src/fs/gnunet-service-fs_pr.c:787
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# bytes recibidos por TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:813
+#: src/fs/gnunet-service-fs_pr.c:814
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:830
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:845
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:936
+#: src/fs/gnunet-service-fs_pr.c:965
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:963
+#: src/fs/gnunet-service-fs_pr.c:992
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:998
+#: src/fs/gnunet-service-fs_pr.c:1027
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1088
+#: src/fs/gnunet-service-fs_pr.c:1120
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1109
+#: src/fs/gnunet-service-fs_pr.c:1141
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1156
+#: src/fs/gnunet-service-fs_pr.c:1188
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1170
+#: src/fs/gnunet-service-fs_pr.c:1202
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1179
+#: src/fs/gnunet-service-fs_pr.c:1211
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1195
+#: src/fs/gnunet-service-fs_pr.c:1227
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1212
+#: src/fs/gnunet-service-fs_pr.c:1244
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1225
+#: src/fs/gnunet-service-fs_pr.c:1257
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1230
+#: src/fs/gnunet-service-fs_pr.c:1262
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
-#: src/fs/gnunet-service-fs_pr.c:1437
+#: src/fs/gnunet-service-fs_pr.c:1289 src/fs/gnunet-service-fs_pr.c:1329
+#: src/fs/gnunet-service-fs_pr.c:1469
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1315
+#: src/fs/gnunet-service-fs_pr.c:1347
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1328
+#: src/fs/gnunet-service-fs_pr.c:1360
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1414
+#: src/fs/gnunet-service-fs_pr.c:1446
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1495
+#: src/fs/gnunet-service-fs_pr.c:1530
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1586 src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1629 src/fs/gnunet-service-fs_pr.c:1638
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Fichero de configuración '%s' creado.\n"
@@ -2691,12 +2709,12 @@
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
-#: src/transport/gnunet-service-transport_neighbours.c:934
-#: src/transport/gnunet-service-transport_neighbours.c:939
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1541
+#: src/transport/gnunet-service-transport_neighbours.c:936
 #: src/transport/gnunet-service-transport_neighbours.c:1263
-#: src/transport/gnunet-service-transport_neighbours.c:2364
-#: src/transport/gnunet-service-transport_neighbours.c:2430
+#: src/transport/gnunet-service-transport_neighbours.c:1735
+#: src/transport/gnunet-service-transport_neighbours.c:2369
+#: src/transport/gnunet-service-transport_neighbours.c:2437
 #: src/topology/gnunet-daemon-topology.c:654
 #: src/topology/gnunet-daemon-topology.c:756
 #, fuzzy
@@ -2721,70 +2739,74 @@
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
-#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
+#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:843
+#: src/fs/gnunet-service-fs_cp.c:858
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:916
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:930
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:968
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1025
+#: src/fs/gnunet-service-fs_cp.c:1035
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1049
+#: src/fs/gnunet-service-fs_cp.c:1059
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1059
+#: src/fs/gnunet-service-fs_cp.c:1069
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1138
+#: src/fs/gnunet-service-fs_cp.c:1148
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1172
+#: src/fs/gnunet-service-fs_cp.c:1182
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1196
+#: src/fs/gnunet-service-fs_cp.c:1206
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1262
+#: src/fs/gnunet-service-fs_cp.c:1272
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1290
+#: 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:1331
+#: 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:1696
+#, fuzzy
+msgid "# migration stop messages sent"
+msgstr "# mensajes PONG encriptados recibidos"
+
 #: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
@@ -2821,26 +2843,26 @@
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:487
+#: src/fs/gnunet-service-fs_indexing.c:490
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:545
+#: src/fs/gnunet-service-fs_indexing.c:548
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:560
+#: src/fs/gnunet-service-fs_indexing.c:563
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:562
+#: src/fs/gnunet-service-fs_indexing.c:565
 #, fuzzy
 msgid "not indexed"
 msgstr "El desindexado falló"
 
-#: src/fs/gnunet-service-fs_indexing.c:577
+#: src/fs/gnunet-service-fs_indexing.c:580
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "La indexación de los datos falló en la posición %i.\n"
@@ -2869,35 +2891,35 @@
 msgid "Failed to read file"
 msgstr "Falló al entregar el mensaje '%s'.\n"
 
-#: src/fs/fs_unindex.c:235
+#: src/fs/fs_unindex.c:236
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:243
+#: src/fs/fs_unindex.c:244
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:251
+#: src/fs/fs_unindex.c:252
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Respuesta inválida a '%s'.\n"
 
-#: src/fs/fs_unindex.c:296
+#: src/fs/fs_unindex.c:297
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/fs_unindex.c:331
+#: src/fs/fs_unindex.c:332
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/fs_unindex.c:344
+#: src/fs/fs_unindex.c:345
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/fs_unindex.c:378
+#: src/fs/fs_unindex.c:379
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Fallo al conectarse a gnunetd"
@@ -2972,74 +2994,74 @@
 "Tipo de metadatos desconocido en la opción de metadatos '%s'.  Usando el "
 "tipo de metadatos 'desconocido' en su lugar.\n"
 
-#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:150 src/fs/fs_publish.c:421
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
-#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
+#: src/fs/fs_publish.c:658 src/fs/fs_publish.c:675 src/fs/fs_publish.c:714
+#: src/fs/fs_publish.c:734 src/fs/fs_publish.c:761 src/fs/fs_publish.c:909
 #, 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:654
+#: src/fs/fs_publish.c:660
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:666
+#: src/fs/fs_publish.c:672
 #, fuzzy
 msgid "unknown error"
 msgstr "Error desconocido"
 
-#: src/fs/fs_publish.c:709
+#: src/fs/fs_publish.c:715
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:729
+#: src/fs/fs_publish.c:735
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:756
+#: src/fs/fs_publish.c:762
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/fs_publish.c:780
+#: src/fs/fs_publish.c:786
 #, 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:850
+#: src/fs/fs_publish.c:856
 #, 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:856
+#: src/fs/fs_publish.c:862
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:904
+#: src/fs/fs_publish.c:910
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "'%s' no es un fichero regular.\n"
 
-#: src/fs/fs_publish.c:1083
+#: src/fs/fs_publish.c:1092
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1154
+#: src/fs/fs_publish.c:1163
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1487
+#: src/fs/fs_publish.c:1499
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Imposible conectar con gnunetd.\n"
@@ -3079,41 +3101,41 @@
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:1984
+#: src/fs/fs_api.c:1992
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1994
+#: src/fs/fs_api.c:2002
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2107 src/fs/fs_api.c:2346
+#: src/fs/fs_api.c:2128 src/fs/fs_api.c:2367
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2124
+#: src/fs/fs_api.c:2145
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
+#: src/fs/fs_api.c:2157 src/fs/fs_api.c:2176 src/fs/fs_api.c:2652
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2337
+#: src/fs/fs_api.c:2358
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2583
+#: src/fs/fs_api.c:2604
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2669
+#: src/fs/fs_api.c:2690
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3173,27 +3195,27 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:581 src/topology/gnunet-daemon-topology.c:1290
+#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
 #: src/topology/gnunet-daemon-topology.c:1297
-#: src/hostlist/gnunet-daemon-hostlist.c:295
+#: src/hostlist/gnunet-daemon-hostlist.c:297
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/fs_file_information.c:350
+#: src/fs/fs_file_information.c:349
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s': %s"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:466
+#: src/transport/gnunet-service-transport_neighbours.c:468
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:855
+#: src/transport/gnunet-service-transport_neighbours.c:859
 #, fuzzy
 msgid "# peers disconnected due to external request"
 msgstr "# Anuncios de los pares recibidos"
@@ -3203,87 +3225,87 @@
 msgid "# fast reconnects failed"
 msgstr "# de pares conectados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:997
+#: src/transport/gnunet-service-transport_neighbours.c:998
 #, fuzzy
 msgid "# peers disconnected due to timeout"
 msgstr "# de pares conectados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1022
+#: src/transport/gnunet-service-transport_neighbours.c:1023
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1064
+#: src/transport/gnunet-service-transport_neighbours.c:1065
 #, fuzzy
 msgid "# peers disconnected due to global disconnect"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1778
-#: src/transport/gnunet-service-transport_neighbours.c:1799
+#: src/transport/gnunet-service-transport_neighbours.c:1781
+#: src/transport/gnunet-service-transport_neighbours.c:1802
 #, fuzzy
 msgid "# messages not sent (no such peer or not connected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1815
+#: src/transport/gnunet-service-transport_neighbours.c:1818
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1867
+#: src/transport/gnunet-service-transport_neighbours.c:1870
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1903
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1921
+#: src/transport/gnunet-service-transport_neighbours.c:1924
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1950
+#: src/transport/gnunet-service-transport_neighbours.c:1953
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2002
+#: src/transport/gnunet-service-transport_neighbours.c:2005
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2010
+#: src/transport/gnunet-service-transport_neighbours.c:2013
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2076
+#: src/transport/gnunet-service-transport_neighbours.c:2079
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2094
+#: src/transport/gnunet-service-transport_neighbours.c:2097
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2212
+#: src/transport/gnunet-service-transport_neighbours.c:2215
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2225
+#: src/transport/gnunet-service-transport_neighbours.c:2228
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2302
+#: src/transport/gnunet-service-transport_neighbours.c:2305
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2319
+#: src/transport/gnunet-service-transport_neighbours.c:2322
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2410
+#: src/transport/gnunet-service-transport_neighbours.c:2415
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# de pares conectados"
@@ -3346,35 +3368,35 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1529
+#: src/transport/plugin_transport_udp.c:1567
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_udp.c:1567
+#: src/transport/plugin_transport_udp.c:1610
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_udp.c:2063
-#: src/transport/plugin_transport_udp_new.c:1218
+#: src/transport/plugin_transport_udp.c:2106
+#: src/transport/plugin_transport_udp_new.c:1220
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2114
-#: src/transport/plugin_transport_udp_new.c:1268
+#: src/transport/plugin_transport_udp.c:2157
+#: src/transport/plugin_transport_udp_new.c:1270
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/transport/plugin_transport_udp.c:2258
+#: src/transport/plugin_transport_udp.c:2301
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2325
-#: src/transport/plugin_transport_udp_new.c:1396
+#: src/transport/plugin_transport_udp.c:2372
+#: src/transport/plugin_transport_udp_new.c:1398
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
@@ -3394,327 +3416,331 @@
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:504
+#: src/transport/plugin_transport_tcp.c:514
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:590
-#: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:731
-#: src/transport/plugin_transport_tcp.c:820
-#: src/transport/plugin_transport_tcp.c:1156
+#: src/transport/plugin_transport_tcp.c:601
+#: src/transport/plugin_transport_tcp.c:690
+#: src/transport/plugin_transport_tcp.c:742
+#: src/transport/plugin_transport_tcp.c:831
+#: src/transport/plugin_transport_tcp.c:1173
+#: src/transport/plugin_transport_tcp.c:1254
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes enviados por TCP"
 
-#: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:846
-#: src/transport/plugin_transport_tcp.c:1544
+#: src/transport/plugin_transport_tcp.c:607
+#: src/transport/plugin_transport_tcp.c:857
+#: src/transport/plugin_transport_tcp.c:1828
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_tcp.c:683
+#: src/transport/plugin_transport_tcp.c:694
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:734
+#: src/transport/plugin_transport_tcp.c:745
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes desencriptados"
 
-#: src/transport/plugin_transport_tcp.c:824
+#: src/transport/plugin_transport_tcp.c:835
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:945
+#: src/transport/plugin_transport_tcp.c:956
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# bytes desencriptados"
 
-#: src/transport/plugin_transport_tcp.c:996
+#: src/transport/plugin_transport_tcp.c:1007
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1039
+#: src/transport/plugin_transport_tcp.c:1050
+#: src/transport/plugin_transport_tcp.c:1368
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1056
+#: src/transport/plugin_transport_tcp.c:1067
+#: src/transport/plugin_transport_tcp.c:1404
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1107
+#: src/transport/plugin_transport_tcp.c:1118
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:1224
+#: src/transport/plugin_transport_tcp.c:1508
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1587
+#: src/transport/plugin_transport_tcp.c:1871
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_tcp.c:1732
+#: src/transport/plugin_transport_tcp.c:2021
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_tcp.c:1796
+#: src/transport/plugin_transport_tcp.c:2089
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1949
+#: src/transport/plugin_transport_tcp.c:2242
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/transport/plugin_transport_tcp.c:2009
+#: src/transport/plugin_transport_tcp.c:2307
 #, 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:2032
+#: src/transport/plugin_transport_tcp.c:2330
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2036
+#: src/transport/plugin_transport_tcp.c:2334
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2040
+#: src/transport/plugin_transport_tcp.c:2338
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:923
+#: src/transport/plugin_transport_http.c:984
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:971
+#: src/transport/plugin_transport_http.c:1032
 #, 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:1118
+#: src/transport/plugin_transport_http.c:1179
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1131
+#: src/transport/plugin_transport_http.c:1192
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1206
+#: src/transport/plugin_transport_http.c:1267
 #, 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:1219
+#: src/transport/plugin_transport_http.c:1280
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/transport/plugin_transport_http.c:1230
+#: src/transport/plugin_transport_http.c:1291
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1250
+#: src/transport/plugin_transport_http.c:1311
 #, 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:1280
+#: src/transport/plugin_transport_http.c:1341
 #, 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_unix.c:1087
+#: src/transport/plugin_transport_unix.c:1096
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_smtp.c:367
+#: src/transport/plugin_transport_smtp.c:370
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/transport/plugin_transport_smtp.c:454
+#: src/transport/plugin_transport_smtp.c:457
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:463
+#: src/transport/plugin_transport_smtp.c:466
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:558
-#: src/transport/plugin_transport_smtp.c:568
-#: src/transport/plugin_transport_smtp.c:581
-#: src/transport/plugin_transport_smtp.c:600
-#: src/transport/plugin_transport_smtp.c:623
-#: src/transport/plugin_transport_smtp.c:631
-#: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:655
+#: src/transport/plugin_transport_smtp.c:561
+#: src/transport/plugin_transport_smtp.c:571
+#: src/transport/plugin_transport_smtp.c:584
+#: src/transport/plugin_transport_smtp.c:603
+#: src/transport/plugin_transport_smtp.c:626
+#: src/transport/plugin_transport_smtp.c:634
+#: src/transport/plugin_transport_smtp.c:647
+#: src/transport/plugin_transport_smtp.c:658
 #, fuzzy, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:798
+#: src/transport/plugin_transport_smtp.c:801
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:810
+#: src/transport/plugin_transport_smtp.c:813
 #, fuzzy
 msgid "# bytes received via SMTP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_smtp.c:811
+#: src/transport/plugin_transport_smtp.c:814
 #, fuzzy
 msgid "# bytes sent via SMTP"
 msgstr "# bytes enviados por TCP"
 
-#: src/transport/plugin_transport_smtp.c:813
+#: src/transport/plugin_transport_smtp.c:816
 #, fuzzy
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/gnunet-service-transport_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:111
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:116
+#: src/transport/gnunet-service-transport_plugins.c:118
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:122
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:147
+#: src/transport/gnunet-service-transport_plugins.c:150
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/transport/plugin_transport_wlan.c:884
+#: src/transport/plugin_transport_wlan.c:880
 #, fuzzy
 msgid "# wlan session timeouts"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_wlan.c:908
+#: src/transport/plugin_transport_wlan.c:904
 #, fuzzy
 msgid "# wlan session created"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_wlan.c:992
-#: src/transport/plugin_transport_wlan.c:1155
-#: src/transport/plugin_transport_wlan.c:1176
-#: src/transport/plugin_transport_wlan.c:1207
-#: src/transport/plugin_transport_wlan.c:2412
-#: src/transport/plugin_transport_wlan.c:3273
+#: src/transport/plugin_transport_wlan.c:988
+#: src/transport/plugin_transport_wlan.c:1151
+#: src/transport/plugin_transport_wlan.c:1172
+#: src/transport/plugin_transport_wlan.c:1203
+#: src/transport/plugin_transport_wlan.c:2378
+#: src/transport/plugin_transport_wlan.c:3240
 msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1250
-#: src/transport/plugin_transport_wlan.c:1967
+#: src/transport/plugin_transport_wlan.c:1246
+#: src/transport/plugin_transport_wlan.c:1933
 #, fuzzy
 msgid "# wlan pending fragments"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:1441
+#: src/transport/plugin_transport_wlan.c:1407
 #, c-format
-msgid "Finished reading from wlan-helper stdout with code: %d\n"
+msgid ""
+"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1808
+#: src/transport/plugin_transport_wlan.c:1774
 msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1841
-#: src/transport/plugin_transport_wlan.c:2056
-#: src/transport/plugin_transport_wlan.c:2151
+#: src/transport/plugin_transport_wlan.c:1807
+#: src/transport/plugin_transport_wlan.c:2022
+#: src/transport/plugin_transport_wlan.c:2117
 #, c-format
 msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2042
+#: src/transport/plugin_transport_wlan.c:2008
 msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2113
+#: src/transport/plugin_transport_wlan.c:2079
 #, fuzzy
 msgid "# wlan fragments send"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:2279
+#: src/transport/plugin_transport_wlan.c:2245
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2284
+#: src/transport/plugin_transport_wlan.c:2250
 #, fuzzy
 msgid "# wlan messages queued"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2373
-#: src/transport/plugin_transport_wlan.c:3029
-#: src/transport/plugin_transport_wlan.c:3276
+#: src/transport/plugin_transport_wlan.c:2339
+#: src/transport/plugin_transport_wlan.c:2996
+#: src/transport/plugin_transport_wlan.c:3243
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2601
+#: src/transport/plugin_transport_wlan.c:2567
 #, fuzzy
 msgid "# wlan whole messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2803
+#: src/transport/plugin_transport_wlan.c:2770
 #, fuzzy
 msgid "# wlan hello messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2840
+#: src/transport/plugin_transport_wlan.c:2807
 #, fuzzy
 msgid "# wlan fragments received"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:2892
+#: src/transport/plugin_transport_wlan.c:2859
 #, fuzzy
 msgid "# wlan acks received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2989
+#: src/transport/plugin_transport_wlan.c:2956
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3013
+#: src/transport/plugin_transport_wlan.c:2980
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:3071
+#: src/transport/plugin_transport_wlan.c:3038
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3127
+#: src/transport/plugin_transport_wlan.c:3094
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:3138
+#: src/transport/plugin_transport_wlan.c:3105
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -3761,109 +3787,109 @@
 
 #: src/transport/gnunet-transport.c:447
 #, fuzzy, c-format
-msgid "Peer `%s': %s\n"
+msgid "Peer `%s': %s %s\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/transport/gnunet-transport.c:515
+#: src/transport/gnunet-transport.c:511
 #, 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:552
+#: src/transport/gnunet-transport.c:548
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:555
+#: src/transport/gnunet-transport.c:551
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:558
+#: src/transport/gnunet-transport.c:554
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/transport/gnunet-transport.c:562
+#: src/transport/gnunet-transport.c:558
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
+#: src/transport/gnunet-transport.c:561
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:568
+#: src/transport/gnunet-transport.c:564
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:576
+#: src/transport/gnunet-transport.c:572
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:408
+#: src/transport/gnunet-service-transport_validation.c:410
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:457
+#: src/transport/gnunet-service-transport_validation.c:459
 #, 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:494
+#: src/transport/gnunet-service-transport_validation.c:496
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/transport/gnunet-service-transport_validation.c:552
+#: src/transport/gnunet-service-transport_validation.c:554
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:773
+#: src/transport/gnunet-service-transport_validation.c:775
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-service-transport_validation.c:808
+#: src/transport/gnunet-service-transport_validation.c:810
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:876
+#: src/transport/gnunet-service-transport_validation.c:878
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:885
+#: src/transport/gnunet-service-transport_validation.c:887
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1007
+#: src/transport/gnunet-service-transport_validation.c:1009
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1032
+#: src/transport/gnunet-service-transport_validation.c:1034
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1091
+#: src/transport/gnunet-service-transport_validation.c:1093
 #, 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-service-transport_clients.c:254
+#: src/transport/gnunet-service-transport_clients.c:253
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:259
+#: src/transport/gnunet-service-transport_clients.c:258
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport_clients.c:406
+#: src/transport/gnunet-service-transport_clients.c:405
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
@@ -3892,11 +3918,11 @@
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport.c:519
+#: src/transport/gnunet-service-transport.c:555
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:528
+#: src/transport/gnunet-service-transport.c:564
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -4547,31 +4573,31 @@
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:262
+#: src/hostlist/gnunet-daemon-hostlist.c:264
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:315
+#: src/hostlist/gnunet-daemon-hostlist.c:317
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:322
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:325
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:327
+#: src/hostlist/gnunet-daemon-hostlist.c:329
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:339
+#: src/hostlist/gnunet-daemon-hostlist.c:341
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4716,23 +4742,59 @@
 msgid "use configuration file FILENAME"
 msgstr "usa el fichero de configuración FILENAME"
 
-#: src/include/gnunet_common.h:366 src/include/gnunet_common.h:371
-#: src/include/gnunet_common.h:377
+#: src/include/gnunet_common.h:430 src/include/gnunet_common.h:435
+#: src/include/gnunet_common.h:441
 #, 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:387
+#: src/include/gnunet_common.h:451
 #, 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:408 src/include/gnunet_common.h:415
+#: src/include/gnunet_common.h:472 src/include/gnunet_common.h:479
 #, 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 "Failed to stop service `%s'!\n"
+#~ msgstr "Fichero almacenado en '%s'.\n"
+
+#, fuzzy
+#~ msgid "Failed to start service `%s'!\n"
+#~ 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"
+
+#, fuzzy
+#~ msgid "Stopping all services\n"
+#~ msgstr "Deteniendo cron\n"
+
+#, fuzzy
+#~ msgid "Service `%s' stopped\n"
+#~ 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':"
+
+#, fuzzy
+#~ msgid "Service `%s' started\n"
+#~ msgstr "Servicio eliminado.\n"
+
+#, fuzzy
 #~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
 #~ msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
@@ -6215,12 +6277,6 @@
 #~ msgid "run as user LOGIN"
 #~ msgstr "ejecuta como el usuario LOGIN"
 
-#~ msgid "`%s' startup complete.\n"
-#~ msgstr "'%s' comienzo completo.\n"
-
-#~ msgid "`%s' is shutting down.\n"
-#~ msgstr "'%s' se esta cerrando.\n"
-
 #~ msgid ""
 #~ "run in debug mode; gnunetd will not daemonize and error messages will be "
 #~ "written to stderr instead of a logfile"

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2011-12-26 21:20:00 UTC (rev 18842)
+++ gnunet/po/sv.po     2011-12-26 21:22:07 UTC (rev 18843)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-11-30 16:20+0100\n"
+"POT-Creation-Date: 2011-12-26 22:22+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -21,16 +21,18 @@
 #: src/datastore/plugin_datastore_mysql.c:146
 #: src/datastore/plugin_datastore_mysql.c:613
 #: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:90 src/datacache/plugin_datacache_sqlite.c:71
+#: src/datastore/plugin_datastore_mysql.c:685
+#: src/datastore/plugin_datastore_mysql.c:1362
+#: src/datastore/plugin_datastore_mysql.c:1376 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:92 src/datacache/plugin_datacache_sqlite.c:71
 #: src/datacache/plugin_datacache_sqlite.c:74
 #: src/datacache/plugin_datacache_mysql.c:103
 #: src/datacache/plugin_datacache_mysql.c:110
 #: src/datacache/plugin_datacache_mysql.c:517
 #: src/datacache/plugin_datacache_mysql.c:526
 #: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:394
-#: src/include/gnunet_common.h:401
+#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:458
+#: src/include/gnunet_common.h:465
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -59,18 +61,18 @@
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1124
+#: src/datastore/plugin_datastore_sqlite.c:1161
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1143
+#: src/datastore/plugin_datastore_sqlite.c:1180
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1182
+#: src/datastore/plugin_datastore_sqlite.c:1220
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -87,16 +89,18 @@
 msgstr "Kunde inte köra \"%s\": %s\n"
 
 #: src/datastore/plugin_datastore_mysql.c:529
+#: src/datastore/plugin_datastore_mysql.c:1336
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #: src/datastore/plugin_datastore_mysql.c:622
+#: src/datastore/plugin_datastore_mysql.c:1346
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1500
+#: src/datastore/plugin_datastore_mysql.c:1581
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -111,7 +115,7 @@
 msgid "Unable to initialize Postgres with configuration `%s': %s"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/plugin_datastore_postgres.c:979
+#: src/datastore/plugin_datastore_postgres.c:1017
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -156,64 +160,64 @@
 msgid "# bytes sent to datastore"
 msgstr "# byte krypterade"
 
-#: src/datastore/datastore_api.c:768
+#: src/datastore/datastore_api.c:772
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/datastore_api.c:781
+#: src/datastore/datastore_api.c:786
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
+#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/datastore/datastore_api.c:805
+#: src/datastore/datastore_api.c:810
 #, fuzzy
 msgid "# status messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:876
+#: src/datastore/datastore_api.c:883
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:947
+#: src/datastore/datastore_api.c:954
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1012
+#: src/datastore/datastore_api.c:1019
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1073
+#: src/datastore/datastore_api.c:1080
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1141
+#: src/datastore/datastore_api.c:1148
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1186
+#: src/datastore/datastore_api.c:1193
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/datastore_api.c:1246
+#: src/datastore/datastore_api.c:1253
 #, fuzzy
 msgid "# Results received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/datastore_api.c:1317
+#: src/datastore/datastore_api.c:1324
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1384
+#: src/datastore/datastore_api.c:1391
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1448
+#: src/datastore/datastore_api.c:1455
 msgid "# GET requests executed"
 msgstr ""
 
@@ -221,150 +225,168 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:52
+#: src/datastore/gnunet-service-datastore.c:347
 #, fuzzy
-msgid "# bytes used in file-sharing datastore"
-msgstr "# byte krypterade"
-
-#: src/datastore/gnunet-service-datastore.c:331
-#, fuzzy
 msgid "# bytes expired"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:397
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:457
+#: src/datastore/gnunet-service-datastore.c:480
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:610
+#: src/datastore/gnunet-service-datastore.c:634
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:655
+#: src/datastore/gnunet-service-datastore.c:679
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:666
+#: src/datastore/gnunet-service-datastore.c:690
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:670
+#: src/datastore/gnunet-service-datastore.c:694
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:676
+#: src/datastore/gnunet-service-datastore.c:700
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:681
-#: src/datastore/gnunet-service-datastore.c:735
-#: src/datastore/gnunet-service-datastore.c:956
-#: src/datastore/gnunet-service-datastore.c:1441
+#: src/datastore/gnunet-service-datastore.c:705
+#: src/datastore/gnunet-service-datastore.c:759
+#: src/datastore/gnunet-service-datastore.c:980
+#: src/datastore/gnunet-service-datastore.c:1459
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:750
+#: src/datastore/gnunet-service-datastore.c:774
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
-#: src/datacache/datacache.c:248
+#: src/datastore/gnunet-service-datastore.c:848 src/datacache/datacache.c:118
+#: src/datacache/datacache.c:255
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datastore/gnunet-service-datastore.c:862
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1004
+#: src/datastore/gnunet-service-datastore.c:1028
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1042
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
+#: src/datastore/gnunet-service-datastore.c:1070
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:1104
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1115
+#: src/datastore/gnunet-service-datastore.c:1139
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1142
+#: src/datastore/gnunet-service-datastore.c:1166
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1152
+#: src/datastore/gnunet-service-datastore.c:1176
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1210
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1230
+#: src/datastore/gnunet-service-datastore.c:1254
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
-#: src/datacache/datacache.c:151
-#, fuzzy, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
-
-#: src/datastore/gnunet-service-datastore.c:1303
+#: src/datastore/gnunet-service-datastore.c:1317
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1312
+#: src/datastore/gnunet-service-datastore.c:1326
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/datastore/gnunet-service-datastore.c:1525
+#: src/datastore/gnunet-service-datastore.c:1536 src/datacache/datacache.c:144
+#: src/datacache/datacache.c:151
+#, fuzzy, c-format
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#: src/datastore/gnunet-service-datastore.c:1530
+#, fuzzy, c-format
+msgid "# bytes used in file-sharing datastore `%s'"
+msgstr "# byte krypterade"
+
+#: src/datastore/gnunet-service-datastore.c:1541
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1493
+#: src/datastore/gnunet-service-datastore.c:1543
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1556
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1516
+#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1590
+#, fuzzy, c-format
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/datastore/gnunet-service-datastore.c:1620
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
+#: src/datastore/gnunet-service-datastore.c:1649
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1654
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1657
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
 #: src/core/gnunet-service-core_sessions.c:208
 #: src/core/gnunet-service-core_sessions.c:273
 msgid "# entries in session map"
@@ -448,137 +470,137 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:491
+#: src/core/gnunet-service-core_kx.c:493
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:541
+#: src/core/gnunet-service-core_kx.c:543
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
+#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
 #: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core_kx.c:618
+#: src/core/gnunet-service-core_kx.c:620
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:668
+#: src/core/gnunet-service-core_kx.c:670
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:689
+#: src/core/gnunet-service-core_kx.c:691
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:741
+#: src/core/gnunet-service-core_kx.c:743
 #, fuzzy
 msgid "# session keys received"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:760
+#: src/core/gnunet-service-core_kx.c:762
 #, fuzzy, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
 
-#: src/core/gnunet-service-core_kx.c:798
+#: src/core/gnunet-service-core_kx.c:800
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:878
-#: src/transport/gnunet-service-transport_validation.c:778
+#: src/core/gnunet-service-core_kx.c:880
+#: src/transport/gnunet-service-transport_validation.c:780
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:912
+#: src/core/gnunet-service-core_kx.c:914
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:935
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1021
+#: src/core/gnunet-service-core_kx.c:1023
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1032
+#: src/core/gnunet-service-core_kx.c:1034
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1090
-#: src/transport/gnunet-service-transport_validation.c:983
+#: src/core/gnunet-service-core_kx.c:1092
+#: src/transport/gnunet-service-transport_validation.c:985
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1120
+#: src/core/gnunet-service-core_kx.c:1122
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1152
+#: src/core/gnunet-service-core_kx.c:1154
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1218
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1357
+#: src/core/gnunet-service-core_kx.c:1359
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1399
-#: src/core/gnunet-service-core_kx.c:1424
+#: src/core/gnunet-service-core_kx.c:1401
+#: src/core/gnunet-service-core_kx.c:1426
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1411
+#: src/core/gnunet-service-core_kx.c:1413
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1448
+#: src/core/gnunet-service-core_kx.c:1450
 #, 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:1452
+#: src/core/gnunet-service-core_kx.c:1454
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1460
+#: src/core/gnunet-service-core_kx.c:1462
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1523
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core_kx.c:1529
+#: src/core/gnunet-service-core_kx.c:1531
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1539
-#: src/transport/gnunet-service-transport.c:542
+#: src/core/gnunet-service-core_kx.c:1541
+#: src/transport/gnunet-service-transport.c:578
 #: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
 #, fuzzy, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
@@ -610,45 +632,45 @@
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:860
+#: src/util/common_logging.c:239 src/util/common_logging.c:890
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:858
+#: src/util/common_logging.c:241 src/util/common_logging.c:888
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:856
+#: src/util/common_logging.c:243 src/util/common_logging.c:886
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:854
+#: src/util/common_logging.c:245 src/util/common_logging.c:884
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:862
+#: src/util/common_logging.c:247 src/util/common_logging.c:892
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:578
+#: src/util/common_logging.c:610
 #, 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:695
+#: src/util/common_logging.c:725
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:863
+#: src/util/common_logging.c:893
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:945
+#: src/util/common_logging.c:975
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:983
+#: src/util/common_logging.c:1013
 msgid "invalid address"
 msgstr ""
 
@@ -801,7 +823,7 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Anrop till \"%s\" returnerade %d.\n"
 
-#: src/util/network.c:1197
+#: src/util/network.c:1204
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -814,12 +836,12 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:477
+#: src/util/os_installation.c:482
 #, 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:483
+#: src/util/os_installation.c:488
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
@@ -828,40 +850,40 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:355
+#: src/util/strings.c:354
 #, c-format
-msgid "Character set requested was `%s'\n"
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:433
+#: src/util/strings.c:462
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:525
+#: src/util/strings.c:554
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:530
+#: src/util/strings.c:559
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:534
+#: src/util/strings.c:563
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:538
+#: src/util/strings.c:567
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:542
+#: src/util/strings.c:571
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:546
+#: src/util/strings.c:575
 msgid " days"
 msgstr " dagar"
 
-#: src/util/strings.c:570
+#: src/util/strings.c:599
 msgid "end of time"
 msgstr ""
 
@@ -899,22 +921,22 @@
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
 # drive = hard drive ?
-#: src/util/disk.c:434
+#: src/util/disk.c:466
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk.c:834
+#: src/util/disk.c:866
 #, 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:1186 src/util/service.c:1452
+#: src/util/disk.c:1218 src/util/service.c:1541
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:1491
+#: src/util/disk.c:1523
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
@@ -976,7 +998,7 @@
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:2228
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -998,58 +1020,62 @@
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:947 src/transport/plugin_transport_http.c:996
+#: src/util/service.c:947 src/transport/plugin_transport_http.c:1057
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/service.c:964 src/transport/plugin_transport_http.c:1013
+#: src/util/service.c:964 src/transport/plugin_transport_http.c:1074
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/util/service.c:1120 src/util/service.c:1138
+#: src/util/service.c:1152
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+
+#: src/util/service.c:1203 src/util/service.c:1221
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/service.c:1248
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1314
+#: src/util/service.c:1403
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1347
+#: src/util/service.c:1436
 #, 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:1393
+#: src/util/service.c:1482
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1397
+#: src/util/service.c:1486
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1401
+#: src/util/service.c:1490
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1453
+#: src/util/service.c:1542
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1466
+#: src/util/service.c:1555
 #, 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:1529
+#: src/util/service.c:1618
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1057,8 +1083,15 @@
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_priority.c:114
+#: src/util/container_bloomfilter.c:507
 #, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+
+#: src/util/os_priority.c:116
+#, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
@@ -1110,12 +1143,12 @@
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:266
+#: src/util/pseudonym.c:273
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/pseudonym.c:330
+#: src/util/pseudonym.c:337
 #, fuzzy
 msgid "no-name"
 msgstr "Visa namn"
@@ -1201,75 +1234,75 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
+#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/crypto_rsa.c:621
+#: src/util/crypto_rsa.c:623
 #, 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:639
+#: src/util/crypto_rsa.c:641
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
+#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:698
+#: src/util/crypto_rsa.c:700
 #, 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:718
+#: src/util/crypto_rsa.c:720
 #, 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:736
+#: src/util/crypto_rsa.c:738
 #, 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:957
+#: src/util/crypto_rsa.c:959
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:634 src/dht/gnunet-dht-get.c:213
+#: src/nse/gnunet-nse-profiler.c:882 src/dht/gnunet-dht-get.c:213
 #: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:596
 #: src/fs/gnunet-download.c:263
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:652
+#: src/nse/gnunet-nse-profiler.c:900
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:903
+#: src/nse/gnunet-service-nse.c:935
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1328 src/nse/gnunet-service-nse.c:1347
-#: src/nse/gnunet-service-nse.c:1368
+#: src/nse/gnunet-service-nse.c:1390 src/nse/gnunet-service-nse.c:1409
+#: src/nse/gnunet-service-nse.c:1430
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1335
+#: src/nse/gnunet-service-nse.c:1397
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/nse/gnunet-service-nse.c:1356
+#: src/nse/gnunet-service-nse.c:1418
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -1327,22 +1360,22 @@
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/datacache.c:176
+#: src/datacache/datacache.c:183
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:184
+#: src/datacache/datacache.c:191
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/datacache/datacache.c:274
+#: src/datacache/datacache.c:281
 #, fuzzy
 msgid "# requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datacache/datacache.c:284
+#: src/datacache/datacache.c:291
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
@@ -1363,99 +1396,99 @@
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:479
+#: src/dht/gnunet-service-dht_neighbours.c:481
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:571
+#: src/dht/gnunet-service-dht_neighbours.c:573
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:627
-#: src/dht/gnunet-service-dht_neighbours.c:687
+#: src/dht/gnunet-service-dht_neighbours.c:629
+#: src/dht/gnunet-service-dht_neighbours.c:689
 #, fuzzy
 msgid "# Peers connected"
 msgstr "# av anslutna parter"
 
-#: src/dht/gnunet-service-dht_neighbours.c:721
+#: src/dht/gnunet-service-dht_neighbours.c:723
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:776
+#: src/dht/gnunet-service-dht_neighbours.c:778
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/dht/gnunet-service-dht_neighbours.c:814
+#: src/dht/gnunet-service-dht_neighbours.c:816
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1038
-#: src/dht/gnunet-service-dht_neighbours.c:1066
+#: src/dht/gnunet-service-dht_neighbours.c:1040
+#: src/dht/gnunet-service-dht_neighbours.c:1068
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1047
-#: src/dht/gnunet-service-dht_neighbours.c:1083
+#: src/dht/gnunet-service-dht_neighbours.c:1049
+#: src/dht/gnunet-service-dht_neighbours.c:1085
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1219
+#: src/dht/gnunet-service-dht_neighbours.c:1221
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1250
+#: src/dht/gnunet-service-dht_neighbours.c:1252
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1331
+#: src/dht/gnunet-service-dht_neighbours.c:1333
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1362
+#: src/dht/gnunet-service-dht_neighbours.c:1364
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1465
+#: 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:1553
+#: 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:1662
+#: src/dht/gnunet-service-dht_neighbours.c:1664
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1670
+#: src/dht/gnunet-service-dht_neighbours.c:1672
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1761
+#: src/dht/gnunet-service-dht_neighbours.c:1763
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1805
+#: src/dht/gnunet-service-dht_neighbours.c:1807
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1819
+#: src/dht/gnunet-service-dht_neighbours.c:1821
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1885
+#: src/dht/gnunet-service-dht_neighbours.c:1887
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1653,283 +1686,260 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/arm/gnunet-arm.c:161
+#: src/arm/gnunet-arm.c:149
 #, fuzzy, c-format
+msgid "Service `%s' is unknown to ARM.\n"
+msgstr "\"%s\" är inte en fil.\n"
+
+#: src/arm/gnunet-arm.c:154
+#, fuzzy, c-format
+msgid "Service `%s' has been stopped.\n"
+msgstr "Tjänst borttagen.\n"
+
+#: src/arm/gnunet-arm.c:157
+#, fuzzy, c-format
+msgid "Service `%s' was already running.\n"
+msgstr "\"%s\" är inte en fil.\n"
+
+#: src/arm/gnunet-arm.c:162
+#, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Tjänst borttagen.\n"
 
 #: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "Failed to stop service `%s'!\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Service `%s' was already being stopped.\n"
+msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-arm.c:171
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Tjänst borttagen.\n"
+msgid "Service `%s' was already not running.\n"
+msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:173
+#, c-format
+msgid "Request ignored as ARM is shutting down.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:177
 #, fuzzy, c-format
-msgid "Failed to start service `%s'!\n"
-msgstr "Misslyckades att starta samling.\n"
+msgid "Error communicating with ARM service.\n"
+msgstr "Skriv ut information om GNUnets motparter."
 
 #: src/arm/gnunet-arm.c:181
 #, fuzzy, c-format
-msgid "Some error communicating with service `%s'.\n"
+msgid "Timeout communicating with ARM service.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:207
+#: src/arm/gnunet-arm.c:185
+#, fuzzy, c-format
+msgid "Operation failed.\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/arm/gnunet-arm.c:189
 #, c-format
-msgid "Service `%s' is running.\n"
+msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:212
-#, fuzzy, c-format
-msgid "Service `%s' is not running.\n"
-msgstr "\"%s\" är inte en fil.\n"
-
-#: src/arm/gnunet-arm.c:238
+#: src/arm/gnunet-arm.c:216
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
+#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:269
+#: src/arm/gnunet-arm.c:247
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:275
+#: src/arm/gnunet-arm.c:253
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:387
+#: src/arm/gnunet-arm.c:355
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:389
+#: src/arm/gnunet-arm.c:357
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:359
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:393
+#: src/arm/gnunet-arm.c:361
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:396
+#: src/arm/gnunet-arm.c:364
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:399
-msgid "test if a particular service is running"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:402
+#: src/arm/gnunet-arm.c:367
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:404
+#: src/arm/gnunet-arm.c:369
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:407
+#: src/arm/gnunet-arm.c:372
 msgid "timeout for completing current operation"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:383
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:957
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
+#: src/arm/mockup-service.c:46
 msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
+#: src/arm/mockup-service.c:69
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:206
-#, c-format
-msgid "Restarting service `%s' due to configuration file change.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:234
-#, fuzzy
-msgid "Could not send status result to client\n"
-msgstr "Kunde inte skicka begäran till gnunetd.\n"
-
-#: src/arm/gnunet-service-arm.c:268
-msgid "Not sending status result to client: no client known\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:406
+#: src/arm/gnunet-service-arm.c:320
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:409
+#: src/arm/gnunet-service-arm.c:323
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:435
-#, c-format
-msgid "ARM is shutting down, service `%s' not started.\n"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:349
+#, fuzzy
+msgid "Could not send status result to client\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:443
+#: src/arm/gnunet-service-arm.c:476
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Kunde inte skapa användarkonto:"
+
+#: src/arm/gnunet-service-arm.c:498
 #, c-format
-msgid "Service `%s' already running.\n"
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:453
+#: src/arm/gnunet-service-arm.c:512
 #, c-format
-msgid "Binary implementing service `%s' not known!\n"
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:464
+#: src/arm/gnunet-service-arm.c:620
 #, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not known!\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/arm/gnunet-service-arm.c:498
-#, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:666
-msgid "Stopping all services\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:723
+#: src/arm/gnunet-service-arm.c:774
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:796
+#: src/arm/gnunet-service-arm.c:868
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:801
+#: src/arm/gnunet-service-arm.c:873
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:806
+#: src/arm/gnunet-service-arm.c:878
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:813
+#: src/arm/gnunet-service-arm.c:912
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1050
 #, fuzzy, c-format
-msgid "Service `%s' stopped\n"
-msgstr "Tjänst borttagen.\n"
+msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/arm/gnunet-service-arm.c:827
+#: src/arm/gnunet-service-arm.c:1052
+msgid "option missing"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1129
+#, fuzzy, c-format
+msgid "Starting default services `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/arm/gnunet-service-arm.c:1140
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
+msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/arm_api.c:201
+#: src/arm/gnunet-service-arm.c:1154
+msgid ""
+"No default services configured, GNUnet will not really start right now.\n"
+msgstr ""
+
+#: src/arm/arm_api.c:187
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:389
+#: src/arm/arm_api.c:378
 #, 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:403
+#: src/arm/arm_api.c:392
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:465
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:536
+#: src/arm/arm_api.c:521
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:537
+#: src/arm/arm_api.c:522
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:559
+#: src/arm/arm_api.c:544
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:560
+#: src/arm/arm_api.c:546
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:592
+#: src/arm/arm_api.c:579
 #, 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:664
+#: src/arm/arm_api.c:652
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "Inget svar mottaget inom %llums.\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:803
-#, c-format
-msgid "Unable to forward to service `%s': shutdown\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:812
-#, c-format
-msgid "Unable to forward to service `%s': timeout before connect\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:868
-#, fuzzy, c-format
-msgid "Unable to start service `%s': %s\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/arm/gnunet-service-arm_interceptor.c:936
-#, fuzzy, c-format
-msgid "Unable to accept connection for service `%s': %s\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/arm/gnunet-service-arm_interceptor.c:952
-#, fuzzy, c-format
-msgid "Service `%s' started\n"
-msgstr "Tjänst borttagen.\n"
-
-#: src/arm/gnunet-service-arm_interceptor.c:1080
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Kunde inte skapa användarkonto:"
-
-#: src/arm/gnunet-service-arm_interceptor.c:1102
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:1116
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
-msgstr ""
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -1989,34 +1999,38 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/statistics_api.c:327
+#: src/statistics/statistics_api.c:390
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/statistics/gnunet-statistics.c:89
+#: src/statistics/gnunet-statistics.c:98
 #, fuzzy, c-format
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#: src/statistics/gnunet-statistics.c:126 src/fs/gnunet-pseudonym.c:151
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/statistics/gnunet-statistics.c:155
-msgid "limit output to statistcs for the given NAME"
+#: src/statistics/gnunet-statistics.c:164
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:158
+#: src/statistics/gnunet-statistics.c:167
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:161
+#: src/statistics/gnunet-statistics.c:170
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
+#: src/statistics/gnunet-statistics.c:173
+msgid "just print the statistics value"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:180
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
@@ -2038,7 +2052,7 @@
 msgstr "Avindexera filer."
 
 #: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
-#: src/fs/gnunet-publish.c:158 src/fs/gnunet-download.c:144
+#: src/fs/gnunet-publish.c:163 src/fs/gnunet-download.c:144
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -2049,7 +2063,7 @@
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
 #: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
-#: src/fs/gnunet-publish.c:412 src/fs/gnunet-download.c:203
+#: src/fs/gnunet-publish.c:417 src/fs/gnunet-download.c:203
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -2074,7 +2088,7 @@
 msgid "Option `%s' ignored\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:538
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:543
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
@@ -2092,7 +2106,7 @@
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:557
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:562
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
@@ -2108,7 +2122,7 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:576
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:581
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2140,37 +2154,37 @@
 msgid "Failed to write `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:335
+#: src/fs/fs_namespace.c:338
 #, fuzzy
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
+#: src/fs/fs_namespace.c:427 src/fs/fs_namespace.c:448
 #, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:464
+#: src/fs/fs_namespace.c:467
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_namespace.c:507
+#: src/fs/fs_namespace.c:510
 #, 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:609
+#: src/fs/fs_namespace.c:612
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:834 src/fs/fs_publish.c:1523
+#: src/fs/fs_namespace.c:840 src/fs/fs_publish.c:1535
 #, fuzzy
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_namespace.c:878
+#: src/fs/fs_namespace.c:884
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2284,11 +2298,11 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
+#: src/fs/fs_uri.c:1109 src/fs/fs_uri.c:1136
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1265
+#: src/fs/fs_uri.c:1142
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2312,134 +2326,139 @@
 msgid "URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:267
+#: src/fs/gnunet-publish.c:160
 #, fuzzy, c-format
+msgid "Cleanup after abort complete.\n"
+msgstr "\"%s\" uppstart klar.\n"
+
+#: src/fs/gnunet-publish.c:272
+#, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:269
+#: src/fs/gnunet-publish.c:274
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:320
+#: src/fs/gnunet-publish.c:325
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-publish.c:362
+#: src/fs/gnunet-publish.c:367
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:369
+#: src/fs/gnunet-publish.c:374
 #, 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:375
+#: src/fs/gnunet-publish.c:380
 #, 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:383
+#: src/fs/gnunet-publish.c:388
 #, 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:393 src/fs/gnunet-publish.c:400
-#: src/transport/gnunet-transport.c:506
+#: src/fs/gnunet-publish.c:398 src/fs/gnunet-publish.c:405
+#: src/transport/gnunet-transport.c:502
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:422
+#: src/fs/gnunet-publish.c:427
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-publish.c:434 src/fs/gnunet-download.c:175
+#: src/fs/gnunet-publish.c:439 src/fs/gnunet-download.c:175
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/gnunet-publish.c:467
+#: src/fs/gnunet-publish.c:472
 #, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:497
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:515
+#: src/fs/gnunet-publish.c:520
 #, fuzzy, c-format
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:547
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:545
+#: src/fs/gnunet-publish.c:550
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:549
+#: src/fs/gnunet-publish.c:554
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:558
 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:560
+#: src/fs/gnunet-publish.c:565
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:570
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:569
+#: src/fs/gnunet-publish.c:574
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-publish.c:573
+#: src/fs/gnunet-publish.c:578
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:579
+#: src/fs/gnunet-publish.c:584
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:583
+#: src/fs/gnunet-publish.c:588
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:587
+#: src/fs/gnunet-publish.c:592
 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:600
+#: src/fs/gnunet-publish.c:605
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:803
+#: src/fs/fs_search.c:810
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2509,103 +2528,103 @@
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:368 src/fs/gnunet-service-fs_pr.c:622
+#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:623
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:786
+#: src/fs/gnunet-service-fs_pr.c:787
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:813
+#: src/fs/gnunet-service-fs_pr.c:814
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:830
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:845
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:936
+#: src/fs/gnunet-service-fs_pr.c:965
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:963
+#: src/fs/gnunet-service-fs_pr.c:992
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:998
+#: src/fs/gnunet-service-fs_pr.c:1027
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1088
+#: src/fs/gnunet-service-fs_pr.c:1120
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1109
+#: src/fs/gnunet-service-fs_pr.c:1141
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1156
+#: src/fs/gnunet-service-fs_pr.c:1188
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1170
+#: src/fs/gnunet-service-fs_pr.c:1202
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1179
+#: src/fs/gnunet-service-fs_pr.c:1211
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1195
+#: src/fs/gnunet-service-fs_pr.c:1227
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1212
+#: src/fs/gnunet-service-fs_pr.c:1244
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1225
+#: src/fs/gnunet-service-fs_pr.c:1257
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1230
+#: src/fs/gnunet-service-fs_pr.c:1262
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
-#: src/fs/gnunet-service-fs_pr.c:1437
+#: src/fs/gnunet-service-fs_pr.c:1289 src/fs/gnunet-service-fs_pr.c:1329
+#: src/fs/gnunet-service-fs_pr.c:1469
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1315
+#: src/fs/gnunet-service-fs_pr.c:1347
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1328
+#: src/fs/gnunet-service-fs_pr.c:1360
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1414
+#: src/fs/gnunet-service-fs_pr.c:1446
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1495
+#: src/fs/gnunet-service-fs_pr.c:1530
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_pr.c:1586 src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1629 src/fs/gnunet-service-fs_pr.c:1638
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
@@ -2647,12 +2666,12 @@
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
-#: src/transport/gnunet-service-transport_neighbours.c:934
-#: src/transport/gnunet-service-transport_neighbours.c:939
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1541
+#: src/transport/gnunet-service-transport_neighbours.c:936
 #: src/transport/gnunet-service-transport_neighbours.c:1263
-#: src/transport/gnunet-service-transport_neighbours.c:2364
-#: src/transport/gnunet-service-transport_neighbours.c:2430
+#: src/transport/gnunet-service-transport_neighbours.c:1735
+#: src/transport/gnunet-service-transport_neighbours.c:2369
+#: src/transport/gnunet-service-transport_neighbours.c:2437
 #: src/topology/gnunet-daemon-topology.c:654
 #: src/topology/gnunet-daemon-topology.c:756
 #, fuzzy
@@ -2678,65 +2697,69 @@
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
-#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
+#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:843
+#: src/fs/gnunet-service-fs_cp.c:858
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:916
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:930
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:968
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1025
+#: src/fs/gnunet-service-fs_cp.c:1035
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1049
+#: src/fs/gnunet-service-fs_cp.c:1059
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1059
+#: src/fs/gnunet-service-fs_cp.c:1069
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1138
+#: src/fs/gnunet-service-fs_cp.c:1148
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1172
+#: src/fs/gnunet-service-fs_cp.c:1182
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1196
+#: src/fs/gnunet-service-fs_cp.c:1206
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1262
+#: src/fs/gnunet-service-fs_cp.c:1272
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1290
+#: src/fs/gnunet-service-fs_cp.c:1300
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1331
+#: 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:1696
+#, fuzzy
+msgid "# migration stop messages sent"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
 #: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
@@ -2773,26 +2796,26 @@
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:487
+#: src/fs/gnunet-service-fs_indexing.c:490
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:545
+#: src/fs/gnunet-service-fs_indexing.c:548
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:560
+#: src/fs/gnunet-service-fs_indexing.c:563
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:562
+#: src/fs/gnunet-service-fs_indexing.c:565
 #, fuzzy
 msgid "not indexed"
 msgstr "Avindexering misslyckades."
 
-#: src/fs/gnunet-service-fs_indexing.c:577
+#: src/fs/gnunet-service-fs_indexing.c:580
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
@@ -2821,35 +2844,35 @@
 msgid "Failed to read file"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:235
+#: src/fs/fs_unindex.c:236
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:243
+#: src/fs/fs_unindex.c:244
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:251
+#: src/fs/fs_unindex.c:252
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
 
-#: src/fs/fs_unindex.c:296
+#: src/fs/fs_unindex.c:297
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:331
+#: src/fs/fs_unindex.c:332
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_unindex.c:344
+#: src/fs/fs_unindex.c:345
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:378
+#: src/fs/fs_unindex.c:379
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2922,73 +2945,73 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:150 src/fs/fs_publish.c:421
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
-#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
+#: src/fs/fs_publish.c:658 src/fs/fs_publish.c:675 src/fs/fs_publish.c:714
+#: src/fs/fs_publish.c:734 src/fs/fs_publish.c:761 src/fs/fs_publish.c:909
 #, 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:654
+#: src/fs/fs_publish.c:660
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:666
+#: src/fs/fs_publish.c:672
 #, fuzzy
 msgid "unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_publish.c:709
+#: src/fs/fs_publish.c:715
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:729
+#: src/fs/fs_publish.c:735
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:756
+#: src/fs/fs_publish.c:762
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:780
+#: src/fs/fs_publish.c:786
 #, 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:850
+#: src/fs/fs_publish.c:856
 #, 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:856
+#: src/fs/fs_publish.c:862
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:904
+#: src/fs/fs_publish.c:910
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1083
+#: src/fs/fs_publish.c:1092
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1154
+#: src/fs/fs_publish.c:1163
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1487
+#: src/fs/fs_publish.c:1499
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -3028,41 +3051,41 @@
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1984
+#: src/fs/fs_api.c:1992
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1994
+#: src/fs/fs_api.c:2002
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2107 src/fs/fs_api.c:2346
+#: src/fs/fs_api.c:2128 src/fs/fs_api.c:2367
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2124
+#: src/fs/fs_api.c:2145
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
+#: src/fs/fs_api.c:2157 src/fs/fs_api.c:2176 src/fs/fs_api.c:2652
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2337
+#: src/fs/fs_api.c:2358
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2583
+#: src/fs/fs_api.c:2604
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2669
+#: src/fs/fs_api.c:2690
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3122,28 +3145,28 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:581 src/topology/gnunet-daemon-topology.c:1290
+#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
 #: src/topology/gnunet-daemon-topology.c:1297
-#: src/hostlist/gnunet-daemon-hostlist.c:295
+#: src/hostlist/gnunet-daemon-hostlist.c:297
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
 # drive = hard drive ?
-#: src/fs/fs_file_information.c:350
+#: src/fs/fs_file_information.c:349
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s': %s"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:466
+#: src/transport/gnunet-service-transport_neighbours.c:468
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:855
+#: src/transport/gnunet-service-transport_neighbours.c:859
 #, fuzzy
 msgid "# peers disconnected due to external request"
 msgstr "# av anslutna parter"
@@ -3153,84 +3176,84 @@
 msgid "# fast reconnects failed"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-service-transport_neighbours.c:997
+#: src/transport/gnunet-service-transport_neighbours.c:998
 #, fuzzy
 msgid "# peers disconnected due to timeout"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1022
+#: src/transport/gnunet-service-transport_neighbours.c:1023
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1064
+#: src/transport/gnunet-service-transport_neighbours.c:1065
 #, fuzzy
 msgid "# peers disconnected due to global disconnect"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1778
-#: src/transport/gnunet-service-transport_neighbours.c:1799
+#: src/transport/gnunet-service-transport_neighbours.c:1781
+#: src/transport/gnunet-service-transport_neighbours.c:1802
 msgid "# messages not sent (no such peer or not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1815
+#: src/transport/gnunet-service-transport_neighbours.c:1818
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1867
+#: src/transport/gnunet-service-transport_neighbours.c:1870
 #, 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:1903
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1921
+#: src/transport/gnunet-service-transport_neighbours.c:1924
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1950
+#: src/transport/gnunet-service-transport_neighbours.c:1953
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2002
+#: src/transport/gnunet-service-transport_neighbours.c:2005
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2010
+#: src/transport/gnunet-service-transport_neighbours.c:2013
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2076
+#: src/transport/gnunet-service-transport_neighbours.c:2079
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2094
+#: src/transport/gnunet-service-transport_neighbours.c:2097
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2212
+#: src/transport/gnunet-service-transport_neighbours.c:2215
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2225
+#: src/transport/gnunet-service-transport_neighbours.c:2228
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2302
+#: src/transport/gnunet-service-transport_neighbours.c:2305
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2319
+#: src/transport/gnunet-service-transport_neighbours.c:2322
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2410
+#: src/transport/gnunet-service-transport_neighbours.c:2415
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
@@ -3291,35 +3314,35 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1529
+#: src/transport/plugin_transport_udp.c:1567
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp.c:1567
+#: src/transport/plugin_transport_udp.c:1610
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp.c:2063
-#: src/transport/plugin_transport_udp_new.c:1218
+#: src/transport/plugin_transport_udp.c:2106
+#: src/transport/plugin_transport_udp_new.c:1220
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2114
-#: src/transport/plugin_transport_udp_new.c:1268
+#: src/transport/plugin_transport_udp.c:2157
+#: src/transport/plugin_transport_udp_new.c:1270
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_udp.c:2258
+#: src/transport/plugin_transport_udp.c:2301
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2325
-#: src/transport/plugin_transport_udp_new.c:1396
+#: src/transport/plugin_transport_udp.c:2372
+#: src/transport/plugin_transport_udp_new.c:1398
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
@@ -3339,329 +3362,333 @@
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:504
+#: src/transport/plugin_transport_tcp.c:514
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:590
-#: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:731
-#: src/transport/plugin_transport_tcp.c:820
-#: src/transport/plugin_transport_tcp.c:1156
+#: src/transport/plugin_transport_tcp.c:601
+#: src/transport/plugin_transport_tcp.c:690
+#: src/transport/plugin_transport_tcp.c:742
+#: src/transport/plugin_transport_tcp.c:831
+#: src/transport/plugin_transport_tcp.c:1173
+#: src/transport/plugin_transport_tcp.c:1254
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:846
-#: src/transport/plugin_transport_tcp.c:1544
+#: src/transport/plugin_transport_tcp.c:607
+#: src/transport/plugin_transport_tcp.c:857
+#: src/transport/plugin_transport_tcp.c:1828
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:683
+#: src/transport/plugin_transport_tcp.c:694
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:734
+#: src/transport/plugin_transport_tcp.c:745
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:824
+#: src/transport/plugin_transport_tcp.c:835
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:945
+#: src/transport/plugin_transport_tcp.c:956
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:996
+#: src/transport/plugin_transport_tcp.c:1007
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1039
+#: src/transport/plugin_transport_tcp.c:1050
+#: src/transport/plugin_transport_tcp.c:1368
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1056
+#: src/transport/plugin_transport_tcp.c:1067
+#: src/transport/plugin_transport_tcp.c:1404
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1107
+#: src/transport/plugin_transport_tcp.c:1118
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1224
+#: src/transport/plugin_transport_tcp.c:1508
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1587
+#: src/transport/plugin_transport_tcp.c:1871
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:1732
+#: src/transport/plugin_transport_tcp.c:2021
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:1796
+#: src/transport/plugin_transport_tcp.c:2089
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1949
+#: src/transport/plugin_transport_tcp.c:2242
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2009
+#: src/transport/plugin_transport_tcp.c:2307
 #, 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:2032
+#: src/transport/plugin_transport_tcp.c:2330
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2036
+#: src/transport/plugin_transport_tcp.c:2334
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2040
+#: src/transport/plugin_transport_tcp.c:2338
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:923
+#: src/transport/plugin_transport_http.c:984
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:971
+#: src/transport/plugin_transport_http.c:1032
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/transport/plugin_transport_http.c:1118
+#: src/transport/plugin_transport_http.c:1179
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1131
+#: src/transport/plugin_transport_http.c:1192
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1206
+#: src/transport/plugin_transport_http.c:1267
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1219
+#: src/transport/plugin_transport_http.c:1280
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http.c:1230
+#: src/transport/plugin_transport_http.c:1291
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1250
+#: src/transport/plugin_transport_http.c:1311
 #, 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:1280
+#: src/transport/plugin_transport_http.c:1341
 #, 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_unix.c:1087
+#: src/transport/plugin_transport_unix.c:1096
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_smtp.c:367
+#: src/transport/plugin_transport_smtp.c:370
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
 # capped är inte ett bra ord IMHO
-#: src/transport/plugin_transport_smtp.c:454
+#: src/transport/plugin_transport_smtp.c:457
 #, fuzzy
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
 # capped är inte ett bra ord IMHO
-#: src/transport/plugin_transport_smtp.c:463
+#: src/transport/plugin_transport_smtp.c:466
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
-#: src/transport/plugin_transport_smtp.c:558
-#: src/transport/plugin_transport_smtp.c:568
-#: src/transport/plugin_transport_smtp.c:581
-#: src/transport/plugin_transport_smtp.c:600
-#: src/transport/plugin_transport_smtp.c:623
-#: src/transport/plugin_transport_smtp.c:631
-#: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:655
+#: src/transport/plugin_transport_smtp.c:561
+#: src/transport/plugin_transport_smtp.c:571
+#: src/transport/plugin_transport_smtp.c:584
+#: src/transport/plugin_transport_smtp.c:603
+#: src/transport/plugin_transport_smtp.c:626
+#: src/transport/plugin_transport_smtp.c:634
+#: src/transport/plugin_transport_smtp.c:647
+#: src/transport/plugin_transport_smtp.c:658
 #, fuzzy, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:798
+#: src/transport/plugin_transport_smtp.c:801
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:810
+#: src/transport/plugin_transport_smtp.c:813
 #, fuzzy
 msgid "# bytes received via SMTP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_smtp.c:811
+#: src/transport/plugin_transport_smtp.c:814
 #, fuzzy
 msgid "# bytes sent via SMTP"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_smtp.c:813
+#: src/transport/plugin_transport_smtp.c:816
 #, fuzzy
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/gnunet-service-transport_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:111
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:116
+#: src/transport/gnunet-service-transport_plugins.c:118
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:122
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:147
+#: src/transport/gnunet-service-transport_plugins.c:150
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/plugin_transport_wlan.c:884
+#: src/transport/plugin_transport_wlan.c:880
 #, fuzzy
 msgid "# wlan session timeouts"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:908
+#: src/transport/plugin_transport_wlan.c:904
 #, fuzzy
 msgid "# wlan session created"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:992
-#: src/transport/plugin_transport_wlan.c:1155
-#: src/transport/plugin_transport_wlan.c:1176
-#: src/transport/plugin_transport_wlan.c:1207
-#: src/transport/plugin_transport_wlan.c:2412
-#: src/transport/plugin_transport_wlan.c:3273
+#: src/transport/plugin_transport_wlan.c:988
+#: src/transport/plugin_transport_wlan.c:1151
+#: src/transport/plugin_transport_wlan.c:1172
+#: src/transport/plugin_transport_wlan.c:1203
+#: src/transport/plugin_transport_wlan.c:2378
+#: src/transport/plugin_transport_wlan.c:3240
 msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1250
-#: src/transport/plugin_transport_wlan.c:1967
+#: src/transport/plugin_transport_wlan.c:1246
+#: src/transport/plugin_transport_wlan.c:1933
 #, fuzzy
 msgid "# wlan pending fragments"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1441
+#: src/transport/plugin_transport_wlan.c:1407
 #, c-format
-msgid "Finished reading from wlan-helper stdout with code: %d\n"
+msgid ""
+"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1808
+#: src/transport/plugin_transport_wlan.c:1774
 msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1841
-#: src/transport/plugin_transport_wlan.c:2056
-#: src/transport/plugin_transport_wlan.c:2151
+#: src/transport/plugin_transport_wlan.c:1807
+#: src/transport/plugin_transport_wlan.c:2022
+#: src/transport/plugin_transport_wlan.c:2117
 #, c-format
 msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2042
+#: src/transport/plugin_transport_wlan.c:2008
 msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2113
+#: src/transport/plugin_transport_wlan.c:2079
 #, fuzzy
 msgid "# wlan fragments send"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:2279
+#: src/transport/plugin_transport_wlan.c:2245
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2284
+#: src/transport/plugin_transport_wlan.c:2250
 #, fuzzy
 msgid "# wlan messages queued"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2373
-#: src/transport/plugin_transport_wlan.c:3029
-#: src/transport/plugin_transport_wlan.c:3276
+#: src/transport/plugin_transport_wlan.c:2339
+#: src/transport/plugin_transport_wlan.c:2996
+#: src/transport/plugin_transport_wlan.c:3243
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2601
+#: src/transport/plugin_transport_wlan.c:2567
 #, fuzzy
 msgid "# wlan whole messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2803
+#: src/transport/plugin_transport_wlan.c:2770
 #, fuzzy
 msgid "# wlan hello messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2840
+#: src/transport/plugin_transport_wlan.c:2807
 #, fuzzy
 msgid "# wlan fragments received"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:2892
+#: src/transport/plugin_transport_wlan.c:2859
 #, fuzzy
 msgid "# wlan acks received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2989
+#: src/transport/plugin_transport_wlan.c:2956
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3013
+#: src/transport/plugin_transport_wlan.c:2980
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:3071
+#: src/transport/plugin_transport_wlan.c:3038
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3127
+#: src/transport/plugin_transport_wlan.c:3094
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:3138
+#: src/transport/plugin_transport_wlan.c:3105
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3708,109 +3735,109 @@
 
 #: src/transport/gnunet-transport.c:447
 #, fuzzy, c-format
-msgid "Peer `%s': %s\n"
+msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:515
+#: src/transport/gnunet-transport.c:511
 #, 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:552
+#: src/transport/gnunet-transport.c:548
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:555
+#: src/transport/gnunet-transport.c:551
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:558
+#: src/transport/gnunet-transport.c:554
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:562
+#: src/transport/gnunet-transport.c:558
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
+#: src/transport/gnunet-transport.c:561
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:568
+#: src/transport/gnunet-transport.c:564
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:576
+#: src/transport/gnunet-transport.c:572
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:408
+#: src/transport/gnunet-service-transport_validation.c:410
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:457
+#: src/transport/gnunet-service-transport_validation.c:459
 #, 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:494
+#: src/transport/gnunet-service-transport_validation.c:496
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/transport/gnunet-service-transport_validation.c:552
+#: src/transport/gnunet-service-transport_validation.c:554
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:773
+#: src/transport/gnunet-service-transport_validation.c:775
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:808
+#: src/transport/gnunet-service-transport_validation.c:810
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:876
+#: src/transport/gnunet-service-transport_validation.c:878
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:885
+#: src/transport/gnunet-service-transport_validation.c:887
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1007
+#: src/transport/gnunet-service-transport_validation.c:1009
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1032
+#: src/transport/gnunet-service-transport_validation.c:1034
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1091
+#: src/transport/gnunet-service-transport_validation.c:1093
 #, 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-service-transport_clients.c:254
+#: src/transport/gnunet-service-transport_clients.c:253
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:259
+#: src/transport/gnunet-service-transport_clients.c:258
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:406
+#: src/transport/gnunet-service-transport_clients.c:405
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
@@ -3839,11 +3866,11 @@
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:519
+#: src/transport/gnunet-service-transport.c:555
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:528
+#: src/transport/gnunet-service-transport.c:564
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -4492,31 +4519,31 @@
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:262
+#: src/hostlist/gnunet-daemon-hostlist.c:264
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:315
+#: src/hostlist/gnunet-daemon-hostlist.c:317
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:322
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:325
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:327
+#: src/hostlist/gnunet-daemon-hostlist.c:329
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:339
+#: src/hostlist/gnunet-daemon-hostlist.c:341
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4655,23 +4682,47 @@
 msgid "use configuration file FILENAME"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/include/gnunet_common.h:366 src/include/gnunet_common.h:371
-#: src/include/gnunet_common.h:377
+#: src/include/gnunet_common.h:430 src/include/gnunet_common.h:435
+#: src/include/gnunet_common.h:441
 #, 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:387
+#: src/include/gnunet_common.h:451
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:408 src/include/gnunet_common.h:415
+#: src/include/gnunet_common.h:472 src/include/gnunet_common.h:479
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to stop service `%s'!\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Failed to start service `%s'!\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' stopped\n"
+#~ 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\":"
+
+#, fuzzy
+#~ msgid "Service `%s' started\n"
+#~ msgstr "Tjänst borttagen.\n"
+
+#, fuzzy
 #~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
 #~ msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
@@ -5581,9 +5632,6 @@
 #~ msgid "run in client mode (for getting client configuration values)"
 #~ msgstr "kör i klientläge (för att hämta värden från klientkonfiguration)"
 
-#~ msgid "`%s' startup complete.\n"
-#~ msgstr "\"%s\" uppstart klar.\n"
-
 #~ msgid "Starts the gnunetd daemon."
 #~ msgstr "Startar gnunetd-demonen."
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2011-12-26 21:20:00 UTC (rev 18842)
+++ gnunet/po/vi.po     2011-12-26 21:22:07 UTC (rev 18843)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-11-30 16:20+0100\n"
+"POT-Creation-Date: 2011-12-26 22:22+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -24,16 +24,18 @@
 #: src/datastore/plugin_datastore_mysql.c:146
 #: src/datastore/plugin_datastore_mysql.c:613
 #: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:90 src/datacache/plugin_datacache_sqlite.c:71
+#: src/datastore/plugin_datastore_mysql.c:685
+#: src/datastore/plugin_datastore_mysql.c:1362
+#: src/datastore/plugin_datastore_mysql.c:1376 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:92 src/datacache/plugin_datacache_sqlite.c:71
 #: src/datacache/plugin_datacache_sqlite.c:74
 #: src/datacache/plugin_datacache_mysql.c:103
 #: src/datacache/plugin_datacache_mysql.c:110
 #: src/datacache/plugin_datacache_mysql.c:517
 #: src/datacache/plugin_datacache_mysql.c:526
 #: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:394
-#: src/include/gnunet_common.h:401
+#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:458
+#: src/include/gnunet_common.h:465
 #, 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"
@@ -63,18 +65,18 @@
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Dữ liệu sai trong %s. Đang thử sửa chữa (bằng cách xoá).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1124
+#: src/datastore/plugin_datastore_sqlite.c:1161
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1143
+#: src/datastore/plugin_datastore_sqlite.c:1180
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1182
+#: src/datastore/plugin_datastore_sqlite.c:1220
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -92,16 +94,18 @@
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
 #: src/datastore/plugin_datastore_mysql.c:529
+#: src/datastore/plugin_datastore_mysql.c:1336
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
 #: src/datastore/plugin_datastore_mysql.c:622
+#: src/datastore/plugin_datastore_mysql.c:1346
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1500
+#: src/datastore/plugin_datastore_mysql.c:1581
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -116,7 +120,7 @@
 msgid "Unable to initialize Postgres with configuration `%s': %s"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/datastore/plugin_datastore_postgres.c:979
+#: src/datastore/plugin_datastore_postgres.c:1017
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -161,72 +165,72 @@
 msgid "# bytes sent to datastore"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datastore/datastore_api.c:768
+#: src/datastore/datastore_api.c:772
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:781
+#: src/datastore/datastore_api.c:786
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
+#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/datastore/datastore_api.c:805
+#: src/datastore/datastore_api.c:810
 #, fuzzy
 msgid "# status messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/datastore/datastore_api.c:876
+#: src/datastore/datastore_api.c:883
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:947
+#: src/datastore/datastore_api.c:954
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1012
+#: src/datastore/datastore_api.c:1019
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1073
+#: src/datastore/datastore_api.c:1080
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1141
+#: src/datastore/datastore_api.c:1148
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1186
+#: src/datastore/datastore_api.c:1193
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1246
+#: src/datastore/datastore_api.c:1253
 #, fuzzy
 msgid "# Results received"
 msgstr "# các kết quả dht được nhận"
 
-#: src/datastore/datastore_api.c:1317
+#: src/datastore/datastore_api.c:1324
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1384
+#: src/datastore/datastore_api.c:1391
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1448
+#: src/datastore/datastore_api.c:1455
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
@@ -235,152 +239,170 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:52
+#: src/datastore/gnunet-service-datastore.c:347
 #, fuzzy
-msgid "# bytes used in file-sharing datastore"
-msgstr "# các byte được phép trong kho dữ liệu"
-
-#: src/datastore/gnunet-service-datastore.c:331
-#, fuzzy
 msgid "# bytes expired"
 msgstr "# các byte được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:397
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:457
+#: src/datastore/gnunet-service-datastore.c:480
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:610
+#: src/datastore/gnunet-service-datastore.c:634
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:655
+#: src/datastore/gnunet-service-datastore.c:679
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:666
+#: src/datastore/gnunet-service-datastore.c:690
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:670
+#: src/datastore/gnunet-service-datastore.c:694
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:676
+#: src/datastore/gnunet-service-datastore.c:700
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:681
-#: src/datastore/gnunet-service-datastore.c:735
-#: src/datastore/gnunet-service-datastore.c:956
-#: src/datastore/gnunet-service-datastore.c:1441
+#: src/datastore/gnunet-service-datastore.c:705
+#: src/datastore/gnunet-service-datastore.c:759
+#: src/datastore/gnunet-service-datastore.c:980
+#: src/datastore/gnunet-service-datastore.c:1459
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:750
+#: src/datastore/gnunet-service-datastore.c:774
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
-#: src/datacache/datacache.c:248
+#: src/datastore/gnunet-service-datastore.c:848 src/datacache/datacache.c:118
+#: src/datacache/datacache.c:255
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datastore/gnunet-service-datastore.c:862
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1004
+#: src/datastore/gnunet-service-datastore.c:1028
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1042
 #, fuzzy
 msgid "# requests filtered by bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datastore/gnunet-service-datastore.c:1046
+#: src/datastore/gnunet-service-datastore.c:1070
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:1104
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1115
+#: src/datastore/gnunet-service-datastore.c:1139
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1142
+#: src/datastore/gnunet-service-datastore.c:1166
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1152
+#: src/datastore/gnunet-service-datastore.c:1176
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1210
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1230
+#: src/datastore/gnunet-service-datastore.c:1254
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
-#: src/datacache/datacache.c:151
+#: src/datastore/gnunet-service-datastore.c:1317
 #, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1303
-#, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1312
+#: src/datastore/gnunet-service-datastore.c:1326
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/datastore/gnunet-service-datastore.c:1525
+#: src/datastore/gnunet-service-datastore.c:1536 src/datacache/datacache.c:144
+#: src/datacache/datacache.c:151
+#, c-format
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1530
+#, fuzzy, c-format
+msgid "# bytes used in file-sharing datastore `%s'"
+msgstr "# các byte được phép trong kho dữ liệu"
+
+#: src/datastore/gnunet-service-datastore.c:1541
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1493
+#: src/datastore/gnunet-service-datastore.c:1543
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1556
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1516
+#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1590
+#, fuzzy, c-format
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/datastore/gnunet-service-datastore.c:1620
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
+#: src/datastore/gnunet-service-datastore.c:1649
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1654
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1657
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
 #: src/core/gnunet-service-core_sessions.c:208
 #: src/core/gnunet-service-core_sessions.c:273
 msgid "# entries in session map"
@@ -466,137 +488,137 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:491
+#: src/core/gnunet-service-core_kx.c:493
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:541
+#: src/core/gnunet-service-core_kx.c:543
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
+#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
 #: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/core/gnunet-service-core_kx.c:618
+#: src/core/gnunet-service-core_kx.c:620
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:668
+#: src/core/gnunet-service-core_kx.c:670
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:689
+#: src/core/gnunet-service-core_kx.c:691
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:741
+#: src/core/gnunet-service-core_kx.c:743
 #, fuzzy
 msgid "# session keys received"
 msgstr "# các khoá phiên chạy bị từ chối"
 
-#: src/core/gnunet-service-core_kx.c:760
+#: src/core/gnunet-service-core_kx.c:762
 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:798
+#: src/core/gnunet-service-core_kx.c:800
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:878
-#: src/transport/gnunet-service-transport_validation.c:778
+#: src/core/gnunet-service-core_kx.c:880
+#: src/transport/gnunet-service-transport_validation.c:780
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:912
+#: src/core/gnunet-service-core_kx.c:914
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:935
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1021
+#: src/core/gnunet-service-core_kx.c:1023
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1032
+#: src/core/gnunet-service-core_kx.c:1034
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# các thông báo PING nhập thô được gửi"
 
-#: src/core/gnunet-service-core_kx.c:1090
-#: src/transport/gnunet-service-transport_validation.c:983
+#: src/core/gnunet-service-core_kx.c:1092
+#: src/transport/gnunet-service-transport_validation.c:985
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1120
+#: src/core/gnunet-service-core_kx.c:1122
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1152
+#: src/core/gnunet-service-core_kx.c:1154
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1218
 #, 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:1357
+#: src/core/gnunet-service-core_kx.c:1359
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1399
-#: src/core/gnunet-service-core_kx.c:1424
+#: src/core/gnunet-service-core_kx.c:1401
+#: src/core/gnunet-service-core_kx.c:1426
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1411
+#: src/core/gnunet-service-core_kx.c:1413
 #, 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:1448
+#: src/core/gnunet-service-core_kx.c:1450
 #, 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:1452
+#: src/core/gnunet-service-core_kx.c:1454
 #, 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:1460
+#: src/core/gnunet-service-core_kx.c:1462
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1523
 #, 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:1529
+#: src/core/gnunet-service-core_kx.c:1531
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1539
-#: src/transport/gnunet-service-transport.c:542
+#: src/core/gnunet-service-core_kx.c:1541
+#: src/transport/gnunet-service-transport.c:578
 #: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
 #, fuzzy, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
@@ -627,45 +649,45 @@
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:860
+#: src/util/common_logging.c:239 src/util/common_logging.c:890
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:858
+#: src/util/common_logging.c:241 src/util/common_logging.c:888
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:856
+#: src/util/common_logging.c:243 src/util/common_logging.c:886
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:854
+#: src/util/common_logging.c:245 src/util/common_logging.c:884
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:862
+#: src/util/common_logging.c:247 src/util/common_logging.c:892
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:578
+#: src/util/common_logging.c:610
 #, 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:695
+#: src/util/common_logging.c:725
 #, 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:863
+#: src/util/common_logging.c:893
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:945
+#: src/util/common_logging.c:975
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:983
+#: src/util/common_logging.c:1013
 msgid "invalid address"
 msgstr ""
 
@@ -821,7 +843,7 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/network.c:1197
+#: src/util/network.c:1204
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -834,12 +856,12 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:477
+#: src/util/os_installation.c:482
 #, 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:483
+#: src/util/os_installation.c:488
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
@@ -848,41 +870,41 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:355
+#: src/util/strings.c:354
 #, c-format
-msgid "Character set requested was `%s'\n"
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:433
+#: src/util/strings.c:462
 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:525
+#: src/util/strings.c:554
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:530
+#: src/util/strings.c:559
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:534
+#: src/util/strings.c:563
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:538
+#: src/util/strings.c:567
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:542
+#: src/util/strings.c:571
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:546
+#: src/util/strings.c:575
 msgid " days"
 msgstr " ngày"
 
-#: src/util/strings.c:570
+#: src/util/strings.c:599
 msgid "end of time"
 msgstr ""
 
@@ -918,22 +940,22 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/disk.c:434
+#: src/util/disk.c:466
 #, 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:834
+#: src/util/disk.c:866
 #, 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:1186 src/util/service.c:1452
+#: src/util/disk.c:1218 src/util/service.c:1541
 #, 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:1491
+#: src/util/disk.c:1523
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -995,7 +1017,7 @@
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:2228
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -1017,58 +1039,62 @@
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:947 src/transport/plugin_transport_http.c:996
+#: src/util/service.c:947 src/transport/plugin_transport_http.c:1057
 #, 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/util/service.c:964 src/transport/plugin_transport_http.c:1013
+#: src/util/service.c:964 src/transport/plugin_transport_http.c:1074
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/util/service.c:1120 src/util/service.c:1138
+#: src/util/service.c:1152
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+
+#: src/util/service.c:1203 src/util/service.c:1221
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/service.c:1248
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1314
+#: src/util/service.c:1403
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1347
+#: src/util/service.c:1436
 #, 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:1393
+#: src/util/service.c:1482
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1397
+#: src/util/service.c:1486
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1401
+#: src/util/service.c:1490
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1453
+#: src/util/service.c:1542
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1466
+#: src/util/service.c:1555
 #, 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:1529
+#: src/util/service.c:1618
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1076,8 +1102,15 @@
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_priority.c:114
+#: src/util/container_bloomfilter.c:507
 #, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+
+#: src/util/os_priority.c:116
+#, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
@@ -1127,12 +1160,12 @@
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:266
+#: src/util/pseudonym.c:273
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Lỗi phân tích dữ liệu giao diện từ « %s ».\n"
 
-#: src/util/pseudonym.c:330
+#: src/util/pseudonym.c:337
 msgid "no-name"
 msgstr "không-tên"
 
@@ -1216,74 +1249,74 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
+#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/util/crypto_rsa.c:621
+#: src/util/crypto_rsa.c:623
 #, 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:639
+#: src/util/crypto_rsa.c:641
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
+#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:698
+#: src/util/crypto_rsa.c:700
 #, 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:718
+#: src/util/crypto_rsa.c:720
 #, 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:736
+#: src/util/crypto_rsa.c:738
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:957
+#: src/util/crypto_rsa.c:959
 #, 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/nse/gnunet-nse-profiler.c:634 src/dht/gnunet-dht-get.c:213
+#: src/nse/gnunet-nse-profiler.c:882 src/dht/gnunet-dht-get.c:213
 #: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:596
 #: src/fs/gnunet-download.c:263
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:652
+#: src/nse/gnunet-nse-profiler.c:900
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/nse/gnunet-service-nse.c:903
+#: src/nse/gnunet-service-nse.c:935
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1328 src/nse/gnunet-service-nse.c:1347
-#: src/nse/gnunet-service-nse.c:1368
+#: src/nse/gnunet-service-nse.c:1390 src/nse/gnunet-service-nse.c:1409
+#: src/nse/gnunet-service-nse.c:1430
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1335
+#: src/nse/gnunet-service-nse.c:1397
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1356
+#: src/nse/gnunet-service-nse.c:1418
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -1344,22 +1377,22 @@
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/datacache.c:176
+#: src/datacache/datacache.c:183
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:184
+#: src/datacache/datacache.c:191
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/datacache/datacache.c:274
+#: src/datacache/datacache.c:281
 #, fuzzy
 msgid "# requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datacache/datacache.c:284
+#: src/datacache/datacache.c:291
 msgid "# requests filtered by bloom filter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
@@ -1380,102 +1413,102 @@
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:479
+#: src/dht/gnunet-service-dht_neighbours.c:481
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:571
+#: src/dht/gnunet-service-dht_neighbours.c:573
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:627
-#: src/dht/gnunet-service-dht_neighbours.c:687
+#: src/dht/gnunet-service-dht_neighbours.c:629
+#: src/dht/gnunet-service-dht_neighbours.c:689
 #, fuzzy
 msgid "# Peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/dht/gnunet-service-dht_neighbours.c:721
+#: src/dht/gnunet-service-dht_neighbours.c:723
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/dht/gnunet-service-dht_neighbours.c:776
+#: src/dht/gnunet-service-dht_neighbours.c:778
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/dht/gnunet-service-dht_neighbours.c:814
+#: src/dht/gnunet-service-dht_neighbours.c:816
 #, 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:1038
-#: src/dht/gnunet-service-dht_neighbours.c:1066
+#: src/dht/gnunet-service-dht_neighbours.c:1040
+#: src/dht/gnunet-service-dht_neighbours.c:1068
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1047
-#: src/dht/gnunet-service-dht_neighbours.c:1083
+#: src/dht/gnunet-service-dht_neighbours.c:1049
+#: src/dht/gnunet-service-dht_neighbours.c:1085
 #, 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:1219
+#: src/dht/gnunet-service-dht_neighbours.c:1221
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1250
+#: src/dht/gnunet-service-dht_neighbours.c:1252
 #, 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:1331
+#: src/dht/gnunet-service-dht_neighbours.c:1333
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1362
+#: src/dht/gnunet-service-dht_neighbours.c:1364
 #, 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:1465
+#: 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:1553
+#: 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:1662
+#: src/dht/gnunet-service-dht_neighbours.c:1664
 #, 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:1670
+#: src/dht/gnunet-service-dht_neighbours.c:1672
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1761
+#: src/dht/gnunet-service-dht_neighbours.c:1763
 #, 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:1805
+#: src/dht/gnunet-service-dht_neighbours.c:1807
 #, 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:1819
+#: src/dht/gnunet-service-dht_neighbours.c:1821
 #, 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:1885
+#: src/dht/gnunet-service-dht_neighbours.c:1887
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -1671,288 +1704,265 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:161
+#: src/arm/gnunet-arm.c:149
 #, 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:154
+#, fuzzy, c-format
+msgid "Service `%s' has been stopped.\n"
+msgstr "Dịch vụ đã bị xoá.\n"
+
+#: src/arm/gnunet-arm.c:157
+#, 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:162
+#, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
 #: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "Failed to stop service `%s'!\n"
-msgstr "Lỗi vào phòng « %s »\n"
+msgid "Service `%s' was already being stopped.\n"
+msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-arm.c:171
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Dịch vụ đã bị xoá.\n"
+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:175
+#: src/arm/gnunet-arm.c:173
 #, fuzzy, c-format
-msgid "Failed to start service `%s'!\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
+msgid "Request ignored as ARM is shutting down.\n"
+msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:177
 #, fuzzy, c-format
-msgid "Some error communicating with service `%s'.\n"
+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:207
+#: src/arm/gnunet-arm.c:181
 #, fuzzy, c-format
-msgid "Service `%s' is running.\n"
-msgstr "Không gian tên « %s » có đánh giá %d.\n"
+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:212
+#: src/arm/gnunet-arm.c:185
 #, fuzzy, c-format
-msgid "Service `%s' is not running.\n"
-msgstr "« %s » không phải là một tập tin.\n"
+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:238
+#: src/arm/gnunet-arm.c:189
 #, c-format
+msgid "Unknown response code from ARM.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:216
+#, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
+#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:269
+#: src/arm/gnunet-arm.c:247
 #, 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:275
+#: src/arm/gnunet-arm.c:253
 #, 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:387
+#: src/arm/gnunet-arm.c:355
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:389
+#: src/arm/gnunet-arm.c:357
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:359
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:393
+#: src/arm/gnunet-arm.c:361
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:396
+#: src/arm/gnunet-arm.c:364
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:399
-msgid "test if a particular service is running"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:402
+#: src/arm/gnunet-arm.c:367
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:404
+#: src/arm/gnunet-arm.c:369
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:407
+#: src/arm/gnunet-arm.c:372
 #, 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:418
+#: src/arm/gnunet-arm.c:383
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:957
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
+#: src/arm/mockup-service.c:46
 msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
+#: src/arm/mockup-service.c:69
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:206
-#, c-format
-msgid "Restarting service `%s' due to configuration file change.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:234
-msgid "Could not send status result to client\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:268
-msgid "Not sending status result to client: no client known\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:406
+#: src/arm/gnunet-service-arm.c:320
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-service-arm.c:409
+#: src/arm/gnunet-service-arm.c:323
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:435
+#: src/arm/gnunet-service-arm.c:349
+msgid "Could not send status result to client\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:476
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "Không thể tạo tài khoản người dùng:"
+
+#: src/arm/gnunet-service-arm.c:498
 #, c-format
-msgid "ARM is shutting down, service `%s' not started.\n"
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:443
+#: src/arm/gnunet-service-arm.c:512
 #, c-format
-msgid "Service `%s' already running.\n"
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:453
+#: src/arm/gnunet-service-arm.c:620
 #, fuzzy, c-format
-msgid "Binary implementing service `%s' not known!\n"
-msgstr "Không thẩm tra được chữ ký: không rõ đồng đẳng « %s ».\n"
-
-#: src/arm/gnunet-service-arm.c:464
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not known!\n"
-msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
-
-#: src/arm/gnunet-service-arm.c:498
-#, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:666
-msgid "Stopping all services\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:723
+#: src/arm/gnunet-service-arm.c:774
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:796
+#: src/arm/gnunet-service-arm.c:868
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:801
+#: src/arm/gnunet-service-arm.c:873
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:806
+#: src/arm/gnunet-service-arm.c:878
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:813
+#: src/arm/gnunet-service-arm.c:912
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1050
 #, fuzzy, c-format
-msgid "Service `%s' stopped\n"
-msgstr "Dịch vụ đã bị xoá.\n"
+msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/arm/gnunet-service-arm.c:827
+#: src/arm/gnunet-service-arm.c:1052
+msgid "option missing"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1129
+#, fuzzy, c-format
+msgid "Starting default services `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/arm/gnunet-service-arm.c:1140
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
+msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/arm_api.c:201
+#: src/arm/gnunet-service-arm.c:1154
+msgid ""
+"No default services configured, GNUnet will not really start right now.\n"
+msgstr ""
+
+#: src/arm/arm_api.c:187
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:389
+#: src/arm/arm_api.c:378
 #, 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:403
+#: src/arm/arm_api.c:392
 #, 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:467
+#: src/arm/arm_api.c:465
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:536
+#: src/arm/arm_api.c:521
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:537
+#: src/arm/arm_api.c:522
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:559
+#: src/arm/arm_api.c:544
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:560
+#: src/arm/arm_api.c:546
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:592
+#: src/arm/arm_api.c:579
 #, 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:664
+#: src/arm/arm_api.c:652
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:803
-#, c-format
-msgid "Unable to forward to service `%s': shutdown\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:812
-#, c-format
-msgid "Unable to forward to service `%s': timeout before connect\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:868
-#, fuzzy, c-format
-msgid "Unable to start service `%s': %s\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/arm/gnunet-service-arm_interceptor.c:936
-#, fuzzy, c-format
-msgid "Unable to accept connection for service `%s': %s\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/arm/gnunet-service-arm_interceptor.c:952
-#, fuzzy, c-format
-msgid "Service `%s' started\n"
-msgstr "Dịch vụ đã bị xoá.\n"
-
-#: src/arm/gnunet-service-arm_interceptor.c:1080
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "Không thể tạo tài khoản người dùng:"
-
-#: src/arm/gnunet-service-arm_interceptor.c:1102
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:1116
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
-msgstr ""
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -2013,34 +2023,38 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/statistics_api.c:327
+#: src/statistics/statistics_api.c:390
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/statistics/gnunet-statistics.c:89
+#: src/statistics/gnunet-statistics.c:98
 #, fuzzy, c-format
 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:117 src/fs/gnunet-pseudonym.c:151
+#: src/statistics/gnunet-statistics.c:126 src/fs/gnunet-pseudonym.c:151
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:155
-msgid "limit output to statistcs for the given NAME"
+#: src/statistics/gnunet-statistics.c:164
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:158
+#: src/statistics/gnunet-statistics.c:167
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:161
+#: src/statistics/gnunet-statistics.c:170
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
+#: src/statistics/gnunet-statistics.c:173
+msgid "just print the statistics value"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:180
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
@@ -2062,7 +2076,7 @@
 msgstr "Bỏ chỉ mục tập tin."
 
 #: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
-#: src/fs/gnunet-publish.c:158 src/fs/gnunet-download.c:144
+#: src/fs/gnunet-publish.c:163 src/fs/gnunet-download.c:144
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
@@ -2073,7 +2087,7 @@
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
 #: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
-#: src/fs/gnunet-publish.c:412 src/fs/gnunet-download.c:203
+#: src/fs/gnunet-publish.c:417 src/fs/gnunet-download.c:203
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -2098,7 +2112,7 @@
 msgid "Option `%s' ignored\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:538
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:543
 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"
 
@@ -2119,7 +2133,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:282 src/fs/gnunet-publish.c:557
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:562
 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"
 
@@ -2136,7 +2150,7 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:576
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:581
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2169,37 +2183,37 @@
 msgid "Failed to write `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:335
+#: src/fs/fs_namespace.c:338
 #, fuzzy
 msgid "Unknown error"
 msgstr "Lỗi không rõ.\n"
 
-#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
+#: src/fs/fs_namespace.c:427 src/fs/fs_namespace.c:448
 #, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/fs/fs_namespace.c:464
+#: src/fs/fs_namespace.c:467
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_namespace.c:507
+#: src/fs/fs_namespace.c:510
 #, 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:609
+#: src/fs/fs_namespace.c:612
 #, 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:834 src/fs/fs_publish.c:1523
+#: src/fs/fs_namespace.c:840 src/fs/fs_publish.c:1535
 #, fuzzy
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_namespace.c:878
+#: src/fs/fs_namespace.c:884
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -2314,11 +2328,11 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
+#: src/fs/fs_uri.c:1109 src/fs/fs_uri.c:1136
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1265
+#: src/fs/fs_uri.c:1142
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -2342,81 +2356,86 @@
 msgid "URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:267
+#: src/fs/gnunet-publish.c:160
 #, fuzzy, c-format
+msgid "Cleanup after abort complete.\n"
+msgstr "Hoàn thành khởi chạy « %s ».\n"
+
+#: src/fs/gnunet-publish.c:272
+#, 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:269
+#: src/fs/gnunet-publish.c:274
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:320
+#: src/fs/gnunet-publish.c:325
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-publish.c:362
+#: src/fs/gnunet-publish.c:367
 #, 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:369
+#: src/fs/gnunet-publish.c:374
 #, 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:375
+#: src/fs/gnunet-publish.c:380
 #, 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:383
+#: src/fs/gnunet-publish.c:388
 #, 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:393 src/fs/gnunet-publish.c:400
-#: src/transport/gnunet-transport.c:506
+#: src/fs/gnunet-publish.c:398 src/fs/gnunet-publish.c:405
+#: src/transport/gnunet-transport.c:502
 #, 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:422
+#: src/fs/gnunet-publish.c:427
 #, 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:434 src/fs/gnunet-download.c:175
+#: src/fs/gnunet-publish.c:439 src/fs/gnunet-download.c:175
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/gnunet-publish.c:467
+#: src/fs/gnunet-publish.c:472
 #, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:497
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:515
+#: src/fs/gnunet-publish.c:520
 #, fuzzy, c-format
 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:542
+#: src/fs/gnunet-publish.c:547
 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:545
+#: src/fs/gnunet-publish.c:550
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:549
+#: src/fs/gnunet-publish.c:554
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2424,7 +2443,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:553
+#: src/fs/gnunet-publish.c:558
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2432,7 +2451,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:560
+#: src/fs/gnunet-publish.c:565
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2440,7 +2459,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:565
+#: src/fs/gnunet-publish.c:570
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2448,16 +2467,16 @@
 "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:569
+#: src/fs/gnunet-publish.c:574
 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:573
+#: src/fs/gnunet-publish.c:578
 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:579
+#: src/fs/gnunet-publish.c:584
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -2465,13 +2484,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:583
+#: src/fs/gnunet-publish.c:588
 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:587
+#: src/fs/gnunet-publish.c:592
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -2479,11 +2498,11 @@
 "Đị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:600
+#: src/fs/gnunet-publish.c:605
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:803
+#: src/fs/fs_search.c:810
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2553,105 +2572,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:368 src/fs/gnunet-service-fs_pr.c:622
+#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:623
 #, 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:786
+#: src/fs/gnunet-service-fs_pr.c:787
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:813
+#: src/fs/gnunet-service-fs_pr.c:814
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:830
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:845
 #, 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:936
+#: src/fs/gnunet-service-fs_pr.c:965
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:963
+#: src/fs/gnunet-service-fs_pr.c:992
 #, 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:998
+#: src/fs/gnunet-service-fs_pr.c:1027
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1088
+#: src/fs/gnunet-service-fs_pr.c:1120
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1109
+#: src/fs/gnunet-service-fs_pr.c:1141
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1156
+#: src/fs/gnunet-service-fs_pr.c:1188
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1170
+#: src/fs/gnunet-service-fs_pr.c:1202
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1179
+#: src/fs/gnunet-service-fs_pr.c:1211
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1195
+#: src/fs/gnunet-service-fs_pr.c:1227
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1212
+#: src/fs/gnunet-service-fs_pr.c:1244
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1225
+#: src/fs/gnunet-service-fs_pr.c:1257
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1230
+#: src/fs/gnunet-service-fs_pr.c:1262
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
-#: src/fs/gnunet-service-fs_pr.c:1437
+#: src/fs/gnunet-service-fs_pr.c:1289 src/fs/gnunet-service-fs_pr.c:1329
+#: src/fs/gnunet-service-fs_pr.c:1469
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1315
+#: src/fs/gnunet-service-fs_pr.c:1347
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1328
+#: src/fs/gnunet-service-fs_pr.c:1360
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1414
+#: src/fs/gnunet-service-fs_pr.c:1446
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1495
+#: src/fs/gnunet-service-fs_pr.c:1530
 #, 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:1586 src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1629 src/fs/gnunet-service-fs_pr.c:1638
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
@@ -2695,12 +2714,12 @@
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
-#: src/transport/gnunet-service-transport_neighbours.c:934
-#: src/transport/gnunet-service-transport_neighbours.c:939
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1541
+#: src/transport/gnunet-service-transport_neighbours.c:936
 #: src/transport/gnunet-service-transport_neighbours.c:1263
-#: src/transport/gnunet-service-transport_neighbours.c:2364
-#: src/transport/gnunet-service-transport_neighbours.c:2430
+#: src/transport/gnunet-service-transport_neighbours.c:1735
+#: src/transport/gnunet-service-transport_neighbours.c:2369
+#: src/transport/gnunet-service-transport_neighbours.c:2437
 #: src/topology/gnunet-daemon-topology.c:654
 #: src/topology/gnunet-daemon-topology.c:756
 #, fuzzy
@@ -2727,71 +2746,75 @@
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
-#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
+#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:843
+#: src/fs/gnunet-service-fs_cp.c:858
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:916
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:930
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:968
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1025
+#: src/fs/gnunet-service-fs_cp.c:1035
 #, 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:1049
+#: src/fs/gnunet-service-fs_cp.c:1059
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1059
+#: src/fs/gnunet-service-fs_cp.c:1069
 #, 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:1138
+#: src/fs/gnunet-service-fs_cp.c:1148
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1172
+#: src/fs/gnunet-service-fs_cp.c:1182
 #, 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:1196
+#: src/fs/gnunet-service-fs_cp.c:1206
 #, 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:1262
+#: src/fs/gnunet-service-fs_cp.c:1272
 #, 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:1290
+#: 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:1331
+#: 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:1696
+#, fuzzy
+msgid "# migration stop messages sent"
+msgstr "# các thông báo phát hiện dht được nhận"
+
 #: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
@@ -2828,25 +2851,25 @@
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:487
+#: src/fs/gnunet-service-fs_indexing.c:490
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:545
+#: src/fs/gnunet-service-fs_indexing.c:548
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:560
+#: src/fs/gnunet-service-fs_indexing.c:563
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:562
+#: src/fs/gnunet-service-fs_indexing.c:565
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:577
+#: src/fs/gnunet-service-fs_indexing.c:580
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
@@ -2875,35 +2898,35 @@
 msgid "Failed to read file"
 msgstr "Lỗi gửi tin nhẳn.\n"
 
-#: src/fs/fs_unindex.c:235
+#: src/fs/fs_unindex.c:236
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:243
+#: src/fs/fs_unindex.c:244
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:251
+#: src/fs/fs_unindex.c:252
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/fs_unindex.c:296
+#: src/fs/fs_unindex.c:297
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:331
+#: src/fs/fs_unindex.c:332
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_unindex.c:344
+#: src/fs/fs_unindex.c:345
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:378
+#: src/fs/fs_unindex.c:379
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -2980,69 +3003,69 @@
 "Không rõ kiểu siêu dữ liệu trong tùy chọn siêu dữ liệu « %s ». Đang ùng kiểu "
 "siêu dữ liệu « không rõ » (unknown) để thay thế.\n"
 
-#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:150 src/fs/fs_publish.c:421
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
-#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
+#: src/fs/fs_publish.c:658 src/fs/fs_publish.c:675 src/fs/fs_publish.c:714
+#: src/fs/fs_publish.c:734 src/fs/fs_publish.c:761 src/fs/fs_publish.c:909
 #, 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:654
+#: src/fs/fs_publish.c:660
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:666
+#: src/fs/fs_publish.c:672
 #, fuzzy
 msgid "unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/fs/fs_publish.c:709
+#: src/fs/fs_publish.c:715
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:729
+#: src/fs/fs_publish.c:735
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:756
+#: src/fs/fs_publish.c:762
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:780
+#: src/fs/fs_publish.c:786
 #, 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:850
+#: src/fs/fs_publish.c:856
 #, 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:856
+#: src/fs/fs_publish.c:862
 #, 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:904
+#: src/fs/fs_publish.c:910
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1083
+#: src/fs/fs_publish.c:1092
 #, 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:1154
+#: src/fs/fs_publish.c:1163
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1487
+#: src/fs/fs_publish.c:1499
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
@@ -3082,41 +3105,41 @@
 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:1984
+#: src/fs/fs_api.c:1992
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1994
+#: src/fs/fs_api.c:2002
 #, 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:2107 src/fs/fs_api.c:2346
+#: src/fs/fs_api.c:2128 src/fs/fs_api.c:2367
 #, 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:2124
+#: src/fs/fs_api.c:2145
 #, 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:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
+#: src/fs/fs_api.c:2157 src/fs/fs_api.c:2176 src/fs/fs_api.c:2652
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2337
+#: src/fs/fs_api.c:2358
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2583
+#: src/fs/fs_api.c:2604
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2669
+#: src/fs/fs_api.c:2690
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3176,28 +3199,28 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
-#: src/fs/gnunet-service-fs.c:581 src/topology/gnunet-daemon-topology.c:1290
+#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
 #: src/topology/gnunet-daemon-topology.c:1297
-#: src/hostlist/gnunet-daemon-hostlist.c:295
+#: src/hostlist/gnunet-daemon-hostlist.c:297
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_file_information.c:350
+#: src/fs/fs_file_information.c:349
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s': %s"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:466
+#: src/transport/gnunet-service-transport_neighbours.c:468
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:855
+#: src/transport/gnunet-service-transport_neighbours.c:859
 #, fuzzy
 msgid "# peers disconnected due to external request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
@@ -3207,88 +3230,88 @@
 msgid "# fast reconnects failed"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/gnunet-service-transport_neighbours.c:997
+#: src/transport/gnunet-service-transport_neighbours.c:998
 #, fuzzy
 msgid "# peers disconnected due to timeout"
 msgstr "# các kết nối bị đóng (vấn đề truyền tải)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1022
+#: src/transport/gnunet-service-transport_neighbours.c:1023
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1064
+#: src/transport/gnunet-service-transport_neighbours.c:1065
 #, fuzzy
 msgid "# peers disconnected due to global disconnect"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1778
-#: src/transport/gnunet-service-transport_neighbours.c:1799
+#: src/transport/gnunet-service-transport_neighbours.c:1781
+#: src/transport/gnunet-service-transport_neighbours.c:1802
 #, fuzzy
 msgid "# messages not sent (no such peer or not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1815
+#: src/transport/gnunet-service-transport_neighbours.c:1818
 #, 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:1867
+#: src/transport/gnunet-service-transport_neighbours.c:1870
 #, 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:1903
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 #, 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:1921
+#: src/transport/gnunet-service-transport_neighbours.c:1924
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1950
+#: src/transport/gnunet-service-transport_neighbours.c:1953
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2002
+#: src/transport/gnunet-service-transport_neighbours.c:2005
 #, 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:2010
+#: src/transport/gnunet-service-transport_neighbours.c:2013
 #, 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:2076
+#: src/transport/gnunet-service-transport_neighbours.c:2079
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2094
+#: src/transport/gnunet-service-transport_neighbours.c:2097
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2212
+#: src/transport/gnunet-service-transport_neighbours.c:2215
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2225
+#: src/transport/gnunet-service-transport_neighbours.c:2228
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2302
+#: src/transport/gnunet-service-transport_neighbours.c:2305
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2319
+#: src/transport/gnunet-service-transport_neighbours.c:2322
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2410
+#: src/transport/gnunet-service-transport_neighbours.c:2415
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
@@ -3350,35 +3373,35 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1529
+#: src/transport/plugin_transport_udp.c:1567
 #, fuzzy
 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.c:1567
+#: src/transport/plugin_transport_udp.c:1610
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp.c:2063
-#: src/transport/plugin_transport_udp_new.c:1218
+#: src/transport/plugin_transport_udp.c:2106
+#: src/transport/plugin_transport_udp_new.c:1220
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2114
-#: src/transport/plugin_transport_udp_new.c:1268
+#: src/transport/plugin_transport_udp.c:2157
+#: src/transport/plugin_transport_udp_new.c:1270
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_udp.c:2258
+#: src/transport/plugin_transport_udp.c:2301
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2325
-#: src/transport/plugin_transport_udp_new.c:1396
+#: src/transport/plugin_transport_udp.c:2372
+#: src/transport/plugin_transport_udp_new.c:1398
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -3398,325 +3421,329 @@
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:504
+#: src/transport/plugin_transport_tcp.c:514
 #, 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:590
-#: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:731
-#: src/transport/plugin_transport_tcp.c:820
-#: src/transport/plugin_transport_tcp.c:1156
+#: src/transport/plugin_transport_tcp.c:601
+#: src/transport/plugin_transport_tcp.c:690
+#: src/transport/plugin_transport_tcp.c:742
+#: src/transport/plugin_transport_tcp.c:831
+#: src/transport/plugin_transport_tcp.c:1173
+#: src/transport/plugin_transport_tcp.c:1254
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:846
-#: src/transport/plugin_transport_tcp.c:1544
+#: src/transport/plugin_transport_tcp.c:607
+#: src/transport/plugin_transport_tcp.c:857
+#: src/transport/plugin_transport_tcp.c:1828
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:683
+#: src/transport/plugin_transport_tcp.c:694
 #, 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:734
+#: src/transport/plugin_transport_tcp.c:745
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:824
+#: src/transport/plugin_transport_tcp.c:835
 #, 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:945
+#: src/transport/plugin_transport_tcp.c:956
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:996
+#: src/transport/plugin_transport_tcp.c:1007
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1039
+#: src/transport/plugin_transport_tcp.c:1050
+#: src/transport/plugin_transport_tcp.c:1368
 #, 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:1056
+#: src/transport/plugin_transport_tcp.c:1067
+#: src/transport/plugin_transport_tcp.c:1404
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1107
+#: src/transport/plugin_transport_tcp.c:1118
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1224
+#: src/transport/plugin_transport_tcp.c:1508
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1587
+#: src/transport/plugin_transport_tcp.c:1871
 #, 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:1732
+#: src/transport/plugin_transport_tcp.c:2021
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:1796
+#: src/transport/plugin_transport_tcp.c:2089
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1949
+#: src/transport/plugin_transport_tcp.c:2242
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2009
+#: src/transport/plugin_transport_tcp.c:2307
 #, 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:2032
+#: src/transport/plugin_transport_tcp.c:2330
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2036
+#: src/transport/plugin_transport_tcp.c:2334
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2040
+#: src/transport/plugin_transport_tcp.c:2338
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:923
+#: src/transport/plugin_transport_http.c:984
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:971
+#: src/transport/plugin_transport_http.c:1032
 #, 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:1118
+#: src/transport/plugin_transport_http.c:1179
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1131
+#: src/transport/plugin_transport_http.c:1192
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1206
+#: src/transport/plugin_transport_http.c:1267
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1219
+#: src/transport/plugin_transport_http.c:1280
 #, 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:1230
+#: src/transport/plugin_transport_http.c:1291
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1250
+#: src/transport/plugin_transport_http.c:1311
 #, 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:1280
+#: src/transport/plugin_transport_http.c:1341
 #, 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_unix.c:1087
+#: src/transport/plugin_transport_unix.c:1096
 #, 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_smtp.c:367
+#: src/transport/plugin_transport_smtp.c:370
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr "Nhận được thông báo dạng sai qua %s. Bị bỏ qua.\n"
 
-#: src/transport/plugin_transport_smtp.c:454
+#: src/transport/plugin_transport_smtp.c:457
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr "Chuỗi lọc vào SMTP không hợp lệ, còn thiếu « : »\n"
 
-#: src/transport/plugin_transport_smtp.c:463
+#: src/transport/plugin_transport_smtp.c:466
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "Chuỗi lọc vào SMTP quá dài, tối đa « %s »\n"
 
-#: src/transport/plugin_transport_smtp.c:558
-#: src/transport/plugin_transport_smtp.c:568
-#: src/transport/plugin_transport_smtp.c:581
-#: src/transport/plugin_transport_smtp.c:600
-#: src/transport/plugin_transport_smtp.c:623
-#: src/transport/plugin_transport_smtp.c:631
-#: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:655
+#: src/transport/plugin_transport_smtp.c:561
+#: src/transport/plugin_transport_smtp.c:571
+#: src/transport/plugin_transport_smtp.c:584
+#: src/transport/plugin_transport_smtp.c:603
+#: src/transport/plugin_transport_smtp.c:626
+#: src/transport/plugin_transport_smtp.c:634
+#: src/transport/plugin_transport_smtp.c:647
+#: src/transport/plugin_transport_smtp.c:658
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:798
+#: src/transport/plugin_transport_smtp.c:801
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr "Chưa ghi rõ địa chỉ thư điện tử nên không tạo được truyền tải SMTP.\n"
 
-#: src/transport/plugin_transport_smtp.c:810
+#: src/transport/plugin_transport_smtp.c:813
 msgid "# bytes received via SMTP"
 msgstr "# các byte đã nhận qua SMTP"
 
-#: src/transport/plugin_transport_smtp.c:811
+#: src/transport/plugin_transport_smtp.c:814
 msgid "# bytes sent via SMTP"
 msgstr "# các byte đã gửi qua SMTP"
 
-#: src/transport/plugin_transport_smtp.c:813
+#: src/transport/plugin_transport_smtp.c:816
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/gnunet-service-transport_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:111
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:116
+#: src/transport/gnunet-service-transport_plugins.c:118
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:122
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:147
+#: src/transport/gnunet-service-transport_plugins.c:150
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/plugin_transport_wlan.c:884
+#: src/transport/plugin_transport_wlan.c:880
 #, fuzzy
 msgid "# wlan session timeouts"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:908
+#: src/transport/plugin_transport_wlan.c:904
 #, fuzzy
 msgid "# wlan session created"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:992
-#: src/transport/plugin_transport_wlan.c:1155
-#: src/transport/plugin_transport_wlan.c:1176
-#: src/transport/plugin_transport_wlan.c:1207
-#: src/transport/plugin_transport_wlan.c:2412
-#: src/transport/plugin_transport_wlan.c:3273
+#: src/transport/plugin_transport_wlan.c:988
+#: src/transport/plugin_transport_wlan.c:1151
+#: src/transport/plugin_transport_wlan.c:1172
+#: src/transport/plugin_transport_wlan.c:1203
+#: src/transport/plugin_transport_wlan.c:2378
+#: src/transport/plugin_transport_wlan.c:3240
 msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1250
-#: src/transport/plugin_transport_wlan.c:1967
+#: src/transport/plugin_transport_wlan.c:1246
+#: src/transport/plugin_transport_wlan.c:1933
 #, fuzzy
 msgid "# wlan pending fragments"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:1441
+#: src/transport/plugin_transport_wlan.c:1407
 #, c-format
-msgid "Finished reading from wlan-helper stdout with code: %d\n"
+msgid ""
+"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1808
+#: src/transport/plugin_transport_wlan.c:1774
 msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1841
-#: src/transport/plugin_transport_wlan.c:2056
-#: src/transport/plugin_transport_wlan.c:2151
+#: src/transport/plugin_transport_wlan.c:1807
+#: src/transport/plugin_transport_wlan.c:2022
+#: src/transport/plugin_transport_wlan.c:2117
 #, c-format
 msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2042
+#: src/transport/plugin_transport_wlan.c:2008
 msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2113
+#: src/transport/plugin_transport_wlan.c:2079
 #, fuzzy
 msgid "# wlan fragments send"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:2279
+#: src/transport/plugin_transport_wlan.c:2245
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2284
+#: src/transport/plugin_transport_wlan.c:2250
 #, fuzzy
 msgid "# wlan messages queued"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2373
-#: src/transport/plugin_transport_wlan.c:3029
-#: src/transport/plugin_transport_wlan.c:3276
+#: src/transport/plugin_transport_wlan.c:2339
+#: src/transport/plugin_transport_wlan.c:2996
+#: src/transport/plugin_transport_wlan.c:3243
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2601
+#: src/transport/plugin_transport_wlan.c:2567
 #, fuzzy
 msgid "# wlan whole messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2803
+#: src/transport/plugin_transport_wlan.c:2770
 #, fuzzy
 msgid "# wlan hello messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2840
+#: src/transport/plugin_transport_wlan.c:2807
 #, fuzzy
 msgid "# wlan fragments received"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:2892
+#: src/transport/plugin_transport_wlan.c:2859
 #, fuzzy
 msgid "# wlan acks received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2989
+#: src/transport/plugin_transport_wlan.c:2956
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3013
+#: src/transport/plugin_transport_wlan.c:2980
 #, fuzzy
 msgid "# wlan mac endpoints created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:3071
+#: src/transport/plugin_transport_wlan.c:3038
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3127
+#: src/transport/plugin_transport_wlan.c:3094
 #, fuzzy
 msgid "# wlan messages for this client received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:3138
+#: src/transport/plugin_transport_wlan.c:3105
 #, fuzzy
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -3763,110 +3790,110 @@
 
 #: src/transport/gnunet-transport.c:447
 #, fuzzy, c-format
-msgid "Peer `%s': %s\n"
+msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:515
+#: src/transport/gnunet-transport.c:511
 #, 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:552
+#: src/transport/gnunet-transport.c:548
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:555
+#: src/transport/gnunet-transport.c:551
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:558
+#: src/transport/gnunet-transport.c:554
 #, 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:562
+#: src/transport/gnunet-transport.c:558
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
+#: src/transport/gnunet-transport.c:561
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:568
+#: src/transport/gnunet-transport.c:564
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:576
+#: src/transport/gnunet-transport.c:572
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:408
+#: src/transport/gnunet-service-transport_validation.c:410
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:457
+#: src/transport/gnunet-service-transport_validation.c:459
 #, 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:494
+#: src/transport/gnunet-service-transport_validation.c:496
 #, 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:552
+#: src/transport/gnunet-service-transport_validation.c:554
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:773
+#: src/transport/gnunet-service-transport_validation.c:775
 #, 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:808
+#: src/transport/gnunet-service-transport_validation.c:810
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:876
+#: src/transport/gnunet-service-transport_validation.c:878
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:885
+#: src/transport/gnunet-service-transport_validation.c:887
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1007
+#: src/transport/gnunet-service-transport_validation.c:1009
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1032
+#: src/transport/gnunet-service-transport_validation.c:1034
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1091
+#: src/transport/gnunet-service-transport_validation.c:1093
 #, 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-service-transport_clients.c:254
+#: src/transport/gnunet-service-transport_clients.c:253
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:259
+#: src/transport/gnunet-service-transport_clients.c:258
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_clients.c:406
+#: src/transport/gnunet-service-transport_clients.c:405
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
@@ -3895,11 +3922,11 @@
 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:519
+#: src/transport/gnunet-service-transport.c:555
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:528
+#: src/transport/gnunet-service-transport.c:564
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -4572,34 +4599,34 @@
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:262
+#: src/hostlist/gnunet-daemon-hostlist.c:264
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:315
+#: src/hostlist/gnunet-daemon-hostlist.c:317
 #, fuzzy
 msgid "advertise our hostlist to other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:322
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:325
 #, fuzzy
 msgid "enable learning about hostlist servers from other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:327
+#: src/hostlist/gnunet-daemon-hostlist.c:329
 #, fuzzy
 msgid "provide a hostlist server"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:339
+#: src/hostlist/gnunet-daemon-hostlist.c:341
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4745,23 +4772,51 @@
 msgid "use configuration file FILENAME"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/include/gnunet_common.h:366 src/include/gnunet_common.h:371
-#: src/include/gnunet_common.h:377
+#: src/include/gnunet_common.h:430 src/include/gnunet_common.h:435
+#: src/include/gnunet_common.h:441
 #, 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:387
+#: src/include/gnunet_common.h:451
 #, 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:408 src/include/gnunet_common.h:415
+#: src/include/gnunet_common.h:472 src/include/gnunet_common.h:479
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to stop service `%s'!\n"
+#~ msgstr "Lỗi vào phòng « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to start service `%s'!\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
+
+#, fuzzy
+#~ msgid "Binary implementing service `%s' not known!\n"
+#~ msgstr "Không thẩm tra được chữ ký: không rõ đồng đẳng « %s ».\n"
+
+#, fuzzy
+#~ msgid "Service `%s' stopped\n"
+#~ 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 »:"
+
+#, fuzzy
+#~ msgid "Service `%s' started\n"
+#~ msgstr "Dịch vụ đã bị xoá.\n"
+
+#, fuzzy
 #~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
 #~ msgstr "Đồng đẳng « %s » có mức tin cậy %8u và địa chỉ « %s »\n"
 
@@ -6739,12 +6794,6 @@
 #~ "Lỗi quyết định tên tập tin được dùng để chứa thông tin về phiên bản "
 #~ "GNUnet.\n"
 
-#~ msgid "`%s' startup complete.\n"
-#~ msgstr "Hoàn thành khởi chạy « %s ».\n"
-
-#~ msgid "`%s' is shutting down.\n"
-#~ msgstr "« %s » đang tắt.\n"
-
 #~ msgid ""
 #~ "run in debug mode; gnunetd will not daemonize and error messages will be "
 #~ "written to stderr instead of a logfile"

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2011-12-26 21:20:00 UTC (rev 18842)
+++ gnunet/po/zh_CN.po  2011-12-26 21:22:07 UTC (rev 18843)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-11-30 16:20+0100\n"
+"POT-Creation-Date: 2011-12-26 22:22+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -21,16 +21,18 @@
 #: src/datastore/plugin_datastore_mysql.c:146
 #: src/datastore/plugin_datastore_mysql.c:613
 #: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:90 src/datacache/plugin_datacache_sqlite.c:71
+#: src/datastore/plugin_datastore_mysql.c:685
+#: src/datastore/plugin_datastore_mysql.c:1362
+#: src/datastore/plugin_datastore_mysql.c:1376 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:92 src/datacache/plugin_datacache_sqlite.c:71
 #: src/datacache/plugin_datacache_sqlite.c:74
 #: src/datacache/plugin_datacache_mysql.c:103
 #: src/datacache/plugin_datacache_mysql.c:110
 #: src/datacache/plugin_datacache_mysql.c:517
 #: src/datacache/plugin_datacache_mysql.c:526
 #: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:394
-#: src/include/gnunet_common.h:401
+#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:458
+#: src/include/gnunet_common.h:465
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
@@ -60,18 +62,18 @@
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1124
+#: src/datastore/plugin_datastore_sqlite.c:1161
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1143
+#: src/datastore/plugin_datastore_sqlite.c:1180
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1182
+#: src/datastore/plugin_datastore_sqlite.c:1220
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -89,16 +91,18 @@
 msgstr "无法解析“%s”(%s)：%s\n"
 
 #: src/datastore/plugin_datastore_mysql.c:529
+#: src/datastore/plugin_datastore_mysql.c:1336
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #: src/datastore/plugin_datastore_mysql.c:622
+#: src/datastore/plugin_datastore_mysql.c:1346
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1500
+#: src/datastore/plugin_datastore_mysql.c:1581
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -113,7 +117,7 @@
 msgid "Unable to initialize Postgres with configuration `%s': %s"
 msgstr "无法保存配置文件“%s”："
 
-#: src/datastore/plugin_datastore_postgres.c:979
+#: src/datastore/plugin_datastore_postgres.c:1017
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -153,59 +157,59 @@
 msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/datastore/datastore_api.c:768
+#: src/datastore/datastore_api.c:772
 msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/datastore/datastore_api.c:781
+#: src/datastore/datastore_api.c:786
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
+#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
 msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:805
+#: src/datastore/datastore_api.c:810
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:876
+#: src/datastore/datastore_api.c:883
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:947
+#: src/datastore/datastore_api.c:954
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1012
+#: src/datastore/datastore_api.c:1019
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1073
+#: src/datastore/datastore_api.c:1080
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1141
+#: src/datastore/datastore_api.c:1148
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1186
+#: src/datastore/datastore_api.c:1193
 msgid "Failed to receive response from database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1246
+#: src/datastore/datastore_api.c:1253
 msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1317
+#: src/datastore/datastore_api.c:1324
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1384
+#: src/datastore/datastore_api.c:1391
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1448
+#: src/datastore/datastore_api.c:1455
 msgid "# GET requests executed"
 msgstr ""
 
@@ -213,143 +217,162 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:52
-msgid "# bytes used in file-sharing datastore"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:331
+#: src/datastore/gnunet-service-datastore.c:347
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:397
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:457
+#: src/datastore/gnunet-service-datastore.c:480
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:610
+#: src/datastore/gnunet-service-datastore.c:634
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:655
+#: src/datastore/gnunet-service-datastore.c:679
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:666
+#: src/datastore/gnunet-service-datastore.c:690
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:670
+#: src/datastore/gnunet-service-datastore.c:694
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:676
+#: src/datastore/gnunet-service-datastore.c:700
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:681
-#: src/datastore/gnunet-service-datastore.c:735
-#: src/datastore/gnunet-service-datastore.c:956
-#: src/datastore/gnunet-service-datastore.c:1441
+#: src/datastore/gnunet-service-datastore.c:705
+#: src/datastore/gnunet-service-datastore.c:759
+#: src/datastore/gnunet-service-datastore.c:980
+#: src/datastore/gnunet-service-datastore.c:1459
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:750
+#: src/datastore/gnunet-service-datastore.c:774
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
-#: src/datacache/datacache.c:248
+#: src/datastore/gnunet-service-datastore.c:848 src/datacache/datacache.c:118
+#: src/datacache/datacache.c:255
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datastore/gnunet-service-datastore.c:862
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1004
+#: src/datastore/gnunet-service-datastore.c:1028
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1042
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
+#: src/datastore/gnunet-service-datastore.c:1070
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:1104
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1115
+#: src/datastore/gnunet-service-datastore.c:1139
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1142
+#: src/datastore/gnunet-service-datastore.c:1166
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1152
+#: src/datastore/gnunet-service-datastore.c:1176
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1210
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1230
+#: src/datastore/gnunet-service-datastore.c:1254
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
+#: src/datastore/gnunet-service-datastore.c:1317
+#, c-format
+msgid "Loading `%s' datastore plugin\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1326
+#, fuzzy, c-format
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/datastore/gnunet-service-datastore.c:1525
+#: src/datastore/gnunet-service-datastore.c:1536 src/datacache/datacache.c:144
 #: src/datacache/datacache.c:151
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1303
+#: src/datastore/gnunet-service-datastore.c:1530
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1312
-#, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/datastore/gnunet-service-datastore.c:1491
+#: src/datastore/gnunet-service-datastore.c:1541
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1493
+#: src/datastore/gnunet-service-datastore.c:1543
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1556
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1516
+#: src/datastore/gnunet-service-datastore.c:1574
+#: src/datastore/gnunet-service-datastore.c:1590
+#, fuzzy, c-format
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/datastore/gnunet-service-datastore.c:1620
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 
+#: src/datastore/gnunet-service-datastore.c:1649
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1654
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1657
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
 #: src/core/gnunet-service-core_sessions.c:208
 #: src/core/gnunet-service-core_sessions.c:273
 msgid "# entries in session map"
@@ -429,123 +452,123 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:491
+#: src/core/gnunet-service-core_kx.c:493
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:541
+#: src/core/gnunet-service-core_kx.c:543
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
+#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
 #: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
 #, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:618
+#: src/core/gnunet-service-core_kx.c:620
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:668
+#: src/core/gnunet-service-core_kx.c:670
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:689
+#: src/core/gnunet-service-core_kx.c:691
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:741
+#: src/core/gnunet-service-core_kx.c:743
 msgid "# session keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:760
+#: src/core/gnunet-service-core_kx.c:762
 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:798
+#: src/core/gnunet-service-core_kx.c:800
 msgid "# SET_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:878
-#: src/transport/gnunet-service-transport_validation.c:778
+#: src/core/gnunet-service-core_kx.c:880
+#: src/transport/gnunet-service-transport_validation.c:780
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:912
+#: src/core/gnunet-service-core_kx.c:914
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:935
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1021
+#: src/core/gnunet-service-core_kx.c:1023
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1032
+#: src/core/gnunet-service-core_kx.c:1034
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1090
-#: src/transport/gnunet-service-transport_validation.c:983
+#: src/core/gnunet-service-core_kx.c:1092
+#: src/transport/gnunet-service-transport_validation.c:985
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1120
+#: src/core/gnunet-service-core_kx.c:1122
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1152
+#: src/core/gnunet-service-core_kx.c:1154
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1218
 msgid "# SET_KEY and PING messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1357
+#: src/core/gnunet-service-core_kx.c:1359
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1399
-#: src/core/gnunet-service-core_kx.c:1424
+#: src/core/gnunet-service-core_kx.c:1401
+#: src/core/gnunet-service-core_kx.c:1426
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1411
+#: src/core/gnunet-service-core_kx.c:1413
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1448
+#: src/core/gnunet-service-core_kx.c:1450
 #, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1452
+#: src/core/gnunet-service-core_kx.c:1454
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1460
+#: src/core/gnunet-service-core_kx.c:1462
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1523
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/core/gnunet-service-core_kx.c:1529
+#: src/core/gnunet-service-core_kx.c:1531
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1539
-#: src/transport/gnunet-service-transport.c:542
+#: src/core/gnunet-service-core_kx.c:1541
+#: src/transport/gnunet-service-transport.c:578
 #: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
 #, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
@@ -574,45 +597,45 @@
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:860
+#: src/util/common_logging.c:239 src/util/common_logging.c:890
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:858
+#: src/util/common_logging.c:241 src/util/common_logging.c:888
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:856
+#: src/util/common_logging.c:243 src/util/common_logging.c:886
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:854
+#: src/util/common_logging.c:245 src/util/common_logging.c:884
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:862
+#: src/util/common_logging.c:247 src/util/common_logging.c:892
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:578
+#: src/util/common_logging.c:610
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/common_logging.c:695
+#: src/util/common_logging.c:725
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:863
+#: src/util/common_logging.c:893
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:945
+#: src/util/common_logging.c:975
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:983
+#: src/util/common_logging.c:1013
 msgid "invalid address"
 msgstr ""
 
@@ -765,7 +788,7 @@
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/network.c:1197
+#: src/util/network.c:1204
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -778,12 +801,12 @@
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:477
+#: src/util/os_installation.c:482
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/os_installation.c:483
+#: src/util/os_installation.c:488
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "“%s”说：%s\n"
@@ -792,40 +815,40 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:355
+#: src/util/strings.c:354
 #, c-format
-msgid "Character set requested was `%s'\n"
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:433
+#: src/util/strings.c:462
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
-#: src/util/strings.c:525
+#: src/util/strings.c:554
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:530
+#: src/util/strings.c:559
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:534
+#: src/util/strings.c:563
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:538
+#: src/util/strings.c:567
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:542
+#: src/util/strings.c:571
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:546
+#: src/util/strings.c:575
 msgid " days"
 msgstr " 天"
 
-#: src/util/strings.c:570
+#: src/util/strings.c:599
 msgid "end of time"
 msgstr ""
 
@@ -861,22 +884,22 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/disk.c:434
+#: src/util/disk.c:466
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/disk.c:834
+#: src/util/disk.c:866
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
-#: src/util/disk.c:1186 src/util/service.c:1452
+#: src/util/disk.c:1218 src/util/service.c:1541
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/util/disk.c:1491
+#: src/util/disk.c:1523
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -938,7 +961,7 @@
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:2228
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -960,58 +983,62 @@
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:947 src/transport/plugin_transport_http.c:996
+#: src/util/service.c:947 src/transport/plugin_transport_http.c:1057
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/service.c:964 src/transport/plugin_transport_http.c:1013
+#: src/util/service.c:964 src/transport/plugin_transport_http.c:1074
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/service.c:1120 src/util/service.c:1138
+#: src/util/service.c:1152
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+
+#: src/util/service.c:1203 src/util/service.c:1221
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/service.c:1248
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1314
+#: src/util/service.c:1403
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/service.c:1347
+#: src/util/service.c:1436
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1393
+#: src/util/service.c:1482
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1397
+#: src/util/service.c:1486
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1401
+#: src/util/service.c:1490
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1453
+#: src/util/service.c:1542
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1466
+#: src/util/service.c:1555
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”：%s\n"
 
-#: src/util/service.c:1529
+#: src/util/service.c:1618
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1019,8 +1046,15 @@
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/os_priority.c:114
+#: src/util/container_bloomfilter.c:507
 #, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+
+#: src/util/os_priority.c:116
+#, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
@@ -1070,12 +1104,12 @@
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:266
+#: src/util/pseudonym.c:273
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/pseudonym.c:330
+#: src/util/pseudonym.c:337
 msgid "no-name"
 msgstr "无名称"
 
@@ -1159,74 +1193,74 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
+#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/crypto_rsa.c:621
+#: src/util/crypto_rsa.c:623
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_rsa.c:639
+#: src/util/crypto_rsa.c:641
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
+#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:698
+#: src/util/crypto_rsa.c:700
 #, 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:718
+#: src/util/crypto_rsa.c:720
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:736
+#: src/util/crypto_rsa.c:738
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:957
+#: src/util/crypto_rsa.c:959
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:634 src/dht/gnunet-dht-get.c:213
+#: src/nse/gnunet-nse-profiler.c:882 src/dht/gnunet-dht-get.c:213
 #: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:596
 #: src/fs/gnunet-download.c:263
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:652
+#: src/nse/gnunet-nse-profiler.c:900
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:903
+#: src/nse/gnunet-service-nse.c:935
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1328 src/nse/gnunet-service-nse.c:1347
-#: src/nse/gnunet-service-nse.c:1368
+#: src/nse/gnunet-service-nse.c:1390 src/nse/gnunet-service-nse.c:1409
+#: src/nse/gnunet-service-nse.c:1430
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1335
+#: src/nse/gnunet-service-nse.c:1397
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1356
+#: src/nse/gnunet-service-nse.c:1418
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -1282,21 +1316,21 @@
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/datacache.c:176
+#: src/datacache/datacache.c:183
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:184
+#: src/datacache/datacache.c:191
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:274
+#: src/datacache/datacache.c:281
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:284
+#: src/datacache/datacache.c:291
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
@@ -1317,89 +1351,89 @@
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:479
+#: src/dht/gnunet-service-dht_neighbours.c:481
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:571
+#: src/dht/gnunet-service-dht_neighbours.c:573
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:627
-#: src/dht/gnunet-service-dht_neighbours.c:687
+#: src/dht/gnunet-service-dht_neighbours.c:629
+#: src/dht/gnunet-service-dht_neighbours.c:689
 #, fuzzy
 msgid "# Peers connected"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:721
+#: src/dht/gnunet-service-dht_neighbours.c:723
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:776
+#: src/dht/gnunet-service-dht_neighbours.c:778
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:814
+#: src/dht/gnunet-service-dht_neighbours.c:816
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1038
-#: src/dht/gnunet-service-dht_neighbours.c:1066
+#: src/dht/gnunet-service-dht_neighbours.c:1040
+#: src/dht/gnunet-service-dht_neighbours.c:1068
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1047
-#: src/dht/gnunet-service-dht_neighbours.c:1083
+#: src/dht/gnunet-service-dht_neighbours.c:1049
+#: src/dht/gnunet-service-dht_neighbours.c:1085
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1219
+#: src/dht/gnunet-service-dht_neighbours.c:1221
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1250
+#: src/dht/gnunet-service-dht_neighbours.c:1252
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1331
+#: src/dht/gnunet-service-dht_neighbours.c:1333
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1362
+#: src/dht/gnunet-service-dht_neighbours.c:1364
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1465
+#: src/dht/gnunet-service-dht_neighbours.c:1467
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1553
+#: src/dht/gnunet-service-dht_neighbours.c:1555
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1662
+#: src/dht/gnunet-service-dht_neighbours.c:1664
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1670
+#: src/dht/gnunet-service-dht_neighbours.c:1672
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1761
+#: src/dht/gnunet-service-dht_neighbours.c:1763
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1805
+#: src/dht/gnunet-service-dht_neighbours.c:1807
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1819
+#: src/dht/gnunet-service-dht_neighbours.c:1821
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1885
+#: src/dht/gnunet-service-dht_neighbours.c:1887
 msgid "# P2P RESULTS received"
 msgstr ""
 
@@ -1587,285 +1621,262 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:161
+#: src/arm/gnunet-arm.c:149
 #, fuzzy, c-format
+msgid "Service `%s' is unknown to ARM.\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-arm.c:154
+#, fuzzy, c-format
+msgid "Service `%s' has been stopped.\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-arm.c:157
+#, fuzzy, c-format
+msgid "Service `%s' was already running.\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-arm.c:162
+#, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "服务已删除。\n"
 
 #: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "Failed to stop service `%s'!\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+msgid "Service `%s' was already being stopped.\n"
+msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:171
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
+msgid "Service `%s' was already not running.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:175
-#, fuzzy, c-format
-msgid "Failed to start service `%s'!\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/arm/gnunet-arm.c:173
+#, c-format
+msgid "Request ignored as ARM is shutting down.\n"
+msgstr ""
 
+#: src/arm/gnunet-arm.c:177
+#, c-format
+msgid "Error communicating with ARM service.\n"
+msgstr ""
+
 #: src/arm/gnunet-arm.c:181
 #, c-format
-msgid "Some error communicating with service `%s'.\n"
+msgid "Timeout communicating with ARM service.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:207
+#: src/arm/gnunet-arm.c:185
 #, c-format
-msgid "Service `%s' is running.\n"
+msgid "Operation failed.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:212
+#: src/arm/gnunet-arm.c:189
 #, c-format
-msgid "Service `%s' is not running.\n"
+msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:238
+#: src/arm/gnunet-arm.c:216
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
+#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:269
+#: src/arm/gnunet-arm.c:247
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:275
+#: src/arm/gnunet-arm.c:253
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:387
+#: src/arm/gnunet-arm.c:355
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:389
+#: src/arm/gnunet-arm.c:357
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:359
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:393
+#: src/arm/gnunet-arm.c:361
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:396
+#: src/arm/gnunet-arm.c:364
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:399
-msgid "test if a particular service is running"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:402
+#: src/arm/gnunet-arm.c:367
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:404
+#: src/arm/gnunet-arm.c:369
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:407
+#: src/arm/gnunet-arm.c:372
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:383
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:957
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
+#: src/arm/mockup-service.c:46
 msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
+#: src/arm/mockup-service.c:69
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:206
-#, c-format
-msgid "Restarting service `%s' due to configuration file change.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:234
-msgid "Could not send status result to client\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:268
-msgid "Not sending status result to client: no client known\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:406
+#: src/arm/gnunet-service-arm.c:320
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:409
+#: src/arm/gnunet-service-arm.c:323
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:435
-#, c-format
-msgid "ARM is shutting down, service `%s' not started.\n"
+#: src/arm/gnunet-service-arm.c:349
+msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:443
+#: src/arm/gnunet-service-arm.c:476
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "无法创建用户账户："
+
+#: src/arm/gnunet-service-arm.c:498
 #, c-format
-msgid "Service `%s' already running.\n"
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:453
+#: src/arm/gnunet-service-arm.c:512
 #, c-format
-msgid "Binary implementing service `%s' not known!\n"
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:464
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not known!\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/arm/gnunet-service-arm.c:498
+#: src/arm/gnunet-service-arm.c:620
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:666
-msgid "Stopping all services\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:723
+#: src/arm/gnunet-service-arm.c:774
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:796
+#: src/arm/gnunet-service-arm.c:868
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:801
+#: src/arm/gnunet-service-arm.c:873
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:806
+#: src/arm/gnunet-service-arm.c:878
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:813
+#: src/arm/gnunet-service-arm.c:912
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1050
 #, fuzzy, c-format
-msgid "Service `%s' stopped\n"
-msgstr "服务已删除。\n"
+msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+msgstr "配置文件“%s”已写入。\n"
 
-#: src/arm/gnunet-service-arm.c:827
+#: src/arm/gnunet-service-arm.c:1052
+msgid "option missing"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1129
+#, fuzzy, c-format
+msgid "Starting default services `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/arm/gnunet-service-arm.c:1140
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
+msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/arm_api.c:201
+#: src/arm/gnunet-service-arm.c:1154
+msgid ""
+"No default services configured, GNUnet will not really start right now.\n"
+msgstr ""
+
+#: src/arm/arm_api.c:187
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:389
+#: src/arm/arm_api.c:378
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/arm/arm_api.c:403
+#: src/arm/arm_api.c:392
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:465
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:536
+#: src/arm/arm_api.c:521
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:537
+#: src/arm/arm_api.c:522
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:559
+#: src/arm/arm_api.c:544
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:560
+#: src/arm/arm_api.c:546
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:592
+#: src/arm/arm_api.c:579
 #, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/arm_api.c:664
+#: src/arm/arm_api.c:652
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:803
-#, c-format
-msgid "Unable to forward to service `%s': shutdown\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:812
-#, c-format
-msgid "Unable to forward to service `%s': timeout before connect\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:868
-#, fuzzy, c-format
-msgid "Unable to start service `%s': %s\n"
-msgstr "无法保存配置文件“%s”："
-
-#: src/arm/gnunet-service-arm_interceptor.c:936
-#, fuzzy, c-format
-msgid "Unable to accept connection for service `%s': %s\n"
-msgstr "无法保存配置文件“%s”："
-
-#: src/arm/gnunet-service-arm_interceptor.c:952
-#, fuzzy, c-format
-msgid "Service `%s' started\n"
-msgstr "服务已删除。\n"
-
-#: src/arm/gnunet-service-arm_interceptor.c:1080
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "无法创建用户账户："
-
-#: src/arm/gnunet-service-arm_interceptor.c:1102
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:1116
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
-msgstr ""
-
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -1920,34 +1931,38 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:327
+#: src/statistics/statistics_api.c:390
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:89
+#: src/statistics/gnunet-statistics.c:98
 #, fuzzy, c-format
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#: src/statistics/gnunet-statistics.c:126 src/fs/gnunet-pseudonym.c:151
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/statistics/gnunet-statistics.c:155
-msgid "limit output to statistcs for the given NAME"
+#: src/statistics/gnunet-statistics.c:164
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:158
+#: src/statistics/gnunet-statistics.c:167
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:161
+#: src/statistics/gnunet-statistics.c:170
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
+#: src/statistics/gnunet-statistics.c:173
+msgid "just print the statistics value"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:180
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -1967,7 +1982,7 @@
 msgstr ""
 
 #: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
-#: src/fs/gnunet-publish.c:158 src/fs/gnunet-download.c:144
+#: src/fs/gnunet-publish.c:163 src/fs/gnunet-download.c:144
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
@@ -1978,7 +1993,7 @@
 msgstr ""
 
 #: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
-#: src/fs/gnunet-publish.c:412 src/fs/gnunet-download.c:203
+#: src/fs/gnunet-publish.c:417 src/fs/gnunet-download.c:203
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -2003,7 +2018,7 @@
 msgid "Option `%s' ignored\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:538
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:543
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
@@ -2021,7 +2036,7 @@
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:557
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:562
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
@@ -2037,7 +2052,7 @@
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:576
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:581
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2068,37 +2083,37 @@
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:335
+#: src/fs/fs_namespace.c:338
 #, fuzzy
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
+#: src/fs/fs_namespace.c:427 src/fs/fs_namespace.c:448
 #, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_namespace.c:464
+#: src/fs/fs_namespace.c:467
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_namespace.c:507
+#: src/fs/fs_namespace.c:510
 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:609
+#: src/fs/fs_namespace.c:612
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:834 src/fs/fs_publish.c:1523
+#: src/fs/fs_namespace.c:840 src/fs/fs_publish.c:1535
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_namespace.c:878
+#: src/fs/fs_namespace.c:884
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -2210,11 +2225,11 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
+#: src/fs/fs_uri.c:1109 src/fs/fs_uri.c:1136
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1265
+#: src/fs/fs_uri.c:1142
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2238,134 +2253,139 @@
 msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:267
+#: src/fs/gnunet-publish.c:160
+#, c-format
+msgid "Cleanup after abort complete.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:272
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:269
+#: src/fs/gnunet-publish.c:274
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:320
+#: src/fs/gnunet-publish.c:325
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/fs/gnunet-publish.c:362
+#: src/fs/gnunet-publish.c:367
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:369
+#: src/fs/gnunet-publish.c:374
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:375
+#: src/fs/gnunet-publish.c:380
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:383
+#: src/fs/gnunet-publish.c:388
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
-#: src/transport/gnunet-transport.c:506
+#: src/fs/gnunet-publish.c:398 src/fs/gnunet-publish.c:405
+#: src/transport/gnunet-transport.c:502
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:422
+#: src/fs/gnunet-publish.c:427
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:434 src/fs/gnunet-download.c:175
+#: src/fs/gnunet-publish.c:439 src/fs/gnunet-download.c:175
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-publish.c:467
+#: src/fs/gnunet-publish.c:472
 #, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "错误：无法访问服务：%s\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:497
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:515
+#: src/fs/gnunet-publish.c:520
 #, c-format
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:547
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:545
+#: src/fs/gnunet-publish.c:550
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:549
+#: src/fs/gnunet-publish.c:554
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:558
 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:560
+#: src/fs/gnunet-publish.c:565
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:570
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:569
+#: src/fs/gnunet-publish.c:574
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:573
+#: src/fs/gnunet-publish.c:578
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:579
+#: src/fs/gnunet-publish.c:584
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:583
+#: src/fs/gnunet-publish.c:588
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:587
+#: src/fs/gnunet-publish.c:592
 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:600
+#: src/fs/gnunet-publish.c:605
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_search.c:803
+#: src/fs/fs_search.c:810
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2430,99 +2450,99 @@
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:368 src/fs/gnunet-service-fs_pr.c:622
+#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:623
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:786
+#: src/fs/gnunet-service-fs_pr.c:787
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:813
+#: src/fs/gnunet-service-fs_pr.c:814
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
+#: src/fs/gnunet-service-fs_pr.c:830
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:845
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:936
+#: src/fs/gnunet-service-fs_pr.c:965
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:963
+#: src/fs/gnunet-service-fs_pr.c:992
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:998
+#: src/fs/gnunet-service-fs_pr.c:1027
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1088
+#: src/fs/gnunet-service-fs_pr.c:1120
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1109
+#: src/fs/gnunet-service-fs_pr.c:1141
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1156
+#: src/fs/gnunet-service-fs_pr.c:1188
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1170
+#: src/fs/gnunet-service-fs_pr.c:1202
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1179
+#: src/fs/gnunet-service-fs_pr.c:1211
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1195
+#: src/fs/gnunet-service-fs_pr.c:1227
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1212
+#: src/fs/gnunet-service-fs_pr.c:1244
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1225
+#: src/fs/gnunet-service-fs_pr.c:1257
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1230
+#: src/fs/gnunet-service-fs_pr.c:1262
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
-#: src/fs/gnunet-service-fs_pr.c:1437
+#: src/fs/gnunet-service-fs_pr.c:1289 src/fs/gnunet-service-fs_pr.c:1329
+#: src/fs/gnunet-service-fs_pr.c:1469
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1315
+#: src/fs/gnunet-service-fs_pr.c:1347
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1328
+#: src/fs/gnunet-service-fs_pr.c:1360
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1414
+#: src/fs/gnunet-service-fs_pr.c:1446
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1495
+#: src/fs/gnunet-service-fs_pr.c:1530
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1586 src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1629 src/fs/gnunet-service-fs_pr.c:1638
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "配置文件“%s”已写入。\n"
@@ -2560,12 +2580,12 @@
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
-#: src/transport/gnunet-service-transport_neighbours.c:934
-#: src/transport/gnunet-service-transport_neighbours.c:939
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1541
+#: src/transport/gnunet-service-transport_neighbours.c:936
 #: src/transport/gnunet-service-transport_neighbours.c:1263
-#: src/transport/gnunet-service-transport_neighbours.c:2364
-#: src/transport/gnunet-service-transport_neighbours.c:2430
+#: src/transport/gnunet-service-transport_neighbours.c:1735
+#: src/transport/gnunet-service-transport_neighbours.c:2369
+#: src/transport/gnunet-service-transport_neighbours.c:2437
 #: src/topology/gnunet-daemon-topology.c:654
 #: src/topology/gnunet-daemon-topology.c:756
 msgid "# peers connected"
@@ -2588,63 +2608,66 @@
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
-#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
+#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:843
+#: src/fs/gnunet-service-fs_cp.c:858
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:916
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:930
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:968
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1025
+#: src/fs/gnunet-service-fs_cp.c:1035
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1049
+#: src/fs/gnunet-service-fs_cp.c:1059
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1059
+#: src/fs/gnunet-service-fs_cp.c:1069
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1138
+#: src/fs/gnunet-service-fs_cp.c:1148
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1172
+#: src/fs/gnunet-service-fs_cp.c:1182
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1196
+#: src/fs/gnunet-service-fs_cp.c:1206
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1262
+#: src/fs/gnunet-service-fs_cp.c:1272
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1290
+#: src/fs/gnunet-service-fs_cp.c:1300
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:1329
 msgid "# P2P query messages received and processed"
 msgstr ""
 
+#: src/fs/gnunet-service-fs_cp.c:1696
+msgid "# migration stop messages sent"
+msgstr ""
+
 #: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
@@ -2681,25 +2704,25 @@
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:487
+#: src/fs/gnunet-service-fs_indexing.c:490
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:545
+#: src/fs/gnunet-service-fs_indexing.c:548
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:560
+#: src/fs/gnunet-service-fs_indexing.c:563
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:562
+#: src/fs/gnunet-service-fs_indexing.c:565
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:577
+#: src/fs/gnunet-service-fs_indexing.c:580
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
@@ -2728,34 +2751,34 @@
 msgid "Failed to read file"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_unindex.c:235
+#: src/fs/fs_unindex.c:236
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:243
+#: src/fs/fs_unindex.c:244
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:251
+#: src/fs/fs_unindex.c:252
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_unindex.c:296
+#: src/fs/fs_unindex.c:297
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:331
+#: src/fs/fs_unindex.c:332
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_unindex.c:344
+#: src/fs/fs_unindex.c:345
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:378
+#: src/fs/fs_unindex.c:379
 msgid "Failed to compute hash of file."
 msgstr ""
 
@@ -2827,68 +2850,68 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:150 src/fs/fs_publish.c:421
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
-#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
+#: src/fs/fs_publish.c:658 src/fs/fs_publish.c:675 src/fs/fs_publish.c:714
+#: src/fs/fs_publish.c:734 src/fs/fs_publish.c:761 src/fs/fs_publish.c:909
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:654
+#: src/fs/fs_publish.c:660
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:666
+#: src/fs/fs_publish.c:672
 #, fuzzy
 msgid "unknown error"
 msgstr "未知错误"
 
-#: src/fs/fs_publish.c:709
+#: src/fs/fs_publish.c:715
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:729
+#: src/fs/fs_publish.c:735
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:756
+#: src/fs/fs_publish.c:762
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:780
+#: src/fs/fs_publish.c:786
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:850
+#: src/fs/fs_publish.c:856
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:856
+#: src/fs/fs_publish.c:862
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:904
+#: src/fs/fs_publish.c:910
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1083
+#: src/fs/fs_publish.c:1092
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1154
+#: src/fs/fs_publish.c:1163
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1487
+#: src/fs/fs_publish.c:1499
 msgid "Could not connect to datastore."
 msgstr ""
 
@@ -2927,41 +2950,41 @@
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:1984
+#: src/fs/fs_api.c:1992
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1994
+#: src/fs/fs_api.c:2002
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2107 src/fs/fs_api.c:2346
+#: src/fs/fs_api.c:2128 src/fs/fs_api.c:2367
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2124
+#: src/fs/fs_api.c:2145
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
+#: src/fs/fs_api.c:2157 src/fs/fs_api.c:2176 src/fs/fs_api.c:2652
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2337
+#: src/fs/fs_api.c:2358
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2583
+#: src/fs/fs_api.c:2604
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2669
+#: src/fs/fs_api.c:2690
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3021,27 +3044,27 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:581 src/topology/gnunet-daemon-topology.c:1290
+#: src/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
 #: src/topology/gnunet-daemon-topology.c:1297
-#: src/hostlist/gnunet-daemon-hostlist.c:295
+#: src/hostlist/gnunet-daemon-hostlist.c:297
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_file_information.c:350
+#: src/fs/fs_file_information.c:349
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s': %s"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:466
+#: src/transport/gnunet-service-transport_neighbours.c:468
 msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:855
+#: src/transport/gnunet-service-transport_neighbours.c:859
 msgid "# peers disconnected due to external request"
 msgstr ""
 
@@ -3052,76 +3075,76 @@
 "\n"
 "按任意键继续\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:997
+#: src/transport/gnunet-service-transport_neighbours.c:998
 msgid "# peers disconnected due to timeout"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1022
+#: src/transport/gnunet-service-transport_neighbours.c:1023
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1064
+#: src/transport/gnunet-service-transport_neighbours.c:1065
 msgid "# peers disconnected due to global disconnect"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1778
-#: src/transport/gnunet-service-transport_neighbours.c:1799
+#: src/transport/gnunet-service-transport_neighbours.c:1781
+#: src/transport/gnunet-service-transport_neighbours.c:1802
 msgid "# messages not sent (no such peer or not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1815
+#: src/transport/gnunet-service-transport_neighbours.c:1818
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1867
+#: src/transport/gnunet-service-transport_neighbours.c:1870
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1903
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1921
+#: src/transport/gnunet-service-transport_neighbours.c:1924
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1950
+#: src/transport/gnunet-service-transport_neighbours.c:1953
 msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2002
+#: src/transport/gnunet-service-transport_neighbours.c:2005
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2010
+#: src/transport/gnunet-service-transport_neighbours.c:2013
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2076
+#: src/transport/gnunet-service-transport_neighbours.c:2079
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2094
+#: src/transport/gnunet-service-transport_neighbours.c:2097
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2212
+#: src/transport/gnunet-service-transport_neighbours.c:2215
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2225
+#: src/transport/gnunet-service-transport_neighbours.c:2228
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2302
+#: src/transport/gnunet-service-transport_neighbours.c:2305
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2319
+#: src/transport/gnunet-service-transport_neighbours.c:2322
 msgid "# unexpected CONNECT_ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2410
+#: src/transport/gnunet-service-transport_neighbours.c:2415
 msgid "# unexpected ACK messages"
 msgstr ""
 
@@ -3181,33 +3204,33 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1529
+#: src/transport/plugin_transport_udp.c:1567
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1567
+#: src/transport/plugin_transport_udp.c:1610
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2063
-#: src/transport/plugin_transport_udp_new.c:1218
+#: src/transport/plugin_transport_udp.c:2106
+#: src/transport/plugin_transport_udp_new.c:1220
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2114
-#: src/transport/plugin_transport_udp_new.c:1268
+#: src/transport/plugin_transport_udp.c:2157
+#: src/transport/plugin_transport_udp_new.c:1270
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_udp.c:2258
+#: src/transport/plugin_transport_udp.c:2301
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2325
-#: src/transport/plugin_transport_udp_new.c:1396
+#: src/transport/plugin_transport_udp.c:2372
+#: src/transport/plugin_transport_udp_new.c:1398
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
@@ -3227,306 +3250,310 @@
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:504
+#: src/transport/plugin_transport_tcp.c:514
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:590
-#: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:731
-#: src/transport/plugin_transport_tcp.c:820
-#: src/transport/plugin_transport_tcp.c:1156
+#: src/transport/plugin_transport_tcp.c:601
+#: src/transport/plugin_transport_tcp.c:690
+#: src/transport/plugin_transport_tcp.c:742
+#: src/transport/plugin_transport_tcp.c:831
+#: src/transport/plugin_transport_tcp.c:1173
+#: src/transport/plugin_transport_tcp.c:1254
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:846
-#: src/transport/plugin_transport_tcp.c:1544
+#: src/transport/plugin_transport_tcp.c:607
+#: src/transport/plugin_transport_tcp.c:857
+#: src/transport/plugin_transport_tcp.c:1828
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:683
+#: src/transport/plugin_transport_tcp.c:694
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:734
+#: src/transport/plugin_transport_tcp.c:745
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:824
+#: src/transport/plugin_transport_tcp.c:835
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:945
+#: src/transport/plugin_transport_tcp.c:956
 msgid "# bytes TCP was asked to transmit"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:996
+#: src/transport/plugin_transport_tcp.c:1007
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1039
+#: src/transport/plugin_transport_tcp.c:1050
+#: src/transport/plugin_transport_tcp.c:1368
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1056
+#: src/transport/plugin_transport_tcp.c:1067
+#: src/transport/plugin_transport_tcp.c:1404
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1107
+#: src/transport/plugin_transport_tcp.c:1118
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1224
+#: src/transport/plugin_transport_tcp.c:1508
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1587
+#: src/transport/plugin_transport_tcp.c:1871
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1732
+#: src/transport/plugin_transport_tcp.c:2021
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1796
+#: src/transport/plugin_transport_tcp.c:2089
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1949
+#: src/transport/plugin_transport_tcp.c:2242
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2009
+#: src/transport/plugin_transport_tcp.c:2307
 #, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2330
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2036
+#: src/transport/plugin_transport_tcp.c:2334
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2040
+#: src/transport/plugin_transport_tcp.c:2338
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:923
+#: src/transport/plugin_transport_http.c:984
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:971
+#: src/transport/plugin_transport_http.c:1032
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http.c:1118
+#: src/transport/plugin_transport_http.c:1179
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1131
+#: src/transport/plugin_transport_http.c:1192
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1206
+#: src/transport/plugin_transport_http.c:1267
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1219
+#: src/transport/plugin_transport_http.c:1280
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http.c:1230
+#: src/transport/plugin_transport_http.c:1291
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1250
+#: src/transport/plugin_transport_http.c:1311
 #, 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:1280
+#: src/transport/plugin_transport_http.c:1341
 #, 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_unix.c:1087
+#: src/transport/plugin_transport_unix.c:1096
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_smtp.c:367
+#: src/transport/plugin_transport_smtp.c:370
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:454
+#: src/transport/plugin_transport_smtp.c:457
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:463
+#: src/transport/plugin_transport_smtp.c:466
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:558
-#: src/transport/plugin_transport_smtp.c:568
-#: src/transport/plugin_transport_smtp.c:581
-#: src/transport/plugin_transport_smtp.c:600
-#: src/transport/plugin_transport_smtp.c:623
-#: src/transport/plugin_transport_smtp.c:631
-#: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:655
+#: src/transport/plugin_transport_smtp.c:561
+#: src/transport/plugin_transport_smtp.c:571
+#: src/transport/plugin_transport_smtp.c:584
+#: src/transport/plugin_transport_smtp.c:603
+#: src/transport/plugin_transport_smtp.c:626
+#: src/transport/plugin_transport_smtp.c:634
+#: src/transport/plugin_transport_smtp.c:647
+#: src/transport/plugin_transport_smtp.c:658
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:798
+#: src/transport/plugin_transport_smtp.c:801
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:810
+#: src/transport/plugin_transport_smtp.c:813
 msgid "# bytes received via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:811
+#: src/transport/plugin_transport_smtp.c:814
 msgid "# bytes sent via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:813
+#: src/transport/plugin_transport_smtp.c:816
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:111
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:116
+#: src/transport/gnunet-service-transport_plugins.c:118
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:122
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:147
+#: src/transport/gnunet-service-transport_plugins.c:150
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/plugin_transport_wlan.c:884
+#: src/transport/plugin_transport_wlan.c:880
 msgid "# wlan session timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:908
+#: src/transport/plugin_transport_wlan.c:904
 msgid "# wlan session created"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:992
-#: src/transport/plugin_transport_wlan.c:1155
-#: src/transport/plugin_transport_wlan.c:1176
-#: src/transport/plugin_transport_wlan.c:1207
-#: src/transport/plugin_transport_wlan.c:2412
-#: src/transport/plugin_transport_wlan.c:3273
+#: src/transport/plugin_transport_wlan.c:988
+#: src/transport/plugin_transport_wlan.c:1151
+#: src/transport/plugin_transport_wlan.c:1172
+#: src/transport/plugin_transport_wlan.c:1203
+#: src/transport/plugin_transport_wlan.c:2378
+#: src/transport/plugin_transport_wlan.c:3240
 msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1250
-#: src/transport/plugin_transport_wlan.c:1967
+#: src/transport/plugin_transport_wlan.c:1246
+#: src/transport/plugin_transport_wlan.c:1933
 msgid "# wlan pending fragments"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1441
+#: src/transport/plugin_transport_wlan.c:1407
 #, c-format
-msgid "Finished reading from wlan-helper stdout with code: %d\n"
+msgid ""
+"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1808
+#: src/transport/plugin_transport_wlan.c:1774
 msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1841
-#: src/transport/plugin_transport_wlan.c:2056
-#: src/transport/plugin_transport_wlan.c:2151
+#: src/transport/plugin_transport_wlan.c:1807
+#: src/transport/plugin_transport_wlan.c:2022
+#: src/transport/plugin_transport_wlan.c:2117
 #, c-format
 msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2042
+#: src/transport/plugin_transport_wlan.c:2008
 msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2113
+#: src/transport/plugin_transport_wlan.c:2079
 msgid "# wlan fragments send"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2279
+#: src/transport/plugin_transport_wlan.c:2245
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2284
+#: src/transport/plugin_transport_wlan.c:2250
 msgid "# wlan messages queued"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2373
-#: src/transport/plugin_transport_wlan.c:3029
-#: src/transport/plugin_transport_wlan.c:3276
+#: src/transport/plugin_transport_wlan.c:2339
+#: src/transport/plugin_transport_wlan.c:2996
+#: src/transport/plugin_transport_wlan.c:3243
 msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2601
+#: src/transport/plugin_transport_wlan.c:2567
 msgid "# wlan whole messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2803
+#: src/transport/plugin_transport_wlan.c:2770
 msgid "# wlan hello messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2840
+#: src/transport/plugin_transport_wlan.c:2807
 msgid "# wlan fragments received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2892
+#: src/transport/plugin_transport_wlan.c:2859
 msgid "# wlan acks received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2989
+#: src/transport/plugin_transport_wlan.c:2956
 msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3013
+#: src/transport/plugin_transport_wlan.c:2980
 msgid "# wlan mac endpoints created"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3071
+#: src/transport/plugin_transport_wlan.c:3038
 msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3127
+#: src/transport/plugin_transport_wlan.c:3094
 msgid "# wlan messages for this client received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3138
+#: src/transport/plugin_transport_wlan.c:3105
 msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr ""
 
@@ -3572,105 +3599,105 @@
 
 #: src/transport/gnunet-transport.c:447
 #, fuzzy, c-format
-msgid "Peer `%s': %s\n"
+msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:515
+#: src/transport/gnunet-transport.c:511
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-transport.c:552
+#: src/transport/gnunet-transport.c:548
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:555
+#: src/transport/gnunet-transport.c:551
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:558
+#: src/transport/gnunet-transport.c:554
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:562
+#: src/transport/gnunet-transport.c:558
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
+#: src/transport/gnunet-transport.c:561
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:568
+#: src/transport/gnunet-transport.c:564
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:576
+#: src/transport/gnunet-transport.c:572
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_validation.c:408
+#: src/transport/gnunet-service-transport_validation.c:410
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:457
+#: src/transport/gnunet-service-transport_validation.c:459
 #, 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:494
+#: src/transport/gnunet-service-transport_validation.c:496
 msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:552
+#: src/transport/gnunet-service-transport_validation.c:554
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:773
+#: src/transport/gnunet-service-transport_validation.c:775
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:808
+#: src/transport/gnunet-service-transport_validation.c:810
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:876
+#: src/transport/gnunet-service-transport_validation.c:878
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:885
+#: src/transport/gnunet-service-transport_validation.c:887
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1007
+#: src/transport/gnunet-service-transport_validation.c:1009
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1032
+#: src/transport/gnunet-service-transport_validation.c:1034
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1091
+#: src/transport/gnunet-service-transport_validation.c:1093
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:254
+#: src/transport/gnunet-service-transport_clients.c:253
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:259
+#: src/transport/gnunet-service-transport_clients.c:258
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:406
+#: src/transport/gnunet-service-transport_clients.c:405
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
@@ -3696,11 +3723,11 @@
 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:519
+#: src/transport/gnunet-service-transport.c:555
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:528
+#: src/transport/gnunet-service-transport.c:564
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
@@ -4343,31 +4370,31 @@
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:262
+#: src/hostlist/gnunet-daemon-hostlist.c:264
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:315
+#: src/hostlist/gnunet-daemon-hostlist.c:317
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:322
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:325
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:327
+#: src/hostlist/gnunet-daemon-hostlist.c:329
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:339
+#: src/hostlist/gnunet-daemon-hostlist.c:341
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4505,22 +4532,42 @@
 msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/include/gnunet_common.h:366 src/include/gnunet_common.h:371
-#: src/include/gnunet_common.h:377
+#: src/include/gnunet_common.h:430 src/include/gnunet_common.h:435
+#: src/include/gnunet_common.h:441
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:387
+#: src/include/gnunet_common.h:451
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:408 src/include/gnunet_common.h:415
+#: src/include/gnunet_common.h:472 src/include/gnunet_common.h:479
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Failed to stop service `%s'!\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
+
+#, fuzzy
+#~ msgid "Failed to start service `%s'!\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Service `%s' stopped\n"
+#~ 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”："
+
 #~ msgid "KiB"
 #~ msgstr "KiB"
 

Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am    2011-12-26 21:20:00 UTC (rev 
18842)
+++ gnunet/src/integration-tests/Makefile.am    2011-12-26 21:22:07 UTC (rev 
18843)
@@ -19,11 +19,11 @@
 if HAVE_PYTHON_PEXPECT
 check_SCRIPTS = \
  test_integration_bootstrap_and_connect.py \
- test_integration_disconnect.py \
  test_integration_restart.py \
  test_integration_clique.py \
  test_integration_clique_nat.py
 endif
+# test_integration_disconnect.py 
 
 
 if ENABLE_TEST_RUN
@@ -36,7 +36,7 @@
 %.py: %.py.in Makefile
        $(do_subst) < $(srcdir)/$< > $@
        chmod +x $@
-       
+
 gnunet_testing.py: gnunet_testing.py.in Makefile
        $(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py
        chmod +x gnunet_testing.py      
@@ -49,14 +49,14 @@
        $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > 
test_integration_disconnect.py
        chmod +x test_integration_disconnect.py
 
-test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in 
Makefile
-       $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > 
test_integration_disconnect_nat.py
-       chmod +x test_integration_disconnect_nat.py
+#test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in 
Makefile
+#      $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > 
test_integration_disconnect_nat.py
+#      chmod +x test_integration_disconnect_nat.py
 
 test_integration_restart.py: test_integration_restart.py.in Makefile
        $(do_subst) < $(srcdir)/test_integration_restart.py.in > 
test_integration_restart.py
        chmod +x test_integration_restart.py    
-       
+
 test_integration_clique.py: test_integration_clique.py.in Makefile
        $(do_subst) < $(srcdir)/test_integration_clique.py.in > 
test_integration_clique.py
        chmod +x test_integration_clique.py     
@@ -70,11 +70,12 @@
    gnunet_testing.py.in \
    test_integration_bootstrap_and_connect.py.in \
    test_integration_disconnect.py.in \
-   test_integration_disconnect_nat.py \
    test_integration_restart.py.in \
    test_integration_clique.py.in \
    test_integration_clique_nat.py.in
 
+#   test_integration_disconnect_nat.py 
+
 CLEANFILES = \
        $(check_SCRIPTS) \
        gnunet_testing.py
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r18843 - in gnunet: po src/integration-tests, gnunet <=
Prev by Date: [GNUnet-SVN] r18842 - in gnunet-gtk: . m4 po src/lib
Next by Date: [GNUnet-SVN] r18844 - gnunet-gtk/src/fs
Previous by thread: [GNUnet-SVN] r18842 - in gnunet-gtk: . m4 po src/lib
Next by thread: [GNUnet-SVN] r18844 - gnunet-gtk/src/fs
Index(es):
- Date
- Thread