minor fixes

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

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1c18e6bcd26bca0a6ce490af26e00d2b30825725..4d822bbc9f2116b3c7e49d42de462a5e9fe5292d 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-05-20 15:09+0200\n"
+"POT-Creation-Date: 2014-12-09 00:23+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"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:880
+#: src/arm/arm_api.c:337
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -25,4591 +25,6782 @@ msgid ""
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:159
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:170
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:204 src/testbed/gnunet-service-testbed_peers.c:962
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:206 src/testbed/gnunet-service-testbed_peers.c:964
+#: src/arm/gnunet-arm.c:218
 #, fuzzy
-msgid "Misconfiguration (can't connect to the ARM service)"
+msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:208 src/testbed/gnunet-service-testbed_peers.c:966
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:210 src/testbed/gnunet-service-testbed_peers.c:968
+#: 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:212 src/testbed/gnunet-service-testbed_peers.c:970
-msgid "Request doesn't fit into a message"
+#: src/arm/gnunet-arm.c:224
+msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:972
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:974
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:990
+#: 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:234 src/testbed/gnunet-service-testbed_peers.c:992
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:236 src/testbed/gnunet-service-testbed_peers.c:994
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:238 src/testbed/gnunet-service-testbed_peers.c:996
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:240 src/testbed/gnunet-service-testbed_peers.c:998
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:1000
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1002
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1004
+#: 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"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1006
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1008
+#: src/arm/gnunet-arm.c:262
 #, c-format
-msgid "%s service can't be started because ARM is shutting down"
+msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1010
+#: 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:271
+#: src/arm/gnunet-arm.c:297
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:291
-#, fuzzy, c-format
-msgid "Failed to send a request to kill the `%s' service: %%s\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/arm/gnunet-arm.c:307
+#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
 #, fuzzy, c-format
-msgid "Failed to kill the `%s' service: %s\n"
-msgstr "è¿\90è¡\8c %s失败ï¼\9a%s %d\n"
+msgid "Failed to start the ARM service: %s\n"
+msgstr "解æ\9e\90é\85\8dç½®æ\96\87件â\80\9c%sâ\80\9d失败\n"
 
-#: src/arm/gnunet-arm.c:323
+#: src/arm/gnunet-arm.c:369
 #, fuzzy, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:345
+#: src/arm/gnunet-arm.c:379
 #, fuzzy, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/arm/gnunet-arm.c:361 src/arm/gnunet-arm.c:370
-#, fuzzy, c-format
-msgid "Failed to start the ARM service: %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/arm/gnunet-arm.c:390
+#: src/arm/gnunet-arm.c:421
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:405
+#: src/arm/gnunet-arm.c:431
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:423
+#: src/arm/gnunet-arm.c:468
+#, 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
+#, fuzzy, c-format
+msgid "Failed to kill the `%s' service: %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/arm/gnunet-arm.c:517
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:430
+#: src/arm/gnunet-arm.c:525
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/arm/gnunet-arm.c:433
+#: src/arm/gnunet-arm.c:530
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:534
-msgid "Began monitoring ARM for service status changes\n"
+#: src/arm/gnunet-arm.c:612
+#, c-format
+msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:537
+#: src/arm/gnunet-arm.c:643
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:540
+#: src/arm/gnunet-arm.c:646
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/arm/gnunet-arm.c:543
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:552
+#: src/arm/gnunet-arm.c:660
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:622
+#: src/arm/gnunet-arm.c:724
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:726
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:626
+#: src/arm/gnunet-arm.c:728
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:628
+#: src/arm/gnunet-arm.c:730
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:631
+#: src/arm/gnunet-arm.c:733
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:634
+#: src/arm/gnunet-arm.c:736
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:636
+#: src/arm/gnunet-arm.c:739
+msgid "monitor ARM activities"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:741
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:639
+#: src/arm/gnunet-arm.c:744
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:641
+#: src/arm/gnunet-arm.c:746
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:748
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:645
+#: src/arm/gnunet-arm.c:750
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:761
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:257
+#: src/arm/gnunet-service-arm.c:266
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:291
+#: src/arm/gnunet-service-arm.c:302
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/arm/gnunet-service-arm.c:500
+#: src/arm/gnunet-service-arm.c:529
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:507
+#: src/arm/gnunet-service-arm.c:540
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:602
+#: src/arm/gnunet-service-arm.c:639
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户："
 
-#: src/arm/gnunet-service-arm.c:624
+#: src/arm/gnunet-service-arm.c:661
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:638
+#: src/arm/gnunet-service-arm.c:695
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:771
+#: src/arm/gnunet-service-arm.c:831
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1023
+#: src/arm/gnunet-service-arm.c:1100
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1116
+#: src/arm/gnunet-service-arm.c:1193
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1121
+#: src/arm/gnunet-service-arm.c:1198
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1126
+#: src/arm/gnunet-service-arm.c:1203
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1132
+#: src/arm/gnunet-service-arm.c:1209
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1154
+#: src/arm/gnunet-service-arm.c:1231
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1169
+#: src/arm/gnunet-service-arm.c:1246
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1386
+#: src/arm/gnunet-service-arm.c:1500
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1397
+#: src/arm/gnunet-service-arm.c:1511
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1411
+#: src/arm/gnunet-service-arm.c:1524
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
+#: src/arm/mockup-service.c:41
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:475
+#: src/ats/ats_api_performance.c:485
 #, c-format
 msgid "Received %s message\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:518
+#: src/ats/ats_api_performance.c:528
 #, c-format
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1372
-#: src/ats/gnunet-service-ats_addresses.c:1406
+#: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
+#: src/ats/gnunet-service-ats_addresses.c:1781
+#: src/ats/gnunet-service-ats_addresses.c:1825
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1378
+#: src/ats/gnunet-ats-solver-eval.c:2810
+#: src/ats/gnunet-service-ats_addresses.c:1788
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1385
+#: src/ats/gnunet-ats-solver-eval.c:2817
+#: src/ats/gnunet-service-ats_addresses.c:1796
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1412
+#: src/ats/gnunet-ats-solver-eval.c:2844
+#: src/ats/gnunet-service-ats_addresses.c:1832
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1419
+#: src/ats/gnunet-ats-solver-eval.c:2851
+#: src/ats/gnunet-service-ats_addresses.c:1840
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:756
+#: src/ats/gnunet-ats-solver-eval.c:3410
+#: src/ats-tests/gnunet-solver-eval.c:918
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3413
+#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats-tests/gnunet-solver-eval.c:924
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3416
+msgid "be verbose"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3419
+#, fuzzy
+msgid "print logging"
+msgstr "未知的命令“%s”。\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3422
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3425
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:2039
+#, c-format
+msgid "Initializing solver `%s '`%s'\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:2042
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/ats/gnunet-service-ats_addresses.c:2065
+#, fuzzy
+msgid "Failed to initialize solver!\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/ats/plugin_ats_mlp.c:1344
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1075
+#: src/ats/plugin_ats_mlp.c:1941
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1258
+#: src/ats/plugin_ats_mlp.c:1988
 #, c-format
-msgid "Update for ATS type `%s' not implemented!\n"
+msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1341
-#, c-format
-msgid "Updating address for peer `%s' not added before\n"
+#: src/ats/plugin_ats_mlp.c:2704
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1761
+#: src/ats/plugin_ats_mlp.c:2744 src/ats/plugin_ats_mlp.c:2761
+#: src/ats/plugin_ats_mlp.c:2793 src/ats/plugin_ats_mlp.c:2811
+#: src/ats/plugin_ats_mlp.c:2830 src/ats/plugin_ats_proportional.c:1989
+#: src/ats/plugin_ats_proportional.c:2010 src/ats/plugin_ats_ril.c:2718
+#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
+#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
+#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
+#: src/ats/plugin_ats_ril.c:2837
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/ats/plugin_ats_mlp.c:2917
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1769
+#: src/ats/plugin_ats_mlp.c:2926
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1779
+#: src/ats/plugin_ats_mlp.c:2937
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1787
+#: src/ats/plugin_ats_mlp.c:2945
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1798
+#: src/ats/plugin_ats_mlp.c:2956
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:141
+#: src/ats/plugin_ats_proportional.c:1847
+#, fuzzy, c-format
+msgid "Invalid network type `%u' `%s': Disconnect!\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
+
+#: src/ats-tests/ats-testing.c:72
+msgid "Benchmarking done\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:105
+#, fuzzy, c-format
+msgid "Failed to connect peer 0 and %u\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/ats-tests/ats-testing.c:413
+#, c-format
+msgid "Connected master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:419
+#, fuzzy, c-format
+msgid "Failed to connect master peer [%u] with slave [%u]\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/ats-tests/ats-testing.c:450
+msgid "Connecting peers on CORE level\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:461
+#, c-format
+msgid "Connecting master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:470
+#, fuzzy, c-format
+msgid "Could not connect master [%u] and slave [%u]\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:677
+#, fuzzy
+msgid "Initialization failed, shutdown\n"
+msgstr "插件机构初始化失败：%s！\n"
+
+#: src/ats-tests/ats-testing-log.c:842
+msgid "Stop logging\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing-log.c:893
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/ats-tests/gnunet-ats-sim.c:86
+#, 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:296
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:143
+#: src/ats-tool/gnunet-ats.c:300
 #, 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:378
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:378
+msgid "inactive "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:199
+#: src/ats-tool/gnunet-ats.c:427
 #, 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:320
+#: src/ats-tool/gnunet-ats.c:544
+#, c-format
+msgid "Removed address of peer `%s' with plugin `%s'\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:747
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:339 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:804
+#: src/ats-tool/gnunet-ats.c:779 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1855
+#: src/transport/gnunet-transport-profiler.c:531
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:349 src/transport/gnunet-transport.c:810
+#: src/ats-tool/gnunet-ats.c:793 src/transport/gnunet-transport.c:1864
+#: src/transport/gnunet-transport-profiler.c:549
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tool/gnunet-ats.c:357
+#: src/ats-tool/gnunet-ats.c:803
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:373 src/ats-tool/gnunet-ats.c:392
-#: src/ats-tool/gnunet-ats.c:409 src/ats-tool/gnunet-ats.c:434
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:825 src/ats-tool/gnunet-ats.c:851
+#: src/ats-tool/gnunet-ats.c:879 src/ats-tool/gnunet-ats.c:925
+#, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:382 src/ats-tool/gnunet-ats.c:399
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:837 src/ats-tool/gnunet-ats.c:863
+#, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:427
-msgid "Type required\n"
+#: src/ats-tool/gnunet-ats.c:891
+#, fuzzy
+msgid "No preference type given!\n"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/ats-tool/gnunet-ats.c:898
+msgid "No peer given!\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:916
+msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:484
+#: src/ats-tool/gnunet-ats.c:984
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:487
+#: src/ats-tool/gnunet-ats.c:986
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:490
+#: src/ats-tool/gnunet-ats.c:989
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:493
+#: src/ats-tool/gnunet-ats.c:991
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:496
+#: src/ats-tool/gnunet-ats.c:993
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:499
+#: src/ats-tool/gnunet-ats.c:995
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:502
+#: src/ats-tool/gnunet-ats.c:997
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:505
+#: src/ats-tool/gnunet-ats.c:1000
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:1002
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:1005
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:1012
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/block/block.c:105
+#: src/cadet/gnunet-cadet.c:376
 #, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+msgid "Invalid target `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/cadet/gnunet-cadet.c:626
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "无效条目。\n"
 
-#: src/consensus/gnunet-consensus.c:350
+#: src/cadet/gnunet-cadet.c:669
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/cadet/gnunet-cadet.c:735
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:832
 #, fuzzy
-msgid "number of peers in consensus"
-msgstr "迭代次数"
+msgid "provide information about a particular connection"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/consensus/gnunet-consensus.c:353
-msgid "how many peers receive one value?"
+#: src/cadet/gnunet-cadet.c:835
+msgid "activate echo mode"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:838
+msgid "dump debug information to STDERR"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:844
+msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:356
+#: src/cadet/gnunet-cadet.c:847
 #, fuzzy
-msgid "number of values"
-msgstr "迭代次数"
+msgid "provide information about a patricular peer"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/consensus/gnunet-consensus.c:359
-msgid "consensus timeout"
+#: src/cadet/gnunet-cadet.c:850
+#, fuzzy
+msgid "provide information about all peers"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cadet/gnunet-cadet.c:853
+#, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cadet/gnunet-cadet.c:856
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cadet/gnunet-service-cadet_peer.c:496
+msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:217
+#: src/consensus/gnunet-consensus-profiler.c:437
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610
 #, fuzzy
-msgid "number of element in set A-B"
+msgid "number of peers in consensus"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus-ibf.c:220
+#: src/consensus/gnunet-consensus-profiler.c:440
+msgid "how many peers receive one value?"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:443
+#: src/set/gnunet-set-profiler.c:289 src/set/gnunet-set-profiler.c:292
+#: src/set/gnunet-set-profiler.c:295
 #, fuzzy
-msgid "number of element in set B-A"
+msgid "number of values"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus-ibf.c:223
-msgid "number of common elements in A and B"
+#: src/consensus/gnunet-consensus-profiler.c:446
+msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:226
-msgid "hash num"
+#: src/consensus/gnunet-consensus-profiler.c:449
+msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:229
-msgid "ibf size"
+#: src/consensus/gnunet-consensus-profiler.c:452
+#: src/secretsharing/gnunet-secretsharing-profiler.c:625
+msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-start-peers.c:172
-msgid "start peers with the given template configuration"
+#: src/conversation/conversation_api.c:493
+#: src/conversation/conversation_api_call.c:475
+msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-start-peers.c:175
+#: src/conversation/conversation_api.c:617
 #, fuzzy
-msgid "number of peers to start"
+msgid "number too large"
 msgstr "迭代次数"
 
-#: src/core/core_api.c:752
-msgid "Client was disconnected from core service, trying to reconnect.\n"
+#: src/conversation/gnunet-conversation.c:269
+#, c-format
+msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:82
+#: src/conversation/gnunet-conversation.c:291
 #, c-format
-msgid "Peer `%s'\n"
+msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
-#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
+#: src/conversation/gnunet-conversation.c:323
 #, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
-#, fuzzy
-msgid "Connected to"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
-#, fuzzy
-msgid "Disconnected from"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:176
-#: src/peerinfo-tool/gnunet-peerinfo.c:643
-#, fuzzy, c-format
-msgid "Invalid command line argument `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:996
-msgid "provide information about all current connections (continuously)"
+#: src/conversation/gnunet-conversation.c:328
+#, c-format
+msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:215
-msgid "Print information about connected peers."
+#: src/conversation/gnunet-conversation.c:346
+#, c-format
+msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:110
-#, fuzzy, c-format
-msgid "Failed to read or generate private key: %s\n"
-msgstr "无法为守护程序创建用户账户。"
+#: src/conversation/gnunet-conversation.c:360
+#, fuzzy
+msgid "Failed to setup phone (internal error)\n"
+msgstr "发送消息失败。\n"
 
-#: src/core/gnunet-service-core.c:124
+#: src/conversation/gnunet-conversation.c:372
 #, c-format
-msgid "Core service of `%4s' ready.\n"
+msgid ""
+"Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:150
-#, fuzzy
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr "立即保存配置？"
+#: src/conversation/gnunet-conversation.c:394
+#, c-format
+msgid "Resolved address of `%s'. Now ringing other party.\n"
+msgstr ""
 
-#: src/core/gnunet-service-core.c:164
-#: src/transport/gnunet-service-transport.c:758
-#, fuzzy
-msgid "Transport service is unable to access hostkey. Exiting.\n"
+#: src/conversation/gnunet-conversation.c:401
+#, fuzzy, c-format
+msgid "Connection established to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/core/gnunet-service-core_clients.c:370
-msgid "# send requests dropped (disconnected)"
+#: src/conversation/gnunet-conversation.c:408
+#, fuzzy, c-format
+msgid "Failed to resolve `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/conversation/gnunet-conversation.c:416
+#, c-format
+msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:475
-msgid "# messages discarded (session disconnected)"
+#: src/conversation/gnunet-conversation.c:425
+#, c-format
+msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:518
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
-msgid "# bytes of messages of type %u received"
+msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:532
-msgid "# bytes encrypted"
+#: src/conversation/gnunet-conversation.c:436
+msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:583
-msgid "# bytes decrypted"
+#: src/conversation/gnunet-conversation.c:504
+#, fuzzy, c-format
+msgid "Unknown command `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/conversation/gnunet-conversation.c:520
+#: src/conversation/gnunet-conversation.c:534
+#, c-format
+msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:667
-msgid "# key exchanges initiated"
+#: src/conversation/gnunet-conversation.c:527
+#: src/conversation/gnunet-conversation.c:584
+msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:697
-msgid "# key exchanges stopped"
+#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:597
+#, c-format
+msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:761
-msgid "# old ephemeral keys ignored"
+#: src/conversation/gnunet-conversation.c:552
+msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:767
-msgid "# ephemeral keys received"
+#: src/conversation/gnunet-conversation.c:608
+msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/conversation/gnunet-conversation.c:625
 #, c-format
-msgid ""
-"Ephemeral key message rejected as its validity range does not match our "
-"system time (%llu not in [%llu,%llu]).\n"
+msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:818
-msgid "# EPHEMERAL_KEY messages decrypted"
+#: src/conversation/gnunet-conversation.c:655
+msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:921
-#: src/transport/gnunet-service-transport_validation.c:915
-msgid "# PING messages received"
+#: src/conversation/gnunet-conversation.c:678
+#, c-format
+msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:929
-msgid "# PING messages dropped (out of order)"
+#: src/conversation/gnunet-conversation.c:683
+#, c-format
+msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:956
+#: src/conversation/gnunet-conversation.c:689
+#: src/conversation/gnunet-conversation.c:713
 #, c-format
-msgid ""
-"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
-"%s'\n"
+msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:973
-msgid "# PONG messages created"
+#: src/conversation/gnunet-conversation.c:694
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:999
-msgid "# sessions terminated by timeout"
-msgstr ""
+#: src/conversation/gnunet-conversation.c:703
+#, fuzzy, c-format
+msgid "We are trying to find the network address to call `%s'.\n"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/core/gnunet-service-core_kx.c:1009
-msgid "# keepalive messages sent"
+#: src/conversation/gnunet-conversation.c:708
+#, c-format
+msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1066
-#: src/transport/gnunet-service-transport_validation.c:1160
-msgid "# PONG messages received"
+#: src/conversation/gnunet-conversation.c:727
+msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1072
-msgid "# PONG messages dropped (connection down)"
+#: src/conversation/gnunet-conversation.c:733
+#, fuzzy, c-format
+msgid "#%u: `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/conversation/gnunet-conversation.c:761
+#: src/conversation/gnunet-conversation.c:776
+msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1077
-msgid "# PONG messages dropped (out of order)"
+#: src/conversation/gnunet-conversation.c:809
+#: src/conversation/gnunet-conversation.c:825
+msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1107
-msgid "# PONG messages decrypted"
+#: src/conversation/gnunet-conversation.c:832
+#, c-format
+msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1141
-msgid "# session keys confirmed via PONG"
+#: src/conversation/gnunet-conversation.c:841
+msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1151
-msgid "# timeouts prevented via PONG"
+#: src/conversation/gnunet-conversation.c:858
+#, c-format
+msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1158
-msgid "# rekey operations confirmed via PONG"
+#: src/conversation/gnunet-conversation.c:893
+msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1298
-msgid "# DATA message dropped (out of order)"
+#: src/conversation/gnunet-conversation.c:901
+msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/conversation/gnunet-conversation.c:918
 #, c-format
-msgid ""
-"Session to peer `%s' went down due to key expiration (should not happen)\n"
+msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1308
-msgid "# sessions terminated by key expiration"
+#: src/conversation/gnunet-conversation.c:944
+msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1351
-#: src/core/gnunet-service-core_kx.c:1376
-msgid "# bytes dropped (duplicates)"
+#: src/conversation/gnunet-conversation.c:946
+msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1363
-msgid "# bytes dropped (out of sequence)"
+#: src/conversation/gnunet-conversation.c:948
+msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1404
-msgid "# bytes dropped (ancient message)"
+#: src/conversation/gnunet-conversation.c:950
+msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1412
-msgid "# bytes of payload decrypted"
+#: src/conversation/gnunet-conversation.c:952
+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/core/gnunet-service-core_kx.c:1443
-msgid "# PAYLOAD dropped (out of order)"
+#: src/conversation/gnunet-conversation.c:954
+msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:163
-msgid "# sessions terminated by transport disconnect"
+#: src/conversation/gnunet-conversation.c:956
+msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:328
-msgid "# neighbour entries allocated"
+#: src/conversation/gnunet-conversation.c:958
+msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:246
-msgid "# encrypted bytes given to transport"
+#: src/conversation/gnunet-conversation.c:960
+msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:411
+#: src/conversation/gnunet-conversation.c:1168
+#, fuzzy, c-format
+msgid "Name of our ego changed to `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/conversation/gnunet-conversation.c:1181
 #, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
+msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:210
-#: src/core/gnunet-service-core_sessions.c:280
-#: src/dht/gnunet-service-dht_neighbours.c:644
-#: src/dht/gnunet-service-dht_neighbours.c:703
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
-#: src/topology/gnunet-daemon-topology.c:700
-#: src/topology/gnunet-daemon-topology.c:801
-#: src/transport/gnunet-service-transport_neighbours.c:1041
-#: src/transport/gnunet-service-transport_neighbours.c:1265
-#: src/transport/gnunet-service-transport_neighbours.c:1274
-#: src/transport/gnunet-service-transport_neighbours.c:2798
-#: src/transport/gnunet-service-transport_neighbours.c:3057
-msgid "# peers connected"
+#: src/conversation/gnunet-conversation.c:1216
+#, fuzzy
+msgid "You must specify the NAME of an ego to use\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/conversation/gnunet-conversation.c:1240
+#, fuzzy
+msgid "Failed to start gnunet-helper-w32-console\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/conversation/gnunet-conversation.c:1266
+msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:248
-msgid "# type map refreshes sent"
+#: src/conversation/gnunet-conversation.c:1269
+msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:417
-msgid "# messages discarded (expired prior to transmission)"
+#: src/conversation/gnunet-conversation.c:1295
+msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
-msgid "# type maps received"
+#: src/conversation/gnunet-conversation-test.c:121
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:151
-msgid "# updates to my type map"
+#: src/conversation/gnunet-conversation-test.c:149
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
 msgstr ""
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:834
-msgid "# bytes stored"
+#: src/conversation/gnunet-conversation-test.c:215
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
 msgstr ""
 
-#: src/datacache/datacache.c:117 src/datacache/datacache.c:268
-msgid "# items stored"
+#: src/conversation/gnunet-conversation-test.c:248
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
+#: src/sensordashboard/gnunet-sensordashboard.c:70
+#: src/template/gnunet-template.c:70
+msgid "help text"
 msgstr ""
 
-#: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1483
-#: src/datastore/gnunet-service-datastore.c:1494
-#, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
+#: src/conversation/gnunet-helper-audio-playback.c:305
+#, fuzzy, c-format
+msgid "pa_stream_write() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:589
+msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/datacache/datacache.c:184
-#, c-format
-msgid "Loading `%s' datacache plugin\n"
+#: src/conversation/gnunet-helper-audio-playback.c:614
+#: src/conversation/gnunet-helper-audio-record.c:545
+msgid "Connection established.\n"
 msgstr ""
 
-#: src/datacache/datacache.c:192
+#: src/conversation/gnunet-helper-audio-playback.c:619
+#: 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:633
 #, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
+msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/datacache/datacache.c:295
-msgid "# requests received"
-msgstr ""
+#: src/conversation/gnunet-helper-audio-playback.c:646
+#: src/conversation/gnunet-helper-audio-record.c:576
+#, fuzzy, c-format
+msgid "Connection failure: %s\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/datacache/datacache.c:304
-msgid "# requests filtered by bloom filter"
+#: src/conversation/gnunet-helper-audio-playback.c:667
+#: src/conversation/gnunet-helper-audio-record.c:599
+msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:406
-#, fuzzy
-msgid "Heap datacache running\n"
-msgstr "sqlite 数据仓库"
+#: src/conversation/gnunet-helper-audio-playback.c:673
+#: src/conversation/gnunet-helper-audio-record.c:605
+msgid "pa_mainloop_new() failed.\n"
+msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:392
-msgid "Postgres datacache running\n"
+#: src/conversation/gnunet-helper-audio-playback.c:687
+#: src/conversation/gnunet-helper-audio-record.c:620
+msgid "pa_context_new() failed.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:72
-#: src/datastore/plugin_datastore_mysql.c:803
-#: src/datastore/plugin_datastore_mysql.c:817
-#: src/datastore/plugin_datastore_sqlite.c:57 src/fs/fs_pseudonym.c:46
-#: src/mysql/mysql.c:41 src/mysql/mysql.c:48 src/mysql/mysql.c:522
-#: src/mysql/mysql.c:531 src/mysql/mysql.c:591 src/mysql/mysql.c:607
-#: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:46
-#: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
-#: src/include/gnunet_common.h:608 src/include/gnunet_common.h:615
+#: src/conversation/gnunet-helper-audio-playback.c:694
+#: src/conversation/gnunet-helper-audio-record.c:626
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+msgid "pa_context_connect() failed: %s\n"
+msgstr "“%s”说：%s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:450
-msgid "Sqlite datacache running\n"
+#: src/conversation/gnunet-helper-audio-playback.c:700
+#: src/conversation/gnunet-helper-audio-record.c:632
+msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namestore/plugin_namestore_sqlite.c:362
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/conversation/gnunet-helper-audio-playback.c:770
+#, 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/datacache/plugin_datacache_sqlite.c:491
+#: src/conversation/gnunet-helper-audio-record.c:344
 #, fuzzy, c-format
-msgid "Failed to close statement %p: %d\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "opus_encode_float() failed: %s. Aborting\n"
+msgstr "“%s”说：%s\n"
 
-#: src/datacache/plugin_datacache_template.c:125
-msgid "Template datacache running\n"
-msgstr ""
+#: src/conversation/gnunet-helper-audio-record.c:420
+#, fuzzy, c-format
+msgid "pa_stream_peek() failed: %s\n"
+msgstr "“%s”说：%s\n"
 
-#: src/datastore/datastore_api.c:310
-msgid "Failed to transmit request to drop database.\n"
+#: src/conversation/gnunet-helper-audio-record.c:458
+msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:393
-msgid "# queue entry timeouts"
-msgstr ""
+#: src/conversation/gnunet-helper-audio-record.c:483
+#, fuzzy
+msgid "Stream successfully created.\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/datastore/datastore_api.c:437
-msgid "# queue overflows"
-msgstr ""
+#: src/conversation/gnunet-helper-audio-record.c:488
+#, fuzzy, c-format
+msgid "pa_stream_get_buffer_attr() failed: %s\n"
+msgstr "“%s”说：%s\n"
 
-#: src/datastore/datastore_api.c:465
-msgid "# queue entries created"
+#: src/conversation/gnunet-helper-audio-record.c:496
+#, c-format
+msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:483
-msgid "# Requests dropped from datastore queue"
+#: src/conversation/gnunet-helper-audio-record.c:500
+#, c-format
+msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:525
-msgid "# datastore connections (re)created"
-msgstr ""
+#: src/conversation/gnunet-helper-audio-record.c:507
+#, fuzzy, c-format
+msgid "Connected to device %s (%u, %ssuspended).\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/datastore/datastore_api.c:608
-msgid "# transmission request failures"
+#: src/conversation/gnunet-helper-audio-record.c:516
+#, c-format
+msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:630
-msgid "# bytes sent to datastore"
+#: src/conversation/gnunet-helper-audio-record.c:563
+#, fuzzy, c-format
+msgid "pa_stream_connect_record() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:676
+#, fuzzy
+msgid "ogg_stream_init() failed.\n"
+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"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/conversation/gnunet-service-conversation.c:853
+msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:762
-msgid "Failed to receive status response from database."
+#: src/conversation/gnunet-service-conversation.c:944
+#, c-format
+msgid ""
+"No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:776
-msgid "Error reading response from datastore service"
+#: src/conversation/gnunet-service-conversation.c:1351
+#, fuzzy, c-format
+msgid "Received incoming Cadet channel on port %u\n"
+msgstr "“%s”已连接到“%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
+#, fuzzy, c-format
+msgid "Unable to parse PHONE record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/conversation/speaker.c:75
+msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
-msgid "Invalid error message received from datastore service"
+#: src/core/core_api.c:768
+msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798
-msgid "# status messages received"
+#: src/core/gnunet-core.c:92
+#, fuzzy
+msgid "fresh connection"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/datastore/datastore_api.c:867
-msgid "# PUT requests executed"
+#: src/core/gnunet-core.c:95
+msgid "key sent"
 msgstr ""
 
-#: src/datastore/datastore_api.c:934
-msgid "# RESERVE requests executed"
+#: src/core/gnunet-core.c:98
+msgid "key received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:995
-msgid "# RELEASE RESERVE requests executed"
+#: src/core/gnunet-core.c:101
+#, fuzzy
+msgid "connection established"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/core/gnunet-core.c:104
+msgid "rekeying"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1052
-msgid "# UPDATE requests executed"
+#: src/core/gnunet-core.c:107
+#, fuzzy
+msgid "disconnected"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/core/gnunet-core.c:114
+msgid "Connection to CORE service lost (reconnecting)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1116
-msgid "# REMOVE requests executed"
+#: src/core/gnunet-core.c:117
+#, fuzzy
+msgid "unknown state"
+msgstr "未知错误"
+
+#: src/core/gnunet-core.c:122
+#, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1161
-msgid "Failed to receive response from database.\n"
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:761
+#, fuzzy, c-format
+msgid "Invalid command line argument `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/core/gnunet-core.c:157
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2115
+msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1220
-msgid "# Results received"
+#: src/core/gnunet-core.c:188
+msgid "Print information about connected peers."
 msgstr ""
 
