Update POTFILES.in

1 files changed, 1453 insertions, 1527 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f28a878a5..fee065a9d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2017-02-20 12:08-0600\n"
+"POT-Creation-Date: 2017-03-31 19:22-0500\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -30,334 +30,317 @@ msgstr ""
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224
-#, fuzzy
-msgid "Misconfiguration (can not connect to the ARM service)"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1145
-msgid "ARM API is busy"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:230 src/testbed/gnunet-service-testbed_peers.c:1147
-msgid "Request timed out"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:1149
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1165
-#, c-format
-msgid "%s is stopped"
-msgstr ""
+#: src/arm/gnunet-arm.c:242
+#, fuzzy
+msgid "is stopped"
+msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1167
-#, c-format
-msgid "%s is starting"
+#: src/arm/gnunet-arm.c:244
+msgid "is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1169
-#, c-format
-msgid "%s is stopping"
+#: src/arm/gnunet-arm.c:246
+msgid "is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1171
-#, c-format
-msgid "%s is starting already"
+#: src/arm/gnunet-arm.c:248
+msgid "is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1173
-#, c-format
-msgid "%s is stopping already"
+#: src/arm/gnunet-arm.c:250
+msgid "is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1175
-#, c-format
-msgid "%s is started already"
+#: src/arm/gnunet-arm.c:252
+msgid "is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1177
-#, c-format
-msgid "%s is stopped already"
+#: src/arm/gnunet-arm.c:254
+msgid "is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1179
-#, fuzzy, c-format
-msgid "%s service is not known to ARM"
+#: src/arm/gnunet-arm.c:256
+#, fuzzy
+msgid "service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1181
-#, fuzzy, c-format
-msgid "%s service failed to start"
+#: src/arm/gnunet-arm.c:258
+#, fuzzy
+msgid "service failed to start"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/arm/gnunet-arm.c:266
-#, c-format
-msgid "%s service cannot be started because ARM is shutting down"
+#: src/arm/gnunet-arm.c:260
+msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:268 src/testbed/gnunet-service-testbed_peers.c:1185
-#, c-format
-msgid "%.s Unknown result code."
-msgstr ""
+#: src/arm/gnunet-arm.c:262
+#, fuzzy
+msgid "Unknown result code."
+msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:300
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:328 src/arm/gnunet-arm.c:337
+#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:371
+#: src/arm/gnunet-arm.c:365
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:382
+#: src/arm/gnunet-arm.c:376
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:415
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:432
+#: src/arm/gnunet-arm.c:425
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:469
+#: src/arm/gnunet-arm.c:462
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:480
+#: src/arm/gnunet-arm.c:473
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/arm/gnunet-arm.c:521
+#: src/arm/gnunet-arm.c:513
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:530
+#: src/arm/gnunet-arm.c:522
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/arm/gnunet-arm.c:536
+#: src/arm/gnunet-arm.c:528
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:616
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:648
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:651
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:668
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:774
+#: src/arm/gnunet-arm.c:769
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:775
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:778
+#: src/arm/gnunet-arm.c:781
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:786
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:783
+#: src/arm/gnunet-arm.c:791
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:786
+#: src/arm/gnunet-arm.c:795
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:789
+#: src/arm/gnunet-arm.c:800
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:791
+#: src/arm/gnunet-arm.c:805
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:794
+#: src/arm/gnunet-arm.c:811
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:816
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:798
+#: src/arm/gnunet-arm.c:821
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:800
+#: src/arm/gnunet-arm.c:826
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:812
+#: src/arm/gnunet-arm.c:839
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:633
-#: src/util/service.c:565 src/util/service_new.c:612
+#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
+#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
-#: src/transport/plugin_transport_tcp.c:652
-#: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3337 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637
-#: src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:1139
+#: src/transport/plugin_transport_tcp.c:1145
+#: src/transport/plugin_transport_tcp.c:3824
+#: src/transport/tcp_service_legacy.c:576
+#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
+#: src/util/service.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client.c:466 src/util/service.c:621 src/util/service_new.c:682
+#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:480
+#: src/util/service.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client.c:471 src/util/service.c:625 src/util/service_new.c:687
+#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:485
+#: src/util/service.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:724
-#: src/util/service.c:656 src/util/service_new.c:723
+#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
+#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:741
-#: src/util/service.c:673 src/util/service_new.c:741
+#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
+#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2620
-#: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
-#: src/util/service_new.c:782
+#: src/transport/plugin_transport_http_server.c:2621
+#: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2638
-#: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
-#: src/util/service_new.c:802
+#: src/transport/plugin_transport_http_server.c:2639
+#: src/transport/plugin_transport_tcp.c:1278
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/arm/gnunet-service-arm.c:932
+#: src/arm/gnunet-service-arm.c:933
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:943
+#: src/arm/gnunet-service-arm.c:944
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1055
+#: src/arm/gnunet-service-arm.c:1056
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户："
 
-#: src/arm/gnunet-service-arm.c:1090
+#: src/arm/gnunet-service-arm.c:1091
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1133
+#: src/arm/gnunet-service-arm.c:1134
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1309
+#: src/arm/gnunet-service-arm.c:1310
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1611
+#: src/arm/gnunet-service-arm.c:1612
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1771
+#: src/arm/gnunet-service-arm.c:1772
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1776
+#: src/arm/gnunet-service-arm.c:1777
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1781
+#: src/arm/gnunet-service-arm.c:1782
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1787
+#: src/arm/gnunet-service-arm.c:1788
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1813
+#: src/arm/gnunet-service-arm.c:1814
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1829
+#: src/arm/gnunet-service-arm.c:1830
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -387,31 +370,27 @@ msgid ""
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats/gnunet-ats-solver-eval.c:3294
+#: src/ats-tests/gnunet-solver-eval.c:939
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
-#: src/ats-tests/gnunet-solver-eval.c:941
-msgid "experiment to use"
-msgstr ""
-
 #: src/ats/gnunet-ats-solver-eval.c:3299
-msgid "be verbose"
+#: src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
+msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3302
+#: src/ats/gnunet-ats-solver-eval.c:3306
 #, fuzzy
 msgid "print logging"
 msgstr "未知的命令“%s”。\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3305
+#: src/ats/gnunet-ats-solver-eval.c:3311
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3308
+#: src/ats/gnunet-ats-solver-eval.c:3316
 msgid "disable normalization"
 msgstr ""
 
@@ -518,7 +497,7 @@ msgstr ""
 msgid "Start logging `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/ats-tests/gnunet-ats-sim.c:88
+#: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
 "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
@@ -561,7 +540,6 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1255
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -595,196 +573,195 @@ msgstr ""
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:949
+#: src/ats-tool/gnunet-ats.c:950
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:951
+#: src/ats-tool/gnunet-ats.c:954
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:954
+#: src/ats-tool/gnunet-ats.c:960
 #, fuzzy
 msgid "connect to PEER"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:957
+#: src/ats-tool/gnunet-ats.c:964
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:959
+#: src/ats-tool/gnunet-ats.c:969
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:961
+#: src/ats-tool/gnunet-ats.c:974
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:963
+#: src/ats-tool/gnunet-ats.c:979
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:965
+#: src/ats-tool/gnunet-ats.c:984
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:968
+#: src/ats-tool/gnunet-ats.c:990
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:970
+#: src/ats-tool/gnunet-ats.c:996
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:973
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:983
+#: src/ats-tool/gnunet-ats.c:1011
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/auction/gnunet-auction-create.c:160
+#: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:163
+#: src/auction/gnunet-auction-create.c:169
 msgid "mapping of possible prices"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:166
+#: src/auction/gnunet-auction-create.c:175
 msgid "max duration per round"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:169
+#: src/auction/gnunet-auction-create.c:181
 msgid "duration until auction starts"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:172
+#: src/auction/gnunet-auction-create.c:186
 msgid ""
 "number of items to sell\n"
 "0 for first price auction\n"
 ">0 for vickrey/M+1st price auction"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:177
+#: src/auction/gnunet-auction-create.c:193
 msgid "public auction outcome"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:180
+#: src/auction/gnunet-auction-create.c:198
 msgid "keep running in foreground until auction completes"
 msgstr ""
 
-#: src/auction/gnunet-auction-create.c:190
+#: src/auction/gnunet-auction-create.c:209
 msgid "create a new auction and start listening for bidders"
 msgstr ""
 
 #: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76
 #: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76
 msgid "help text"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:668
+#: src/cadet/gnunet-cadet.c:664
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/cadet/gnunet-cadet.c:706
+#: src/cadet/gnunet-cadet.c:702
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/cadet/gnunet-cadet.c:779
-msgid "You must NOT give a TARGET when using 'request all' options\n"
+#: src/cadet/gnunet-cadet.c:775
+msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:870
+#: src/cadet/gnunet-cadet.c:866
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/cadet/gnunet-cadet.c:907
+#: src/cadet/gnunet-cadet.c:903
 msgid "No action requested\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:929
+#: src/cadet/gnunet-cadet.c:928
 #, fuzzy
-msgid "provide information about a particular connection"
+msgid "Provide information about a particular connection"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-cadet.c:932
-msgid "activate echo mode"
+#: src/cadet/gnunet-cadet.c:933
+msgid "Activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:935
-msgid "dump debug information to STDERR"
+#: src/cadet/gnunet-cadet.c:938
+msgid "Dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:938
-msgid "port to listen to"
+#: src/cadet/gnunet-cadet.c:944
+msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:941
+#: src/cadet/gnunet-cadet.c:951
 #, fuzzy
-msgid "provide information about a patricular peer"
+msgid "Provide information about a patricular peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-cadet.c:944
+#: src/cadet/gnunet-cadet.c:957
 #, fuzzy
-msgid "provide information about all peers"
+msgid "Provide information about all peers"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-cadet.c:947
+#: src/cadet/gnunet-cadet.c:963
 #, fuzzy
-msgid "provide information about a particular tunnel"
+msgid "Provide information about a particular tunnel"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:969
 #, fuzzy
-msgid "provide information about all tunnels"
+msgid "Provide information about all tunnels"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-service-cadet_peer.c:687
-msgid "Wrong CORE service\n"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-profiler.c:499
-#: src/secretsharing/gnunet-secretsharing-profiler.c:607
+#: src/consensus/gnunet-consensus-profiler.c:523
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus-profiler.c:502
+#: src/consensus/gnunet-consensus-profiler.c:529
 msgid ""
 "how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:505
-#: src/set/gnunet-set-profiler.c:378 src/set/gnunet-set-profiler.c:381
-#: src/set/gnunet-set-profiler.c:384
+#: src/consensus/gnunet-consensus-profiler.c:535
+#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439
+#: src/set/gnunet-set-profiler.c:462
 #, fuzzy
 msgid "number of values"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus-profiler.c:508
+#: src/consensus/gnunet-consensus-profiler.c:541
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:511
+#: src/consensus/gnunet-consensus-profiler.c:548
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:514
-#: src/set/gnunet-set-profiler.c:390
+#: src/consensus/gnunet-consensus-profiler.c:554
+#: src/set/gnunet-set-profiler.c:480
 msgid "write statistics to file"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:517
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+#: src/consensus/gnunet-consensus-profiler.c:559
+msgid "distribute elements to a static subset of good peers"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:564
 msgid "be more verbose (print received values)"
 msgstr ""
 
@@ -1037,15 +1014,15 @@ msgstr "您必须指定一个昵称\n"
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1270
+#: src/conversation/gnunet-conversation.c:1273
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1279
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1299
+#: src/conversation/gnunet-conversation.c:1306
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1071,8 +1048,8 @@ msgid ""
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet_gst.c:630
-#: src/conversation/gnunet-helper-audio-playback-gst.c:357
+#: src/conversation/gnunet_gst.c:622
+#: src/conversation/gnunet-helper-audio-playback-gst.c:356
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1082,59 +1059,59 @@ msgstr ""
 msgid "pa_stream_write() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:608
+#: src/conversation/gnunet-helper-audio-playback.c:607
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:633
+#: src/conversation/gnunet-helper-audio-playback.c:632
 #: src/conversation/gnunet-helper-audio-record.c:545
 msgid "Connection established.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:638
+#: src/conversation/gnunet-helper-audio-playback.c:637
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:652
+#: src/conversation/gnunet-helper-audio-playback.c:651
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-playback.c:664
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:686
+#: src/conversation/gnunet-helper-audio-playback.c:685
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:691
 #: src/conversation/gnunet-helper-audio-record.c:605
 msgid "pa_mainloop_new() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:706
+#: src/conversation/gnunet-helper-audio-playback.c:705
 #: src/conversation/gnunet-helper-audio-record.c:620
 msgid "pa_context_new() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:713
