add assertion

[oweals/gnunet.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f6bd6784120cbcef49ad3b06c30c1a6e071c560a..11632aed0288ca70ff63005f41eab7839e1def1f 100644 (file)
--- 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: 2014-02-03 20:43+0100\n"
+"POT-Creation-Date: 2018-01-02 02:33+0100\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"
@@ -16,901 +16,1022 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:337
-msgid "Client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/arm_monitor_api.c:321
-msgid ""
-"Monitoring client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:156
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:162
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:218
-#, fuzzy
-msgid "Misconfiguration (can not connect to the ARM service)"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
+#: 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:222 src/testbed/gnunet-service-testbed_peers.c:1019
-msgid "ARM API is busy"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:224
-msgid "Request does not fit into a message"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
-msgid "Request timed out"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
+#: 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:244 src/testbed/gnunet-service-testbed_peers.c:1041
-#, c-format
-msgid "%s is stopped"
-msgstr ""
+#: src/arm/gnunet-arm.c:242
+#, fuzzy
+msgid "is stopped"
+msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
-#, c-format
-msgid "%s is starting"
+#: src/arm/gnunet-arm.c:244
+msgid "is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
-#, c-format
-msgid "%s is stopping"
+#: src/arm/gnunet-arm.c:246
+msgid "is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
-#, c-format
-msgid "%s is starting already"
+#: src/arm/gnunet-arm.c:248
+msgid "is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
-#, c-format
-msgid "%s is stopping already"
+#: src/arm/gnunet-arm.c:250
+msgid "is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
-#, c-format
-msgid "%s is started already"
+#: src/arm/gnunet-arm.c:252
+msgid "is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
-#, c-format
-msgid "%s is stopped already"
+#: src/arm/gnunet-arm.c:254
+msgid "is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
-#, 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:260 src/testbed/gnunet-service-testbed_peers.c:1057
-#, 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:262
-#, 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:264 src/testbed/gnunet-service-testbed_peers.c:1061
-#, 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:297
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
+#: 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:369
+#: 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:379
+#: 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:421
+#: src/arm/gnunet-arm.c:415
 #, fuzzy, c-format
-msgid "Failed to send a request to start the `%s' service: %%s\n"
+msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:431
+#: 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:468
+#: 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:479
+#: 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:517
+#: 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:525
+#: 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:530
+#: src/arm/gnunet-arm.c:528
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:612
+#: src/arm/gnunet-arm.c:616
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:648
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:646
+#: src/arm/gnunet-arm.c:651
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/arm/gnunet-arm.c:649
+#: src/arm/gnunet-arm.c:654
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:660
+#: 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:724
+#: src/arm/gnunet-arm.c:769
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:775
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:728
+#: src/arm/gnunet-arm.c:781
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:786
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:733
+#: src/arm/gnunet-arm.c:791
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:736
+#: src/arm/gnunet-arm.c:795
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:800
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:805
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:744
-#, fuzzy
-msgid "timeout in MSECS milliseconds for completing current operation"
-msgstr "等待一次迭代完成的时间(毫秒)"
+#: src/arm/gnunet-arm.c:811
+msgid "exit with error status if operation does not finish after DELAY"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:746
+#: src/arm/gnunet-arm.c:816
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:748
+#: src/arm/gnunet-arm.c:821
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:750
+#: src/arm/gnunet-arm.c:826
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:761
+#: src/arm/gnunet-arm.c:839
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:266
-msgid "Could not send status result to client\n"
+#: 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: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:302
-#, fuzzy
-msgid "Could not send list result to client\n"
+#: 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:505
+#: 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:1180
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510
+#: 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: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: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:2684
+#: 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:2702
+#: 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:529
+#: 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:540
+#: src/arm/gnunet-service-arm.c:944
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:639
+#: 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:661
+#: 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:690
+#: 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:826
+#: src/arm/gnunet-service-arm.c:1310
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1095
+#: src/arm/gnunet-service-arm.c:1612
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1188
+#: src/arm/gnunet-service-arm.c:1772
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1193
+#: src/arm/gnunet-service-arm.c:1777
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1198
+#: src/arm/gnunet-service-arm.c:1782
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1204
+#: 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:1226
+#: 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:1241
+#: src/arm/gnunet-service-arm.c:1830
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1495
-#, fuzzy, c-format
-msgid "Starting default services `%s'\n"
-msgstr "卸载 GNUnet 服务"
+#: src/arm/mockup-service.c:42
+msgid "Initiating shutdown as requested by client.\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1506
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
 #, c-format
-msgid "Default service `%s' not configured correctly!\n"
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1519
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
 msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41
-msgid "Initiating shutdown as requested by client.\n"
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:468
-#, c-format
-msgid "Received %s message\n"
+#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
+msgid "solver to use"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:511
-#, c-format
-msgid "Received last message for %s \n"
+#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
+msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1980
-#: src/ats/gnunet-service-ats_addresses.c:2024
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
+#: src/ats/gnunet-ats-solver-eval.c:3306
+#, fuzzy
+msgid "print logging"
+msgstr "未知的命令“%s”。\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1987
-#, c-format
-msgid "Outbound quota configure for network `%s' is %llu\n"
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1995
+#: src/ats/gnunet-service-ats_plugins.c:304
 #, c-format
 msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2031
+#: src/ats/gnunet-service-ats_plugins.c:314
 #, c-format
-msgid "Inbound quota configured for network `%s' is %llu\n"
+msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2039
+#: src/ats/gnunet-service-ats_plugins.c:359
 #, c-format
 msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_addresses.c:2217
-#, c-format
-msgid "Initializing solver `%s '`%s'\n"
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2220
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:2243
-#, fuzzy
-msgid "Failed to initialize solver!\n"
-msgstr "无法初始化 SQLite：%s。\n"
-
-#: src/ats/plugin_ats_mlp.c:892
+#: src/ats/plugin_ats_mlp.c:1274
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1329
+#: src/ats/plugin_ats_mlp.c:1869
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1376
+#: src/ats/plugin_ats_mlp.c:1913
 #, c-format
-msgid "Updating address property `%s' for peer `%s' %p not added before\n"
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2122
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/ats/plugin_ats_mlp.c:2670
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2131
+#: src/ats/plugin_ats_mlp.c:2679
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2142
+#: src/ats/plugin_ats_mlp.c:2689
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2150
+#: src/ats/plugin_ats_mlp.c:2698
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2161
-#, c-format
-msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1510
-#, fuzzy, c-format
-msgid "Invalid network type `%u' `%s': Disconnect!\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
-
-#: src/ats-tests/ats-testing.c:71
-msgid "Benchmarking done\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:104
+#: src/ats/plugin_ats_proportional.c:1164
 #, fuzzy, c-format
-msgid "Failed to connect peer 0 and %u\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Invalid %s configuration %f\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tests/ats-testing.c:412
+#: src/ats-tests/ats-testing.c:422
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:418
+#: src/ats-tests/ats-testing.c:429
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tests/ats-testing.c:449
-msgid "Connecting peers on CORE level\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:460
-#, c-format
-msgid "Connecting master [%u] with slave [%u]\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:469
-#, fuzzy, c-format
-msgid "Could not connect master [%u] and slave [%u]\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/ats-tests/ats-testing.c:489 src/ats-tests/ats-testing.c:670
-#, fuzzy
-msgid "Initialization failed, shutdown\n"
-msgstr "插件机构初始化失败：%s！\n"
-
-#: src/ats-tests/ats-testing-log.c:840
+#: src/ats-tests/ats-testing-log.c:837
 msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:889
+#: src/ats-tests/ats-testing-log.c:892
 #, fuzzy, c-format
 msgid "Start logging `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/ats-tests/gnunet-ats-sim.c:86
+#: 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. "
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:145
+#: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:147
+#: src/ats-tool/gnunet-ats.c:311
 #, c-format
-msgid "ATS returned results for %u addresses\n"
+msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:205
+#: src/ats-tool/gnunet-ats.c:395
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:333
+#: src/ats-tool/gnunet-ats.c:402
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:402
+msgid "inactive "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:512
 #, c-format
-msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
+msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
-#: src/transport/gnunet-transport.c:1134
-#, fuzzy, c-format
-msgid "Service `%s' is not running\n"
-msgstr "服务已删除。\n"
+#: src/ats-tool/gnunet-ats.c:705
+#, c-format
+msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
+msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:1143
+#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tool/gnunet-ats.c:372
+#: src/ats-tool/gnunet-ats.c:773
 #, c-format
-msgid "Please select one operation : %s or %s or %s or %s or %s\n"
+msgid "Please select one operation: %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:407
-#: src/ats-tool/gnunet-ats.c:424 src/ats-tool/gnunet-ats.c:462
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820
+#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896
+#, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:397 src/ats-tool/gnunet-ats.c:414
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832
+#, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:432
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:862
+#, fuzzy
 msgid "No preference type given!\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:437
-#, c-format
+#: src/ats-tool/gnunet-ats.c:869
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:455
+#: src/ats-tool/gnunet-ats.c:887
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:513
+#: src/ats-tool/gnunet-ats.c:950
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:516
+#: src/ats-tool/gnunet-ats.c:954
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:519
+#: src/ats-tool/gnunet-ats.c:960
+#, fuzzy
+msgid "connect to PEER"
+msgstr "初始化“%s”服务失败。\n"
+
+#: 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:522
+#: src/ats-tool/gnunet-ats.c:969
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:525
+#: 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:528
+#: src/ats-tool/gnunet-ats.c:979
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:531
+#: src/ats-tool/gnunet-ats.c:984
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:534
+#: src/ats-tool/gnunet-ats.c:990
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:537
+#: src/ats-tool/gnunet-ats.c:996
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:540
+#: src/ats-tool/gnunet-ats.c:1001
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:549
+#: src/ats-tool/gnunet-ats.c:1011
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/consensus/gnunet-consensus-profiler.c:420
-#: src/secretsharing/gnunet-secretsharing-profiler.c:514
+#: src/auction/gnunet-auction-create.c:163
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:169
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:175
+msgid "max duration per round"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:181
+msgid "duration until auction starts"
+msgstr ""
+
+#: 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:193
+msgid "public auction outcome"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:198
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: 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:562 src/template/gnunet-template.c:76
+msgid "help text"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:664
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/cadet/gnunet-cadet.c:703
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/cadet/gnunet-cadet.c:776
+msgid "Extra arguments are not applicable in combination with this option.\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:867
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/cadet/gnunet-cadet.c:904
+msgid "No action requested\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:929
+#, fuzzy
+msgid "Provide information about a particular connection"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cadet/gnunet-cadet.c:934
+msgid "Activate echo mode"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:939
+msgid "Dump debug information to STDERR"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:945
+msgid "Listen for connections using a shared secret among sender and recipient"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:952
+#, fuzzy
+msgid "Provide information about a patricular peer"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cadet/gnunet-cadet.c:958
+#, fuzzy
+msgid "Provide information about all peers"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cadet/gnunet-cadet.c:964
+#, fuzzy
+msgid "Provide information about a particular tunnel"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cadet/gnunet-cadet.c:970
+#, fuzzy
+msgid "Provide information about all tunnels"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: 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:423
-msgid "how many peers receive one value?"
+#: 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:426
-#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
-#: src/set/gnunet-set-profiler.c:292
+#: 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:429
+#: src/consensus/gnunet-consensus-profiler.c:541
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:432
-#: src/secretsharing/gnunet-secretsharing-profiler.c:526
+#: src/consensus/gnunet-consensus-profiler.c:548
+msgid "delay until consensus starts"
+msgstr ""
+
+#: 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: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 ""
 
-#: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:470
+#: src/conversation/conversation_api.c:513
+#: src/conversation/conversation_api_call.c:490
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/conversation/gnunet-conversation.c:269
 #, c-format
-msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
+msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:286
+#: src/conversation/gnunet-conversation.c:294
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/conversation/gnunet-conversation.c:329
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:324
+#: src/conversation/gnunet-conversation.c:334
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:342
+#: src/conversation/gnunet-conversation.c:352
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/conversation/gnunet-conversation.c:367
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/conversation/gnunet-conversation.c:379
 #, c-format
-msgid ""
-"Phone active on line %u.  Type `/help' for a list of available commands\n"
+msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:390
+#: src/conversation/gnunet-conversation.c:401
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:397
+#: src/conversation/gnunet-conversation.c:408
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/conversation/gnunet-conversation.c:415
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/conversation/gnunet-conversation.c:411
-msgid "Call terminated\n"
+#: src/conversation/gnunet-conversation.c:423
+#, c-format
+msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:417
+#: src/conversation/gnunet-conversation.c:432
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:438
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:428
+#: src/conversation/gnunet-conversation.c:443
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:512
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/conversation/gnunet-conversation.c:511
-#: src/conversation/gnunet-conversation.c:525
+#: src/conversation/gnunet-conversation.c:528
+#: src/conversation/gnunet-conversation.c:542
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:518
-#: src/conversation/gnunet-conversation.c:575
+#: src/conversation/gnunet-conversation.c:535
+#: src/conversation/gnunet-conversation.c:592
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:533
-#: src/conversation/gnunet-conversation.c:588
+#: src/conversation/gnunet-conversation.c:550
+#: src/conversation/gnunet-conversation.c:605
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:544
+#: src/conversation/gnunet-conversation.c:560
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:599
+#: src/conversation/gnunet-conversation.c:616
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:633
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:647
+#: src/conversation/gnunet-conversation.c:663
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:670
+#: src/conversation/gnunet-conversation.c:686
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:675
+#: src/conversation/gnunet-conversation.c:691
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:681
-#: src/conversation/gnunet-conversation.c:705
+#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:721
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:702
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:711
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/conversation/gnunet-conversation.c:700
+#: src/conversation/gnunet-conversation.c:716
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:719
+#: src/conversation/gnunet-conversation.c:735
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:741
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/conversation/gnunet-conversation.c:753
-#: src/conversation/gnunet-conversation.c:768
+#: src/conversation/gnunet-conversation.c:769
+#: src/conversation/gnunet-conversation.c:784
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:801
 #: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:840
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:849
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:850
+#: src/conversation/gnunet-conversation.c:866
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:893
+#: src/conversation/gnunet-conversation.c:909
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:910
+#: src/conversation/gnunet-conversation.c:926
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:937
+#: src/conversation/gnunet-conversation.c:952
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:939
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:943
+#: src/conversation/gnunet-conversation.c:958
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
+#: src/conversation/gnunet-conversation.c:960
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:947
+#: src/conversation/gnunet-conversation.c:962
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:949
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1151
+#: src/conversation/gnunet-conversation.c:1172
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1164
+#: src/conversation/gnunet-conversation.c:1185
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/conversation/gnunet-conversation.c:1220
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1244
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1249
+#: 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:1252
+#: src/conversation/gnunet-conversation.c:1279
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1306
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:121
+#: src/conversation/gnunet-conversation-test.c:119
 #, c-format
 msgid ""
 "\n"
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:149
+#: src/conversation/gnunet-conversation-test.c:145
 #, c-format
 msgid ""
 "\n"
@@ -918,86 +1039,81 @@ msgid ""
 "settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:215
+#: src/conversation/gnunet-conversation-test.c:210
 #, c-format
 msgid ""
 "We will now be recording you for %s. After that time, the recording will be "
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:248
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
-#: src/template/gnunet-template.c:70
-msgid "help text"
+#: src/conversation/gnunet_gst.c:622
+#: src/conversation/gnunet-helper-audio-playback-gst.c:361
+#, c-format
+msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:305
+#: src/conversation/gnunet-helper-audio-playback.c:320
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:587
+#: src/conversation/gnunet-helper-audio-playback.c:612
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:612
+#: src/conversation/gnunet-helper-audio-playback.c:637
 #: src/conversation/gnunet-helper-audio-record.c:545
 msgid "Connection established.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:617
+#: src/conversation/gnunet-helper-audio-playback.c:642
 #: 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:631
+#: src/conversation/gnunet-helper-audio-playback.c:656
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:644
+#: src/conversation/gnunet-helper-audio-playback.c:669
 #: 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:665
+#: src/conversation/gnunet-helper-audio-playback.c:690
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:671
+#: src/conversation/gnunet-helper-audio-playback.c:696
 #: src/conversation/gnunet-helper-audio-record.c:605
 msgid "pa_mainloop_new() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:685
+#: src/conversation/gnunet-helper-audio-playback.c:710
 #: src/conversation/gnunet-helper-audio-record.c:620
 msgid "pa_context_new() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:717
 #: 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:698
+#: src/conversation/gnunet-helper-audio-playback.c:723
 #: src/conversation/gnunet-helper-audio-record.c:632
 msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:768
+#: src/conversation/gnunet-helper-audio-playback.c:795
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:325
-#, c-format
-msgid "Read error from STDIN: %d %s\n"
-msgstr ""
-
 #: src/conversation/gnunet-helper-audio-record.c:344
 #, fuzzy, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
@@ -1054,30 +1170,26 @@ msgstr "“%s”说：%s\n"
 
 #: src/conversation/gnunet-helper-audio-record.c:721
 #, fuzzy, c-format
-msgid "Failed to allocate %d bytes for second packet\n"
+msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-service-conversation.c:841
-msgid "Mesh audio channel not ready; audio data dropped\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:932
-#, c-format
-msgid ""
-"No available phone for incoming call on line %u, sending HANG_UP signal\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:1338
+#: src/conversation/gnunet-service-conversation.c:1276
 #, fuzzy, c-format
-msgid "Received incoming channel on port %u\n"
-msgstr "“%s”已连接到“%s”。\n"
+msgid "Could not open line, port %s already in use!\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
 #: src/conversation/microphone.c:121
 #, fuzzy
 msgid "Could not start record audio helper\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/conversation/plugin_gnsrecord_conversation.c:116
+#: src/conversation/plugin_gnsrecord_conversation.c:71
+#, c-format
+msgid "PHONE version %u not supported\n"
+msgstr ""
+
+#: src/conversation/plugin_gnsrecord_conversation.c:133
+#: src/conversation/plugin_gnsrecord_conversation.c:147
 #, fuzzy, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -1086,1699 +1198,1570 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:767
-msgid "Client was disconnected from core service, trying to reconnect.\n"
+#: src/core/gnunet-core.c:90
+#, fuzzy
+msgid "fresh connection"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/core/gnunet-core.c:80
-#, c-format
-msgid "Peer `%s'\n"
+#: src/core/gnunet-core.c:93
+msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:824 src/transport/gnunet-transport.c:844
-#, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+#: src/core/gnunet-core.c:96
+msgid "key received"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:825
+#: src/core/gnunet-core.c:99
 #, fuzzy
-msgid "Connected to"
-msgstr "“%s”已连接到“%s”。\n"
+msgid "connection established"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/core/gnunet-core.c:102
+msgid "rekeying"
+msgstr ""
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:845
+#: src/core/gnunet-core.c:105
 #, fuzzy
-msgid "Disconnected from"
+msgid "disconnected"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:694
+#: src/core/gnunet-core.c:112
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/core/gnunet-core.c:115
+#, fuzzy
+msgid "unknown state"
+msgstr "未知错误"
+
+#: src/core/gnunet-core.c:120
+#, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
+msgstr ""
+
+#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1340
+#: src/core/gnunet-core.c:155
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: 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:212
+#: src/core/gnunet-core.c:186
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:105
-#, fuzzy
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr "立即保存配置？"
+#: src/core/gnunet-service-core.c:347
+msgid "# send requests dropped (disconnected)"
+msgstr ""
 
-#: src/core/gnunet-service-core.c:126
-#, c-format
-msgid "Core service of `%4s' ready.\n"
+#: src/core/gnunet-service-core.c:371
+msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:370
-msgid "# send requests dropped (disconnected)"
+#: src/core/gnunet-service-core.c:443
+#, c-format
+msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:480
+#: src/core/gnunet-service-core.c:541
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:526
+#: src/core/gnunet-service-core.c:879
 #, c-format
-msgid "# bytes of messages of type %u received"
+msgid "# messages of type %u discarded (client busy)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:535
+#: src/core/gnunet-service-core.c:988
+#, fuzzy
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "立即保存配置？"
+
+#: src/core/gnunet-service-core.c:1009
+#, fuzzy, c-format
+msgid "Core service of `%s' ready.\n"
+msgstr "服务已删除。\n"
+
+#: src/core/gnunet-service-core_kx.c:566
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:586
+#: src/core/gnunet-service-core_kx.c:626
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:672
+#: src/core/gnunet-service-core_kx.c:728
+msgid "# PAYLOAD dropped (out of order)"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:778
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:712
+#: src/core/gnunet-service-core_kx.c:840
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:809
+#: src/core/gnunet-service-core_kx.c:874
+#, fuzzy
+msgid "# PING messages transmitted"
+msgstr "消息尺寸"
+
+#: src/core/gnunet-service-core_kx.c:941
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:815
+#: src/core/gnunet-service-core_kx.c:948
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:849
+#: src/core/gnunet-service-core_kx.c:987
 #, 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:860
+#: src/core/gnunet-service-core_kx.c:998
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:950
-#: src/transport/gnunet-service-transport_validation.c:1016
+#: src/core/gnunet-service-core_kx.c:1094
+#: src/transport/gnunet-service-transport_validation.c:1128
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:1103
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:985
-#, c-format
-msgid ""
-"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
-"%s'\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:1002
+#: src/core/gnunet-service-core_kx.c:1161
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1028
+#: src/core/gnunet-service-core_kx.c:1187
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1038
+#: src/core/gnunet-service-core_kx.c:1200
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1095
-#: src/transport/gnunet-service-transport_validation.c:1328
+#: src/core/gnunet-service-core_kx.c:1264
+#: src/transport/gnunet-service-transport_validation.c:1461
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1101
+#: src/core/gnunet-service-core_kx.c:1271
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1106
+#: src/core/gnunet-service-core_kx.c:1276
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1136
+#: src/core/gnunet-service-core_kx.c:1311
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1170
+#: src/core/gnunet-service-core_kx.c:1349
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1180
+#: src/core/gnunet-service-core_kx.c:1360
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1187
+#: src/core/gnunet-service-core_kx.c:1367
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1327
+#: src/core/gnunet-service-core_kx.c:1521
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1334
+#: src/core/gnunet-service-core_kx.c:1529
 #, 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:1337
+#: src/core/gnunet-service-core_kx.c:1532
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1382
-#: src/core/gnunet-service-core_kx.c:1407
+#: src/core/gnunet-service-core_kx.c:1593
+#: src/core/gnunet-service-core_kx.c:1619
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1394
+#: src/core/gnunet-service-core_kx.c:1606
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1436
+#: src/core/gnunet-service-core_kx.c:1648
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1444
+#: src/core/gnunet-service-core_kx.c:1656
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1479
-msgid "# PAYLOAD dropped (out of order)"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:163
-msgid "# sessions terminated by transport disconnect"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:329
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:246
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:412
-#, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_sessions.c:214
-#: src/core/gnunet-service-core_sessions.c:286
-#: src/dht/gnunet-service-dht_neighbours.c:662
-#: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:939
-#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
-#: src/topology/gnunet-daemon-topology.c:707
-#: src/topology/gnunet-daemon-topology.c:808
-#: src/transport/gnunet-service-transport_neighbours.c:848
-#: src/transport/gnunet-service-transport_neighbours.c:1080
-#: src/transport/gnunet-service-transport_neighbours.c:1089
-#: src/transport/gnunet-service-transport_neighbours.c:3202
-#: src/transport/gnunet-service-transport_neighbours.c:3463
+#: src/core/gnunet-service-core_sessions.c:260
+#: src/core/gnunet-service-core_sessions.c:350
+#: 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
+#: src/transport/gnunet-service-transport_neighbours.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:727
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:253
+#: src/core/gnunet-service-core_sessions.c:296
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:424
-msgid "# messages discarded (expired prior to transmission)"
-msgstr ""
+#: src/core/gnunet-service-core_sessions.c:416
+#, fuzzy
+msgid "# outdated typemap confirmations received"
+msgstr "保存配置失败。"
 
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
+#: src/core/gnunet-service-core_sessions.c:433
+#, fuzzy
+msgid "# valid typemap confirmations received"
+msgstr "保存配置失败。"
+
+#: src/core/gnunet-service-core_typemap.c:169
+#: src/core/gnunet-service-core_typemap.c:181
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:151
+#: src/core/gnunet-service-core_typemap.c:212
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/datacache/datacache.c:119 src/datacache/datacache.c:294
+#: src/datastore/gnunet-service-datastore.c:757
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:117 src/datacache/datacache.c:268
+#: src/datacache/datacache.c:123 src/datacache/datacache.c:298
 msgid "# items stored"
 msgstr ""
 
-#: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1487
-#: src/datastore/gnunet-service-datastore.c:1498
-#, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr ""
-
-#: src/datacache/datacache.c:184
+#: src/datacache/datacache.c:202
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:192
+#: src/datacache/datacache.c:213
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:295
+#: src/datacache/datacache.c:329
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:304
+#: src/datacache/datacache.c:339
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:406
+#: src/datacache/datacache.c:367
+msgid "# requests for random value received"
+msgstr ""
+
+#: src/datacache/datacache.c:399
+msgid "# proximity search requests received"
+msgstr ""
+
+#: src/datacache/plugin_datacache_heap.c:466
 #, fuzzy
 msgid "Heap datacache running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datacache/plugin_datacache_postgres.c:392
-msgid "Postgres datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:72
-#: src/datastore/plugin_datastore_mysql.c:806
-#: src/datastore/plugin_datastore_mysql.c:820
-#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
-#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
-#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
-#: src/namecache/plugin_namecache_postgres.c:52
-#: src/namecache/plugin_namecache_sqlite.c:52
-#: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/datacache/plugin_datacache_sqlite.c:113
+#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datastore/plugin_datastore_mysql.c:892
+#: 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_sqlite.c:53
+#: 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
-#: src/testbed/gnunet-daemon-testbed-underlay.c:55
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
-#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:60
+#: src/testbed/gnunet-daemon-testbed-underlay.c:56
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
+#: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
+#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744
+#: src/scalarproduct/scalarproduct.h:35
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:450
-msgid "Sqlite datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:404
-#: src/namecache/plugin_namecache_sqlite.c:295
-#: src/namestore/plugin_namestore_sqlite.c:327
+#: src/datacache/plugin_datacache_sqlite.c:817
+#: src/datastore/plugin_datastore_sqlite.c:456
+#: 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/datacache/plugin_datacache_sqlite.c:491
-#, fuzzy, c-format
-msgid "Failed to close statement %p: %d\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/datacache/plugin_datacache_template.c:125
-msgid "Template datacache running\n"
-msgstr ""
-
-#: src/datastore/datastore_api.c:310
-msgid "Failed to transmit request to drop database.\n"
-msgstr ""
+#: src/datastore/datastore_api.c:348
+#, fuzzy
+msgid "DATASTORE disconnected"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/datastore/datastore_api.c:394
-msgid "# queue entry timeouts"
-msgstr ""
+#: src/datastore/datastore_api.c:468
+#, fuzzy
+msgid "Disconnected from DATASTORE"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/datastore/datastore_api.c:443
+#: src/datastore/datastore_api.c:569
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:471
+#: src/datastore/datastore_api.c:599
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:491
-msgid "# Requests dropped from datastore queue"
+#: src/datastore/datastore_api.c:760
+msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:533
-msgid "# datastore connections (re)created"
+#: src/datastore/datastore_api.c:814
+msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
-msgid "# transmission request failures"
+#: src/datastore/datastore_api.c:920
+msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:638
-msgid "# bytes sent to datastore"
+#: src/datastore/datastore_api.c:1034
+msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:770
-msgid "Failed to receive status response from database."
+#: src/datastore/datastore_api.c:1095
+msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:784
-msgid "Error reading response from datastore service"
+#: src/datastore/datastore_api.c:1160
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
-msgid "Invalid error message received from datastore service"
+#: src/datastore/datastore_api.c:1238
+msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:806
-msgid "# status messages received"
+#: src/datastore/datastore_api.c:1298
+msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:876
-msgid "# PUT requests executed"
+#: src/datastore/datastore_api.c:1360
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:944
-msgid "# RESERVE requests executed"
+#: src/datastore/datastore_api.c:1441
+msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1005
-msgid "# RELEASE RESERVE requests executed"
+#: src/datastore/gnunet-datastore.c:189
+#, c-format
+msgid "Dumped %<PRIu64> records\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1065
-msgid "# UPDATE requests executed"
+#: src/datastore/gnunet-datastore.c:217 src/datastore/gnunet-datastore.c:229
+#, c-format
+msgid "Short write to file: %zd bytes expecting %zd\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1129
-msgid "# REMOVE requests executed"
-msgstr ""
+#: src/datastore/gnunet-datastore.c:261
+#, fuzzy
+msgid "Error queueing datastore GET operation\n"
+msgstr "创建用户出错"
 
-#: src/datastore/datastore_api.c:1174
-msgid "Failed to receive response from database.\n"
-msgstr ""
+#: src/datastore/gnunet-datastore.c:287 src/datastore/gnunet-datastore.c:412
+#, fuzzy, c-format
+msgid "Unable to open dump file: %s\n"
+msgstr "发送消息失败。\n"
 
-#: src/datastore/datastore_api.c:1233
-msgid "# Results received"
-msgstr ""
+#: src/datastore/gnunet-datastore.c:326
+#, fuzzy, c-format
+msgid "Failed to store item: %s, aborting\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/datastore/datastore_api.c:1300
-msgid "# GET REPLICATION requests executed"
+#: src/datastore/gnunet-datastore.c:340
+#, c-format
+msgid "Inserted %<PRIu64> records\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1363
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/datastore/gnunet-datastore.c:349 src/datastore/gnunet-datastore.c:363
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1424
-msgid "# GET requests executed"
+#: src/datastore/gnunet-datastore.c:389
+#, fuzzy
+msgid "Error queueing datastore PUT operation\n"
+msgstr "创建用户出错"
+
+#: src/datastore/gnunet-datastore.c:432
+msgid "Input file is not of a supported format\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:114
-#, fuzzy, c-format
-msgid "Failed to store item: %s, aborting\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/datastore/gnunet-datastore.c:458
+#, fuzzy
+msgid "Failed connecting to the datastore.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/datastore/gnunet-datastore.c:200
+#: src/datastore/gnunet-datastore.c:470
 #, c-format
-msgid "Cannot use the same configuration for source and destination\n"
+msgid "Please choose at least one operation: %s, %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:246
-msgid ""
-"specifies the configuration to use to access an alternative datastore; will "
-"merge that datastore into our current datastore"
+#: src/datastore/gnunet-datastore.c:493
+#, fuzzy
+msgid "Dump all records from the datastore"
+msgstr "发送消息失败。\n"
+
+#: src/datastore/gnunet-datastore.c:497
+msgid "Insert records into the datastore"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:502
+msgid "File to dump or insert"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:255
+#: src/datastore/gnunet-datastore.c:511
 #, fuzzy
 msgid "Manipulate GNUnet datastore"
 msgstr "更改配置文件中的一个值"
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:338
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:425
+#: src/datastore/gnunet-service-datastore.c:420
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:223
-msgid "Transmission to client failed!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:262
-msgid "Shutdown in progress, aborting transmission.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:630
+#: src/datastore/gnunet-service-datastore.c:562
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:673
+#: src/datastore/gnunet-service-datastore.c:603
 #, c-format
 msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: 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:688
+#: 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:694
+#: src/datastore/gnunet-service-datastore.c:627
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:699
-#: src/datastore/gnunet-service-datastore.c:751
-#: src/datastore/gnunet-service-datastore.c:964
-#: src/datastore/gnunet-service-datastore.c:1421
+#: src/datastore/gnunet-service-datastore.c:634
+#: src/datastore/gnunet-service-datastore.c:689
+#: src/datastore/gnunet-service-datastore.c:837
+#: src/datastore/gnunet-service-datastore.c:1469
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:764
+#: src/datastore/gnunet-service-datastore.c:707
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:850
+#: src/datastore/gnunet-service-datastore.c:773
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1010
+#: src/datastore/gnunet-service-datastore.c:876
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1022
-msgid "# requests filtered by bloomfilter"
+#: src/datastore/gnunet-service-datastore.c:907
+msgid "# GET KEY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1050
-msgid "# UPDATE requests received"
+#: src/datastore/gnunet-service-datastore.c:920
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:956
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:989
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1138
+#: src/datastore/gnunet-service-datastore.c:1036
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1043
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1178
+#: src/datastore/gnunet-service-datastore.c:1088
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1220
+#: src/datastore/gnunet-service-datastore.c:1137
+#, c-format
+msgid ""
+"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1143
+#: src/datastore/gnunet-service-datastore.c:1318
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1197
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1290
+#: src/datastore/gnunet-service-datastore.c:1209
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1269
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1325
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1336
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1506
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1522
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1505
+#: src/datastore/gnunet-service-datastore.c:1527
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1518
+#: src/datastore/gnunet-service-datastore.c:1543
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1536
-#: src/datastore/gnunet-service-datastore.c:1552
+#: src/datastore/gnunet-service-datastore.c:1561
+#: src/datastore/gnunet-service-datastore.c:1577
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1582
+#: src/datastore/gnunet-service-datastore.c:1609
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/datastore/gnunet-service-datastore.c:1611
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1616
-msgid "Plugin does not support get_keys function. Please fix!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1619
-msgid "Bloomfilter construction complete.\n"
-msgstr ""
-
-#: src/datastore/plugin_datastore_heap.c:820
+#: src/datastore/plugin_datastore_heap.c:893
 #, fuzzy
 msgid "Heap database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datastore/plugin_datastore_mysql.c:783
-#, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/datastore/plugin_datastore_mysql.c:371
+#: src/datastore/plugin_datastore_mysql.c:423
+#: src/datastore/plugin_datastore_mysql.c:1075
+msgid "MySQL statement run failure"
+msgstr ""
+
+#: src/datastore/plugin_datastore_mysql.c:410
+#: src/datastore/plugin_datastore_sqlite.c:626
+#, fuzzy
+msgid "Data too large"
+msgstr "迭代次数"
 
-#: src/datastore/plugin_datastore_mysql.c:791
+#: src/datastore/plugin_datastore_mysql.c:848
 #, 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:1022
+#: src/datastore/plugin_datastore_mysql.c:1180
+#: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:824
+#: src/datastore/plugin_datastore_postgres.c:274
+#: src/datastore/plugin_datastore_postgres.c:891
+msgid "Postgress exec failure"
+msgstr ""
+
+#: src/datastore/plugin_datastore_postgres.c:852
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "发送消息失败。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:860
-#: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:569
+#: src/datastore/plugin_datastore_postgres.c:950
+#: src/psycstore/plugin_psycstore_postgres.c:1506
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:57
+#: 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:58
+#: src/testbed/gnunet-daemon-testbed-underlay.c:59
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:255
-#: src/namecache/plugin_namecache_sqlite.c:193
-#: src/namestore/plugin_namestore_sqlite.c:204
-#: src/psycstore/plugin_psycstore_sqlite.c:319
+#: src/datastore/plugin_datastore_sqlite.c:271
+#: 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:663
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
+#: src/datastore/plugin_datastore_sqlite.c:577
+msgid "sqlite bind failure"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1156
+#: src/datastore/plugin_datastore_sqlite.c:1259
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1175
+#: src/datastore/plugin_datastore_sqlite.c:1293
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1215
-#: src/namecache/plugin_namecache_sqlite.c:583
-#: src/namestore/plugin_namestore_sqlite.c:719
+#: src/datastore/plugin_datastore_sqlite.c:1337
+#: 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:257
+#: src/datastore/plugin_datastore_template.c:253
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:376
-#, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/dht/gnunet-dht-get.c:133
+#: src/dht/gnunet-dht-get.c:157
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-dht-get.c:173
+#: src/dht/gnunet-dht-get.c:218
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
-#: src/dht/gnunet-dht-put.c:198
+#: 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:192
+#: src/dht/gnunet-dht-get.c:251
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
+#: 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:198 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:264
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
+#: 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:204 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
-#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:873
-msgid "be verbose (print progress information)"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:225
+#: 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:268
+#: src/dht/gnunet-dht-monitor.c:310
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:293
+#: 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 ""
 
-#: src/dht/gnunet-dht-put.c:118
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
+
+#: src/dht/gnunet_dht_profiler.c:1188
+#, fuzzy
+msgid "number of peers to start"
+msgstr "迭代次数"
+
+#: 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:1200 src/nse/gnunet-nse-profiler.c:853
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1206
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1212
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1218
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1223
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: 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:1248
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "无法访问该服务"
+
+#: src/dht/gnunet-dht-put.c:120
 msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:123
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:126
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:156
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:160
+#: 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:176
+#: 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:192
+#: src/dht/gnunet-dht-put.c:210
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: 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:204
+#: src/dht/gnunet-dht-put.c:233
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
+#: src/dht/gnunet-dht-put.c:238
+msgid "use DHT's record route option"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:244
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:236
+#: 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.c:172 src/dht/gnunet-service-xdht.c:176
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:417
+#: src/dht/gnunet-service-dht_clients.c:369
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:511
-#: src/dht/gnunet-service-xdht_clients.c:512
+#: src/dht/gnunet-service-dht_clients.c:485
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:595
-#: src/dht/gnunet-service-xdht_clients.c:597
+#: src/dht/gnunet-service-dht_clients.c:624
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:796
-#: src/dht/gnunet-service-xdht_clients.c:798
+#: src/dht/gnunet-service-dht_clients.c:850
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1037
-#: src/dht/gnunet-service-xdht_clients.c:1039
+#: 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:1050
-#: src/dht/gnunet-service-xdht_clients.c:1052
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1087
-#: src/dht/gnunet-service-xdht_clients.c:1089
+#: 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:1110
-#: src/dht/gnunet-service-xdht_clients.c:1112
+#: src/dht/gnunet-service-dht_clients.c:1103
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1164
-#: src/dht/gnunet-service-dht_clients.c:1207
-#: src/dht/gnunet-service-xdht_clients.c:1166
-#: src/dht/gnunet-service-xdht_clients.c:1208
+#: src/dht/gnunet-service-dht_clients.c:1181
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1174
-#: src/dht/gnunet-service-xdht_clients.c:1176
-msgid "Could not pass reply to client, message too big!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:68
+#: src/dht/gnunet-service-dht_datacache.c:72
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:78
+#: src/dht/gnunet-service-dht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:165
+#: src/dht/gnunet-service-dht_datacache.c:198
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:176
+#: src/dht/gnunet-service-dht_datacache.c:210
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:182
+#: src/dht/gnunet-service-dht_datacache.c:216
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:188
+#: src/dht/gnunet-service-dht_datacache.c:222
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:200
+#: src/dht/gnunet-service-dht_datacache.c:234
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:203
+#: src/dht/gnunet-service-dht_datacache.c:238
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:273
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:82
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:86
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:516
-msgid "# Preference updates given to core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-dht_neighbours.c:672
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:764
-msgid "# Queued messages discarded (peer disconnected)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:540
-msgid "# Bytes transmitted to other peers"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:579
-msgid "# Bytes of bandwidth requested from core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:889
+#: src/dht/gnunet-service-dht_neighbours.c:843
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1093
-#: src/dht/gnunet-service-dht_neighbours.c:1130
+#: 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:1108
-#: src/dht/gnunet-service-dht_neighbours.c:1145
+#: 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:1287
+#: src/dht/gnunet-service-dht_neighbours.c:1262
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-dht_neighbours.c:1295
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1323
-#: src/dht/gnunet-service-dht_neighbours.c:1440
-#: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:616
-#: src/dht/gnunet-service-xdht_neighbours.c:1246
-#: src/dht/gnunet-service-xdht_neighbours.c:1330
+#: 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:1405
+#: src/dht/gnunet-service-dht_neighbours.c:1391
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-dht_neighbours.c:1434
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-dht_neighbours.c:1564
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1637
+#: src/dht/gnunet-service-dht_neighbours.c:1663
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1640
+#: src/dht/gnunet-service-dht_neighbours.c:1667
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1893
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: 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:1904
+#: src/dht/gnunet-service-dht_neighbours.c:2062
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-dht_neighbours.c:2066
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-dht_neighbours.c:2131
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-dht_neighbours.c:2152
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-dht_neighbours.c:2334
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-dht_neighbours.c:2338
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59
 msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-dht_routing.c:223
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:237
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-dht_routing.c:243
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:249
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:261
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-dht_routing.c:339
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-dht_routing.c:415
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-dht_routing.c:437
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1179
-msgid "# TRAIL SETUP requests received"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1182
-msgid "# TRAIL SETUP bytes received"
-msgstr ""
-
-#: src/dht/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:187
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:145
+#: src/dht/plugin_block_dht.c:194
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:154
+#: src/dht/plugin_block_dht.c:204
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:257
+#: src/dns/dnsparser.c:254
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dns/dnsparser.c:856
+#: src/dns/dnsparser.c:818
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dns/dnsstub.c:299
+#: src/dns/dnsstub.c:298
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dns/dnsstub.c:368
+#: src/dns/dnsstub.c:367
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:440
+#: src/dns/dnsstub.c:437
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: 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:358
-msgid "only monitor DNS replies"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:369
+#: src/dns/gnunet-dns-monitor.c:370
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:236
+#: src/dns/gnunet-dns-redirector.c:237
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:239
+#: src/dns/gnunet-dns-redirector.c:243
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:251
+#: src/dns/gnunet-dns-redirector.c:256
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:456
+#: src/dns/gnunet-service-dns.c:462
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:603
+#: src/dns/gnunet-service-dns.c:608
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:714
+#: src/dns/gnunet-service-dns.c:738
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:792
+#: src/dns/gnunet-service-dns.c:813
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:907
+#: src/dns/gnunet-service-dns.c:928
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:923
+#: src/dns/gnunet-service-dns.c:944
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:932
+#: 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:942
-msgid "# Non-DNS UDP packet received via TUN interface"
+#: src/dns/gnunet-service-dns.c:963
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1009
-msgid "# DNS requests received via TUN interface"
+#: src/dns/gnunet-service-dns.c:965
+msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
-#, c-format
-msgid "`%s' must be installed SUID, refusing to run\n"
+#: src/dns/gnunet-service-dns.c:1032
+msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571
+#: 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/dv/gnunet-dv.c:169
-msgid "verbose output"
+#: 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:178
+#: src/dv/gnunet-dv.c:175
 #, fuzzy
 msgid "Print information about DV state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/exit/gnunet-daemon-exit.c:802
-#, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
+#: src/exit/gnunet-daemon-exit.c:961
+msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:853
-#, fuzzy
-msgid "# Bytes transmitted via mesh channels"
+#: src/exit/gnunet-daemon-exit.c:1062
+msgid "# ICMP packets sent via TUN"
 msgstr ""
-"\n"
-"按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
-#: src/exit/gnunet-daemon-exit.c:2654 src/vpn/gnunet-service-vpn.c:1407
-#: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960
-msgid "# ICMPv4 packets dropped (type not allowed)"
+#: src/exit/gnunet-daemon-exit.c:1341
+msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
-#: src/exit/gnunet-daemon-exit.c:2713 src/vpn/gnunet-service-vpn.c:1463
-#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
-msgid "# ICMPv6 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:1047
-msgid "# ICMP packets dropped (not allowed)"
+#: src/exit/gnunet-daemon-exit.c:1468
+msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1054
-msgid "ICMP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:1576
+msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1130
-msgid "UDP 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:1204
-msgid "TCP 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:1256
-msgid "# Packets received from TUN"
+#: src/exit/gnunet-daemon-exit.c:1789
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1270
-msgid "# Bytes received from TUN"
+#: src/exit/gnunet-daemon-exit.c:1826
+msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1296
-msgid "IPv4 packet options received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:1957
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1323
-#, c-format
-msgid "IPv4 packet with unsupported next header %u 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:1369
-#, c-format
-msgid "IPv6 packet with unsupported next header %d 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:1377
-#, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2211
+msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1759
-msgid "# TCP packets sent via TUN"
+#: 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:1872
-msgid "# TCP service creation requests received via mesh"
+#: 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:1875 src/exit/gnunet-daemon-exit.c:1968
-#: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321
-#: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859
-#: src/exit/gnunet-daemon-exit.c:2966
-msgid "# Bytes received from MESH"
+#: 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:1909 src/exit/gnunet-daemon-exit.c:2990
+#: src/exit/gnunet-daemon-exit.c:2523
 #, c-format
-msgid "No service %s found for %s on port %d!\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1914
-msgid "# TCP requests dropped (no such service)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1971
-msgid "# TCP IP-exit creation requests received via mesh"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:2076
-msgid "# TCP data requests received via mesh"
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2090
-msgid "# TCP DATA requests dropped (no session)"
+#: src/exit/gnunet-daemon-exit.c:2542
+#, fuzzy
+msgid "# Messages transmitted via cadet channels"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:2150
-msgid "# ICMP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:2720
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2324
-msgid "# ICMP IP-exit requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2728
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2573
-msgid "# ICMP service requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2802
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
-#: src/vpn/gnunet-service-vpn.c:1954
-msgid "# ICMPv4 packets dropped (impossible PT to v6)"
+#: src/exit/gnunet-daemon-exit.c:2874
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2698 src/vpn/gnunet-service-vpn.c:1433
-#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
-msgid "# ICMPv6 packets dropped (impossible PT to v4)"
+#: src/exit/gnunet-daemon-exit.c:2922
+msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2748
-msgid "# UDP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:2936
+msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2862
-msgid "# UDP IP-exit requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2962
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2969
-msgid "# UDP service requests received via mesh"
+#: 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:2995
-msgid "# UDP requests dropped (no such service)"
+#: 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:3031
-msgid "# Inbound MESH channels created"
+#: 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:3235 src/exit/gnunet-daemon-exit.c:3245
+#: 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:3259 src/exit/gnunet-daemon-exit.c:3267
+#: 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:3300
+#: 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:3314 src/exit/gnunet-daemon-exit.c:3326
+#: 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:3337
+#: 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:3527
+#: 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:3535
+#: 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:3542
+#: 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:3548
+#: 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:3554 src/exit/gnunet-daemon-exit.c:3717
-#: src/pt/gnunet-daemon-pt.c:1247
-msgid "No useful service enabled.  Exiting.\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3694
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3813
-msgid "Daemon to run to provide an IP exit node for the VPN"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:55
-msgid "Experimentation daemon shutting down ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:77
-msgid "Experimentation daemon starting ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:83
-#, fuzzy
-msgid "Failed to create statistics!\n"
-msgstr "发送消息失败。\n"
-
-#: src/experimentation/gnunet-daemon-experimentation.c:120
-msgid "GNUnet experimentation daemon"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
-#, c-format
-msgid "Experiment `%s': Experiment signature is invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
-#, c-format
-msgid ""
-"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
-"sec. \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
-#, c-format
-msgid "Experiment `%s': Issuer missing\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
-#, c-format
-msgid "Experiment `%s': Issuer invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
-#, c-format
-msgid "Experiment `%s': Issuer not accepted!\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
-#, c-format
-msgid "Experiment `%s': Version missing or invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
-#, c-format
-msgid "Experiment `%s': Required capabilities missing \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
-#, c-format
-msgid "Experiment `%s': Required capabilities invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
-#, fuzzy, c-format
-msgid "Failed to parse file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-msgid ""
-"No valid experiment issuers configured! Set value to public keys of issuers! "
-"Exiting.\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
-#, fuzzy
-msgid "Invalid value for public key\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
-#, fuzzy, c-format
-msgid "Cannot read experiments file `%s'\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
-#, c-format
-msgid "Cannot send message to peer `%s' for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
+#: src/exit/gnunet-daemon-exit.c:3809
 #, c-format
-msgid "Sending experimentation request to peer %s\n"
+msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
-#, c-format
-msgid "Added peer `%s' as active node\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
-#, fuzzy, c-format
-msgid "Connected to peer %s\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
-#, fuzzy, c-format
-msgid "Disconnected from peer %s\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
-#, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
-#, c-format
-msgid "Peer `%s' did not respond to request for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
-#, c-format
-msgid "Starting inbound experiment `%s' with peer `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
-#, c-format
-msgid "Starting outbound experiment `%s' with peer `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
+msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
-#, c-format
-msgid "Received %s message from peer %s for experiment `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:3970
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:270
+#: src/fragmentation/defragmentation.c:275
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:456
+#: src/fragmentation/defragmentation.c:468
+#: src/transport/plugin_transport_wlan.c:1554
 msgid "# fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:521
+#: src/fragmentation/defragmentation.c:538
 msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:534
+#: src/fragmentation/defragmentation.c:556
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:208
+#: src/fragmentation/fragmentation.c:240
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:211
+#: src/fragmentation/fragmentation.c:245
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:237
+#: src/fragmentation/fragmentation.c:278
 msgid "# fragments wrap arounds"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:281
+#: src/fragmentation/fragmentation.c:325
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:284
+#: src/fragmentation/fragmentation.c:331
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:405
+#: src/fragmentation/fragmentation.c:456
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:411
+#: src/fragmentation/fragmentation.c:463
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:435
+#: src/fragmentation/fragmentation.c:487
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:499
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:510
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:518
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1064
+#: src/fs/fs_api.c:1126
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:1569
+#: src/fs/fs_api.c:1646
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1583
+#: src/fs/fs_api.c:1662
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2240
+#: src/fs/fs_api.c:2322
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2250
+#: src/fs/fs_api.c:2332
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2617
+#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2393
+#: src/fs/fs_api.c:2478
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2407 src/fs/fs_api.c:2426 src/fs/fs_api.c:2909
+#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2608
+#: src/fs/fs_api.c:2696
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2853
+#: src/fs/fs_api.c:2959
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2947
+#: src/fs/fs_api.c:3054
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:210
+#: src/fs/fs_directory.c:213
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:322
+#: 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:342
+#: src/fs/fs_download.c:334
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:508 src/fs/fs_download.c:520
+#: 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:889
+#: 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:971
+#: 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:997
+#: src/fs/fs_download.c:1074
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1020
+#: 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:1030
+#: 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:1039
+#: 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:1137
+#: src/fs/fs_download.c:1219
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1928
+#: src/fs/fs_download.c:1884
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
 
-#: src/fs/fs_getopt.c:192
+#: src/fs/fs_getopt.c:226
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
-#, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
-msgstr ""
-
-#: src/fs/fs_list_indexed.c:113
-#, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
-msgstr ""
+#: src/fs/fs_list_indexed.c:152
+#, fuzzy, c-format
+msgid "Failed to receive response from `%s' service.\n"
+msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_list_indexed.c:151
+#: src/fs/fs_list_indexed.c:196
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_misc.c:126
+#: src/fs/fs_misc.c:128
 #, c-format
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
@@ -2788,321 +2771,328 @@ msgstr ""
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:232
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:320
+#: src/fs/fs_namespace.c:324
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:466
+#: src/fs/fs_namespace.c:470
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
-#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823
+#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:669
-msgid "timeout on index-start request to `fs' service"
-msgstr ""
-
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:780
 #, fuzzy
-msgid "unknown error"
-msgstr "未知错误"
+msgid "error on index-start request to `fs' service"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_publish.c:725
+#: src/fs/fs_publish.c:825
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:845
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:770
+#: src/fs/fs_publish.c:876
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:793
+#: src/fs/fs_publish.c:902
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:862
+#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027
+msgid "Can not create LOC URI. Will continue with CHK instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:1094
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:868
+#: src/fs/fs_publish.c:1102
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:915
+#: src/fs/fs_publish.c:1142
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1151
-#, c-format
-msgid "Insufficient space for publishing: %s"
-msgstr ""
+#: src/fs/fs_publish.c:1381
+#, fuzzy, c-format
+msgid "Datastore failure: %s"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/fs/fs_publish.c:1243
+#: src/fs/fs_publish.c:1472
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:219
+#: src/fs/fs_publish_ksk.c:220
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:219
+#: src/fs/fs_publish_ublock.c:241
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_search.c:819
+#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_search.c:878
+#: src/fs/fs_search.c:966
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:59
+#: src/fs/fs_unindex.c:63
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/fs/fs_unindex.c:68
 #, fuzzy
 msgid "Failed to read file"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_unindex.c:234
-msgid "Unexpected time for a response from `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:242
-msgid "Timeout waiting for `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:250
+#: src/fs/fs_unindex.c:275
 #, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "“%s”的参数无效。\n"
+msgid "Error communicating with `fs' service."
+msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/fs/fs_unindex.c:291
+#: src/fs/fs_unindex.c:326
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359
+#: 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:355
+#: src/fs/fs_unindex.c:384
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_unindex.c:414
+#: 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:562 src/fs/fs_unindex.c:626
+#: 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:639
+#: src/fs/fs_unindex.c:665
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:673
+#: src/fs/fs_unindex.c:704
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:222
+#: src/fs/fs_uri.c:223
 #, no-c-format
-msgid "`%' must be followed by HEX number"
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:281
+#: src/fs/fs_uri.c:282
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:299
-msgid "`++' not allowed in KSK URI"
+#: src/fs/fs_uri.c:300
+msgid "Malformed KSK URI (`++' not allowed)"
+msgstr ""
+
+#: src/fs/fs_uri.c:307
+msgid "Malformed KSK URI (quotes not balanced)"
+msgstr ""
+
+#: src/fs/fs_uri.c:377
+msgid "Malformed SKS URI (wrong syntax)"
+msgstr ""
+
+#: src/fs/fs_uri.c:418
+msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:306
-msgid "Quotes not balanced in KSK URI"
+#: src/fs/fs_uri.c:433
+msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI"
+#: src/fs/fs_uri.c:512
+msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
-msgid "Malformed CHK URI"
+#: src/fs/fs_uri.c:527
+msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
-msgid "SKS URI malformed"
+#: src/fs/fs_uri.c:537
+msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
-msgid "LOC URI malformed"
+#: src/fs/fs_uri.c:545
+msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:553
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
 #: src/fs/fs_uri.c:559
-msgid "SKS URI malformed (could not find signature)"
+msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574
-msgid "SKS URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:565
+msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/fs/fs_uri.c:574
+msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
-msgid "SKS URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:580
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
-msgid "Unrecognized URI type"
+#: src/fs/fs_uri.c:586
+msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:860
+#: src/fs/fs_uri.c:598
+msgid "LOC URI malformed (signature failed validation)"
+msgstr ""
+
+#: src/fs/fs_uri.c:632
 #, fuzzy
-msgid "Lacking key configuration settings.\n"
-msgstr "立即保存配置？"
+msgid "invalid argument"
+msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_uri.c:866
-#, fuzzy, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/fs/fs_uri.c:644
+msgid "Unrecognized URI type"
+msgstr ""
 
-#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
+#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1081
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:236
+#: src/fs/gnunet-auto-share.c:232
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
-#: src/fs/gnunet-auto-share.c:309
+#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:305
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-auto-share.c:401
+#: src/fs/gnunet-auto-share.c:407
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:488
+#: src/fs/gnunet-auto-share.c:494
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:497
+#: src/fs/gnunet-auto-share.c:504
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-auto-share.c:686
+#: src/fs/gnunet-auto-share.c:713
 #, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
+#: 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:741 src/fs/gnunet-publish.c:828
+#: 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:744 src/fs/gnunet-publish.c:831
+#: 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:747 src/fs/gnunet-publish.c:855
+#: 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:750 src/fs/gnunet-publish.c:862
+#: 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:770
+#: src/fs/gnunet-auto-share.c:813
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:660
+#: src/fs/gnunet-daemon-fsprofiler.c:648
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:49
+#: src/fs/gnunet-directory.c:53
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
+#: src/fs/gnunet-directory.c:105
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:97
+#: src/fs/gnunet-directory.c:108
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:132
+#: src/fs/gnunet-directory.c:143
 #, fuzzy
 msgid "You must specify a filename to inspect.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:156
 #, fuzzy, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-directory.c:154
+#: src/fs/gnunet-directory.c:165
 #, fuzzy, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/fs/gnunet-directory.c:183
+#: src/fs/gnunet-directory.c:194
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "更改 GNUnet 目录的权限出错"
@@ -3134,630 +3124,634 @@ msgstr ""
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
-#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
+#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:234
+#: src/fs/gnunet-download.c:233
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
+#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-download.c:247
+#: src/fs/gnunet-download.c:246
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254
+#: src/fs/gnunet-download.c:253
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
-#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
+#: 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:308
+#: src/fs/gnunet-download.c:311
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
+#: 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:314
+#: src/fs/gnunet-download.c:322
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:328
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:322
+#: 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:325
+#: src/fs/gnunet-download.c:339
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:339
+#: 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:193
+#: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: 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:199
+#: src/fs/gnunet-fs-profiler.c:223
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:233
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
+#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:250
+#: src/fs/gnunet-publish.c:239
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:260
+#: src/fs/gnunet-publish.c:246
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:251
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:283
-msgid "Cleanup after abort complete.\n"
+#: src/fs/gnunet-publish.c:259
+#, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:275
+msgid "Starting cleanup after abort\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:282
+msgid "Cleanup after abort completed.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:288
+msgid "Cleanup after abort failed.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:401
+#: src/fs/gnunet-publish.c:430
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:403
+#: src/fs/gnunet-publish.c:435
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:589
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:614
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:598
+#: src/fs/gnunet-publish.c:648
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:600
+#: src/fs/gnunet-publish.c:652
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:658
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:610
+#: src/fs/gnunet-publish.c:665
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:614
+#: src/fs/gnunet-publish.c:670
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-publish.c:677
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-publish.c:686
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:656
+#: src/fs/gnunet-publish.c:714
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:747
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:695
+#: src/fs/gnunet-publish.c:761
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:817
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:824
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:760
+#: src/fs/gnunet-publish.c:830
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1172 src/transport/gnunet-transport.c:1202
+#: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
+#: 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:835
+#: 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:839
+#: 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:843
+#: 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:846
+#: 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:851
+#: 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:859
+#: src/fs/gnunet-publish.c:955
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:865
+#: 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:869
+#: 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:873
+#: 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:889
+#: src/fs/gnunet-publish.c:998
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:114
+#: src/fs/gnunet-search.c:127
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:191
+#: src/fs/gnunet-search.c:204
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-search.c:240
+#: src/fs/gnunet-search.c:260
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:264
+#: src/fs/gnunet-search.c:284
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:295
+#: src/fs/gnunet-search.c:325
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:298
+#: src/fs/gnunet-search.c:331
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:305
+#: src/fs/gnunet-search.c:340
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:353
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:271
+#: 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:436
+msgid "# replies received for local clients"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:605
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
+#: 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:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1254
-#: src/topology/gnunet-daemon-topology.c:1261
+#: src/fs/gnunet-service-fs.c:836
+msgid "# client searches received"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:875
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: 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:1286
+#, fuzzy
+msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "立即保存配置？"
+
+#: 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"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_cp.c:682
-msgid "# migration stop messages received"
+#: src/fs/gnunet-service-fs_cadet_client.c:370
+msgid "# replies received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:686
-#, c-format
-msgid "Migration of content to peer `%s' blocked for %s\n"
+#: src/fs/gnunet-service-fs_cadet_client.c:384
+msgid "# replies received via cadet dropped"
+msgstr ""
+
+#: 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:320
+msgid "# Blocks transferred via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:346
+msgid "# queries received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:721
-msgid "# replies transmitted to other peers"
+#: 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:395
+#: src/fs/gnunet-service-fs_cadet_server.c:435
+#, fuzzy
+msgid "# cadet connections active"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/fs/gnunet-service-fs_cp.c:686
+msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:727
-msgid "# replies dropped"
+#: src/fs/gnunet-service-fs_cp.c:690
+#, c-format
+msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:845
+#: src/fs/gnunet-service-fs_cp.c:818
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:898
+#: src/fs/gnunet-service-fs_cp.c:875
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:883
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:897
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:944
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1026
+#: src/fs/gnunet-service-fs_cp.c:1015
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1051
+#: src/fs/gnunet-service-fs_cp.c:1040
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1061
+#: src/fs/gnunet-service-fs_cp.c:1050
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1139
-msgid "# GET requests received (from other peers)"
+#: src/fs/gnunet-service-fs_cp.c:1148
+msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1173
-msgid "# requests dropped due to initiator not being connected"
+#: src/fs/gnunet-service-fs_cp.c:1205
+msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1195
+#: src/fs/gnunet-service-fs_cp.c:1228
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1246
-msgid "# requests dropped due TTL underflow"
+#: src/fs/gnunet-service-fs_cp.c:1239
+msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1270
-msgid "# requests dropped due to higher-TTL request"
+#: src/fs/gnunet-service-fs_cp.c:1295
+msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:1339
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1670
+#: src/fs/gnunet-service-fs_cp.c:1706
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:181
+#: src/fs/gnunet-service-fs_indexing.c:134
+#: src/fs/gnunet-service-fs_indexing.c:195
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:142
+#: src/fs/gnunet-service-fs_indexing.c:151
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-service-fs_indexing.c:237
-#, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:275
-#, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:477
+#: src/fs/gnunet-service-fs_indexing.c:253
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:542
+#: src/fs/gnunet-service-fs_indexing.c:331
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:557
+#: 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:559
+#: src/fs/gnunet-service-fs_indexing.c:361
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:574
+#: 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_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
-msgid "# client searches active"
+#: src/fs/gnunet-service-fs_indexing.c:518
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:256
-msgid "# replies received for local clients"
+#: src/fs/gnunet-service-fs_pe.c:265
+msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:327
-msgid "# client searches received"
+#: src/fs/gnunet-service-fs_pe.c:427
+msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:362
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-service-fs_pe.c:438
+msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_client.c:484
-msgid "# replies received via mesh"
+#: src/fs/gnunet-service-fs_pe.c:466
+msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_client.c:498
-msgid "# replies received via mesh dropped"
+#: src/fs/gnunet-service-fs_pe.c:536
+msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_server.c:260
-msgid "# Blocks transferred via mesh"
+#: src/fs/gnunet-service-fs_pe.c:546
+msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_server.c:352
-msgid "# queries received via mesh not answered"
+#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709
+#: src/fs/gnunet-service-fs_pe.c:788
+msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_server.c:432
-msgid "# queries received via mesh"
+#: src/fs/gnunet-service-fs_pr.c:330
+msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_mesh_server.c:476
-#, fuzzy
-msgid "# mesh client connections rejected"
-msgstr ""
-"\n"
-"按任意键继续\n"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:482
-#: src/fs/gnunet-service-fs_mesh_server.c:522
-#, fuzzy
-msgid "# mesh connections active"
-msgstr ""
-"\n"
-"按任意键继续\n"
-
-#: src/fs/gnunet-service-fs_pe.c:269
-msgid "# average retransmission delay (ms)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:400
-msgid "# transmission failed (core has no bandwidth)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:433
-msgid "# query messages sent to other peers"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:484
-msgid "# delay heap timeout (ms)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:492
-msgid "# query plans executed"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:552
-msgid "# requests merged"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:560
-msgid "# requests refreshed"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
-#: src/fs/gnunet-service-fs_pe.c:771
-msgid "# query plan entries"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:311
-msgid "# Pending requests created"
+#: 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:394 src/fs/gnunet-service-fs_pr.c:645
-msgid "# Pending requests active"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:858
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:894
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:853
+#: src/fs/gnunet-service-fs_pr.c:903
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:867
+#: src/fs/gnunet-service-fs_pr.c:918
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:880
+#: src/fs/gnunet-service-fs_pr.c:935
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1001
+#: src/fs/gnunet-service-fs_pr.c:1065
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1029
+#: src/fs/gnunet-service-fs_pr.c:1093
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1064
+#: src/fs/gnunet-service-fs_pr.c:1131
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1192
-msgid "# Replies received from MESH"
+#: src/fs/gnunet-service-fs_pr.c:1262
+msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: 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:1264
+#: 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:1311
+#: 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:1326
+#: src/fs/gnunet-service-fs_pr.c:1524
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1335
+#: src/fs/gnunet-service-fs_pr.c:1548
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1350
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1562
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1583
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1382
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1590
-msgid "# Datastore lookups concluded (error queueing)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1626
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1639
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1566
+#: src/fs/gnunet-service-fs_pr.c:1693
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1651
+#: src/fs/gnunet-service-fs_pr.c:1749
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:631
+#: src/fs/gnunet-service-fs_push.c:646
 msgid "time required, content pushing disabled"
 msgstr ""
 
@@ -3775,131 +3769,132 @@ msgstr ""
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:130
+#: src/fs/gnunet-unindex.c:129
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:147
+#: src/fs/gnunet-unindex.c:146
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:179
+#: src/fs/gnunet-unindex.c:178
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:393
-#, fuzzy
-msgid "Failed to serialize lookup reply from GNS service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/gns/gnunet-bcd.c:123
+#: src/gns/gnunet-bcd.c:127
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
+#: src/gns/gnunet-bcd.c:357
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Invalid port number %u.  Exiting.\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:360
-#, c-format
-msgid "Businesscard HTTP server starts on %llu\n"
-msgstr ""
+#: src/gns/gnunet-bcd.c:362
+#, fuzzy, c-format
+msgid "Businesscard HTTP server starts on %u\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-bcd.c:374
+#: src/gns/gnunet-bcd.c:376
 #, fuzzy, c-format
 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 ""
 
-#: src/gns/gnunet-dns2gns.c:228
+#: src/gns/gnunet-dns2gns.c:238
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-dns2gns.c:400
+#: src/gns/gnunet-dns2gns.c:408
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:416
+#: src/gns/gnunet-dns2gns.c:424
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:432
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:711
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:727
+#: src/gns/gnunet-dns2gns.c:739
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:749
+#: src/gns/gnunet-dns2gns.c:760
 msgid "No valid GNS zone specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:770
+#: src/gns/gnunet-dns2gns.c:784
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:773
+#: src/gns/gnunet-dns2gns.c:790
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
+#: src/gns/gnunet-dns2gns.c:796
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
-msgid "UDP port to listen on for inbound DNS requests; default: 53"
+#: src/gns/gnunet-dns2gns.c:802
+msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:808
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:795
+#: src/gns/gnunet-dns2gns.c:826
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:217
+#: 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:252
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:298
+#: src/gns/gnunet-gns.c:276
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:798
+#: 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:365 src/gns/gnunet-gns-helper-service-w32.c:828
+#: 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:378
+#: src/gns/gnunet-gns.c:374
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
@@ -3908,1230 +3903,1495 @@ msgstr ""
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:431
+#: src/gns/gnunet-gns.c:434
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:434
+#: src/gns/gnunet-gns.c:440
+msgid "Specify timeout for the lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:445
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:437
+#: 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:440
+#: 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:453
+#: src/gns/gnunet-gns.c:476
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"
 
-#: src/gns/gnunet-gns-helper-service-w32.c:768
-#, 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:838
+#: 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:476
+#: src/gns/gnunet-gns-import.c:452
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
-#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
-#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
-#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
-#: src/hostlist/hostlist-client.c:968
-#: src/transport/plugin_transport_http_client.c:1062
-#: src/transport/plugin_transport_http_client.c:1077
+#: src/gns/gnunet-gns-proxy.c:109
+#: src/hostlist/gnunet-daemon-hostlist_client.c:569
+#: src/hostlist/gnunet-daemon-hostlist_client.c:787
+#: src/hostlist/gnunet-daemon-hostlist_client.c:793
+#: src/hostlist/gnunet-daemon-hostlist_client.c:845
+#: src/hostlist/gnunet-daemon-hostlist_client.c:854
+#: src/hostlist/gnunet-daemon-hostlist_client.c:965
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
+#: src/transport/plugin_transport_http_client.c:598
+#: src/transport/plugin_transport_http_client.c:616
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:833
+#: src/gns/gnunet-gns-proxy.c:887
 #, fuzzy, c-format
 msgid "Unsupported CURL SSL backend %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:856
+#: src/gns/gnunet-gns-proxy.c:910
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:879
+#: src/gns/gnunet-gns-proxy.c:933
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:946
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:907
+#: src/gns/gnunet-gns-proxy.c:961
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:917
+#: src/gns/gnunet-gns-proxy.c:971
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:941
+#: src/gns/gnunet-gns-proxy.c:995
 #, c-format
 msgid "SSL certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1086
+#: src/gns/gnunet-gns-proxy.c:1104
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1602
+#: src/gns/gnunet-gns-proxy.c:1709
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:1973
+#: src/gns/gnunet-gns-proxy.c:2172
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户："
 
-#: src/gns/gnunet-gns-proxy.c:2003
+#: src/gns/gnunet-gns-proxy.c:2202
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "无法保存配置文件“%s”："
 
-#: src/gns/gnunet-gns-proxy.c:2177
+#: src/gns/gnunet-gns-proxy.c:2375
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2196
+#: src/gns/gnunet-gns-proxy.c:2394 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:2504
+#: src/gns/gnunet-gns-proxy.c:2716
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2533
+#: src/gns/gnunet-gns-proxy.c:2745
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+#: src/gns/gnunet-gns-proxy.c:2763 src/gns/gnunet-gns-proxy.c:2792
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2631
+#: src/gns/gnunet-gns-proxy.c:2842
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2970
-msgid "No ego configured for `shorten-zone`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3010
+#: src/gns/gnunet-gns-proxy.c:3177 src/gns/gnunet-service-gns.c:403
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3072
+#: src/gns/gnunet-gns-proxy.c:3238
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3113
+#: src/gns/gnunet-gns-proxy.c:3281
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3116
+#: src/gns/gnunet-gns-proxy.c:3287
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3135
+#: src/gns/gnunet-gns-proxy.c:3312
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:862
-#, fuzzy
-msgid "Failed to connect to the namestore!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/gns/gnunet-service-gns.c:870
+#: 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:903
+#: src/gns/gnunet-service-gns.c:461
+#: src/zonemaster/gnunet-service-zonemaster.c:742
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/gns/gnunet-service-gns.c:919
-#, fuzzy
-msgid "valid public key required"
-msgstr "“%s”的参数无效。\n"
-
 #: src/gns/gnunet-service-gns_interceptor.c:263
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:369
+#: 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:816
+#: 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:652
+#, c-format
+msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
+msgstr ""
+
+#: 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:958
+#: 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:1317
+#: 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:1817
+#: 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:1841
+#: 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:2173
+#: 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:2322
+#: src/gns/gnunet-service-gns_resolver.c:2318
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:151
+#: src/gns/plugin_gnsrecord_gns.c:203
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:180
+#: src/gns/plugin_gnsrecord_gns.c:232
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:253
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:217
+#: src/gns/plugin_gnsrecord_gns.c:276
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:293
+#: 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:360
+#, fuzzy, c-format
+msgid "Unable to parse REVERSE record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/plugin_rest_gns.c:384
+msgid "Ego for not found, cannot perform lookup.\n"
+msgstr ""
+
+#: src/gns/plugin_rest_gns.c:668
+msgid "GNS REST API initialized\n"
+msgstr ""
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:314
+#: src/gnsrecord/plugin_gnsrecord_dns.c:380
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:336
+#: src/gnsrecord/plugin_gnsrecord_dns.c:402
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:420
+#: src/gnsrecord/plugin_gnsrecord_dns.c:487
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#: src/gnsrecord/plugin_gnsrecord_dns.c:523
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:471
+#: src/gnsrecord/plugin_gnsrecord_dns.c:542
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:494
+#: src/gnsrecord/plugin_gnsrecord_dns.c:565
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:514
+#: src/gnsrecord/plugin_gnsrecord_dns.c:588
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:529
+#: src/gnsrecord/plugin_gnsrecord_dns.c:603
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:549
+#: src/gnsrecord/plugin_gnsrecord_dns.c:630
+#, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:646
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:663
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:567
+#: src/gnsrecord/plugin_gnsrecord_dns.c:687
+#: src/gnsrecord/plugin_gnsrecord_dns.c:703
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/hello/gnunet-hello.c:123
+#: src/hello/gnunet-hello.c:126
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:129
+#: src/hello/gnunet-hello.c:132
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/gnunet-hello.c:137
+#: src/hello/gnunet-hello.c:140
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:144
+#: src/hello/gnunet-hello.c:147
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
+#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:198
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/gnunet-hello.c:170
+#: src/hello/gnunet-hello.c:174
 #, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:195
+#: src/hello/gnunet-hello.c:210
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/gnunet-hello.c:203
+#: src/hello/gnunet-hello.c:219
 #, c-format
-msgid "Modified %u addresses \n"
+msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:944
+#: src/hello/hello.c:1110
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:953
+#: src/hello/hello.c:1119
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:963
+#: src/hello/hello.c:1129
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/hello/hello.c:973
+#: src/hello/hello.c:1140
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:990
+#: src/hello/hello.c:1158
 #, c-format
-msgid "Plugin `%s' not found\n"
+msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:999
+#: src/hello/hello.c:1166
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1018
+#: src/hello/hello.c:1181
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:259
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/hostlist/gnunet-daemon-hostlist.c:376
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: 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:316
+#: src/hostlist/gnunet-daemon-hostlist.c:385
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:390
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:406
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:288
+#: src/hostlist/gnunet-daemon-hostlist_client.c:371
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
+#: src/hostlist/gnunet-daemon-hostlist_client.c:392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:437
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
+#: src/hostlist/gnunet-daemon-hostlist_client.c:395
+#: src/hostlist/gnunet-daemon-hostlist_client.c:440
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/gnunet-daemon-hostlist_client.c:413
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
+#: src/hostlist/gnunet-daemon-hostlist_client.c:695
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:725
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/gnunet-daemon-hostlist_client.c:768
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/gnunet-daemon-hostlist_client.c:930
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/gnunet-daemon-hostlist_client.c:936
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/gnunet-daemon-hostlist_client.c:944
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/gnunet-daemon-hostlist_client.c:997
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1049
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1285
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1296
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1515
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1471
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/transport/plugin_transport_http_client.c:2274
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1495
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1499
-#, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr ""
-
-#: src/hostlist/hostlist-server.c:137
+#: src/hostlist/gnunet-daemon-hostlist_server.c:176
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:161
+#: src/hostlist/gnunet-daemon-hostlist_server.c:201
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:350
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
-#: src/peerinfo-tool/gnunet-peerinfo.c:490
-#: src/topology/gnunet-daemon-topology.c:925
+#: src/hostlist/gnunet-daemon-hostlist_server.c:237
+#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:385
+#: src/peerinfo-tool/gnunet-peerinfo.c:534
+#: src/topology/gnunet-daemon-topology.c:857
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:210
+#: src/hostlist/gnunet-daemon-hostlist_server.c:261
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/gnunet-daemon-hostlist_server.c:278
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:268
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:271
+#: src/hostlist/gnunet-daemon-hostlist_server.c:385
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:397
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:288
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:296
+#: src/hostlist/gnunet-daemon-hostlist_server.c:408
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/gnunet-daemon-hostlist_server.c:411
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:303
+#: src/hostlist/gnunet-daemon-hostlist_server.c:416
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:304
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:346
+#: src/hostlist/gnunet-daemon-hostlist_server.c:466
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:390
-msgid "Advertisement message could not be queued by core\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/transport/gnunet-service-transport.c:2815
+msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
-#: src/transport/gnunet-service-transport.c:892
-msgid "Could not access PEERINFO service.  Exiting.\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:691
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:576
+#: src/hostlist/gnunet-daemon-hostlist_server.c:703
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:590
+#: src/hostlist/gnunet-daemon-hostlist_server.c:718
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:630
+#: src/hostlist/gnunet-daemon-hostlist_server.c:731
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:748
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:769
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:789
 #, fuzzy, c-format
-msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/hostlist-server.c:673
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:165
+#: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/identity/gnunet-identity.c:184
+#: src/identity/gnunet-identity.c:201
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:356
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:362
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:367
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:336
+#: 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:339
+#: src/identity/gnunet-identity.c:378
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:342
+#: 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:351
+#: src/identity/gnunet-identity.c:398
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:338
+#: src/identity/gnunet-service-identity.c:390
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:362
+#: src/identity/gnunet-service-identity.c:412
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:439
-#: src/identity/gnunet-service-identity.c:670
-#: src/identity/gnunet-service-identity.c:778
+#: src/identity/gnunet-service-identity.c:501
+#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:895
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:446
+#: src/identity/gnunet-service-identity.c:508
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:516
+#: src/identity/gnunet-service-identity.c:601
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:647
+#: src/identity/gnunet-service-identity.c:750
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:686
-#: src/identity/gnunet-service-identity.c:795
+#: src/identity/gnunet-service-identity.c:789
+#: src/identity/gnunet-service-identity.c:912
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:829
+#: src/identity/gnunet-service-identity.c:946
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:902
+#: src/identity/gnunet-service-identity.c:1004
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:914
+#: src/identity/gnunet-service-identity.c:1014
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/mesh/gnunet-mesh.c:348
-#, fuzzy, c-format
-msgid "Invalid target `%s'\n"
-msgstr "“%s”的参数无效。\n"
+#: src/identity/plugin_rest_identity.c:967
+msgid "Identity REST API initialized\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-identity-token.c:66
+#, fuzzy
+msgid "Option `-t' is required\n"
+msgstr "%s：选项“%s”有歧义\n"
 
-#: src/mesh/gnunet-mesh.c:592
+#: src/identity-provider/gnunet-identity-token.c:77
 #, fuzzy, c-format
-msgid "Invalid tunnel owner `%s'\n"
-msgstr "IP 格式无效：“%s”\n"
+msgid "Token `%s' is malformed\n"
+msgstr "“%s”的参数无效。\n"
 
-#: src/mesh/gnunet-mesh.c:658
-msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+#: src/identity-provider/gnunet-identity-token.c:166
+msgid "GNUid token"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:747
-msgid "activate echo mode"
+#: src/identity-provider/gnunet-identity-token.c:171
+msgid "Print token contents"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:753
-msgid "port to listen to (default; 0)"
+#: src/identity-provider/plugin_rest_identity_provider.c:1166
+msgid "Identity Token REST API initialized\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:756
-#, fuzzy
-msgid "provide information about all peers"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/mesh/gnunet-mesh.c:759
-#, fuzzy
-msgid "provide information about a particular tunnel"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/mesh/gnunet-mesh.c:762
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
+#: src/json/json.c:119
+#, fuzzy, c-format
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/mesh/gnunet-service-mesh_peer.c:377
-msgid "Wrong CORE service\n"
+#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72
+msgid "This command doesn't do anything yet."
 msgstr ""
 
-#: src/mysql/mysql.c:174
+#: src/my/my.c:198 src/my/my.c:217
+#, fuzzy, c-format
+msgid "%s failed at %s:%d with error: %s\n"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+
+#: src/mysql/mysql.c:180
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/mysql/mysql.c:181
+#: src/mysql/mysql.c:187
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/namecache/gnunet-namecache.c:109
+#: src/namecache/gnunet-namecache.c:107
 #, fuzzy, c-format
 msgid "No records found for `%s'"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:185
+#: src/namecache/gnunet-namecache.c:183
 #, fuzzy, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
+#: src/namecache/gnunet-namecache.c:193
 #, fuzzy, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
+msgid "Invalid public key for zone `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namecache/gnunet-namecache.c:203
+#: src/namecache/gnunet-namecache.c:201
 #, fuzzy, c-format
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方！\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
+#: 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:237
+#: src/namecache/gnunet-namecache.c:238
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
 
-#: src/namecache/namecache_api.c:276
+#: src/namecache/namecache_api.c:296
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:96
+#: src/namecache/namecache_api.c:383
 #, fuzzy
-msgid "Failed to create indices\n"
+msgid "Error communicating with namecache service"
+msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
+
+#: src/namecache/plugin_namecache_flat.c:119
+#: src/namecache/plugin_namecache_flat.c:253
+#: 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:538
+#, fuzzy, c-format
+msgid "Unable to initialize file: %s.\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/namecache/plugin_namecache_flat.c:130
+#: src/namestore/plugin_namestore_flat.c:190
+#: src/peerstore/plugin_peerstore_flat.c:394
+#, fuzzy, c-format
+msgid "Unable to get filesize: %s.\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namecache/plugin_namecache_flat.c:149
+#: src/namestore/plugin_namestore_flat.c:203
+#: src/peerstore/plugin_peerstore_flat.c:406
+#, fuzzy, c-format
+msgid "Unable to read file: %s.\n"
+msgstr "发送消息失败。\n"
+
+#: src/namecache/plugin_namecache_flat.c:408
+#, fuzzy
+msgid "flat plugin running\n"
+msgstr "sqlite 数据仓库"
+
+#: src/namestore/gnunet-namestore.c:301
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:332
+#: src/namestore/gnunet-namestore.c:330
+#: src/namestore/plugin_rest_namestore.c:562
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:339
+#: src/namestore/gnunet-namestore.c:337
+#: src/namestore/plugin_rest_namestore.c:571
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:558
+#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
+#: src/namestore/gnunet-namestore.c:535
+#, c-format
+msgid "A %s record exists already under `%s', no other records can be added.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:573
+#, c-format
+msgid "Records already exist under `%s', cannot add `%s' record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/plugin_rest_namestore.c:597
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:739
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:776
+#: src/namestore/plugin_rest_namestore.c:1004
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:791
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
-#: src/namestore/gnunet-namestore-fcfsd.c:970
+#: src/namestore/gnunet-namestore.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:1034
+#: src/namestore/plugin_rest_namestore.c:1017
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586
-#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625
-#: src/namestore/gnunet-namestore.c:665
+#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
+#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
+#: src/namestore/gnunet-namestore.c:915
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
-#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
+#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
+#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:829
+#: src/namestore/plugin_rest_namestore.c:671
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:615
+#: src/namestore/gnunet-namestore.c:851
+#: src/namestore/plugin_rest_namestore.c:689
+#: src/namestore/plugin_rest_namestore.c:729
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:651
+#: src/namestore/gnunet-namestore.c:896
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore.c:916
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:723
+#: src/namestore/gnunet-namestore.c:950
+#, fuzzy, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:750
+#: src/namestore/gnunet-namestore.c:1014
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:790
-#, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:817
+#: src/namestore/gnunet-namestore.c:1051
+#: src/namestore/plugin_rest_namestore.c:1047
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:853
-#, fuzzy, c-format
-msgid "Identity service is not running\n"
-msgstr "服务已删除。\n"
-
-#: src/namestore/gnunet-namestore.c:865
+#: src/namestore/gnunet-namestore.c:1108
+#: 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:913
+#: src/namestore/gnunet-namestore.c:1137
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1142
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:1147
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:922
+#: 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:925
+#: 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:928
+#: src/namestore/gnunet-namestore.c:1164
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:1176
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:1184
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:1190
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1196
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:1201
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:949
+#: 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:952
+#: src/namestore/gnunet-namestore.c:1212
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:464
+#: src/namestore/gnunet-namestore-fcfsd.c:508
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:491
+#: src/namestore/gnunet-namestore-fcfsd.c:535
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:525
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:555
+msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:534
-msgid "Error when mapping zone to name\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:585
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:596
+#: src/namestore/gnunet-namestore-fcfsd.c:662
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:652
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:668
+#: src/namestore/gnunet-namestore-fcfsd.c:734
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:704
+#: src/namestore/gnunet-namestore-fcfsd.c:770
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:712
+#: src/namestore/gnunet-namestore-fcfsd.c:778
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:910
+#: src/namestore/gnunet-namestore-fcfsd.c:974
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:936
+#: src/namestore/gnunet-namestore-fcfsd.c:1000
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:978
+#: src/namestore/gnunet-namestore-fcfsd.c:1042
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1011
+#: src/namestore/gnunet-namestore-fcfsd.c:1074
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:638
+#: src/namestore/gnunet-service-namestore.c:615
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_api.c:275
+#: src/namestore/namestore_api.c:379
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:279
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
+#: src/namestore/plugin_namestore_flat.c:656
+#, fuzzy
+msgid "flat file database running\n"
+msgstr "sqlite 数据仓库"
+
+#: src/namestore/plugin_rest_namestore.c:1188
+msgid "Namestore REST API initialized\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:193
+#, fuzzy
+msgid "Suggested configuration changes:\n"
+msgstr ""
+"\n"
+"您的配置更改没有保存。\n"
+
+#: 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:226
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:345
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "配额配置"
+
+#: 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:356 src/nat/gnunet-nat.c:447
+msgid "use TCP"
+msgstr ""
+
+#: 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:366
+msgid "write configuration file (for autoconfiguration)"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:378
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr "GNUnet 配置"
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:403
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681
+#: src/nat-auto/nat_auto_api_test.c:405
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/nat-auto/gnunet-nat-auto_legacy.c:518
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:170
-msgid "NAT traversal with ICMP Server timed out.\n"
+#: src/nat-auto/gnunet-nat-auto_legacy.c:568
+#: src/nat-auto/nat_auto_api_test.c:571
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/nat-auto/gnunet-service-nat-auto.c:342
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:203
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:204
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:225
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:274
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:344
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:360
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/nat/nat_auto.c:413
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:414
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:447
-msgid "gnunet-helper-nat-server found, testing it\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:448
-msgid "No working gnunet-helper-nat-server found\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:482
-msgid "gnunet-helper-nat-client found, enabling it\n"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:483
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat.c:867
-#, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846
+msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat.c:917
-#, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/nat/nat.c:1205
-msgid "malformed"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1288
-#, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
+#: src/nat-auto/nat_auto_api.c:76
+msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat.c:1426
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/nat-auto/nat_auto_api.c:78
+msgid "IPC failure"
 msgstr ""
 
-#: src/nat/nat.c:1442
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+#: src/nat-auto/nat_auto_api.c:80
+msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat_mini.c:155
-msgid "no valid address was returned by `external-ip'"
+#: src/nat-auto/nat_auto_api.c:82
+msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat_mini.c:175
-msgid "`external-ip' command not found"
+#: src/nat-auto/nat_auto_api.c:84
+msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat_mini.c:201
-msgid "`external-ip' command not found\n"
+#: src/nat-auto/nat_auto_api.c:86
+msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat_mini.c:366
+#: src/nat-auto/nat_auto_api.c:88
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat/nat_mini.c:512
+#: src/nat-auto/nat_auto_api.c:90
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat_mini.c:540
+#: src/nat-auto/nat_auto_api.c:92
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat_mini.c:604
-msgid "`upnpc' command not found\n"
+#: src/nat-auto/nat_auto_api.c:94
+msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat_mini.c:608
-msgid "`upnpc` command not found"
+#: src/nat-auto/nat_auto_api.c:96
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/nat-auto/nat_auto_api.c:98
+msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat_test.c:351
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/nat-auto/nat_auto_api.c:100
+msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat_test.c:423
+#: src/nat-auto/nat_auto_api.c:102
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "无法确定用户界面定义文件。"
+
+#: src/nat-auto/nat_auto_api.c:104
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr ""
+
+#: src/nat-auto/nat_auto_api.c:106
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat-auto/nat_auto_api.c:108
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat-auto/nat_auto_api.c:110
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat-auto/nat_auto_api.c:112
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr ""
+
+#: src/nat-auto/nat_auto_api_test.c:477
+#, fuzzy, c-format
+msgid "Failed to find valid PORT in section `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/nat-auto/nat_auto_api_test.c:522
+#, fuzzy, c-format
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: 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:431
+msgid "which remote IP and port should be asked for connection reversal"
+msgstr ""
+
+#: 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:442
+msgid "enable STUN processing"
+msgstr ""
+
+#: src/nat/gnunet-nat.c:457
+msgid "watch for connection reversal requests"
+msgstr ""
+
+#: src/nat/gnunet-nat.c:469
+msgid "GNUnet NAT traversal autoconfigure daemon"
+msgstr ""
+
+#: src/nat/gnunet-service-nat.c:1335
 #, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:858
-msgid "limit to the number of connections to NSE services, 0 for none"
+#: src/nat/gnunet-service-nat.c:1345
+#, c-format
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:861
-msgid "name of the file for writing connection information and statistics"
+#: src/nat/gnunet-service-nat.c:1361
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
-msgid "name of the file with the login information for the testbed"
+#: 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:1837
+msgid "Connection reversal request failed\n"
+msgstr ""
+
+#: src/nat/gnunet-service-nat.c:1910
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP\n"
+msgstr ""
+
+#: src/nat/gnunet-service-nat_helper.c:186
+#, c-format
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgstr ""
+
+#: src/nat/gnunet-service-nat_helper.c:273
+#, fuzzy, c-format
+msgid "Failed to start %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/nat/gnunet-service-nat_mini.c:196
+msgid "`external-ip' command not found\n"
+msgstr ""
+
+#: src/nat/gnunet-service-nat_mini.c:656
+msgid "`upnpc' command not found\n"
+msgstr ""
+
+#: src/nse/gnunet-nse.c:122
+msgid "Show network size estimates from NSE service."
+msgstr ""
+
+#: 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:847
+msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:867
+#: src/nse/gnunet-nse-profiler.c:859
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:870
+#: 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:876
+#: src/nse/gnunet-nse-profiler.c:877
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:885
+#: src/nse/gnunet-nse-profiler.c:886
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:1462
-#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:215
+#: src/peerinfo/gnunet-service-peerinfo.c:178
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:354
+#: src/peerinfo/gnunet-service-peerinfo.c:310
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:373
-#: src/peerinfo/gnunet-service-peerinfo.c:390
+#: src/peerinfo/gnunet-service-peerinfo.c:331
+#: src/peerinfo/gnunet-service-peerinfo.c:362
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:468
+#: src/peerinfo/gnunet-service-peerinfo.c:446
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:505
+#: src/peerinfo/gnunet-service-peerinfo.c:489
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5142,957 +5402,982 @@ msgstr ""
 msgid "Scanning directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:660
+#: src/peerinfo/gnunet-service-peerinfo.c:663
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:996
+#: src/peerinfo/gnunet-service-peerinfo.c:1080
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1286
+#: src/peerinfo/gnunet-service-peerinfo.c:1409
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:236
-msgid "aborted due to explicit disconnect request"
+#: src/peerinfo/gnunet-service-peerinfo.c:1422
+msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356
-#, fuzzy
-msgid "failed to transmit request (service down?)"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/peerinfo/peerinfo_api.c:506
+#: src/peerinfo/peerinfo_api.c:220
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
-#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
-#: src/peerinfo/peerinfo_api.c:603
-#, fuzzy
-msgid "Received invalid message from `PEERINFO' service."
-msgstr "“%s”的参数无效。\n"
-
-#: src/peerinfo/peerinfo_api.c:678
-#, fuzzy
-msgid "Timeout transmitting iteration request to `PEERINFO' service."
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/peerinfo/peerinfo_api_notify.c:268
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:232
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:299
 #, fuzzy, c-format
-msgid "Failure: Did not receive %s\n"
-msgstr "æ\89\93å¼\80æ\97¥å¿\97æ\96\87件â\80\9c%sâ\80\9d失败ï¼\9a%s\n"
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgstr "æ\89¾ä¸\8då\88°æ\8e¥å\8f£â\80\9c%sâ\80\9dç\9a\84ä¸\80个 IP å\9c°å\9d\80ã\80\82\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:436
+#: src/peerinfo-tool/gnunet-peerinfo.c:466
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:480
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:522
-#, c-format
-msgid "Failure adding HELLO: %s\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:633
-#, fuzzy, c-format
-msgid "Service `%s' is not running, please start GNUnet\n"
-msgstr "服务已删除。\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
+#: src/peerinfo-tool/gnunet-peerinfo.c:799
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:843
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:848
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:852
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:857
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:862
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:804
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:807
+#: src/peerinfo-tool/gnunet-peerinfo.c:873
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:810
+#: src/peerinfo-tool/gnunet-peerinfo.c:879
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:897
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:126
+#: src/transport/gnunet-service-transport_plugins.c:168
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:131
+#: src/transport/gnunet-service-transport_plugins.c:173
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:163
+#: src/transport/gnunet-service-transport_plugins.c:208
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/postgres/postgres.c:59
+#: src/peerstore/gnunet-peerstore.c:91
+msgid "peerstore"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:598
 #, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+msgid "Could not load database backend `%s'\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/peerstore/peerstore_api.c:350
+msgid "timeout"
+msgstr ""
+
+#: 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:629
+#, fuzzy
+msgid "Received a malformed response from service."
+msgstr "“%s”的参数无效。\n"
 
-#: src/postgres/postgres.c:148
+#: src/peerstore/peerstore_api.c:778
+msgid "Received a watch result for a non existing watch.\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:453
+#: src/psycstore/plugin_psycstore_sqlite.c:282
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "无法初始化 SQLite：%s。\n"
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "创建用户出错"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:488
+#: src/psycstore/plugin_psycstore_mysql.c:250
+#: src/psycstore/plugin_psycstore_sqlite.c:259
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "创建用户出错"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:570
+#, fuzzy, c-format
+msgid "Unable to create indices: %s.\n"
+msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:200
+#: src/pq/pq_prepare.c:80
+#, fuzzy, c-format
+msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:249
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:224
+#: src/psycstore/gnunet-service-psycstore.c:271
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:246
+#: src/psycstore/gnunet-service-psycstore.c:300
+#, fuzzy
+msgid "Dropping invalid fragment\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:311
 #, fuzzy
-msgid "Failed to store fragment!\n"
+msgid "Failed to store fragment\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:272
+#: src/psycstore/gnunet-service-psycstore.c:368
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:299
+#: src/psycstore/gnunet-service-psycstore.c:434
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:328
+#: src/psycstore/gnunet-service-psycstore.c:464
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:356
+#: src/psycstore/gnunet-service-psycstore.c:494
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:392
-#: src/psycstore/gnunet-service-psycstore.c:465
-msgid "Tried to set invalid state variable name!\n"
-msgstr ""
-
-#: src/psycstore/gnunet-service-psycstore.c:408
-#, fuzzy
-msgid "Failed to begin modifying state!\n"
+#: src/psycstore/gnunet-service-psycstore.c:675
+#, fuzzy, c-format
+msgid "Failed to begin modifying state: %d\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:431
+#: src/psycstore/gnunet-service-psycstore.c:685
 #, fuzzy, c-format
-msgid "Unknown operator: %c\n"
-msgstr "未知错误"
+msgid "Failed to modify state: %d\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:441
+#: src/psycstore/gnunet-service-psycstore.c:693
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:479
+#: src/psycstore/gnunet-service-psycstore.c:730
+msgid "Tried to set invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:744
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:495
+#: src/psycstore/gnunet-service-psycstore.c:761
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:515
-#: src/psycstore/gnunet-service-psycstore.c:534
+#: src/psycstore/gnunet-service-psycstore.c:779
+#: src/psycstore/gnunet-service-psycstore.c:795
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:557
-#: src/psycstore/gnunet-service-psycstore.c:608
+#: src/psycstore/gnunet-service-psycstore.c:824
+#: src/psycstore/gnunet-service-psycstore.c:881
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:584
-#: src/psycstore/gnunet-service-psycstore.c:623
+#: src/psycstore/gnunet-service-psycstore.c:851
+#: src/psycstore/gnunet-service-psycstore.c:896
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:60
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s (%d)\n"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+#: src/psycstore/plugin_psycstore_mysql.c:281
+#, fuzzy
+msgid "Unable to initialize Mysql.\n"
+msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:253
+#: src/psycstore/plugin_psycstore_mysql.c:291
 #, fuzzy, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr "创建用户出错"
+msgid "Failed to run SQL statement `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:276
+#: src/psycstore/plugin_psycstore_sqlite.c:61
 #, fuzzy, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr "创建用户出错"
+msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#: src/psycstore/plugin_psycstore_sqlite.c:1924
 #, fuzzy
 msgid "SQLite database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/pt/gnunet-daemon-pt.c:482
+#: src/pt/gnunet-daemon-pt.c:423
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:488
+#: src/pt/gnunet-daemon-pt.c:429
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:541
+#: src/pt/gnunet-daemon-pt.c:483
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:717
+#: src/pt/gnunet-daemon-pt.c:667
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:723
+#: src/pt/gnunet-daemon-pt.c:674
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:826
+#: src/pt/gnunet-daemon-pt.c:712
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:768
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:888
-msgid "# DNS requests dropped (DNS mesh channel down)"
+#: src/pt/gnunet-daemon-pt.c:773
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:896
+#: src/pt/gnunet-daemon-pt.c:781
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:969
+#: src/pt/gnunet-daemon-pt.c:876
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:985
+#: src/pt/gnunet-daemon-pt.c:893
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1261 src/pt/gnunet-daemon-pt.c:1270
-#: src/pt/gnunet-daemon-pt.c:1290 src/pt/gnunet-daemon-pt.c:1301
-#: src/pt/gnunet-daemon-pt.c:1310
+#: 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:1347
+#: src/pt/gnunet-daemon-pt.c:1307
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-regex-simulation-profiler.c:659
+#: src/regex/gnunet-daemon-regexprofiler.c:267
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "立即保存配置？"
 
 #: src/regex/gnunet-daemon-regexprofiler.c:380
-msgid "Daemon to announce regular expressions for the peer using mesh."
+msgid "Daemon to announce regular expressions for the peer using cadet."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1288
+#: src/regex/gnunet-regex-profiler.c:1386
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1299
-#, fuzzy
-msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/regex/gnunet-regex-profiler.c:1328
-#: src/regex/gnunet-regex-simulation-profiler.c:622
+#: src/regex/gnunet-regex-profiler.c:1427
+#: src/regex/gnunet-regex-simulation-profiler.c:630
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1334
-#: src/regex/gnunet-regex-simulation-profiler.c:629
+#: src/regex/gnunet-regex-profiler.c:1433
+#: src/regex/gnunet-regex-simulation-profiler.c:638
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1341
+#: src/regex/gnunet-regex-profiler.c:1440
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/regex/gnunet-regex-profiler.c:1350
+#: src/regex/gnunet-regex-profiler.c:1449
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1370
+#: src/regex/gnunet-regex-profiler.c:1469
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1557
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1458
+#: src/regex/gnunet-regex-profiler.c:1563
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1461
+#: src/regex/gnunet-regex-profiler.c:1569
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1464
+#: src/regex/gnunet-regex-profiler.c:1576
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1582
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1479
+#: src/regex/gnunet-regex-profiler.c:1595
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
+#: src/regex/gnunet-regex-simulation-profiler.c:699
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:692
+#: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:705
+#: src/regex/gnunet-regex-simulation-profiler.c:719
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api.c:131
+#: src/regex/regex_api_announce.c:152
 #, fuzzy, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr "服务已删除。\n"
 
-#: src/revocation/gnunet-revocation.c:126
+#: src/regex/regex_api_search.c:212
+#, fuzzy, c-format
+msgid "Search string `%s' is too long!\n"
+msgstr "服务已删除。\n"
+
+#: src/rest/gnunet-rest-server.c:790
+msgid "listen on specified port (default: 7776)"
+msgstr ""
+
+#: src/rest/gnunet-rest-server.c:807
+#, fuzzy
+msgid "GNUnet REST server"
+msgstr "GNUnet 错误日志"
+
+#: src/revocation/gnunet-revocation.c:129
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:134
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "服务已删除。\n"
 
-#: src/revocation/gnunet-revocation.c:137
+#: src/revocation/gnunet-revocation.c:140
 #, fuzzy
 msgid "Internal error\n"
 msgstr "未知错误。\n"
 
-#: src/revocation/gnunet-revocation.c:163
+#: src/revocation/gnunet-revocation.c:166
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:168
+#: src/revocation/gnunet-revocation.c:171
 msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:176
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:178
+#: src/revocation/gnunet-revocation.c:181
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:183
+#: src/revocation/gnunet-revocation.c:186
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:294
+#: src/revocation/gnunet-revocation.c:323
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:324
+#: src/revocation/gnunet-revocation.c:352
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:345
+#: src/revocation/gnunet-revocation.c:373
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:365
+#: src/revocation/gnunet-revocation.c:393
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:375
+#: src/revocation/gnunet-revocation.c:403
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:407
+#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/revocation/gnunet-revocation.c:421
+#: src/revocation/gnunet-revocation.c:450
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:441
+#: src/revocation/gnunet-revocation.c:470
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/revocation/gnunet-revocation.c:463
+#: src/revocation/gnunet-revocation.c:491
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/revocation/gnunet-revocation.c:488
+#: src/revocation/gnunet-revocation.c:516
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "没有指定接口，将使用默认。\n"
 
-#: src/revocation/gnunet-revocation.c:504
+#: src/revocation/gnunet-revocation.c:535
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:507
+#: 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:510
+#: src/revocation/gnunet-revocation.c:546
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:513
+#: src/revocation/gnunet-revocation.c:552
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:272
-msgid "Duplicate revocation received from peer. Ignored.\n"
+#: src/revocation/gnunet-service-revocation.c:459
+msgid "# unsupported revocations received via set union"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:468
+msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:434
+#: 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:477
+#, fuzzy
+msgid "# revocation set unions failed"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
 #: src/revocation/gnunet-service-revocation.c:486
+msgid "# revocation set unions completed"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:525
+#: src/revocation/gnunet-service-revocation.c:773
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:812
+#: src/revocation/gnunet-service-revocation.c:864
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:225
+#: src/rps/gnunet-rps.c:146
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:232
+#: src/scalarproduct/gnunet-scalarproduct.c:227
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:239
-msgid "Please give a session key for --input_key!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:251
+#: src/scalarproduct/gnunet-scalarproduct.c:240
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:278
-#: src/scalarproduct/gnunet-scalarproduct.c:314
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int32_t.\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:286
-msgid "Need elements to compute the vectorproduct, got none.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:258
+msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:346
+#: src/scalarproduct/gnunet-scalarproduct.c:280
+#, fuzzy, c-format
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:298
 #, fuzzy, c-format
-msgid "Could not convert `%s' to integer.\n"
+msgid "Could not convert `%s' to int64_t.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:407
-msgid ""
-"A comma separated list of elements to compare as vector with our remote peer."
+#: src/scalarproduct/gnunet-scalarproduct.c:325
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:410
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:357
 msgid ""
-"A comma separated mask to select which elements should actually be compared."
+"A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:413
+#: 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:416
+#: src/scalarproduct/gnunet-scalarproduct.c:369
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:425
+#: src/scalarproduct/gnunet-scalarproduct.c:379
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:450
-#, c-format
-msgid "Generated key set with key length %d bits.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:746
-#, fuzzy, c-format
-msgid "Client (%p) disconnected from us.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
+#, fuzzy
+msgid "Connect to CADET failed\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:818
-#: src/scalarproduct/gnunet-service-scalarproduct.c:908
-#, fuzzy, c-format
-msgid "Could not send message to client (%p)!\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:824
-#, c-format
-msgid "Sending session-end notification to client (%p) for session %s\n"
+#: src/scalarproduct/scalarproduct_api.c:185
+msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:918
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg start delay"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:997
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1135
-msgid "Could not send service-response message via mesh!)\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "dkg timeout"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1340
-#, c-format
-msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:628
+msgid "threshold"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1444
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1571
-msgid "Transmitting service request.\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:633
+msgid "also profile decryption"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1453
+#: src/set/gnunet-service-set.c:1989
 #, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
-msgstr "æ\89¾ä¸\8då\88°æ\8e¥å\8f£â\80\9c%sâ\80\9dç\9a\84ä¸\80个 IP å\9c°å\9d\80ã\80\82\n"
+msgid "Could not connect to CADET service\n"
+msgstr "æ\97 æ³\95è¿\9eæ\8e¥å\88° %s:%uï¼\9a%s\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1493
-#, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "“%s”已连接到“%s”。\n"
+#: src/set/gnunet-set-ibf-profiler.c:252
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "迭代次数"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1580
+#: src/set/gnunet-set-ibf-profiler.c:258
 #, fuzzy
-msgid "Could not send message to channel!\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+msgid "number of element in set B-A"
+msgstr "迭代次数"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1637
-msgid "Too short message received from client!\n"
+#: src/set/gnunet-set-ibf-profiler.c:264
+msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1650
-msgid "Invalid message received from client, session information incorrect!\n"
+#: src/set/gnunet-set-ibf-profiler.c:270
+msgid "hash num"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1661
-#, c-format
-msgid ""
-"Duplicate session information received, cannot create new session with key `"
-"%s'\n"
+#: src/set/gnunet-set-ibf-profiler.c:276
+msgid "ibf size"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
-#, c-format
-msgid ""
-"Got client-request-session with key %s, preparing channel to remote "
-"service.\n"
+#: src/set/gnunet-set-profiler.c:444
+msgid "use byzantine mode"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1721
-#, c-format
-msgid "Creating new channel for session with key %s.\n"
+#: src/set/gnunet-set-profiler.c:450
+msgid "force sending full set"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1768
-#, c-format
-msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
+#: src/set/gnunet-set-profiler.c:456
+msgid "number delta operation"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1779
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
+#: src/set/gnunet-set-profiler.c:468
+msgid "operation to execute"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1809
-#, fuzzy, c-format
-msgid "New incoming channel from peer %s.\n"
-msgstr "“%s”已连接到“%s”。\n"
+#: src/set/gnunet-set-profiler.c:474
+msgid "element size"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1841
-#, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+#: src/social/gnunet-social.c:1166
+#, fuzzy
+msgid "--place missing or invalid.\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/social/gnunet-social.c:1217
+msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2032
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2191
-#, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+#: src/social/gnunet-social.c:1222
+msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2041
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2198
-#, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+#: src/social/gnunet-social.c:1227
+msgid "create a place"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2136
-#, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+#: src/social/gnunet-social.c:1232
+msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2420
-msgid "Shutting down, initiating cleanup.\n"
+#: src/social/gnunet-social.c:1237
+msgid "enter somebody else's place"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2485
-msgid "Generating Paillier-Keyset.\n"
+#: src/social/gnunet-social.c:1243
+msgid "find state matching name prefix"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2500
-#, fuzzy
-msgid "Connect to MESH failed\n"
-msgstr "“%s”已连接到“%s”。\n"
+#: src/social/gnunet-social.c:1248
+msgid "replay history of messages up to the given --limit"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2504
-msgid "Mesh initialized\n"
+#: src/social/gnunet-social.c:1253
+msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:246
-msgid "# SUC responder result messages received"
+#: src/social/gnunet-social.c:1258
+msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:300
-msgid "# bytes sent to scalarproduct"
+#: src/social/gnunet-social.c:1263
+msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:345
-#: src/scalarproduct/scalarproduct_api.c:440
-#, fuzzy
-msgid "Failed to connect to the scalarproduct service\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/social/gnunet-social.c:1268
+msgid "search for state matching exact name"
+msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:353
-#: src/scalarproduct/scalarproduct_api.c:448
-#, fuzzy
-msgid "Failed to send a message to the statistics service\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/social/gnunet-social.c:1273
+msgid "submit something to somebody's place"
+msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:387
-#: src/scalarproduct/scalarproduct_api.c:485
-#, fuzzy
-msgid "Failed to send a message to the scalarproduct service\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/social/gnunet-social.c:1278
+msgid "list of egos and subscribed places"
+msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:517
-msgid "dkg timeout"
+#: src/social/gnunet-social.c:1283
+msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:520
-msgid "threshold"
+#: src/social/gnunet-social.c:1292
+msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:523
-msgid "also profile decryption"
+#: src/social/gnunet-social.c:1298
+msgid "message body or state value"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1415
+#: src/social/gnunet-social.c:1304
 #, fuzzy
-msgid "Could not connect to mesh service\n"
-msgstr "无法连接到 %s:%u：%s\n"
+msgid "name or public key of ego"
+msgstr "“%s”的参数无效。\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:221
+#: src/social/gnunet-social.c:1309
 #, fuzzy
-msgid "number of element in set A-B"
-msgstr "迭代次数"
+msgid "wait for incoming messages"
+msgstr "发送消息失败。\n"
 
-#: src/set/gnunet-set-ibf-profiler.c:224
-#, fuzzy
-msgid "number of element in set B-A"
-msgstr "迭代次数"
+#: src/social/gnunet-social.c:1315
+msgid "GNS name"
+msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:227
-msgid "number of common elements in A and B"
+#: src/social/gnunet-social.c:1321
+msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:230
-msgid "hash num"
+#: src/social/gnunet-social.c:1327
+msgid "name (key) to query from state"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:233
-msgid "ibf size"
+#: src/social/gnunet-social.c:1333
+msgid "method name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1339
+#, fuzzy
+msgid "number of messages to replay from history"
+msgstr "每次迭代所使用的消息数量"
+
+#: src/social/gnunet-social.c:1345
+msgid "key address of place"
+msgstr ""
+
+#: src/social/gnunet-social.c:1351
+msgid "start message ID for history replay"
+msgstr ""
+
+#: src/social/gnunet-social.c:1356
+msgid "respond to entry requests by admitting all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1362
+msgid "end message ID for history replay"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:295
-msgid "oeration to execute"
+#: src/social/gnunet-social.c:1367
+msgid "respond to entry requests by refusing all guests"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:280
+#: src/social/gnunet-social.c:1377
+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 "Loading %llu bytes of statistics from `%s'\n"
+msgid "Failure to bind %u-th SQL parameter\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:346
+#: 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-statistics.c:140
+#: src/statistics/gnunet-service-statistics.c:1086
+#, c-format
+msgid "Loading %llu bytes of statistics from `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:158
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:161
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:189
+#: src/statistics/gnunet-statistics.c:219
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:227
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:226
+#: src/statistics/gnunet-statistics.c:270
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:234
+#: src/statistics/gnunet-statistics.c:285
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:261
+#: src/statistics/gnunet-statistics.c:321
 #, fuzzy, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Invalid argument `%s'\n"
+msgstr "“%s”的参数无效。\n"
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:339
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/statistics/gnunet-statistics.c:276
+#: src/statistics/gnunet-statistics.c:347
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:308
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:385
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:390
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:396
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:401
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:406
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:412
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:417
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:433
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:506
+#: src/statistics/statistics_api.c:753
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/statistics_api.c:1074
-msgid ""
-"Failed to receive acknowledgement from statistics service, some statistics "
-"might have been lost!\n"
-msgstr ""
-
-#: src/testbed/generate-underlay-topology.c:223
-msgid "Need atleast 2 arguments\n"
-msgstr ""
+#: src/testbed/generate-underlay-topology.c:225
+#, fuzzy
+msgid "Need at least 2 arguments\n"
+msgstr "您必须指定一个昵称\n"
 
-#: src/testbed/generate-underlay-topology.c:228
+#: src/testbed/generate-underlay-topology.c:230
 msgid "Database filename missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:235
+#: src/testbed/generate-underlay-topology.c:237
 msgid "Topology string missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:240
+#: src/testbed/generate-underlay-topology.c:242
 #, fuzzy, c-format
 msgid "Invalid topology: %s\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/testbed/generate-underlay-topology.c:252
+#: src/testbed/generate-underlay-topology.c:255
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:258
+#: src/testbed/generate-underlay-topology.c:261
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/testbed/generate-underlay-topology.c:266
+#: src/testbed/generate-underlay-topology.c:269
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:280
+#: src/testbed/generate-underlay-topology.c:283
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:286
+#: src/testbed/generate-underlay-topology.c:289
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/testbed/generate-underlay-topology.c:335
-#: src/testbed/gnunet-testbed-profiler.c:293
+#: src/testbed/generate-underlay-topology.c:342
+#: src/testbed/gnunet-testbed-profiler.c:283
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:344
+#: 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"
@@ -6116,190 +6401,226 @@ msgid ""
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:325
+#: src/testbed/gnunet-daemon-latency-logger.c:315
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
+#: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:474
+#: src/testbed/gnunet-daemon-testbed-underlay.c:471
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:727
+#: src/testbed/gnunet-service-testbed_cpustatus.c:728
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
-#, 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: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:1021
-msgid "Request doesn't fit into a message"
+#: src/testbed/gnunet-service-testbed_peers.c:1171
+#, c-format
+msgid "%s is stopped already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: 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_testbed_mpi_spawn.c:125
+#: 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 ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:247
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
 #, fuzzy, c-format
 msgid "Spawning process `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/testbed/gnunet-testbed-profiler.c:267
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "增加 TCP/IP 的最大连接数"
-
-#: src/testbed/gnunet-testbed-profiler.c:296
+#: src/testbed/gnunet-testbed-profiler.c:289
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:299
+#: src/testbed/gnunet-testbed-profiler.c:294
 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 "
 "signal is received"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:415
+#: src/testbed/testbed_api.c:410
+#, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "“%s”以错误码 %d 失败：%s\n"
+
+#: src/testbed/testbed_api_hosts.c:413
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:423
+#: src/testbed/testbed_api_hosts.c:421
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:430
+#: src/testbed/testbed_api_hosts.c:428
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:570
+#: src/testbed/testbed_api_hosts.c:569
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1586
-#, fuzzy, c-format
-msgid "Adding host %u failed with error: %s\n"
-msgstr "“%s”以错误码 %d 失败：%s\n"
-
-#: src/testbed/testbed_api_testbed.c:819
+#: src/testbed/testbed_api_testbed.c:818
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:988
+#: src/testbed/testbed_api_testbed.c:986
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1054
+#: src/testbed/testbed_api_testbed.c:1052
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1143
+#: src/testbed/testbed_api_testbed.c:1141
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1147
+#: src/testbed/testbed_api_testbed.c:1145
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1185
+#: src/testbed/testbed_api_testbed.c:1183
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1203
+#: src/testbed/testbed_api_testbed.c:1201
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1263
+#: src/testbed/testbed_api_testbed.c:1261
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1275
+#: src/testbed/testbed_api_testbed.c:1273
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1299
+#: src/testbed/testbed_api_testbed.c:1297
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1349
+#: src/testbed/testbed_api_testbed.c:1347
 #, c-format
 msgid ""
 "Maximum number of edges a peer can have in a scale free topology cannot be "
 "more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1365
+#: src/testbed/testbed_api_testbed.c:1363
 #, c-format
 msgid ""
 "The number of edges that can established when adding a new node to scale "
 "free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:960
+#: src/testbed/testbed_api_topology.c:1028
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:1036
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:973
+#: src/testbed/testbed_api_topology.c:1044
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:995
+#: src/testbed/testbed_api_topology.c:1066
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:1004
-#: src/testbed/testbed_api_topology.c:1028
+#: src/testbed/testbed_api_topology.c:1075
+#: src/testbed/testbed_api_topology.c:1099
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1010
-#: src/testbed/testbed_api_topology.c:1034
+#: src/testbed/testbed_api_topology.c:1081
+#: src/testbed/testbed_api_topology.c:1105
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:1016
-#: src/testbed/testbed_api_topology.c:1040
+#: src/testbed/testbed_api_topology.c:1087
+#: src/testbed/testbed_api_topology.c:1111
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1145
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "无法连接到 %s:%u：%s\n"
@@ -6309,864 +6630,843 @@ msgstr "无法连接到 %s:%u：%s\n"
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/gnunet-testing.c:258
+#: src/testing/gnunet-testing.c:253
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:355
+#: src/testing/gnunet-testing.c:354
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/testing/gnunet-testing.c:357
+#: src/testing/gnunet-testing.c:359
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:359
+#: 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:361
+#: src/testing/gnunet-testing.c:372
 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
 
-#: src/testing/gnunet-testing.c:363
+#: 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:376
+#: src/testing/gnunet-testing.c:391
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:90
+#: src/testing/list-keys.c:89
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:93
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
-
-#: src/testing/testing.c:277
+#: src/testing/testing.c:272
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:716
+#: src/testing/testing.c:715
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:1155
+#: 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:1164
+#: src/testing/testing.c:1168
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:1174
+#: src/testing/testing.c:1178
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
-#: src/testing/testing.c:1187
+#: 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:1201
+#: src/testing/testing.c:1205
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing.c:1213
+#: 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:1238
+#: 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:1340
+#: src/testing/testing.c:1344
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/testing/testing.c:1704
+#: 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/gnunet-daemon-topology.c:255
+#: src/topology/friends.c:160
+#, c-format
+msgid "Directory for file `%s' does not seem to be writable.\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:225
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:388
-msgid "# connect requests issued to transport"
+#: src/topology/gnunet-daemon-topology.c:339
+msgid "# connect requests issued to ATS"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:533
+msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:728
-#: src/topology/gnunet-daemon-topology.c:813
+#: src/topology/gnunet-daemon-topology.c:635
+#: src/topology/gnunet-daemon-topology.c:721
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:918
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1022
+#: src/topology/gnunet-daemon-topology.c:951
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1029
+#: src/topology/gnunet-daemon-topology.c:958
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:980
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:983
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1057
+#: src/topology/gnunet-daemon-topology.c:990
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1063
+#: src/topology/gnunet-daemon-topology.c:996
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1094
+#: src/topology/gnunet-daemon-topology.c:1059
+#: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1151
-msgid "# HELLO messages gossipped"
+#: src/topology/gnunet-daemon-topology.c:1233
+msgid "GNUnet topology control"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1290
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:267
-#, fuzzy, c-format
-msgid "Adding blacklisting entry for peer `%s'\n"
-msgstr "卸载 GNUnet 服务"
-
-#: src/transport/gnunet-service-transport_blacklist.c:275
-#, c-format
-msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+#: src/transport/gnunet-service-transport.c:448
+msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:455
-#: src/transport/gnunet-service-transport_blacklist.c:726
-msgid "# disconnects due to blacklist"
+#: src/transport/gnunet-service-transport.c:818
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:201
+#: src/transport/gnunet-service-transport.c:1551
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:298
+#: src/transport/gnunet-service-transport.c:1711
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:365
+#: src/transport/gnunet-service-transport.c:1808
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:521
+#: src/transport/gnunet-service-transport.c:2125
+#: src/transport/gnunet-service-transport.c:2597
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:2601
+#, fuzzy, c-format
+msgid "Disallowing connection to peer `%s' on transport %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/gnunet-service-transport.c:2709
 #, fuzzy, c-format
-msgid "Could not obtain a valid network for `%s' %s (%s)\n"
-msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
+msgid "Adding blacklisting entry for peer `%s'\n"
+msgstr "卸载 GNUnet 服务"
 
-#: src/transport/gnunet-service-transport.c:568
+#: src/transport/gnunet-service-transport.c:2718
 #, c-format
-msgid ""
-"Address or session unknown: failed to update properties for peer `%s' plugin "
-"`%s' address `%s' session %p\n"
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:862
+#: src/transport/gnunet-service-transport.c:2783
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/transport/gnunet-service-transport_clients.c:432
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:439
-msgid "# messages dropped due to slow client"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:596
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:737
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/transport/gnunet-service-transport_hello.c:195
+msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:794
-msgid "# REQUEST CONNECT messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:804
+msgid "# session creation failed"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:181
-msgid "# refreshed my HELLO"
+#: src/transport/gnunet-service-transport_neighbours.c:1047
+msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1027
-msgid "# DISCONNECT messages sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1168
+msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1163
-#: src/transport/gnunet-service-transport_neighbours.c:1573
+#: 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:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1316
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1173
+#: src/transport/gnunet-service-transport_neighbours.c:1322
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1230
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1287
-msgid "# keepalives sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1458
+msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1320
+#: src/transport/gnunet-service-transport_neighbours.c:1494
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1328
+#: src/transport/gnunet-service-transport_neighbours.c:1502
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1375
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1512
+msgid "# KEEPALIVES received in good order"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1557
+msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1566
+msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1574
+msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1583
+msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1392
-msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+#: src/transport/gnunet-service-transport_neighbours.c:1588
+msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1400
-msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+#: src/transport/gnunet-service-transport_neighbours.c:1594
+msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1478
+#: 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:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1695
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1528
+#: src/transport/gnunet-service-transport_neighbours.c:1710
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1620
-msgid "# SESSION_CONNECT messages sent"
-msgstr ""
+#: 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:1850
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1636
+#: src/transport/gnunet-service-transport_neighbours.c:1889
+#, fuzzy
+msgid "# SYN messages sent"
+msgstr "消息尺寸"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1906
 #, fuzzy, c-format
-msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgid "Failed to transmit SYN message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1679
-msgid "# CONNECT_ACK messages sent"
-msgstr ""
+#: 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:1947
+#: src/transport/gnunet-service-transport_neighbours.c:2001
 #, fuzzy, c-format
-msgid "Blacklisting dissaproved to connect to peer `%s'\n"
+msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2360
-msgid "# CONNECT messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:2055
+msgid "# SYN_ACK messages sent"
+msgstr ""
+
+#: 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:2233
+msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2365
+#: src/transport/gnunet-service-transport_neighbours.c:2238
 #, c-format
-msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
-msgid "# CONNECT_ACK messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:2623
+msgid "# Attempts to switch addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3105
+msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3175
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:3113
+msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3190
-#: src/transport/gnunet-service-transport_neighbours.c:3226
-msgid "# unexpected CONNECT_ACK messages (not ready)"
+#: src/transport/gnunet-service-transport_neighbours.c:3131
+#: src/transport/gnunet-service-transport_neighbours.c:3155
+msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3239
-msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+#: src/transport/gnunet-service-transport_neighbours.c:3167
+msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3269
-msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+#: src/transport/gnunet-service-transport_neighbours.c:3192
+msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3438
-msgid "# SESSION_ACK messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:3205
+msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3457
-msgid "# unexpected SESSION_ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3377
+msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3511
-msgid "# SET QUOTA messages ignored (no such peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:3413
+msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3526
-msgid "# disconnects due to quota of 0"
+#: src/transport/gnunet-service-transport_neighbours.c:3501
+msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3554
-msgid "# disconnect messages ignored (old format)"
+#: src/transport/gnunet-service-transport_neighbours.c:3508
+msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3560
-msgid "# DISCONNECT messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:3548
+msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3569
-msgid "# disconnect messages ignored (timestamp)"
+#: src/transport/gnunet-service-transport_neighbours.c:3555
+msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3605
-msgid "# other peer asked to disconnect from us"
+#: src/transport/gnunet-service-transport_neighbours.c:3566
+msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3704
+#: src/transport/gnunet-service-transport_neighbours.c:3700
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:118
+#: src/transport/gnunet-service-transport_plugins.c:158
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:176
-#: src/transport/gnunet-service-transport_plugins.c:184
-#: src/transport/gnunet-service-transport_plugins.c:192
-#: src/transport/gnunet-service-transport_plugins.c:200
-#: src/transport/gnunet-service-transport_plugins.c:208
-#: src/transport/gnunet-service-transport_plugins.c:216
-#: src/transport/gnunet-service-transport_plugins.c:224
-#: src/transport/gnunet-service-transport_plugins.c:232
-#: src/transport/gnunet-service-transport_plugins.c:240
-#: src/transport/gnunet-service-transport_plugins.c:248
-#: src/transport/gnunet-service-transport_plugins.c:256
+#: src/transport/gnunet-service-transport_plugins.c:223
+#: src/transport/gnunet-service-transport_plugins.c:231
+#: src/transport/gnunet-service-transport_plugins.c:239
+#: src/transport/gnunet-service-transport_plugins.c:247
+#: src/transport/gnunet-service-transport_plugins.c:255
+#: src/transport/gnunet-service-transport_plugins.c:263
+#: src/transport/gnunet-service-transport_plugins.c:271
+#: src/transport/gnunet-service-transport_plugins.c:279
+#: src/transport/gnunet-service-transport_plugins.c:287
+#: src/transport/gnunet-service-transport_plugins.c:295
+#: src/transport/gnunet-service-transport_plugins.c:303
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:263
+#: src/transport/gnunet-service-transport_plugins.c:310
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:488
-msgid "# address records discarded"
+#: src/transport/gnunet-service-transport_validation.c:388
+msgid "# Addresses in validation map"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:558
-#, c-format
-msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+#: src/transport/gnunet-service-transport_validation.c:491
+#: src/transport/gnunet-service-transport_validation.c:677
+#: src/transport/gnunet-service-transport_validation.c:997
+#: src/transport/gnunet-service-transport_validation.c:1609
+#, fuzzy
+msgid "# validations running"
+msgstr "sqlite 数据仓库"
+
+#: src/transport/gnunet-service-transport_validation.c:532
+msgid "# address records discarded (timeout)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:580
+msgid "# address records discarded (blacklist)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:668
+msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:616
-msgid "# PING without HELLO messages sent"
+#: src/transport/gnunet-service-transport_validation.c:748
+msgid "# validations delayed by global throttle"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:722
+#: src/transport/gnunet-service-transport_validation.c:785
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1011
+#: src/transport/gnunet-service-transport_validation.c:1123
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1062
+#: src/transport/gnunet-service-transport_validation.c:1174
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1072
+#: src/transport/gnunet-service-transport_validation.c:1187
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1190
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1083
+#: src/transport/gnunet-service-transport_validation.c:1198
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1095
+#: src/transport/gnunet-service-transport_validation.c:1211
 #, c-format
 msgid ""
 "Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1103
-#, c-format
-msgid "Received a PING message with validation bug from `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1157
+#: src/transport/gnunet-service-transport_validation.c:1266
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1206
+#: src/transport/gnunet-service-transport_validation.c:1317
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1215
+#: src/transport/gnunet-service-transport_validation.c:1326
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1356
+#: src/transport/gnunet-service-transport_validation.c:1499
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1371
+#: src/transport/gnunet-service-transport_validation.c:1517
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1493
-#, c-format
-msgid "Validation received new %s message for peer `%s' with size %u\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1500
-#, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
+#: src/transport/gnunet-service-transport_validation.c:1572
+msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:302
+#: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:310
+#: src/transport/gnunet-transport.c:423
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:369
+#: src/transport/gnunet-transport.c:467
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:382
+#: 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:392
+#: src/transport/gnunet-transport.c:494
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:506
-#, fuzzy, c-format
-msgid ""
-"Peer `%s' %s %s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/transport/gnunet-transport.c:533
-#, fuzzy, c-format
-msgid "Peer `%s' %s `%s' \n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/transport/gnunet-transport.c:643
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:657
+#: src/transport/gnunet-transport.c:527
 #, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
+msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:722
+#: src/transport/gnunet-transport.c:561
 #, c-format
-msgid "Transmitting %u bytes to %s\n"
+msgid ""
+"Successfully connected to `%s', starting to send benchmark data in %u Kb "
+"blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:743
+#: src/transport/gnunet-transport.c:592
 #, fuzzy, c-format
-msgid "Successfully connected to `%s'\n"
+msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:767
+#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645
 #, c-format
-msgid ""
-"Successfully connected to `%s', starting to send benchmark data in %u Kb "
-"blocks\n"
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:802
-#, fuzzy, c-format
-msgid "Disconnected from peer `%s' while benchmarking\n"
+#: src/transport/gnunet-transport.c:618
+#, fuzzy
+msgid "Connected to"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/transport/gnunet-transport.c:647
+#, fuzzy
+msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:864
+#: src/transport/gnunet-transport.c:682
 #, c-format
-msgid "Received %u bytes from %s\n"
+msgid "Received %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:887
+#: 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:897
+#: 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:1110
+#: src/transport/gnunet-transport.c:1144
 #, fuzzy
-msgid "Failed to send connect request to transport service\n"
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1154
+#: src/transport/gnunet-transport.c:1251
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
-"%s, %s\n"
+"%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1162
+#: src/transport/gnunet-transport.c:1264
 #, c-format
 msgid ""
-"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1181 src/transport/gnunet-transport.c:1211
-#: src/transport/gnunet-transport.c:1234 src/transport/gnunet-transport.c:1277
+#: src/transport/gnunet-transport.c:1294
 #, fuzzy
-msgid "Failed to connect to transport service\n"
+msgid "Failed to connect to transport service for disconnection\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1190 src/transport/gnunet-transport.c:1220
+#: src/transport/gnunet-transport.c:1300
+msgid "Blacklisting request in place, stop with CTRL-C\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355
+#: src/transport/gnunet-transport.c:1408
 #, fuzzy
-msgid "Failed to send request to transport service\n"
+msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1239
+#: src/transport/gnunet-transport.c:1362
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1323
+#: src/transport/gnunet-transport.c:1433
 #, fuzzy
-msgid "print information for all peers (instead of only connected peers )"
+msgid "print information for all peers (instead of only connected peers)"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:1326
+#: 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:1328
+#: src/transport/gnunet-transport.c:1441
 #, fuzzy
-msgid "connect to a peer"
+msgid "disconnect from a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1331
-#, fuzzy
-msgid "print information for all pending validations "
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/transport/gnunet-transport.c:1334
-#, fuzzy
-msgid "print information for all pending validations continously"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/transport/gnunet-transport.c:1337
+#: src/transport/gnunet-transport.c:1445
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1343
+#: src/transport/gnunet-transport.c:1453
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1345
+#: src/transport/gnunet-transport.c:1457
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1347
+#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport-profiler.c:641
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1349
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
+#: src/transport/gnunet-transport.c:1466
+msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1352
-msgid "test transport configuration (involves external server)"
+#: src/transport/gnunet-transport.c:1471
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1361
+#: src/transport/gnunet-transport.c:1482
+#: src/transport/gnunet-transport-profiler.c:652
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_bluetooth.c:621
-msgid "# Bluetooth ACKs sent"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:640
-msgid "# Bluetooth messages defragmented"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:686
-#: src/transport/plugin_transport_bluetooth.c:737
-#: src/transport/plugin_transport_bluetooth.c:1942
-msgid "# Bluetooth sessions allocated"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:837
-msgid "# Bluetooth message fragments sent"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:861
-msgid "# Bluetooth messages pending (with fragmentation)"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:969
-#: src/transport/plugin_transport_bluetooth.c:1054
-#: src/transport/plugin_transport_bluetooth.c:1944
-msgid "# Bluetooth MAC endpoints allocated"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:1307
-msgid "# HELLO messages received via Bluetooth"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:1331
-msgid "# fragments received via Bluetooth"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:1341
-msgid "# ACKs received via Bluetooth"
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1401
-msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1512
-msgid "# DATA messages received via Bluetooth"
+#: src/transport/gnunet-transport-profiler.c:621
+msgid "receive data from peer"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1547
-msgid "# Bluetooth DATA messages processed"
+#: src/transport/gnunet-transport-profiler.c:626
+msgid "iterations"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1610
-msgid "# HELLO beacons sent via Bluetooth"
-msgstr ""
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "每次迭代所使用的消息数量"
 
-#: src/transport/plugin_transport_bluetooth.c:1723
-msgid "Bluetooth address with invalid size encountered\n"
-msgstr ""
+#: src/transport/gnunet-transport-profiler.c:636
+#, fuzzy
+msgid "message size to use"
+msgstr "消息尺寸"
 
-#: src/transport/plugin_transport_bluetooth.c:1923
-#, c-format
-msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+#: src/transport/plugin_transport_http_client.c:1474
+#: src/transport/plugin_transport_http_server.c:2312
+#: src/transport/plugin_transport_http_server.c:3526
+#: 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:1621
+#: 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:1696
-#: src/transport/plugin_transport_http_server.c:3006
+#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_server.c:3241
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:1721
-#: src/transport/plugin_transport_http_server.c:3062
+#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_server.c:3311
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1749
-#: src/transport/plugin_transport_http_server.c:2906
+#: src/transport/plugin_transport_http_client.c:2215
 #, fuzzy, c-format
-msgid "Maximum number of connections is %u\n"
+msgid "Maximum number of requests is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1402
+#: src/transport/plugin_transport_http_server.c:1756
 #, 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:1663
+#: src/transport/plugin_transport_http_server.c:2028
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1671
+#: src/transport/plugin_transport_http_server.c:2036
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1957
+#: src/transport/plugin_transport_http_server.c:2186
 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:1981
+#: src/transport/plugin_transport_http_server.c:2209
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2404
+#: src/transport/plugin_transport_http_server.c:2338
+msgid "Could not load or create server certificate! Loading plugin failed!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2650
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http_server.c:2436 src/util/service.c:696
-#, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/transport/plugin_transport_http_server.c:2453 src/util/service.c:713
-#, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/transport/plugin_transport_http_server.c:2564
+#: src/transport/plugin_transport_http_server.c:2815
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2636
+#: src/transport/plugin_transport_http_server.c:2901
+#: 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:2729
+#: src/transport/plugin_transport_http_server.c:3007
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2743
+#: src/transport/plugin_transport_http_server.c:3022
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2750
+#: src/transport/plugin_transport_http_server.c:3028
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2761
+#: src/transport/plugin_transport_http_server.c:3039
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http_server.c:2768
+#: src/transport/plugin_transport_http_server.c:3045
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2783
+#: src/transport/plugin_transport_http_server.c:3064
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2793
-#, fuzzy, c-format
-msgid "Binding to IPv4 address %s\n"
-msgstr "无效的进程优先级“%s”\n"
-
-#: src/transport/plugin_transport_http_server.c:2814
+#: src/transport/plugin_transport_http_server.c:3099
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2824
-#, fuzzy, c-format
-msgid "Binding to IPv6 address %s\n"
-msgstr "无效的进程优先级“%s”\n"
-
-#: src/transport/plugin_transport_http_server.c:2876
+#: src/transport/plugin_transport_http_server.c:3174
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/plugin_transport_http_server.c:2892
+#: src/transport/plugin_transport_http_server.c:3195
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
+#: src/transport/plugin_transport_http_server.c:3212
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
+
+#: src/transport/plugin_transport_http_server.c:3538
+#, fuzzy
+msgid "Unable to compile URL regex\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
 #: src/transport/plugin_transport_smtp.c:223
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -7209,477 +7509,568 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:559
+#: 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:766
-#: src/transport/plugin_transport_tcp.c:932
-#: src/transport/plugin_transport_tcp.c:2012
-#: src/transport/plugin_transport_tcp.c:2550
+#: 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:799
-#: src/transport/plugin_transport_tcp.c:925
-#: src/transport/plugin_transport_tcp.c:1013
-#: src/transport/plugin_transport_tcp.c:1060
-#: src/transport/plugin_transport_tcp.c:1223
-#: src/transport/plugin_transport_tcp.c:1241
+#: 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:802
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1016
+#: src/transport/plugin_transport_tcp.c:2063
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1063
+#: src/transport/plugin_transport_tcp.c:2137
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1197
-#, c-format
-msgid "Trying to send with invalid session %p\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1466
+#: src/transport/plugin_transport_tcp.c:2535
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1571
+#: src/transport/plugin_transport_tcp.c:2711
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2060
+#: src/transport/plugin_transport_tcp.c:3203
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2211
+#: src/transport/plugin_transport_tcp.c:3408
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2275
-msgid "# network-level TCP disconnect events"
+#: 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:2429 src/util/service.c:589
-#: src/util/service.c:595
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+#: src/transport/plugin_transport_tcp.c:3463
+#, fuzzy
+msgid "# TCP server connect events"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/transport/plugin_transport_tcp.c:3469
+msgid "TCP connection limit reached, suspending server\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:3471
+msgid "# TCP service suspended"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:3511
+msgid "# TCP service resumed"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:3521
+msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2443
+#: src/transport/plugin_transport_tcp.c:3840
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2539
+#: src/transport/plugin_transport_tcp.c:4001
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2543
+#: 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:2546
+#: 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:167
-msgid "# IPv6 multicast HELLO beacons received via udp"
+#: src/transport/plugin_transport_udp_broadcasting.c:168
+msgid "# Multicast HELLO beacons received via UDP"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:210
-msgid "# IPv4 broadcast HELLO beacons received via udp"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:603
+#: 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:626
+#: 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:1405
-#, c-format
-msgid ""
-"Trying to create session for address of unexpected length %u (should be %u "
-"or %u)\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:2473
+#: 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:2487
+#: 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:2816
+#: 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:3716
+msgid "Disabling IPv4 since it is not supported on this system!\n"
+msgstr ""
+
+#: 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:2911
-#, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+#: 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:2950
-#, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "无效的进程优先级“%s”\n"
+#: src/transport/plugin_transport_udp.c:3924
+#, fuzzy
+msgid "must be valid IPv4 address"
+msgstr "“%s”不可用。\n"
 
-#: src/transport/plugin_transport_udp.c:3020
+#: src/transport/plugin_transport_udp.c:3951
 #, fuzzy
-msgid "Failed to create network sockets, plugin failed\n"
+msgid "must be valid IPv6 address"
+msgstr "“%s”不可用。\n"
+
+#: src/transport/plugin_transport_udp.c:4015
+#, fuzzy
+msgid "Failed to create UDP network sockets\n"
+msgstr "发送消息失败。\n"
+
+#: src/transport/plugin_transport_unix.c:1403
+#, fuzzy, c-format
+msgid "Cannot create path to `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/transport/plugin_transport_unix.c:1416
+#, fuzzy, c-format
+msgid "Cannot bind to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1622
+#: src/transport/plugin_transport_unix.c:1816
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:620
-msgid "# WLAN ACKs sent"
+#: src/transport/plugin_transport_wlan.c:768
+msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:639
-msgid "# WLAN messages defragmented"
+#: src/transport/plugin_transport_wlan.c:788
+msgid "# Messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:772
-#: src/transport/plugin_transport_wlan.c:1948
-msgid "# WLAN sessions allocated"
+#: src/transport/plugin_transport_wlan.c:829
+#: src/transport/plugin_transport_wlan.c:914
+msgid "# Sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:876
-msgid "# WLAN message fragments sent"
+#: src/transport/plugin_transport_wlan.c:1035
+#, fuzzy
+msgid "# message fragments sent"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/plugin_transport_wlan.c:1064
+msgid "# messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:900
-msgid "# WLAN messages pending (with fragmentation)"
+#: 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:1008
-#: src/transport/plugin_transport_wlan.c:1098
-#: src/transport/plugin_transport_wlan.c:1950
-msgid "# WLAN MAC endpoints allocated"
+#: src/transport/plugin_transport_wlan.c:1567
+msgid "# ACKs received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1302
-msgid "# HELLO messages received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1636
+msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1326
-msgid "# fragments received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1740
+msgid "# HELLO beacons sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1336
-msgid "# ACKs received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1856
+msgid "# DATA messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1396
-msgid "# WLAN DATA messages discarded due to CRC32 error"
+#: src/transport/plugin_transport_wlan.c:1890
+msgid "# DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1518
-msgid "# DATA messages received via WLAN"
+#: 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:1553
-msgid "# WLAN DATA messages processed"
+#: src/transport/plugin_transport_wlan.c:2302
+msgid "# sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1616
-msgid "# HELLO beacons sent via WLAN"
+#: 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/plugin_transport_wlan.c:1729
-msgid "WLAN address with invalid size encountered\n"
+#: 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/plugin_transport_wlan.c:1929
+#: 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 "Helper binary `%s' not SUID, cannot run WLAN transport\n"
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/transport_api.c:710
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346
 #, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
+msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/transport/transport-testing.c:584
-#, fuzzy
-msgid "Failed to initialize testing library!\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/transport/tcp_service_legacy.c:346
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
+msgstr ""
 
-#: src/tun/regex.c:129
+#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439
 #, c-format
-msgid "Bad mask: %d\n"
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/bio.c:170 src/util/bio.c:178
-#, fuzzy, c-format
-msgid "Error reading `%s': %s"
-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/util/bio.c:180
-msgid "End of file"
+#: 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/util/bio.c:237
+#: src/transport/tcp_service_legacy.c:953
+#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194
 #, c-format
-msgid "Error reading length of string `%s'"
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/bio.c:247
+#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226
 #, c-format
-msgid "String `%s' longer than allowed (%u > %u)"
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/bio.c:293
+#: 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 "Serialized metadata `%s' larger than allowed (%u>%u)"
+msgid "Service `%s' runs at %s\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1500
+msgid "Service process failed to initialize\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1504
+msgid "Service process could not initialize server function\n"
+msgstr ""
+
+#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1508
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/bio.c:307
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/util/service.c:1378
 #, c-format
-msgid "Metadata `%s' failed to deserialize"
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1380
+msgid "No such user"
+msgstr "无此用户"
+
+#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1399
+#, 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:1727
+msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:857 src/util/service.c:625
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255
+#: src/util/service.c:1790
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272
+#: src/util/service.c:1801
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267
+#: src/util/service.c:1807
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/tun/regex.c:134
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/client.c:265 src/util/client.c:862 src/util/service.c:629
+#: src/util/bio.c:177 src/util/bio.c:185
 #, fuzzy, c-format
-msgid "Using `%s' instead\n"
-msgstr "%s：选项“%s”有歧义\n"
+msgid "Error reading `%s': %s"
+msgstr "创建用户出错"
+
+#: src/util/bio.c:187
+msgid "End of file"
+msgstr ""
 
-#: src/util/client.c:360
+#: src/util/bio.c:244
 #, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/client.c:368
+#: src/util/bio.c:254
 #, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/client.c:995
-#, fuzzy, c-format
-msgid "Could not connect to service `%s', configuration broken.\n"
-msgstr "无法连接到 %s:%u：%s\n"
+#: src/util/bio.c:300
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+msgstr ""
 
-#: src/util/client.c:1007
+#: src/util/bio.c:314
 #, c-format
-msgid "Failure to transmit request to service `%s'\n"
+msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:1290
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/util/client.c:911
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:254 src/util/common_logging.c:1039
+#: src/util/common_logging.c:259 src/util/common_logging.c:1132
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:256 src/util/common_logging.c:1037
+#: src/util/common_logging.c:261 src/util/common_logging.c:1130
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1035
+#: src/util/common_logging.c:263 src/util/common_logging.c:1128
+msgid "MESSAGE"
+msgstr ""
+
+#: src/util/common_logging.c:265 src/util/common_logging.c:1126
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1033
+#: src/util/common_logging.c:267 src/util/common_logging.c:1124
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1041
+#: src/util/common_logging.c:269 src/util/common_logging.c:1134
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:391
-#, fuzzy, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/common_logging.c:817
+#: src/util/common_logging.c:882
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1042
+#: src/util/common_logging.c:1135
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1150
+#: src/util/common_logging.c:1326
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1189
+#: src/util/common_logging.c:1368
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1207
+#: src/util/common_logging.c:1386
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/util/common_logging.c:1228
+#: src/util/common_logging.c:1407
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/util/configuration.c:288
+#: src/util/configuration.c:296
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:996
+#: src/util/configuration.c:355
+#, fuzzy, c-format
+msgid "Error while reading file `%s'\n"
+msgstr "解析 dscl 输出时出错。\n"
+
+#: src/util/configuration.c:1034
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1066
+#: src/util/configuration.c:1153
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1098
+#: src/util/configuration.c:1186
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/configuration.c:1172
+#: src/util/configuration.c:1254
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:423
-#, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/util/connection.c:438
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
-msgstr ""
-
-#: src/util/connection.c:553
+#: src/util/container_bloomfilter.c:531
 #, c-format
 msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/util/connection.c:751 src/util/connection.c:909
+#: src/util/crypto_ecc.c:810
 #, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "无法连接到 %s:%u：%s\n"
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/connection.c:900
-#, c-format
-msgid "Attempt to connect to `%s' failed\n"
-msgstr ""
+#: src/util/crypto_ecc.c:860
+#, fuzzy, c-format
+msgid "EdDSA signing failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/container_bloomfilter.c:531
-#, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
-msgstr ""
+#: src/util/crypto_ecc.c:934
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#: src/util/crypto_ecc.c:991
+#, fuzzy, c-format
+msgid "EdDSA signature verification failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
-#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
+#: src/util/crypto_ecc_setup.c:122 src/util/crypto_ecc_setup.c:161
+#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
+#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
+#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
+#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1016
+#: src/util/crypto_ecc_setup.c:415
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/crypto_ecc.c:1120
-#, fuzzy, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/util/crypto_ecc.c:1170
-#, fuzzy, c-format
-msgid "EdDSA signing failed at %s:%d: %s\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+#: src/util/crypto_random.c:284
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/crypto_ecc.c:1244
+#: src/util/crypto_rsa.c:835
 #, fuzzy, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_ecc.c:1301
+#: src/util/crypto_rsa.c:1166
 #, fuzzy, c-format
-msgid "EdDSA signature verification failed at %s:%d: %s\n"
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_random.c:280
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
-
-#: src/util/disk.c:1184
+#: src/util/disk.c:1247
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
-#: src/util/disk.c:1546 src/util/service.c:1315
-#, 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"
@@ -7735,751 +8126,1230 @@ 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:84
+#: 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:268 src/util/getopt_helpers.c:326
+#: 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:298
+#: 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/gnunet-config.c:90
+#: src/util/getopt_helpers.c:675
 #, fuzzy, c-format
-msgid "--section argument is required\n"
-msgstr "设置要使用的昵称(必须)"
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/gnunet-config.c:133
+#: src/util/getopt_helpers.c:823
 #, c-format
-msgid "--option argument required to set value\n"
-msgstr ""
-
-#: src/util/gnunet-config.c:160
-msgid "obtain option of value as a filename (with $-expansion)"
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:163
+#: src/util/gnunet-config.c:124
+#, fuzzy, c-format
+msgid "failed to load configuration defaults"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/util/gnunet-config.c:137
+#, fuzzy, c-format
+msgid "--section argument is required\n"
+msgstr "设置要使用的昵称(必须)"
+
+#: src/util/gnunet-config.c:140
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:191
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:229
+msgid "obtain option of value as a filename (with $-expansion)"
+msgstr ""
+
+#: src/util/gnunet-config.c:234
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:166
+#: src/util/gnunet-config.c:239
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:169
+#: src/util/gnunet-config.c:244
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:178
+#: src/util/gnunet-config.c:248
+#, fuzzy
+msgid "print available configuration sections"
+msgstr "立即保存配置？"
+
+#: src/util/gnunet-config.c:252
+msgid "write configuration file that only contains delta to defaults"
+msgstr ""
+
+#: src/util/gnunet-config.c:265
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-ecc.c:75
+#: src/util/gnunet-ecc.c:94
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/gnunet-ecc.c:81
+#: src/util/gnunet-ecc.c:130
+#, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:143
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:184
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/gnunet-ecc.c:107
+#: src/util/gnunet-ecc.c:194
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:110
+#: src/util/gnunet-ecc.c:197
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199
+#: src/util/gnunet-ecc.c:288
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:210
+#: src/util/gnunet-ecc.c:299
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/gnunet-ecc.c:232
+#: src/util/gnunet-ecc.c:321
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/gnunet-ecc.c:283
+#: src/util/gnunet-ecc.c:372
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:349
+#: src/util/gnunet-ecc.c:437
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:352
+#: src/util/gnunet-ecc.c:442
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:355
+#: src/util/gnunet-ecc.c:447
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:358
+#: src/util/gnunet-ecc.c:451
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:361
-msgid "print the hash of the public key in ASCII format"
+#: src/util/gnunet-ecc.c:455
+msgid "print the private key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:459
+msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:364
+#: src/util/gnunet-ecc.c:463
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:375
+#: src/util/gnunet-ecc.c:479
 #, 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 ""
 
-#: src/util/gnunet-scrypt.c:279
+#: src/util/gnunet-scrypt.c:242
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr ""
+
+#: src/util/gnunet-scrypt.c:317
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:282
+#: src/util/gnunet-scrypt.c:322
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:327
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:288
+#: src/util/gnunet-scrypt.c:332
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:345
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-service-resolver.c:299
+#: src/util/gnunet-service-resolver.c:371
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/gnunet-service-resolver.c:371
-#: src/util/gnunet-service-resolver.c:412
+#: src/util/gnunet-service-resolver.c:460
+#: src/util/gnunet-service-resolver.c:512
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/gnunet-uri.c:84
+#: src/util/gnunet-uri.c:85
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:89
+#: src/util/gnunet-uri.c:91
 #, fuzzy, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/gnunet-uri.c:96
+#: src/util/gnunet-uri.c:98
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:106
+#: src/util/gnunet-uri.c:108
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:168
+#: src/util/gnunet-uri.c:170
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:338
+#: src/util/helper.c:335
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:383
+#: 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:609
+#: src/util/helper.c:606
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/network.c:134
+#: src/util/network.c:137
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1344 src/util/network.c:1469
+#: src/util/network.c:1793 src/util/network.c:1977
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:421
+#: src/util/os_installation.c:501
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:766
+#: 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:826
+#: 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:836
+#: src/util/os_installation.c:954
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:87
+#: src/util/plugin.c:86
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "插件机构初始化失败：%s！\n"
 
-#: src/util/plugin.c:148
+#: src/util/plugin.c:151
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:223
+#: src/util/plugin.c:226
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:382
+#: src/util/plugin.c:385
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:262 src/util/service.c:1449
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/program.c:274 src/util/service.c:1464
-#, fuzzy, c-format
-msgid "Could not access configuration file `%s'\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/util/program.c:279 src/util/service.c:1459
-#, fuzzy
-msgid "Malformed configuration, exit ...\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/resolver_api.c:198
+#: src/util/resolver_api.c:203
 #, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:216
+#: src/util/resolver_api.c:223
 #, c-format
 msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+"Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
+"resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:348
-#, fuzzy, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr "GNUnet 现在使用 IP 地址 %s。\n"
-
-#: src/util/resolver_api.c:352
+#: src/util/resolver_api.c:827
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:908
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/util/scheduler.c:813
-msgid "Looks like we're busy waiting...\n"
-msgstr ""
-
-#: src/util/scheduler.c:948
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
-msgstr ""
-
-#: src/util/server.c:484
+#: src/util/resolver_api.c:840
 #, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/util/server.c:493
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
+#: src/util/resolver_api.c:1024
+msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/server.c:499
+#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133
+#: src/util/resolver_api.c:1147
 #, 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:892
-#, 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:362
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr ""
-
-#: src/util/service.c:369
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr ""
-
-#: src/util/service.c:424
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:461
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
+msgid "Could not resolve our FQDN: %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/service.c:570
-#, c-format
+#: src/util/service.c:1305
 msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/service.c:651
+#: src/util/service.c:2091
 #, c-format
 msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:667
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
-msgstr ""
-
-#: src/util/service.c:901
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
-msgstr ""
-
-#: src/util/service.c:950 src/util/service.c:968
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
-
-#: src/util/service.c:993
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1163
-#, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/util/service.c:1204
+#: src/util/signal.c:89
 #, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr ""
-
-#: src/util/service.c:1253
-msgid "Service process failed to initialize\n"
-msgstr ""
-
-#: src/util/service.c:1257
-msgid "Service process could not initialize server function\n"
-msgstr ""
-
-#: src/util/service.c:1261
-msgid "Service process failed to report status\n"
+msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/service.c:1316
-msgid "No such user"
-msgstr "无此用户"
-
-#: src/util/service.c:1329
+#: src/util/socks.c:597
 #, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "无法更改用户/组为“%s”：%s\n"
-
-#: src/util/service.c:1399
-msgid "do daemonize (detach from terminal)"
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/signal.c:89
+#: src/util/socks.c:616
 #, c-format
-msgid "signal (%d, %p) returned %d.\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:145
+#: src/util/strings.c:176
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:433
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:561
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
-#: src/util/strings.c:658
+#: src/util/strings.c:702
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:662
+#: src/util/strings.c:706
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:664
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:670
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:676
+#: src/util/strings.c:720
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:682
+#: src/util/strings.c:726
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:688
+#: src/util/strings.c:732
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:695
+#: src/util/strings.c:739
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:741
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:726
+#: src/util/strings.c:770
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1159
+#: src/util/strings.c:1270
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1167
+#: src/util/strings.c:1278
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1173
+#: src/util/strings.c:1284
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1180
+#: src/util/strings.c:1291
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1189
+#: src/util/strings.c:1300
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/util/strings.c:1395 src/util/strings.c:1411
+#: src/util/strings.c:1572 src/util/strings.c:1588
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1420
+#: src/util/strings.c:1597
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
-#: src/util/strings.c:1603
+#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759
+#: src/util/strings.c:1780
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1560
+#: src/util/strings.c:1737
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/strings.c:1612
+#: src/util/strings.c:1789
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1664
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
+#: src/util/strings.c:1841
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
+
+#: src/util/strings.c:1891
+#, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "网络掩码的格式“%s”错误\n"
+
+#: src/util/strings.c:1922
+#, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "网络的格式“%s”错误\n"
+
+#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807
+msgid "# Active channels"
+msgstr ""
+
+#: 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:1255
+msgid "# TCP packets received from cadet"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1467
+#, fuzzy
+msgid "# Cadet channels created"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/vpn/gnunet-service-vpn.c:1687
+#, c-format
+msgid "Protocol %u not supported, dropping\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1826
+msgid "# Packets dropped (channel not yet online)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2006
+msgid "# ICMPv4 packets dropped (not allowed)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2027
+msgid "# ICMPv6 packets dropped (not allowed)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2235
+msgid "# Packets received from TUN interface"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2268 src/vpn/gnunet-service-vpn.c:2304
+#, c-format
+msgid "Packet received for unmapped destination `%s' (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2314
+msgid "Received IPv4 packet with options (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2328
+#, c-format
+msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2367
+msgid "Failed to find unallocated IPv4 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2422
+msgid "Failed to find unallocated IPv6 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2464 src/vpn/gnunet-service-vpn.c:2686
+msgid "# Active destinations"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2735
+msgid "Failed to allocate IP address for new destination\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2998
+#, fuzzy
+msgid "Must specify valid IPv6 address"
+msgstr "“%s”不可用。\n"
+
+#: src/vpn/gnunet-service-vpn.c:3022
+msgid "Must specify valid IPv6 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3030
+msgid "IPv6 support disabled as this system does not support IPv6\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3043
+#, fuzzy
+msgid "Must specify valid IPv4 address"
+msgstr "“%s”不可用。\n"
+
+#: src/vpn/gnunet-service-vpn.c:3056
+msgid "Must specify valid IPv4 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3066
+msgid "IPv4 support disabled as this system does not support IPv4\n"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:147
+#, fuzzy
+msgid "Error creating tunnel\n"
+msgstr "创建用户出错"
+
+#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222
+#, c-format
+msgid "Option `%s' makes no sense with option `%s'.\n"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:204
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "%s：选项“%s”有歧义\n"
+
+#: src/vpn/gnunet-vpn.c:216
+#, c-format
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:236
+#, fuzzy, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/vpn/gnunet-vpn.c:256
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/vpn/gnunet-vpn.c:292
+msgid "request that result should be an IPv4 address"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:297
+msgid "request that result should be an IPv6 address"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:303
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:309
+msgid "destination IP for the tunnel"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:315
+msgid "peer offering the service we would like to access"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:321
+msgid "name of the service we would like to access"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:326
+msgid "service is offered via TCP"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:331
+msgid "service is offered via UDP"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:344
+msgid "Setup tunnels via VPN."
+msgstr ""
+
+#: src/zonemaster/gnunet-service-zonemaster.c:706
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696
+#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714
+#, c-format
+msgid "Assertion failed at %s:%d.\n"
+msgstr ""
+
+#: src/include/gnunet_common.h:726
+#, c-format
+msgid "External protocol violation detected at %s:%d.\n"
+msgstr ""
+
+#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762
+#, c-format
+msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Failed to create indices\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "`%s:%s' failed at %s:%d with error: %s\n"
+#~ msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+
+#, fuzzy
+#~ msgid "Unable to connect to Postgres database '%s': %s\n"
+#~ msgstr "无法保存配置文件“%s”："
+
+#, 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"
+
+#, fuzzy
+#~ msgid "Failed to run upnp client for port %u\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to start resolver!\n"
+#~ msgstr "运行 %s失败：%s %d\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Postgres: %s\n"
+#~ msgstr "无法初始化 SQLite：%s。\n"
+
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did not work!\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did work!\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Internal NAT error while running test for plugin `%s'\n"
+#~ msgstr "未知错误。\n"
+
+#, fuzzy
+#~ msgid "Failed to start NAT test for plugin `%s'\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Could not send list result to client\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Failed to connect peer 0 and %u\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Could not connect master [%u] and slave [%u]\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
+
+#, fuzzy
+#~ msgid "Initialization failed, shutdown\n"
+#~ msgstr "插件机构初始化失败：%s！\n"
+
+#, fuzzy
+#~ msgid "number too large"
+#~ msgstr "迭代次数"
+
+#, fuzzy
+#~ msgid "Received incoming Cadet channel on port %u\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the DHT service!\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to transport service!\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "unknown error"
+#~ msgstr "未知错误"
+
+#, fuzzy
+#~ msgid "Invalid response from `fs' service."
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "Failed to deserialize lookup reply from GNS service!\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Service `%s' is not running\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "Identity service is not running\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "NSE service is not running\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "failed to transmit request (service down?)"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Received invalid message from `PEERINFO' service."
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "Timeout transmitting iteration request to `PEERINFO' service."
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Could not connect to `%s' service.\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
+
+#, fuzzy
+#~ msgid "Failed to get my own HELLO from this peer!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Service `%s' is not running, please start GNUnet\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "Malformed iterate request.\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Malformed store request from client\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Failed to store requested value, database error."
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Trying to connect to remote host, but service `%s' is not running\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Peer `%s' %s %s\n"
+#~ "\t%s%s\n"
+#~ "\t%s%s\n"
+#~ "\t%s%s\n"
+#~ msgstr "运行 %s失败：%s %d\n"
+
+#, fuzzy
+#~ msgid "Peer `%s' %s `%s' \n"
+#~ msgstr "运行 %s失败：%s %d\n"
+
+#, fuzzy
+#~ msgid "print information for all pending validations "
+#~ msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#, fuzzy
+#~ msgid "print information for all pending validations continuously"
+#~ msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#, fuzzy
+#~ msgid "Connected to different peer `%s'\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Successfully connected to `%s'\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Denying connection to `%s'\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
+
+#, fuzzy
+#~ msgid "Message size too big!\n"
+#~ msgstr "消息尺寸"
+
+#, fuzzy
+#~ msgid "No peer identity given\n"
+#~ msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#, fuzzy
+#~ msgid "Trying to receive messages from peer `%s'\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
+
+#, fuzzy
+#~ msgid "No operation given\n"
+#~ msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to ATS service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Binding to IPv4 address %s\n"
+#~ msgstr "无效的进程优先级“%s”\n"
+
+#, fuzzy
+#~ msgid "Binding to IPv6 address %s\n"
+#~ msgstr "无效的进程优先级“%s”\n"
+
+#, fuzzy
+#~ msgid "Failed to initialize testing library!\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Could not connect to service `%s', configuration broken.\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
+
+#, fuzzy
+#~ msgid "Failed to setup cadet channel!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "timeout in MSECS milliseconds for completing current operation"
+#~ msgstr "等待一次迭代完成的时间(毫秒)"
+
+#, fuzzy
+#~ msgid "Error trying to send a message to peer `%s'.\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
+
+#, fuzzy
+#~ msgid "Retrieve information about all defined sensors"
+#~ msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#, fuzzy
+#~ msgid "Retrieve information about a single sensor"
+#~ msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#, fuzzy
+#~ msgid "Number of peers to run"
+#~ msgstr "迭代次数"
+
+#, fuzzy
+#~ msgid "Number of peers to simulate anomalies on"
+#~ msgstr "迭代次数"
+
+#, fuzzy
+#~ msgid "Profiler for sensor service"
+#~ msgstr "创建用户出错"
+
+#, fuzzy
+#~ msgid "Received an invalid sensor value."
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "Analysis model not defined in configuration.\n"
+#~ msgstr "找不到主机“%s”的 IP：%s\n"
+
+#, fuzzy
+#~ msgid "Could not load analysis model `%s'.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Could not connect to peerstore service.\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
+
+#, fuzzy
+#~ msgid "Unknown value type expected by sensor, this should not happen.\n"
+#~ msgstr "输出格式未知，不应出现这种情况。\n"
+
+#, fuzzy
+#~ msgid "Received an invalid value for sensor `%s': %s\n"
+#~ msgstr "配置不满足配置规范文件“%s”的约束！\n"
+
+#, fuzzy
+#~ msgid "Double creation of proof-of-work, this should not happen.\n"
+#~ msgstr "输出格式未知，不应出现这种情况。\n"
+
+#, fuzzy
+#~ msgid "Failed to create pow and signature block.\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to CORE service.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to peerstore service.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to load my private key.\n"
+#~ msgstr "运行 %s失败：%s %d\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to update point `%s'.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Timeout transmitting iteration request to `SENSOR' service."
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Error reading sensor category\n"
+#~ msgstr "创建用户出错"
+
+#, fuzzy
+#~ msgid "Error reading sensor run interval\n"
+#~ msgstr "创建用户出错"
+
+#, fuzzy
+#~ msgid "Error reading sensor source\n"
+#~ msgstr "创建用户出错"
 
-#: src/util/strings.c:1714
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "网络掩码的格式“%s”错误\n"
+#, fuzzy
+#~ msgid "Error reading sensor process name\n"
+#~ msgstr "创建用户出错"
 
-#: src/util/strings.c:1745
-#, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "网络的格式“%s”错误\n"
+#, fuzzy
+#~ msgid "Failed to access sensor file: %s\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
-msgid "# Active channels"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to load sensor definition: %s\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/vpn/gnunet-service-vpn.c:642
-msgid "# Bytes given to mesh for transmission"
-msgstr ""
+#, fuzzy
+#~ msgid "Error adding new sensor `%s' to global hashmap.\n"
+#~ msgstr "创建用户出错"
 
-#: src/vpn/gnunet-service-vpn.c:680
-msgid "# Bytes dropped in mesh queue (overflow)"
-msgstr ""
+#, fuzzy
+#~ msgid "Error loading sensor from file: %s\n"
+#~ msgstr "创建用户出错"
 
-#: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# Mesh channels created"
-msgstr ""
-"\n"
-"按任意键继续\n"
+#~ msgid "Blacklisting disapproved to connect to peer `%s'\n"
+#~ msgstr "初始化“%s”服务失败。\n"
 
-#: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh channel!\n"
-msgstr "发送消息失败。\n"
+#~ msgid "Successfully disconnected from `%s'\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
 
-#: src/vpn/gnunet-service-vpn.c:978
-#, c-format
-msgid "Protocol %u not supported, dropping\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to send connect request to transport service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
 
-#: src/vpn/gnunet-service-vpn.c:1305
-msgid "# ICMPv4 packets dropped (not allowed)"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to send disconnect request to transport service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
 
-#: src/vpn/gnunet-service-vpn.c:1326
-msgid "# ICMPv6 packets dropped (not allowed)"
-msgstr ""
+#, fuzzy
+#~ msgid "Retrying to connect to `%s'\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/vpn/gnunet-service-vpn.c:1531
-msgid "# Packets received from TUN interface"
-msgstr ""
+#, fuzzy
+#~ msgid "Unknown operator: %c\n"
+#~ msgstr "未知错误"
 
-#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
-#, c-format
-msgid "Packet received for unmapped destination `%s' (dropping it)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "valid public key required"
+#~ msgstr "“%s”的参数无效。\n"
 
-#: src/vpn/gnunet-service-vpn.c:1610
-msgid "Received IPv4 packet with options (dropping it)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to create or access directory for log file `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
 
-#: src/vpn/gnunet-service-vpn.c:1624
-#, c-format
-msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to initialize solver!\n"
+#~ msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/vpn/gnunet-service-vpn.c:1706
-msgid "# ICMP packets received from mesh"
-msgstr ""
+#, fuzzy
+#~ msgid "Invalid network type `%u' `%s': Disconnect!\n"
+#~ msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/vpn/gnunet-service-vpn.c:2045
-msgid "# UDP packets received from mesh"
-msgstr ""
+#, fuzzy
+#~ msgid "Could not obtain a valid network for `%s' %s (%s)\n"
+#~ msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
 
-#: src/vpn/gnunet-service-vpn.c:2200
-msgid "# TCP packets received from mesh"
-msgstr ""
+#, fuzzy
+#~ msgid "Blacklist refuses connection attempt to peer `%s'\n"
+#~ msgstr "初始化“%s”服务失败。\n"
 
-#: src/vpn/gnunet-service-vpn.c:2351
-msgid "Failed to find unallocated IPv4 address in VPN's range\n"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
+#~ msgstr "初始化“%s”服务失败。\n"
 
-#: src/vpn/gnunet-service-vpn.c:2406
-msgid "Failed to find unallocated IPv6 address in VPN's range\n"
-msgstr ""
+#, fuzzy
+#~ msgid "# Failed attempts to switch addresses (no response)"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
-msgid "# Active destinations"
-msgstr ""
+#, fuzzy
+#~ msgid "Invalid IPv6 address: `%s'\n"
+#~ msgstr "无效的进程优先级“%s”\n"
 
-#: src/vpn/gnunet-service-vpn.c:2715
-msgid "Failed to allocate IP address for new destination\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Trying to connect to `%s' (%p)\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/vpn/gnunet-service-vpn.c:2982
 #, fuzzy
-msgid "Must specify valid IPv6 address"
-msgstr "“%s”不可用。\n"
+#~ msgid "Configuration for plugin `%s' is working!\n"
+#~ msgstr "配置文件“%s”已写入。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3006
-msgid "Must specify valid IPv6 mask"
-msgstr ""
+#, fuzzy
+#~ msgid "Starting default services `%s'\n"
+#~ msgstr "卸载 GNUnet 服务"
 
-#: src/vpn/gnunet-service-vpn.c:3014
-msgid "IPv6 support disabled as this system does not support IPv6\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to create statistics!\n"
+#~ msgstr "发送消息失败。\n"
 
-#: src/vpn/gnunet-service-vpn.c:3027
 #, fuzzy
-msgid "Must specify valid IPv4 address"
-msgstr "“%s”不可用。\n"
+#~ msgid "Failed to parse file `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
 
-#: src/vpn/gnunet-service-vpn.c:3040
-msgid "Must specify valid IPv4 mask"
-msgstr ""
+#, fuzzy
+#~ msgid "Cannot read experiments file `%s'\n"
+#~ msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/vpn/gnunet-service-vpn.c:3050
-msgid "IPv4 support disabled as this system does not support IPv4\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Connected to peer %s\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
 
-#: src/vpn/gnunet-vpn.c:147
 #, fuzzy
-msgid "Error creating tunnel\n"
-msgstr "创建用户出错"
+#~ msgid "Disconnected from peer %s\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
 
-#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
-#, c-format
-msgid "Option `%s' makes no sense with option `%s'.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Could not access hostkey file `%s'.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/vpn/gnunet-vpn.c:203
-#, fuzzy, c-format
-msgid "Option `%s' or `%s' is required.\n"
-msgstr "%s：选项“%s”有歧义\n"
+#, fuzzy
+#~ msgid "Failure: Did not receive %s\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/vpn/gnunet-vpn.c:215
-#, c-format
-msgid "Option `%s' or `%s' is required when using option `%s'.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Blacklist allows connection attempt to peer `%s'\n"
+#~ msgstr "初始化“%s”服务失败。\n"
 
-#: src/vpn/gnunet-vpn.c:235
-#, fuzzy, c-format
-msgid "`%s' is not a valid peer identifier.\n"
-msgstr "“%s”不可用。\n"
+#, fuzzy
+#~ msgid "Received a request connect message for peer `%s'\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/vpn/gnunet-vpn.c:255
-#, fuzzy, c-format
-msgid "`%s' is not a valid IP address.\n"
-msgstr "“%s”不可用。\n"
+#, fuzzy
+#~ msgid "Received a request disconnect message for peer `%s'\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/vpn/gnunet-vpn.c:290
-msgid "request that result should be an IPv4 address"
-msgstr ""
+#, fuzzy
+#~ msgid "Client %p disconnected from us.\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
 
-#: src/vpn/gnunet-vpn.c:293
-msgid "request that result should be an IPv6 address"
-msgstr ""
+#, fuzzy
+#~ msgid "Could not send message to client (%p)!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/vpn/gnunet-vpn.c:296
-msgid "how long should the mapping be valid for new tunnels?"
-msgstr ""
+#, fuzzy
+#~ msgid "Successfully created new channel to peer (%s)!\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
 
-#: src/vpn/gnunet-vpn.c:299
-msgid "destination IP for the tunnel"
-msgstr ""
+#, fuzzy
+#~ msgid "Could not send message to channel!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/vpn/gnunet-vpn.c:302
-msgid "peer offering the service we would like to access"
-msgstr ""
+#, fuzzy
+#~ msgid "Could not send service-response message via cadet!)\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/vpn/gnunet-vpn.c:305
-msgid "name of the service we would like to access"
-msgstr ""
+#, fuzzy
+#~ msgid "Could not send service-request multipart message to channel!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/vpn/gnunet-vpn.c:308
-msgid "service is offered via TCP"
-msgstr ""
+#, fuzzy
+#~ msgid "New incoming channel from peer %s.\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
 
-#: src/vpn/gnunet-vpn.c:311
-msgid "service is offered via UDP"
-msgstr ""
+#, fuzzy
+#~ msgid "Reloading sensor definitions from directory `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
 
-#: src/vpn/gnunet-vpn.c:323
-msgid "Setup tunnels via VPN."
-msgstr ""
+#, fuzzy
+#~ msgid "Loaded %d sensors from directory `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
 
-#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
-#: src/include/gnunet_common.h:581
-#, c-format
-msgid "Assertion failed at %s:%d.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Received invalid message from `SENSOR' service."
+#~ msgstr "“%s”的参数无效。\n"
 
-#: src/include/gnunet_common.h:593
-#, c-format
-msgid "External protocol violation detected at %s:%d.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "No UNIXPATH given in configuration!\n"
+#~ msgstr "保存配置失败。"
 
-#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
-#, c-format
-msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Could not convert `%s' to integer.\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
 
 #, fuzzy
-#~ msgid "provide information about a particular channel"
-#~ msgstr "无法获取有关用户“%s”的信息：%s\n"
+#~ msgid "Failed to connect to the scalarproduct service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
-#~ msgid "provide information about a particular connection"
-#~ msgstr "无法获取有关用户“%s”的信息：%s\n"
+#~ msgid "Failed to send a message to the statistics service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
-#~ msgid "Could not find option `%s:%s' in configuration.\n"
-#~ msgstr "找不到主机“%s”的 IP：%s\n"
+#~ msgid "Failed to send a message to the scalarproduct service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "provide information about a particular channel"
+#~ msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #, fuzzy
 #~ msgid "Peer `%s' disconnected\n"
@@ -8491,10 +9361,6 @@ msgstr ""
 #~ msgid "Found %u transport plugins: `%s'\n"
 #~ 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"
@@ -8539,10 +9405,6 @@ msgstr ""
 #~ "%s/%s\n"
 #~ msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
 
-#, fuzzy
-#~ msgid "Error while decoding key %u\n"
-#~ msgstr "解析 dscl 输出时出错。\n"
-
 #, fuzzy
 #~ msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 #~ msgstr "打开日志文件“%s”失败：%s\n"
@@ -8562,10 +9424,6 @@ msgstr ""
 #~ msgid "Failed to read or create private zone key\n"
 #~ msgstr "无法为守护程序创建用户账户。"
 
-#, fuzzy
-#~ msgid "Unable to initialize resolver!\n"
-#~ msgstr "无法初始化 SQLite：%s。\n"
-
 #, fuzzy
 #~ msgid "Using default zone file `%s'\n"
 #~ msgstr "卸载 GNUnet 服务"
@@ -8578,10 +9436,6 @@ msgstr ""
 #~ msgid "name of the template configuration file to use (optional)"
 #~ msgstr "打印配置文件中的一个值到标准输出"
 
-#, fuzzy
-#~ msgid "number of peers to start"
-#~ msgstr "迭代次数"
-
 #, fuzzy
 #~ msgid "Failed to read or generate private key: %s\n"
 #~ msgstr "无法为守护程序创建用户账户。"
@@ -8610,14 +9464,6 @@ msgstr ""
 #~ msgid "Could not parse zone key file `%s'\n"
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#, fuzzy
-#~ msgid "Failed to create new signature"
-#~ msgstr "发送消息失败。\n"
-
-#, fuzzy
-#~ msgid "Failed to remove records from database"
-#~ msgstr "发送消息失败。\n"
-
 #, fuzzy
 #~ msgid "Failed to access database"
 #~ msgstr "打开日志文件“%s”失败：%s\n"
@@ -8644,10 +9490,6 @@ msgstr ""
 #~ msgid "`%s' failed for drive `%S': %u\n"
 #~ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#, fuzzy
-#~ msgid "Service `%s' was already running.\n"
-#~ msgstr "服务已删除。\n"
-
 #, fuzzy
 #~ msgid "Service `%s' has been started.\n"
 #~ msgstr "服务已删除。\n"
@@ -8708,10 +9550,6 @@ msgstr ""
 #~ msgid "Mesh service could not access hostkey.  Exiting.\n"
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#, fuzzy
-#~ msgid "Malformed %s `%s' given in configuration!\n"
-#~ msgstr "保存配置失败。"
-
 #, fuzzy
 #~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 #~ msgstr "配置文件“%s”已写入。\n"
@@ -8789,18 +9627,10 @@ msgstr ""
 #~ msgid "Failed to queue a join notification\n"
 #~ msgstr "保存配置失败。"
 
-#, fuzzy
-#~ msgid "Failed to queue a confirmation receipt\n"
-#~ msgstr "保存配置失败。"
-
 #, fuzzy
 #~ msgid "Failed to queue a leave notification\n"
 #~ msgstr "保存配置失败。"
 
-#, fuzzy
-#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
-#~ msgstr "配置文件“%s”已写入。\n"
-
 #, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "配置文件“%s”已写入。\n"
@@ -8845,10 +9675,6 @@ msgstr ""
 #~ msgid "Setting d->dead on peer `%4s'\n"
 #~ msgstr "卸载 GNUnet 服务"
 
-#, fuzzy
-#~ msgid "Failed to write new configuration to disk."
-#~ msgstr "保存配置失败。"
-
 #, fuzzy
 #~ msgid "Failed to copy new configuration to remote machine."
 #~ msgstr "保存配置失败。"
@@ -8883,10 +9709,6 @@ msgstr ""
 #~ msgid "internal error"
 #~ msgstr "未知错误。\n"
 
-#, fuzzy
-#~ msgid "Could not create namespace `%s'\n"
-#~ msgstr "无法解析“%s”(%s)：%s\n"
-
 #, fuzzy
 #~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
 #~ msgstr "打开日志文件“%s”失败：%s\n"
@@ -8903,12 +9725,6 @@ msgstr ""
 #~ msgid "access (%s, X_OK) failed: %s\n"
 #~ msgstr "“%s”说：%s\n"
 
-#, fuzzy
-#~ msgid "# Peers connected"
-#~ msgstr ""
-#~ "\n"
-#~ "按任意键继续\n"
-
 #, fuzzy
 #~ msgid "Unable to initialize Postgres with configuration `%s': %s"
 #~ msgstr "无法保存配置文件“%s”："
@@ -8941,14 +9757,6 @@ msgstr ""
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
-#, fuzzy
-#~ msgid "Service `%s' stopped\n"
-#~ msgstr "服务已删除。\n"
-
-#, fuzzy
-#~ msgid "Unable to accept connection for service `%s': %s\n"
-#~ msgstr "无法保存配置文件“%s”："
-
 #~ msgid "KiB"
 #~ msgstr "KiB"
 
@@ -8969,10 +9777,6 @@ msgstr ""
 #~ msgid "Failed to load dhtlog plugin for `%s'\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
-#, fuzzy
-#~ msgid "Phase 3: sending messages\n"
-#~ msgstr "发送消息失败。\n"
-
 #, fuzzy
 #~ msgid "Fail! Could not connect peers\n"
 #~ msgstr "无法连接到 %s:%u：%s\n"
@@ -9115,9 +9919,6 @@ msgstr ""
 #~ "量。如果您的网速很平稳，您可以将该限制设置为网速的最大值。您不应该使用超过"
 #~ "实际连接速度极限的值。"
 
-#~ msgid "Quota configuration"
-#~ msgstr "配额配置"
-
 #~ msgid "What is the maximum size of the datastore in MB?"
 #~ msgstr "数据仓库的最大尺寸是多少(MB)？"
 
@@ -9192,9 +9993,6 @@ msgstr ""
 #~ msgid "Save configuration?"
 #~ msgstr "保存配置？"
 
-#~ msgid "GNUnet Configuration"
-#~ msgstr "GNUnet 配置"
-
 #~ msgid "Back"
 #~ msgstr "后退"
 
@@ -9219,13 +10017,6 @@ msgstr ""
 #~ msgid "Do you wish to save your new configuration?"
 #~ msgstr "您想保存新配置吗？"
 
-#~ msgid ""
-#~ "\n"
-#~ "Your configuration changes were NOT saved.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "您的配置更改没有保存。\n"
-
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "以 Windows 服务方式安装 GNUnet"
 
@@ -9512,15 +10303,9 @@ msgstr ""
 #~ msgid "output in gnuplot format"
 #~ msgstr "以 gnuplot 格式输出"
 
-#~ msgid "number of messages to use per iteration"
-#~ msgstr "每次迭代所使用的消息数量"
-
 #~ msgid "receiver host identifier (ENC file name)"
 #~ msgstr "接收方主机标识(ENC 文件名)"
 
-#~ msgid "message size"
-#~ msgstr "消息尺寸"
-
 #~ msgid "number of messages in a message block"
 #~ msgstr "一个消息块中的消息数量"
 
@@ -9559,9 +10344,6 @@ msgstr ""
 #~ msgid "\tvariance %8.4f\n"
 #~ msgstr "\t波动 %8.4f\n"
 
-#~ msgid "Output format not known, this should not happen.\n"
-#~ msgstr "输出格式未知，不应出现这种情况。\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Did not receive the message from gnunetd. Is gnunetd running?\n"