-#: src/datastore/datastore_api.c:1286
-msgid "# GET REPLICATION requests executed"
+#: src/core/gnunet-service-core.c:104
+#, fuzzy
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "立即保存配置？"
+
+#: src/core/gnunet-service-core.c:128
+#, c-format
+msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1349
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/core/gnunet-service-core_clients.c:372
+msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1410
-msgid "# GET requests executed"
+#: src/core/gnunet-service-core_clients.c:483
+msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:349
-msgid "# bytes expired"
+#: src/core/gnunet-service-core_clients.c:529
+#, c-format
+msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:422
-msgid "# bytes purged (low-priority)"
+#: src/core/gnunet-service-core_kx.c:565
+msgid "# bytes encrypted"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:480
-#: src/gns/gnunet-gns-helper-service-w32.c:159
-msgid "Transmission to client failed!\n"
+#: src/core/gnunet-service-core_kx.c:617
+msgid "# bytes decrypted"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:511
-#: src/gns/gnunet-gns-helper-service-w32.c:189
-msgid "Shutdown in progress, aborting transmission.\n"
+#: src/core/gnunet-service-core_kx.c:703
+msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:626
-msgid "# results found"
+#: src/core/gnunet-service-core_kx.c:747
+msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:669
-#, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+#: src/core/gnunet-service-core_kx.c:847
+msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:680
-#, c-format
-msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+#: src/core/gnunet-service-core_kx.c:854
+msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/core/gnunet-service-core_kx.c:888
+#, c-format
 msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+"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/datastore/gnunet-service-datastore.c:690
-msgid "Insufficient space to satisfy request"
+#: src/core/gnunet-service-core_kx.c:899
+msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:695
-#: src/datastore/gnunet-service-datastore.c:747
-#: src/datastore/gnunet-service-datastore.c:960
-#: src/datastore/gnunet-service-datastore.c:1417
-msgid "# reserved"
+#: src/core/gnunet-service-core_kx.c:998
+#: src/transport/gnunet-service-transport_validation.c:1016
+msgid "# PING messages received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:760
-msgid "Could not find matching reservation"
+#: src/core/gnunet-service-core_kx.c:1006
+msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:846
+#: src/core/gnunet-service-core_kx.c:1033
 #, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+msgid ""
+"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
+"%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1006
-msgid "# GET requests received"
+#: src/core/gnunet-service-core_kx.c:1049
+msgid "# PONG messages created"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1018
-msgid "# requests filtered by bloomfilter"
+#: src/core/gnunet-service-core_kx.c:1075
+msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
-msgid "# UPDATE requests received"
+#: src/core/gnunet-service-core_kx.c:1086
+msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1076
-msgid "# GET REPLICATION requests received"
+#: src/core/gnunet-service-core_kx.c:1153
+#: src/transport/gnunet-service-transport_validation.c:1359
+msgid "# PONG messages received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1109
-msgid "# GET ZERO ANONYMITY requests received"
+#: src/core/gnunet-service-core_kx.c:1159
+msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1134
-msgid "Content not found"
+#: src/core/gnunet-service-core_kx.c:1164
+msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1142
-msgid "# bytes removed (explicit request)"
+#: src/core/gnunet-service-core_kx.c:1194
+msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1174
-msgid "# REMOVE requests received"
+#: src/core/gnunet-service-core_kx.c:1229
+msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
-#, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+#: src/core/gnunet-service-core_kx.c:1240
+msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1277
-#, c-format
-msgid "Loading `%s' datastore plugin\n"
+#: src/core/gnunet-service-core_kx.c:1247
+msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1286
-#, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/core/gnunet-service-core_kx.c:1386
+msgid "# DATA message dropped (out of order)"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1488
+#: src/core/gnunet-service-core_kx.c:1393
 #, c-format
-msgid "# bytes used in file-sharing datastore `%s'"
+msgid ""
+"Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1499
-msgid "# quota"
+#: src/core/gnunet-service-core_kx.c:1396
+msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1501
-msgid "# cache size"
+#: src/core/gnunet-service-core_kx.c:1442
+#: src/core/gnunet-service-core_kx.c:1467
+msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1514
-#, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+#: src/core/gnunet-service-core_kx.c:1454
+msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1532
-#: src/datastore/gnunet-service-datastore.c:1548
-#, fuzzy, c-format
-msgid "Failed to remove bogus bloomfilter file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/core/gnunet-service-core_kx.c:1496
+msgid "# bytes dropped (ancient message)"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1578
-#, fuzzy
-msgid "Failed to initialize bloomfilter.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/core/gnunet-service-core_kx.c:1504
+msgid "# bytes of payload decrypted"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1607
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
+#: src/core/gnunet-service-core_kx.c:1539
+msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1612
-msgid "Plugin does not support get_keys function. Please fix!\n"
+#: src/core/gnunet-service-core_neighbours.c:168
+msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1615
-msgid "Bloomfilter construction complete.\n"
+#: src/core/gnunet-service-core_neighbours.c:184
+#: src/core/gnunet-service-core_neighbours.c:335
+msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/datastore/plugin_datastore_heap.c:820
-#, fuzzy
-msgid "Heap database running\n"
-msgstr "sqlite 数据仓库"
+#: src/core/gnunet-service-core_neighbours.c:252
+msgid "# encrypted bytes given to transport"
+msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:780
-#, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/core/gnunet-service-core_neighbours.c:418
+#, c-format
+msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:788
-#, fuzzy, c-format
-msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+#: src/core/gnunet-service-core_sessions.c:245
+#: src/core/gnunet-service-core_sessions.c:328
+#: src/dht/gnunet-service-dht_neighbours.c:662
+#: src/dht/gnunet-service-dht_neighbours.c:727
+#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1517
+#: src/topology/gnunet-daemon-topology.c:734
+#: src/topology/gnunet-daemon-topology.c:835
+#: src/transport/gnunet-service-transport_neighbours.c:917
+#: src/transport/gnunet-service-transport_neighbours.c:1141
+#: src/transport/gnunet-service-transport_neighbours.c:3177
+#: src/transport/gnunet-service-transport_neighbours.c:3491
+msgid "# peers connected"
+msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1019
-msgid "Mysql database running\n"
+#: src/core/gnunet-service-core_sessions.c:278
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:824
+#: src/core/gnunet-service-core_sessions.c:394
 #, fuzzy
-msgid "Failed to drop table from database.\n"
-msgstr "发送消息失败。\n"
+msgid "# outdated typemap confirmations received"
+msgstr "保存配置失败。"
 
-#: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:652
-msgid "Postgres database running\n"
+#: src/core/gnunet-service-core_sessions.c:405
+#, fuzzy
+msgid "# valid typemap confirmations received"
+msgstr "保存配置失败。"
+
+#: src/core/gnunet-service-core_sessions.c:543
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:57
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%u with error: %s"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+#: src/core/gnunet-service-core_typemap.c:169
+#: src/core/gnunet-service-core_typemap.c:180
+msgid "# type maps received"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:253
-#: src/namestore/plugin_namestore_sqlite.c:223
-#, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "无法初始化 SQLite：%s。\n"
+#: src/core/gnunet-service-core_typemap.c:210
+msgid "# updates to my type map"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:648
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:266
+#: src/datastore/gnunet-service-datastore.c:838
+msgid "# bytes stored"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1134
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:268
+msgid "# items stored"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1153
+#: 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 ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1193
-#: src/namestore/plugin_namestore_sqlite.c:827
-#, fuzzy
-msgid "Sqlite database running\n"
-msgstr "sqlite 数据仓库"
-
-#: src/datastore/plugin_datastore_template.c:257
-msgid "Template database running\n"
+#: src/datacache/datacache.c:184
+#, c-format
+msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/dht/dht_api.c:375
-#, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/dht/gnunet-dht-get.c:132
+#: src/datacache/datacache.c:192
 #, c-format
-msgid ""
-"Result %d, type %d:\n"
-"%.*s\n"
+msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:156
-msgid "Must provide key for DHT GET!\n"
+#: src/datacache/datacache.c:295
+msgid "# requests received"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
-#, fuzzy
-msgid "Failed to connect to DHT service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/dht/gnunet-dht-get.c:170
-msgid "Issueing DHT GET with key"
+#: src/datacache/datacache.c:304
+msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
-#: src/dht/gnunet-dht-put.c:198
-msgid "the query key"
-msgstr ""
+#: src/datacache/plugin_datacache_heap.c:406
+#, fuzzy
+msgid "Heap datacache running\n"
+msgstr "sqlite 数据仓库"
 
-#: src/dht/gnunet-dht-get.c:189
-msgid "how many parallel requests (replicas) to create"
+#: src/datacache/plugin_datacache_postgres.c:391
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
-msgid "the type of data to look for"
-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/peerstore/plugin_peerstore_sqlite.c:50
+#: 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:622
+#: src/include/gnunet_common.h:631 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/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
-msgid "how long to execute this query before giving up?"
+#: src/datacache/plugin_datacache_sqlite.c:449
+msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
-msgid "use DHT's demultiplex everywhere option"
+#: src/datacache/plugin_datacache_sqlite.c:483
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namestore/plugin_namestore_sqlite.c:324
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
-#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:899
-msgid "be verbose (print progress information)"
-msgstr ""
+#: src/datacache/plugin_datacache_sqlite.c:490
+#, fuzzy, c-format
+msgid "Failed to close statement %p: %d\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/dht/gnunet-dht-get.c:222
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/datacache/plugin_datacache_template.c:125
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:268
-msgid "how long should the monitor command run"
+#: src/datastore/datastore_api.c:310
+msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:293
-msgid "Prints all packets that go through the DHT."
+#: src/datastore/datastore_api.c:394
+msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:118
-msgid "PUT request sent with key"
+#: src/datastore/datastore_api.c:443
+msgid "# queue overflows"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
-msgid "Timeout sending PUT request!\n"
+#: src/datastore/datastore_api.c:471
+msgid "# queue entries created"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
-msgid "PUT request not confirmed!\n"
+#: src/datastore/datastore_api.c:491
+msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:153
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/datastore/datastore_api.c:533
+msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:160
-#, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/dht/gnunet-dht-put.c:176
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+#: src/datastore/datastore_api.c:616
+msgid "# transmission request failures"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
-msgid "the data to insert under the key"
+#: src/datastore/datastore_api.c:638
+msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/datastore/datastore_api.c:770
+msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
-msgid "how many replicas to create"
+#: src/datastore/datastore_api.c:784
+msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
-msgid "the type to insert data as"
+#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
+msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:235
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/datastore/datastore_api.c:806
+msgid "# status messages received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/dht/gnunet-service-dht_clients.c:414
-msgid "# GET requests from clients injected"
+#: src/datastore/datastore_api.c:876
+msgid "# PUT requests executed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:508
-msgid "# PUT requests received from clients"
+#: src/datastore/datastore_api.c:944
+msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:590
-msgid "# GET requests received from clients"
+#: src/datastore/datastore_api.c:1005
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:796
-msgid "# GET STOP requests received from clients"
+#: src/datastore/datastore_api.c:1065
+msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1041
-msgid "# Key match, type mismatches in REPLY to CLIENT"
+#: src/datastore/datastore_api.c:1129
+msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1054
-msgid "# Duplicate REPLIES to CLIENT request dropped"
+#: src/datastore/datastore_api.c:1174
+msgid "Failed to receive response from database.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1091
-#, c-format
-msgid "Unsupported block type (%u) in request!\n"
+#: src/datastore/datastore_api.c:1233
+msgid "# Results received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1114
-msgid "# RESULTS queued for clients"
+#: src/datastore/datastore_api.c:1300
+msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1165
-#: src/dht/gnunet-service-dht_clients.c:1207
-msgid "# REPLIES ignored for CLIENTS (no match)"
+#: src/datastore/datastore_api.c:1363
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1175
-msgid "Could not pass reply to client, message too big!\n"
+#: src/datastore/datastore_api.c:1424
+msgid "# GET requests executed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:68
+#: 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:200
 #, c-format
-msgid "%s request received, but have no datacache!\n"
+msgid "Cannot use the same configuration for source and destination\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:78
-msgid "# ITEMS stored in datacache"
+#: 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"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:165
-msgid "# Good RESULTS found in datacache"
+#: src/datastore/gnunet-datastore.c:255
+#, fuzzy
+msgid "Manipulate GNUnet datastore"
+msgstr "更改配置文件中的一个值"
+
+#: src/datastore/gnunet-service-datastore.c:351
+msgid "# bytes expired"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
-msgid "# Duplicate RESULTS found in datacache"
+#: src/datastore/gnunet-service-datastore.c:425
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
-msgid "# Invalid RESULTS found in datacache"
+#: src/datastore/gnunet-service-datastore.c:483
+#: src/gns/gnunet-gns-helper-service-w32.c:223
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:188
-msgid "# Irrelevant RESULTS found in datacache"
+#: 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/dht/gnunet-service-dht_datacache.c:200
-msgid "# Unsupported RESULTS found in datacache"
+#: src/datastore/gnunet-service-datastore.c:630
+msgid "# results found"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:203
+#: src/datastore/gnunet-service-datastore.c:673
 #, c-format
-msgid "Unsupported block type (%u) in local response!\n"
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
-msgid "# GET requests given to datacache"
+#: src/datastore/gnunet-service-datastore.c:684
+#, c-format
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:82
-msgid "# HELLOs obtained from peerinfo"
+#: src/datastore/gnunet-service-datastore.c:688
+msgid ""
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:504
-msgid "# Preference updates given to core"
+#: src/datastore/gnunet-service-datastore.c:694
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:594
-msgid "# FIND PEER messages initiated"
+#: 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
+msgid "# reserved"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:737
-msgid "# Queued messages discarded (peer disconnected)"
+#: src/datastore/gnunet-service-datastore.c:764
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
-msgid "# Bytes transmitted to other peers"
+#: src/datastore/gnunet-service-datastore.c:850
+#, c-format
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:830
-msgid "# Bytes of bandwidth requested from core"
+#: src/datastore/gnunet-service-datastore.c:1010
+msgid "# GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1086
-msgid "# Peers excluded from routing due to Bloomfilter"
+#: src/datastore/gnunet-service-datastore.c:1022
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1067
-#: src/dht/gnunet-service-dht_neighbours.c:1101
-msgid "# Peer selection failed"
+#: src/datastore/gnunet-service-datastore.c:1050
+msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1235
-msgid "# PUT requests routed"
+#: src/datastore/gnunet-service-datastore.c:1080
+msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1264
-msgid "# PUT messages queued for transmission"
+#: src/datastore/gnunet-service-datastore.c:1113
+msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1271
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-#: src/dht/gnunet-service-dht_neighbours.c:1484
-msgid "# P2P messages dropped due to full queue"
+#: src/datastore/gnunet-service-datastore.c:1138
+msgid "Content not found"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1349
-msgid "# GET requests routed"
+#: src/datastore/gnunet-service-datastore.c:1146
+msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1376
-msgid "# GET messages queued for transmission"
+#: src/datastore/gnunet-service-datastore.c:1178
+msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1491
-msgid "# RESULT messages queued for transmission"
+#: src/datastore/gnunet-service-datastore.c:1220
+#, c-format
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1575
-msgid "# P2P PUT requests received"
+#: src/datastore/gnunet-service-datastore.c:1281
+#, c-format
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1730
-msgid "# FIND PEER requests ignored due to Bloomfilter"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1290
+#, fuzzy, c-format
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1738
-msgid "# FIND PEER requests ignored due to lack of HELLO"
+#: src/datastore/gnunet-service-datastore.c:1492
+#, c-format
+msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1829
-msgid "# P2P GET requests received"
+#: src/datastore/gnunet-service-datastore.c:1503
+msgid "# quota"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1882
-msgid "# P2P FIND PEER requests processed"
+#: src/datastore/gnunet-service-datastore.c:1505
+msgid "# cache size"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1896
-msgid "# P2P GET requests ONLY routed"
+#: src/datastore/gnunet-service-datastore.c:1518
+#, c-format
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1973
-msgid "# P2P RESULTS received"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1552
+#, fuzzy, c-format
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/dht/gnunet-service-dht_nse.c:59
-msgid "# Network size estimates received"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1582
+#, fuzzy
+msgid "Failed to initialize bloomfilter.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-service-dht_routing.c:211
-msgid "# Good REPLIES matched against routing table"
+#: src/datastore/gnunet-service-datastore.c:1611
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Duplicate REPLIES matched against routing table"
+#: src/datastore/gnunet-service-datastore.c:1616
+msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
-msgid "# Invalid REPLIES matched against routing table"
+#: src/datastore/gnunet-service-datastore.c:1619
+msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:232
-msgid "# Irrelevant REPLIES matched against routing table"
-msgstr ""
+#: src/datastore/plugin_datastore_heap.c:820
+#, fuzzy
+msgid "Heap database running\n"
+msgstr "sqlite 数据仓库"
 
-#: src/dht/gnunet-service-dht_routing.c:244
-msgid "# Unsupported REPLIES matched against routing table"
-msgstr ""
+#: src/datastore/plugin_datastore_mysql.c:783
+#, fuzzy, c-format
+msgid "Failed to prepare statement `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/dht/gnunet-service-dht_routing.c:317
-msgid "# Entries removed from routing table"
-msgstr ""
+#: src/datastore/plugin_datastore_mysql.c:791
+#, fuzzy, c-format
+msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/dht/gnunet-service-dht_routing.c:400
-msgid "# Entries added to routing table"
+#: src/datastore/plugin_datastore_mysql.c:1022
+msgid "Mysql database running\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:418
-msgid "# DHT requests combined"
+#: src/datastore/plugin_datastore_postgres.c:832
+#, fuzzy
+msgid "Failed to drop table from database.\n"
+msgstr "发送消息失败。\n"
+
+#: src/datastore/plugin_datastore_postgres.c:868
+#: src/namecache/plugin_namecache_postgres.c:414
+#: src/namestore/plugin_namestore_postgres.c:569
+msgid "Postgres database running\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:136
+#: src/datastore/plugin_datastore_sqlite.c:57
+#: src/testbed/generate-underlay-topology.c:50
+#: src/testbed/gnunet-daemon-latency-logger.c:55
+#: src/testbed/gnunet-daemon-testbed-underlay.c:58
+#, 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/peerstore/plugin_peerstore_sqlite.c:458
+#: src/psycstore/plugin_psycstore_sqlite.c:329
 #, c-format
-msgid "Block not of type %u\n"
-msgstr ""
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/dht/plugin_block_dht.c:143
-msgid "Size mismatch for block\n"
+#: src/datastore/plugin_datastore_sqlite.c:661
+#, fuzzy
+msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
+
+#: src/datastore/plugin_datastore_sqlite.c:1154
+msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:152
+#: src/datastore/plugin_datastore_sqlite.c:1173
 #, c-format
-msgid "Block of type %u is malformed\n"
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:152
-#, fuzzy, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/dns/dnsparser.c:626
-#, fuzzy, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/dns/dnsstub.c:175
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
+#: src/datastore/plugin_datastore_sqlite.c:1213
+#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namestore/plugin_namestore_sqlite.c:716
+#, fuzzy
+msgid "Sqlite database running\n"
+msgstr "sqlite 数据仓库"
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
-#: src/gns/gnunet-service-gns_resolver.c:1621
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/datastore/plugin_datastore_template.c:257
+msgid "Template database running\n"
+msgstr ""
 
-#: src/dns/dnsstub.c:299
-#, fuzzy, c-format
-msgid "Sent DNS request to %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/dht/dht_api.c:403
+#, fuzzy
+msgid "Failed to connect to the DHT service!\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/dns/dnsstub.c:368
+#: src/dht/gnunet-dht-get.c:133
 #, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
+msgid ""
+"Result %d, type %d:\n"
+"%.*s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:440
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
+#: src/dht/gnunet-dht-get.c:159
+msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
-msgid "only monitor DNS queries"
-msgstr ""
+#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
+#, fuzzy
+msgid "Failed to connect to DHT service!\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/dns/gnunet-dns-monitor.c:358
-msgid "only monitor DNS replies"
+#: src/dht/gnunet-dht-get.c:173
+msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:369
-msgid "Monitor DNS queries."
+#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-put.c:198
+msgid "the query key"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:236
-msgid "set A records"
+#: src/dht/gnunet-dht-get.c:192
+msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:239
-msgid "set AAAA records"
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
+msgid "the type of data to look for"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:251
-msgid "Change DNS replies to point elsewhere."
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:456
-msgid "# DNS requests answered via TUN interface"
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
+msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:603
-msgid "# DNS exit failed (failed to open socket)"
+#: 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:939
+#: 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/dns/gnunet-service-dns.c:714
-msgid "# External DNS response discarded (no matching request)"
+#: src/dht/gnunet-dht-get.c:225
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:792
-msgid "# Client response discarded (no matching request)"
+#: src/dht/gnunet-dht-monitor.c:268
+msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:907
-msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
+#: src/dht/gnunet-dht-monitor.c:293
+msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:923
-msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
+#: src/dht/gnunet_dht_profiler.c:1392
+#: src/testbed/gnunet-testbed-profiler.c:267
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
+
+#: src/dht/gnunet_dht_profiler.c:1417
+#, fuzzy
+msgid "number of peers to start"
+msgstr "迭代次数"
+
+#: src/dht/gnunet_dht_profiler.c:1420
+msgid ""
+"maximum number of times we try to search for successor circle formation (0 "
+"for R5N)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:932
-#, c-format
-msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
+#: src/dht/gnunet_dht_profiler.c:1423 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"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:942
-msgid "# Non-DNS UDP packet received via TUN interface"
+#: src/dht/gnunet_dht_profiler.c:1426
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1009
-msgid "# DNS requests received via TUN interface"
+#: src/dht/gnunet_dht_profiler.c:1429
+msgid "delay to start doing PUTs (default: 1 sec)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3351
-#, c-format
-msgid "`%s' must be installed SUID, refusing to run\n"
+#: src/dht/gnunet_dht_profiler.c:1432
+msgid "delay to start doing GETs (default: 5 min)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3407
-#, fuzzy
-msgid "need a valid IPv4 or IPv6 address\n"
-msgstr "无效的进程优先级“%s”\n"
+#: src/dht/gnunet_dht_profiler.c:1435
+msgid "replication degree for DHT PUTs"
+msgstr ""
 
-#: src/dv/gnunet-dv.c:165
-msgid "verbose output"
+#: src/dht/gnunet_dht_profiler.c:1438
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:174
+#: src/dht/gnunet_dht_profiler.c:1456
 #, fuzzy
-msgid "Print information about DV state"
-msgstr "æ\97 æ³\95è\8e·å\8f\96æ\9c\89å\85³ç\94¨æ\88·â\80\9c%sâ\80\9dç\9a\84ä¿¡æ\81¯ï¼\9a%s\n"
+msgid "Measure quality and performance of the DHT service."
+msgstr "æ\97 æ³\95访é\97®è¯¥æ\9c\8då\8a¡"
 
-#: src/exit/gnunet-daemon-exit.c:741
-#, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
+#: src/dht/gnunet-dht-put.c:118
+msgid "PUT request sent with key"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:794
-msgid "# Bytes transmitted via mesh tunnels"
+#: src/dht/gnunet-dht-put.c:121
+msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:911 src/exit/gnunet-daemon-exit.c:2343
-#: src/exit/gnunet-daemon-exit.c:2603 src/vpn/gnunet-service-vpn.c:1411
-#: src/vpn/gnunet-service-vpn.c:1812 src/vpn/gnunet-service-vpn.c:1975
-msgid "# ICMPv4 packets dropped (type not allowed)"
+#: src/dht/gnunet-dht-put.c:124
+msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:948 src/exit/gnunet-daemon-exit.c:2402
-#: src/exit/gnunet-daemon-exit.c:2662 src/vpn/gnunet-service-vpn.c:1467
-#: src/vpn/gnunet-service-vpn.c:1871 src/vpn/gnunet-service-vpn.c:2008
-msgid "# ICMPv6 packets dropped (type not allowed)"
+#: src/dht/gnunet-dht-put.c:153
+msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:988
-msgid "# ICMP packets dropped (not allowed)"
-msgstr ""
+#: src/dht/gnunet-dht-put.c:160
+#, fuzzy, c-format
+msgid "Could not connect to %s service!\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/exit/gnunet-daemon-exit.c:995
-msgid "ICMP Packet dropped, have no matching connection information\n"
+#: src/dht/gnunet-dht-put.c:176
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1072
-msgid "UDP Packet dropped, have no matching connection information\n"
+#: src/dht/gnunet-dht-put.c:192
+msgid "the data to insert under the key"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1147
-msgid "TCP Packet dropped, have no matching connection information\n"
+#: src/dht/gnunet-dht-put.c:195
+msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1200
-msgid "# Packets received from TUN"
+#: src/dht/gnunet-dht-put.c:204
+msgid "how many replicas to create"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1214
-msgid "# Bytes received from TUN"
+#: src/dht/gnunet-dht-put.c:207
+msgid "the type to insert data as"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1240
-msgid "IPv4 packet options received.  Ignored.\n"
+#: src/dht/gnunet-dht-put.c:236
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1267
-#, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:193
+#, 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:844
+msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1313
-#, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+#: src/dht/gnunet-service-dht_clients.c:513
+#: src/dht/gnunet-service-xdht_clients.c:928
+msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1321
-#, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
+#: src/dht/gnunet-service-dht_clients.c:597
+#: src/dht/gnunet-service-xdht_clients.c:993
+msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1703
-msgid "# TCP packets sent via TUN"
+#: src/dht/gnunet-service-dht_clients.c:798
+#: src/dht/gnunet-service-xdht_clients.c:1195
+msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1814
-msgid "# TCP service creation requests received via mesh"
+#: src/dht/gnunet-service-dht_clients.c:1040
+#: src/dht/gnunet-service-xdht_clients.c:503
+msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1906
-#: src/exit/gnunet-daemon-exit.c:2026 src/exit/gnunet-daemon-exit.c:2267
-#: src/exit/gnunet-daemon-exit.c:2519 src/exit/gnunet-daemon-exit.c:2811
-#: src/exit/gnunet-daemon-exit.c:2921
-msgid "# Bytes received from MESH"
+#: src/dht/gnunet-service-dht_clients.c:1053
+#: src/dht/gnunet-service-xdht_clients.c:517
+msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1850 src/exit/gnunet-daemon-exit.c:2943
+#: src/dht/gnunet-service-dht_clients.c:1090
+#: src/dht/gnunet-service-xdht_clients.c:554
 #, c-format
-msgid "No service found for %s on port %d!\n"
+msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1854
-msgid "# TCP requests dropped (no such service)"
+#: src/dht/gnunet-service-dht_clients.c:1113
+#: src/dht/gnunet-service-xdht_clients.c:577
+msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1909
-msgid "# TCP IP-exit creation requests received via mesh"
+#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1210
+#: src/dht/gnunet-service-xdht_clients.c:631
+#: src/dht/gnunet-service-xdht_clients.c:674
+msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2029
-msgid "# TCP data requests received via mesh"
+#: src/dht/gnunet-service-dht_clients.c:1177
+#: src/dht/gnunet-service-xdht_clients.c:641
+msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2043
-msgid "# TCP DATA requests dropped (no session)"
+#: src/dht/gnunet-service-dht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:71
+#, c-format
+msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2093
-msgid "# ICMP packets sent via TUN"
+#: src/dht/gnunet-service-dht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:82
+msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2270
-msgid "# ICMP IP-exit requests received via mesh"
+#: src/dht/gnunet-service-dht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:221
+msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2522
-msgid "# ICMP service requests received via mesh"
+#: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:244
+msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2588 src/vpn/gnunet-service-vpn.c:1401
-#: src/vpn/gnunet-service-vpn.c:1969
-msgid "# ICMPv4 packets dropped (impossible PT to v6)"
+#: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:250
+msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2647 src/vpn/gnunet-service-vpn.c:1437
-#: src/vpn/gnunet-service-vpn.c:1449 src/vpn/gnunet-service-vpn.c:1859
-msgid "# ICMPv6 packets dropped (impossible PT to v4)"
+#: src/dht/gnunet-service-dht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:256
+msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2697
-msgid "# UDP packets sent via TUN"
+#: src/dht/gnunet-service-dht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:268
+msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2814
-msgid "# UDP IP-exit requests received via mesh"
+#: src/dht/gnunet-service-dht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:271
+#, c-format
+msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2924
-msgid "# UDP service requests received via mesh"
+#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:309
+msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2947
-msgid "# UDP requests dropped (no such service)"
+#: src/dht/gnunet-service-dht_hello.c:84
+#: src/dht/gnunet-service-xdht_hello.c:82
+msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2980
-msgid "# Inbound MESH tunnels created"
+#: src/dht/gnunet-service-dht_neighbours.c:516
+msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3209
-#, c-format
-msgid "No addresses found for hostname `%s' of service `%s'!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:610
+msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3223 src/exit/gnunet-daemon-exit.c:3235
-#, c-format
-msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:764
+#: src/dht/gnunet-service-xdht_neighbours.c:6055
+msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3246
-#, c-format
-msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:1012
+msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3364
-msgid ""
-"This system does not support IPv4, will disable IPv4 functions despite them "
-"being enabled in the configuration\n"
+#: src/dht/gnunet-service-dht_neighbours.c:857
+msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3372
-msgid ""
-"This system does not support IPv6, will disable IPv6 functions despite them "
-"being enabled in the configuration\n"
+#: src/dht/gnunet-service-dht_neighbours.c:889
+msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3379
-msgid ""
-"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
-"ENABLE_IPv4=YES\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1093
+#: src/dht/gnunet-service-dht_neighbours.c:1130
+msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3385
-msgid ""
-"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
-"ENABLE_IPv6=YES\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1108
+#: src/dht/gnunet-service-dht_neighbours.c:1145
+msgid "# Peer selection failed"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3391 src/pt/gnunet-daemon-pt.c:884
-msgid "No useful service enabled.  Exiting.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1289
+msgid "# PUT requests routed"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3620
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/dht/gnunet-service-dht_neighbours.c:1318
+msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:270
-msgid "# acknowledgements sent for fragment"
+#: src/dht/gnunet-service-dht_neighbours.c:1328
+#: src/dht/gnunet-service-dht_neighbours.c:1452
+#: src/dht/gnunet-service-dht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:1121
+#: src/dht/gnunet-service-xdht_neighbours.c:1190
+#: src/dht/gnunet-service-xdht_neighbours.c:1240
+#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/dht/gnunet-service-xdht_neighbours.c:1371
+#: src/dht/gnunet-service-xdht_neighbours.c:1433
+#: src/dht/gnunet-service-xdht_neighbours.c:1495
+#: src/dht/gnunet-service-xdht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:1617
+msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:456
-msgid "# fragments received"
+#: src/dht/gnunet-service-dht_neighbours.c:1414
+msgid "# GET requests routed"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:521
-msgid "# duplicate fragments received"
+#: src/dht/gnunet-service-dht_neighbours.c:1441
+msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:534
-msgid "# messages defragmented"
+#: src/dht/gnunet-service-dht_neighbours.c:1564
+msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:208
-msgid "# fragments transmitted"
+#: src/dht/gnunet-service-dht_neighbours.c:1651
+msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:211
-msgid "# fragments retransmitted"
+#: src/dht/gnunet-service-dht_neighbours.c:1654
+msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:237
-msgid "# fragments wrap arounds"
+#: src/dht/gnunet-service-dht_neighbours.c:1821
+msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:281
-msgid "# messages fragmented"
+#: src/dht/gnunet-service-dht_neighbours.c:1829
+msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:284
-msgid "# total size of fragmented messages"
+#: src/dht/gnunet-service-dht_neighbours.c:1924
+msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:405
-msgid "# fragment acknowledgements received"
+#: src/dht/gnunet-service-dht_neighbours.c:1927
+msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:411
-msgid "# bits removed from fragmentation ACKs"
+#: src/dht/gnunet-service-dht_neighbours.c:1984
+msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:435
-msgid "# fragmentation transmissions completed"
+#: src/dht/gnunet-service-dht_neighbours.c:1998
+msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/fs/fs_api.c:465
-#, fuzzy, c-format
-msgid "Could not open file `%s': %s"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/dht/gnunet-service-dht_neighbours.c:2083
+msgid "# P2P RESULTS received"
+msgstr ""
 