+#: src/conversation/gnunet-helper-audio-playback.c:712
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:719
+#: src/conversation/gnunet-helper-audio-playback.c:718
 #: src/conversation/gnunet-helper-audio-record.c:632
 msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:789
+#: src/conversation/gnunet-helper-audio-playback.c:790
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1198,7 +1175,7 @@ msgstr "“%s”说：%s\n"
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/microphone.c:121
+#: src/conversation/microphone.c:119
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
@@ -1271,37 +1248,42 @@ msgstr "“%s”的参数无效。\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
+#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:185
+#: src/core/gnunet-core.c:186
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:339
+#: src/core/gnunet-service-core.c:347
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:363
+#: src/core/gnunet-service-core.c:371
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:432
+#: src/core/gnunet-service-core.c:440
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:530
+#: src/core/gnunet-service-core.c:538
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:937
+#: src/core/gnunet-service-core.c:876
+#, c-format
+msgid "# messages of type %u discarded (client busy)"
+msgstr ""
+
+#: src/core/gnunet-service-core.c:985
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/core/gnunet-service-core.c:958
+#: src/core/gnunet-service-core.c:1006
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "服务已删除。\n"
@@ -1314,127 +1296,127 @@ msgstr ""
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:726
+#: src/core/gnunet-service-core_kx.c:725
+msgid "# PAYLOAD dropped (out of order)"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:786
+#: src/core/gnunet-service-core_kx.c:837
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:819
+#: src/core/gnunet-service-core_kx.c:871
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "消息尺寸"
 
-#: src/core/gnunet-service-core_kx.c:886
+#: src/core/gnunet-service-core_kx.c:938
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:893
+#: src/core/gnunet-service-core_kx.c:945
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:932
+#: src/core/gnunet-service-core_kx.c:984
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:943
+#: src/core/gnunet-service-core_kx.c:995
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1091
 #: src/transport/gnunet-service-transport_validation.c:1119
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1048
+#: src/core/gnunet-service-core_kx.c:1100
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1106
+#: src/core/gnunet-service-core_kx.c:1158
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1132
+#: src/core/gnunet-service-core_kx.c:1184
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1197
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1209
+#: src/core/gnunet-service-core_kx.c:1261
 #: src/transport/gnunet-service-transport_validation.c:1442
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1268
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1221
+#: src/core/gnunet-service-core_kx.c:1273
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1256
+#: src/core/gnunet-service-core_kx.c:1308
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1294
+#: src/core/gnunet-service-core_kx.c:1346
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/core/gnunet-service-core_kx.c:1357
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1364
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1485
+#: src/core/gnunet-service-core_kx.c:1518
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1493
+#: src/core/gnunet-service-core_kx.c:1526
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1496
+#: src/core/gnunet-service-core_kx.c:1529
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1557
-#: src/core/gnunet-service-core_kx.c:1583
+#: src/core/gnunet-service-core_kx.c:1590
+#: src/core/gnunet-service-core_kx.c:1616
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1570
+#: src/core/gnunet-service-core_kx.c:1603
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1612
+#: src/core/gnunet-service-core_kx.c:1645
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1620
+#: src/core/gnunet-service-core_kx.c:1653
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1681
-msgid "# PAYLOAD dropped (out of order)"
-msgstr ""
-
 #: src/core/gnunet-service-core_sessions.c:266
 #: src/core/gnunet-service-core_sessions.c:356
-#: src/dht/gnunet-service-dht_neighbours.c:732
-#: src/dht/gnunet-service-dht_neighbours.c:794
+#: src/dht/gnunet-service-dht_neighbours.c:733
+#: src/dht/gnunet-service-dht_neighbours.c:795
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
 #: src/topology/gnunet-daemon-topology.c:612
 #: src/topology/gnunet-daemon-topology.c:714
@@ -1467,7 +1449,7 @@ msgid "# updates to my type map"
 msgstr ""
 
 #: src/datacache/datacache.c:119 src/datacache/datacache.c:294
-#: src/datastore/gnunet-service-datastore.c:770
+#: src/datastore/gnunet-service-datastore.c:775
 msgid "# bytes stored"
 msgstr ""
 
@@ -1506,17 +1488,17 @@ msgstr ""
 msgid "Heap datacache running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datacache/plugin_datacache_sqlite.c:77
-#: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:1024
-#: src/datastore/plugin_datastore_sqlite.c:57
-#: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
+#: src/datacache/plugin_datacache_sqlite.c:113
+#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datastore/plugin_datastore_mysql.c:980
+#: src/datastore/plugin_datastore_sqlite.c:58
+#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
 #: src/namecache/plugin_namecache_postgres.c:53
-#: src/namecache/plugin_namecache_sqlite.c:52
+#: src/namecache/plugin_namecache_sqlite.c:53
 #: src/namestore/plugin_namestore_postgres.c:53
-#: src/namestore/plugin_namestore_sqlite.c:52
-#: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/namestore/plugin_namestore_sqlite.c:53
+#: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
 #: src/testbed/generate-underlay-topology.c:47
 #: src/testbed/gnunet-daemon-latency-logger.c:52
@@ -1529,68 +1511,68 @@ msgstr "sqlite 数据仓库"
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:749
-#: src/datastore/plugin_datastore_sqlite.c:415
-#: src/namecache/plugin_namecache_sqlite.c:292
-#: src/namestore/plugin_namestore_sqlite.c:343
+#: src/datacache/plugin_datacache_sqlite.c:817
+#: src/datastore/plugin_datastore_sqlite.c:475
+#: src/namecache/plugin_namecache_sqlite.c:296
+#: src/namestore/plugin_namestore_sqlite.c:355
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:309
+#: src/datastore/datastore_api.c:348
 #, fuzzy
 msgid "DATASTORE disconnected"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/datastore/datastore_api.c:425
+#: src/datastore/datastore_api.c:468
 #, fuzzy
 msgid "Disconnected from DATASTORE"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:569
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:599
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:680
+#: src/datastore/datastore_api.c:740
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:754
+#: src/datastore/datastore_api.c:814
 msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:879
+#: src/datastore/datastore_api.c:941
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:1055
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1056
+#: src/datastore/datastore_api.c:1116
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1121
+#: src/datastore/datastore_api.c:1181
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1205
+#: src/datastore/datastore_api.c:1259
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1265
+#: src/datastore/datastore_api.c:1319
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1331
+#: src/datastore/datastore_api.c:1381
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1411
+#: src/datastore/datastore_api.c:1462
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1599,211 +1581,211 @@ msgstr ""
 msgid "Failed to store item: %s, aborting\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/datastore/gnunet-datastore.c:199
+#: src/datastore/gnunet-datastore.c:209
 #, c-format
 msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:244
+#: src/datastore/gnunet-datastore.c:256
 msgid ""
 "specifies the configuration to use to access an alternative datastore; will "
 "merge that datastore into our current datastore"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:253
+#: src/datastore/gnunet-datastore.c:265
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "更改配置文件中的一个值"
 
-#: src/datastore/gnunet-service-datastore.c:336
+#: src/datastore/gnunet-service-datastore.c:338
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:416
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:557
+#: src/datastore/gnunet-service-datastore.c:562
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:598
+#: src/datastore/gnunet-service-datastore.c:603
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:609
+#: src/datastore/gnunet-service-datastore.c:614
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:615
+#: src/datastore/gnunet-service-datastore.c:620
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:622
+#: src/datastore/gnunet-service-datastore.c:627
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:629
-#: src/datastore/gnunet-service-datastore.c:684
-#: src/datastore/gnunet-service-datastore.c:969
-#: src/datastore/gnunet-service-datastore.c:1619
+#: src/datastore/gnunet-service-datastore.c:634
+#: src/datastore/gnunet-service-datastore.c:689
+#: src/datastore/gnunet-service-datastore.c:977
+#: src/datastore/gnunet-service-datastore.c:1633
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:702
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:787
+#: src/datastore/gnunet-service-datastore.c:792
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1017
+#: src/datastore/gnunet-service-datastore.c:1026
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1058
 msgid "# GET KEY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1061
+#: src/datastore/gnunet-service-datastore.c:1071
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1097
+#: src/datastore/gnunet-service-datastore.c:1108
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1130
+#: src/datastore/gnunet-service-datastore.c:1141
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1177
+#: src/datastore/gnunet-service-datastore.c:1190
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1186
+#: src/datastore/gnunet-service-datastore.c:1199
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1233
+#: src/datastore/gnunet-service-datastore.c:1246
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1287
+#: src/datastore/gnunet-service-datastore.c:1301
 #, c-format
 msgid ""
 "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1293
-#: src/datastore/gnunet-service-datastore.c:1468
+#: src/datastore/gnunet-service-datastore.c:1307
+#: src/datastore/gnunet-service-datastore.c:1482
 #, c-format
 msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1347
+#: src/datastore/gnunet-service-datastore.c:1361
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1359
+#: src/datastore/gnunet-service-datastore.c:1373
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1419
+#: src/datastore/gnunet-service-datastore.c:1433
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1475
+#: src/datastore/gnunet-service-datastore.c:1489
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1486
+#: src/datastore/gnunet-service-datastore.c:1500
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1656
+#: src/datastore/gnunet-service-datastore.c:1670
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1672
+#: src/datastore/gnunet-service-datastore.c:1686
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1677
+#: src/datastore/gnunet-service-datastore.c:1691
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1693
+#: src/datastore/gnunet-service-datastore.c:1707
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1711
-#: src/datastore/gnunet-service-datastore.c:1727
+#: src/datastore/gnunet-service-datastore.c:1725
+#: src/datastore/gnunet-service-datastore.c:1741
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1759
+#: src/datastore/gnunet-service-datastore.c:1773
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/datastore/plugin_datastore_heap.c:823
+#: src/datastore/plugin_datastore_heap.c:769
 #, fuzzy
 msgid "Heap database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datastore/plugin_datastore_mysql.c:347
-#: src/datastore/plugin_datastore_sqlite.c:513
+#: src/datastore/plugin_datastore_mysql.c:377
+#: src/datastore/plugin_datastore_sqlite.c:590
 #, fuzzy
 msgid "Data too large"
 msgstr "迭代次数"
 
-#: src/datastore/plugin_datastore_mysql.c:363
+#: src/datastore/plugin_datastore_mysql.c:393
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:980
+#: src/datastore/plugin_datastore_mysql.c:936
 #, 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:1254
+#: src/datastore/plugin_datastore_mysql.c:1208
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:350
+#: src/datastore/plugin_datastore_postgres.c:345
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:977
+#: src/datastore/plugin_datastore_postgres.c:866
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "发送消息失败。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1014
+#: src/datastore/plugin_datastore_postgres.c:903
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:65
+#: src/datastore/plugin_datastore_sqlite.c:66
 #: src/testbed/generate-underlay-topology.c:50
 #: src/testbed/gnunet-daemon-latency-logger.c:55
 #: src/testbed/gnunet-daemon-testbed-underlay.c:59
@@ -1811,39 +1793,34 @@ msgstr ""
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:263
-#: src/namecache/plugin_namecache_sqlite.c:193
-#: src/namestore/plugin_namestore_sqlite.c:213
-#: src/peerstore/plugin_peerstore_sqlite.c:479
+#: src/datastore/plugin_datastore_sqlite.c:281
+#: src/namecache/plugin_namecache_sqlite.c:194
+#: src/namestore/plugin_namestore_sqlite.c:222
+#: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:692
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:1189
+#: src/datastore/plugin_datastore_sqlite.c:1234
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1209
+#: src/datastore/plugin_datastore_sqlite.c:1268
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1249
-#: src/namecache/plugin_namecache_sqlite.c:580
-#: src/namestore/plugin_namestore_sqlite.c:766
+#: src/datastore/plugin_datastore_sqlite.c:1312
+#: src/namecache/plugin_namecache_sqlite.c:603
+#: src/namestore/plugin_namestore_sqlite.c:802
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datastore/plugin_datastore_template.c:258
+#: src/datastore/plugin_datastore_template.c:259
 msgid "Template database running\n"
 msgstr ""
 
@@ -1867,44 +1844,41 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:235 src/dht/gnunet-dht-monitor.c:289
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
+#: src/dht/gnunet-dht-put.c:222
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:238
+#: src/dht/gnunet-dht-get.c:251
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:241 src/dht/gnunet-dht-monitor.c:292
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:244
+#: src/dht/gnunet-dht-get.c:264
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:247 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:250 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:222 src/fs/gnunet-auto-share.c:780
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:951
-#: src/fs/gnunet-search.c:322 src/fs/gnunet-unindex.c:167
-#: src/nse/gnunet-nse-profiler.c:855
-msgid "be verbose (print progress information)"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:271
+#: src/dht/gnunet-dht-get.c:283
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:295
+#: src/dht/gnunet-dht-monitor.c:310
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:320
+#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
+#: src/nse/gnunet-nse-profiler.c:871
+msgid "be verbose (print progress information)"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:328
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
@@ -1914,43 +1888,43 @@ msgstr ""
 msgid "Exiting as the number of peers is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/dht/gnunet_dht_profiler.c:1186