-#: src/fs/fs_api.c:474
-#, fuzzy, c-format
-msgid "Could not read file `%s': %s"
-msgstr "无法解析“%s”(%s)：%s\n"
+#: src/dht/gnunet-service-dht_neighbours.c:2086
+msgid "# P2P RESULT bytes received"
+msgstr ""
 
-#: src/fs/fs_api.c:480
-#, c-format
-msgid "Short read reading from file `%s'!"
+#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
+msgid "# Network size estimates received"
 msgstr ""
 
-#: src/fs/fs_api.c:1061
-#, fuzzy, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/dht/gnunet-service-dht_routing.c:211
+msgid "# Good REPLIES matched against routing table"
+msgstr ""
 
-#: src/fs/fs_api.c:1520
-#, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+#: src/dht/gnunet-service-dht_routing.c:220
+msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/fs/fs_api.c:1562
-#, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+#: src/dht/gnunet-service-dht_routing.c:226
+msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/fs/fs_api.c:1578
-#, fuzzy, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/dht/gnunet-service-dht_routing.c:232
+msgid "# Irrelevant REPLIES matched against routing table"
+msgstr ""
 
-#: src/fs/fs_api.c:2229
-#, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
+#: src/dht/gnunet-service-dht_routing.c:244
+msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/fs/fs_api.c:2239
-#, fuzzy, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/dht/gnunet-service-dht_routing.c:317
+msgid "# Entries removed from routing table"
+msgstr ""
 
-#: src/fs/fs_api.c:2364 src/fs/fs_api.c:2604
-#, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/dht/gnunet-service-dht_routing.c:399
+msgid "# Entries added to routing table"
+msgstr ""
 
-#: src/fs/fs_api.c:2381
-#, fuzzy, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/dht/gnunet-service-dht_routing.c:417
+msgid "# DHT requests combined"
+msgstr ""
 
-#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2897
+#: src/dht/gnunet-service-xdht_neighbours.c:1824
 #, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail_length = %d"
 msgstr ""
 
-#: src/fs/fs_api.c:2595
-#, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/fs/fs_api.c:2841
-msgid "Could not resume running search, will resume as paused search\n"
+#: src/dht/gnunet-service-xdht_neighbours.c:1829
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d]=%s"
 msgstr ""
 
-#: src/fs/fs_api.c:2935
+#: src/dht/gnunet-service-xdht_neighbours.c:1849
 #, c-format
-msgid "Failure while resuming download operation `%s': %s\n"
+msgid ""
+"\n"
+"SUPU************  FRIEND_PEERMAP of %s"
 msgstr ""
 
-#: src/fs/fs_directory.c:210
-msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+#: src/dht/gnunet-service-xdht_neighbours.c:1859
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
 msgstr ""
 
-#: src/fs/fs_download.c:321
+#: src/dht/gnunet-service-xdht_neighbours.c:1880
+#, c-format
 msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
+"\n"
+"SUPU************  FINGER_TABLE of %s"
 msgstr ""
 
-#: src/fs/fs_download.c:341
-msgid "Directory too large for system address space\n"
+#: src/dht/gnunet-service-xdht_neighbours.c:1889
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
 msgstr ""
 
-#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
-#, fuzzy, c-format
-msgid "Failed to open file `%s' for writing"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/fs_download.c:888
+#: src/dht/gnunet-service-xdht_neighbours.c:1896
 #, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail_id[%d]=%s"
 msgstr ""
 
-#: src/fs/fs_download.c:970
+#: src/dht/gnunet-service-xdht_neighbours.c:1902
 #, c-format
 msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)"
+"\n"
+"SUPU %s, %s, %d,trail[%d] = %s "
 msgstr ""
 
-#: src/fs/fs_download.c:996
-msgid "internal error decrypting content"
+#: src/dht/gnunet-service-xdht_neighbours.c:3551
+msgid "# FINGERS_COUNT"
 msgstr ""
 
-#: src/fs/fs_download.c:1019
-#, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/fs_download.c:1029
-#, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/fs_download.c:1038
-#, fuzzy, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/fs/fs_download.c:1136
-#, fuzzy
-msgid "internal error decoding tree"
-msgstr "未知错误。\n"
-
-#: src/fs/fs_download.c:1927
-#, fuzzy
-msgid "Invalid URI"
-msgstr "无效条目。\n"
+#: src/dht/gnunet-service-xdht_neighbours.c:3692
+#: src/dht/gnunet-service-xdht_neighbours.c:3930
+#: src/dht/gnunet-service-xdht_neighbours.c:4083
+#: src/dht/gnunet-service-xdht_neighbours.c:4233
+#: src/dht/gnunet-service-xdht_neighbours.c:4414
+#: src/dht/gnunet-service-xdht_neighbours.c:4929
+#: src/dht/gnunet-service-xdht_neighbours.c:5323
+#: src/dht/gnunet-service-xdht_neighbours.c:5416
+#: src/dht/gnunet-service-xdht_neighbours.c:5505
+#: src/dht/gnunet-service-xdht_neighbours.c:5609
+#: src/dht/gnunet-service-xdht_neighbours.c:5753
+#: src/dht/gnunet-service-xdht_neighbours.c:5842
+msgid "# Bytes received from other peers"
+msgstr ""
 
-#: src/fs/fs_getopt.c:192
+#: src/dht/gnunet-service-xdht_routing.c:256
 #, c-format
 msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+"\n"
+"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
+#: src/dht/gnunet-service-xdht_routing.c:264
 #, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->trail_id = %s"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:113
+#: src/dht/gnunet-service-xdht_routing.c:267
 #, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->next_hop = %s"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:151
-#, fuzzy, c-format
-msgid "Failed to not connect to `%s' service.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/fs/fs_misc.c:126
+#: src/dht/gnunet-service-xdht_routing.c:270
 #, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:104
-#, fuzzy, c-format
-msgid "Failed to open `%s' for writing: %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/fs_namespace.c:126 src/fs/fs_namespace.c:214
-#, fuzzy, c-format
-msgid "Failed to write `%s': %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/fs/fs_namespace.c:240 src/fs/fs_namespace.c:284
-#: src/fs/fs_namespace.c:330
-msgid "Can't determine where namespace directory is\n"
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/fs/fs_namespace.c:252
+#: src/dht/plugin_block_dht.c:138
 #, c-format
-msgid "Failed to create or read private key for namespace `%s'\n"
+msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:296
-#, fuzzy, c-format
-msgid "Failed to read private key for namespace `%s'\n"
-msgstr "发送消息失败。\n"
-
-#: src/fs/fs_namespace.c:467
-#, c-format
-msgid "Failed to read namespace private key file `%s', deleting it!\n"
+#: src/dht/plugin_block_dht.c:145
+msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:659
-msgid "Identifiers or URI too long to create UBlock"
+#: src/dht/plugin_block_dht.c:155
+#, c-format
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:311
-#, fuzzy
-msgid "Internal error."
-msgstr "未知错误。\n"
-
-#: src/fs/fs_namespace.c:747
-msgid "Failed to connect to datastore."
-msgstr ""
+#: 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/fs/fs_pseudonym.c:342 src/fs/fs_pseudonym.c:645
+#: src/dns/dnsparser.c:818
 #, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_pseudonym.c:477 src/fs/fs_pseudonym.c:503
-#: src/fs/fs_pseudonym.c:641
-msgid "no-name"
-msgstr "æ\97 å\90\8d称"
+#: src/dns/dnsstub.c:175
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "æ\89¾ä¸\8då\88°ä¸»æ\9cºâ\80\9c%sâ\80\9dç\9a\84 IPï¼\9a%s\n"
 
-#: src/fs/fs_pseudonym.c:1182 src/util/crypto_ecc.c:1014
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
 #, fuzzy, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+msgid "Failed to send DNS request to %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_pseudonym.c:1505
+#: src/dns/dnsstub.c:299
 #, fuzzy, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+msgid "Sent DNS request to %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
+#: src/dns/dnsstub.c:368
 #, c-format
-msgid "Publishing failed: %s"
+msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
-#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
+#: src/dns/dnsstub.c:440
 #, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/fs/fs_publish.c:624
-msgid "timeout on index-start request to `fs' service"
+#: src/dns/gnunet-dns-monitor.c:352
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/fs/fs_publish.c:636
-#, fuzzy
-msgid "unknown error"
-msgstr "未知错误"
-
-#: src/fs/fs_publish.c:679
-msgid "failed to compute hash"
+#: src/dns/gnunet-dns-monitor.c:355
+msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/fs/fs_publish.c:699
-msgid "filename too long"
+#: src/dns/gnunet-dns-monitor.c:366
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/fs/fs_publish.c:724
-msgid "could not connect to `fs' service"
+#: src/dns/gnunet-dns-redirector.c:236
+msgid "set A records"
 msgstr ""
 
-#: src/fs/fs_publish.c:747
-#, fuzzy, c-format
-msgid "Failed to get file identifiers for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/dns/gnunet-dns-redirector.c:239
+msgid "set AAAA records"
+msgstr ""
 
-#: src/fs/fs_publish.c:812
-#, c-format
-msgid "Recursive upload failed at `%s': %s"
+#: src/dns/gnunet-dns-redirector.c:251
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/fs/fs_publish.c:818
-#, c-format
-msgid "Recursive upload failed: %s"
+#: src/dns/gnunet-service-dns.c:456
+msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/fs/fs_publish.c:864
-msgid "needs to be an actual file"
+#: src/dns/gnunet-service-dns.c:603
+msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/fs/fs_publish.c:1090
-#, c-format
-msgid "Insufficient space for publishing: %s"
+#: src/dns/gnunet-service-dns.c:714
+msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/fs/fs_publish.c:1161
-#, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+#: src/dns/gnunet-service-dns.c:792
+msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:273
-msgid "Could not connect to datastore."
+#: src/dns/gnunet-service-dns.c:907
+msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/fs/fs_search.c:742
-#, fuzzy, c-format
-msgid "Failed to parse URI `%s': %s\n"
-msgstr "运行 %s失败：%s %d\n"
+#: src/dns/gnunet-service-dns.c:923
+msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
+msgstr ""
 
-#: src/fs/fs_search.c:800
+#: src/dns/gnunet-service-dns.c:932
 #, c-format
-msgid "Got result with unknown block type `%d', ignoring"
+msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/dns/gnunet-service-dns.c:942
+msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
-#, fuzzy
-msgid "Failed to read file"
-msgstr "发送消息失败。\n"
-
-#: src/fs/fs_unindex.c:233
-msgid "Unexpected time for a response from `fs' service."
+#: src/dns/gnunet-service-dns.c:1009
+msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/fs/fs_unindex.c:241
-msgid "Timeout waiting for `fs' service."
+#: src/dns/gnunet-service-dns.c:1049
+#, c-format
+msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:249
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3594
 #, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "“%s”的参数无效。\n"
+msgid "need a valid IPv4 or IPv6 address\n"
+msgstr "无效的进程优先级“%s”\n"
 
-#: src/fs/fs_unindex.c:293
-msgid "Failed to connect to FS service for unindexing."
+#: src/dv/gnunet-dv.c:169
+msgid "verbose output"
 msgstr ""
 
-#: src/fs/fs_unindex.c:349 src/fs/fs_unindex.c:361
-#, fuzzy
-msgid "Failed to get KSKs from directory scan."
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/fs/fs_unindex.c:357
-#, fuzzy, c-format
-msgid "Internal error scanning `%s'.\n"
-msgstr "未知错误。\n"
-
-#: src/fs/fs_unindex.c:416
-#, fuzzy, c-format
-msgid "Failed to remove UBlock: %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/fs_unindex.c:566 src/fs/fs_unindex.c:633
-#, fuzzy
-msgid "Failed to connect to `datastore' service."
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/fs/fs_unindex.c:646
+#: src/dv/gnunet-dv.c:178
 #, fuzzy
-msgid "Failed to open file for unindexing."
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/fs_unindex.c:680
-msgid "Failed to compute hash of file."
-msgstr ""
+msgid "Print information about DV state"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/fs/fs_uri.c:221
-#, no-c-format
-msgid "`%' must be followed by HEX number"
+#: src/exit/gnunet-daemon-exit.c:802
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:280
-msgid "Malformed KSK URI (must not begin or end with `+')"
+#: src/exit/gnunet-daemon-exit.c:853
+#, fuzzy
+msgid "# Bytes transmitted via cadet channels"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/fs/fs_uri.c:298
-msgid "`++' not allowed in KSK URI"
+#: 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)"
 msgstr ""
 
-#: src/fs/fs_uri.c:305
-msgid "Quotes not balanced in KSK URI"
+#: 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)"
 msgstr ""
 
-#: src/fs/fs_uri.c:375
-msgid "Malformed SKS URI"
+#: src/exit/gnunet-daemon-exit.c:1047
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:418 src/fs/fs_uri.c:433
-msgid "Malformed CHK URI"
+#: src/exit/gnunet-daemon-exit.c:1054
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:563 src/fs/fs_uri.c:578 src/fs/fs_uri.c:588
-#: src/fs/fs_uri.c:616
-msgid "SKS URI malformed"
+#: src/exit/gnunet-daemon-exit.c:1130
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
-msgid "SKS URI malformed (could not decode public key)"
+#: src/exit/gnunet-daemon-exit.c:1204
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:604
-msgid "SKS URI malformed (could not find signature)"
+#: src/exit/gnunet-daemon-exit.c:1256
+msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/fs/fs_uri.c:610
-msgid "SKS URI malformed (could not decode signature)"
+#: src/exit/gnunet-daemon-exit.c:1270
+msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/fs/fs_uri.c:623
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/exit/gnunet-daemon-exit.c:1296
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:635
-msgid "SKS URI malformed (signature failed validation)"
+#: src/exit/gnunet-daemon-exit.c:1323
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:673
-msgid "Unrecognized URI type"
+#: src/exit/gnunet-daemon-exit.c:1369
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:898 src/util/crypto_ecc.c:941
-#, fuzzy
-msgid "Lacking key configuration settings.\n"
-msgstr "立即保存配置？"
-
-#: src/fs/fs_uri.c:904 src/util/crypto_ecc.c:947
-#, fuzzy, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/fs/fs_uri.c:945
-msgid "identifier is NULL!"
+#: src/exit/gnunet-daemon-exit.c:1377
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:951
-msgid "identifier has zero length!"
+#: src/exit/gnunet-daemon-exit.c:1759
+msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/fs/fs_uri.c:1122 src/fs/fs_uri.c:1149
-msgid "No keywords specified!\n"
+#: src/exit/gnunet-daemon-exit.c:1872
+msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/fs/fs_uri.c:1155
-msgid "Number of double-quotes not balanced!\n"
+#: 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 CADET"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:236
-#, fuzzy, c-format
-msgid "Failed to load state: %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
-#: src/fs/gnunet-auto-share.c:309
-#, fuzzy, c-format
-msgid "Failed to save state to file %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/fs/gnunet-auto-share.c:401
+#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
 #, c-format
-msgid "Publication of `%s' done\n"
+msgid "No service %s found for %s on port %d!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:488
-#, c-format
-msgid "Publishing `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:1914
+msgid "# TCP requests dropped (no such service)"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:497
-#, fuzzy, c-format
-msgid "Failed to run `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/fs/gnunet-auto-share.c:686
-#, c-format
-msgid ""
-"You must specify one and only one directory name for automatic publication.\n"
+#: src/exit/gnunet-daemon-exit.c:1971
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:302
-#: src/fs/gnunet-publish.c:683
-msgid "set the desired LEVEL of sender-anonymity"
+#: src/exit/gnunet-daemon-exit.c:2076
+msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
-msgid "disable adding the creation time to the metadata of the uploaded file"
+#: src/exit/gnunet-daemon-exit.c:2090
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
-msgid "do not use libextractor to add keywords or metadata"
+#: src/exit/gnunet-daemon-exit.c:2150
+msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:714
-msgid "specify the priority of the content"
+#: src/exit/gnunet-daemon-exit.c:2324
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:327
-#: src/fs/gnunet-publish.c:721
-msgid "set the desired replication LEVEL"
+#: src/exit/gnunet-daemon-exit.c:2573
+msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:770
-msgid "Automatically publish files from a directory on GNUnet"
+#: 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)"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:656
-msgid "Daemon to use file-sharing to measure its performance."
+#: 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)"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:49
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+#: src/exit/gnunet-daemon-exit.c:2748
+msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
-#, c-format
-msgid "Directory `%s' meta data:\n"
+#: src/exit/gnunet-daemon-exit.c:2862
+msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:97
-#, c-format
-msgid "Directory `%s' contents:\n"
+#: src/exit/gnunet-daemon-exit.c:2969
+msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:132
-#, fuzzy
-msgid "You must specify a filename to inspect.\n"
-msgstr "您必须指定一个昵称\n"
-
-#: src/fs/gnunet-directory.c:145
-#, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/fs/gnunet-directory.c:154
-#, fuzzy, c-format
-msgid "`%s' is not a GNUnet directory\n"
-msgstr "更改 GNUnet 目录的权限出错"
+#: src/exit/gnunet-daemon-exit.c:2995
+msgid "# UDP requests dropped (no such service)"
+msgstr ""
 
-#: src/fs/gnunet-directory.c:183
+#: src/exit/gnunet-daemon-exit.c:3031
 #, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "更改 GNUnet 目录的权限出错"
+msgid "# Inbound CADET channels created"
+msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/fs/gnunet-download.c:137
+#: src/exit/gnunet-daemon-exit.c:3255 src/exit/gnunet-daemon-exit.c:3265
 #, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/fs/gnunet-download.c:147
-#, fuzzy
-msgid "<unknown time>"
-msgstr "未知错误"
+msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
+msgstr "%s：选项“%s”有歧义\n"
 
-#: src/fs/gnunet-download.c:157
+#: src/exit/gnunet-daemon-exit.c:3279 src/exit/gnunet-daemon-exit.c:3287
 #, c-format
-msgid ""
-"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
-"download\n"
+msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/exit/gnunet-daemon-exit.c:3320
 #, c-format
-msgid "Error downloading: %s.\n"
+msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:194
+#: src/exit/gnunet-daemon-exit.c:3334 src/exit/gnunet-daemon-exit.c:3346
 #, c-format
-msgid "Downloading `%s' done (%s/s).\n"
+msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:195
-#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
-msgid "Unexpected status: %d\n"
+msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:234
-#, fuzzy
-msgid "You need to specify a URI argument.\n"
-msgstr "您必须指定一个昵称\n"
+#: src/exit/gnunet-daemon-exit.c:3534
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
+msgstr ""
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:629
-#, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "运行 %s失败：%s %d\n"
+#: src/exit/gnunet-daemon-exit.c:3550
+msgid ""
+"This system does not support IPv4, will disable IPv4 functions despite them "
+"being enabled in the configuration\n"
+msgstr ""
 
-#: src/fs/gnunet-download.c:247
-msgid "Only CHK or LOC URIs supported.\n"
+#: src/exit/gnunet-daemon-exit.c:3558
+msgid ""
+"This system does not support IPv6, will disable IPv6 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254
-msgid "Target filename must be specified.\n"
+#: src/exit/gnunet-daemon-exit.c:3565
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:607
-#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
-#, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/exit/gnunet-daemon-exit.c:3571
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
+msgstr ""
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
-msgid "set the desired LEVEL of receiver-anonymity"
+#: src/exit/gnunet-daemon-exit.c:3577 src/exit/gnunet-daemon-exit.c:3742
+#: src/pt/gnunet-daemon-pt.c:1247
+msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:308
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
+#: src/exit/gnunet-daemon-exit.c:3689
+msgid "Must be a number"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
-msgid "only search the local peer (no P2P network search)"
+#: src/exit/gnunet-daemon-exit.c:3838
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/fs/gnunet-download.c:314
-msgid "write the file to FILENAME"
+#: src/experimentation/gnunet-daemon-experimentation.c:55
+msgid "Experimentation daemon shutting down ...\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:318
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/experimentation/gnunet-daemon-experimentation.c:77
+msgid "Experimentation daemon starting ...\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:322
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: 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/fs/gnunet-download.c:325
-msgid "download a GNUnet directory recursively"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
+#, c-format
+msgid "Experiment `%s': Experiment signature is invalid\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:339
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
+#, c-format
 msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
+"sec. \n"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:117
-msgid "print a list of all indexed files"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
+#, c-format
+msgid "Experiment `%s': Issuer missing\n"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:127
-msgid "Special file-sharing operations"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
+#, c-format
+msgid "Experiment `%s': Issuer invalid\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:190
-msgid "run the experiment with COUNT peers"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
+#, c-format
+msgid "Experiment `%s': Issuer not accepted!\n"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:193
-msgid "specifies name of a file with the HOSTS the testbed should use"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
+#, c-format
+msgid "Experiment `%s': Version missing or invalid \n"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:196
-msgid "automatically terminate experiment after DELAY"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
+#, c-format
+msgid "Experiment `%s': Required capabilities missing \n"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:205
-msgid "run a testbed to measure file-sharing performance"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
+#, c-format
+msgid "Experiment `%s': Required capabilities invalid \n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:178 src/statistics/gnunet-statistics.c:283
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
 #, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
+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/fs/gnunet-pseudonym.c:273 src/fs/gnunet-pseudonym.c:280
-#: src/fs/gnunet-pseudonym.c:282
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
 #, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s：选项“%s”有歧义\n"
+msgid "Cannot read experiments file `%s'\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-pseudonym.c:305
-msgid "create or advertise namespace NAME"
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
+#, c-format
+msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "delete namespace NAME "
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
+#, c-format
+msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:311
-msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
+#, c-format
+msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:315 src/fs/gnunet-publish.c:702
-msgid "set the meta-data for the given TYPE to the given VALUE"
+#: 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_scheduler.c:108
+#, c-format
+msgid "Peer `%s' did not respond to request for experiment `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:318
-msgid "print names of local namespaces"
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
+#, c-format
+msgid "Starting inbound experiment `%s' with peer `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:321
-msgid "use the given PRIORITY for the advertisments"
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
+#, c-format
+msgid "Starting outbound experiment `%s' with peer `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:324
-msgid "do not print names of remote namespaces"
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
+#, c-format
+msgid "Received %s message from peer %s for experiment `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:330
-msgid "specify ID of the root of the namespace"
+#: src/fragmentation/defragmentation.c:270
+msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:333
-msgid "change rating of namespace ID by VALUE"
+#: src/fragmentation/defragmentation.c:456
+#: src/transport/plugin_transport_wlan.c:1474
+msgid "# fragments received"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:345
-msgid "Manage GNUnet pseudonyms."
+#: src/fragmentation/defragmentation.c:521
+msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:152
-#, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
+#: src/fragmentation/defragmentation.c:534
+msgid "# messages defragmented"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:159
-#, c-format
-msgid "Error publishing: %s.\n"
+#: src/fragmentation/fragmentation.c:208
+msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:169
-#, c-format
-msgid "Publishing `%s' done.\n"
+#: src/fragmentation/fragmentation.c:211
+msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:173
-#, c-format
-msgid "URI is `%s'.\n"
+#: src/fragmentation/fragmentation.c:237
+msgid "# fragments wrap arounds"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:192
-msgid "Cleanup after abort complete.\n"
+#: src/fragmentation/fragmentation.c:281
+msgid "# messages fragmented"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:284
+msgid "# total size of fragmented messages"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:405
+msgid "# fragment acknowledgements received"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:411
+msgid "# bits removed from fragmentation ACKs"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:435
+msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:310
+#: src/fs/fs_api.c:474
 #, fuzzy, c-format
-msgid "Meta data for file `%s' (%s)\n"
+msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:312
+#: src/fs/fs_api.c:485
 #, fuzzy, c-format
-msgid "Keywords for file `%s' (%s)\n"
+msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:363 src/fs/gnunet-publish.c:617
+#: src/fs/fs_api.c:493
+#, c-format
+msgid "Short read reading from file `%s'!"
+msgstr ""
+
+#: src/fs/fs_api.c:1101
 #, fuzzy, c-format
-msgid "Failed to create namespace `%s' (illegal filename?)\n"
-msgstr "发送消息失败。\n"
+msgid "Failed to resume publishing information `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:438
-#, fuzzy
-msgid "Could not publish\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+#: src/fs/fs_api.c:1621
+#, c-format
+msgid "Failure while resuming publishing operation `%s': %s\n"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:465
-msgid "Could not start publishing.\n"
+#: src/fs/fs_api.c:1635
+#, fuzzy, c-format
+msgid "Failed to resume publishing operation `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/fs_api.c:2293
+#, c-format
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:496
+#: src/fs/fs_api.c:2303
 #, fuzzy, c-format
-msgid "Scanning directory `%s'.\n"
+msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:498
+#: src/fs/fs_api.c:2431 src/fs/fs_api.c:2679
 #, fuzzy, c-format
-msgid "Scanning file `%s'.\n"
-msgstr "æ\9cªç\9f¥ç\9a\84å\91½ä»¤â\80\9c%sâ\80\9dã\80\82\n"
+msgid "Failed to resume sub-download `%s': %s\n"
+msgstr "æ\89\93å¼\80æ\97¥å¿\97æ\96\87件â\80\9c%sâ\80\9d失败ï¼\9a%s\n"
 
-#: src/fs/gnunet-publish.c:503
+#: src/fs/fs_api.c:2449
+#, fuzzy, c-format
+msgid "Failed to resume sub-search `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_api.c:2464 src/fs/fs_api.c:2483 src/fs/fs_api.c:2975
 #, c-format
-msgid "There was trouble processing file `%s', skipping it.\n"
+msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:508
-msgid "Preprocessing complete.\n"
+#: src/fs/fs_api.c:2669
+#, fuzzy, c-format
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/fs_api.c:2918
+msgid "Could not resume running search, will resume as paused search\n"
+msgstr ""
+
+#: src/fs/fs_api.c:3013
+#, c-format
+msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/fs_directory.c:208
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+msgstr ""
+
+#: src/fs/fs_download.c:322
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
+msgstr ""
+
+#: src/fs/fs_download.c:342
+msgid "Directory too large for system address space\n"
+msgstr ""
+
+#: src/fs/fs_download.c:523 src/fs/fs_download.c:535
 #, fuzzy, c-format
-msgid "Extracting meta data from file `%s' complete.\n"
+msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:516
-msgid "Meta data extraction has finished.\n"
+#: src/fs/fs_download.c:905
+#, c-format
+msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:523
+#: src/fs/fs_download.c:987
+#, 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:1013
+msgid "internal error decrypting content"
+msgstr ""
+
+#: src/fs/fs_download.c:1036
+#, fuzzy, c-format
+msgid "Download failed: could not open file `%s': %s"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_download.c:1046
+#, fuzzy, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_download.c:1055
+#, 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:1153
 #, fuzzy
-msgid "Internal error scanning directory.\n"
+msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:557
+#: src/fs/fs_download.c:1944
+#, fuzzy
+msgid "Invalid URI"
+msgstr "无效条目。\n"
+
+#: src/fs/fs_getopt.c:192
 #, c-format
-msgid "Cannot extract metadata from a URI!\n"
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:564
+#: src/fs/fs_list_indexed.c:90
 #, c-format
-msgid "You must specify one and only one filename for insertion.\n"
+msgid "Failed to receive response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:570
+#: src/fs/fs_list_indexed.c:113
 #, c-format
-msgid "You must NOT specify an URI and a filename.\n"
+msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:578 src/vpn/gnunet-vpn.c:213
+#: src/fs/fs_list_indexed.c:151
+#, fuzzy, c-format
+msgid "Failed to not connect to `%s' service.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/fs/fs_misc.c:126
 #, c-format