+#: src/dht/gnunet_dht_profiler.c:1188
 #, fuzzy
 msgid "number of peers to start"
 msgstr "迭代次数"
 
-#: src/dht/gnunet_dht_profiler.c:1189
+#: src/dht/gnunet_dht_profiler.c:1194
 msgid ""
 "maximum number of times we try to search for successor circle formation (0 "
 "for R5N)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1192 src/nse/gnunet-nse-profiler.c:846
-#: src/testbed/gnunet-testbed-profiler.c:294
+#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
+#: src/testbed/gnunet-testbed-profiler.c:305
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1195
+#: src/dht/gnunet_dht_profiler.c:1206
 msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1198
+#: src/dht/gnunet_dht_profiler.c:1212
 msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1201
+#: src/dht/gnunet_dht_profiler.c:1218
 msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1204
+#: src/dht/gnunet_dht_profiler.c:1223
 msgid "replication degree for DHT PUTs"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1207
+#: src/dht/gnunet_dht_profiler.c:1230
 msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1225
+#: src/dht/gnunet_dht_profiler.c:1248
 #, fuzzy
 msgid "Measure quality and performance of the DHT service."
 msgstr "无法访问该服务"
@@ -1967,88 +1941,78 @@ msgstr ""
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:157
+#: src/dht/gnunet-dht-put.c:156
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:164
+#: src/dht/gnunet-dht-put.c:163
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:174
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-put.c:210
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:216
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:213
+#: src/dht/gnunet-dht-put.c:233
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:238
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:219
+#: src/dht/gnunet-dht-put.c:244
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:247
+#: src/dht/gnunet-dht-put.c:262
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:369
-#: src/dht/gnunet-service-wdht_clients.c:864
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:482
-#: src/dht/gnunet-service-wdht_clients.c:945
+#: src/dht/gnunet-service-dht_clients.c:485
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:621
-#: src/dht/gnunet-service-wdht_clients.c:1011
+#: src/dht/gnunet-service-dht_clients.c:624
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:847
-#: src/dht/gnunet-service-wdht_clients.c:1220
+#: src/dht/gnunet-service-dht_clients.c:850
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1032
-#: src/dht/gnunet-service-wdht_clients.c:510
+#: src/dht/gnunet-service-dht_clients.c:1035
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1047
-#: src/dht/gnunet-service-wdht_clients.c:524
+#: src/dht/gnunet-service-dht_clients.c:1050
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1093
-#: src/dht/gnunet-service-wdht_clients.c:566
+#: src/dht/gnunet-service-dht_clients.c:1096
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1100
-#: src/dht/gnunet-service-wdht_clients.c:589
+#: src/dht/gnunet-service-dht_clients.c:1103
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1178
-#: src/dht/gnunet-service-wdht_clients.c:643
-#: src/dht/gnunet-service-wdht_clients.c:693
+#: src/dht/gnunet-service-dht_clients.c:1181
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
@@ -2091,100 +2055,90 @@ msgid "# GET requests given to datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_hello.c:86
-#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:671
+#: src/dht/gnunet-service-dht_neighbours.c:672
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:842
+#: src/dht/gnunet-service-dht_neighbours.c:843
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1082
+#: src/dht/gnunet-service-dht_neighbours.c:1046
+#: src/dht/gnunet-service-dht_neighbours.c:1089
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1062
-#: src/dht/gnunet-service-dht_neighbours.c:1098
+#: src/dht/gnunet-service-dht_neighbours.c:1063
+#: src/dht/gnunet-service-dht_neighbours.c:1105
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1246
+#: src/dht/gnunet-service-dht_neighbours.c:1262
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1279
+#: src/dht/gnunet-service-dht_neighbours.c:1295
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1290
-#: src/dht/gnunet-service-dht_neighbours.c:1430
-#: src/dht/gnunet-service-dht_neighbours.c:1533
-#: src/dht/gnunet-service-xdht_neighbours.c:946
-#: src/dht/gnunet-service-xdht_neighbours.c:1007
-#: src/dht/gnunet-service-xdht_neighbours.c:1047
-#: src/dht/gnunet-service-xdht_neighbours.c:1103
-#: src/dht/gnunet-service-xdht_neighbours.c:1158
-#: src/dht/gnunet-service-xdht_neighbours.c:1208
-#: src/dht/gnunet-service-xdht_neighbours.c:1262
-#: src/dht/gnunet-service-xdht_neighbours.c:1317
-#: src/dht/gnunet-service-xdht_neighbours.c:1370
+#: src/dht/gnunet-service-dht_neighbours.c:1306
+#: src/dht/gnunet-service-dht_neighbours.c:1446
+#: src/dht/gnunet-service-dht_neighbours.c:1549
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1375
+#: src/dht/gnunet-service-dht_neighbours.c:1391
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1418
+#: src/dht/gnunet-service-dht_neighbours.c:1434
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1548
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1663
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1651
+#: src/dht/gnunet-service-dht_neighbours.c:1667
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1869
+#: src/dht/gnunet-service-dht_neighbours.c:1893
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1877
+#: src/dht/gnunet-service-dht_neighbours.c:1901
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2029
+#: src/dht/gnunet-service-dht_neighbours.c:2062
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2033
+#: src/dht/gnunet-service-dht_neighbours.c:2066
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2104
+#: src/dht/gnunet-service-dht_neighbours.c:2131
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2125
+#: src/dht/gnunet-service-dht_neighbours.c:2152
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2223
+#: src/dht/gnunet-service-dht_neighbours.c:2334
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2227
+#: src/dht/gnunet-service-dht_neighbours.c:2338
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -2192,155 +2146,48 @@ msgstr ""
 msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:223
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:237
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:238
+#: src/dht/gnunet-service-dht_routing.c:243
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:249
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:256
+#: src/dht/gnunet-service-dht_routing.c:261
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:335
+#: src/dht/gnunet-service-dht_routing.c:339
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:411
+#: src/dht/gnunet-service-dht_routing.c:415
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:433
+#: src/dht/gnunet-service-dht_routing.c:437
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet-service-wdht_clients.c:653
-msgid "Could not pass reply to client, message too big!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1572
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail_length = %d"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1577
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d]=%s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1597
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FRIEND_PEERMAP of %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1607
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1628
-#, c-format
-msgid ""
-"\n"
-"SUPU************  FINGER_TABLE of %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1644
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail_id[%d]=%s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1650
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,trail[%d] = %s "
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:3366
-msgid "# FINGERS_COUNT"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:3522
-#: src/dht/gnunet-service-xdht_neighbours.c:3743
-#: src/dht/gnunet-service-xdht_neighbours.c:3900
-#: src/dht/gnunet-service-xdht_neighbours.c:4070
-#: src/dht/gnunet-service-xdht_neighbours.c:4281
-#: src/dht/gnunet-service-xdht_neighbours.c:4836
-#: src/dht/gnunet-service-xdht_neighbours.c:5254
-#: src/dht/gnunet-service-xdht_neighbours.c:5365
-#: src/dht/gnunet-service-xdht_neighbours.c:5451
-#: src/dht/gnunet-service-xdht_neighbours.c:5567
-#: src/dht/gnunet-service-xdht_neighbours.c:5712
-#: src/dht/gnunet-service-xdht_neighbours.c:5812
-msgid "# Bytes received from other peers"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:261
-#, c-format
-msgid ""
-"\n"
-"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:269
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->trail_id = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:272
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->next_hop = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_routing.c:275
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d, trail->prev_hop = %s"
-msgstr ""
-
-#: src/dht/plugin_block_dht.c:167
+#: src/dht/plugin_block_dht.c:187
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:174
+#: src/dht/plugin_block_dht.c:194
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:184
+#: src/dht/plugin_block_dht.c:204
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2380,27 +2227,23 @@ msgstr ""
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:351
+#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:354
-msgid "only monitor DNS replies"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:365
+#: src/dns/gnunet-dns-monitor.c:370
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:235
+#: src/dns/gnunet-dns-redirector.c:237
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:238
+#: src/dns/gnunet-dns-redirector.c:243
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:250
+#: src/dns/gnunet-dns-redirector.c:256
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
@@ -2420,248 +2263,244 @@ msgstr ""
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:929
+#: src/dns/gnunet-service-dns.c:928
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:945
+#: src/dns/gnunet-service-dns.c:944
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:954
+#: src/dns/gnunet-service-dns.c:953
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:964
+#: src/dns/gnunet-service-dns.c:963
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:966
+#: src/dns/gnunet-service-dns.c:965
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1033
+#: src/dns/gnunet-service-dns.c:1032
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1078 src/exit/gnunet-daemon-exit.c:3642
+#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/dns/gnunet-service-dns.c:1091
+#: src/dns/gnunet-service-dns.c:1090
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:166
-msgid "verbose output"
-msgstr ""
-
 #: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/exit/gnunet-daemon-exit.c:804 src/exit/gnunet-daemon-exit.c:3108
-#, fuzzy
-msgid "# Inbound CADET channels created"
+#: src/exit/gnunet-daemon-exit.c:961
+msgid "# TCP packets sent via TUN"
 msgstr ""
-"\n"
-"按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:860
-#, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
+#: src/exit/gnunet-daemon-exit.c:1062
+msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:913
-#, fuzzy
-msgid "# Bytes transmitted via cadet channels"
+#: src/exit/gnunet-daemon-exit.c:1341
+msgid "# UDP packets sent via TUN"
 msgstr ""
-"\n"
-"按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:1032 src/exit/gnunet-daemon-exit.c:2492
-#: src/exit/gnunet-daemon-exit.c:2745 src/vpn/gnunet-service-vpn.c:1454
-#: src/vpn/gnunet-service-vpn.c:1845 src/vpn/gnunet-service-vpn.c:2008
-msgid "# ICMPv4 packets dropped (type not allowed)"
+#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
+#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
+#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
+#: src/exit/gnunet-daemon-exit.c:2208
+msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1069 src/exit/gnunet-daemon-exit.c:2551
-#: src/exit/gnunet-daemon-exit.c:2804 src/vpn/gnunet-service-vpn.c:1510
-#: src/vpn/gnunet-service-vpn.c:1904 src/vpn/gnunet-service-vpn.c:2041
-msgid "# ICMPv6 packets dropped (type not allowed)"
+#: src/exit/gnunet-daemon-exit.c:1468
+msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1117
-msgid "# ICMP packets dropped (not allowed)"
+#: src/exit/gnunet-daemon-exit.c:1576
+msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1125
-msgid "ICMP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:1616
+msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1202
-msgid "UDP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:1705
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1277
-msgid "TCP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:1789
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1330
-msgid "# Packets received from TUN"
+#: src/exit/gnunet-daemon-exit.c:1826
+msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1344
-msgid "# Bytes received from TUN"
+#: src/exit/gnunet-daemon-exit.c:1957
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1370
-msgid "IPv4 packet options received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
+#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
+#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
+msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1397
-#, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
+#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
+#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
+msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1443
-#, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2211
+msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1451
-#, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
+#: src/vpn/gnunet-service-vpn.c:2096
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1852
-msgid "# TCP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
+#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1976
-msgid "# TCP service creation requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
+#, fuzzy
+msgid "# Inbound CADET channels created"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:1980 src/exit/gnunet-daemon-exit.c:2059
-#: src/exit/gnunet-daemon-exit.c:2166 src/exit/gnunet-daemon-exit.c:2416
-#: src/exit/gnunet-daemon-exit.c:2666 src/exit/gnunet-daemon-exit.c:2953
-#: src/exit/gnunet-daemon-exit.c:3056
-msgid "# Bytes received from CADET"
+#: src/exit/gnunet-daemon-exit.c:2523
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2062
-msgid "# TCP IP-exit creation requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2542
+#, fuzzy
+msgid "# Messages transmitted via cadet channels"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:2169
-msgid "# TCP data requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2720
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2183
-msgid "# TCP DATA requests dropped (no session)"
+#: src/exit/gnunet-daemon-exit.c:2728
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2245
-msgid "# ICMP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:2802
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2419
-msgid "# ICMP IP-exit requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2874
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2669
-msgid "# ICMP service requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:2922
+msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2730 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:2002
-msgid "# ICMPv4 packets dropped (impossible PT to v6)"
+#: src/exit/gnunet-daemon-exit.c:2936
+msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2789 src/vpn/gnunet-service-vpn.c:1480
-#: src/vpn/gnunet-service-vpn.c:1492 src/vpn/gnunet-service-vpn.c:1892
-msgid "# ICMPv6 packets dropped (impossible PT to v4)"
+#: src/exit/gnunet-daemon-exit.c:2962
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2840
-msgid "# UDP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:2989
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2956
-msgid "# UDP IP-exit requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:3035
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3059
-msgid "# UDP service requests received via cadet"
+#: src/exit/gnunet-daemon-exit.c:3043
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3326 src/exit/gnunet-daemon-exit.c:3336
+#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/exit/gnunet-daemon-exit.c:3350 src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3399
+#: src/exit/gnunet-daemon-exit.c:3319
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3413 src/exit/gnunet-daemon-exit.c:3426
+#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3438
+#: src/exit/gnunet-daemon-exit.c:3358
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3583
+#: src/exit/gnunet-daemon-exit.c:3503
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3591
+#: src/exit/gnunet-daemon-exit.c:3511
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3598
+#: src/exit/gnunet-daemon-exit.c:3518
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3604
+#: src/exit/gnunet-daemon-exit.c:3524
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3764
+#: src/exit/gnunet-daemon-exit.c:3694
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3871
+#: src/exit/gnunet-daemon-exit.c:3809
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3883 src/pt/gnunet-daemon-pt.c:1279
+#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:4028
+#: src/exit/gnunet-daemon-exit.c:3969
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2670,7 +2509,7 @@ msgid "# acknowledgements sent for fragment"
 msgstr ""
 
 #: src/fragmentation/defragmentation.c:468
-#: src/transport/plugin_transport_wlan.c:1528
+#: src/transport/plugin_transport_wlan.c:1554
 msgid "# fragments received"
 msgstr ""
 
@@ -2783,67 +2622,73 @@ msgstr ""
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:208
+#: src/fs/fs_directory.c:213
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:308
+#: src/fs/fs_download.c:309
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:328
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:509 src/fs/fs_download.c:521
+#: src/fs/fs_download.c:346
+#, c-format
+msgid ""
+"Failed to access full directroy contents of `%s' for recursive download\n"
+msgstr ""
+
+#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:926
+#: src/fs/fs_download.c:955
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1011
+#: src/fs/fs_download.c:1046
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1039
+#: src/fs/fs_download.c:1074
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1063
+#: src/fs/fs_download.c:1098
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:1075
+#: src/fs/fs_download.c:1110
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:1084
+#: src/fs/fs_download.c:1119
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_download.c:1184
+#: src/fs/fs_download.c:1219
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1845
+#: src/fs/fs_download.c:1884
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
 
-#: src/fs/fs_getopt.c:197
+#: src/fs/fs_getopt.c:226
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2978,36 +2823,36 @@ msgstr "发送消息失败。\n"
 msgid "Error communicating with `fs' service."
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:326
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:378 src/fs/fs_unindex.c:390
+#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_unindex.c:386
+#: src/fs/fs_unindex.c:384
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_unindex.c:445
+#: src/fs/fs_unindex.c:443
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:606 src/fs/fs_unindex.c:669
+#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_unindex.c:682
+#: src/fs/fs_unindex.c:665
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:721
+#: src/fs/fs_unindex.c:704
 msgid "Failed to compute hash of file."
 msgstr ""
 
@@ -3028,76 +2873,76 @@ msgstr ""
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:376
+#: src/fs/fs_uri.c:377
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:417
+#: src/fs/fs_uri.c:418
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:432
+#: src/fs/fs_uri.c:433
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:511
+#: src/fs/fs_uri.c:512
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:526
+#: src/fs/fs_uri.c:527
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:536
+#: src/fs/fs_uri.c:537
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:544
+#: src/fs/fs_uri.c:545
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:552
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:559
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:565
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:573
+#: src/fs/fs_uri.c:574
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:580
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:586
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
+#: src/fs/fs_uri.c:598
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:632
 #, fuzzy
 msgid "invalid argument"
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_uri.c:643
+#: src/fs/fs_uri.c:644
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1045 src/fs/fs_uri.c:1072
+#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1078
+#: src/fs/fs_uri.c:1081
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3133,27 +2978,27 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:764 src/fs/gnunet-publish.c:898
+#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:768 src/fs/gnunet-publish.c:902
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:771 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:774 src/fs/gnunet-publish.c:929
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:936
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:801
+#: src/fs/gnunet-auto-share.c:813
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -3253,61 +3098,61 @@ msgstr ""
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:310
+#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:307
+#: src/fs/gnunet-download.c:311
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:322
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:328
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:334
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:339
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:356
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:117
+#: src/fs/gnunet-fs.c:119
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:127
+#: src/fs/gnunet-fs.c:130
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:211
+#: src/fs/gnunet-fs-profiler.c:217
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:214
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:223
+#: src/fs/gnunet-fs-profiler.c:233
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
@@ -3437,61 +3282,61 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
 #: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1296 src/transport/gnunet-transport.c:1321
+#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:909
+#: src/fs/gnunet-publish.c:916
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:913
+#: src/fs/gnunet-publish.c:923
 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:917
+#: src/fs/gnunet-publish.c:930
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:920
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:925
+#: src/fs/gnunet-publish.c:942
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:933
+#: src/fs/gnunet-publish.c:955
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:939
+#: src/fs/gnunet-publish.c:968
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:943
+#: src/fs/gnunet-publish.c:975
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:947
+#: src/fs/gnunet-publish.c:982
 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:963
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3513,57 +3358,57 @@ msgstr ""
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:325
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:319
+#: src/fs/gnunet-search.c:331
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:326
+#: src/fs/gnunet-search.c:340
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:337
+#: src/fs/gnunet-search.c:353
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:378 src/fs/gnunet-service-fs.c:883
+#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:437
+#: src/fs/gnunet-service-fs.c:436
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:606
+#: src/fs/gnunet-service-fs.c:605
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:658 src/fs/gnunet-service-fs_cp.c:564
+#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:837
+#: src/fs/gnunet-service-fs.c:836
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:876
+#: src/fs/gnunet-service-fs.c:875
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1047
+#: src/fs/gnunet-service-fs.c:1046
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1287
+#: src/fs/gnunet-service-fs.c:1286
 #, fuzzy
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/fs/gnunet-service-fs.c:1312 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
 #: src/topology/gnunet-daemon-topology.c:1203
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3577,27 +3422,27 @@ msgstr ""
 msgid "# replies received via cadet dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:263
+#: src/fs/gnunet-service-fs_cadet_server.c:265
 msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:317
+#: src/fs/gnunet-service-fs_cadet_server.c:320
 msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:343
+#: src/fs/gnunet-service-fs_cadet_server.c:346
 msgid "# queries received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:384
+#: src/fs/gnunet-service-fs_cadet_server.c:388
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:391
-#: src/fs/gnunet-service-fs_cadet_server.c:431
+#: src/fs/gnunet-service-fs_cadet_server.c:395
+#: src/fs/gnunet-service-fs_cadet_server.c:435
 #, fuzzy
 msgid "# cadet connections active"
 msgstr ""
@@ -3693,25 +3538,25 @@ msgstr "创建用户出错"
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:329
+#: src/fs/gnunet-service-fs_indexing.c:331
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:355
+#: src/fs/gnunet-service-fs_indexing.c:357
 #, 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:359
+#: src/fs/gnunet-service-fs_indexing.c:361
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:392
+#: src/fs/gnunet-service-fs_indexing.c:394
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:515
+#: src/fs/gnunet-service-fs_indexing.c:518
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3747,111 +3592,110 @@ msgstr ""
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:327
+#: src/fs/gnunet-service-fs_pr.c:330
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
+#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:856
+#: src/fs/gnunet-service-fs_pr.c:858
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:892
+#: src/fs/gnunet-service-fs_pr.c:894
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:901
+#: src/fs/gnunet-service-fs_pr.c:903
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:916
+#: src/fs/gnunet-service-fs_pr.c:918
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:933
+#: src/fs/gnunet-service-fs_pr.c:935
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1063
+#: src/fs/gnunet-service-fs_pr.c:1065
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1091
+#: src/fs/gnunet-service-fs_pr.c:1093
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1129
+#: src/fs/gnunet-service-fs_pr.c:1131
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1260
+#: src/fs/gnunet-service-fs_pr.c:1262
 msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1312
+#: src/fs/gnunet-service-fs_pr.c:1314
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1335
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1385
+#: src/fs/gnunet-service-fs_pr.c:1395
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1454
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1509
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1400
+#: src/fs/gnunet-service-fs_pr.c:1524
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1409
+#: src/fs/gnunet-service-fs_pr.c:1548
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1424
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1438
+#: src/fs/gnunet-service-fs_pr.c:1562
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1451
+#: src/fs/gnunet-service-fs_pr.c:1583
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1456
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1482 src/fs/gnunet-service-fs_pr.c:1521
-#: src/fs/gnunet-service-fs_pr.c:1688
-msgid "# Datastore lookups concluded (error queueing)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1540
+#: src/fs/gnunet-service-fs_pr.c:1626
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1552
+#: src/fs/gnunet-service-fs_pr.c:1639
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1665
+#: src/fs/gnunet-service-fs_pr.c:1693
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1745
+#: src/fs/gnunet-service-fs_pr.c:1749
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:642
+#: src/fs/gnunet-service-fs_push.c:646
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3902,11 +3746,11 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:522
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:535
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -3930,135 +3774,114 @@ msgstr ""
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:712
+#: src/gns/gnunet-dns2gns.c:711
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:740
+#: src/gns/gnunet-dns2gns.c:739
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:761
+#: src/gns/gnunet-dns2gns.c:760
 msgid "No valid GNS zone specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:784
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:790
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:788
+#: src/gns/gnunet-dns2gns.c:796
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:802
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:794
+#: src/gns/gnunet-dns2gns.c:808
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:807
+#: src/gns/gnunet-dns2gns.c:826
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:269 src/gns/plugin_rest_gns.c:347
+#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:295
+#: src/gns/gnunet-gns.c:252
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:376
+#: src/gns/gnunet-gns.c:276
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:415 src/gns/gnunet-gns-helper-service-w32.c:796
-#: src/gns/plugin_rest_gns.c:472
+#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
+#: src/gns/plugin_rest_gns.c:422
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:456 src/gns/gnunet-gns-helper-service-w32.c:826
+#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns.c:470 src/gns/gnunet-gns.c:500
-#, c-format
-msgid "Reverse key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:484
+#: src/gns/gnunet-gns.c:374
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:548
+#: src/gns/gnunet-gns.c:428
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:551
+#: src/gns/gnunet-gns.c:434
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:554
+#: src/gns/gnunet-gns.c:440
 msgid "Specify timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:557
+#: src/gns/gnunet-gns.c:445
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:560
+#: src/gns/gnunet-gns.c:451
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:563
+#: src/gns/gnunet-gns.c:457
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:566
-msgid "Specify the public key of the zone to reverse lookup a name for"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:580
+#: src/gns/gnunet-gns.c:476
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"
 
-#: src/gns/gnunet-gns-helper-service-w32.c:221
-msgid "Transmission to client failed!\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-helper-service-w32.c:260
-msgid "Shutdown in progress, aborting transmission.\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-helper-service-w32.c:766
-#, c-format
-msgid ""
-"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
-"that it is and refuse to perform a lookup.  Did you run gnunet-gns-import."
-"sh?\n"
+#: src/gns/gnunet-gns-helper-service-w32.c:602
+msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:836
+#: src/gns/gnunet-gns-helper-service-w32.c:739
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-import.c:482
+#: src/gns/gnunet-gns-import.c:489
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
@@ -4077,129 +3900,118 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:878
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:901
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:924
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:937
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:952
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:962
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:986
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1095
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1708
+#: src/gns/gnunet-gns-proxy.c:1699
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2168
+#: src/gns/gnunet-gns-proxy.c:2162
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户："
 
-#: src/gns/gnunet-gns-proxy.c:2198
+#: src/gns/gnunet-gns-proxy.c:2192
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "无法保存配置文件“%s”："
 