-msgid "Option `%s' is required when using option `%s'.\n"
+msgid "Did not find mime type `%s' in extension list.\n"
+msgstr ""
+
+#: src/fs/fs_namespace.c:207
+#, fuzzy, c-format
+msgid "Failed to open `%s' for writing: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_namespace.c:229
+#, fuzzy, c-format
+msgid "Failed to write `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/fs/fs_namespace.c:320
+#, fuzzy, c-format
+msgid "Failed to read `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/fs/fs_namespace.c:466
+msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
-#: src/transport/gnunet-transport.c:834 src/transport/gnunet-transport.c:864
+#: src/fs/fs_publish.c:126 src/fs/fs_publish.c:431
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
+msgid "Publishing failed: %s"
+msgstr ""
+
+#: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
+#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:934
+#, c-format
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:685
+msgid "timeout on index-start request to `fs' service"
+msgstr ""
+
+#: src/fs/fs_publish.c:697
+#, fuzzy
+msgid "unknown error"
+msgstr "未知错误"
+
+#: src/fs/fs_publish.c:741
+msgid "failed to compute hash"
+msgstr ""
+
+#: src/fs/fs_publish.c:761
+msgid "filename too long"
+msgstr ""
+
+#: src/fs/fs_publish.c:786
+msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:650
+#: src/fs/fs_publish.c:809
 #, fuzzy, c-format
-msgid "Failed to access `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+msgid "Failed to get file identifiers for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:662
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
+#: src/fs/fs_publish.c:878
+#, c-format
+msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
+#: src/fs/fs_publish.c:884
+#, c-format
+msgid "Recursive upload failed: %s"
+msgstr ""
+
+#: src/fs/fs_publish.c:936
+msgid "needs to be an actual file"
+msgstr ""
+
+#: src/fs/fs_publish.c:1172
+#, c-format
+msgid "Insufficient space for publishing: %s"
+msgstr ""
+
+#: src/fs/fs_publish.c:1263
+#, c-format
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
+msgstr ""
+
+#: src/fs/fs_publish_ksk.c:219
+msgid "Could not connect to datastore."
+msgstr ""
+
+#: src/fs/fs_publish_ublock.c:243
+#, fuzzy
+msgid "Internal error."
+msgstr "未知错误。\n"
+
+#: src/fs/fs_search.c:778 src/fs/fs_search.c:848
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/fs/fs_search.c:907
+#, c-format
+msgid "Got result with unknown block type `%d', ignoring"
+msgstr ""
+
+#: src/fs/fs_unindex.c:59
+msgid "Failed to find given position in file"
+msgstr ""
+
+#: src/fs/fs_unindex.c:64
+#, 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
+#, fuzzy
+msgid "Invalid response from `fs' service."
+msgstr "“%s”的参数无效。\n"
+
+#: src/fs/fs_unindex.c:291
+msgid "Failed to connect to FS service for unindexing."
+msgstr ""
+
+#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359
+#, fuzzy
+msgid "Failed to get KSKs from directory scan."
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/fs_unindex.c:355
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "未知错误。\n"
+
+#: src/fs/fs_unindex.c:414
+#, 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
+#, fuzzy
+msgid "Failed to connect to `datastore' service."
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/fs/fs_unindex.c:639
+#, fuzzy
+msgid "Failed to open file for unindexing."
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_unindex.c:673
+msgid "Failed to compute hash of file."
+msgstr ""
+
+#: src/fs/fs_uri.c:223
+#, no-c-format
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
+msgstr ""
+
+#: src/fs/fs_uri.c:283
+msgid "Malformed KSK URI (must not begin or end with `+')"
+msgstr ""
+
+#: src/fs/fs_uri.c:301
+msgid "Malformed KSK URI (`++' not allowed)"
+msgstr ""
+
+#: src/fs/fs_uri.c:308
+msgid "Malformed KSK URI (quotes not balanced)"
+msgstr ""
+
+#: src/fs/fs_uri.c:378
+msgid "Malformed SKS URI (wrong syntax)"
+msgstr ""
+
+#: src/fs/fs_uri.c:422
+msgid "Malformed CHK URI (wrong syntax)"
+msgstr ""
+
+#: src/fs/fs_uri.c:437
+msgid "Malformed CHK URI (failed to decode CHK)"
+msgstr ""
+
+#: src/fs/fs_uri.c:516
+msgid "LOC URI malformed (wrong syntax)"
+msgstr ""
+
+#: src/fs/fs_uri.c:531
+msgid "LOC URI malformed (no CHK)"
+msgstr ""
+
+#: src/fs/fs_uri.c:541
+msgid "LOC URI malformed (missing LOC)"
+msgstr ""
+
+#: src/fs/fs_uri.c:549
+msgid "LOC URI malformed (wrong syntax for public key)"
+msgstr ""
+
+#: src/fs/fs_uri.c:557
+msgid "LOC URI malformed (could not decode public key)"
+msgstr ""
+
+#: src/fs/fs_uri.c:563
+msgid "LOC URI malformed (could not find signature)"
+msgstr ""
+
+#: src/fs/fs_uri.c:569
+msgid "LOC URI malformed (wrong syntax for signature)"
+msgstr ""
+
+#: src/fs/fs_uri.c:578
+msgid "LOC URI malformed (could not decode signature)"
+msgstr ""
+
+#: src/fs/fs_uri.c:584
+msgid "LOC URI malformed (wrong syntax for expiration time)"
+msgstr ""
+
+#: src/fs/fs_uri.c:590
+msgid "LOC URI malformed (could not parse expiration time)"
+msgstr ""
+
+#: src/fs/fs_uri.c:602
+msgid "LOC URI malformed (signature failed validation)"
+msgstr ""
+
+#: src/fs/fs_uri.c:641
+msgid "Unrecognized URI type"
+msgstr ""
+
+#: src/fs/fs_uri.c:865
+#, fuzzy
+msgid "Lacking key configuration settings.\n"
+msgstr "立即保存配置？"
+
+#: src/fs/fs_uri.c:871
+#, fuzzy, c-format
+msgid "Could not access hostkey file `%s'.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/fs/fs_uri.c:1056 src/fs/fs_uri.c:1083
+msgid "No keywords specified!\n"
+msgstr ""
+
+#: src/fs/fs_uri.c:1089
+msgid "Number of double-quotes not balanced!\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:236
+#, fuzzy, c-format
+msgid "Failed to load state: %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
+#: src/fs/gnunet-auto-share.c:309
+#, fuzzy, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:488
+#, c-format
+msgid "Publishing `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:497
+#, fuzzy, c-format
+msgid "Failed to run `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/fs/gnunet-auto-share.c:686
+#, 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:886
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:890
+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:893
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:917
+msgid "specify the priority of the content"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:924
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:770
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr ""
+
+#: src/fs/gnunet-daemon-fsprofiler.c:660
+msgid "Daemon to use file-sharing to measure its performance."
+msgstr ""
+
+#: src/fs/gnunet-directory.c:49
+#, c-format
+msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgstr ""
+
+#: src/fs/gnunet-directory.c:94
+#, c-format
+msgid "Directory `%s' meta data:\n"
+msgstr ""
+
+#: src/fs/gnunet-directory.c:97
+#, c-format
+msgid "Directory `%s' contents:\n"
+msgstr ""
+
+#: src/fs/gnunet-directory.c:132
+#, fuzzy
+msgid "You must specify a filename to inspect.\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/fs/gnunet-directory.c:145
+#, fuzzy, c-format
+msgid "Failed to read directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/gnunet-directory.c:154
+#, fuzzy, c-format
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "更改 GNUnet 目录的权限出错"
+
+#: src/fs/gnunet-directory.c:183
+#, fuzzy
+msgid "Display contents of a GNUnet directory"
+msgstr "更改 GNUnet 目录的权限出错"
+
+#: src/fs/gnunet-download.c:137
+#, fuzzy, c-format
+msgid "Starting download `%s'.\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/fs/gnunet-download.c:147
+#, fuzzy
+msgid "<unknown time>"
+msgstr "未知错误"
+
+#: src/fs/gnunet-download.c:157
+#, c-format
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:179
+#, c-format
+msgid "Error downloading: %s.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:194
+#, c-format
+msgid "Downloading `%s' done (%s/s).\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:304
+#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
+#, c-format
+msgid "Unexpected status: %d\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:234
+#, fuzzy
+msgid "You need to specify a URI argument.\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:712
+#, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/fs/gnunet-download.c:247
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:254
+msgid "Target filename must be specified.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:856
+#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
+#, 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
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr ""
+
+#: src/fs/gnunet-download.c:308
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
+msgstr ""
+
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
+msgid "only search the local peer (no P2P network search)"
+msgstr ""
+
+#: src/fs/gnunet-download.c:314
+msgid "write the file to FILENAME"
+msgstr ""
+
+#: src/fs/gnunet-download.c:318
+msgid "set the maximum number of parallel downloads that is allowed"
+msgstr ""
+
+#: src/fs/gnunet-download.c:322
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr ""
+
+#: src/fs/gnunet-download.c:325
+msgid "download a GNUnet directory recursively"
+msgstr ""
+
+#: src/fs/gnunet-download.c:339
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:117
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:127
+msgid "Special file-sharing operations"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:193
+msgid "run the experiment with COUNT peers"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:196
+msgid "specifies name of a file with the HOSTS the testbed should use"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:199
+msgid "automatically terminate experiment after DELAY"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:208
+msgid "run a testbed to measure file-sharing performance"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:238 src/fs/gnunet-publish.c:250
+#, c-format
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:257
+#, c-format
+msgid "Error publishing: %s.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:268
+#, c-format
+msgid "Publishing `%s' done.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:273
+#, c-format
+msgid "URI is `%s'.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:281
+#, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:301
+msgid "Cleanup after abort complete.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:427
+#, fuzzy, c-format
+msgid "Meta data for file `%s' (%s)\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/gnunet-publish.c:429
+#, fuzzy, c-format
+msgid "Keywords for file `%s' (%s)\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/fs/gnunet-publish.c:572
+#, fuzzy
+msgid "Could not publish\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/fs/gnunet-publish.c:597
+msgid "Could not start publishing.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:631
+#, fuzzy, c-format
+msgid "Scanning directory `%s'.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/gnunet-publish.c:635
+#, fuzzy, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/fs/gnunet-publish.c:641
+#, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:648
+msgid "Preprocessing complete.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:653
+#, fuzzy, c-format
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/gnunet-publish.c:660
+msgid "Meta data extraction has finished.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:669
+#, fuzzy
+msgid "Internal error scanning directory.\n"
+msgstr "未知错误。\n"
+
+#: src/fs/gnunet-publish.c:701
+#, c-format
+msgid "Selected pseudonym `%s' unknown\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:733
+#, fuzzy, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/gnunet-publish.c:747
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:803
+#, c-format
+msgid "Cannot extract metadata from a URI!\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:810
+#, c-format
+msgid "You must specify one and only one filename for insertion.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:816
+#, c-format
+msgid "You must NOT specify an URI and a filename.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:824 src/vpn/gnunet-vpn.c:209
+#, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:835 src/fs/gnunet-publish.c:843
+#: src/transport/gnunet-transport.c:1893 src/transport/gnunet-transport.c:1923
+#: src/transport/gnunet-transport.c:1953
+#, c-format
+msgid "Option `%s' makes no sense without option `%s'.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:897
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:901
+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:905
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:908
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:913
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:921
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:927
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:931
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:935
+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:951
+msgid "Publish a file or directory on GNUnet"
+msgstr ""
+
+#: src/fs/gnunet-search.c:114
+#, c-format
+msgid "Failed to write directory with search results to `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-search.c:191
+#, fuzzy, c-format
+msgid "Error searching: %s.\n"
+msgstr "创建用户出错"
+
+#: src/fs/gnunet-search.c:240
+msgid "Could not create keyword URI from arguments.\n"
+msgstr ""
+
+#: src/fs/gnunet-search.c:264
+msgid "Could not start searching.\n"
+msgstr ""
+
+#: src/fs/gnunet-search.c:295
+msgid "write search results to file starting with PREFIX"
+msgstr ""
+
+#: src/fs/gnunet-search.c:298
+msgid "automatically terminate search after DELAY"
+msgstr ""
+
+#: src/fs/gnunet-search.c:305
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/fs/gnunet-search.c:316
+msgid "Search GNUnet for files that were published on GNUnet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:277
+msgid "# running average P2P latency (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:540
+msgid "# Loopback routes suppressed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:650 src/hostlist/gnunet-daemon-hostlist.c:303
+#: src/sensordashboard/gnunet-service-sensordashboard.c:854
+#: src/sensordashboard/gnunet-service-sensordashboard.c:862
+#: src/topology/gnunet-daemon-topology.c:1287
+#: src/topology/gnunet-daemon-topology.c:1294
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' service.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/fs/gnunet-service-fs_cadet_client.c:494
+msgid "# replies received via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_client.c:508
+msgid "# replies received via cadet dropped"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:260
+msgid "# Blocks transferred via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:361
+msgid "# queries received via CADET not answered"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:441
+msgid "# queries received via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:485
+#, fuzzy
+msgid "# cadet client connections rejected"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:491
+#: src/fs/gnunet-service-fs_cadet_server.c:531
+#, fuzzy
+msgid "# cadet connections active"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/fs/gnunet-service-fs_cp.c:698
+msgid "# migration stop messages received"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:702
+#, c-format
+msgid "Migration of content to peer `%s' blocked for %s\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:737
+msgid "# replies transmitted to other peers"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:743
+msgid "# replies dropped"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:768 src/fs/gnunet-service-fs_cp.c:1317
+msgid "# P2P searches active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:861
+msgid "# artificial delays introduced (ms)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:914
+msgid "# replies dropped due to type mismatch"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:922
+msgid "# replies received for other peers"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:936
+msgid "# replies dropped due to insufficient cover traffic"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:974
+msgid "# P2P searches destroyed due to ultimate reply"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1042
+msgid "# requests done for free (low load)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1067
+msgid "# request dropped, priority insufficient"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1077
+msgid "# requests done for a price (normal load)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1155
+msgid "# GET requests received (from other peers)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1189
+msgid "# requests dropped due to initiator not being connected"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1211
+msgid "# requests dropped due to missing reverse route"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1262
+msgid "# requests dropped due TTL underflow"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1286
+msgid "# requests dropped due to higher-TTL request"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1315
+msgid "# P2P query messages received and processed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:1691
+msgid "# migration stop messages sent"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:130
+#: src/fs/gnunet-service-fs_indexing.c:181
+#, fuzzy, c-format
+msgid "Could not open `%s'.\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:142
+#, 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
+#, fuzzy, c-format
+msgid "Failed to delete bogus block: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:542
+msgid "# index blocks removed: original file inaccessible"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:557
+#, fuzzy, c-format
+msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/fs/gnunet-service-fs_indexing.c:559
+msgid "not indexed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:574
+#, 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:370
+msgid "# client searches active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_lc.c:258
+msgid "# replies received for local clients"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_lc.c:329
+msgid "# client searches received"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_lc.c:364
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: 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"
+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
+msgid "# replies received and matched"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:844
+msgid "# duplicate replies discarded (bloomfilter)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:853
+msgid "# irrelevant replies discarded"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:867
+#, c-format
+msgid "Unsupported block type %u\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:880
+msgid "# results found locally"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1001
+msgid "# Datastore `PUT' failures"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1029
+msgid "# storage requests dropped due to high load"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1064
+msgid "# Replies received from DHT"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1192
+msgid "# Replies received from CADET"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1244
+#, c-format
+msgid "Datastore lookup already took %s!\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1264
+#, c-format
+msgid "On-demand lookup already took %s!\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1311
+msgid "# Datastore lookups concluded (no results)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1326
+msgid "# Datastore lookups concluded (seen all)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1335
+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
+msgid "# on-demand blocks matched requests"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1377
+msgid "# on-demand lookups performed successfully"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1382
+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:1612
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1467
+msgid "# Datastore lookups concluded (found last result)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1478
+msgid "# Datastore lookups concluded (load too high)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1588
+msgid "# Datastore lookups initiated"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1673
+msgid "# GAP PUT messages received"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_push.c:631
+msgid "time required, content pushing disabled"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:89
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:95
+#, c-format
+msgid "Error unindexing: %s.\n"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:100
+msgid "Unindexing done.\n"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:130
+#, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:147
+msgid "Could not start unindex operation.\n"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:179
+msgid "Unindex a file that was previously indexed with gnunet-publish."
+msgstr ""
+
+#: src/gns/gns_api.c:393
+#, fuzzy
+msgid "Failed to deserialize lookup reply from GNS service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-bcd.c:123
+#, c-format
+msgid "Refusing `%s' request to HTTP server\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:696
+#, c-format
+msgid "Invalid port number %llu.  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:374
+#, fuzzy, c-format
+msgid "Could not start businesscard HTTP server on port %u\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-bcd.c:519
+msgid "Run HTTP serve on port PORT (default is 8888)"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:531
+msgid "GNUnet HTTP server to create business cards"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:228
+#, fuzzy
+msgid "Failed to pack DNS response into UDP packet!\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/gns/gnunet-dns2gns.c:400
+#, c-format
+msgid "Cannot parse DNS request from %s\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:416
+#, c-format
+msgid "Received malformed DNS request from %s\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:424
+#, c-format
+msgid "Received unsupported DNS request from %s\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:701
+msgid "No ego configured for `dns2gns` subsystem\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:727
+msgid "No DNS server specified!\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:749
+msgid "No valid GNS zone specified!\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:770
+msgid "IP of recursive DNS resolver to use (required)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:773
+msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:776
+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"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:782
+msgid "Public key of the GNS zone to use (overrides default)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:795
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:215
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+#, c-format
+msgid "Please specify name to lookup!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:314
+#, c-format
+msgid "Ego for `%s' not found, cannot perform lookup.\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:353 src/gns/gnunet-gns-helper-service-w32.c:798
+#, 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:392 src/gns/gnunet-gns-helper-service-w32.c:828
+#, fuzzy, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns.c:405
+#, c-format
+msgid "Public key `%s' is not well-formed\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:455
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:458
+msgid "Specify the type of the record to lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:461
+msgid "Specify timeout for the lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:464
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:467
+msgid "Specify the public key of the zone to lookup the record in"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:470
+msgid "Specify the name of the ego of the zone to lookup the record in"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:484
+#, 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"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:838
+#, fuzzy, c-format
+msgid "Failed to connect to identity service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns-import.c:479
+msgid "This program will import some GNS authorities into your GNS namestore."
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:105
+#: src/hostlist/gnunet-daemon-hostlist_client.c:524
+#: src/hostlist/gnunet-daemon-hostlist_client.c:741
+#: src/hostlist/gnunet-daemon-hostlist_client.c:747
+#: src/hostlist/gnunet-daemon-hostlist_client.c:800
+#: src/hostlist/gnunet-daemon-hostlist_client.c:809
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
+#, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:833
+#, fuzzy, c-format
+msgid "Unsupported CURL SSL backend %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:856
+#, fuzzy, c-format
+msgid "Failed to fetch CN from cert: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/gns/gnunet-gns-proxy.c:879
+#, fuzzy, c-format
+msgid "Failed to initialize DANE: %s\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/gns/gnunet-gns-proxy.c:892
+#, fuzzy, c-format
+msgid "Failed to parse DANE record: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/gns/gnunet-gns-proxy.c:907
+#, fuzzy, c-format
+msgid "Failed to verify TLS connection using DANE: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/gnunet-gns-proxy.c:917
+#, c-format
+msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:941
+#, c-format
+msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1086
+#, c-format
+msgid "Cookie domain `%s' supplied by server is invalid\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1602
+#, fuzzy, c-format
+msgid "Unsupported HTTP method `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:1973
+#, fuzzy, c-format
+msgid "Unable to import private key from file `%s'\n"
+msgstr "无法创建用户账户："
+
+#: src/gns/gnunet-gns-proxy.c:2003
+#, fuzzy, c-format
+msgid "Unable to import certificate %s\n"
+msgstr "无法保存配置文件“%s”："
+
+#: src/gns/gnunet-gns-proxy.c:2177
+#, fuzzy, c-format
+msgid "Failed to start HTTPS server for `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2196
+#, fuzzy
+msgid "Failed to pass client to MHD\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2518
+#, fuzzy, c-format
+msgid "Unsupported socks version %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2547
+#, fuzzy, c-format
+msgid "Unsupported socks command %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
+msgid "SSL connection to plain IPv4 address requested\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:2645
+#, fuzzy, c-format
+msgid "Unsupported socks address type %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2984
+msgid "No ego configured for `shorten-zone`\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3024
+#, c-format
+msgid "No ego configured for `%s`\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3086
+#, fuzzy, c-format
+msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/gnunet-gns-proxy.c:3127
+msgid "listen on specified port (default: 7777)"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3130
+msgid "pem file to use as CA"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3149
+msgid "GNUnet GNS proxy"
+msgstr ""
+
+#: src/gns/gnunet-service-gns.c:864
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-service-gns.c:872
+#, fuzzy
+msgid "Failed to connect to the namecache!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-service-gns.c:905
+#, fuzzy
+msgid "Could not connect to DHT!\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/gns/gnunet-service-gns.c:921
+#, 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
+#, fuzzy
+msgid "Failed to connect to the DNS service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:650
+#, c-format
+msgid "Protocol `%s' unknown, skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:661
+#, c-format
+msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:854
+#, fuzzy
+msgid "Failed to parse DNS response\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:996
+#, c-format
+msgid "Skipping record of unsupported type %d\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1356
+#, c-format
+msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1886
+msgid "GNS lookup recursion failed (no delegation record found)\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1910
+#, fuzzy, c-format
+msgid "Failed to cache GNS resolution: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:2192
+#, c-format
+msgid "Zone %s was revoked, resolution fails\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2341
+#, c-format
+msgid "Hostname `%s' is not well-formed, resolution fails\n"
+msgstr ""
+
+#: src/gns/plugin_gnsrecord_gns.c:172
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:201
+#, fuzzy, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:222
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:245
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:280
+#, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:291
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:312
+#, fuzzy, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:334
+#, fuzzy, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:418
+#, fuzzy, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:455
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:474
+#, 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:497
+#, fuzzy, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:520
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:535
+#, fuzzy, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:562
+#, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:578
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:595
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:619
+#: src/gnsrecord/plugin_gnsrecord_dns.c:635
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/hello/gnunet-hello.c:126
+msgid "Call with name of HELLO file to modify.\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:132
+#, fuzzy, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "创建用户出错"
+
+#: 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:147
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:196
+#, fuzzy, c-format
+msgid "Error opening file `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/hello/gnunet-hello.c:173
+#, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:208
+#, fuzzy, c-format
+msgid "Error writing HELLO to file `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/hello/gnunet-hello.c:216
+#, c-format
+msgid "Modified %u addresses \n"
+msgstr ""
+
+#: src/hello/hello.c:955
+#, fuzzy
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "保存配置失败。"
+
+#: src/hello/hello.c:964
+#, fuzzy
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "保存配置失败。"
+
+#: src/hello/hello.c:974
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/hello/hello.c:984
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr ""
+
+#: src/hello/hello.c:1002
+#, c-format
+msgid "Plugin `%s' not found, skipping address\n"
+msgstr ""
+
+#: src/hello/hello.c:1010
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:698
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
-msgstr ""
+#: src/hello/hello.c:1025
+#, fuzzy, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/gnunet-publish.c:705
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
+#: src/hello/hello.c:1098
+#, c-format
+msgid "HELLO URI contained %u addresses, added %u addresses\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:710
+#: src/hostlist/gnunet-daemon-hostlist.c:274
 msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:718
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
+#: src/hostlist/gnunet-daemon-hostlist.c:323
+msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:724
+#: src/hostlist/gnunet-daemon-hostlist.c:328
 msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:728
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
+#: src/hostlist/gnunet-daemon-hostlist.c:331
+msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:732
-msgid ""
-"URI to be published (can be used instead of passing a file to add keywords "
-"to the file with the respective URI)"
+#: src/hostlist/gnunet-daemon-hostlist.c:335
+msgid "provide a hostlist server"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:748
-msgid "Publish a file or directory on GNUnet"
+#: src/hostlist/gnunet-daemon-hostlist.c:350
+msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/fs/gnunet-search.c:114
-#, c-format
-msgid "Failed to write directory with search results to `%s'\n"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:343
+msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/fs/gnunet-search.c:184
-#, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "创建用户出错"
-
-#: src/fs/gnunet-search.c:233
-msgid "Could not create keyword URI from arguments.\n"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:394
+msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/fs/gnunet-search.c:257
-msgid "Could not start searching.\n"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:397
+#, c-format
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:288
-msgid "write search results to file starting with PREFIX"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:385
+msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/fs/gnunet-search.c:291
-msgid "automatically terminate search after DELAY"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:650
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/fs/gnunet-search.c:298
-msgid "automatically terminate search after VALUE results are found"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:680
+#, c-format
+msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/fs/gnunet-search.c:309
-msgid "Search GNUnet for files that were published on GNUnet"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:722
+#, c-format
+msgid ""
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:271
-msgid "# running average P2P latency (ms)"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
+#, c-format
+msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:538
-msgid "# Loopback routes suppressed"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
+#, c-format
+msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:291
-#: src/topology/gnunet-daemon-topology.c:1314
-#: src/topology/gnunet-daemon-topology.c:1321
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, fuzzy, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/fs/gnunet-service-fs_cp.c:677
-msgid "# migration stop messages received"
-msgstr ""
+msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:681
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %s\n"
+msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:716
-msgid "# replies transmitted to other peers"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#, c-format
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:722
-msgid "# replies dropped"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
+#, c-format
+msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:747 src/fs/gnunet-service-fs_cp.c:1296
-msgid "# P2P searches active"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
+msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:840
-msgid "# artificial delays introduced (ms)"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1103
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1646
+msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:893
-msgid "# replies dropped due to type mismatch"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1112
+#, c-format
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:901
-msgid "# replies received for other peers"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1188
+msgid "# active connections"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:915
-msgid "# replies dropped due to insufficient cover traffic"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1347
+#, c-format
+msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:953
-msgid "# P2P searches destroyed due to ultimate reply"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1352
+#, c-format
+msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1021
-msgid "# requests done for free (low load)"
-msgstr ""
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1361
+#, fuzzy, c-format
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1046
-msgid "# request dropped, priority insufficient"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1395
+#, c-format
+msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1056
-msgid "# requests done for a price (normal load)"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
+msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1134
-msgid "# GET requests received (from other peers)"
-msgstr ""
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1445
+#, fuzzy, c-format
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1168
-msgid "# requests dropped due to initiator not being connected"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#, c-format
+msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1191
-msgid "# requests dropped due to missing reverse route"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
+#, c-format
+msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1241
-msgid "# requests dropped due TTL underflow"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1486
+msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1265
-msgid "# requests dropped due to higher-TTL request"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1581
+#: src/transport/plugin_transport_http_client.c:2274
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1294
-msgid "# P2P query messages received and processed"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1611
+msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1664
-msgid "# migration stop messages sent"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1623
+msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:181
-#, fuzzy, c-format
-msgid "Could not open `%s'.\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:142
-#, fuzzy, c-format
-msgid "Error writing `%s'.\n"
-msgstr "创建用户出错"
-
-#: src/fs/gnunet-service-fs_indexing.c:237
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 #, c-format
 msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:275
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639
 #, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
+msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:477
-#, fuzzy, c-format
-msgid "Failed to delete bogus block: %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:542
-msgid "# index blocks removed: original file inaccessible"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:165
+msgid "bytes in hostlist"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:557
-#, fuzzy, c-format
-msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:559
-msgid "not indexed"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:190
+msgid "expired addresses encountered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:574
+#: src/hostlist/gnunet-daemon-hostlist_server.c:225
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
+#: src/peerinfo-tool/gnunet-peerinfo.c:367
+#: src/peerinfo-tool/gnunet-peerinfo.c:452
+#: src/peerinfo-tool/gnunet-peerinfo.c:535
+#: src/topology/gnunet-daemon-topology.c:952
 #, c-format
-msgid "Indexed file `%s' changed at offset %llu\n"
+msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
-msgid "# client searches active"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:249
+msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:256
-msgid "# replies received for local clients"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:265
+msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:328
-msgid "# client searches received"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:365
+#, c-format
+msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:363
-msgid "# client searches updated (merged content seen list)"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:368
+msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:269
-msgid "# average retransmission delay (ms)"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:400
-msgid "# transmission failed (core has no bandwidth)"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:386
+msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:433
-msgid "# query messages sent to other peers"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:482
-msgid "# delay heap timeout"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:396
+msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:490
-msgid "# query plans executed"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:550
-msgid "# requests merged"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
+msgid "hostlist requests processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:558
-msgid "# requests refreshed"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:449
+msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:612 src/fs/gnunet-service-fs_pe.c:696
-#: src/fs/gnunet-service-fs_pe.c:767
-msgid "# query plan entries"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:497
+msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:310
-msgid "# Pending requests created"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/peerinfo-tool/gnunet-peerinfo.c:696
+#: src/transport/gnunet-service-transport.c:1127
+msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:393 src/fs/gnunet-service-fs_pr.c:644
-msgid "# Pending requests active"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:708
+#, c-format
+msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:812
-msgid "# replies received and matched"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:723
+#, c-format
+msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:842
-msgid "# duplicate replies discarded (bloomfilter)"
-msgstr ""
+#: src/hostlist/gnunet-daemon-hostlist_server.c:736
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "“%s”不可用。\n"
 
-#: src/fs/gnunet-service-fs_pr.c:851
-msgid "# irrelevant replies discarded"
-msgstr ""
+#: src/hostlist/gnunet-daemon-hostlist_server.c:749
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:770
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:790
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr "“%s”不可用。\n"
 
-#: src/fs/gnunet-service-fs_pr.c:865
+#: src/hostlist/gnunet-daemon-hostlist_server.c:830
 #, c-format
-msgid "Unsupported block type %u\n"
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:878
-msgid "# results found locally"
-msgstr ""
+#: src/identity/gnunet-identity.c:165
+#, fuzzy, c-format
+msgid "Failed to create ego: %s\n"
+msgstr "发送消息失败。\n"
 