-#: src/gns/gnunet-gns-proxy.c:2371
+#: src/gns/gnunet-gns-proxy.c:2365
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2384 src/rest/gnunet-rest-server.c:533
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2710
+#: src/gns/gnunet-gns-proxy.c:2704
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2739
+#: src/gns/gnunet-gns-proxy.c:2733
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
+#: src/gns/gnunet-gns-proxy.c:2751 src/gns/gnunet-gns-proxy.c:2780
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2837
+#: src/gns/gnunet-gns-proxy.c:2830
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3172
-msgid "No ego configured for `shorten-zone`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
-#: src/gns/gnunet-service-gns.c:548
+#: src/gns/gnunet-gns-proxy.c:3165 src/gns/gnunet-service-gns.c:403
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3274
+#: src/gns/gnunet-gns-proxy.c:3226
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3314
+#: src/gns/gnunet-gns-proxy.c:3269
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3317
+#: src/gns/gnunet-gns-proxy.c:3275
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3336
+#: src/gns/gnunet-gns-proxy.c:3300
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:585
-#: src/zonemaster/gnunet-service-zonemaster.c:705
-#, fuzzy
-msgid "Failed to connect to the namestore!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/gns/gnunet-service-gns.c:593
+#: src/gns/gnunet-service-gns.c:442
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:612
+#: src/gns/gnunet-service-gns.c:461
 #: src/zonemaster/gnunet-service-zonemaster.c:741
 #, fuzzy
 msgid "Could not connect to DHT!\n"
@@ -4209,51 +4021,51 @@ msgstr "无法连接到 %s:%u：%s\n"
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:371
+#: src/gns/gnunet-service-gns_interceptor.c:370
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:648
+#: src/gns/gnunet-service-gns_resolver.c:641
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:659
+#: src/gns/gnunet-service-gns_resolver.c:652
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:851
+#: src/gns/gnunet-service-gns_resolver.c:844
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:993
+#: src/gns/gnunet-service-gns_resolver.c:986
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1354
+#: src/gns/gnunet-service-gns_resolver.c:1347
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:1865
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1913
+#: src/gns/gnunet-service-gns_resolver.c:1889
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2195
+#: src/gns/gnunet-service-gns_resolver.c:2171
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2342
+#: src/gns/gnunet-service-gns_resolver.c:2318
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
@@ -4278,21 +4090,21 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:311
+#: src/gns/plugin_gnsrecord_gns.c:312
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:359
+#: src/gns/plugin_gnsrecord_gns.c:360
 #, fuzzy, c-format
 msgid "Unable to parse REVERSE record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_rest_gns.c:435
+#: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:717
+#: src/gns/plugin_rest_gns.c:668
 msgid "GNS REST API initialized\n"
 msgstr ""
 
@@ -4441,25 +4253,25 @@ msgid ""
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:375
+#: src/hostlist/gnunet-daemon-hostlist.c:376
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:380
+#: src/hostlist/gnunet-daemon-hostlist.c:381
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:385
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:387
+#: src/hostlist/gnunet-daemon-hostlist.c:390
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:403
+#: src/hostlist/gnunet-daemon-hostlist.c:406
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4593,7 +4405,7 @@ msgid "# hostlist URIs written to file"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1628
-#: src/transport/plugin_transport_http_client.c:2277
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4720,43 +4532,43 @@ msgstr "“%s”不可用。\n"
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:163
+#: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/identity/gnunet-identity.c:182
+#: src/identity/gnunet-identity.c:201
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/identity/gnunet-identity.c:324
+#: src/identity/gnunet-identity.c:356
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:362
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:367
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:373
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:336
+#: src/identity/gnunet-identity.c:378
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:384
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:348
+#: src/identity/gnunet-identity.c:398
 msgid "Maintain egos"
 msgstr ""
 
@@ -4821,18 +4633,23 @@ msgstr "%s：选项“%s”有歧义\n"
 msgid "Token `%s' is malformed\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/identity-provider/gnunet-identity-token.c:163
+#: src/identity-provider/gnunet-identity-token.c:166
 msgid "GNUid token"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:166
+#: src/identity-provider/gnunet-identity-token.c:171
 msgid "Print token contents"
 msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1163
+#: src/identity-provider/plugin_rest_identity_provider.c:1166
 msgid "Identity Token REST API initialized\n"
 msgstr ""
 
+#: src/json/json.c:119
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
 msgid "This command doesn't do anything yet."
 msgstr ""
@@ -4877,15 +4694,15 @@ msgstr "“%s”的参数无效。\n"
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方！\n"
 
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1153
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:233
+#: src/namecache/gnunet-namecache.c:238
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:244 src/namestore/gnunet-namestore.c:1189
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
@@ -4904,7 +4721,7 @@ msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 #: src/namestore/plugin_namestore_flat.c:179
 #: src/namestore/plugin_namestore_flat.c:375
 #: src/peerstore/plugin_peerstore_flat.c:379
-#: src/peerstore/plugin_peerstore_flat.c:527
+#: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
@@ -4976,7 +4793,7 @@ msgid ""
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1003
+#: src/namestore/plugin_rest_namestore.c:1004
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -4988,7 +4805,7 @@ msgstr ""
 
 #: src/namestore/gnunet-namestore.c:802
 #: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1016
+#: src/namestore/plugin_rest_namestore.c:1017
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -5044,72 +4861,72 @@ msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
 #: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1046
+#: src/namestore/plugin_rest_namestore.c:1047
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1142
+#: src/namestore/plugin_rest_namestore.c:1143
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1135
+#: src/namestore/gnunet-namestore.c:1137
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1138
+#: src/namestore/gnunet-namestore.c:1142
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1141
+#: src/namestore/gnunet-namestore.c:1147
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1144
+#: src/namestore/gnunet-namestore.c:1153
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1159
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1150
+#: src/namestore/gnunet-namestore.c:1164
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:1156
+#: src/namestore/gnunet-namestore.c:1176
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1184
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1162
+#: src/namestore/gnunet-namestore.c:1190
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1165
+#: src/namestore/gnunet-namestore.c:1196
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1201
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1171
+#: src/namestore/gnunet-namestore.c:1206
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1174
+#: src/namestore/gnunet-namestore.c:1212
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5187,23 +5004,23 @@ msgstr ""
 msgid "flat file database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/namestore/plugin_rest_namestore.c:1187
+#: src/namestore/plugin_rest_namestore.c:1188
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:192
+#: src/nat-auto/gnunet-nat-auto.c:193
 #, fuzzy
 msgid "Suggested configuration changes:\n"
 msgstr ""
 "\n"
 "您的配置更改没有保存。\n"
 
-#: src/nat-auto/gnunet-nat-auto.c:220
+#: src/nat-auto/gnunet-nat-auto.c:219
 #, fuzzy, c-format
 msgid "Failed to write configuration to `%s'\n"
 msgstr "保存配置失败。"
 
-#: src/nat-auto/gnunet-nat-auto.c:227
+#: src/nat-auto/gnunet-nat-auto.c:226
 #, fuzzy, c-format
 msgid "Wrote updated configuration to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -5213,23 +5030,23 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "run autoconfiguration"
 msgstr "配额配置"
 
-#: src/nat-auto/gnunet-nat-auto.c:348
+#: src/nat-auto/gnunet-nat-auto.c:351
 msgid "section name providing the configuration for the adapter"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
 msgid "use TCP"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
 msgid "use UDP"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:357
+#: src/nat-auto/gnunet-nat-auto.c:366
 msgid "write configuration file (for autoconfiguration)"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:369
+#: src/nat-auto/gnunet-nat-auto.c:378
 #, fuzzy
 msgid "GNUnet NAT traversal autoconfiguration"
 msgstr "GNUnet 配置"
@@ -5251,15 +5068,6 @@ msgstr ""
 msgid "NAT test failed to start NAT library\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/nat-auto/gnunet-nat-server.c:338
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr ""
-
-#: src/nat-auto/gnunet-nat-server.c:388
-msgid "GNUnet NAT traversal test helper daemon"
-msgstr ""
-
 #: src/nat-auto/gnunet-service-nat-auto.c:342
 msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr ""
@@ -5405,57 +5213,57 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/nat/gnunet-nat.c:424
+#: src/nat/gnunet-nat.c:425
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:427
+#: src/nat/gnunet-nat.c:431
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:430
+#: src/nat/gnunet-nat.c:437
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:433
+#: src/nat/gnunet-nat.c:442
 msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:457
 msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:454
+#: src/nat/gnunet-nat.c:469
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1317
+#: src/nat/gnunet-service-nat.c:1335
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1327
+#: src/nat/gnunet-service-nat.c:1345
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1343
+#: src/nat/gnunet-service-nat.c:1361
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1354
+#: src/nat/gnunet-service-nat.c:1372
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1813
+#: src/nat/gnunet-service-nat.c:1837
 msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1886
+#: src/nat/gnunet-service-nat.c:1910
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5466,7 +5274,7 @@ msgstr ""
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_helper.c:260
+#: src/nat/gnunet-service-nat_helper.c:273
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败：%s %d\n"
@@ -5483,33 +5291,33 @@ msgstr ""
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:840
+#: src/nse/gnunet-nse-profiler.c:842
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:843
+#: src/nse/gnunet-nse-profiler.c:847
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:849
+#: src/nse/gnunet-nse-profiler.c:859
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:852
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:858
+#: src/nse/gnunet-nse-profiler.c:877
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:886
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
 #: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:832 src/util/gnunet-scrypt.c:276
+#: src/revocation/gnunet-service-revocation.c:838 src/util/gnunet-scrypt.c:276
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
@@ -5603,40 +5411,40 @@ msgstr ""
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:842
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:845
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:848
+#: src/peerinfo-tool/gnunet-peerinfo.c:852
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:851
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:854
+#: src/peerinfo-tool/gnunet-peerinfo.c:862
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:857
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:860
+#: src/peerinfo-tool/gnunet-peerinfo.c:873
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:863
+#: src/peerinfo-tool/gnunet-peerinfo.c:879
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:880
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
@@ -5663,35 +5471,30 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/gnunet-service-peerstore.c:588
+#: src/peerstore/gnunet-service-peerstore.c:598
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/peerstore/peerstore_api.c:296
-#, c-format
-msgid "Received an error notification from MQ of type: %d\n"
-msgstr ""
-
-#: src/peerstore/peerstore_api.c:344
+#: src/peerstore/peerstore_api.c:350
 msgid "timeout"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:560 src/peerstore/peerstore_api.c:609
+#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615
 #, fuzzy
 msgid "Unexpected iteration response, this should not happen.\n"
 msgstr "输出格式未知，不应出现这种情况。\n"
 
-#: src/peerstore/peerstore_api.c:623
+#: src/peerstore/peerstore_api.c:629
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/peerstore/peerstore_api.c:768
+#: src/peerstore/peerstore_api.c:778
 msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/peerstore/plugin_peerstore_sqlite.c:398
+#: src/peerstore/plugin_peerstore_sqlite.c:453
 #: src/psycstore/plugin_psycstore_sqlite.c:282
 #, fuzzy, c-format
 msgid ""
@@ -5699,7 +5502,7 @@ msgid ""
 "  %s\n"
 msgstr "创建用户出错"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:422
+#: src/peerstore/plugin_peerstore_sqlite.c:488
 #: src/psycstore/plugin_psycstore_mysql.c:250
 #: src/psycstore/plugin_psycstore_sqlite.c:259
 #, fuzzy, c-format
@@ -5708,7 +5511,7 @@ msgid ""
 "  %s\n"
 msgstr "创建用户出错"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:504
+#: src/peerstore/plugin_peerstore_sqlite.c:570
 #, fuzzy, c-format
 msgid "Unable to create indices: %s.\n"
 msgstr "发送消息失败。\n"
@@ -5829,58 +5632,58 @@ msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 msgid "SQLite database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/pt/gnunet-daemon-pt.c:493
+#: src/pt/gnunet-daemon-pt.c:423
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:499
+#: src/pt/gnunet-daemon-pt.c:429
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:553
+#: src/pt/gnunet-daemon-pt.c:483
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:737
+#: src/pt/gnunet-daemon-pt.c:667
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:744
+#: src/pt/gnunet-daemon-pt.c:674
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:851
+#: src/pt/gnunet-daemon-pt.c:712
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:909
+#: src/pt/gnunet-daemon-pt.c:768
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:914
+#: src/pt/gnunet-daemon-pt.c:773
 msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:922
+#: src/pt/gnunet-daemon-pt.c:781
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:995
+#: src/pt/gnunet-daemon-pt.c:876
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1011
+#: src/pt/gnunet-daemon-pt.c:893
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1294 src/pt/gnunet-daemon-pt.c:1303
-#: src/pt/gnunet-daemon-pt.c:1324 src/pt/gnunet-daemon-pt.c:1336
-#: src/pt/gnunet-daemon-pt.c:1345
+#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228
+#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253
+#: src/pt/gnunet-daemon-pt.c:1262
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:1390
+#: src/pt/gnunet-daemon-pt.c:1307
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
@@ -5923,42 +5726,42 @@ msgstr ""
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1482
+#: src/regex/gnunet-regex-profiler.c:1485
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1485
+#: src/regex/gnunet-regex-profiler.c:1491
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1488
+#: src/regex/gnunet-regex-profiler.c:1497
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1491
+#: src/regex/gnunet-regex-profiler.c:1504
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1494
+#: src/regex/gnunet-regex-profiler.c:1510
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1506
+#: src/regex/gnunet-regex-profiler.c:1523
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:696
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:699
+#: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:712
+#: src/regex/gnunet-regex-simulation-profiler.c:719
 msgid "Profiler for regex library"
 msgstr ""
 
@@ -5972,11 +5775,11 @@ msgstr "服务已删除。\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "服务已删除。\n"
 
-#: src/rest/gnunet-rest-server.c:788
+#: src/rest/gnunet-rest-server.c:790
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:805
+#: src/rest/gnunet-rest-server.c:807
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet 错误日志"
@@ -6041,7 +5844,7 @@ msgstr ""
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1176
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "“%s”的参数无效。\n"
@@ -6066,59 +5869,59 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "No action specified. Nothing to do.\n"
 msgstr "没有指定接口，将使用默认。\n"
 
-#: src/revocation/gnunet-revocation.c:532
+#: src/revocation/gnunet-revocation.c:535
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:535
+#: src/revocation/gnunet-revocation.c:541
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:538
+#: src/revocation/gnunet-revocation.c:546
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:541
+#: src/revocation/gnunet-revocation.c:552
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:456
+#: src/revocation/gnunet-service-revocation.c:459
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:464
+#: src/revocation/gnunet-service-revocation.c:468
 msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:469
+#: src/revocation/gnunet-service-revocation.c:473
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:473
+#: src/revocation/gnunet-service-revocation.c:477
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/revocation/gnunet-service-revocation.c:482
+#: src/revocation/gnunet-service-revocation.c:486
 msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:519
-#: src/revocation/gnunet-service-revocation.c:765
+#: src/revocation/gnunet-service-revocation.c:524
+#: src/revocation/gnunet-service-revocation.c:771
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:856
+#: src/revocation/gnunet-service-revocation.c:862
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/rps/gnunet-rps.c:177
+#: src/rps/gnunet-rps.c:146
 msgid "Seed a PeerID"
 msgstr ""
 
@@ -6157,29 +5960,30 @@ msgstr "无法连接到 %s:%u：%s\n"
 msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:357
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:363
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:369
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:363
+#: src/scalarproduct/gnunet-scalarproduct.c:379
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1404
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1342
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1177
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1060
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1407
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1180
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "“%s”已连接到“%s”。\n"
@@ -6188,185 +5992,215 @@ msgstr "“%s”已连接到“%s”。\n"
 msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:610
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
 msgid "dkg start delay"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
 msgid "dkg timeout"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+#: src/secretsharing/gnunet-secretsharing-profiler.c:628
 msgid "threshold"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+#: src/secretsharing/gnunet-secretsharing-profiler.c:633
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:2068
+#: src/set/gnunet-service-set.c:1948
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:249
+#: src/set/gnunet-set-ibf-profiler.c:252
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "迭代次数"
 
-#: src/set/gnunet-set-ibf-profiler.c:252
+#: src/set/gnunet-set-ibf-profiler.c:258
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "迭代次数"
 
-#: src/set/gnunet-set-ibf-profiler.c:255
+#: src/set/gnunet-set-ibf-profiler.c:264
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:258
+#: src/set/gnunet-set-ibf-profiler.c:270
 msgid "hash num"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:261
+#: src/set/gnunet-set-ibf-profiler.c:276
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:387
+#: src/set/gnunet-set-profiler.c:444
+msgid "use byzantine mode"
+msgstr ""
+
+#: src/set/gnunet-set-profiler.c:450
+msgid "force sending full set"
+msgstr ""
+
+#: src/set/gnunet-set-profiler.c:456
+msgid "number delta operation"
+msgstr ""
+
+#: src/set/gnunet-set-profiler.c:468
 msgid "operation to execute"
 msgstr ""
 
-#: src/social/gnunet-social.c:1163
+#: src/set/gnunet-set-profiler.c:474
+msgid "element size"
+msgstr ""
+
+#: src/social/gnunet-social.c:1166
 #, fuzzy
 msgid "--place missing or invalid.\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/social/gnunet-social.c:1212
+#: src/social/gnunet-social.c:1217
 msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/social/gnunet-social.c:1216
+#: src/social/gnunet-social.c:1222
 msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1220
+#: src/social/gnunet-social.c:1227 src/social/gnunet-social.c:1232
 msgid "create a place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1224
+#: src/social/gnunet-social.c:1237
 msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1228
+#: src/social/gnunet-social.c:1242
 msgid "enter somebody else's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1232
+#: src/social/gnunet-social.c:1248
 msgid "find state matching name prefix"
 msgstr ""
 
-#: src/social/gnunet-social.c:1236
+#: src/social/gnunet-social.c:1253
 msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/social/gnunet-social.c:1240
+#: src/social/gnunet-social.c:1258
 msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1244
+#: src/social/gnunet-social.c:1263
 msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1248
+#: src/social/gnunet-social.c:1268
 msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1252
+#: src/social/gnunet-social.c:1273
 msgid "search for state matching exact name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1256
+#: src/social/gnunet-social.c:1278
 msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1260
+#: src/social/gnunet-social.c:1283
 msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/social/gnunet-social.c:1264
+#: src/social/gnunet-social.c:1288
 msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/social/gnunet-social.c:1271
+#: src/social/gnunet-social.c:1297
 msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/social/gnunet-social.c:1275
+#: src/social/gnunet-social.c:1303
 msgid "message body or state value"
 msgstr ""
 
-#: src/social/gnunet-social.c:1279
+#: src/social/gnunet-social.c:1309
 #, fuzzy
 msgid "name or public key of ego"
 msgstr "“%s”的参数无效。\n"
 
-#: src/social/gnunet-social.c:1283
+#: src/social/gnunet-social.c:1314
 #, fuzzy
 msgid "wait for incoming messages"
 msgstr "发送消息失败。\n"
 
-#: src/social/gnunet-social.c:1287
+#: src/social/gnunet-social.c:1320
 msgid "GNS name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1291
+#: src/social/gnunet-social.c:1326
 msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/social/gnunet-social.c:1295
+#: src/social/gnunet-social.c:1332
 msgid "name (key) to query from state"
 msgstr ""
 
-#: src/social/gnunet-social.c:1299
+#: src/social/gnunet-social.c:1338
 msgid "method name"
 msgstr ""
 
-#: src/social/gnunet-social.c:1303
+#: src/social/gnunet-social.c:1344
 #, fuzzy
 msgid "number of messages to replay from history"
 msgstr "每次迭代所使用的消息数量"
 
-#: src/social/gnunet-social.c:1307
+#: src/social/gnunet-social.c:1350
 msgid "key address of place"
 msgstr ""
 
-#: src/social/gnunet-social.c:1311
+#: src/social/gnunet-social.c:1356
 msgid "start message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1315
+#: src/social/gnunet-social.c:1361
 msgid "respond to entry requests by admitting all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1319
+#: src/social/gnunet-social.c:1367
 msgid "end message ID for history replay"
 msgstr ""
 
-#: src/social/gnunet-social.c:1323
+#: src/social/gnunet-social.c:1372
 msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/social/gnunet-social.c:1333
+#: src/social/gnunet-social.c:1382
 msgid ""
 "gnunet-social - Interact with the social service: enter/leave, send/receive "
 "messages, access history and state.\n"
 msgstr ""
 
+#: src/sq/sq.c:50
+#, c-format
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+
+#: src/sq/sq.c:57
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+
+#: src/sq/sq.c:135
+#, fuzzy, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/statistics/gnunet-service-statistics.c:338
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:1083
+#: src/statistics/gnunet-service-statistics.c:1084
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
@@ -6414,35 +6248,35 @@ msgstr "无法连接到 %s:%u：%s\n"
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:383
+#: src/statistics/gnunet-statistics.c:385
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:386
+#: src/statistics/gnunet-statistics.c:390
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:389
+#: src/statistics/gnunet-statistics.c:396
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:392
+#: src/statistics/gnunet-statistics.c:401
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:395
+#: src/statistics/gnunet-statistics.c:406
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:398
+#: src/statistics/gnunet-statistics.c:412
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:401
+#: src/statistics/gnunet-statistics.c:417
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:417
+#: src/statistics/gnunet-statistics.c:433
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -6494,12 +6328,12 @@ msgstr ""
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/testbed/generate-underlay-topology.c:339
-#: src/testbed/gnunet-testbed-profiler.c:281
+#: src/testbed/generate-underlay-topology.c:342
+#: src/testbed/gnunet-testbed-profiler.c:284
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:348
+#: src/testbed/generate-underlay-topology.c:352
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6533,7 +6367,7 @@ msgid ""
 "deployments"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:50
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:46
 #: src/testing/testing.c:288 src/util/gnunet-ecc.c:298
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
@@ -6549,16 +6383,61 @@ msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1141
-#, fuzzy
-msgid "Misconfiguration (can't connect to the ARM service)"
-msgstr "初始化“%s”服务失败。\n"
+#: src/testbed/gnunet-service-testbed_peers.c:1159
+#, c-format
+msgid "%s is stopped"
+msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1183
+#: src/testbed/gnunet-service-testbed_peers.c:1161
+#, c-format
+msgid "%s is starting"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1163
+#, c-format
+msgid "%s is stopping"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1165
+#, c-format
+msgid "%s is starting already"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1167
+#, c-format
+msgid "%s is stopping already"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1169
+#, c-format
+msgid "%s is started already"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1171
+#, c-format
+msgid "%s is stopped already"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1173
+#, fuzzy, c-format
+msgid "%s service is not known to ARM"
+msgstr "服务已删除。\n"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1175
+#, fuzzy, c-format
+msgid "%s service failed to start"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/testbed/gnunet-service-testbed_peers.c:1177
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
+#: src/testbed/gnunet-service-testbed_peers.c:1179
+#, c-format
+msgid "%.s Unknown result code."
+msgstr ""
+
 #: src/testbed/gnunet_testbed_mpi_spawn.c:118
 msgid "Waiting for child to exit.\n"
 msgstr ""
@@ -6568,11 +6447,11 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/testbed/gnunet-testbed-profiler.c:284
+#: src/testbed/gnunet-testbed-profiler.c:290
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:287
+#: src/testbed/gnunet-testbed-profiler.c:295
 msgid ""
 "run profiler in non-interactive mode where upon testbed setup the profiler "
 "does not wait for a keystroke but continues to run until a termination "
@@ -6712,43 +6591,39 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:352
+#: src/testing/gnunet-testing.c:354
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/testing/gnunet-testing.c:354
+#: src/testing/gnunet-testing.c:359
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:356
+#: src/testing/gnunet-testing.c:365
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "打印配置文件中的一个值到标准输出"
 
-#: src/testing/gnunet-testing.c:358
+#: src/testing/gnunet-testing.c:372
 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
 
-#: src/testing/gnunet-testing.c:360
+#: src/testing/gnunet-testing.c:378
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:373
+#: src/testing/gnunet-testing.c:391
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:91
+#: src/testing/list-keys.c:89
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:94
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
-
 #: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
@@ -6759,58 +6634,58 @@ msgstr ""
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1159
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1168
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1178
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1191
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1205
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1217
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:1241
+#: src/testing/testing.c:1242
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1343
+#: src/testing/testing.c:1344
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/testing/testing.c:1644
+#: src/testing/testing.c:1647
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/topology/friends.c:100
+#: src/topology/friends.c:106
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/topology/friends.c:154
+#: src/topology/friends.c:160
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
@@ -6871,7 +6746,7 @@ msgid ""
 msgstr ""
 
 #: src/topology/gnunet-daemon-topology.c:1059
-#: src/transport/plugin_transport_wlan.c:1491
+#: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr ""
 