-#: src/fs/gnunet-service-fs_pr.c:999
-msgid "# Datastore `PUT' failures"
+#: src/identity/gnunet-identity.c:184
+#, fuzzy, c-format
+msgid "Failed to set default ego: %s\n"
+msgstr "发送消息失败。\n"
+
+#: src/identity/gnunet-identity.c:327
+msgid "create ego NAME"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1026
-msgid "# storage requests dropped due to high load"
+#: src/identity/gnunet-identity.c:330
+msgid "delete ego NAME "
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1061
-msgid "# Replies received from DHT"
+#: src/identity/gnunet-identity.c:333
+msgid "display all egos"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1189
-msgid "# Replies received from STREAM"
+#: src/identity/gnunet-identity.c:336
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1241
-#, c-format
-msgid "Datastore lookup already took %s!\n"
+#: src/identity/gnunet-identity.c:339
+msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1261
-#, c-format
-msgid "On-demand lookup already took %s!\n"
+#: src/identity/gnunet-identity.c:342
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1308
-msgid "# Datastore lookups concluded (no results)"
+#: src/identity/gnunet-identity.c:351
+msgid "Maintain egos"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1323
-msgid "# Datastore lookups concluded (seen all)"
+#: src/identity/gnunet-service-identity.c:338
+msgid "no default known"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1332
-msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
+#: src/identity/gnunet-service-identity.c:362
+msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1347
-msgid "# requested DBLOCK or IBLOCK not found"
+#: src/identity/gnunet-service-identity.c:439
+#: src/identity/gnunet-service-identity.c:670
+#: src/identity/gnunet-service-identity.c:778
+#, fuzzy, c-format
+msgid "Failed to write subsystem default identifier map to `%s'.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/identity/gnunet-service-identity.c:446
+msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1361
-msgid "# on-demand blocks matched requests"
+#: src/identity/gnunet-service-identity.c:516
+msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1374
-msgid "# on-demand lookups performed successfully"
+#: src/identity/gnunet-service-identity.c:647
+msgid "target name already exists"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1379
-msgid "# on-demand lookups failed"
+#: src/identity/gnunet-service-identity.c:686
+#: src/identity/gnunet-service-identity.c:795
+msgid "no matching ego found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1406 src/fs/gnunet-service-fs_pr.c:1446
-#: src/fs/gnunet-service-fs_pr.c:1587
-msgid "# Datastore lookups concluded (error queueing)"
+#: src/identity/gnunet-service-identity.c:829
+#, fuzzy, c-format
+msgid "Failed to parse ego information in `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/identity/gnunet-service-identity.c:902
+#, fuzzy, c-format
+msgid "Failed to parse subsystem identity configuration file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/identity/gnunet-service-identity.c:914
+#, fuzzy, c-format
+msgid "Failed to create directory `%s' for storing egos\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/mysql/mysql.c:174
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1464
-msgid "# Datastore lookups concluded (found last result)"
-msgstr ""
+#: src/mysql/mysql.c:181
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/namecache/gnunet-namecache.c:109
+#, fuzzy, c-format
+msgid "No records found for `%s'"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1475
-msgid "# Datastore lookups concluded (load too high)"
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1563
-msgid "# Datastore lookups initiated"
-msgstr ""
+#: src/namecache/gnunet-namecache.c:185
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1648
-msgid "# GAP PUT messages received"
-msgstr ""
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:844
+#, fuzzy, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "“%s”的参数无效。\n"
 
-#: src/fs/gnunet-service-fs_push.c:629
-msgid "time required, content pushing disabled"
-msgstr ""
+#: src/namecache/gnunet-namecache.c:203
+#, fuzzy, c-format
+msgid "You must specify a name\n"
+msgstr "您必须指定一个接收方！\n"
 
-#: src/fs/gnunet-service-fs_stream.c:777
-msgid "# replies received via stream"
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1084
+msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_stream.c:791
-msgid "# replies received via stream dropped"
+#: src/namecache/gnunet-namecache.c:237
+msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_stream.c:930
-#: src/fs/gnunet-service-fs_stream.c:1384
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1116
 #, fuzzy
-msgid "# stream connections active"
-msgstr ""
-"\n"
-"按任意键继续\n"
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet 配置"
 
-#: src/fs/gnunet-service-fs_stream.c:1166
-msgid "# Blocks transferred via stream"
+#: src/namecache/namecache_api.c:276
+msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_stream.c:1326
-msgid "# queries received via stream"
+#: src/namecache/plugin_namecache_postgres.c:89
+#: src/namestore/plugin_namestore_postgres.c:96
+#, fuzzy
+msgid "Failed to create indices\n"
+msgstr "发送消息失败。\n"
+
+#: src/namestore/gnunet-namestore.c:303
+#, c-format
+msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_stream.c:1376
-msgid "# stream client connections rejected"
+#: src/namestore/gnunet-namestore.c:332
+#, c-format
+msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:89
+#: src/namestore/gnunet-namestore.c:339
 #, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:95
+#: src/namestore/gnunet-namestore.c:477 src/namestore/gnunet-namestore.c:485
+#: src/namestore/gnunet-namestore.c:493
 #, c-format
-msgid "Error unindexing: %s.\n"
+msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:100
-msgid "Unindexing done.\n"
+#: src/namestore/gnunet-namestore.c:507 src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:531
+#, c-format
+msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:130
+#: src/namestore/gnunet-namestore.c:628
 #, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
+msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:147
-msgid "Could not start unindex operation.\n"
+#: src/namestore/gnunet-namestore.c:667
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:179
-msgid "Unindex a file that was previously indexed with gnunet-publish."
+#: src/namestore/gnunet-namestore.c:708
+#, c-format
+msgid "No options given\n"
 msgstr ""
 
-#: src/gns/gns_api.c:598
+#: src/namestore/gnunet-namestore.c:719
+#: src/namestore/gnunet-namestore-fcfsd.c:984
 #, fuzzy
-msgid "Failed to serialize lookup reply from GNS service!\n"
+msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-dns2gns.c:192
-#, fuzzy
-msgid "Failed to pack DNS response into UDP packet!\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/namestore/gnunet-namestore.c:727 src/namestore/gnunet-namestore.c:736
+#: src/namestore/gnunet-namestore.c:753 src/namestore/gnunet-namestore.c:775
+#: src/namestore/gnunet-namestore.c:815
+#, fuzzy, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
 
-#: src/gns/gnunet-dns2gns.c:367
-#, c-format
-msgid "Cannot parse DNS request from %s\n"
+#: src/namestore/gnunet-namestore.c:728 src/namestore/gnunet-namestore.c:737
+#: src/namestore/gnunet-namestore.c:754 src/namestore/gnunet-namestore.c:776
+msgid "add"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:383
-#, c-format
-msgid "Received malformed DNS request from %s\n"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:745
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-dns2gns.c:391
+#: src/namestore/gnunet-namestore.c:765
 #, c-format
-msgid "Received unsupported DNS request from %s\n"
+msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:679
-msgid "IP of recursive DNS resolver to use (required)"
+#: src/namestore/gnunet-namestore.c:801
+#, fuzzy, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/namestore/gnunet-namestore.c:816
+msgid "del"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:682
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+#: src/namestore/gnunet-namestore.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/namestore/gnunet-namestore.c:903
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/namestore/gnunet-namestore.c:943
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:685
-msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
+#: src/namestore/gnunet-namestore.c:970
+#, c-format
+msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:688
-msgid "UDP port to listen on for inbound DNS requests; default: 53"
+#: src/namestore/gnunet-namestore.c:1006
+#, fuzzy, c-format
+msgid "Identity service is not running\n"
+msgstr "服务已删除。\n"
+
+#: src/namestore/gnunet-namestore.c:1018
+#, fuzzy, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/namestore/gnunet-namestore.c:1066
+msgid "add record"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:701
-msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+#: src/namestore/gnunet-namestore.c:1069
+msgid "delete record"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:221
-#, fuzzy, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/namestore/gnunet-namestore.c:1072
+msgid "display records"
+msgstr ""
 
-#: src/gns/gnunet-gns.c:335
-#, c-format
-msgid "Please specify lookup, shorten or authority operation!\n"
+#: src/namestore/gnunet-namestore.c:1075
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:356
+#: src/namestore/gnunet-namestore.c:1078
+#, fuzzy
+msgid "set the desired nick name for the zone"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/namestore/gnunet-namestore.c:1081
 #, fuzzy
-msgid "try to shorten a given name"
+msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns.c:359
-msgid "Lookup a record for the given name"
+#: src/namestore/gnunet-namestore.c:1087
+#, fuzzy
+msgid "determine our name for the given PKEY"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/namestore/gnunet-namestore.c:1090
+msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:362
-msgid "Get the authority of a particular name"
+#: src/namestore/gnunet-namestore.c:1093
+msgid "URI to import into our zone"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:365
-msgid "Specify the type of the record to lookup"
+#: src/namestore/gnunet-namestore.c:1096
+msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:368
-msgid "No unneeded output"
+#: src/namestore/gnunet-namestore.c:1099
+msgid "create or list public record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1102
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:381
-msgid "GNUnet GNS access tool"
+#: src/namestore/gnunet-namestore.c:1105
+msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:451
+#: src/namestore/gnunet-namestore-fcfsd.c:478
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:480
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:524
+#: src/namestore/gnunet-namestore-fcfsd.c:539
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:586
+#: src/namestore/gnunet-namestore-fcfsd.c:548
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:610
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:648
+#: src/namestore/gnunet-namestore-fcfsd.c:666
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:664
+#: src/namestore/gnunet-namestore-fcfsd.c:682
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:700
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:708
+#: src/namestore/gnunet-namestore-fcfsd.c:726
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:912 src/namestore/gnunet-namestore.c:364
-#, fuzzy
-msgid "Failed to read or create private zone key\n"
-msgstr "无法为守护程序创建用户账户。"
+#: src/namestore/gnunet-namestore-fcfsd.c:924
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:922 src/namestore/gnunet-namestore.c:375
+#: src/namestore/gnunet-namestore-fcfsd.c:950
 #, fuzzy
-msgid "Failed to connect to namestore\n"
+msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:938 src/gns/gnunet-gns-proxy.c:2857
+#: src/namestore/gnunet-namestore-fcfsd.c:992
 #, fuzzy
-msgid "Failed to start HTTP server\n"
+msgid "Failed to connect to identity\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:972
-msgid "GNUnet GNS first come first serve registration service"
+#: src/namestore/gnunet-namestore-fcfsd.c:1025
+msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2494
-#, fuzzy, c-format
-msgid "Unable to import private key from file `%s'\n"
-msgstr "无法创建用户账户："
-
-#: src/gns/gnunet-gns-proxy.c:2522
+#: src/namestore/gnunet-service-namestore.c:655
 #, fuzzy, c-format
-msgid "Unable to import certificate %s\n"
-msgstr "无法保存配置文件“%s”："
-
-#: src/gns/gnunet-gns-proxy.c:3510
-msgid "listen on specified port (default: 7777)"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3513
-msgid "pem file to use as CA"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3525
-msgid "GNUnet GNS proxy"
-msgstr ""
+msgid "Failed to replicate block in namecache: %s\n"
+msgstr "发送消息失败。\n"
 
-#: src/gns/gnunet-service-gns.c:486
-#, c-format
-msgid "Records for name `%s' in zone %s too large to fit into DHT"
+#: src/namestore/namestore_api.c:275
+msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1216
-#, fuzzy
-msgid "Failed to connect to the namestore!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/gns/gnunet-service-gns.c:1277
-#, fuzzy
-msgid "Could not connect to DHT!\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/gns/gnunet-service-gns.c:1288
-#, fuzzy
-msgid "Unable to initialize resolver!\n"
-msgstr "无法初始化 SQLite：%s。\n"
-
-#: src/gns/gnunet-service-gns_resolver.c:3439
+#: src/nat/gnunet-nat-server.c:279
 #, c-format
-msgid "Not a GADS TLD: `%s'\n"
-msgstr ""
-
-#: src/hello/gnunet-hello.c:119
-msgid "Call with name of HELLO file to modify.\n"
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:125
-#, fuzzy, c-format
-msgid "Error accessing file `%s': %s\n"
-msgstr "创建用户出错"
-
-#: src/hello/gnunet-hello.c:133
-#, c-format
-msgid "File `%s' is too big to be a HELLO\n"
+#: src/nat/gnunet-nat-server.c:321
+msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:140
-#, c-format
-msgid "File `%s' is too small to be a HELLO\n"
+#: src/nat/nat_auto.c:179
+msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:150 src/hello/gnunet-hello.c:179
-#, fuzzy, c-format
-msgid "Error opening file `%s': %s\n"
-msgstr "创建用户出错"
-
-#: src/hello/gnunet-hello.c:166
-#, c-format
-msgid "Did not find well-formed HELLO in file `%s'\n"
+#: src/nat/nat_auto.c:180
+msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:191
-#, fuzzy, c-format
-msgid "Error writing HELLO to file `%s': %s\n"
-msgstr "创建用户出错"
-
-#: src/hello/hello.c:936
-#, fuzzy
-msgid "Failed to parse HELLO message: missing expiration time\n"
-msgstr "保存配置失败。"
-
-#: src/hello/hello.c:945
-#, fuzzy
-msgid "Failed to parse HELLO message: invalid expiration time\n"
-msgstr "保存配置失败。"
-
-#: src/hello/hello.c:955
-#, fuzzy
-msgid "Failed to parse HELLO message: malformed\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/hello/hello.c:965
-msgid "Failed to parse HELLO message: missing transport plugin\n"
+#: src/nat/nat_auto.c:201
+msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/hello/hello.c:982
+#: src/nat/nat_auto.c:249
 #, c-format
-msgid "Plugin `%s' not found\n"
+msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/hello/hello.c:991
-#, c-format
-msgid "Plugin `%s' does not support URIs yet\n"
+#: src/nat/nat_auto.c:327
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/hello/hello.c:1010
+#: src/nat/nat_auto.c:343
 #, 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:258
-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:311
-msgid "advertise our hostlist to other peers"
-msgstr ""
+msgid "Detected internal network address `%s'.\n"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
-msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+#: src/nat/nat_auto.c:406
+msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:319
-msgid "enable learning about hostlist servers from other peers"
+#: src/nat/nat_auto.c:407
+msgid "upnpc not found\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
-msgid "provide a hostlist server"
+#: src/nat/nat_auto.c:437
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:338
-msgid "GNUnet hostlist server and client"
+#: src/nat/nat_auto.c:445 src/nat/nat_auto.c:490
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:289
-msgid "# bytes downloaded from hostlist servers"
+#: src/nat/nat_auto.c:453 src/nat/nat_auto.c:498
+msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
-msgid "# invalid HELLOs downloaded from hostlist servers"
+#: src/nat/nat_auto.c:483
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
+#: src/nat/nat.c:867
 #, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:331
-msgid "# valid HELLOs downloaded from hostlist servers"
-msgstr ""
+#: src/nat/nat.c:917
+#, fuzzy, c-format
+msgid "Failed to start %s\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/hostlist/hostlist-client.c:469 src/hostlist/hostlist-client.c:680
-#: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
-#: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
-#: src/hostlist/hostlist-client.c:960 src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1056
-#: src/transport/plugin_transport_http_client.c:1071
-#, c-format
-msgid "%s failed at %s:%d: `%s'\n"
+#: src/nat/nat.c:1032
+msgid "Error while running upnp client:\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1319
-msgid "# advertised hostlist URIs"
-msgstr ""
+#: src/nat/nat.c:1102
+#, fuzzy, c-format
+msgid "Failed to run upnp client for port %u\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/hostlist/hostlist-client.c:619
-#, c-format
-msgid "# advertised URI `%s' downloaded"
+#: src/nat/nat.c:1243
+msgid "malformed"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:661
-#, c-format
+#: src/nat/nat.c:1297
 msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:799
-#, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:813
-#, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:833
-#, fuzzy, c-format
-msgid "Download of hostlist from `%s' failed: `%s'\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/hostlist/hostlist-client.c:839
+#: src/nat/nat.c:1324 src/nat/nat.c:1336
 #, c-format
-msgid "Download of hostlist `%s' completed.\n"
+msgid ""
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:847
-#, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
+#: src/nat/nat.c:1474
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:900
+#: src/nat/nat.c:1490
 #, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:908
-msgid "# hostlist downloads initiated"
+#: src/nat/nat.c:1575
+msgid "Operation Successful"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1492
-msgid "# milliseconds between hostlist downloads"
+#: src/nat/nat.c:1577
+msgid "Internal Failure (IPC, ...)"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045
-#, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
+#: src/nat/nat.c:1579
+msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1105 src/hostlist/hostlist-client.c:1121
-msgid "# active connections"
+#: src/nat/nat.c:1581
+msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1267
-#, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
+#: src/nat/nat.c:1583
+msgid "detected that we are offline"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1271
-#, c-format
-msgid "Hostlist file `%s' does not exist\n"
+#: src/nat/nat.c:1585
+msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1282
-#, fuzzy, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
-msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
+#: src/nat/nat.c:1587
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/hostlist/hostlist-client.c:1315
-#, c-format
-msgid "%u hostlist URIs loaded from file\n"
+#: src/nat/nat.c:1589
+msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1317
-msgid "# hostlist URIs read from file"
+#: src/nat/nat.c:1591
+msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1362
-#, 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:1367
-#, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
+#: src/nat/nat.c:1593
+msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1391 src/hostlist/hostlist-client.c:1408
-#, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
-msgstr ""
+#: src/nat/nat.c:1595
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/hostlist/hostlist-client.c:1403
-msgid "# hostlist URIs written to file"
+#: src/nat/nat.c:1597
+msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1457
-msgid "Learning is enabled on this peer\n"
+#: src/nat/nat.c:1599
+msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1469
-msgid "Learning is not enabled on this peer\n"
+#: src/nat/nat.c:1601
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "无法确定用户界面定义文件。"
+
+#: src/nat/nat.c:1603
+msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1481
-#, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+#: src/nat/nat.c:1605
+msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1485
-#, c-format
-msgid "Hostlist file `%s' could not be removed\n"
+#: src/nat/nat.c:1607
+msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:137
-msgid "bytes in hostlist"
+#: src/nat/nat.c:1609
+msgid "could not register NAT"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:161
-msgid "expired addresses encountered"
+#: src/nat/nat.c:1611
+msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:348
-#: src/peerinfo-tool/gnunet-peerinfo.c:418
-#: src/peerinfo-tool/gnunet-peerinfo.c:489
-#: src/topology/gnunet-daemon-topology.c:918
-#, c-format
-msgid "Error in communication with PEERINFO service: %s\n"
+#: src/nat/nat_mini.c:203
+msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:210
-msgid "HELLOs without addresses encountered (ignored)"
+#: src/nat/nat_mini.c:609
+msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
-msgid "bytes not included in hostlist (size limit)"
+#: src/nat/nat_test.c:360
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:268
+#: src/nat/nat_test.c:462
 #, c-format
-msgid "Refusing `%s' request to hostlist server\n"
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:271
-msgid "hostlist requests refused (not HTTP GET)"
-msgstr ""
+#: src/nat/nat_test.c:497
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/hostlist/hostlist-server.c:284
-#, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
-msgstr ""
+#: src/nse/gnunet-nse.c:117
+#, fuzzy
+msgid "NSE service is not running\n"
+msgstr "服务已删除。\n"
 
-#: src/hostlist/hostlist-server.c:288
-msgid "hostlist requests refused (upload data)"
+#: src/nse/gnunet-nse.c:122
+msgid "Error while checking if NSE service is running or not\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:296
-msgid "Could not handle hostlist request since I do not have a response yet\n"
+#: src/nse/gnunet-nse.c:168
+msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
-msgid "hostlist requests refused (not ready)"
+#: src/nse/gnunet-nse-profiler.c:858
+msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:303
-msgid "Received request for our hostlist\n"
+#: src/nse/gnunet-nse-profiler.c:861
+msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:304
-msgid "hostlist requests processed"
+#: src/nse/gnunet-nse-profiler.c:867
+msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:346
-msgid "# hostlist advertisements send"
+#: src/nse/gnunet-nse-profiler.c:870
+msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:389
-msgid "Advertisement message could not be queued by core\n"
+#: src/nse/gnunet-nse-profiler.c:876
+msgid "delay between rounds"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:649
-#: src/transport/gnunet-service-transport.c:661
-msgid "Could not access PEERINFO service.  Exiting.\n"
-msgstr ""
+#: src/nse/gnunet-nse-profiler.c:885
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "无法访问该服务"
 
-#: src/hostlist/hostlist-server.c:570
-#, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr ""
+#: src/nse/gnunet-service-nse.c:1517
+#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:248
+#, fuzzy
+msgid "Value is too large.\n"
+msgstr "值不在合法范围内。"
 
-#: src/hostlist/hostlist-server.c:579
+#: src/peerinfo/gnunet-service-peerinfo.c:215
 #, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:593
-#, c-format
-msgid "Address to obtain hostlist: `%s'\n"
-msgstr ""
+#: src/peerinfo/gnunet-service-peerinfo.c:352
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/hostlist/hostlist-server.c:633
+#: src/peerinfo/gnunet-service-peerinfo.c:371
+#: src/peerinfo/gnunet-service-peerinfo.c:388
 #, fuzzy, c-format
-msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
-msgstr "“%s”不可用。\n"
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/hostlist/hostlist-server.c:675
-#, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:468
+msgid "# peers known"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:990
+#: src/peerinfo/gnunet-service-peerinfo.c:506
 #, c-format
-msgid "Transport plugin: `%s' port %llu\n"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1023
+#: src/peerinfo/gnunet-service-peerinfo.c:662
 #, fuzzy, c-format
-msgid "Found %u transport plugins: `%s'\n"
+msgid "Scanning directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/integration-tests/connection_watchdog.c:1082
-msgid "Send ping messages to test connectivity (default == NO)"
+#: src/peerinfo/gnunet-service-peerinfo.c:668
+#, c-format
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1091
-#: src/template/gnunet-template.c:70
-msgid "help text"
+#: src/peerinfo/gnunet-service-peerinfo.c:1037
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1358
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:211
-msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
+#: src/peerinfo/gnunet-service-peerinfo.c:1371
+msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:214
-#, fuzzy
-msgid "provide information about a particular tunnel"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
+#: src/peerinfo/peerinfo_api.c:237
+msgid "aborted due to explicit disconnect request"
+msgstr ""
 
-#: src/mesh/gnunet-mesh.c:224
+#: src/peerinfo/peerinfo_api.c:363
 #, fuzzy
-msgid "Print information about mesh tunnels and peers."
-msgstr "无法获取有关用户“%s”的信息：%s\n"
+msgid "failed to transmit request (service down?)"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/mesh/gnunet-service-mesh.c:7966 src/mesh/gnunet-service-mesh-new.c:4649
-msgid "Wrong CORE service\n"
+#: src/peerinfo/peerinfo_api.c:519
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8179 src/mesh/gnunet-service-mesh-new.c:4790
-#, fuzzy, c-format
-msgid "Mesh service could not access hostkey: %s. Exiting.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
+#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
+#: src/peerinfo/peerinfo_api.c:631
+#, fuzzy
+msgid "Received invalid message from `PEERINFO' service."
+msgstr "“%s”的参数无效。\n"
 
-#: src/mesh/gnunet-service-mesh.c:8261 src/mesh/gnunet-service-mesh.c:8273
-#: src/mesh/gnunet-service-mesh.c:8285 src/mesh/gnunet-service-mesh.c:8299
-#: src/mesh/gnunet-service-mesh.c:8311 src/mesh/gnunet-service-mesh.c:8323
-#: src/mesh/gnunet-service-mesh.c:8335 src/mesh/gnunet-service-mesh-new.c:4860
-#: src/mesh/gnunet-service-mesh-new.c:4872
-#: src/mesh/gnunet-service-mesh-new.c:4884
-#: src/mesh/gnunet-service-mesh-new.c:4896
-#: src/mesh/gnunet-service-mesh-new.c:4908
-#: src/mesh/gnunet-service-mesh-new.c:4920 src/nse/gnunet-service-nse.c:1500
-#: src/nse/gnunet-service-nse.c:1518
-#: src/regex/gnunet-daemon-regexprofiler.c:320
-#: src/regex/gnunet-daemon-regexprofiler.c:332
-#: src/regex/gnunet-daemon-regexprofiler.c:344
-#: src/regex/gnunet-daemon-regexprofiler.c:357
-#: src/regex/gnunet-regex-simulation-profiler.c:659
+#: src/peerinfo/peerinfo_api.c:720
+#, fuzzy
+msgid "Timeout transmitting iteration request to `PEERINFO' service."
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/peerinfo/peerinfo_api_notify.c:268
 #, fuzzy, c-format
-msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
-msgstr "立即保存配置？"
+msgid "Could not connect to `%s' service.\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/mesh/gnunet-service-mesh.c:8347 src/mesh/gnunet-service-mesh.c:8357
-#: src/mesh/gnunet-service-mesh.c:8368 src/mesh/gnunet-service-mesh-new.c:4932
-#: src/mesh/gnunet-service-mesh-new.c:4942
-#: src/mesh/gnunet-service-mesh-new.c:4953
+#: src/peerinfo-tool/gnunet-peerinfo.c:230
 #, fuzzy, c-format
-msgid ""
-"%s service is lacking key configuration settings (%s). Using default (%u).\n"
-msgstr "立即保存配置？"
+msgid "%sPeer `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/mysql/mysql.c:174
+#: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/mysql/mysql.c:181
+#: src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:462
+#, fuzzy, c-format
+msgid "Failure: Did not receive %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/namestore/gnunet-namestore.c:212
+#: src/peerinfo-tool/gnunet-peerinfo.c:471
 #, c-format
-msgid "Adding record failed: %s\n"
+msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:243
+#: src/peerinfo-tool/gnunet-peerinfo.c:483
+#, fuzzy, c-format
+msgid "Failed to write HELLO with %u bytes to file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:502
 #, c-format
-msgid "Deleting record failed: %s\n"
+msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:304
+#: src/peerinfo-tool/gnunet-peerinfo.c:570
 #, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
+msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:320
-msgid "for at least"
-msgstr ""
+#: src/peerinfo-tool/gnunet-peerinfo.c:687
+#, fuzzy, c-format
+msgid "Service `%s' is not running, please start GNUnet\n"
+msgstr "服务已删除。\n"
 
-#: src/namestore/gnunet-namestore.c:321
-msgid "until"
+#: src/peerinfo-tool/gnunet-peerinfo.c:718 src/util/gnunet-scrypt.c:224
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:356
+#: src/peerinfo-tool/gnunet-peerinfo.c:816
 #, c-format
-msgid "No options given\n"
+msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:386
-#, fuzzy, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "未知的命令“%s”。\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:865
+msgid "don't resolve host names"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:394 src/namestore/gnunet-namestore.c:418
-#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:477
-#: src/namestore/gnunet-namestore.c:518
-#, fuzzy, c-format
-msgid "Missing option `%s' for operation `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
+msgid "output only the identity strings"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
-msgid "add/del"
+#: src/peerinfo-tool/gnunet-peerinfo.c:871
+msgid "include friend-only information"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:408
-#, c-format
-msgid "Value `%s' invalid for record type `%s'\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:874
+msgid "output our own identity only"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:446
-#, fuzzy, c-format
-msgid "Invalid time format `%s'\n"
-msgstr "IP 格式无效：“%s”\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:877
+#, fuzzy
+msgid "list all known peers"
+msgstr "列出所有网络适配器"
 
-#: src/namestore/gnunet-namestore.c:455
-#, c-format
-msgid ""
-"Deletion requires either absolute time, or no time at all. Got relative time "
-"`%s' instead.\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
+msgid "dump hello to file"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
-#: src/namestore/gnunet-namestore.c:497
-msgid "add"
+#: src/peerinfo-tool/gnunet-peerinfo.c:883
+msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:496
-#, fuzzy, c-format
-msgid "No valid expiration time for operation `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
+#: src/peerinfo-tool/gnunet-peerinfo.c:886
+msgid "add given HELLO uri to the database"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:519
-msgid "del"
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
+#, 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:127
+#, c-format
+msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:701
-#, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "无效条目。\n"
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:132
+#, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:625
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:164
 #, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "卸载 GNUnet 服务"
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore.c:677
-msgid "add record"
+#: src/peerstore/gnunet-peerstore.c:92
+msgid "peerstore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:680
-msgid "delete record"
-msgstr ""
+#: src/peerstore/gnunet-service-peerstore.c:343
+#, fuzzy
+msgid "Malformed iterate request.\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore.c:683
-msgid "display records"
+#: src/peerstore/gnunet-service-peerstore.c:350
+msgid "Sub system not supplied in client iterate request.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:686
-msgid ""
-"expiration time for record to use (for adding only), \"never\" is possible"
-msgstr ""
+#: src/peerstore/gnunet-service-peerstore.c:399
+#, fuzzy
+msgid "Malformed store request from client\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/namestore/gnunet-namestore.c:689
-msgid "name of the record to add/delete/display"
+#: src/peerstore/gnunet-service-peerstore.c:407
+msgid "Full key not supplied in client store request\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:692
-msgid "type of the record to add/delete/display"
+#: src/peerstore/gnunet-service-peerstore.c:427
+msgid "Failed to store requested value, sqlite database error."
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:695
-msgid "URI to import into our zone"
+#: src/peerstore/gnunet-service-peerstore.c:509
+msgid "No database backend configured\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-msgid "value of the record to add/delete"
-msgstr ""
+#: src/peerstore/gnunet-service-peerstore.c:520
+#, fuzzy, c-format
+msgid "Could not load database backend `%s'\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/namestore/gnunet-namestore.c:701
-msgid "create or list public record"
+#: src/peerstore/peerstore_api.c:299 src/sensor/sensor_api.c:179
+#, c-format
+msgid "Received an error notification from MQ of type: %d\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:704
-msgid "create or list non-authority record"
+#: src/peerstore/peerstore_api.c:370
+msgid "Iteration canceled due to reconnection."
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
-msgid "filename with the zone key"
-msgstr ""
+#: src/peerstore/peerstore_api.c:635
+#, fuzzy
+msgid "Unexpected iteration response, this should not happen.\n"
+msgstr "输出格式未知，不应出现这种情况。\n"
 