@@ -6940,185 +6815,185 @@ msgstr ""
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1167
+#: src/transport/gnunet-service-transport_neighbours.c:1168
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1310
-#: src/transport/gnunet-service-transport_neighbours.c:1763
+#: src/transport/gnunet-service-transport_neighbours.c:1311
+#: src/transport/gnunet-service-transport_neighbours.c:1764
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1315
+#: src/transport/gnunet-service-transport_neighbours.c:1316
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1321
+#: src/transport/gnunet-service-transport_neighbours.c:1322
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1381
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1457
+#: src/transport/gnunet-service-transport_neighbours.c:1458
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1493
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1501
+#: src/transport/gnunet-service-transport_neighbours.c:1502
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1511
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1556
+#: src/transport/gnunet-service-transport_neighbours.c:1557
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1565
+#: src/transport/gnunet-service-transport_neighbours.c:1566
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1573
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1582
+#: src/transport/gnunet-service-transport_neighbours.c:1583
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1587
+#: src/transport/gnunet-service-transport_neighbours.c:1588
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1593
+#: src/transport/gnunet-service-transport_neighbours.c:1594
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1660
+#: src/transport/gnunet-service-transport_neighbours.c:1661
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1695
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1709
+#: src/transport/gnunet-service-transport_neighbours.c:1710
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1829
+#: src/transport/gnunet-service-transport_neighbours.c:1830
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1849
+#: src/transport/gnunet-service-transport_neighbours.c:1850
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1889
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "消息尺寸"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1905
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1935
+#: src/transport/gnunet-service-transport_neighbours.c:1936
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2000
+#: src/transport/gnunet-service-transport_neighbours.c:2001
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2054
+#: src/transport/gnunet-service-transport_neighbours.c:2055
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2071
+#: src/transport/gnunet-service-transport_neighbours.c:2072
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2227
+#: src/transport/gnunet-service-transport_neighbours.c:2233
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2232
+#: src/transport/gnunet-service-transport_neighbours.c:2238
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2606
+#: src/transport/gnunet-service-transport_neighbours.c:2620
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3088
+#: src/transport/gnunet-service-transport_neighbours.c:3102
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3096
+#: src/transport/gnunet-service-transport_neighbours.c:3110
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3114
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3128
+#: src/transport/gnunet-service-transport_neighbours.c:3152
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3164
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3175
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3202
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3360
+#: src/transport/gnunet-service-transport_neighbours.c:3374
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3396
+#: src/transport/gnunet-service-transport_neighbours.c:3410
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3484
+#: src/transport/gnunet-service-transport_neighbours.c:3498
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3491
+#: src/transport/gnunet-service-transport_neighbours.c:3505
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3531
+#: src/transport/gnunet-service-transport_neighbours.c:3545
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3538
+#: src/transport/gnunet-service-transport_neighbours.c:3552
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3549
+#: src/transport/gnunet-service-transport_neighbours.c:3563
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3683
+#: src/transport/gnunet-service-transport_neighbours.c:3697
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7232,148 +7107,148 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:418
+#: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:423
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:472
+#: src/transport/gnunet-transport.c:467
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:485
+#: src/transport/gnunet-transport.c:480
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:494
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:532
+#: src/transport/gnunet-transport.c:527
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:566
+#: src/transport/gnunet-transport.c:561
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:592
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
+#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:618
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:652
+#: src/transport/gnunet-transport.c:647
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:682
 #, c-format
 msgid "Received %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:724
+#: src/transport/gnunet-transport.c:719
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:736
+#: src/transport/gnunet-transport.c:731
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1144
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1267
+#: src/transport/gnunet-transport.c:1251
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1280
+#: src/transport/gnunet-transport.c:1264
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1308
+#: src/transport/gnunet-transport.c:1294
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1314
+#: src/transport/gnunet-transport.c:1300
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
-#: src/transport/gnunet-transport.c:1420
+#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355
+#: src/transport/gnunet-transport.c:1408
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1374
+#: src/transport/gnunet-transport.c:1362
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1444
+#: src/transport/gnunet-transport.c:1433
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:1447
+#: src/transport/gnunet-transport.c:1437
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1450
+#: src/transport/gnunet-transport.c:1441
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1453
+#: src/transport/gnunet-transport.c:1445
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1459
+#: src/transport/gnunet-transport.c:1453
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport.c:1457
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1465
-#: src/transport/gnunet-transport-profiler.c:631
+#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport-profiler.c:641
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1468
+#: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
 
@@ -7382,7 +7257,7 @@ msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
 #: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:642
+#: src/transport/gnunet-transport-profiler.c:652
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
@@ -7392,158 +7267,158 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:616
+#: src/transport/gnunet-transport-profiler.c:617
 msgid "send data to peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:619
+#: src/transport/gnunet-transport-profiler.c:621
 msgid "receive data from peer"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:622
+#: src/transport/gnunet-transport-profiler.c:626
 msgid "iterations"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:625
+#: src/transport/gnunet-transport-profiler.c:631
 #, fuzzy
 msgid "number of messages to send"
 msgstr "每次迭代所使用的消息数量"
 
-#: src/transport/gnunet-transport-profiler.c:628
+#: src/transport/gnunet-transport-profiler.c:636
 #, fuzzy
 msgid "message size to use"
 msgstr "消息尺寸"
 
-#: src/transport/plugin_transport_http_client.c:1477
-#: src/transport/plugin_transport_http_server.c:2248
-#: src/transport/plugin_transport_http_server.c:3462
-#: src/transport/plugin_transport_tcp.c:3403
-#: src/transport/plugin_transport_tcp.c:3410
+#: src/transport/plugin_transport_http_client.c:1474
+#: src/transport/plugin_transport_http_server.c:2249
+#: src/transport/plugin_transport_http_server.c:3463
+#: src/transport/plugin_transport_tcp.c:3890
+#: src/transport/plugin_transport_tcp.c:3897
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2118
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2167
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_server.c:3178
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:2184
-#: src/transport/plugin_transport_http_server.c:3247
+#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_server.c:3248
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2218
+#: src/transport/plugin_transport_http_client.c:2215
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1729
+#: src/transport/plugin_transport_http_server.c:1727
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1966
+#: src/transport/plugin_transport_http_server.c:1967
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1974
+#: src/transport/plugin_transport_http_server.c:1975
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2124
+#: src/transport/plugin_transport_http_server.c:2125
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2147
+#: src/transport/plugin_transport_http_server.c:2148
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2274
+#: src/transport/plugin_transport_http_server.c:2275
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2586
+#: src/transport/plugin_transport_http_server.c:2587
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:2752
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2837
-#: src/transport/plugin_transport_udp.c:3613
+#: src/transport/plugin_transport_http_server.c:2838
+#: src/transport/plugin_transport_udp.c:3622
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2943
+#: src/transport/plugin_transport_http_server.c:2944
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2958
+#: src/transport/plugin_transport_http_server.c:2959
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2964
+#: src/transport/plugin_transport_http_server.c:2965
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2975
+#: src/transport/plugin_transport_http_server.c:2976
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http_server.c:2981
+#: src/transport/plugin_transport_http_server.c:2982
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3000
+#: src/transport/plugin_transport_http_server.c:3001
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3035
+#: src/transport/plugin_transport_http_server.c:3036
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3110
+#: src/transport/plugin_transport_http_server.c:3111
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/plugin_transport_http_server.c:3131
+#: src/transport/plugin_transport_http_server.c:3132
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3148
+#: src/transport/plugin_transport_http_server.c:3149
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:3474
+#: src/transport/plugin_transport_http_server.c:3475
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "无法初始化 SQLite：%s。\n"
@@ -7590,164 +7465,164 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1060
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:1547
+#: src/transport/plugin_transport_tcp.c:2873
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1243
-#: src/transport/plugin_transport_tcp.c:1467
-#: src/transport/plugin_transport_tcp.c:2650
-#: src/transport/plugin_transport_tcp.c:3526
+#: src/transport/plugin_transport_tcp.c:1730
+#: src/transport/plugin_transport_tcp.c:1954
+#: src/transport/plugin_transport_tcp.c:3137
+#: src/transport/plugin_transport_tcp.c:4013
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1285
-#: src/transport/plugin_transport_tcp.c:1449
-#: src/transport/plugin_transport_tcp.c:1573
-#: src/transport/plugin_transport_tcp.c:1646
-#: src/transport/plugin_transport_tcp.c:1746
-#: src/transport/plugin_transport_tcp.c:1771
+#: src/transport/plugin_transport_tcp.c:1772
+#: src/transport/plugin_transport_tcp.c:1936
+#: src/transport/plugin_transport_tcp.c:2060
+#: src/transport/plugin_transport_tcp.c:2133
+#: src/transport/plugin_transport_tcp.c:2233
+#: src/transport/plugin_transport_tcp.c:2258
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1288
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1576
+#: src/transport/plugin_transport_tcp.c:2063
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1650
+#: src/transport/plugin_transport_tcp.c:2137
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2048
+#: src/transport/plugin_transport_tcp.c:2535
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2224
+#: src/transport/plugin_transport_tcp.c:2711
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2716
+#: src/transport/plugin_transport_tcp.c:3203
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2921
+#: src/transport/plugin_transport_tcp.c:3408
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2972
-#: src/transport/plugin_transport_tcp.c:3030
+#: src/transport/plugin_transport_tcp.c:3459
+#: src/transport/plugin_transport_tcp.c:3517
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:2976
+#: src/transport/plugin_transport_tcp.c:3463
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:2982
+#: src/transport/plugin_transport_tcp.c:3469
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2984
+#: src/transport/plugin_transport_tcp.c:3471
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3024
+#: src/transport/plugin_transport_tcp.c:3511
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3034
+#: src/transport/plugin_transport_tcp.c:3521
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3353
+#: src/transport/plugin_transport_tcp.c:3840
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:3514
+#: src/transport/plugin_transport_tcp.c:4001
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_tcp.c:4005
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_tcp.c:4009
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:168
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:545
+#: src/transport/plugin_transport_udp_broadcasting.c:548
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:566
+#: src/transport/plugin_transport_udp_broadcasting.c:565
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3357
+#: src/transport/plugin_transport_udp.c:3366
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3371
+#: src/transport/plugin_transport_udp.c:3380
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3689
-#: src/transport/plugin_transport_udp.c:3788
+#: src/transport/plugin_transport_udp.c:3698
+#: src/transport/plugin_transport_udp.c:3797
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:3707
+#: src/transport/plugin_transport_udp.c:3716
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3798
+#: src/transport/plugin_transport_udp.c:3807
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:3869
-#: src/transport/plugin_transport_udp.c:3883
+#: src/transport/plugin_transport_udp.c:3878
+#: src/transport/plugin_transport_udp.c:3892
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3915
+#: src/transport/plugin_transport_udp.c:3924
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
-#: src/transport/plugin_transport_udp.c:3942
+#: src/transport/plugin_transport_udp.c:3951
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
-#: src/transport/plugin_transport_udp.c:4008
+#: src/transport/plugin_transport_udp.c:4015
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "发送消息失败。\n"
@@ -7767,63 +7642,189 @@ msgstr "发送消息失败。\n"
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:768
 msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:762
+#: src/transport/plugin_transport_wlan.c:788
 msgid "# Messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:803
-#: src/transport/plugin_transport_wlan.c:888
+#: src/transport/plugin_transport_wlan.c:829
+#: src/transport/plugin_transport_wlan.c:914
 msgid "# Sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1009
+#: src/transport/plugin_transport_wlan.c:1035
 #, fuzzy
 msgid "# message fragments sent"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:1038
+#: src/transport/plugin_transport_wlan.c:1064
 msgid "# messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1167
-#: src/transport/plugin_transport_wlan.c:1258
-#: src/transport/plugin_transport_wlan.c:2280
+#: src/transport/plugin_transport_wlan.c:1193
+#: src/transport/plugin_transport_wlan.c:1284
+#: src/transport/plugin_transport_wlan.c:2305
 msgid "# MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1541
+#: src/transport/plugin_transport_wlan.c:1567
 msgid "# ACKs received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1610
+#: src/transport/plugin_transport_wlan.c:1636
 msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1714
+#: src/transport/plugin_transport_wlan.c:1740
 msgid "# HELLO beacons sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1831
+#: src/transport/plugin_transport_wlan.c:1856
 msgid "# DATA messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1865
+#: src/transport/plugin_transport_wlan.c:1890
 msgid "# DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2255
+#: src/transport/plugin_transport_wlan.c:2280
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2277
+#: src/transport/plugin_transport_wlan.c:2302
 msgid "# sessions allocated"
 msgstr ""
 
+#: src/transport/tcp_connection_legacy.c:452
+#, fuzzy, c-format
+msgid "Access denied to `%s'\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/transport/tcp_connection_legacy.c:469
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
+msgstr ""
+
+#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121
+#, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr ""
+
+#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#: src/transport/tcp_server_legacy.c:890
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2337
+#, c-format
+msgid "Unknown address family %d\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:346
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:953
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1161
+#, fuzzy, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/transport/tcp_service_legacy.c:1202
+#, c-format
+msgid "Service `%s' runs at %s\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1501
+msgid "Service process failed to initialize\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1505
+msgid "Service process could not initialize server function\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1509
+msgid "Service process failed to report status\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/util/service.c:1379
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1381
+msgid "No such user"
+msgstr "无此用户"
+
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1400
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "无法更改用户/组为“%s”：%s\n"
+
+#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1728
+msgid "do daemonize (detach from terminal)"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:244
+#: src/util/service.c:1791
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:261
+#: src/util/service.c:1802
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:256
+#: src/util/service.c:1808
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
 #: src/tun/regex.c:134
 #, c-format
 msgid "Bad mask: %d\n"