-#: src/namestore/gnunet-namestore.c:718
+#: src/peerstore/peerstore_api.c:646
 #, fuzzy
-msgid "GNUnet zone manipulation tool"
-msgstr "GNUnet 配置"
+msgid "Error communicating with `PEERSTORE' service."
+msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/namestore/gnunet-service-namestore.c:241
-#: src/namestore/gnunet-service-namestore.c:257
-#, fuzzy, c-format
-msgid "Failed to write zone key to file `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/peerstore/peerstore_api.c:665
+#, fuzzy
+msgid "Received a malformed response from service."
+msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-service-namestore.c:243
-msgid "file exists but reading key failed"
+#: src/peerstore/peerstore_api.c:804
+msgid ""
+"Problem receiving a watch response, no way to determine which request.\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:259
-msgid "file exists with different key"
+#: src/peerstore/peerstore_api.c:815
+msgid "Received a watch result for a non existing watch.\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:1557
-#, fuzzy
-msgid "Failed to find record to remove\n"
-msgstr "无法连接到 %s:%u：%s\n"
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:286
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "创建用户出错"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:401
+#: src/psycstore/plugin_psycstore_sqlite.c:263
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "创建用户出错"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:483
+#, fuzzy, c-format
+msgid "Unable to create indices: %s.\n"
+msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-service-namestore.c:2172
+#: src/postgres/postgres.c:59
 #, fuzzy, c-format
-msgid "Could not parse zone key file `%s'\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/namestore/gnunet-service-namestore.c:2262
-msgid "No directory to load zonefiles specified in configuration\n"
-msgstr ""
+#: src/postgres/postgres.c:148
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres: %s"
+msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/namestore/gnunet-service-namestore.c:2272
-#, c-format
-msgid "Creating directory `%s' for zone files failed!\n"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:260
+#, fuzzy
+msgid "Failed to store membership information!\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/namestore/namestore_api.c:345
-msgid "Namestore failed to add record"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:284
+#, fuzzy
+msgid "Failed to test membership!\n"
+msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_api.c:371
-msgid "Namestore failed to add record\n"
-msgstr ""
+#: src/psycstore/gnunet-service-psycstore.c:306
+#, fuzzy
+msgid "Failed to store fragment!\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/namestore/namestore_api.c:415
+#: src/psycstore/gnunet-service-psycstore.c:362
 #, fuzzy
-msgid "Failed to create new signature"
+msgid "Failed to get fragment!\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_api.c:419
-msgid "Failed to put new set of records in database"
-msgstr ""
-
-#: src/namestore/namestore_api.c:423
+#: src/psycstore/gnunet-service-psycstore.c:402
 #, fuzzy
-msgid "Failed to remove records from database"
+msgid "Failed to get message!\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_api.c:427
+#: src/psycstore/gnunet-service-psycstore.c:433
 #, fuzzy
-msgid "Failed to access database"
+msgid "Failed to get message fragment!\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/namestore/namestore_api.c:431
+#: src/psycstore/gnunet-service-psycstore.c:461
 #, fuzzy
-msgid "unknown internal error in namestore"
-msgstr "未知错误。\n"
+msgid "Failed to get master counters!\n"
+msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_api.c:436
-msgid "Protocol error"
+#: src/psycstore/gnunet-service-psycstore.c:497
+#: src/psycstore/gnunet-service-psycstore.c:570
+msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/namestore/namestore_common.c:532 src/namestore/namestore_common.c:672
-#, fuzzy, c-format
-msgid "Unsupported record type %d\n"
-msgstr "未知的命令“%s”。\n"
+#: src/psycstore/gnunet-service-psycstore.c:513
+#, fuzzy
+msgid "Failed to begin modifying state!\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/namestore/namestore_common.c:539
+#: src/psycstore/gnunet-service-psycstore.c:536
 #, fuzzy, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr "æ\97 æ\95\88ç\9a\84è¿\9bç¨\8bä¼\98å\85\88级â\80\9c%sâ\80\9d\n"
+msgid "Unknown operator: %c\n"
+msgstr "æ\9cªç\9f¥é\94\99误"
 
-#: src/namestore/namestore_common.c:562
-#, fuzzy, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "解æ\9e\90é\85\8dç½®æ\96\87件â\80\9c%sâ\80\9d失败\n"
+#: src/psycstore/gnunet-service-psycstore.c:546
+#, fuzzy
+msgid "Failed to end modifying state!\n"
+msgstr "è¿\90è¡\8c %s失败ï¼\9a%s %d\n"
 
-#: src/namestore/namestore_common.c:585
-#, fuzzy, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/psycstore/gnunet-service-psycstore.c:584
+#, fuzzy
+msgid "Failed to begin synchronizing state!\n"
+msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_common.c:603
-#, fuzzy, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "无效的进程优先级“%s”\n"
+#: src/psycstore/gnunet-service-psycstore.c:600
+#, fuzzy
+msgid "Failed to end synchronizing state!\n"
+msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_common.c:616
-#, fuzzy, c-format
-msgid "Unable to parse PKEY record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/psycstore/gnunet-service-psycstore.c:620
+#: src/psycstore/gnunet-service-psycstore.c:639
+#, fuzzy
+msgid "Failed to reset state!\n"
+msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_common.c:637
-#, fuzzy, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/psycstore/gnunet-service-psycstore.c:662
+#: src/psycstore/gnunet-service-psycstore.c:713
+msgid "Tried to get invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:689
+#: src/psycstore/gnunet-service-psycstore.c:728
+#, fuzzy
+msgid "Failed to get state variable!\n"
+msgstr "发送消息失败。\n"
 
-#: src/namestore/namestore_common.c:663
+#: src/psycstore/plugin_psycstore_sqlite.c:60
 #, fuzzy, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/namestore/plugin_namestore_postgres.c:95
+#: src/psycstore/plugin_psycstore_sqlite.c:1933
 #, fuzzy
-msgid "Failed to create indices\n"
-msgstr "发送消息失败。\n"
+msgid "SQLite database running\n"
+msgstr "sqlite 数据仓库"
 
-#: src/nat/gnunet-nat-server.c:279
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
+#: src/pt/gnunet-daemon-pt.c:482
+msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/pt/gnunet-daemon-pt.c:488
+msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/nat/nat_auto.c:169
-msgid "NAT traversal with ICMP Server timed out.\n"
+#: src/pt/gnunet-daemon-pt.c:541
+msgid "# DNS records modified"
 msgstr ""
 
-#: src/nat/nat_auto.c:199
-msgid "NAT traversal with ICMP Server succeeded.\n"
+#: src/pt/gnunet-daemon-pt.c:717
+msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/nat/nat_auto.c:200
-msgid "NAT traversal with ICMP Server failed.\n"
+#: src/pt/gnunet-daemon-pt.c:723
+msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:219
-msgid "Testing connection reversal with ICMP server.\n"
+#: src/pt/gnunet-daemon-pt.c:826
+msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/nat/nat_auto.c:265
-#, c-format
-msgid "Detected external IP `%s'\n"
+#: src/pt/gnunet-daemon-pt.c:883
+msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/nat/nat_auto.c:331
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+#: src/pt/gnunet-daemon-pt.c:888
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/nat/nat_auto.c:347
-#, fuzzy, c-format
-msgid "Detected internal network address `%s'.\n"
-msgstr "GNUnet 现在使用 IP 地址 %s。\n"
+#: src/pt/gnunet-daemon-pt.c:896
+msgid "# DNS requests dropped (malformed)"
+msgstr ""
 
-#: src/nat/nat_auto.c:400
-msgid "upnpc found, enabling its use\n"
+#: src/pt/gnunet-daemon-pt.c:969
+msgid "# DNS replies received"
 msgstr ""
 
-#: src/nat/nat_auto.c:401
-msgid "upnpc not found\n"
+#: src/pt/gnunet-daemon-pt.c:985
+msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/nat/nat_auto.c:434
-msgid "gnunet-helper-nat-server found, testing it\n"
+#: 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
+#, fuzzy, c-format
+msgid "Failed to connect to %s service.  Exiting.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/pt/gnunet-daemon-pt.c:1347
+msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/nat/nat_auto.c:435
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-regex-simulation-profiler.c:659
+#, 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 cadet."
 msgstr ""
 
-#: src/nat/nat_auto.c:469
-msgid "gnunet-helper-nat-client found, enabling it\n"
+#: src/regex/gnunet-regex-profiler.c:1288
+msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:470
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+#: 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
+#, c-format
+msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/nat/nat.c:834
+#: src/regex/gnunet-regex-profiler.c:1334
+#: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/nat/nat.c:883
+#: src/regex/gnunet-regex-profiler.c:1341
 #, fuzzy, c-format
-msgid "Failed to start %s\n"
+msgid "No files found in `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat/nat.c:1152
-msgid "malformed"
+#: src/regex/gnunet-regex-profiler.c:1350
+msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/nat/nat.c:1218 src/nat/nat.c:1230
-#, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
+#: src/regex/gnunet-regex-profiler.c:1370
+#, fuzzy
+msgid "Error loading search strings. Exiting.\n"
+msgstr "创建用户出错"
+
+#: src/regex/gnunet-regex-profiler.c:1455
+#, fuzzy
+msgid "name of the file for writing statistics"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/regex/gnunet-regex-profiler.c:1458
+msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/nat/nat.c:1365
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/regex/gnunet-regex-profiler.c:1461
+msgid "directory with policy files"
 msgstr ""
 
-#: src/nat/nat.c:1376
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+#: src/regex/gnunet-regex-profiler.c:1464
+#, fuzzy
+msgid "name of file with input strings"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/regex/gnunet-regex-profiler.c:1467
+#, fuzzy
+msgid "name of file with hosts' names"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/regex/gnunet-regex-profiler.c:1479
+msgid "Profiler for regex"
 msgstr ""
 
-#: src/nat/nat_mini.c:170
-msgid "`external-ip' command not found\n"
+#: src/regex/gnunet-regex-simulation-profiler.c:689
+msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/nat/nat_mini.c:505
-msgid "`upnpc' command not found\n"
+#: src/regex/gnunet-regex-simulation-profiler.c:692
+msgid "maximum path compression length"
 msgstr ""
 
-#: src/nat/nat_test.c:341
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/regex/gnunet-regex-simulation-profiler.c:705
+msgid "Profiler for regex library"
 msgstr ""
 
-#: src/nat/nat_test.c:411
+#: src/regex/regex_api.c:131
+#, fuzzy, c-format
+msgid "Regex `%s' is too long!\n"
+msgstr "服务已删除。\n"
+
+#: src/revocation/gnunet-revocation.c:126
 #, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
-msgid "limit to the number of connections to NSE services, 0 for none"
-msgstr ""
+#: src/revocation/gnunet-revocation.c:131
+#, fuzzy, c-format
+msgid "Key `%s' has been revoked\n"
+msgstr "服务已删除。\n"
 
-#: src/nse/gnunet-nse-profiler.c:887
-msgid "name of the file for writing connection information and statistics"
+#: src/revocation/gnunet-revocation.c:137
+#, fuzzy
+msgid "Internal error\n"
+msgstr "未知错误。\n"
+
+#: src/revocation/gnunet-revocation.c:163
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:890 src/testbed/gnunet-testbed-profiler.c:284
-msgid "name of the file with the login information for the testbed"
+#: src/revocation/gnunet-revocation.c:168
+msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:893
-msgid "name of the file for writing the main results"
+#: src/revocation/gnunet-revocation.c:173
+#, c-format
+msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:896
-msgid "Number of peers to run in each round, separated by commas"
+#: src/revocation/gnunet-revocation.c:178
+msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:902
-msgid "delay between rounds"
+#: src/revocation/gnunet-revocation.c:183
+msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:911
-#, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "无法访问该服务"
+#: src/revocation/gnunet-revocation.c:294
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
+msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1419
-#, fuzzy, c-format
-msgid "NSE service could not access hostkey: %s\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/revocation/gnunet-revocation.c:324
+#, c-format
+msgid "Ego `%s' not found.\n"
+msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1433
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+#: src/revocation/gnunet-revocation.c:345
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1508
-msgid "Invalid work requirement for NSE service. Exiting.\n"
+#: src/revocation/gnunet-revocation.c:365
+msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:215
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
+#: src/revocation/gnunet-revocation.c:375
+msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:355
+#: src/revocation/gnunet-revocation.c:407
 #, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
+msgid "Public key `%s' malformed\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/revocation/gnunet-revocation.c:421
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:441
+#, fuzzy
+msgid "No filename to store revocation certificate given.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:370
+#: src/revocation/gnunet-revocation.c:463
 #, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s %u \n"
+msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:445
-msgid "# peers known"
+#: src/revocation/gnunet-revocation.c:488
+#, fuzzy
+msgid "No action specified. Nothing to do.\n"
+msgstr "没有指定接口，将使用默认。\n"
+
+#: src/revocation/gnunet-revocation.c:504
+msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:481
-#, c-format
+#: src/revocation/gnunet-revocation.c:507
 msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:633
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:638
-#, c-format
-msgid "Still no peers found in `%s'!\n"
+#: src/revocation/gnunet-revocation.c:510
+msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:970
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/revocation/gnunet-revocation.c:513
+msgid "test if the public key KEY has been revoked"
+msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1250
+#: src/revocation/gnunet-service-revocation.c:433
 #, c-format
-msgid "Importing HELLOs from `%s'\n"
+msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:239
-msgid "aborted due to explicit disconnect request"
+#: src/revocation/gnunet-service-revocation.c:483
+#: src/revocation/gnunet-service-revocation.c:730
+msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:359
+#: src/revocation/gnunet-service-revocation.c:822
 #, fuzzy
-msgid "failed to transmit request (service down?)"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Could not open revocation database file!"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/peerinfo/peerinfo_api.c:509
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/rps/gnunet-rps.c:67
+msgid "rps"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
-#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
-#: src/peerinfo/peerinfo_api.c:606
-#, fuzzy
-msgid "Received invalid message from `PEERINFO' service."
-msgstr "“%s”的参数无效。\n"
-
-#: src/peerinfo/peerinfo_api.c:681
+#: src/scalarproduct/gnunet-scalarproduct.c:222
 #, fuzzy
-msgid "Timeout transmitting iteration request to `PEERINFO' service."
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/peerinfo/peerinfo_api_notify.c:269
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
-#, fuzzy, c-format
-msgid "%sPeer `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
+msgid "You must specify at least one message ID to check!\n"
+msgstr "您必须指定一个昵称\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:427
-#, fuzzy, c-format
-msgid "Failure: Did not receive %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:229
+msgid "This program needs a session identifier for comparing vectors.\n"
+msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:435
+#: src/scalarproduct/gnunet-scalarproduct.c:242
 #, c-format
-msgid "Failure: Received invalid %s\n"
+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:253
+msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:444
+#: src/scalarproduct/gnunet-scalarproduct.c:275
 #, fuzzy, c-format
-msgid "Failed to write HELLO with %u bytes to file `%s'\n"
+msgid "Malformed input, could not parse `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:457
-#, c-format
-msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
-msgstr ""
+#: src/scalarproduct/gnunet-scalarproduct.c:294
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int64_t.\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:521
-#, c-format
-msgid "Failure adding HELLO: %s\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:344
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:659
-#, fuzzy, c-format
-msgid "Could not find option `%s:%s' in configuration.\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:347
+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/peerinfo-tool/gnunet-peerinfo.c:665
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:350
+msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:727
-#, c-format
-msgid "I am peer `%s'.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:359
+msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:759
-msgid "don't resolve host names"
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1418
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1529
+#, fuzzy
+msgid "Connect to CADET failed\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:762
-msgid "output only the identity strings"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:765
-msgid "include friend-only information"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:768
-msgid "output our own identity only"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:771
+#: src/sensordashboard/gnunet-service-sensordashboard.c:353
+#, fuzzy, c-format
+msgid "Error trying to send a message to peer `%s'.\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/sensor/gnunet-sensor.c:162
 #, fuzzy
-msgid "list all known peers"
-msgstr "列出所有网络适配器"
+msgid "Retrieve information about all defined sensors"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:774
-msgid "dump hello to file"
+#: src/sensor/gnunet-sensor.c:165
+#, fuzzy
+msgid "Retrieve information about a single sensor"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/sensor/gnunet-sensor.c:168
+msgid "Force an anomaly on a sensor, use only for testing"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
-msgid "also output HELLO uri(s)"
+#: src/sensor/gnunet-sensor.c:175
+msgid "sensor"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
-msgid "add given HELLO uri to the database"
+#: src/sensor/gnunet-sensor-profiler.c:728
+msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:791
+#: src/sensor/gnunet-sensor-profiler.c:735
 #, fuzzy
-msgid "Print information about peers."
-msgstr "无法获取有关用户“%s”的信息：%s\n"
+msgid "Missing or invalid topology file.\n"
+msgstr "“%s”的参数无效。\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:120
-#, c-format
-msgid "Starting transport plugins `%s'\n"
+#: src/sensor/gnunet-sensor-profiler.c:781
+#, fuzzy
+msgid "Number of peers to run"
+msgstr "迭代次数"
+
+#: src/sensor/gnunet-sensor-profiler.c:783
+msgid "Path to topology file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:124
-#, c-format
-msgid "Loading `%s' transport plugin\n"
+#: src/sensor/gnunet-sensor-profiler.c:786
+msgid "Change the interval of running sensors to given value"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:153
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/sensor/gnunet-sensor-profiler.c:789
+#, fuzzy
+msgid "Number of peers to simulate anomalies on"
+msgstr "迭代次数"
 
-#: src/postgres/postgres.c:59
+#: src/sensor/gnunet-sensor-profiler.c:796
+#, fuzzy
+msgid "Profiler for sensor service"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:202
+#, fuzzy
+msgid "Received an invalid sensor value."
+msgstr "“%s”的参数无效。\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:293
+#, fuzzy
+msgid "Analysis model not defined in configuration.\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:302
 #, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+msgid "Could not load analysis model `%s'.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/postgres/postgres.c:148
+#: src/sensor/gnunet-service-sensor_analysis.c:310
+#, fuzzy
+msgid "Could not connect to peerstore service.\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:233
+#, fuzzy
+msgid "Unknown value type expected by sensor, this should not happen.\n"
+msgstr "输出格式未知，不应出现这种情况。\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:268
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "无法初始化 SQLite：%s。\n"
+msgid "Received an invalid value for sensor `%s': %s\n"
+msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/pt/gnunet-daemon-pt.c:264
-msgid "Failed to pack DNS request.  Dropping.\n"
+#: src/sensor/gnunet-service-sensor_monitoring.c:345
+#, c-format
+msgid "Sensor `%s': External process should not be a path, disabling sensor.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:270
-msgid "# DNS requests mapped to VPN"
+#: src/sensor/gnunet-service-sensor_monitoring.c:368
+#, c-format
+msgid ""
+"Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:323
-msgid "# DNS records modified"
+#: src/sensor/gnunet-service-sensor_monitoring.c:416
+#, c-format
+msgid "Sensor `%s' execution task already set, this should not happen\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:500
-msgid "# DNS replies intercepted"
-msgstr ""
+#: src/sensor/gnunet-service-sensor_reporting.c:828
+#, fuzzy
+msgid "Double creation of proof-of-work, this should not happen.\n"
+msgstr "输出格式未知，不应出现这种情况。\n"
 
-#: src/pt/gnunet-daemon-pt.c:506
-msgid "Failed to parse DNS request.  Dropping.\n"
-msgstr ""
+#: src/sensor/gnunet-service-sensor_reporting.c:834
+#, fuzzy
+msgid "Failed to create pow and signature block.\n"
+msgstr "发送消息失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:602
-msgid "# DNS requests dropped (timeout)"
+#: src/sensor/gnunet-service-sensor_reporting.c:1044
+#, c-format
+msgid "PEERSTORE error: %s.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:632
-msgid "# DNS requests intercepted"
-msgstr ""
+#: src/sensor/gnunet-service-sensor_reporting.c:1149
+#: src/sensor/gnunet-service-sensor_reporting.c:1407
+#, fuzzy
+msgid "Failed to connect to CORE service.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:637
-msgid "# DNS requests dropped (DNS mesh tunnel down)"
+#: src/sensor/gnunet-service-sensor_reporting.c:1156
+msgid "Peer identity received from CORE init doesn't match ours.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:645
-msgid "# DNS requests dropped (malformed)"
-msgstr ""
+#: src/sensor/gnunet-service-sensor_reporting.c:1396
+#, fuzzy
+msgid "Failed to connect to peerstore service.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:716
-msgid "# DNS replies received"
-msgstr ""
+#: src/sensor/gnunet-service-sensor_reporting.c:1417
+#: src/sensor/gnunet-service-sensor_update.c:781
+#, fuzzy
+msgid "Failed to connect to CADET service.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:730
-msgid "# DNS replies dropped (too late?)"
-msgstr ""
+#: src/sensor/gnunet-service-sensor_reporting.c:1424
+#, fuzzy
+msgid "Failed to load my private key.\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
-msgid "# DNS requests aborted (tunnel down)"
+#: src/sensor/gnunet-service-sensor_update.c:327
+#, c-format
+msgid "Error trying to send a message to update point `%s'.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:898 src/pt/gnunet-daemon-pt.c:907
-#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
+#: src/sensor/gnunet-service-sensor_update.c:418
 #, fuzzy, c-format
-msgid "Failed to connect to %s service.  Exiting.\n"
+msgid "Failed to connect to update point `%s'.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:976
-msgid "Daemon to run to perform IP protocol translation to GNUnet"
+#: src/sensor/plugin_sensor_model_gaussian.c:203
+msgid "Missing `TRAINING_WINDOW' value in configuration.\n"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:432
-msgid "Daemon to announce regular expressions for the peer using mesh."
+#: src/sensor/plugin_sensor_model_gaussian.c:221
+msgid "Missing `CONFIDENCE_INTERVAL' value in configuration.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1247
-msgid "No configuration file given. Exiting\n"
+#: src/sensor/plugin_sensor_model_gaussian.c:229
+msgid "Missing `WEIGHT_INC' value in configuration.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1258
-#, fuzzy
-msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/regex/gnunet-regex-profiler.c:1287
-#: src/regex/gnunet-regex-simulation-profiler.c:622
-#, c-format
-msgid "No policy directory specified on command line. Exiting.\n"
+#: src/sensor/sensor_api.c:296
+msgid "Iterate request canceled due to disconnection.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1293
-#: src/regex/gnunet-regex-simulation-profiler.c:629
-#, c-format
-msgid "Specified policies directory does not exist. Exiting.\n"
+#: src/sensor/sensor_api.c:307
+msgid "Force anomaly request canceled due to disconnection.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1300
-#, fuzzy, c-format
-msgid "No files found in `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
+#: src/sensor/sensor_api.c:374
+#, fuzzy
+msgid "Timeout transmitting iteration request to `SENSOR' service."
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1309
-msgid "No search strings file given. Exiting.\n"
+#: src/sensor/sensor_util_lib.c:107
+#, fuzzy
+msgid "Error reading sensor version\n"
+msgstr "创建用户出错"
+
+#: src/sensor/sensor_util_lib.c:116
+msgid "Invalid sensor version number, format should be major.minor\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1319
+#: src/sensor/sensor_util_lib.c:131
 #, fuzzy
-msgid ""
-"Error loading search strings.Given file does not contain enough strings. "
-"Exiting.\n"
+msgid "Error reading sensor category\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1327
+#: src/sensor/sensor_util_lib.c:164
 #, fuzzy
-msgid "Error loading search strings. Exiting.\n"
+msgid "Error reading sensor run interval\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1394
+#: src/sensor/sensor_util_lib.c:191
 #, fuzzy
-msgid "name of the file for writing statistics"
-msgstr "å\88\9då§\8bå\8c\96â\80\9c%sâ\80\9dæ\9c\8då\8a¡å¤±è´¥ã\80\82\n"
+msgid "Error reading sensor source\n"
+msgstr "å\88\9b建ç\94¨æ\88·å\87ºé\94\99"
 
-#: src/regex/gnunet-regex-profiler.c:1397
-msgid "wait TIMEOUT before ending the experiment"
+#: src/sensor/sensor_util_lib.c:206
+msgid "Error reading sensor gnunet-statistics source information\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1400
-msgid "directory with policy files"
+#: src/sensor/sensor_util_lib.c:218
+#, fuzzy
+msgid "Error reading sensor process name\n"
+msgstr "创建用户出错"
+
+#: src/sensor/sensor_util_lib.c:233
+msgid "Error reading sensor expected datatype\n"
+msgstr ""
+
+#: src/sensor/sensor_util_lib.c:241
+msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
+msgstr ""
+
+#: src/sensor/sensor_util_lib.c:299
+#, fuzzy, c-format
+msgid "Failed to access sensor file: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/sensor/sensor_util_lib.c:308
+#, fuzzy, c-format
+msgid "Failed to load sensor definition: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/sensor/sensor_util_lib.c:370
+#, c-format
+msgid "Sensor `%s' already exists with same or newer version\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1403
+#: src/sensor/sensor_util_lib.c:387
+#, fuzzy, c-format
+msgid "Error adding new sensor `%s' to global hashmap.\n"
+msgstr "创建用户出错"
+
+#: src/sensor/sensor_util_lib.c:412
+#, fuzzy, c-format
+msgid "Error loading sensor from file: %s\n"
+msgstr "创建用户出错"
+
+#: src/set/gnunet-service-set.c:1529
 #, fuzzy
-msgid "name of file with input strings"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Could not connect to cadet service\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1406
+#: src/set/gnunet-set-ibf-profiler.c:221
 #, fuzzy
-msgid "name of file with hosts' names"
-msgstr "初始化“%s”服务失败。\n"
+msgid "number of element in set A-B"
+msgstr "迭代次数"
 
-#: src/regex/gnunet-regex-profiler.c:1418
-msgid "Profiler for regex"
+#: src/set/gnunet-set-ibf-profiler.c:224
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "迭代次数"
+
+#: src/set/gnunet-set-ibf-profiler.c:227
+msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
-msgid "name of the table to write DFAs"
+#: src/set/gnunet-set-ibf-profiler.c:230
+msgid "hash num"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:692
-msgid "maximum path compression length"
+#: src/set/gnunet-set-ibf-profiler.c:233
+msgid "ibf size"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:705
-msgid "Profiler for regex library"
+#: src/set/gnunet-set-profiler.c:298
+msgid "oeration to execute"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:271
+#: src/statistics/gnunet-service-statistics.c:280
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:330
+#: src/statistics/gnunet-service-statistics.c:346
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:141
+#: src/statistics/gnunet-statistics.c:140
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:143
+#: src/statistics/gnunet-statistics.c:142
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:181
-#, fuzzy, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/statistics/gnunet-statistics.c:190
-#, fuzzy, c-format
-msgid "A port is required to connect to host `%s'\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/statistics/gnunet-statistics.c:196
-#, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:210
+#: src/statistics/gnunet-statistics.c:189
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:216
+#: src/statistics/gnunet-statistics.c:195
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:247
+#: src/statistics/gnunet-statistics.c:226
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:255
+#: src/statistics/gnunet-statistics.c:234
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:310
+#: src/statistics/gnunet-statistics.c:261
+#, fuzzy, c-format
+msgid "Trying to connect to remote host, but service `%s' is not running\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/statistics/gnunet-statistics.c:269
+#, 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
+#, 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
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:313
+#: src/statistics/gnunet-statistics.c:337
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:316
+#: src/statistics/gnunet-statistics.c:340
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:319
+#: src/statistics/gnunet-statistics.c:343
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:322
+#: src/statistics/gnunet-statistics.c:346
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:325
+#: src/statistics/gnunet-statistics.c:349
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:328
+#: src/statistics/gnunet-statistics.c:352
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:364
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:512
+#: src/statistics/statistics_api.c:519
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/statistics_api.c:1057
+#: src/statistics/statistics_api.c:1090
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
-#: src/sysmon/gnunet-service-sysmon.c:546
+#: src/testbed/generate-underlay-topology.c:223
+msgid "Need atleast 2 arguments\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:228
+msgid "Database filename missing\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:235
+msgid "Topology string missing\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:240
+#, fuzzy, c-format
+msgid "Invalid topology: %s\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/testbed/generate-underlay-topology.c:253
+#, c-format
+msgid "An argument is missing for given topology `%s'\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:259
+#, fuzzy, c-format
+msgid "Invalid argument `%s' given as topology argument\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/testbed/generate-underlay-topology.c:267
+#, c-format
+msgid "Filename argument missing for topology `%s'\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:281
+#, c-format
+msgid "Second argument for topology `%s' is missing\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:287
+#, fuzzy, c-format
+msgid "Invalid argument `%s'; expecting unsigned int\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/testbed/generate-underlay-topology.c:336
+#: src/testbed/gnunet-testbed-profiler.c:293
+msgid "create COUNT number of peers"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:345
+msgid ""
+"Generates SQLite3 database representing a given underlay topology.\n"
+"Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
+"The following options are available for TOPO followed by TOPOOPTS if "
+"applicable:\n"
+"\t LINE\n"
+"\t RING\n"
+"\t RANDOM <num_rnd_links>\n"
+"\t SMALL_WORLD <num_rnd_links>\n"
+"\t SMALL_WORLD_RING <num_rnd_links>\n"
+"\t CLIQUE\n"
+"\t 2D_TORUS\n"
+"\t SCALE_FREE <cap> <m>\n"
+"\t FROM_FILE <filename>\n"
+"TOPOOPTS:\n"
+"\t num_rnd_links: The number of random links\n"
+"\t cap: the maximum number of links a node can have\n"
+"\t m: the number of links a node should have while joining the network\n"
+"\t filename: the path of the file which contains topology information\n"
+"NOTE: the format of the above file is descibed here: https://www.gnunet.org/"
+"content/topology-file-format\n"
+msgstr ""
+
+#: src/testbed/gnunet-daemon-latency-logger.c:333
+msgid "Daemon to log latency values of connections to neighbours"
+msgstr ""
+
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
+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:295
 #, c-format
-msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
+msgid "Incorrect hostkey file format: %s\n"
+msgstr ""
+
+#: src/testbed/gnunet-daemon-testbed-underlay.c:474
+msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:692
+#: src/testbed/gnunet-service-testbed_cpustatus.c:730
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_ll_master.c:57
+#: 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:1021
+msgid "Request doesn't fit into a message"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1059
 #, c-format
-msgid "Job command file not given. Exiting\n"
+msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
 #: src/testbed/gnunet_testbed_mpi_spawn.c:125
@@ -4621,1451 +6812,1788 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/testbed/gnunet-testbed-profiler.c:251
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "增加 TCP/IP 的最大连接数"
-
-#: src/testbed/gnunet-testbed-profiler.c:277
-msgid "create COUNT number of peers"
+#: src/testbed/gnunet-testbed-profiler.c:296
+msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:280
-msgid "tolerate COUNT number of continious timeout failures"
+#: src/testbed/gnunet-testbed-profiler.c:299
+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:459
+#: src/testbed/testbed_api_hosts.c:415
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:467
+#: src/testbed/testbed_api_hosts.c:423
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:474
+#: src/testbed/testbed_api_hosts.c:430
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:595
+#: src/testbed/testbed_api_hosts.c:570
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1879
+#: 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:891
+#: src/testbed/testbed_api_testbed.c:819
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1094
+#: src/testbed/testbed_api_testbed.c:988
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1175
+#: src/testbed/testbed_api_testbed.c:1054
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1320
+#: src/testbed/testbed_api_testbed.c:1143
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1324
+#: src/testbed/testbed_api_testbed.c:1147
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1365
+#: src/testbed/testbed_api_testbed.c:1185
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1383
+#: src/testbed/testbed_api_testbed.c:1203
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1443
+#: src/testbed/testbed_api_testbed.c:1263
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1455
+#: src/testbed/testbed_api_testbed.c:1275
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1479
+#: src/testbed/testbed_api_testbed.c:1299
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:670
+#: src/testbed/testbed_api_testbed.c:1349
+#, 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
+#, 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
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:676
+#: src/testbed/testbed_api_topology.c:966
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:683
+#: src/testbed/testbed_api_topology.c:973
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:706
+#: src/testbed/testbed_api_topology.c:995
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:715
-#: src/testbed/testbed_api_topology.c:739
+#: src/testbed/testbed_api_topology.c:1004
+#: src/testbed/testbed_api_topology.c:1028
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:721
-#: src/testbed/testbed_api_topology.c:745
+#: src/testbed/testbed_api_topology.c:1010
+#: src/testbed/testbed_api_topology.c:1034
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:727
-#: src/testbed/testbed_api_topology.c:751
+#: src/testbed/testbed_api_topology.c:1016
+#: src/testbed/testbed_api_topology.c:1040
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:766
+#: src/testbed/testbed_api_topology.c:1074
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/testing/gnunet-testing.c:133
+#: src/testing/gnunet-testing.c:173
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/gnunet-testing.c:210
+#: src/testing/gnunet-testing.c:258
+#, c-format
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr ""
+
+#: src/testing/gnunet-testing.c:355
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/testing/gnunet-testing.c:212
+#: src/testing/gnunet-testing.c:357
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:214
+#: src/testing/gnunet-testing.c:359
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "打印配置文件中的一个值到标准输出"
 
-#: src/testing/gnunet-testing.c:216
+#: src/testing/gnunet-testing.c:361
 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
 
-#: src/testing/gnunet-testing.c:225
+#: src/testing/gnunet-testing.c:363
+msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
+msgstr ""
+
+#: src/testing/gnunet-testing.c:376
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/gnunet-testing-run-service.c:129
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+#: src/testing/list-keys.c:90
+msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/gnunet-testing-run-service.c:186
-#, fuzzy
-msgid "name of the template configuration file to use (optional)"
-msgstr "打印配置文件中的一个值到标准输出"
-
-#: src/testing/gnunet-testing-run-service.c:189
-msgid "name of the service to run"
+#: src/testing/list-keys.c:93
+msgid "skip COUNT number of keys in the beginning"
 msgstr ""
 
-#: src/testing/testing.c:288
+#: src/testing/testing.c:277
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:304
-#, c-format
-msgid "Incorrect hostkey file format: %s\n"
-msgstr ""
-
-#: src/testing/testing.c:719
+#: src/testing/testing.c:718
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:730
-#, fuzzy, c-format
-msgid "Error while decoding key %u\n"
-msgstr "解析 dscl 输出时出错。\n"
-
-#: src/testing/testing.c:1175
-#, fuzzy
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/testing/testing.c:1182
+#: src/testing/testing.c:1157
 #, 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:1191
+#: src/testing/testing.c:1166
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:1211
+#: src/testing/testing.c:1176
+msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
+msgstr ""
+
+#: src/testing/testing.c:1189
+#, fuzzy
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/testing/testing.c:1203
 #, fuzzy, c-format
-msgid "Cannot open hostkey file: %s\n"
+msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing.c:1221
+#: src/testing/testing.c:1215
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:1243
+#: src/testing/testing.c:1240
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1343
+#: src/testing/testing.c:1342
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/testing/testing.c:1709
+#: src/testing/testing.c:1706
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/topology/gnunet-daemon-topology.c:254
-msgid "# peers blacklisted"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:387
-msgid "# connect requests issued to transport"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:721
-#: src/topology/gnunet-daemon-topology.c:806
-msgid "# friends connected"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:987
-msgid "Failed to connect to core service, can not manage topology!\n"
-msgstr ""
+#: src/topology/friends.c:100
+#, 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:1030
+#: src/topology/friends.c:154
 #, c-format
-msgid "Could not read friends list `%s'\n"
+msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1036
-#, c-format
-msgid "Friends file `%s' is empty.\n"
+#: src/topology/gnunet-daemon-topology.c:265
+msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1045
-#, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
+#: src/topology/gnunet-daemon-topology.c:406
+msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1053
-#, c-format
-msgid "Failed to read friends list from `%s'\n"
+#: src/topology/gnunet-daemon-topology.c:756
+#: src/topology/gnunet-daemon-topology.c:840
+msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1073
-#, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
+#: src/topology/gnunet-daemon-topology.c:1020
+msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1086
+#: src/topology/gnunet-daemon-topology.c:1049
 #, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1096
+#: src/topology/gnunet-daemon-topology.c:1056
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1102
-#, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+#: src/topology/gnunet-daemon-topology.c:1077
+msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1112
+#: src/topology/gnunet-daemon-topology.c:1079
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1118
+#: src/topology/gnunet-daemon-topology.c:1084
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1125
+#: src/topology/gnunet-daemon-topology.c:1090
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1156
+#: src/topology/gnunet-daemon-topology.c:1121
+#: src/transport/plugin_transport_wlan.c:1444
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1211
+#: src/topology/gnunet-daemon-topology.c:1178
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1350
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1323
+msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:267
+#: src/transport/gnunet-service-transport_blacklist.c:271
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/gnunet-service-transport_blacklist.c:275
+#: src/transport/gnunet-service-transport_blacklist.c:279
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:453
-#: src/transport/gnunet-service-transport_blacklist.c:718
+#: src/transport/gnunet-service-transport_blacklist.c:465
+#: src/transport/gnunet-service-transport_blacklist.c:748
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:174
-msgid "# bytes payload discarded due to not connected peer "
+#: src/transport/gnunet-service-transport.c:220
+msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:239
+#: src/transport/gnunet-service-transport.c:424
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:286
+#: src/transport/gnunet-service-transport.c:515
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:642
+#: src/transport/gnunet-service-transport.c:708
 #, fuzzy, c-format
-msgid "Transport service could not access hostkey: %s. Exiting.\n"
-msgstr "æ\89¾ä¸\8då\88°æ\8e¥å\8f£â\80\9c%sâ\80\9dç\9a\84ä¸\80个 IP å\9c°å\9d\80。\n"
+msgid "Could not obtain a valid network for `%s' %s (%s)\n"
+msgstr "æ\97 æ³\95å\88©ç\94¨â\80\9c%2$sâ\80\9dè\8e·å\8f\96æ\8e¥å\8f£â\80\9c%1$sâ\80\9dç\9a\84 IP。\n"
 
-#: src/transport/gnunet-service-transport.c:741
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+#: src/transport/gnunet-service-transport.c:757
+#, c-format
+msgid ""
+"Address or session unknown: failed to update properties for peer `%s' plugin "
+"`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:389
+#: src/transport/gnunet-service-transport.c:1094
+#, fuzzy
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
+msgstr "立即保存配置？"
+
+#: src/transport/gnunet-service-transport_clients.c:463
 #, 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:394
+#: src/transport/gnunet-service-transport_clients.c:470
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:536
+#: src/transport/gnunet-service-transport_clients.c:630
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:677
+#: src/transport/gnunet-service-transport_clients.c:771
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:733
+#: src/transport/gnunet-service-transport_clients.c:804
+#, fuzzy, c-format
+msgid "Blacklist refuses connection attempt to peer `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-service-transport_clients.c:810
+#, fuzzy, c-format
+msgid "Blacklist allows connection attempt to peer `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-service-transport_clients.c:836
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:179
+#: src/transport/gnunet-service-transport_clients.c:850
+#, fuzzy, c-format
+msgid "Received a request connect message for peer `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/transport/gnunet-service-transport_clients.c:861
+msgid "# REQUEST DISCONNECT messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:875
+#, fuzzy, c-format
+msgid "Received a request disconnect message for peer `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/gnunet-service-transport_hello.c:182
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1095
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1346
-#: src/transport/gnunet-service-transport_neighbours.c:1678
+#: src/transport/gnunet-service-transport_neighbours.c:1220
+#: src/transport/gnunet-service-transport_neighbours.c:1635
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1351
+#: src/transport/gnunet-service-transport_neighbours.c:1225
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1356
+#: src/transport/gnunet-service-transport_neighbours.c:1230
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1413
+#: src/transport/gnunet-service-transport_neighbours.c:1288
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1455
+#: src/transport/gnunet-service-transport_neighbours.c:1349
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1479
+#: src/transport/gnunet-service-transport_neighbours.c:1382
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1487
+#: src/transport/gnunet-service-transport_neighbours.c:1390
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1520
+#: src/transport/gnunet-service-transport_neighbours.c:1437
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1529
+#: src/transport/gnunet-service-transport_neighbours.c:1446
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
+#: src/transport/gnunet-service-transport_neighbours.c:1454
+msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1462
+msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1540
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1618
+#: src/transport/gnunet-service-transport_neighbours.c:1574
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1590
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2774
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:1685
+#, fuzzy, c-format
+msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1712
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1757
+#, fuzzy
+msgid "# SYN messages sent"
+msgstr "消息尺寸"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1773
+#, fuzzy, c-format
+msgid "Failed to transmit SYN message via plugin to %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1800
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN)"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1849
+#, fuzzy, c-format
+msgid ""
+"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1904
+msgid "# SYN_ACK messages sent"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1919
+#, fuzzy, c-format
+msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2199
+#, fuzzy, c-format
+msgid "Blacklisting disapproved to connect to peer `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2324
+msgid "# SYN messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2329
+#, c-format
+msgid "SYN request from peer `%s' ignored due impending shutdown\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2626
+msgid "# Attempts to switch addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3047
+#, fuzzy
+msgid "# Failed attempts to switch addresses (no response)"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3142
+msgid "# SYN_ACK messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3150
+msgid "# unexpected SYN_ACK messages (no peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3164
+#: src/transport/gnunet-service-transport_neighbours.c:3199
+msgid "# unexpected SYN_ACK messages (not ready)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3211
+msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2789
-#: src/transport/gnunet-service-transport_neighbours.c:2823
-msgid "# unexpected CONNECT_ACK messages (not ready)"
+#: src/transport/gnunet-service-transport_neighbours.c:3234
+msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2836
-msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+#: src/transport/gnunet-service-transport_neighbours.c:3242
+msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2869
-msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+#: src/transport/gnunet-service-transport_neighbours.c:3441
+msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3050
-msgid "# unexpected SESSION ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3477
+msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3105
+#: src/transport/gnunet-service-transport_neighbours.c:3551
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3119
+#: src/transport/gnunet-service-transport_neighbours.c:3566
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3150
-msgid "# disconnect messages ignored (old format)"
+#: src/transport/gnunet-service-transport_neighbours.c:3611
+msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3161
-msgid "# disconnect messages ignored (timestamp)"
+#: src/transport/gnunet-service-transport_neighbours.c:3617
+msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3192
-msgid "# other peer asked to disconnect from us"
+#: src/transport/gnunet-service-transport_neighbours.c:3626
+msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3287
+#: src/transport/gnunet-service-transport_neighbours.c:3753
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:113
+#: src/transport/gnunet-service-transport_plugins.c:119
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:453
+#: src/transport/gnunet-service-transport_plugins.c:177
+#: src/transport/gnunet-service-transport_plugins.c:185
+#: src/transport/gnunet-service-transport_plugins.c:193
+#: src/transport/gnunet-service-transport_plugins.c:201
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
+#, fuzzy, c-format
+msgid "Missing function `%s' in transport plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:264
+#, c-format
+msgid "Did not load plugin `%s' due to missing functions\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:493
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:515
+#: src/transport/gnunet-service-transport_validation.c:563
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:564
+#: src/transport/gnunet-service-transport_validation.c:624
 msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:651
+#: src/transport/gnunet-service-transport_validation.c:722
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:910
+#: src/transport/gnunet-service-transport_validation.c:1011
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:955
+#: src/transport/gnunet-service-transport_validation.c:1062
+#, c-format
+msgid "Plugin `%s' not available, cannot confirm having this address\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1072
+msgid "# failed address checks during validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1075
+#, c-format
+msgid "Address `%s' is not one of my addresses, not confirming PING\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1083
+msgid "# successful address checks during validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1095
+#, 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:1051
+#: src/transport/gnunet-service-transport_validation.c:1157
+#, fuzzy, c-format
+msgid "Failed to create PONG signature for peer `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/transport/gnunet-service-transport_validation.c:1206
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1060
+#: src/transport/gnunet-service-transport_validation.c:1215
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1387
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1202
+#: src/transport/gnunet-service-transport_validation.c:1402
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1305
+#: src/transport/gnunet-service-transport_validation.c:1526
+#, c-format
+msgid "Validation received new %s message for peer `%s' with size %u\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1533
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:266
+#: src/transport/gnunet-transport.c:573
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:273
+#: src/transport/gnunet-transport.c:582
+#: src/transport/gnunet-transport-profiler.c:274
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:303
+#: src/transport/gnunet-transport.c:614
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:316
+#: src/transport/gnunet-transport.c:629
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-transport.c:325
+#: src/transport/gnunet-transport.c:641
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:429
+#: src/transport/gnunet-transport.c:668 src/transport/gnunet-transport.c:698
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did not work!\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/transport/gnunet-transport.c:673
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did work!\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/transport/gnunet-transport.c:678
+#, fuzzy, c-format
+msgid "Internal NAT error while running test for plugin `%s'\n"
+msgstr "未知错误。\n"
+
+#: src/transport/gnunet-transport.c:683
+#, fuzzy, c-format
+msgid "Failed to start NAT test for plugin `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:688
+#, c-format
+msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:704
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' is working!\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/transport/gnunet-transport.c:823
+#, 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:859
+#, fuzzy, c-format
+msgid "Peer `%s' %s `%s' \n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/transport/gnunet-transport.c:958 src/transport/gnunet-transport.c:1707
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:1026
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:442
+#: src/transport/gnunet-transport.c:1040
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:506
+#: src/transport/gnunet-transport.c:1065
+#, fuzzy
+msgid "Failed to start resolver!\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/transport/gnunet-transport.c:1111
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:1134
+#: src/transport/gnunet-transport-profiler.c:406
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:550
+#: src/transport/gnunet-transport.c:1158
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:1191
+#, fuzzy, c-format
+msgid "Successfully disconnected from `%s'\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/transport/gnunet-transport.c:1214
+#: src/transport/gnunet-transport-profiler.c:434
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:655
+#: src/transport/gnunet-transport.c:1239 src/transport/gnunet-transport.c:1265
 #, c-format
-msgid "Received %u bytes from %s\n"
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:678
-#, fuzzy, c-format
-msgid "Peer `%s': %s %s\n"
-msgstr "运行 %s失败：%s %d\n"
+#: src/transport/gnunet-transport.c:1241
+#, fuzzy
+msgid "Connected to"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/transport/gnunet-transport.c:1267
+#, fuzzy
+msgid "Disconnected from"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:693
+#: src/transport/gnunet-transport.c:1291
+#: src/transport/gnunet-transport-profiler.c:458
 #, c-format
-msgid "Peer `%s': %s <unable to resolve address>\n"
+msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:757
-#, fuzzy, c-format
-msgid "Peer `%s' disconnected\n"
+#: src/transport/gnunet-transport.c:1323
+#, c-format
+msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
-"\n"
-"按任意键继续\n"
 
-#: src/transport/gnunet-transport.c:785
+#: src/transport/gnunet-transport.c:1335
+#, fuzzy, c-format
+msgid "Peer `%s': %s %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport-profiler.c:492
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:819
+#: src/transport/gnunet-transport.c:1829
+#, fuzzy
+msgid "Failed to send disconnect request to transport service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:1875
 #, 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:825
+#: src/transport/gnunet-transport.c:1883
 #, 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:845 src/transport/gnunet-transport.c:875
-#: src/transport/gnunet-transport.c:897 src/transport/gnunet-transport.c:936
+#: src/transport/gnunet-transport.c:1902 src/transport/gnunet-transport.c:1932
+#: src/transport/gnunet-transport.c:1964 src/transport/gnunet-transport.c:1990
+#: src/transport/gnunet-transport.c:2046
+#: src/transport/gnunet-transport-profiler.c:578
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:852 src/transport/gnunet-transport.c:882
+#: src/transport/gnunet-transport.c:1911 src/transport/gnunet-transport.c:1941
+#: src/transport/gnunet-transport.c:1975
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:902
+#: src/transport/gnunet-transport.c:1995
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:987
+#: src/transport/gnunet-transport.c:2094
+#, fuzzy
+msgid "print information for all peers (instead of only connected peers)"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/gnunet-transport.c:2097
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:990
+#: src/transport/gnunet-transport.c:2100
 #, fuzzy
 msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:2103
+#, fuzzy
+msgid "disconnect to a peer"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:2106
+#, fuzzy
+msgid "print information for all pending validations "
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/gnunet-transport.c:2109
+#, fuzzy
+msgid "print information for all pending validations continuously"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/gnunet-transport.c:2112
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:999
+#: src/transport/gnunet-transport.c:2118
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:2121
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1005
+#: src/transport/gnunet-transport.c:2124
+#: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1009
+#: src/transport/gnunet-transport.c:2127
+msgid "monitor plugin sessions"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:2130
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1012
+#: src/transport/gnunet-transport.c:2133
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1023
+#: src/transport/gnunet-transport.c:2144
+#: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2566
-msgid "Disabling IPv6 since it is not supported on this system!\n"
+#: src/transport/gnunet-transport-profiler.c:218
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2334
-#, fuzzy
-msgid "Require valid port number for service in configuration!\n"
-msgstr "保存配置失败。"
+#: src/transport/gnunet-transport-profiler.c:254
+#, c-format
+msgid "%u;%u;%llu;%llu;%.2f;%.2f"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:263
+#, c-format
+msgid ";%llu;%.2f"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:280
+msgid "\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:332
+msgid "."
+msgstr ""
 
-#: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2366 src/util/service.c:1053
+#: src/transport/gnunet-transport-profiler.c:352
+#, c-format
+msgid ""
+"\n"
+"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:400
 #, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+msgid "Connected to different peer `%s'\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2383 src/util/service.c:1070
+#: src/transport/gnunet-transport-profiler.c:483
 #, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+msgid "Retrying to connect to `%s'\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/transport/gnunet-transport-profiler.c:508
+#, fuzzy, c-format
+msgid "Denying connection to `%s'\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/transport/gnunet-transport-profiler.c:537
+#, fuzzy
+msgid "Message size too big!\n"
+msgstr "消息尺寸"
 
-#: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2494
+#: src/transport/gnunet-transport-profiler.c:543
+#, fuzzy
+msgid "No peer identity given\n"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/gnunet-transport-profiler.c:558
 #, c-format
-msgid "Found %u addresses to report to NAT service\n"
+msgid "Trying to send %u messages with size %u to peer `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2673
-msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
-msgstr ""
+#: src/transport/gnunet-transport-profiler.c:564
+#, fuzzy, c-format
+msgid "Trying to receive messages from peer `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2684
+#: src/transport/gnunet-transport-profiler.c:569
 #, fuzzy
-msgid "Port is required! Fix in configuration\n"
-msgstr ""
-"\n"
-"结束配置。\n"
+msgid "No operation given\n"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/plugin_transport_http.c:1155
-msgid "Port 0, client only mode\n"
+#: src/transport/gnunet-transport-profiler.c:623
+msgid "send data to peer"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1175
-#, c-format
-msgid ""
-"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
+#: src/transport/gnunet-transport-profiler.c:626
+msgid "receive data from peer"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1204
-#, c-format
-msgid ""
-"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
+#: src/transport/gnunet-transport-profiler.c:629
+msgid "iterations"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2774
-#, fuzzy, c-format
-msgid "Using external hostname `%s'\n"
-msgstr "卸载 GNUnet 服务"
+#: src/transport/gnunet-transport-profiler.c:632
+#, fuzzy
+msgid "number of messages to send"
+msgstr "每次迭代所使用的消息数量"
+
+#: src/transport/gnunet-transport-profiler.c:635
+#, fuzzy
+msgid "message size to use"
+msgstr "消息尺寸"
 
-#: src/transport/plugin_transport_http.c:1226
-msgid "No external hostname configured\n"
+#: src/transport/plugin_transport_http_client.c:1491
+#: src/transport/plugin_transport_http_server.c:2271
+#: src/transport/plugin_transport_http_server.c:3436
+#: src/transport/plugin_transport_tcp.c:2826
+#: src/transport/plugin_transport_tcp.c:2833
+msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1535
+#: 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:1666
-#: src/transport/plugin_transport_http_server.c:2898
+#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_server.c:3170
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:1691
-#: src/transport/plugin_transport_http_server.c:2957
+#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_server.c:3240
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1719
-#: src/transport/plugin_transport_http_server.c:2804
+#: 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:1352
+#: src/transport/plugin_transport_http_server.c:1761
 #, 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:1613
+#: src/transport/plugin_transport_http_server.c:1992
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1621
+#: src/transport/plugin_transport_http_server.c:2000
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1922
+#: src/transport/plugin_transport_http_server.c:2150
 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:1946
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/plugin_transport_http_server.c:2173
+#, c-format
+msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2297
+msgid "Could not load or create server certificate! Loading plugin failed!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2604
+#, fuzzy
+msgid "Require valid port number for service in configuration!\n"
+msgstr "保存配置失败。"
+
+#: src/transport/plugin_transport_http_server.c:2638 src/util/service.c:700
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/plugin_transport_http_server.c:2656 src/util/service.c:719
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/transport/plugin_transport_http_server.c:2769
+#, c-format
+msgid "Found %u addresses to report to NAT service\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2847
+msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2652
+#: src/transport/plugin_transport_http_server.c:2946
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2666
+#: src/transport/plugin_transport_http_server.c:2961
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2691
+#: src/transport/plugin_transport_http_server.c:2967
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2978
+#, fuzzy
+msgid "Port is required! Fix in configuration\n"
+msgstr ""
+"\n"
+"结束配置。\n"
+
+#: src/transport/plugin_transport_http_server.c:2984
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2706
+#: src/transport/plugin_transport_http_server.c:2998
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2716
+#: src/transport/plugin_transport_http_server.c:3008
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2737
+#: src/transport/plugin_transport_http_server.c:3030
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2747
+#: src/transport/plugin_transport_http_server.c:3040
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2790
+#: src/transport/plugin_transport_http_server.c:3103
+#, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/transport/plugin_transport_http_server.c:3124
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:370
+#: src/transport/plugin_transport_http_server.c:3141
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
+
+#: src/transport/plugin_transport_http_server.c:3448
+#, 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"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:457
+#: src/transport/plugin_transport_smtp.c:310
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:466
+#: src/transport/plugin_transport_smtp.c:319
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
+#: src/transport/plugin_transport_smtp.c:414
+#: src/transport/plugin_transport_smtp.c:424
+#: src/transport/plugin_transport_smtp.c:437
+#: src/transport/plugin_transport_smtp.c:456
+#: src/transport/plugin_transport_smtp.c:479
+#: src/transport/plugin_transport_smtp.c:487
+#: src/transport/plugin_transport_smtp.c:500
+#: src/transport/plugin_transport_smtp.c:511
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:799
+#: src/transport/plugin_transport_smtp.c:652
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:811
+#: src/transport/plugin_transport_smtp.c:664
 msgid "# bytes received via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:812
+#: src/transport/plugin_transport_smtp.c:665
 msgid "# bytes sent via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:814
+#: src/transport/plugin_transport_smtp.c:667
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:648
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:772
-#: src/transport/plugin_transport_tcp.c:861
-#: src/transport/plugin_transport_tcp.c:911
-#: src/transport/plugin_transport_tcp.c:997
-#: src/transport/plugin_transport_tcp.c:1140
-#: src/transport/plugin_transport_tcp.c:1157
-msgid "# bytes currently in TCP buffers"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:779
-#: src/transport/plugin_transport_tcp.c:968
-#: src/transport/plugin_transport_tcp.c:1827
-#: src/transport/plugin_transport_tcp.c:2460
+#: src/transport/plugin_transport_tcp.c:829
+#: src/transport/plugin_transport_tcp.c:1044
+#: src/transport/plugin_transport_tcp.c:2232
+#: src/transport/plugin_transport_tcp.c:2932
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:865
-msgid "# bytes discarded by TCP (timeout)"
+#: src/transport/plugin_transport_tcp.c:870
+#: src/transport/plugin_transport_tcp.c:1027
+#: src/transport/plugin_transport_tcp.c:1146
+#: src/transport/plugin_transport_tcp.c:1214
+#: src/transport/plugin_transport_tcp.c:1312
+#: src/transport/plugin_transport_tcp.c:1336
+msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:914
-msgid "# bytes transmitted via TCP"
+#: src/transport/plugin_transport_tcp.c:873
+msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1001
-msgid "# bytes discarded by TCP (disconnect)"
+#: src/transport/plugin_transport_tcp.c:1149
+msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1114
-#, c-format
-msgid "Trying to send with invalid session %p\n"
+#: src/transport/plugin_transport_tcp.c:1218
+msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1350
-#, c-format
-msgid "Address of unexpected length: %u\n"
+#: src/transport/plugin_transport_tcp.c:1611
+msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1868
+#: src/transport/plugin_transport_tcp.c:2282
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2037
+#: src/transport/plugin_transport_tcp.c:2452
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2119
+#: src/transport/plugin_transport_tcp.c:2524
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2345 src/util/service.c:948
-#: src/util/service.c:954
+#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:582
+#: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2359
+#: src/transport/plugin_transport_tcp.c:2776
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2448
+#: src/transport/plugin_transport_tcp.c:2919
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2452
+#: src/transport/plugin_transport_tcp.c:2923
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2456
+#: src/transport/plugin_transport_tcp.c:2927
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:134
+#: src/transport/plugin_transport_udp_broadcasting.c:167
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:184
+#: src/transport/plugin_transport_udp_broadcasting.c:210
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:403
+#: src/transport/plugin_transport_udp_broadcasting.c:603
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:420
+#: src/transport/plugin_transport_udp_broadcasting.c:626
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2350
+#: src/transport/plugin_transport_udp.c:1655
+#, 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:2881
 #, 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:2364
-#, c-format
+#: src/transport/plugin_transport_udp.c:2894
 msgid ""
-"UDP could not transmit message to `%s': Please check your network "
-"configuration and disable IPv6 if your connection does not have a global "
-"IPv6 address\n"
+"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:2664
+#: src/transport/plugin_transport_udp.c:3247
+#, fuzzy, c-format
+msgid "Failed to bind UDP socket to %s: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/plugin_transport_udp.c:3255
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:2762
+#: src/transport/plugin_transport_udp.c:3414
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2805
+#: src/transport/plugin_transport_udp.c:3461
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_udp.c:2862
+#: src/transport/plugin_transport_udp.c:3529
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1427
+#: 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:1817
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:580
-msgid "# WLAN ACKs sent"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:599
-msgid "# WLAN messages defragmented"
+#: src/transport/plugin_transport_wlan.c:725
+msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:645
-#: src/transport/plugin_transport_wlan.c:695
-#: src/transport/plugin_transport_wlan.c:1764
-msgid "# WLAN sessions allocated"
+#: src/transport/plugin_transport_wlan.c:745
+msgid "# Messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:770
-msgid "# WLAN message fragments sent"
+#: src/transport/plugin_transport_wlan.c:786
+#: src/transport/plugin_transport_wlan.c:873
+msgid "# Sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:794
-msgid "# WLAN messages pending (with fragmentation)"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:902
-#: src/transport/plugin_transport_wlan.c:987
-#: src/transport/plugin_transport_wlan.c:1766
-msgid "# WLAN MAC endpoints allocated"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1166
-msgid "# HELLO messages received via WLAN"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:989
+#, fuzzy
+msgid "# message fragments sent"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:1192
-msgid "# fragments received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1015
+msgid "# messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1202
-msgid "# ACKs received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1129
+#: src/transport/plugin_transport_wlan.c:1222
+#: src/transport/plugin_transport_wlan.c:2185
+msgid "# MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1259
-msgid "# WLAN DATA messages discarded due to CRC32 error"
+#: src/transport/plugin_transport_wlan.c:1487
+msgid "# ACKs received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1364
-msgid "# DATA messages received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1555
+msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1399
-msgid "# WLAN DATA messages processed"
+#: src/transport/plugin_transport_wlan.c:1696
+msgid "# DATA messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1460
-msgid "# HELLO beacons sent via WLAN"
+#: src/transport/plugin_transport_wlan.c:1730
+msgid "# DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1569
-msgid "WLAN address with invalid size encountered\n"
+#: src/transport/plugin_transport_wlan.c:1793
+msgid "# HELLO beacons sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1745
+#: src/transport/plugin_transport_wlan.c:2160
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:651
+#: src/transport/plugin_transport_wlan.c:2182
+msgid "# sessions allocated"
+msgstr ""
+
+#: src/transport/transport_api.c:767
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/transport-testing.c:585
+#: src/transport/transport-testing.c:603
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/util/bio.c:136 src/util/bio.c:142
+#: src/tun/regex.c:129
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/util/bio.c:170 src/util/bio.c:178
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "创建用户出错"
 