@@ -7858,7 +7859,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:868
+#: src/util/client.c:882
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -7949,16 +7950,6 @@ msgid ""
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:441
-#, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/util/connection.c:458
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr ""
-
 #: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
@@ -8031,16 +8022,11 @@ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/disk.c:1245
+#: src/util/disk.c:1247
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
-#: src/util/disk.c:1486 src/util/service.c:1322 src/util/service_new.c:1379
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
 #: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -8096,27 +8082,67 @@ msgstr "%s：选项“-W %s”有歧义\n"
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s：选项“-W %s” 不允许有参数\n"
 
-#: src/util/getopt.c:933
+#: src/util/getopt.c:947
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "请使用 --help 获取选项列表。\n"
 
-#: src/util/getopt_helpers.c:91
+#: src/util/getopt.c:962
+#, fuzzy, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/util/getopt_helpers.c:68
+msgid "print the version number"
+msgstr ""
+
+#: src/util/getopt_helpers.c:111
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 
-#: src/util/getopt_helpers.c:278 src/util/getopt_helpers.c:336
+#: src/util/getopt_helpers.c:199
+msgid "print this help"
+msgstr ""
+
+#: src/util/getopt_helpers.c:274
+msgid "be verbose"
+msgstr ""
+
+#: src/util/getopt_helpers.c:410
+msgid "configure logging to use LOGLEVEL"
+msgstr ""
+
+#: src/util/getopt_helpers.c:488
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+
+#: src/util/getopt_helpers.c:510
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "更改配置文件中的一个值"
+
+#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:308
+#: src/util/getopt_helpers.c:610
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
+#: src/util/getopt_helpers.c:675
+#, fuzzy, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/util/getopt_helpers.c:823
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
+
 #: src/util/gnunet-config.c:124
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
@@ -8137,32 +8163,32 @@ msgstr ""
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:228
+#: src/util/gnunet-config.c:229
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:231
+#: src/util/gnunet-config.c:234
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:239
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:237
+#: src/util/gnunet-config.c:244
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:240
+#: src/util/gnunet-config.c:248
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "立即保存配置？"
 
-#: src/util/gnunet-config.c:243
+#: src/util/gnunet-config.c:252
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:265
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
@@ -8222,36 +8248,36 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:414
+#: src/util/gnunet-ecc.c:416
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:417
+#: src/util/gnunet-ecc.c:421
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:420
+#: src/util/gnunet-ecc.c:426
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:423
+#: src/util/gnunet-ecc.c:430
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:426
+#: src/util/gnunet-ecc.c:434
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:449
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-resolver.c:149
+#: src/util/gnunet-resolver.c:150
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:160
+#: src/util/gnunet-resolver.c:161
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
@@ -8260,23 +8286,23 @@ msgstr ""
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:314
+#: src/util/gnunet-scrypt.c:317
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:317
+#: src/util/gnunet-scrypt.c:322
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:320
+#: src/util/gnunet-scrypt.c:327
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:323
+#: src/util/gnunet-scrypt.c:332
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:336
+#: src/util/gnunet-scrypt.c:345
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "更改配置文件中的一个值"
@@ -8316,17 +8342,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:331
+#: src/util/helper.c:335
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:382
+#: src/util/helper.c:386
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/helper.c:601
+#: src/util/helper.c:606
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
@@ -8336,7 +8362,7 @@ msgstr "创建用户出错"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1735 src/util/network.c:1911
+#: src/util/network.c:1793 src/util/network.c:1969
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8349,17 +8375,22 @@ msgid ""
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:861
+#: src/util/os_installation.c:873
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/os_installation.c:921
+#: src/util/os_installation.c:913
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+
+#: src/util/os_installation.c:944
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/os_installation.c:931
+#: src/util/os_installation.c:954
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8384,21 +8415,6 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:244 src/util/service.c:1456 src/util/service_new.c:1809
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/program.c:256 src/util/service.c:1471 src/util/service_new.c:1826
-#, fuzzy, c-format
-msgid "Could not access configuration file `%s'\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/util/program.c:261 src/util/service.c:1466 src/util/service_new.c:1820
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "解析配置文件“%s”失败\n"
-
 #: src/util/resolver_api.c:204
 #, c-format
 msgid ""
@@ -8432,103 +8448,12 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/server.c:478 src/util/service_new.c:1111
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/util/server.c:488 src/util/service_new.c:1121
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr ""
-
-#: src/util/server.c:494 src/util/service_new.c:1127
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/util/server.c:894
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"`GNUNET_SERVER_receive_done' after %s\n"
-msgstr ""
-
-#: src/util/service.c:347 src/util/service_new.c:2344
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr ""
-
-#: src/util/service.c:354
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr ""
-
-#: src/util/service.c:410 src/util/service_new.c:439
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:448 src/util/service_new.c:482
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:912 src/util/service_new.c:1042
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
-msgstr ""
-
-#: src/util/service.c:961 src/util/service.c:979 src/util/service_new.c:1194
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-
-#: src/util/service.c:1004 src/util/service_new.c:1226
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr ""
-
-#: src/util/service.c:1170
-#, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/util/service.c:1211
-#, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr ""
-
-#: src/util/service.c:1260 src/util/service_new.c:1501
-msgid "Service process failed to initialize\n"
-msgstr ""
-
-#: src/util/service.c:1264 src/util/service_new.c:1505
-msgid "Service process could not initialize server function\n"
-msgstr ""
-
-#: src/util/service.c:1268 src/util/service_new.c:1509
-msgid "Service process failed to report status\n"
-msgstr ""
-
-#: src/util/service.c:1323 src/util/service_new.c:1381
-msgid "No such user"
-msgstr "无此用户"
-
-#: src/util/service.c:1336 src/util/service_new.c:1400
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "无法更改用户/组为“%s”：%s\n"
-
-#: src/util/service.c:1406 src/util/service_new.c:1737
-msgid "do daemonize (detach from terminal)"
-msgstr ""
-
-#: src/util/service_new.c:1306
+#: src/util/service.c:1306
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/service_new.c:2093
+#: src/util/service.c:2082
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8540,237 +8465,233 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/socks.c:586
+#: src/util/socks.c:597
 #, c-format
 msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/socks.c:599
+#: src/util/socks.c:616
 #, c-format
-msgid "Attempting to proxy service `%s' to invalid port %d or hostname `%s'.\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:146
+#: src/util/strings.c:176
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:441
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:568
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
-#: src/util/strings.c:672
+#: src/util/strings.c:702
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:676
+#: src/util/strings.c:706
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:678
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:684
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:690
+#: src/util/strings.c:720
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:696
+#: src/util/strings.c:726
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:702
+#: src/util/strings.c:732
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:709
+#: src/util/strings.c:739
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:711
+#: src/util/strings.c:741
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:740
+#: src/util/strings.c:770
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1239
+#: src/util/strings.c:1269
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1247
+#: src/util/strings.c:1277
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1253
+#: src/util/strings.c:1283
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1260
+#: src/util/strings.c:1290
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1269
+#: src/util/strings.c:1299
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/util/strings.c:1541 src/util/strings.c:1557
+#: src/util/strings.c:1571 src/util/strings.c:1587
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1566
+#: src/util/strings.c:1596
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
-#: src/util/strings.c:1749
+#: src/util/strings.c:1679 src/util/strings.c:1710 src/util/strings.c:1758
+#: src/util/strings.c:1779
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1706
+#: src/util/strings.c:1736
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/strings.c:1758
+#: src/util/strings.c:1788
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1810
+#: src/util/strings.c:1840
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/strings.c:1860
+#: src/util/strings.c:1890
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/strings.c:1891
+#: src/util/strings.c:1921
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1125
+#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807
 msgid "# Active channels"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:629
-msgid "# Bytes given to cadet for transmission"
+#: src/vpn/gnunet-service-vpn.c:599
+msgid "# Messages dropped in cadet queue (overflow)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:753
+msgid "# ICMP packets received from cadet"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1096
+msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:667
-msgid "# Bytes dropped in cadet queue (overflow)"
+#: src/vpn/gnunet-service-vpn.c:1255
+msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:783
+#: src/vpn/gnunet-service-vpn.c:1467
 #, fuzzy
 msgid "# Cadet channels created"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/vpn/gnunet-service-vpn.c:1005
+#: src/vpn/gnunet-service-vpn.c:1687
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1144
+#: src/vpn/gnunet-service-vpn.c:1826
 msgid "# Packets dropped (channel not yet online)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1352
+#: src/vpn/gnunet-service-vpn.c:2006
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1373
+#: src/vpn/gnunet-service-vpn.c:2027
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1579
+#: src/vpn/gnunet-service-vpn.c:2232
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1648
+#: src/vpn/gnunet-service-vpn.c:2265 src/vpn/gnunet-service-vpn.c:2301
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1658
+#: src/vpn/gnunet-service-vpn.c:2311
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1672
+#: src/vpn/gnunet-service-vpn.c:2325
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1754
-msgid "# ICMP packets received from cadet"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2093
-msgid "# UDP packets received from cadet"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2248
-msgid "# TCP packets received from cadet"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2399
+#: src/vpn/gnunet-service-vpn.c:2364
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2454
+#: src/vpn/gnunet-service-vpn.c:2419
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2496 src/vpn/gnunet-service-vpn.c:2718
+#: src/vpn/gnunet-service-vpn.c:2461 src/vpn/gnunet-service-vpn.c:2683
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2767
+#: src/vpn/gnunet-service-vpn.c:2732
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3059
+#: src/vpn/gnunet-service-vpn.c:2995
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3083
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3091
+#: src/vpn/gnunet-service-vpn.c:3027
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3104
+#: src/vpn/gnunet-service-vpn.c:3040
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3117
+#: src/vpn/gnunet-service-vpn.c:3053
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3127
+#: src/vpn/gnunet-service-vpn.c:3063
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -8804,42 +8725,47 @@ msgstr "“%s”不可用。\n"
 msgid "`%s' is not a valid IP address.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-vpn.c:291
+#: src/vpn/gnunet-vpn.c:292
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:294
+#: src/vpn/gnunet-vpn.c:297
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:297
+#: src/vpn/gnunet-vpn.c:303
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:300
+#: src/vpn/gnunet-vpn.c:309
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:303
+#: src/vpn/gnunet-vpn.c:315
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:306
+#: src/vpn/gnunet-vpn.c:321
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:309
+#: src/vpn/gnunet-vpn.c:326
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:312
+#: src/vpn/gnunet-vpn.c:331
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:324
+#: src/vpn/gnunet-vpn.c:344
 msgid "Setup tunnels via VPN."
 msgstr ""
 
+#: src/zonemaster/gnunet-service-zonemaster.c:705
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "初始化“%s”服务失败。\n"
+
 #: src/include/gnunet_common.h:674 src/include/gnunet_common.h:681
 #: src/include/gnunet_common.h:691 src/include/gnunet_common.h:699
 #, c-format
@@ -8857,6 +8783,18 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Misconfiguration (can not connect to the ARM service)"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#~ msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
+
+#, fuzzy
+#~ msgid "Misconfiguration (can't connect to the ARM service)"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
 #~ msgid "Could not connect to cadet service\n"
 #~ msgstr "无法连接到 %s:%u：%s\n"
 
@@ -9209,10 +9147,6 @@ msgstr ""
 #~ msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy
-#~ msgid "Failed to close statement %p: %d\n"
-#~ msgstr "解析配置文件“%s”失败\n"
-
-#, fuzzy
 #~ msgid "Failed to initialize solver!\n"
 #~ msgstr "无法初始化 SQLite：%s。\n"
 
@@ -9368,10 +9302,6 @@ msgstr ""
 #~ msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy
-#~ msgid "Failed to parse HELLO in file `%s': %s %u \n"
-#~ msgstr "解析配置文件“%s”失败\n"
-
-#, fuzzy
 #~ msgid "Internal error %d\n"
 #~ msgstr "未知错误。\n"
 
@@ -9771,10 +9701,6 @@ msgstr ""
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
-#, fuzzy
-#~ msgid "Service `%s' stopped\n"
-#~ msgstr "服务已删除。\n"
-
 #~ msgid "KiB"
 #~ msgstr "KiB"