-#: src/util/bio.c:143
+#: src/util/bio.c:180
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:195
+#: src/util/bio.c:237
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:205
+#: src/util/bio.c:247
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:250
+#: src/util/bio.c:293
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:264
+#: src/util/bio.c:307
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
+#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:619
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
+#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:623
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/util/client.c:371
+#: src/util/client.c:360
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:379
+#: src/util/client.c:368
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:698
-msgid "Failure to transmit TEST request.\n"
-msgstr ""
-
-#: src/util/client.c:898
-#, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
-msgstr ""
+#: src/util/client.c:1008
+#, fuzzy, c-format
+msgid "Could not connect to service `%s', configuration broken.\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/client.c:912
+#: src/util/client.c:1020
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1178
+#: src/util/client.c:1303
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1034
+#: src/util/common_logging.c:254 src/util/common_logging.c:1039
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1032
+#: src/util/common_logging.c:256 src/util/common_logging.c:1037
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1030
+#: src/util/common_logging.c:258 src/util/common_logging.c:1035
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1028
+#: src/util/common_logging.c:260 src/util/common_logging.c:1033
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1036
+#: src/util/common_logging.c:262 src/util/common_logging.c:1041
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:395
+#: 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:819
+#: src/util/common_logging.c:817
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1037
+#: src/util/common_logging.c:1042
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1176
+#: src/util/common_logging.c:1157
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1215
+#: src/util/common_logging.c:1196
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1233
+#: src/util/common_logging.c:1214
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/util/common_logging.c:1254
+#: src/util/common_logging.c:1235
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/util/configuration.c:291
+#: src/util/configuration.c:288
 #, fuzzy, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:998
+#: src/util/configuration.c:1023
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:427
+#: src/util/configuration.c:1093
+#, c-format
+msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
+msgstr ""
+
+#: src/util/configuration.c:1125
+#, fuzzy, c-format
+msgid "Missing closing `%s' in option `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/util/configuration.c:1199
+#, 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:442
+#: src/util/connection.c:438
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:557
+#: src/util/connection.c:553
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/util/connection.c:755 src/util/connection.c:922
+#: src/util/connection.c:751 src/util/connection.c:914
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/connection.c:913
+#: src/util/connection.c:904
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:518
+#: 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:444
-#, c-format
-msgid ""
-"File `%s' does not contain a valid private key (too long, %llu bytes).  "
-"Deleting it.\n"
-msgstr ""
-
-#: src/util/crypto_ecc.c:459 src/util/crypto_rsa.c:676
-#, c-format
-msgid ""
-"File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
-"Deleting it.\n"
-msgstr ""
-
-#: src/util/crypto_ecc.c:555 src/util/crypto_ecc.c:599
-#: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
+#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
+#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/crypto_ecc.c:560 src/util/crypto_rsa.c:892
+#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_ecc.c:603 src/util/crypto_rsa.c:754
-#: src/util/crypto_rsa.c:790
+#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:634 src/util/crypto_rsa.c:785
+#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
 #, 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:639
+#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:654 src/util/crypto_rsa.c:805
-#, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
-msgstr ""
+#: src/util/crypto_ecc.c:1016
+#, fuzzy
+msgid "Could not load peer's private key\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/crypto_ecc.c:776 src/util/crypto_rsa.c:982
-msgid "interrupted by shutdown"
-msgstr ""
+#: 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:787
-msgid "gnunet-ecc failed"
-msgstr ""
+#: 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_ecc.c:1084
-#, c-format
-msgid "ECC signature verification failed at %s:%d: %s\n"
-msgstr ""
+#: src/util/crypto_ecc.c:1244
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_random.c:281
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
+#: src/util/crypto_ecc.c:1301
+#, fuzzy, c-format
+msgid "EdDSA signature verification failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/crypto_random.c:312
+#: 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_rsa.c:660
-#, c-format
-msgid ""
-"File `%s' does not contain a valid private key (too long, %llu bytes).  "
-"Renaming it.\n"
-msgstr ""
-
-#: src/util/crypto_rsa.c:993
-msgid "gnunet-rsa failed"
-msgstr ""
-
-#: src/util/crypto_rsa.c:1378
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr ""
-
-#: src/util/disk.c:602
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%S': %u\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/util/disk.c:1207
+#: src/util/disk.c:1202
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
-#: src/util/disk.c:1564 src/util/service.c:1670
+#: src/util/disk.c:1564 src/util/service.c:1323
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/util/disk.c:2007
-#, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr ""
-
-#: src/util/getopt.c:570
+#: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/util/getopt.c:594
+#: src/util/getopt.c:592
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s：选项“--%s”不允许有参数\n"
 
-#: src/util/getopt.c:599
+#: src/util/getopt.c:597
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: src/util/getopt.c:616 src/util/getopt.c:783
+#: src/util/getopt.c:614 src/util/getopt.c:781
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s：选项“%s”要求有一个参数\n"
 
-#: src/util/getopt.c:645
+#: src/util/getopt.c:643
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s：无法识别的选项“--%s”\n"
 
-#: src/util/getopt.c:649
+#: src/util/getopt.c:647
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s：无法识别的选项“%c%s”\n"
 
-#: src/util/getopt.c:674
+#: src/util/getopt.c:672
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s：非法选项 -- %c\n"
 
-#: src/util/getopt.c:676
+#: src/util/getopt.c:674
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s：无效选项 -- %c\n"
 
-#: src/util/getopt.c:704 src/util/getopt.c:831
+#: src/util/getopt.c:702 src/util/getopt.c:829
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s：选项要求有一个参数 -- %c\n"
 
-#: src/util/getopt.c:752
+#: src/util/getopt.c:750
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s：选项“-W %s”有歧义\n"
 
-#: src/util/getopt.c:770
+#: src/util/getopt.c:768
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s：选项“-W %s” 不允许有参数\n"
 
-#: src/util/getopt.c:935
+#: src/util/getopt.c:933
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "请使用 --help 获取选项列表。\n"
 
-#: src/util/getopt_helpers.c:86
+#: src/util/getopt_helpers.c:84
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 
-#: src/util/getopt_helpers.c:270 src/util/getopt_helpers.c:328
+#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:300
+#: src/util/getopt_helpers.c:298
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
@@ -6101,619 +8629,907 @@ msgstr ""
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-ecc.c:76
+#: src/util/gnunet-ecc.c:81
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/gnunet-ecc.c:82
+#: src/util/gnunet-ecc.c:117
+#, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:130
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:100
+#: src/util/gnunet-ecc.c:171
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/gnunet-ecc.c:112
+#: src/util/gnunet-ecc.c:181
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:115
+#: src/util/gnunet-ecc.c:184
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:138 src/util/gnunet-rsa.c:65
+#: src/util/gnunet-ecc.c:277
 #, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:288
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/util/gnunet-ecc.c:310
+#, fuzzy, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/util/gnunet-ecc.c:361
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:193
-msgid "create COUNT public-private key pairs (for testing)"
+#: src/util/gnunet-ecc.c:411
+msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:196 src/util/gnunet-rsa.c:115
-msgid "print the public key in ASCII format"
+#: src/util/gnunet-ecc.c:414
+msgid "number of keys to list included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:417
+msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199 src/util/gnunet-rsa.c:118
-msgid "print the hash of the public key in ASCII format"
+#: src/util/gnunet-ecc.c:420
+msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:202 src/util/gnunet-rsa.c:121
-msgid "print the short hash of the public key in ASCII format"
+#: src/util/gnunet-ecc.c:423
+msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:213
+#: src/util/gnunet-ecc.c:434
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-resolver.c:148
+#: src/util/gnunet-resolver.c:149
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:159
+#: src/util/gnunet-resolver.c:160
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:132
-msgid "Manipulate GNUnet private RSA key files"
+#: src/util/gnunet-scrypt.c:279
+msgid "number of bits to require for the proof of work"
+msgstr ""
+
+#: src/util/gnunet-scrypt.c:282
+msgid "file with private key, otherwise default is used"
+msgstr ""
+
+#: src/util/gnunet-scrypt.c:285
+msgid "file with proof of work, otherwise default is used"
+msgstr ""
+
+#: src/util/gnunet-scrypt.c:288
+msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:288
+#: src/util/gnunet-scrypt.c:299
+#, fuzzy
+msgid "Manipulate GNUnet proof of work files"
+msgstr "更改配置文件中的一个值"
+
+#: src/util/gnunet-service-resolver.c:310
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/gnunet-service-resolver.c:358
-#: src/util/gnunet-service-resolver.c:399
+#: src/util/gnunet-service-resolver.c:382
+#: src/util/gnunet-service-resolver.c:423
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/gnunet-uri.c:90
+#: src/util/gnunet-uri.c:84
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:95
+#: src/util/gnunet-uri.c:89
 #, fuzzy, c-format
 msgid "Invalid URI: does not start with `%s'\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/gnunet-uri.c:102
+#: src/util/gnunet-uri.c:96
 #, c-format
 msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:112
+#: src/util/gnunet-uri.c:106
 #, c-format
 msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:174
+#: src/util/gnunet-uri.c:168
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:322
+#: src/util/helper.c:338
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:367
+#: src/util/helper.c:383
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/helper.c:564
+#: src/util/helper.c:609
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/network.c:127
+#: src/util/network.c:134
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1331
+#: src/util/network.c:1361 src/util/network.c:1486
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:423
+#: src/util/os_installation.c:421
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:709
+#: src/util/os_installation.c:766
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/os_installation.c:767
+#: src/util/os_installation.c:826
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/os_installation.c:777
+#: src/util/os_installation.c:836
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:89
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "插件机构初始化失败：%s！\n"
 
-#: src/util/plugin.c:146
+#: src/util/plugin.c:148
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:219
+#: src/util/plugin.c:223
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:349
+#: src/util/plugin.c:382
 #, fuzzy
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:254 src/util/service.c:1792
+#: src/util/program.c:246 src/util/service.c:1457
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/util/program.c:258 src/util/service.c:1472
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/resolver_api.c:202
+#: src/util/program.c:263 src/util/service.c:1467
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/util/resolver_api.c:201
 #, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:221
+#: src/util/resolver_api.c:220
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:347
+#: src/util/resolver_api.c:354
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:361
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:890
+#: src/util/resolver_api.c:974
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/scheduler.c:782
+#: src/util/scheduler.c:813
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:912
+#: src/util/scheduler.c:948
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:436
+#: src/util/server.c:484
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/server.c:445
+#: src/util/server.c:493
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:456
+#: src/util/server.c:499
 #, fuzzy, c-format
-msgid "`%s' failed for `%.*s': address already in use\n"
+msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/server.c:848
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
-#: src/util/service.c:232 src/util/service.c:239
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "IP 格式无效：“%s”\n"
-
-#: src/util/service.c:195
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
-
-#: src/util/service.c:288
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
-
-#: src/util/service.c:320
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "网络掩码的格式“%s”错误\n"
-
-#: src/util/service.c:350
-#, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "网络的格式“%s”错误\n"
-
-#: src/util/service.c:707
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
-msgstr ""
-
-#: src/util/service.c:712
+#: src/util/service.c:347
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/util/service.c:719
+#: src/util/service.c:354
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:774
+#: src/util/service.c:409
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:811
+#: src/util/service.c:446
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:929
+#: src/util/service.c:563
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1007
+#: src/util/service.c:653
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1024
+#: src/util/service.c:669
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1258
+#: src/util/service.c:908
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1309 src/util/service.c:1327
+#: src/util/service.c:957 src/util/service.c:975
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1354
+#: src/util/service.c:1000
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1526
+#: src/util/service.c:1170
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/service.c:1559
+#: src/util/service.c:1212
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1608
+#: src/util/service.c:1261
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1612
+#: src/util/service.c:1265
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1616
+#: src/util/service.c:1269
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1671
+#: src/util/service.c:1324
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1684
+#: src/util/service.c:1337
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”：%s\n"
 
-#: src/util/service.c:1750
+#: src/util/service.c:1407
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/util/signal.c:80
+#: src/util/signal.c:89
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/strings.c:146
+#: src/util/strings.c:145
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:425
+#: src/util/strings.c:434
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:540
+#: src/util/strings.c:562
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
-#: src/util/strings.c:637
-msgid "ms"
-msgstr "毫秒"
+#: src/util/strings.c:659
+msgid "µs"
+msgstr ""
 
-#: src/util/strings.c:641
+#: src/util/strings.c:663
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:643
+#: src/util/strings.c:665
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:649
+#: src/util/strings.c:671
+msgid "ms"
+msgstr "毫秒"
+
+#: src/util/strings.c:677
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:655
+#: src/util/strings.c:683
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:661
+#: src/util/strings.c:689
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:668
+#: src/util/strings.c:696
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:670
+#: src/util/strings.c:698
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:727
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1098
+#: src/util/strings.c:1192
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1106
+#: src/util/strings.c:1200
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1112
-msgid "IPv6 address did contain ']' before ':' to separate port number\n"
-msgstr ""
+#: src/util/strings.c:1206
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1213
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/util/strings.c:1222
+#, fuzzy, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/util/strings.c:1428 src/util/strings.c:1444
+msgid "Port not in range\n"
+msgstr ""
+
+#: src/util/strings.c:1453
+#, fuzzy, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
+#: src/util/strings.c:1636
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/util/strings.c:1593
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
+
+#: src/util/strings.c:1645
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/util/strings.c:1697
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
+
+#: src/util/strings.c:1747
+#, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "网络掩码的格式“%s”错误\n"
+
+#: src/util/strings.c:1778
+#, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "网络的格式“%s”错误\n"
 
-#: src/util/strings.c:1119
-msgid "IPv6 address did contain a valid port number after the last ':'\n"
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
+msgid "# Active channels"
 msgstr ""
 
-#: src/util/strings.c:1128
-#, fuzzy, c-format
-msgid "Invalid IPv6 address `%s': %s\n"
-msgstr "无效的进程优先级“%s”\n"
+#: src/vpn/gnunet-service-vpn.c:642
+msgid "# Bytes given to cadet for transmission"
+msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:512 src/vpn/gnunet-service-vpn.c:1088
-msgid "# Active tunnels"
+#: src/vpn/gnunet-service-vpn.c:680
+msgid "# Bytes dropped in cadet queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:609 src/vpn/gnunet-service-vpn.c:646
+#: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
-msgid "# peers connected to mesh tunnels"
+msgid "# Cadet channels created"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/vpn/gnunet-service-vpn.c:699
-msgid "# Bytes given to mesh for transmission"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:737
-msgid "# Bytes dropped in mesh queue (overflow)"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:771
-msgid "# Mesh tunnels created"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:794
+#: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
-msgid "Failed to setup mesh tunnel!\n"
+msgid "Failed to setup cadet channel!\n"
 msgstr "发送消息失败。\n"
 
-#: src/vpn/gnunet-service-vpn.c:990
+#: src/vpn/gnunet-service-vpn.c:978
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1308
+#: src/vpn/gnunet-service-vpn.c:1305
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1329
+#: src/vpn/gnunet-service-vpn.c:1326
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1534
+#: src/vpn/gnunet-service-vpn.c:1531
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1572 src/vpn/gnunet-service-vpn.c:1613
+#: 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 ""
 
-#: src/vpn/gnunet-service-vpn.c:1623
+#: src/vpn/gnunet-service-vpn.c:1610
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1637
+#: src/vpn/gnunet-service-vpn.c:1624
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1721
-msgid "# ICMP packets received from mesh"
+#: src/vpn/gnunet-service-vpn.c:1706
+msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2062
-msgid "# UDP packets received from mesh"
+#: src/vpn/gnunet-service-vpn.c:2045
+msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2220
-msgid "# TCP packets received from mesh"
+#: src/vpn/gnunet-service-vpn.c:2200
+msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2351
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2426
+#: src/vpn/gnunet-service-vpn.c:2406
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2465 src/vpn/gnunet-service-vpn.c:2678
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2751
+#: src/vpn/gnunet-service-vpn.c:2715
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3138
+#: src/vpn/gnunet-service-vpn.c:2987
+#, fuzzy
+msgid "Must specify valid IPv6 address"
+msgstr "“%s”不可用。\n"
+
+#: src/vpn/gnunet-service-vpn.c:3011
+msgid "Must specify valid IPv6 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3019
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3170
+#: src/vpn/gnunet-service-vpn.c:3032
+#, fuzzy
+msgid "Must specify valid IPv4 address"
+msgstr "“%s”不可用。\n"
+
+#: src/vpn/gnunet-service-vpn.c:3045
+msgid "Must specify valid IPv4 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3055
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:151
+#: src/vpn/gnunet-vpn.c:147
 #, fuzzy
 msgid "Error creating tunnel\n"
 msgstr "创建用户出错"
 
-#: src/vpn/gnunet-vpn.c:194 src/vpn/gnunet-vpn.c:225
+#: 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 ""
 
-#: src/vpn/gnunet-vpn.c:207
+#: src/vpn/gnunet-vpn.c:203
 #, fuzzy, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/vpn/gnunet-vpn.c:219
+#: src/vpn/gnunet-vpn.c:215
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:237
+#: src/vpn/gnunet-vpn.c:235
 #, fuzzy, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:255
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/vpn/gnunet-vpn.c:295
+#: src/vpn/gnunet-vpn.c:290
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:298
+#: src/vpn/gnunet-vpn.c:293
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:301
-msgid "print IP address only after mesh tunnel has been created"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:304
+#: src/vpn/gnunet-vpn.c:296
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:307
+#: src/vpn/gnunet-vpn.c:299
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:310
+#: src/vpn/gnunet-vpn.c:302
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:313
+#: src/vpn/gnunet-vpn.c:305
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:308
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:319
+#: src/vpn/gnunet-vpn.c:311
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:331
+#: src/vpn/gnunet-vpn.c:323
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
-#: src/include/gnunet_common.h:591
+#: src/include/gnunet_common.h:586 src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:601
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:601
+#: src/include/gnunet_common.h:613
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:649
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Service `%s' has been stopped.\n"
-#~ msgstr "服务已删除。\n"
+#~ msgid "Client %p disconnected from us.\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Could not send message to client (%p)!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Successfully created new channel to peer (%s)!\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Could not send message to channel!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Could not send service-response message via cadet!)\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Could not send service-request multipart message to channel!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "New incoming channel from peer %s.\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Reloading sensor definitions from directory `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Loaded %d sensors from directory `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Failed to receive response from `SENSOR' service."
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "Received invalid message from `SENSOR' service."
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "No UNIXPATH given in configuration!\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Could not convert `%s' to integer.\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the scalarproduct service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to send a message to the statistics service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ 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"
+#~ msgstr ""
+#~ "\n"
+#~ "按任意键继续\n"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Aborting call to `%s'\n"
+#~ msgstr "创建用户出错"
+
+#, fuzzy
+#~ msgid "You are already in a conversation with `%s'.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s service is lacking key configuration settings (%s). Using default "
+#~ "(%u).\n"
+#~ msgstr "立即保存配置？"
+
+#, fuzzy
+#~ msgid "Loading block plugin `%s'\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
+
+#, fuzzy
+#~ msgid "Invalid value `%s'\n"
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "Found issuer for public key `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "No issuer for public key `%s'\n"
+#~ msgstr "运行 %s失败：%s %d\n"
+
+#, fuzzy
+#~ msgid "Failed to get slave counters!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not translate E[a%d] to MPI!\n"
+#~ "%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"
+
+#~ msgid "no-name"
+#~ msgstr "无名称"
+
+#, fuzzy
+#~ msgid "Option `%s' ignored\n"
+#~ msgstr "%s：选项“%s”有歧义\n"
+
+#, fuzzy
+#~ msgid "try to shorten a given name"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to read or create private zone key\n"
+#~ msgstr "无法为守护程序创建用户账户。"
+
+#, fuzzy
+#~ msgid "Using default zone file `%s'\n"
+#~ msgstr "卸载 GNUnet 服务"
+
+#, fuzzy
+#~ msgid "Failed to write zone key to file `%s': %s\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
+
+#, fuzzy
+#~ msgid "name of the template configuration file to use (optional)"
+#~ msgstr "打印配置文件中的一个值到标准输出"
+
+#, fuzzy
+#~ msgid "Failed to read or generate private key: %s\n"
+#~ msgstr "无法为守护程序创建用户账户。"
+
+#, fuzzy
+#~ msgid "Transport service is unable to access hostkey. Exiting.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Failed to create namespace `%s' (illegal filename?)\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Mesh service could not access hostkey: %s. Exiting.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "No valid expiration time for operation `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Failed to find record to remove\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
+
+#, fuzzy
+#~ msgid "Could not parse zone key file `%s'\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Failed to remove records from database"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to access database"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
+
+#, fuzzy
+#~ msgid "unknown internal error in namestore"
+#~ msgstr "未知错误。\n"
+
+#, fuzzy
+#~ msgid "NSE service could not access hostkey: %s\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error loading search strings.Given file does not contain enough strings. "
+#~ "Exiting.\n"
+#~ msgstr "创建用户出错"
+
+#, fuzzy
+#~ msgid "Transport service could not access hostkey: %s. Exiting.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "`%s' failed for drive `%S': %u\n"
+#~ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
 #, fuzzy
 #~ msgid "Service `%s' was already running.\n"
@@ -6739,10 +9555,6 @@ msgstr ""
 #~ msgid "Exiting\n"
 #~ msgstr "退出"
 
-#, fuzzy
-#~ msgid "Could not read blacklist file `%s'\n"
-#~ msgstr "无法解析“%s”(%s)：%s\n"
-
 #, fuzzy
 #~ msgid "Failed to read blacklist from `%s'\n"
 #~ msgstr "解析配置文件“%s”失败\n"
@@ -6751,27 +9563,14 @@ msgstr ""
 #~ msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 #~ msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-#~ msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-
 #, fuzzy
 #~ msgid "Failed to read hostkey: %s\n"
 #~ msgstr "运行 %s失败：%s %d\n"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "未知错误"
-
 #, fuzzy
 #~ msgid "Failed to serialize meta data"
 #~ msgstr "发送消息失败。\n"
 
-#, fuzzy
-#~ msgid "Failed to connect to datastore service"
-#~ msgstr "初始化“%s”服务失败。\n"
-
 #, fuzzy
 #~ msgid "Failed to parse URI `%s' from KBlock!\n"
 #~ msgstr "运行 %s失败：%s %d\n"
@@ -6796,18 +9595,6 @@ msgstr ""
 #~ msgid "Mesh service could not access hostkey.  Exiting.\n"
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#, fuzzy
-#~ msgid "Connected to %s\n"
-#~ msgstr "“%s”已连接到“%s”。\n"
-
-#, fuzzy
-#~ msgid "list information for all peers"
-#~ msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#, fuzzy
-#~ msgid "Malformed %s `%s' given in configuration!\n"
-#~ msgstr "保存配置失败。"
-
 #, fuzzy
 #~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 #~ msgstr "配置文件“%s”已写入。\n"
@@ -6828,10 +9615,6 @@ msgstr ""
 #~ msgid "Failed to create/open key in file `%s'\n"
 #~ msgstr "打开日志文件“%s”失败：%s\n"
 
-#, fuzzy
-#~ msgid "Failed to connect to the chat service\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
 #~ msgid "anonymous"
 #~ msgstr "匿名"
 
@@ -6878,13 +9661,6 @@ msgstr ""
 #~ msgid "User `%s' is currently not in the room!\n"
 #~ msgstr "用户“%s”当前不在房间里！\n"
 
-#, fuzzy
-#~ msgid "Unknown command `%s'\n"
-#~ msgstr "未知的命令“%s”。\n"
-
-#~ msgid "You must specify a nickname\n"
-#~ msgstr "您必须指定一个昵称\n"
-
 #~ msgid "set the chat room to join"
 #~ msgstr "设置要加入的聊天室"
 
@@ -6896,26 +9672,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 "Connected to %s service!\n"
-#~ msgstr "“%s”已连接到“%s”。\n"
-
-#, fuzzy
-#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
-#~ msgstr "配置文件“%s”已写入。\n"
-
-#, fuzzy
-#~ msgid "Failed to start daemon: %s\n"
-#~ msgstr "运行 %s失败：%s %d\n"
-
 #, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "配置文件“%s”已写入。\n"
@@ -6928,34 +9688,18 @@ msgstr ""
 #~ msgid "Peer is lacking HOSTKEY configuration setting.\n"
 #~ msgstr "立即保存配置？"
 
-#, fuzzy
-#~ msgid "Could not access hostkey.\n"
-#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
 #, fuzzy
 #~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 #~ msgstr "初始化“%s”服务失败。\n"
 
-#, fuzzy
-#~ msgid "Failed to create pipe for `ssh' process.\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
 #, fuzzy
 #~ msgid "Could not start `%s' process to create hostkey.\n"
 #~ msgstr "初始化“%s”服务失败。\n"
 
-#, fuzzy
-#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
 #, fuzzy
 #~ msgid "Failed to start `ssh' process.\n"
 #~ msgstr "初始化“%s”服务失败。\n"
 
-#, fuzzy
-#~ msgid "Failed to get hostkey!\n"
-#~ msgstr "发送消息失败。\n"
-
 #, fuzzy
 #~ msgid "Could not start `%s' process to start GNUnet.\n"
 #~ msgstr "初始化“%s”服务失败。\n"
@@ -6980,10 +9724,6 @@ msgstr ""
 #~ msgid "Failed to write new configuration to disk."
 #~ msgstr "保存配置失败。"
 
-#, fuzzy
-#~ msgid "Could not start `%s' process to copy configuration file.\n"
-#~ msgstr "找不到主机“%s”的 IP：%s\n"
-
 #, fuzzy
 #~ msgid "Failed to copy new configuration to remote machine."
 #~ msgstr "保存配置失败。"
@@ -7002,10 +9742,6 @@ msgstr ""
 #~ msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 #~ msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#, fuzzy
-#~ msgid "Could not read hostkeys file `%s'!\n"
-#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
 #, fuzzy
 #~ msgid "Could not create configuration for peer number %u on `%s'!\n"
 #~ msgstr "解析配置文件“%s”失败\n"
@@ -7022,10 +9758,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"
@@ -7042,10 +9774,6 @@ msgstr ""
 #~ msgid "access (%s, X_OK) failed: %s\n"
 #~ msgstr "“%s”说：%s\n"
 
-#, fuzzy
-#~ msgid "stat (%s) failed: %s\n"
-#~ msgstr "“%s”说：%s\n"
-
 #, fuzzy
 #~ msgid "# Peers connected"
 #~ msgstr ""
@@ -7072,10 +9800,6 @@ msgstr ""
 #~ msgid "Failed during blacklist file copying!\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
-#, fuzzy
-#~ msgid "Failed to connect to statistics service!\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
 #, fuzzy
 #~ msgid "Could not access file: %s\n"
 #~ msgstr "错误：无法访问服务：%s\n"
@@ -7360,9 +10084,6 @@ msgstr ""
 #~ msgid "Invalid input, expecting integer."
 #~ msgstr "无效输入，应为整数。"
 
-#~ msgid "Value is not in legal range."
-#~ msgstr "值不在合法范围内。"
-
 #~ msgid "Configuration unchanged, no need to save.\n"
 #~ msgstr "配置未更改，无须保存。\n"
 
@@ -7443,9 +10164,6 @@ msgstr ""
 #~ msgid "Too many arguments.\n"
 #~ msgstr "参数过多。\n"
 
-#~ msgid "No interface specified, using default.\n"
-#~ msgstr "没有指定接口，将使用默认。\n"
-
 #~ msgid "Configuration file `%s' must be a filename (but is a directory).\n"
 #~ msgstr "配置文件“%s”必须是一个文件名(但是一个目录)。\n"
 
@@ -7604,9 +10322,6 @@ msgstr ""
 #~ msgid "No interface specified in section `%s' under `%s'!\n"
 #~ msgstr "“%2$s”下的“%1$s”节中没有指定接口！\n"
 
-#~ msgid "Could not obtain IP for interface `%s' using `%s'.\n"
-#~ msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
-
 #~ msgid ""
 #~ "Could not find interface `%s' using `%s', trying to find another "
 #~ "interface.\n"
@@ -7650,9 +10365,6 @@ msgstr ""
 #~ msgid "Deadlock due to `%s'.\n"
 #~ msgstr "“%s”造成了死锁。\n"
 
-#~ msgid "GNUnet error log"
-#~ msgstr "GNUnet 错误日志"
-
 #, fuzzy
 #~ msgid "Out of memory (for logging)\n"
 #~ msgstr "(用于日志的)内存耗尽\n"
@@ -7671,24 +10383,15 @@ 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 "一个消息块中的消息数量"
 
 #~ msgid "Error establishing connection with gnunetd.\n"
 #~ msgstr "通过 gnunetd 建立连接失败。\n"
 
-#~ msgid "You must specify a receiver!\n"
-#~ msgstr "您必须指定一个接收方！\n"
-
 #~ msgid "Time:\n"
 #~ msgstr "时间：\n"
 
@@ -7721,9 +10424,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"