-disable unused services during test

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

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a1d067caaedf95c918e6aa5bb0d8afe68a4ce4d7..910ccba9900b1c49aaac7e6345a2769feeef4130 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"

-"POT-Creation-Date: 2013-12-23 23:34+0100\n"
+"POT-Creation-Date: 2014-06-04 18:25+0200\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"
 "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"


@@ -283,60 +283,60 @@ msgstr "无法创建用户账户："
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:690
+#: src/arm/gnunet-service-arm.c:695

 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:826
+#: src/arm/gnunet-service-arm.c:831

 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:1095
+#: src/arm/gnunet-service-arm.c:1100

 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:1188
+#: src/arm/gnunet-service-arm.c:1193

 msgid "exit"
 msgstr ""
 
 msgid "exit"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:1193
+#: src/arm/gnunet-service-arm.c:1198

 msgid "signal"
 msgstr ""
 
 msgid "signal"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:1198
+#: src/arm/gnunet-service-arm.c:1203

 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 

-#: src/arm/gnunet-service-arm.c:1204
+#: src/arm/gnunet-service-arm.c:1209

 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 

-#: src/arm/gnunet-service-arm.c:1226
+#: src/arm/gnunet-service-arm.c:1231

 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:1241
+#: src/arm/gnunet-service-arm.c:1246

 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:1495
+#: src/arm/gnunet-service-arm.c:1500

 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 

-#: src/arm/gnunet-service-arm.c:1506
+#: src/arm/gnunet-service-arm.c:1511

 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:1519
+#: src/arm/gnunet-service-arm.c:1524

 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""


@@ -345,244 +345,410 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 

-#: src/ats/ats_api_performance.c:468
+#: src/ats/ats_api_performance.c:485

 #, c-format
 msgid "Received %s message\n"
 msgstr ""
 
 #, c-format
 msgid "Received %s message\n"
 msgstr ""
 

-#: src/ats/ats_api_performance.c:511
+#: src/ats/ats_api_performance.c:528

 #, c-format
 msgid "Received last message for %s \n"
 msgstr ""
 
 #, c-format
 msgid "Received last message for %s \n"
 msgstr ""
 

-#: src/ats/gnunet-service-ats_addresses.c:1944
-#: src/ats/gnunet-service-ats_addresses.c:1988
+#: src/ats/gnunet-ats-solver-eval.c:2793 src/ats/gnunet-ats-solver-eval.c:2827
+#: src/ats/gnunet-service-ats_addresses.c:1675
+#: src/ats/gnunet-service-ats_addresses.c:1719

 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 

-#: src/ats/gnunet-service-ats_addresses.c:1951
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#: src/ats/gnunet-service-ats_addresses.c:1682

 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 

-#: src/ats/gnunet-service-ats_addresses.c:1959
+#: src/ats/gnunet-ats-solver-eval.c:2806
+#: src/ats/gnunet-service-ats_addresses.c:1690

 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 

-#: src/ats/gnunet-service-ats_addresses.c:1995
+#: src/ats/gnunet-ats-solver-eval.c:2833
+#: src/ats/gnunet-service-ats_addresses.c:1726

 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 

-#: src/ats/gnunet-service-ats_addresses.c:2003
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#: src/ats/gnunet-service-ats_addresses.c:1734

 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 

-#: src/ats/gnunet-service-ats_addresses.c:2173
+#: src/ats/gnunet-ats-solver-eval.c:3397
+#: src/ats-tests/gnunet-solver-eval.c:919
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3400
+#: src/ats-tests/gnunet-solver-eval.c:922
+#: src/ats-tests/gnunet-solver-eval.c:925
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3403
+msgid "be verbose"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3406
+#, fuzzy
+msgid "print logging"
+msgstr "未知的命令“%s”。\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3409
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3412
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1912

 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 

-#: src/ats/gnunet-service-ats_addresses.c:2176
+#: src/ats/gnunet-service-ats_addresses.c:1915

 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 

-#: src/ats/gnunet-service-ats_addresses.c:2199
+#: src/ats/gnunet-service-ats_addresses.c:1938

 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 

-#: src/ats/plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:949

 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 

-#: src/ats/plugin_ats_mlp.c:1281
+#: src/ats/plugin_ats_mlp.c:1542

 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 

-#: src/ats/plugin_ats_mlp.c:1328
+#: src/ats/plugin_ats_mlp.c:1589

 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 

-#: src/ats/plugin_ats_mlp.c:2059
+#: src/ats/plugin_ats_mlp.c:2299
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2339 src/ats/plugin_ats_mlp.c:2356
+#: src/ats/plugin_ats_mlp.c:2388 src/ats/plugin_ats_mlp.c:2406
+#: src/ats/plugin_ats_mlp.c:2425 src/ats/plugin_ats_proportional.c:458
+#: src/ats/plugin_ats_proportional.c:475 src/ats/plugin_ats_ril.c:2220
+#: src/ats/plugin_ats_ril.c:2237 src/ats/plugin_ats_ril.c:2254
+#: src/ats/plugin_ats_ril.c:2271 src/ats/plugin_ats_ril.c:2288
+#: src/ats/plugin_ats_ril.c:2305 src/ats/plugin_ats_ril.c:2322
+#: src/ats/plugin_ats_ril.c:2339
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/ats/plugin_ats_mlp.c:2512

 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 

-#: src/ats/plugin_ats_mlp.c:2067
+#: src/ats/plugin_ats_mlp.c:2521

 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 

-#: src/ats/plugin_ats_mlp.c:2077
+#: src/ats/plugin_ats_mlp.c:2532

 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 

-#: src/ats/plugin_ats_mlp.c:2085
+#: src/ats/plugin_ats_mlp.c:2540

 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 

-#: src/ats/plugin_ats_mlp.c:2096
+#: src/ats/plugin_ats_mlp.c:2551

 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 

-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_proportional.c:1819

 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 

-#: src/ats-tool/gnunet-ats.c:145
+#: 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:673
+#, 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:169

 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:147
+#: src/ats-tool/gnunet-ats.c:171

 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:205
+#: src/ats-tool/gnunet-ats.c:258

 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:333
+#: src/ats-tool/gnunet-ats.c:467

 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
-#: src/transport/gnunet-transport.c:829
+#: src/ats-tool/gnunet-ats.c:487 src/namestore/gnunet-namestore.c:639
+#: src/transport/gnunet-transport.c:1349

 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 

-#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:838
+#: src/ats-tool/gnunet-ats.c:499 src/transport/gnunet-transport.c:1358

 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/ats-tool/gnunet-ats.c:372
+#: src/ats-tool/gnunet-ats.c:508

 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:407
-#: src/ats-tool/gnunet-ats.c:424 src/ats-tool/gnunet-ats.c:462
+#: src/ats-tool/gnunet-ats.c:524 src/ats-tool/gnunet-ats.c:543
+#: src/ats-tool/gnunet-ats.c:560 src/ats-tool/gnunet-ats.c:597

 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/ats-tool/gnunet-ats.c:397 src/ats-tool/gnunet-ats.c:414
+#: src/ats-tool/gnunet-ats.c:532 src/ats-tool/gnunet-ats.c:549

 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/ats-tool/gnunet-ats.c:432
+#: src/ats-tool/gnunet-ats.c:569

 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #, fuzzy, c-format
 msgid "No preference type given!\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 

-#: src/ats-tool/gnunet-ats.c:437
+#: src/ats-tool/gnunet-ats.c:574

 #, c-format
 msgid "No peer given!\n"
 msgstr ""
 
 #, c-format
 msgid "No peer given!\n"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:455
+#: src/ats-tool/gnunet-ats.c:590

 msgid "Valid type required\n"
 msgstr ""
 
 msgid "Valid type required\n"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:513
+#: src/ats-tool/gnunet-ats.c:648

 msgid "get list of active addresses currently used"
 msgstr ""
 
 msgid "get list of active addresses currently used"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:516
+#: src/ats-tool/gnunet-ats.c:650

 msgid "get list of all active addresses"
 msgstr ""
 
 msgid "get list of all active addresses"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:519
+#: src/ats-tool/gnunet-ats.c:653

 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 

-#: src/ats-tool/gnunet-ats.c:522
+#: src/ats-tool/gnunet-ats.c:655

 msgid "monitor mode"
 msgstr ""
 
 msgid "monitor mode"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:525
+#: src/ats-tool/gnunet-ats.c:657

 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 

-#: src/ats-tool/gnunet-ats.c:528
+#: src/ats-tool/gnunet-ats.c:659

 msgid "print all configured quotas"
 msgstr ""
 
 msgid "print all configured quotas"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:531
+#: src/ats-tool/gnunet-ats.c:661

 msgid "peer id"
 msgstr ""
 
 msgid "peer id"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:534
+#: src/ats-tool/gnunet-ats.c:664

 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:537
+#: src/ats-tool/gnunet-ats.c:666

 msgid "preference value"
 msgstr ""
 
 msgid "preference value"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:540
+#: src/ats-tool/gnunet-ats.c:669

 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 

-#: src/ats-tool/gnunet-ats.c:549
+#: src/ats-tool/gnunet-ats.c:676

 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 

-#: src/consensus/gnunet-consensus-profiler.c:420
+#: src/cadet/gnunet-cadet.c:357
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/cadet/gnunet-cadet.c:607
+#, fuzzy, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/cadet/gnunet-cadet.c:650
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/cadet/gnunet-cadet.c:716
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:807
+#, fuzzy
+msgid "provide information about a particular connection"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cadet/gnunet-cadet.c:810
+msgid "activate echo mode"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:816
+msgid "port to listen to (default; 0)"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:819
+#, fuzzy
+msgid "provide information about a patricular peer"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cadet/gnunet-cadet.c:822
+#, fuzzy
+msgid "provide information about all peers"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cadet/gnunet-cadet.c:825
+#, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cadet/gnunet-cadet.c:828
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/cadet/gnunet-service-cadet_peer.c:429
+msgid "Wrong CORE service\n"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:437
+#: src/secretsharing/gnunet-secretsharing-profiler.c:610

 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
 
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
 

-#: src/consensus/gnunet-consensus-profiler.c:423
+#: src/consensus/gnunet-consensus-profiler.c:440

 msgid "how many peers receive one value?"
 msgstr ""
 
 msgid "how many peers receive one value?"
 msgstr ""
 

-#: src/consensus/gnunet-consensus-profiler.c:426
+#: src/consensus/gnunet-consensus-profiler.c:443

 #: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
 #: src/set/gnunet-set-profiler.c:292
 #, fuzzy
 msgid "number of values"
 msgstr "迭代次数"
 
 #: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
 #: src/set/gnunet-set-profiler.c:292
 #, fuzzy
 msgid "number of values"
 msgstr "迭代次数"
 

-#: src/consensus/gnunet-consensus-profiler.c:429
+#: src/consensus/gnunet-consensus-profiler.c:446

 msgid "consensus timeout"
 msgstr ""
 
 msgid "consensus timeout"
 msgstr ""
 

-#: src/consensus/gnunet-consensus-profiler.c:432
+#: src/consensus/gnunet-consensus-profiler.c:449
+msgid "delay until consensus starts"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:452
+#: src/secretsharing/gnunet-secretsharing-profiler.c:625

 msgid "be more verbose (print received values)"
 msgstr ""
 
 msgid "be more verbose (print received values)"
 msgstr ""
 


@@ -591,254 +757,264 @@ msgstr ""
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:252
+#: src/conversation/conversation_api.c:681
+#, fuzzy
+msgid "number too large"
+msgstr "迭代次数"
+
+#: src/conversation/gnunet-conversation.c:264

 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:274
+#: src/conversation/gnunet-conversation.c:286

 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:307
+#: src/conversation/gnunet-conversation.c:319

 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:312
+#: src/conversation/gnunet-conversation.c:324

 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:330
+#: src/conversation/gnunet-conversation.c:342

 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:344
+#: src/conversation/gnunet-conversation.c:356

 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "发送消息失败。\n"
 
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "发送消息失败。\n"
 

-#: src/conversation/gnunet-conversation.c:356
+#: src/conversation/gnunet-conversation.c:368

 #, c-format
 msgid ""
 "Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:390

 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:385
+#: src/conversation/gnunet-conversation.c:397

 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/conversation/gnunet-conversation.c:392
+#: src/conversation/gnunet-conversation.c:404

 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/conversation/gnunet-conversation.c:399
+#: src/conversation/gnunet-conversation.c:411

 msgid "Call terminated\n"
 msgstr ""
 
 msgid "Call terminated\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:405
+#: src/conversation/gnunet-conversation.c:417

 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:411
+#: src/conversation/gnunet-conversation.c:423

 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:416
+#: src/conversation/gnunet-conversation.c:428

 msgid "Error with the call, restarting it\n"
 msgstr ""
 
 msgid "Error with the call, restarting it\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:483
+#: src/conversation/gnunet-conversation.c:495

 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 

-#: src/conversation/gnunet-conversation.c:499
-#: src/conversation/gnunet-conversation.c:513
+#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:525

 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:506
-#: src/conversation/gnunet-conversation.c:563
+#: src/conversation/gnunet-conversation.c:518
+#: src/conversation/gnunet-conversation.c:575

 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:521
-#: src/conversation/gnunet-conversation.c:576
+#: src/conversation/gnunet-conversation.c:533
+#: src/conversation/gnunet-conversation.c:588

 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:532
+#: src/conversation/gnunet-conversation.c:544

 msgid "Call recipient missing.\n"
 msgstr ""
 
 msgid "Call recipient missing.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:587
+#: src/conversation/gnunet-conversation.c:599

 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:604
+#: src/conversation/gnunet-conversation.c:616

 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:632
+#: src/conversation/gnunet-conversation.c:647

 msgid "We currently do not have an address.\n"
 msgstr ""
 
 msgid "We currently do not have an address.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:655
+#: src/conversation/gnunet-conversation.c:670

 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:660
+#: src/conversation/gnunet-conversation.c:675

 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:666
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:681
+#: src/conversation/gnunet-conversation.c:705

 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:671
+#: src/conversation/gnunet-conversation.c:686

 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:680
+#: src/conversation/gnunet-conversation.c:695

 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 

-#: src/conversation/gnunet-conversation.c:685
+#: src/conversation/gnunet-conversation.c:700

 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:704
+#: src/conversation/gnunet-conversation.c:719

 msgid "Calls waiting:\n"
 msgstr ""
 
 msgid "Calls waiting:\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:710
+#: src/conversation/gnunet-conversation.c:725

 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 

-#: src/conversation/gnunet-conversation.c:738

 #: src/conversation/gnunet-conversation.c:753
 #: src/conversation/gnunet-conversation.c:753

+#: src/conversation/gnunet-conversation.c:768

 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:786
-#: src/conversation/gnunet-conversation.c:802
+#: src/conversation/gnunet-conversation.c:801
+#: src/conversation/gnunet-conversation.c:817

 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:809
+#: src/conversation/gnunet-conversation.c:824

 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:818
+#: src/conversation/gnunet-conversation.c:833

 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:835
+#: src/conversation/gnunet-conversation.c:850

 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:870
+#: src/conversation/gnunet-conversation.c:885

 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:878
+#: src/conversation/gnunet-conversation.c:893

 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:895
+#: src/conversation/gnunet-conversation.c:910

 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:922
+#: src/conversation/gnunet-conversation.c:937

 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:924
+#: src/conversation/gnunet-conversation.c:939

 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:926
+#: src/conversation/gnunet-conversation.c:941

 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:928
+#: src/conversation/gnunet-conversation.c:943

 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:930
+#: src/conversation/gnunet-conversation.c:945

 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 ""
 
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:932
+#: src/conversation/gnunet-conversation.c:947

 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:934
+#: src/conversation/gnunet-conversation.c:949

 msgid "Use `/status' to print status information"
 msgstr ""
 
 msgid "Use `/status' to print status information"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:936
+#: src/conversation/gnunet-conversation.c:951

 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:938
+#: src/conversation/gnunet-conversation.c:953

 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:1093
+#: src/conversation/gnunet-conversation.c:1151

 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "发送消息失败。\n"
 
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "发送消息失败。\n"
 

-#: src/conversation/gnunet-conversation.c:1106
+#: src/conversation/gnunet-conversation.c:1164

 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:1141
+#: src/conversation/gnunet-conversation.c:1199

 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "您必须指定一个昵称\n"
 
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "您必须指定一个昵称\n"
 

-#: src/conversation/gnunet-conversation.c:1167
+#: src/conversation/gnunet-conversation.c:1223
+#, fuzzy
+msgid "Failed to start gnunet-helper-w32-console\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/conversation/gnunet-conversation.c:1249

 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:1170
+#: src/conversation/gnunet-conversation.c:1252

 msgid "sets the LINE to use for the phone"
 msgstr ""
 
 msgid "sets the LINE to use for the phone"
 msgstr ""
 

-#: src/conversation/gnunet-conversation.c:1185
+#: src/conversation/gnunet-conversation.c:1276

 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 


@@ -865,130 +1041,150 @@ msgid ""
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:248
 msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:248

-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522

 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
 
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-playback.c:137
+#: src/conversation/gnunet-helper-audio-playback.c:305

 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
 #, fuzzy, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr "“%s”说：%s\n"
 

-#: src/conversation/gnunet-helper-audio-playback.c:186
+#: src/conversation/gnunet-helper-audio-playback.c:587

 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-playback.c:211
-#: src/conversation/gnunet-helper-audio-record.c:362
+#: src/conversation/gnunet-helper-audio-playback.c:612
+#: src/conversation/gnunet-helper-audio-record.c:545

 msgid "Connection established.\n"
 msgstr ""
 
 msgid "Connection established.\n"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-playback.c:216
-#: src/conversation/gnunet-helper-audio-record.c:367
+#: src/conversation/gnunet-helper-audio-playback.c:617
+#: src/conversation/gnunet-helper-audio-record.c:550

 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "“%s”说：%s\n"
 

-#: src/conversation/gnunet-helper-audio-playback.c:230
+#: src/conversation/gnunet-helper-audio-playback.c:631

 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-playback.c:243
-#: src/conversation/gnunet-helper-audio-record.c:393
+#: src/conversation/gnunet-helper-audio-playback.c:644
+#: src/conversation/gnunet-helper-audio-record.c:576

 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/conversation/gnunet-helper-audio-playback.c:264
-#: src/conversation/gnunet-helper-audio-record.c:416
+#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-record.c:599

 msgid "Wrong Spec\n"
 msgstr ""
 
 msgid "Wrong Spec\n"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-playback.c:270
-#: src/conversation/gnunet-helper-audio-record.c:422
+#: src/conversation/gnunet-helper-audio-playback.c:671
+#: src/conversation/gnunet-helper-audio-record.c:605

 msgid "pa_mainloop_new() failed.\n"
 msgstr ""
 
 msgid "pa_mainloop_new() failed.\n"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-playback.c:284
-#: src/conversation/gnunet-helper-audio-record.c:437
+#: src/conversation/gnunet-helper-audio-playback.c:685
+#: src/conversation/gnunet-helper-audio-record.c:620

 msgid "pa_context_new() failed.\n"
 msgstr ""
 
 msgid "pa_context_new() failed.\n"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-playback.c:291
-#: src/conversation/gnunet-helper-audio-record.c:443
+#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-record.c:626

 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "“%s”说：%s\n"
 

-#: src/conversation/gnunet-helper-audio-playback.c:297
-#: src/conversation/gnunet-helper-audio-record.c:449
+#: src/conversation/gnunet-helper-audio-playback.c:698
+#: src/conversation/gnunet-helper-audio-record.c:632

 msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 
 msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-playback.c:366
+#: src/conversation/gnunet-helper-audio-playback.c:768

 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-record.c:237
+#: src/conversation/gnunet-helper-audio-playback-gst.c:325
+#, c-format
+msgid "Read error from STDIN: %d %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:344
+#, fuzzy, c-format
+msgid "opus_encode_float() failed: %s. Aborting\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:420

 #, fuzzy, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
 #, fuzzy, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr "“%s”说：%s\n"
 

-#: src/conversation/gnunet-helper-audio-record.c:275
+#: src/conversation/gnunet-helper-audio-record.c:458

 msgid "Got signal, exiting.\n"
 msgstr ""
 
 msgid "Got signal, exiting.\n"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-record.c:300
+#: src/conversation/gnunet-helper-audio-record.c:483

 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/conversation/gnunet-helper-audio-record.c:305
+#: src/conversation/gnunet-helper-audio-record.c:488

 #, fuzzy, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
 #, fuzzy, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "“%s”说：%s\n"
 

-#: src/conversation/gnunet-helper-audio-record.c:313
+#: src/conversation/gnunet-helper-audio-record.c:496

 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-record.c:317
+#: src/conversation/gnunet-helper-audio-record.c:500

 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-record.c:324
+#: src/conversation/gnunet-helper-audio-record.c:507

 #, fuzzy, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/conversation/gnunet-helper-audio-record.c:333
+#: src/conversation/gnunet-helper-audio-record.c:516

 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 

-#: src/conversation/gnunet-helper-audio-record.c:380
+#: src/conversation/gnunet-helper-audio-record.c:563

 #, fuzzy, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
 #, fuzzy, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "“%s”说：%s\n"
 

-#: src/conversation/gnunet-service-conversation.c:841
-msgid "Mesh audio channel not ready; audio data dropped\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:852
+msgid "Cadet audio channel not ready; audio data dropped\n"

 msgstr ""
 
 msgstr ""
 

-#: src/conversation/gnunet-service-conversation.c:932
+#: src/conversation/gnunet-service-conversation.c:943

 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 

-#: src/conversation/gnunet-service-conversation.c:1338
+#: src/conversation/gnunet-service-conversation.c:1349

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Received incoming channel on port %u\n"
+msgid "Received incoming Cadet channel on port %u\n"

 msgstr "“%s”已连接到“%s”。\n"
 
 #: src/conversation/microphone.c:121
 msgstr "“%s”已连接到“%s”。\n"
 
 #: src/conversation/microphone.c:121


@@ -1005,243 +1201,279 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 

-#: src/core/core_api.c:765
+#: src/core/core_api.c:768

 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 

-#: src/core/gnunet-core.c:80
-#, c-format
-msgid "Peer `%s'\n"
+#: src/core/gnunet-core.c:92
+#, fuzzy
+msgid "fresh connection"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/core/gnunet-core.c:95
+msgid "key sent"

 msgstr ""
 
 msgstr ""
 

-#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:609 src/transport/gnunet-transport.c:634
-#, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+#: src/core/gnunet-core.c:98
+msgid "key received"

 msgstr ""
 
 msgstr ""
 

-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:611
+#: src/core/gnunet-core.c:101

 #, fuzzy
 #, fuzzy

-msgid "Connected to"
-msgstr "“%s”已连接到“%s”。\n"
+msgid "connection established"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"

 
 

-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:636
+#: src/core/gnunet-core.c:104
+msgid "rekeying"
+msgstr ""
+
+#: src/core/gnunet-core.c:107

 #, fuzzy
 #, fuzzy

-msgid "Disconnected from"
+msgid "disconnected"

 msgstr "“%s”已连接到“%s”。\n"
 
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:114
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: 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/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:705

 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 

-#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1028
+#: 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:1590

 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 

-#: src/core/gnunet-core.c:212
+#: src/core/gnunet-core.c:188

 msgid "Print information about connected peers."
 msgstr ""
 
 msgid "Print information about connected peers."
 msgstr ""
 

-#: src/core/gnunet-service-core.c:105
+#: src/core/gnunet-service-core.c:104

 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 

-#: src/core/gnunet-service-core.c:126
+#: src/core/gnunet-service-core.c:128

 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 

-#: src/core/gnunet-service-core_clients.c:370
+#: src/core/gnunet-service-core_clients.c:372

 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 

-#: src/core/gnunet-service-core_clients.c:475
+#: src/core/gnunet-service-core_clients.c:483

 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 

-#: src/core/gnunet-service-core_clients.c:518
+#: src/core/gnunet-service-core_clients.c:529

 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:535
+#: src/core/gnunet-service-core_kx.c:549

 msgid "# bytes encrypted"
 msgstr ""
 
 msgid "# bytes encrypted"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:586
+#: src/core/gnunet-service-core_kx.c:601

 msgid "# bytes decrypted"
 msgstr ""
 
 msgid "# bytes decrypted"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:672
+#: src/core/gnunet-service-core_kx.c:688

 msgid "# key exchanges initiated"
 msgstr ""
 
 msgid "# key exchanges initiated"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:712
+#: src/core/gnunet-service-core_kx.c:732

 msgid "# key exchanges stopped"
 msgstr ""
 
 msgid "# key exchanges stopped"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:809
+#: src/core/gnunet-service-core_kx.c:832

 msgid "# old ephemeral keys ignored"
 msgstr ""
 
 msgid "# old ephemeral keys ignored"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:815
+#: src/core/gnunet-service-core_kx.c:839

 msgid "# ephemeral keys received"
 msgstr ""
 
 msgid "# ephemeral keys received"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:849
+#: src/core/gnunet-service-core_kx.c:873

 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:860
+#: src/core/gnunet-service-core_kx.c:884

 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:950
-#: src/transport/gnunet-service-transport_validation.c:974
+#: src/core/gnunet-service-core_kx.c:983
+#: src/transport/gnunet-service-transport_validation.c:1016

 msgid "# PING messages received"
 msgstr ""
 
 msgid "# PING messages received"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:991

 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:985
+#: src/core/gnunet-service-core_kx.c:1018

 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1002
+#: src/core/gnunet-service-core_kx.c:1035

 msgid "# PONG messages created"
 msgstr ""
 
 msgid "# PONG messages created"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1028
+#: src/core/gnunet-service-core_kx.c:1061

 msgid "# sessions terminated by timeout"
 msgstr ""
 
 msgid "# sessions terminated by timeout"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1038
+#: src/core/gnunet-service-core_kx.c:1072

 msgid "# keepalive messages sent"
 msgstr ""
 
 msgid "# keepalive messages sent"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1095
-#: src/transport/gnunet-service-transport_validation.c:1285
+#: src/core/gnunet-service-core_kx.c:1139
+#: src/transport/gnunet-service-transport_validation.c:1328

 msgid "# PONG messages received"
 msgstr ""
 
 msgid "# PONG messages received"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1101
+#: src/core/gnunet-service-core_kx.c:1145

 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1106
+#: src/core/gnunet-service-core_kx.c:1150

 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1136
+#: src/core/gnunet-service-core_kx.c:1180

 msgid "# PONG messages decrypted"
 msgstr ""
 
 msgid "# PONG messages decrypted"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1170
+#: src/core/gnunet-service-core_kx.c:1215

 msgid "# session keys confirmed via PONG"
 msgstr ""
 
 msgid "# session keys confirmed via PONG"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1180
+#: src/core/gnunet-service-core_kx.c:1226

 msgid "# timeouts prevented via PONG"
 msgstr ""
 
 msgid "# timeouts prevented via PONG"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1187
+#: src/core/gnunet-service-core_kx.c:1233

 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1327
+#: src/core/gnunet-service-core_kx.c:1374

 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1334
+#: src/core/gnunet-service-core_kx.c:1381

 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1337
+#: src/core/gnunet-service-core_kx.c:1384

 msgid "# sessions terminated by key expiration"
 msgstr ""
 
 msgid "# sessions terminated by key expiration"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1382
-#: src/core/gnunet-service-core_kx.c:1407
+#: src/core/gnunet-service-core_kx.c:1430
+#: src/core/gnunet-service-core_kx.c:1455

 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1394
+#: src/core/gnunet-service-core_kx.c:1442

 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1436
+#: src/core/gnunet-service-core_kx.c:1484

 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1444
+#: src/core/gnunet-service-core_kx.c:1492

 msgid "# bytes of payload decrypted"
 msgstr ""
 
 msgid "# bytes of payload decrypted"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1479
+#: src/core/gnunet-service-core_kx.c:1527

 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 

-#: src/core/gnunet-service-core_neighbours.c:163
+#: src/core/gnunet-service-core_neighbours.c:168

 msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
 msgid "# sessions terminated by transport disconnect"
 msgstr ""
 

-#: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:329
+#: src/core/gnunet-service-core_neighbours.c:184
+#: src/core/gnunet-service-core_neighbours.c:335

 msgid "# neighbour entries allocated"
 msgstr ""
 
 msgid "# neighbour entries allocated"
 msgstr ""
 

-#: src/core/gnunet-service-core_neighbours.c:246
+#: src/core/gnunet-service-core_neighbours.c:252

 msgid "# encrypted bytes given to transport"
 msgstr ""
 
 msgid "# encrypted bytes given to transport"
 msgstr ""
 

-#: src/core/gnunet-service-core_neighbours.c:412
+#: src/core/gnunet-service-core_neighbours.c:418

 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 

-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:278
+#: 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/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727

-#: src/dht/gnunet-service-xdht_neighbours.c:662
-#: src/dht/gnunet-service-xdht_neighbours.c:727
-#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
-#: src/topology/gnunet-daemon-topology.c:706
-#: src/topology/gnunet-daemon-topology.c:807
-#: src/transport/gnunet-service-transport_neighbours.c:929
-#: src/transport/gnunet-service-transport_neighbours.c:1161
-#: src/transport/gnunet-service-transport_neighbours.c:1170
-#: src/transport/gnunet-service-transport_neighbours.c:3015
-#: src/transport/gnunet-service-transport_neighbours.c:3291
+#: src/dht/gnunet-service-xdht_neighbours.c:3586
+#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
+#: src/topology/gnunet-daemon-topology.c:707
+#: src/topology/gnunet-daemon-topology.c:808
+#: src/transport/gnunet-service-transport_neighbours.c:917
+#: src/transport/gnunet-service-transport_neighbours.c:1141
+#: src/transport/gnunet-service-transport_neighbours.c:3146
+#: src/transport/gnunet-service-transport_neighbours.c:3449

 msgid "# peers connected"
 msgstr ""
 
 msgid "# peers connected"
 msgstr ""
 

-#: src/core/gnunet-service-core_sessions.c:246
+#: src/core/gnunet-service-core_sessions.c:278

 msgid "# type map refreshes sent"
 msgstr ""
 
 msgid "# type map refreshes sent"
 msgstr ""
 

-#: src/core/gnunet-service-core_sessions.c:415
+#: src/core/gnunet-service-core_sessions.c:394
+#, fuzzy
+msgid "# outdated typemap confirmations received"
+msgstr "保存配置失败。"
+
+#: 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 ""
 
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 

-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
+#: src/core/gnunet-service-core_typemap.c:169
+#: src/core/gnunet-service-core_typemap.c:180

 msgid "# type maps received"
 msgstr ""
 
 msgid "# type maps received"
 msgstr ""
 

-#: src/core/gnunet-service-core_typemap.c:151
+#: src/core/gnunet-service-core_typemap.c:210

 msgid "# updates to my type map"
 msgstr ""
 
 msgid "# updates to my type map"
 msgstr ""
 


@@ -1299,9 +1531,13 @@ msgstr ""
 #: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.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/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51

-#: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
-#: src/scalarproduct/scalarproduct.h:61
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:44

 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"


@@ -1311,7 +1547,7 @@ msgid "Sqlite datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:484
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:484

-#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/datastore/plugin_datastore_sqlite.c:404

 #: src/namecache/plugin_namecache_sqlite.c:295
 #: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 #: src/namecache/plugin_namecache_sqlite.c:295
 #: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"


@@ -1350,7 +1586,7 @@ msgstr ""
 msgid "# datastore connections (re)created"
 msgstr ""
 
 msgid "# datastore connections (re)created"
 msgstr ""
 

-#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
+#: src/datastore/datastore_api.c:616

 msgid "# transmission request failures"
 msgstr ""
 
 msgid "# transmission request failures"
 msgstr ""
 


@@ -1616,35 +1852,39 @@ msgid "Postgres database running\n"
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:57
 msgstr ""
 
 #: 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"
 
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 

-#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/datastore/plugin_datastore_sqlite.c:255

 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204

+#: src/peerstore/plugin_peerstore_sqlite.c:434

 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
 #: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
 

-#: src/datastore/plugin_datastore_sqlite.c:649
+#: src/datastore/plugin_datastore_sqlite.c:663

 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 

-#: src/datastore/plugin_datastore_sqlite.c:1135
+#: src/datastore/plugin_datastore_sqlite.c:1156

 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 

-#: src/datastore/plugin_datastore_sqlite.c:1154
+#: src/datastore/plugin_datastore_sqlite.c:1175

 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 

-#: src/datastore/plugin_datastore_sqlite.c:1194
+#: src/datastore/plugin_datastore_sqlite.c:1215

 #: src/namecache/plugin_namecache_sqlite.c:583
 #: src/namestore/plugin_namestore_sqlite.c:719
 #, fuzzy
 #: src/namecache/plugin_namecache_sqlite.c:583
 #: src/namestore/plugin_namestore_sqlite.c:719
 #, fuzzy


@@ -1660,48 +1900,48 @@ msgstr ""
 msgid "Failed to connect to the DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 msgid "Failed to connect to the DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/dht/gnunet-dht-get.c:132
+#: src/dht/gnunet-dht-get.c:133

 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:156
+#: src/dht/gnunet-dht-get.c:159

 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#: 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"
 
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/dht/gnunet-dht-get.c:170
+#: src/dht/gnunet-dht-get.c:173

 msgid "Issueing DHT GET with key"
 msgstr ""
 
 msgid "Issueing DHT GET with key"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: 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/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:189
+#: src/dht/gnunet-dht-get.c:192

 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265

 msgid "the type of data to look for"
 msgstr ""
 
 msgid "the type of data to look for"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
+#: 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 ""
 
 msgid "how long to execute this query before giving up?"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201

 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271

 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168


@@ -1709,7 +1949,7 @@ msgstr ""
 msgid "be verbose (print progress information)"
 msgstr ""
 
 msgid "be verbose (print progress information)"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:222
+#: src/dht/gnunet-dht-get.c:225

 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 


@@ -1763,245 +2003,228 @@ msgstr ""
 msgid "the type to insert data as"
 msgstr ""
 
 msgid "the type to insert data as"
 msgstr ""
 

-#: src/dht/gnunet-dht-put.c:235
+#: src/dht/gnunet-dht-put.c:236

 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 

-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176

 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417

-#: src/dht/gnunet-service-xdht_clients.c:417
+#: src/dht/gnunet-service-xdht_clients.c:838

 msgid "# GET requests from clients injected"
 msgstr ""
 
 msgid "# GET requests from clients injected"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:511
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-dht_clients.c:513
+#: src/dht/gnunet-service-xdht_clients.c:925

 msgid "# PUT requests received from clients"
 msgstr ""
 
 msgid "# PUT requests received from clients"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:595
-#: src/dht/gnunet-service-xdht_clients.c:595
+#: src/dht/gnunet-service-dht_clients.c:597
+#: src/dht/gnunet-service-xdht_clients.c:1010

 msgid "# GET requests received from clients"
 msgstr ""
 
 msgid "# GET requests received from clients"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:796
-#: src/dht/gnunet-service-xdht_clients.c:796
+#: src/dht/gnunet-service-dht_clients.c:798
+#: src/dht/gnunet-service-xdht_clients.c:1211

 msgid "# GET STOP requests received from clients"
 msgstr ""
 
 msgid "# GET STOP requests received from clients"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:1037
-#: src/dht/gnunet-service-xdht_clients.c:1037
+#: src/dht/gnunet-service-dht_clients.c:1040
+#: src/dht/gnunet-service-xdht_clients.c:498

 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-xdht_clients.c:1050
+#: src/dht/gnunet-service-dht_clients.c:1053
+#: src/dht/gnunet-service-xdht_clients.c:511

 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:1087
-#: src/dht/gnunet-service-xdht_clients.c:1087
+#: src/dht/gnunet-service-dht_clients.c:1090
+#: src/dht/gnunet-service-xdht_clients.c:548

 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:1110
-#: src/dht/gnunet-service-xdht_clients.c:1110
+#: src/dht/gnunet-service-dht_clients.c:1113
+#: src/dht/gnunet-service-xdht_clients.c:571

 msgid "# RESULTS queued for clients"
 msgstr ""
 
 msgid "# RESULTS queued for clients"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:1164
-#: src/dht/gnunet-service-dht_clients.c:1206
-#: src/dht/gnunet-service-xdht_clients.c:1164
-#: src/dht/gnunet-service-xdht_clients.c:1206
+#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1210
+#: src/dht/gnunet-service-xdht_clients.c:625
+#: src/dht/gnunet-service-xdht_clients.c:668

 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:1174
-#: src/dht/gnunet-service-xdht_clients.c:1174
+#: src/dht/gnunet-service-dht_clients.c:1177
+#: src/dht/gnunet-service-xdht_clients.c:635

 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:68
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:68

-#: src/dht/gnunet-service-xdht_datacache.c:68
+#: src/dht/gnunet-service-xdht_datacache.c:69

 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:78
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:78

-#: src/dht/gnunet-service-xdht_datacache.c:78
+#: src/dht/gnunet-service-xdht_datacache.c:79

 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165

-#: src/dht/gnunet-service-xdht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:213

 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176

-#: src/dht/gnunet-service-xdht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:234

 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182

-#: src/dht/gnunet-service-xdht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:240

 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188

-#: src/dht/gnunet-service-xdht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:246

 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200

-#: src/dht/gnunet-service-xdht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:258

 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203

-#: src/dht/gnunet-service-xdht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:261

 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234

-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:298

 msgid "# GET requests given to datacache"
 msgstr ""
 
 msgid "# GET requests given to datacache"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84

 #: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:516
 #: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:516

-#: src/dht/gnunet-service-xdht_neighbours.c:516

 msgid "# Preference updates given to core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:610
 msgid "# Preference updates given to core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:610

-#: src/dht/gnunet-service-xdht_neighbours.c:610

 msgid "# FIND PEER messages initiated"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:764

-#: src/dht/gnunet-service-xdht_neighbours.c:764

 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:819

-#: src/dht/gnunet-service-xdht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:745

 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:857

-#: src/dht/gnunet-service-xdht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_neighbours.c:786

 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:889
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:889

-#: src/dht/gnunet-service-xdht_neighbours.c:889

 msgid "# requests TTL-dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1093
 #: src/dht/gnunet-service-dht_neighbours.c:1130
 msgid "# requests TTL-dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1093
 #: src/dht/gnunet-service-dht_neighbours.c:1130

-#: src/dht/gnunet-service-xdht_neighbours.c:1093
-#: src/dht/gnunet-service-xdht_neighbours.c:1130

 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1108
 #: src/dht/gnunet-service-dht_neighbours.c:1145
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1108
 #: src/dht/gnunet-service-dht_neighbours.c:1145

-#: src/dht/gnunet-service-xdht_neighbours.c:1108
-#: src/dht/gnunet-service-xdht_neighbours.c:1145

 msgid "# Peer selection failed"
 msgstr ""
 
 msgid "# Peer selection failed"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1287
-#: src/dht/gnunet-service-xdht_neighbours.c:1287
+#: src/dht/gnunet-service-dht_neighbours.c:1289

 msgid "# PUT requests routed"
 msgstr ""
 
 msgid "# PUT requests routed"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1316
-#: src/dht/gnunet-service-xdht_neighbours.c:1316
+#: src/dht/gnunet-service-dht_neighbours.c:1318

 msgid "# PUT messages queued for transmission"
 msgstr ""
 
 msgid "# PUT messages queued for transmission"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1323
-#: src/dht/gnunet-service-dht_neighbours.c:1440
-#: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:1323
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1543
+#: 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:843
+#: src/dht/gnunet-service-xdht_neighbours.c:910
+#: src/dht/gnunet-service-xdht_neighbours.c:980
+#: src/dht/gnunet-service-xdht_neighbours.c:1040
+#: src/dht/gnunet-service-xdht_neighbours.c:1098
+#: src/dht/gnunet-service-xdht_neighbours.c:1157
+#: src/dht/gnunet-service-xdht_neighbours.c:1218
+#: src/dht/gnunet-service-xdht_neighbours.c:1280
+#: src/dht/gnunet-service-xdht_neighbours.c:1341

 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1405
-#: src/dht/gnunet-service-xdht_neighbours.c:1405
+#: src/dht/gnunet-service-dht_neighbours.c:1414

 msgid "# GET requests routed"
 msgstr ""
 
 msgid "# GET requests routed"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1432
-#: src/dht/gnunet-service-xdht_neighbours.c:1432
+#: src/dht/gnunet-service-dht_neighbours.c:1441

 msgid "# GET messages queued for transmission"
 msgstr ""
 
 msgid "# GET messages queued for transmission"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1550
-#: src/dht/gnunet-service-xdht_neighbours.c:1550
+#: src/dht/gnunet-service-dht_neighbours.c:1564

 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1637
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
+#: src/dht/gnunet-service-dht_neighbours.c:1651

 msgid "# P2P PUT requests received"
 msgstr ""
 
 msgid "# P2P PUT requests received"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1640
-#: src/dht/gnunet-service-xdht_neighbours.c:1640
+#: src/dht/gnunet-service-dht_neighbours.c:1654

 msgid "# P2P PUT bytes received"
 msgstr ""
 
 msgid "# P2P PUT bytes received"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1803
-#: src/dht/gnunet-service-xdht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1821

 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1811
-#: src/dht/gnunet-service-xdht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1829

 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1904
-#: src/dht/gnunet-service-xdht_neighbours.c:1904
+#: src/dht/gnunet-service-dht_neighbours.c:1924

 msgid "# P2P GET requests received"
 msgstr ""
 
 msgid "# P2P GET requests received"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1907
-#: src/dht/gnunet-service-xdht_neighbours.c:1907
+#: src/dht/gnunet-service-dht_neighbours.c:1927

 msgid "# P2P GET bytes received"
 msgstr ""
 
 msgid "# P2P GET bytes received"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1961
-#: src/dht/gnunet-service-xdht_neighbours.c:1961
+#: src/dht/gnunet-service-dht_neighbours.c:1984

 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1975
-#: src/dht/gnunet-service-xdht_neighbours.c:1975
+#: src/dht/gnunet-service-dht_neighbours.c:1998

 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:2052
-#: src/dht/gnunet-service-xdht_neighbours.c:2052
+#: src/dht/gnunet-service-dht_neighbours.c:2083

 msgid "# P2P RESULTS received"
 msgstr ""
 
 msgid "# P2P RESULTS received"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:2055
-#: src/dht/gnunet-service-xdht_neighbours.c:2055
+#: src/dht/gnunet-service-dht_neighbours.c:2086

 msgid "# P2P RESULT bytes received"
 msgstr ""
 
 msgid "# P2P RESULT bytes received"
 msgstr ""
 


@@ -2010,42 +2233,34 @@ msgid "# Network size estimates received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:211
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:211

-#: src/dht/gnunet-service-xdht_routing.c:211

 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:220

-#: src/dht/gnunet-service-xdht_routing.c:220

 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:226
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:226

-#: src/dht/gnunet-service-xdht_routing.c:226

 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:232
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:232

-#: src/dht/gnunet-service-xdht_routing.c:232

 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:244
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:244

-#: src/dht/gnunet-service-xdht_routing.c:244

 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:317
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:317

-#: src/dht/gnunet-service-xdht_routing.c:317

 msgid "# Entries removed from routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:399
 msgid "# Entries removed from routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:399

-#: src/dht/gnunet-service-xdht_routing.c:399

 msgid "# Entries added to routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:417
 msgid "# Entries added to routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:417

-#: src/dht/gnunet-service-xdht_routing.c:417

 msgid "# DHT requests combined"
 msgstr ""
 
 msgid "# DHT requests combined"
 msgstr ""
 


@@ -2058,7 +2273,7 @@ msgstr ""
 msgid "Size mismatch for block\n"
 msgstr ""
 
 msgid "Size mismatch for block\n"
 msgstr ""
 

-#: src/dht/plugin_block_dht.c:154
+#: src/dht/plugin_block_dht.c:155

 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""


@@ -2159,12 +2374,12 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
+#: src/dns/gnunet-service-dns.c:1049

 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3594

 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"


@@ -2185,7 +2400,7 @@ msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy
 
 #: src/exit/gnunet-daemon-exit.c:853
 #, fuzzy

-msgid "# Bytes transmitted via mesh channels"
+msgid "# Bytes transmitted via cadet channels"

 msgstr ""
 "\n"
 "按任意键继续\n"
 msgstr ""
 "\n"
 "按任意键继续\n"


@@ -2250,14 +2465,14 @@ msgid "# TCP packets sent via TUN"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1872
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1872

-msgid "# TCP service creation requests received via mesh"
+msgid "# TCP service creation requests received via cadet"

 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
 #: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321
 #: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859
 #: src/exit/gnunet-daemon-exit.c:2966
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
 #: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321
 #: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859
 #: src/exit/gnunet-daemon-exit.c:2966

-msgid "# Bytes received from MESH"
+msgid "# Bytes received from CADET"

 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990


@@ -2270,11 +2485,11 @@ msgid "# TCP requests dropped (no such service)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1971
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:1971

-msgid "# TCP IP-exit creation requests received via mesh"
+msgid "# TCP IP-exit creation requests received via cadet"

 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2076
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2076

-msgid "# TCP data requests received via mesh"
+msgid "# TCP data requests received via cadet"

 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2090
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2090


@@ -2286,11 +2501,11 @@ msgid "# ICMP packets sent via TUN"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2324
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2324

-msgid "# ICMP IP-exit requests received via mesh"
+msgid "# ICMP IP-exit requests received via cadet"

 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2573
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2573

-msgid "# ICMP service requests received via mesh"
+msgid "# ICMP service requests received via cadet"

 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397


@@ -2308,11 +2523,11 @@ msgid "# UDP packets sent via TUN"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2862
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2862

-msgid "# UDP IP-exit requests received via mesh"
+msgid "# UDP IP-exit requests received via cadet"

 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2969
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2969

-msgid "# UDP service requests received via mesh"
+msgid "# UDP service requests received via cadet"

 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2995
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:2995


@@ -2320,68 +2535,76 @@ msgid "# UDP requests dropped (no such service)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:3031
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:3031

-msgid "# Inbound MESH channels created"
+#, fuzzy
+msgid "# Inbound CADET channels created"

 msgstr ""
 msgstr ""

+"\n"
+"按任意键继续\n"

 
 

-#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#: src/exit/gnunet-daemon-exit.c:3255 src/exit/gnunet-daemon-exit.c:3265

 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s：选项“%s”有歧义\n"
 
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s：选项“%s”有歧义\n"
 

-#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267
+#: src/exit/gnunet-daemon-exit.c:3279 src/exit/gnunet-daemon-exit.c:3287

 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3320

 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
+#: src/exit/gnunet-daemon-exit.c:3334 src/exit/gnunet-daemon-exit.c:3346

 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3357

 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3527
+#: src/exit/gnunet-daemon-exit.c:3534
+#, c-format
+msgid "`%s' must be installed SUID, EXIT will not work\n"
+msgstr ""
+
+#: 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 ""
 
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3535
+#: src/exit/gnunet-daemon-exit.c:3558

 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3542
+#: src/exit/gnunet-daemon-exit.c:3565

 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3548
+#: src/exit/gnunet-daemon-exit.c:3571

 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
+#: src/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/pt/gnunet-daemon-pt.c:1247
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3689

 msgid "Must be a number"
 msgstr ""
 
 msgid "Must be a number"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3813
+#: src/exit/gnunet-daemon-exit.c:3838

 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 


@@ -2466,36 +2689,31 @@ msgstr "“%s”的参数无效。\n"
 msgid "Cannot read experiments file `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
 msgid "Cannot read experiments file `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 

-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:219
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221

 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 

-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:307
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309

 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 

-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:451
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453

 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 

-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:889
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891

 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:919
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921

 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1102
-#, fuzzy
-msgid "Failed to connect to CORE service!\n"
-msgstr "初始化“%s”服务失败。\n"
-

 #: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"
 #: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
 #, c-format
 msgid "Peer `%s' did not respond to request for experiment `%s'\n"


@@ -2579,61 +2797,61 @@ msgstr "无法解析“%s”(%s)：%s\n"
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
 msgid "Short read reading from file `%s'!"
 msgstr ""
 

-#: src/fs/fs_api.c:1064
+#: src/fs/fs_api.c:1066

 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_api.c:1569
+#: src/fs/fs_api.c:1571

 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 

-#: src/fs/fs_api.c:1583
+#: src/fs/fs_api.c:1585

 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/fs/fs_api.c:2240
+#: src/fs/fs_api.c:2242

 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 

-#: src/fs/fs_api.c:2250
+#: src/fs/fs_api.c:2252

 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/fs/fs_api.c:2376 src/fs/fs_api.c:2617
+#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2619

 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_api.c:2393
+#: src/fs/fs_api.c:2395

 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_api.c:2407 src/fs/fs_api.c:2426 src/fs/fs_api.c:2909
+#: src/fs/fs_api.c:2409 src/fs/fs_api.c:2428 src/fs/fs_api.c:2911

 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 

-#: src/fs/fs_api.c:2608
+#: src/fs/fs_api.c:2610

 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/fs/fs_api.c:2853
+#: src/fs/fs_api.c:2855

 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 

-#: src/fs/fs_api.c:2947
+#: src/fs/fs_api.c:2949

 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 

-#: src/fs/fs_directory.c:210
+#: src/fs/fs_directory.c:208

 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 


@@ -2647,48 +2865,48 @@ msgstr ""
 msgid "Directory too large for system address space\n"
 msgstr ""
 
 msgid "Directory too large for system address space\n"
 msgstr ""
 

-#: src/fs/fs_download.c:508 src/fs/fs_download.c:520
+#: src/fs/fs_download.c:523 src/fs/fs_download.c:535

 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_download.c:889
+#: src/fs/fs_download.c:905

 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 

-#: src/fs/fs_download.c:971
+#: src/fs/fs_download.c:987

 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 

-#: src/fs/fs_download.c:997
+#: src/fs/fs_download.c:1013

 msgid "internal error decrypting content"
 msgstr ""
 
 msgid "internal error decrypting content"
 msgstr ""
 

-#: src/fs/fs_download.c:1020
+#: src/fs/fs_download.c:1036

 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_download.c:1030
+#: src/fs/fs_download.c:1046

 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_download.c:1039
+#: src/fs/fs_download.c:1055

 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/fs/fs_download.c:1137
+#: src/fs/fs_download.c:1153

 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 

-#: src/fs/fs_download.c:1928
+#: src/fs/fs_download.c:1944

 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"


@@ -2809,12 +3027,12 @@ msgstr ""
 msgid "Internal error."
 msgstr "未知错误。\n"
 
 msgid "Internal error."
 msgstr "未知错误。\n"
 

-#: src/fs/fs_search.c:819
+#: src/fs/fs_search.c:751 src/fs/fs_search.c:817

 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 

-#: src/fs/fs_search.c:878
+#: src/fs/fs_search.c:876

 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""


@@ -2874,78 +3092,98 @@ msgstr "打开日志文件“%s”失败：%s\n"
 msgid "Failed to compute hash of file."
 msgstr ""
 
 msgid "Failed to compute hash of file."
 msgstr ""
 

-#: src/fs/fs_uri.c:222
+#: src/fs/fs_uri.c:223

 #, no-c-format
 #, no-c-format

-msgid "`%' must be followed by HEX number"
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"

 msgstr ""
 
 msgstr ""
 

-#: src/fs/fs_uri.c:281
+#: src/fs/fs_uri.c:283

 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 

-#: src/fs/fs_uri.c:299
-msgid "`++' not allowed in KSK URI"
+#: src/fs/fs_uri.c: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:379
+msgid "Malformed SKS URI (wrong syntax)"
+msgstr ""
+
+#: src/fs/fs_uri.c:423
+msgid "Malformed CHK URI (wrong syntax)"

 msgstr ""
 
 msgstr ""
 

-#: src/fs/fs_uri.c:306
-msgid "Quotes not balanced in KSK URI"
+#: src/fs/fs_uri.c:438
+msgid "Malformed CHK URI (failed to decode CHK)"

 msgstr ""
 
 msgstr ""
 

-#: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI"
+#: src/fs/fs_uri.c:517
+msgid "LOC URI malformed (wrong syntax)"

 msgstr ""
 
 msgstr ""
 

-#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
-msgid "Malformed CHK URI"
+#: src/fs/fs_uri.c:532
+msgid "LOC URI malformed (no CHK)"

 msgstr ""
 
 msgstr ""
 

-#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:629
-msgid "SKS URI malformed"
+#: src/fs/fs_uri.c:542
+msgid "LOC URI malformed (missing LOC)"

 msgstr ""
 
 msgstr ""
 

-#: src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
-msgid "LOC URI malformed"
+#: src/fs/fs_uri.c:550
+msgid "LOC URI malformed (wrong syntax for public key)"

 msgstr ""
 
 msgstr ""
 

-#: src/fs/fs_uri.c:611
+#: src/fs/fs_uri.c:558

 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 

-#: src/fs/fs_uri.c:617
-msgid "SKS URI malformed (could not find signature)"
+#: src/fs/fs_uri.c:564
+msgid "LOC URI malformed (could not find signature)"
+msgstr ""
+
+#: src/fs/fs_uri.c:570
+msgid "LOC URI malformed (wrong syntax for signature)"
+msgstr ""
+
+#: src/fs/fs_uri.c:579
+msgid "LOC URI malformed (could not decode signature)"

 msgstr ""
 
 msgstr ""
 

-#: src/fs/fs_uri.c:623
-msgid "SKS URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:585
+msgid "LOC URI malformed (wrong syntax for expiration time)"

 msgstr ""
 
 msgstr ""
 

-#: src/fs/fs_uri.c:636
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/fs/fs_uri.c:591
+msgid "LOC URI malformed (could not parse expiration time)"

 msgstr ""
 
 msgstr ""
 

-#: src/fs/fs_uri.c:648
-msgid "SKS URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:603
+msgid "LOC URI malformed (signature failed validation)"

 msgstr ""
 
 msgstr ""
 

-#: src/fs/fs_uri.c:686
+#: src/fs/fs_uri.c:642

 msgid "Unrecognized URI type"
 msgstr ""
 
 msgid "Unrecognized URI type"
 msgstr ""
 

-#: src/fs/fs_uri.c:910
+#: src/fs/fs_uri.c:866

 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "立即保存配置？"
 
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "立即保存配置？"
 

-#: src/fs/fs_uri.c:916
+#: src/fs/fs_uri.c:872

 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/fs/fs_uri.c:1100 src/fs/fs_uri.c:1127
+#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084

 msgid "No keywords specified!\n"
 msgstr ""
 
 msgid "No keywords specified!\n"
 msgstr ""
 

-#: src/fs/fs_uri.c:1133
+#: src/fs/fs_uri.c:1090

 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 


@@ -3272,7 +3510,8 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
 msgstr ""
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785

-#: src/transport/gnunet-transport.c:865 src/transport/gnunet-transport.c:899
+#: src/transport/gnunet-transport.c:1387 src/transport/gnunet-transport.c:1417
+#: src/transport/gnunet-transport.c:1447

 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""


@@ -3364,99 +3603,134 @@ msgstr ""
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 

-#: src/fs/gnunet-service-fs.c:271
+#: src/fs/gnunet-service-fs.c:277

 msgid "# running average P2P latency (ms)"
 msgstr ""
 
 msgid "# running average P2P latency (ms)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:545

 msgid "# Loopback routes suppressed"
 msgstr ""
 
 msgid "# Loopback routes suppressed"
 msgstr ""
 

-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1253
+#: src/fs/gnunet-service-fs.c:645 src/hostlist/gnunet-daemon-hostlist.c:303

 #: src/topology/gnunet-daemon-topology.c:1260
 #: src/topology/gnunet-daemon-topology.c:1260

+#: src/topology/gnunet-daemon-topology.c:1267

 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cadet_client.c:484
+msgid "# replies received via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_client.c:498
+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:352
+msgid "# queries received via cadet not answered"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:432
+msgid "# queries received via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:476
+#, fuzzy
+msgid "# cadet client connections rejected"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:482
+#: src/fs/gnunet-service-fs_cadet_server.c:522
+#, fuzzy
+msgid "# cadet connections active"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/fs/gnunet-service-fs_cp.c:682

 msgid "# migration stop messages received"
 msgstr ""
 
 msgid "# migration stop messages received"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:686

 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:719
+#: src/fs/gnunet-service-fs_cp.c:721

 msgid "# replies transmitted to other peers"
 msgstr ""
 
 msgid "# replies transmitted to other peers"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:725
+#: src/fs/gnunet-service-fs_cp.c:727

 msgid "# replies dropped"
 msgstr ""
 
 msgid "# replies dropped"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:750 src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301

 msgid "# P2P searches active"
 msgstr ""
 
 msgid "# P2P searches active"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:843
+#: src/fs/gnunet-service-fs_cp.c:845

 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:896
+#: src/fs/gnunet-service-fs_cp.c:898

 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:904
+#: src/fs/gnunet-service-fs_cp.c:906

 msgid "# replies received for other peers"
 msgstr ""
 
 msgid "# replies received for other peers"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:920

 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:958

 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1024
+#: src/fs/gnunet-service-fs_cp.c:1026

 msgid "# requests done for free (low load)"
 msgstr ""
 
 msgid "# requests done for free (low load)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1049
+#: src/fs/gnunet-service-fs_cp.c:1051

 msgid "# request dropped, priority insufficient"
 msgstr ""
 
 msgid "# request dropped, priority insufficient"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1059
+#: src/fs/gnunet-service-fs_cp.c:1061

 msgid "# requests done for a price (normal load)"
 msgstr ""
 
 msgid "# requests done for a price (normal load)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1137
+#: src/fs/gnunet-service-fs_cp.c:1139

 msgid "# GET requests received (from other peers)"
 msgstr ""
 
 msgid "# GET requests received (from other peers)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1171
+#: src/fs/gnunet-service-fs_cp.c:1173

 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1193
+#: src/fs/gnunet-service-fs_cp.c:1195

 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1244
+#: src/fs/gnunet-service-fs_cp.c:1246

 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1268
+#: src/fs/gnunet-service-fs_cp.c:1270

 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1297
+#: src/fs/gnunet-service-fs_cp.c:1299

 msgid "# P2P query messages received and processed"
 msgstr ""
 
 msgid "# P2P query messages received and processed"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1668
+#: src/fs/gnunet-service-fs_cp.c:1670

 msgid "# migration stop messages sent"
 msgstr ""
 
 msgid "# migration stop messages sent"
 msgstr ""
 


@@ -3522,41 +3796,6 @@ msgstr ""
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_mesh_client.c:484
-msgid "# replies received via mesh"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_client.c:498
-msgid "# replies received via mesh dropped"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:260
-msgid "# Blocks transferred via mesh"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:352
-msgid "# queries received via mesh not answered"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:432
-msgid "# queries received via mesh"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:476
-#, fuzzy
-msgid "# mesh client connections rejected"
-msgstr ""
-"\n"
-"按任意键继续\n"
-
-#: src/fs/gnunet-service-fs_mesh_server.c:482
-#: src/fs/gnunet-service-fs_mesh_server.c:522
-#, fuzzy
-msgid "# mesh connections active"
-msgstr ""
-"\n"
-"按任意键继续\n"
-

 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""


@@ -3632,7 +3871,7 @@ msgid "# Replies received from DHT"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_pr.c:1192
 msgstr ""
 
 #: src/fs/gnunet-service-fs_pr.c:1192

-msgid "# Replies received from MESH"
+msgid "# Replies received from CADET"

 msgstr ""
 
 #: src/fs/gnunet-service-fs_pr.c:1244
 msgstr ""
 
 #: src/fs/gnunet-service-fs_pr.c:1244


@@ -3727,7 +3966,7 @@ msgstr ""
 
 #: src/gns/gns_api.c:393
 #, fuzzy
 
 #: src/gns/gns_api.c:393
 #, fuzzy

-msgid "Failed to serialize lookup reply from GNS service!\n"
+msgid "Failed to deserialize lookup reply from GNS service!\n"

 msgstr "初始化“%s”服务失败。\n"
 
 #: src/gns/gnunet-bcd.c:123
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/gns/gnunet-bcd.c:123


@@ -3735,7 +3974,7 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 

-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:566
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:695

 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""


@@ -3814,54 +4053,58 @@ msgstr ""
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 

-#: src/gns/gnunet-gns.c:217
+#: src/gns/gnunet-gns.c:227

 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
 #, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 

-#: src/gns/gnunet-gns.c:298
+#: src/gns/gnunet-gns.c:308

 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 

-#: src/gns/gnunet-gns.c:336 src/gns/gnunet-gns-helper-service-w32.c:798
+#: src/gns/gnunet-gns.c:347 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 ""
 
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 

-#: src/gns/gnunet-gns.c:365 src/gns/gnunet-gns-helper-service-w32.c:828
+#: src/gns/gnunet-gns.c:386 src/gns/gnunet-gns-helper-service-w32.c:828

 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/gns/gnunet-gns.c:378
+#: src/gns/gnunet-gns.c:399

 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 

-#: src/gns/gnunet-gns.c:428
+#: src/gns/gnunet-gns.c:449

 msgid "Lookup a record for the given name"
 msgstr ""
 
 msgid "Lookup a record for the given name"
 msgstr ""
 

-#: src/gns/gnunet-gns.c:431
+#: src/gns/gnunet-gns.c:452

 msgid "Specify the type of the record to lookup"
 msgstr ""
 
 msgid "Specify the type of the record to lookup"
 msgstr ""
 

-#: src/gns/gnunet-gns.c:434
+#: src/gns/gnunet-gns.c:455
+msgid "Specify timeout for the lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:458

 msgid "No unneeded output"
 msgstr ""
 
 msgid "No unneeded output"
 msgstr ""
 

-#: src/gns/gnunet-gns.c:437
+#: src/gns/gnunet-gns.c:461

 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 

-#: src/gns/gnunet-gns.c:440
+#: src/gns/gnunet-gns.c:464

 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 

-#: src/gns/gnunet-gns.c:453
+#: src/gns/gnunet-gns.c:478

 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"


@@ -3879,17 +4122,21 @@ msgstr ""
 msgid "Failed to connect to identity service\n"
 msgstr "初始化“%s”服务失败。\n"
 
 msgid "Failed to connect to identity service\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/gns/gnunet-gns-import.c:476
+#: src/gns/gnunet-gns-import.c:479

 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 

-#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
-#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
-#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
-#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
-#: src/hostlist/hostlist-client.c:968
-#: src/transport/plugin_transport_http_client.c:1070
-#: src/transport/plugin_transport_http_client.c:1085
+#: 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:1095
+#: src/transport/plugin_transport_http_client.c:1110

 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""


@@ -4033,36 +4280,36 @@ msgstr ""
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/gns/gnunet-service-gns_resolver.c:816
+#: src/gns/gnunet-service-gns_resolver.c:832

 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/gns/gnunet-service-gns_resolver.c:958
+#: src/gns/gnunet-service-gns_resolver.c:974

 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 

-#: src/gns/gnunet-service-gns_resolver.c:1317
+#: src/gns/gnunet-service-gns_resolver.c:1333

 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 

-#: src/gns/gnunet-service-gns_resolver.c:1817
+#: src/gns/gnunet-service-gns_resolver.c:1831

 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 

-#: src/gns/gnunet-service-gns_resolver.c:1841
+#: src/gns/gnunet-service-gns_resolver.c:1855

 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/gns/gnunet-service-gns_resolver.c:2173
+#: src/gns/gnunet-service-gns_resolver.c:2137

 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 

-#: src/gns/gnunet-service-gns_resolver.c:2322
+#: src/gns/gnunet-service-gns_resolver.c:2286

 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""


@@ -4181,298 +4428,322 @@ msgstr "创建用户出错"
 msgid "Modified %u addresses \n"
 msgstr ""
 
 msgid "Modified %u addresses \n"
 msgstr ""
 

-#: src/hello/hello.c:943
+#: src/hello/hello.c:957

 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "保存配置失败。"
 
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "保存配置失败。"
 

-#: src/hello/hello.c:952
+#: src/hello/hello.c:966

 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "保存配置失败。"
 
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "保存配置失败。"
 

-#: src/hello/hello.c:962
+#: src/hello/hello.c:976

 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/hello/hello.c:972
+#: src/hello/hello.c:986

 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 

-#: src/hello/hello.c:989
+#: src/hello/hello.c:1004

 #, c-format
 #, c-format

-msgid "Plugin `%s' not found\n"
+msgid "Plugin `%s' not found, skipping address\n"

 msgstr ""
 
 msgstr ""
 

-#: src/hello/hello.c:998
+#: src/hello/hello.c:1012

 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 

-#: src/hello/hello.c:1017
+#: src/hello/hello.c:1031

 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/hostlist/gnunet-daemon-hostlist.c:259
+#: src/hello/hello.c:1104
+#, c-format
+msgid "HELLO URI contained %u addresses, added %u addresses\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:274

 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 

-#: src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/hostlist/gnunet-daemon-hostlist.c:323

 msgid "advertise our hostlist to other peers"
 msgstr ""
 
 msgid "advertise our hostlist to other peers"
 msgstr ""
 

-#: src/hostlist/gnunet-daemon-hostlist.c:313
+#: src/hostlist/gnunet-daemon-hostlist.c:328

 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 

-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:331

 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 

-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:335

 msgid "provide a hostlist server"
 msgstr ""
 
 msgid "provide a hostlist server"
 msgstr ""
 

-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:350

 msgid "GNUnet hostlist server and client"
 msgstr ""
 
 msgid "GNUnet hostlist server and client"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:288
+#: src/hostlist/gnunet-daemon-hostlist_client.c:343

 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
+#: src/hostlist/gnunet-daemon-hostlist_client.c:364
+#: src/hostlist/gnunet-daemon-hostlist_client.c:394

 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:397

 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/gnunet-daemon-hostlist_client.c:385

 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
+#: src/hostlist/gnunet-daemon-hostlist_client.c:650
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401

 msgid "# advertised hostlist URIs"
 msgstr ""
 
 msgid "# advertised hostlist URIs"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:680

 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:664
+#: 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 ""
 
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862

 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876

 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896

 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902

 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910

 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963

 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971

 msgid "# hostlist downloads initiated"
 msgstr ""
 
 msgid "# hostlist downloads initiated"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1103
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1646

 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1049
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1112

 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1172
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1188

 msgid "# active connections"
 msgstr ""
 
 msgid "# active connections"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1347

 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1285
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1352

 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1296
+#: 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"
 
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 

-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1395

 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398

 msgid "# hostlist URIs read from file"
 msgstr ""
 
 msgid "# hostlist URIs read from file"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1376
+#: 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"
 
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 

-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450

 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1474
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491

 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1486

 msgid "# hostlist URIs written to file"
 msgstr ""
 
 msgid "# hostlist URIs written to file"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1471
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1581
+#: src/transport/plugin_transport_http_client.c:1866
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1611

 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1623

 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1495
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635

 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1639

 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:137
+#: src/hostlist/gnunet-daemon-hostlist_server.c:143

 msgid "bytes in hostlist"
 msgstr ""
 
 msgid "bytes in hostlist"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:161
+#: src/hostlist/gnunet-daemon-hostlist_server.c:168

 msgid "expired addresses encountered"
 msgstr ""
 
 msgid "expired addresses encountered"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:350
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
-#: src/peerinfo-tool/gnunet-peerinfo.c:490
-#: src/topology/gnunet-daemon-topology.c:924
+#: src/hostlist/gnunet-daemon-hostlist_server.c:203
+#: src/hostlist/gnunet-daemon-hostlist_server.c:534
+#: src/peerinfo-tool/gnunet-peerinfo.c:361
+#: src/peerinfo-tool/gnunet-peerinfo.c:430
+#: src/peerinfo-tool/gnunet-peerinfo.c:501
+#: src/topology/gnunet-daemon-topology.c:925

 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:210
+#: src/hostlist/gnunet-daemon-hostlist_server.c:227

 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/gnunet-daemon-hostlist_server.c:243

 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:268
+#: src/hostlist/gnunet-daemon-hostlist_server.c:363

 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:271
+#: src/hostlist/gnunet-daemon-hostlist_server.c:366

 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380

 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:288
+#: src/hostlist/gnunet-daemon-hostlist_server.c:384

 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:296
+#: src/hostlist/gnunet-daemon-hostlist_server.c:391

 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394

 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:303
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399

 msgid "Received request for our hostlist\n"
 msgstr ""
 
 msgid "Received request for our hostlist\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:304
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401

 msgid "hostlist requests processed"
 msgstr ""
 
 msgid "hostlist requests processed"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:346
+#: src/hostlist/gnunet-daemon-hostlist_server.c:448

 msgid "# hostlist advertisements send"
 msgstr ""
 
 msgid "# hostlist advertisements send"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:389
+#: src/hostlist/gnunet-daemon-hostlist_server.c:496

 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
-#: src/transport/gnunet-service-transport.c:946
+#: src/hostlist/gnunet-daemon-hostlist_server.c:683
+#: src/peerinfo-tool/gnunet-peerinfo.c:650
+#: src/transport/gnunet-service-transport.c:1136

 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:575
+#: src/hostlist/gnunet-daemon-hostlist_server.c:707

 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:589
+#: src/hostlist/gnunet-daemon-hostlist_server.c:722

 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:629
+#: src/hostlist/gnunet-daemon-hostlist_server.c:760
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:780

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"

 msgstr "“%s”不可用。\n"
 
 msgstr "“%s”不可用。\n"
 

-#: src/hostlist/hostlist-server.c:672
+#: src/hostlist/gnunet-daemon-hostlist_server.c:820

 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""


@@ -4564,78 +4835,32 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/mesh/gnunet-mesh.c:300
+#: src/mysql/mysql.c:174
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr ""
+
+#: src/mysql/mysql.c:181

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Invalid target `%s'\n"
-msgstr "“%s”的参数无效。\n"
+msgid "Could not access file `%s': %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"

 
 

-#: src/mesh/gnunet-mesh.c:434
+#: src/namecache/gnunet-namecache.c:109

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Invalid tunnel owner `%s'\n"
-msgstr "IP 格式无效：“%s”\n"
+msgid "No records found for `%s'"
+msgstr "运行 %s失败：%s %d\n"

 
 

-#: src/mesh/gnunet-mesh.c:499
-msgid "You must NOT give a TARGET when using options\n"
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:402
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"

 msgstr ""
 
 msgstr ""
 

-#: src/mesh/gnunet-mesh.c:576
-#, fuzzy
-msgid "provide information about a particular channel"
-msgstr "æ\97 æ³\95è\8e·å\8f\96æ\9c\89å\85³ç\94¨æ\88·â\80\9c%sâ\80\9dç\9a\84ä¿¡æ\81¯ï¼\9a%s\n"
+#: src/namecache/gnunet-namecache.c:185
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "æ\82¨å¿\85é¡»æ\8c\87å®\9aä¸\80个æ\98µç§°\n"

 
 

-#: src/mesh/gnunet-mesh.c:579
-#, fuzzy
-msgid "provide information about a particular connection"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/mesh/gnunet-mesh.c:582
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/mesh/gnunet-mesh.c:585
-msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:588
-msgid "port to listen to (default; 0)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:591
-#, fuzzy
-msgid "provide information about a particular tunnel"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/mesh/gnunet-service-mesh_peer.c:377
-msgid "Wrong CORE service\n"
-msgstr ""
-
-#: src/mysql/mysql.c:174
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-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/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
-#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
-msgstr ""
-
-#: src/namecache/gnunet-namecache.c:185
-#, fuzzy, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "您必须指定一个昵称\n"
-
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:783

 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"


@@ -4645,7 +4870,7 @@ msgstr "“%s”的参数无效。\n"
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方！\n"
 
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方！\n"
 

-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1020

 msgid "name of the record to add/delete/display"
 msgstr ""
 
 msgid "name of the record to add/delete/display"
 msgstr ""
 


@@ -4653,7 +4878,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 

-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1055

 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"


@@ -4668,149 +4893,164 @@ msgstr ""
 msgid "Failed to create indices\n"
 msgstr "发送消息失败。\n"
 
 msgid "Failed to create indices\n"
 msgstr "发送消息失败。\n"
 

-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:308

 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:332
+#: src/namestore/gnunet-namestore.c:337

 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:339
+#: src/namestore/gnunet-namestore.c:344

 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:558
+#: src/namestore/gnunet-namestore.c:567
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:606
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:647

 #, c-format
 msgid "No options given\n"
 msgstr ""
 
 #, c-format
 msgid "No options given\n"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:569
+#: src/namestore/gnunet-namestore.c:658

 #: src/namestore/gnunet-namestore-fcfsd.c:970
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/namestore/gnunet-namestore-fcfsd.c:970
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586
-#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625
-#: src/namestore/gnunet-namestore.c:665
+#: src/namestore/gnunet-namestore.c:666 src/namestore/gnunet-namestore.c:675
+#: src/namestore/gnunet-namestore.c:692 src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:754

 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 

-#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
-#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
+#: src/namestore/gnunet-namestore.c:667 src/namestore/gnunet-namestore.c:676
+#: src/namestore/gnunet-namestore.c:693 src/namestore/gnunet-namestore.c:715

 msgid "add"
 msgstr ""
 
 msgid "add"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:684

 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 

-#: src/namestore/gnunet-namestore.c:615
+#: src/namestore/gnunet-namestore.c:704

 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:651
+#: src/namestore/gnunet-namestore.c:740

 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 

-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore.c:755

 msgid "del"
 msgstr ""
 
 msgid "del"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:703
+#: src/namestore/gnunet-namestore.c:803
+#: src/peerinfo-tool/gnunet-peerinfo.c:734

 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 

-#: src/namestore/gnunet-namestore.c:750
+#: src/namestore/gnunet-namestore.c:838

 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 

-#: src/namestore/gnunet-namestore.c:790
+#: src/namestore/gnunet-namestore.c:878

 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:817
+#: src/namestore/gnunet-namestore.c:905

 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:853
+#: src/namestore/gnunet-namestore.c:941

 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "服务已删除。\n"
 
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "服务已删除。\n"
 

-#: src/namestore/gnunet-namestore.c:865
+#: src/namestore/gnunet-namestore.c:953

 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u：%s\n"
 

-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:1002

 msgid "add record"
 msgstr ""
 
 msgid "add record"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1005

 msgid "delete record"
 msgstr ""
 
 msgid "delete record"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:1008

 msgid "display records"
 msgstr ""
 
 msgid "display records"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:922
+#: src/namestore/gnunet-namestore.c:1011

 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:925
+#: src/namestore/gnunet-namestore.c:1014

 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 

-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:1017

 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:1023

 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 

-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:1026

 msgid "type of the record to add/delete/display"
 msgstr ""
 
 msgid "type of the record to add/delete/display"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:1029

 msgid "URI to import into our zone"
 msgstr ""
 
 msgid "URI to import into our zone"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1032

 msgid "value of the record to add/delete"
 msgstr ""
 
 msgid "value of the record to add/delete"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:1035

 msgid "create or list public record"
 msgstr ""
 
 msgid "create or list public record"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:949
+#: src/namestore/gnunet-namestore.c:1038
+msgid "create record that is pending approval (and thus for now inactive)"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1041

 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 

-#: src/namestore/gnunet-namestore.c:952
+#: src/namestore/gnunet-namestore.c:1044

 msgid "name of the ego controlling the zone"
 msgstr ""
 
 msgid "name of the ego controlling the zone"
 msgstr ""
 


@@ -4874,7 +5114,7 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 

-#: src/namestore/gnunet-service-namestore.c:638
+#: src/namestore/gnunet-service-namestore.c:655

 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"


@@ -4892,57 +5132,61 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 

-#: src/nat/nat_auto.c:170
+#: src/nat/nat_auto.c:175

 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr ""
 
 msgid "NAT traversal with ICMP Server timed out.\n"
 msgstr ""
 

-#: src/nat/nat_auto.c:200
+#: src/nat/nat_auto.c:207

 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 

-#: src/nat/nat_auto.c:201
+#: src/nat/nat_auto.c:208

 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 

-#: src/nat/nat_auto.c:222
+#: src/nat/nat_auto.c:229

 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 

-#: src/nat/nat_auto.c:269
+#: src/nat/nat_auto.c:284

 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 

-#: src/nat/nat_auto.c:339
+#: src/nat/nat_auto.c:362

 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 

-#: src/nat/nat_auto.c:355
+#: src/nat/nat_auto.c:378

 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 

-#: src/nat/nat_auto.c:408
+#: src/nat/nat_auto.c:441

 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 

-#: src/nat/nat_auto.c:409
+#: src/nat/nat_auto.c:442

 msgid "upnpc not found\n"
 msgstr ""
 
 msgid "upnpc not found\n"
 msgstr ""
 

-#: src/nat/nat_auto.c:442
-msgid "gnunet-helper-nat-server found, testing it\n"
+#: src/nat/nat_auto.c:472
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"

 msgstr ""
 
 msgstr ""
 

-#: src/nat/nat_auto.c:443
+#: src/nat/nat_auto.c:480
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:488

 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 

-#: src/nat/nat_auto.c:477
+#: src/nat/nat_auto.c:527

 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 
 msgid "gnunet-helper-nat-client found, enabling it\n"
 msgstr ""
 

-#: src/nat/nat_auto.c:478
+#: src/nat/nat_auto.c:528

 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 
 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
 msgstr ""
 


@@ -4956,43 +5200,76 @@ msgstr ""
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败：%s %d\n"
 

-#: src/nat/nat.c:1203
+#: src/nat/nat.c:1032
+msgid "Error while running upnp client:\n"
+msgstr ""
+
+#: src/nat/nat.c:1102
+#, fuzzy, c-format
+msgid "Failed to run upnp client for port %u\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/nat/nat.c:1243

 msgid "malformed"
 msgstr ""
 
 msgid "malformed"
 msgstr ""
 

-#: src/nat/nat.c:1274 src/nat/nat.c:1286
+#: src/nat/nat.c:1297
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP \n"
+msgstr ""
+
+#: src/nat/nat.c:1324 src/nat/nat.c:1336

 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 

-#: src/nat/nat.c:1424
+#: src/nat/nat.c:1474

 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 

-#: src/nat/nat.c:1440
+#: src/nat/nat.c:1490

 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 

-#: src/nat/nat_mini.c:170
+#: src/nat/nat_mini.c:203

 msgid "`external-ip' command not found\n"
 msgstr ""
 
 msgid "`external-ip' command not found\n"
 msgstr ""
 

-#: src/nat/nat_mini.c:505
+#: src/nat/nat_mini.c:609

 msgid "`upnpc' command not found\n"
 msgstr ""
 
 msgid "`upnpc' command not found\n"
 msgstr ""
 

-#: src/nat/nat_test.c:348
+#: src/nat/nat_test.c:351

 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 

-#: src/nat/nat_test.c:420
+#: src/nat/nat_test.c:423

 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 

+#: src/nat/nat_test.c:453
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/nse/gnunet-nse.c:117
+#, fuzzy
+msgid "NSE service is not running\n"
+msgstr "服务已删除。\n"
+
+#: src/nse/gnunet-nse.c:122
+msgid "Error while checking if NSE service is running or not\n"
+msgstr ""
+
+#: src/nse/gnunet-nse.c:168
+msgid "Show network size estimates from NSE service."
+msgstr ""
+

 #: src/nse/gnunet-nse-profiler.c:858
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 #: src/nse/gnunet-nse-profiler.c:858
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""


@@ -5022,67 +5299,67 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 

-#: src/nse/gnunet-service-nse.c:1461
-#: src/revocation/gnunet-service-revocation.c:789
+#: src/nse/gnunet-service-nse.c:1517
+#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248

 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
 
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
 

-#: src/nse/gnunet-service-nse.c:1488
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
-

 #: src/peerinfo/gnunet-service-peerinfo.c:215
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
 #: src/peerinfo/gnunet-service-peerinfo.c:215
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 

-#: src/peerinfo/gnunet-service-peerinfo.c:354
+#: src/peerinfo/gnunet-service-peerinfo.c:352

 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/peerinfo/gnunet-service-peerinfo.c:373
-#: src/peerinfo/gnunet-service-peerinfo.c:390
+#: src/peerinfo/gnunet-service-peerinfo.c:371
+#: src/peerinfo/gnunet-service-peerinfo.c:388

 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/peerinfo/gnunet-service-peerinfo.c:468
+#: src/peerinfo/gnunet-service-peerinfo.c:466

 msgid "# peers known"
 msgstr ""
 
 msgid "# peers known"
 msgstr ""
 

-#: src/peerinfo/gnunet-service-peerinfo.c:505
+#: src/peerinfo/gnunet-service-peerinfo.c:503

 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 

-#: src/peerinfo/gnunet-service-peerinfo.c:655
+#: src/peerinfo/gnunet-service-peerinfo.c:653

 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/peerinfo/gnunet-service-peerinfo.c:660
+#: src/peerinfo/gnunet-service-peerinfo.c:658

 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 

-#: src/peerinfo/gnunet-service-peerinfo.c:996
+#: src/peerinfo/gnunet-service-peerinfo.c:994

 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/peerinfo/gnunet-service-peerinfo.c:1286
+#: src/peerinfo/gnunet-service-peerinfo.c:1287

 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 

+#: src/peerinfo/gnunet-service-peerinfo.c:1298
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+

 #: src/peerinfo/peerinfo_api.c:236
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
 #: src/peerinfo/peerinfo_api.c:236
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 

-#: src/peerinfo/peerinfo_api.c:356
+#: src/peerinfo/peerinfo_api.c:356 src/sensor/sensor_api.c:519

 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "初始化“%s”服务失败。\n"
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "初始化“%s”服务失败。\n"


@@ -5108,112 +5385,147 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:232
+#: src/peerinfo-tool/gnunet-peerinfo.c:233

 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:240

 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:282
+#, fuzzy, c-format
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:439

 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:436
+#: src/peerinfo-tool/gnunet-peerinfo.c:447

 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:456

 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:469

 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:522
+#: src/peerinfo-tool/gnunet-peerinfo.c:533

 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:661
+#: src/peerinfo-tool/gnunet-peerinfo.c:644

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Could not find option `%s:%s' in configuration.\n"
-msgstr "æ\89¾ä¸\8då\88°ä¸»æ\9cºâ\80\9c%sâ\80\9dç\9a\84 IPï¼\9a%s\n"
+msgid "Service `%s' is not running, please start GNUnet\n"
+msgstr "æ\9c\8då\8a¡å·²å\88 é\99¤ã\80\82\n"

 
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:667
+#: src/peerinfo-tool/gnunet-peerinfo.c:665 src/util/gnunet-scrypt.c:224

 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:725
+#: src/peerinfo-tool/gnunet-peerinfo.c:756

 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:769
+#: src/peerinfo-tool/gnunet-peerinfo.c:800

 msgid "don't resolve host names"
 msgstr ""
 
 msgid "don't resolve host names"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:772
+#: src/peerinfo-tool/gnunet-peerinfo.c:803

 msgid "output only the identity strings"
 msgstr ""
 
 msgid "output only the identity strings"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/peerinfo-tool/gnunet-peerinfo.c:806

 msgid "include friend-only information"
 msgstr ""
 
 msgid "include friend-only information"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:778
+#: src/peerinfo-tool/gnunet-peerinfo.c:809

 msgid "output our own identity only"
 msgstr ""
 
 msgid "output our own identity only"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:781
+#: src/peerinfo-tool/gnunet-peerinfo.c:812

 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:784
+#: src/peerinfo-tool/gnunet-peerinfo.c:815

 msgid "dump hello to file"
 msgstr ""
 
 msgid "dump hello to file"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:787
+#: src/peerinfo-tool/gnunet-peerinfo.c:818

 msgid "also output HELLO uri(s)"
 msgstr ""
 
 msgid "also output HELLO uri(s)"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:790
+#: src/peerinfo-tool/gnunet-peerinfo.c:821

 msgid "add given HELLO uri to the database"
 msgstr ""
 
 msgid "add given HELLO uri to the database"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:832

 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
 #, 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:124
+#: src/transport/gnunet-service-transport_plugins.c:128

 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109

-#: src/transport/gnunet-service-transport_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:133

 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129

-#: src/transport/gnunet-service-transport_plugins.c:159
+#: src/transport/gnunet-service-transport_plugins.c:165

 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

+#: src/peerstore/gnunet-peerstore.c:97
+msgid "peerstore"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:486
+#, fuzzy
+msgid "Error communicating with `PEERSTORE' service."
+msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
+
+#: src/peerstore/peerstore_api.c:503
+#, fuzzy
+msgid "Received a malformed response from service."
+msgstr "“%s”的参数无效。\n"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:352
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "创建用户出错"
+
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "创建用户出错"
+

 #: src/postgres/postgres.c:59
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
 #: src/postgres/postgres.c:59
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"


@@ -5311,20 +5623,6 @@ msgstr "发送消息失败。\n"
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 

-#: src/psycstore/plugin_psycstore_sqlite.c:253
-#, fuzzy, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
-msgstr "创建用户出错"
-
-#: src/psycstore/plugin_psycstore_sqlite.c:276
-#, fuzzy, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
-msgstr "创建用户出错"
-

 #: src/psycstore/plugin_psycstore_sqlite.c:1796
 #, fuzzy
 msgid "SQLite database running\n"
 #: src/psycstore/plugin_psycstore_sqlite.c:1796
 #, fuzzy
 msgid "SQLite database running\n"


@@ -5359,7 +5657,7 @@ msgid "# DNS requests intercepted"
 msgstr ""
 
 #: src/pt/gnunet-daemon-pt.c:888
 msgstr ""
 
 #: src/pt/gnunet-daemon-pt.c:888

-msgid "# DNS requests dropped (DNS mesh channel down)"
+msgid "# DNS requests dropped (DNS cadet channel down)"

 msgstr ""
 
 #: src/pt/gnunet-daemon-pt.c:896
 msgstr ""
 
 #: src/pt/gnunet-daemon-pt.c:896


@@ -5392,7 +5690,7 @@ msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "立即保存配置？"
 
 #: src/regex/gnunet-daemon-regexprofiler.c:380
 msgstr "立即保存配置？"
 
 #: src/regex/gnunet-daemon-regexprofiler.c:380

-msgid "Daemon to announce regular expressions for the peer using mesh."
+msgid "Daemon to announce regular expressions for the peer using cadet."

 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1288
 msgstr ""
 
 #: src/regex/gnunet-regex-profiler.c:1288


@@ -5474,106 +5772,106 @@ msgstr ""
 msgid "Regex `%s' is too long!\n"
 msgstr "服务已删除。\n"
 
 msgid "Regex `%s' is too long!\n"
 msgstr "服务已删除。\n"
 

-#: src/revocation/gnunet-revocation.c:121
+#: src/revocation/gnunet-revocation.c:126

 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr ""
 
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:126
+#: src/revocation/gnunet-revocation.c:131

 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "服务已删除。\n"
 
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "服务已删除。\n"
 

-#: src/revocation/gnunet-revocation.c:132
+#: src/revocation/gnunet-revocation.c:137

 #, fuzzy
 msgid "Internal error\n"
 msgstr "未知错误。\n"
 
 #, fuzzy
 msgid "Internal error\n"
 msgstr "未知错误。\n"
 

-#: src/revocation/gnunet-revocation.c:158
+#: src/revocation/gnunet-revocation.c:163

 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:163
+#: src/revocation/gnunet-revocation.c:168

 msgid "Revocation failed (!)\n"
 msgstr ""
 
 msgid "Revocation failed (!)\n"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:168
+#: src/revocation/gnunet-revocation.c:173

 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:178

 msgid "Revocation successful.\n"
 msgstr ""
 
 msgid "Revocation successful.\n"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:178
+#: src/revocation/gnunet-revocation.c:183

 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:289
+#: src/revocation/gnunet-revocation.c:294

 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:319
+#: src/revocation/gnunet-revocation.c:324

 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:340
+#: src/revocation/gnunet-revocation.c:345

 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:360
+#: src/revocation/gnunet-revocation.c:365

 msgid "Revocation certificate ready\n"
 msgstr ""
 
 msgid "Revocation certificate ready\n"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:370
+#: src/revocation/gnunet-revocation.c:375

 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:402
+#: src/revocation/gnunet-revocation.c:407

 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "“%s”的参数无效。\n"
 
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "“%s”的参数无效。\n"
 

-#: src/revocation/gnunet-revocation.c:416
+#: src/revocation/gnunet-revocation.c:421

 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:436
+#: src/revocation/gnunet-revocation.c:441

 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/revocation/gnunet-revocation.c:458
+#: src/revocation/gnunet-revocation.c:463

 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/revocation/gnunet-revocation.c:483
+#: src/revocation/gnunet-revocation.c:488

 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "没有指定接口，将使用默认。\n"
 
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "没有指定接口，将使用默认。\n"
 

-#: src/revocation/gnunet-revocation.c:499
+#: src/revocation/gnunet-revocation.c:504

 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:502
+#: src/revocation/gnunet-revocation.c:507

 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:510

 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 

-#: src/revocation/gnunet-revocation.c:508
+#: src/revocation/gnunet-revocation.c:513

 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 


@@ -5595,162 +5893,135 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u：%s\n"
 
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u：%s\n"
 

-#: src/scalarproduct/gnunet-scalarproduct.c:225
+#: src/scalarproduct/gnunet-scalarproduct.c:224

 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "您必须指定一个昵称\n"
 
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "您必须指定一个昵称\n"
 

-#: src/scalarproduct/gnunet-scalarproduct.c:232
+#: src/scalarproduct/gnunet-scalarproduct.c:231

 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 

-#: src/scalarproduct/gnunet-scalarproduct.c:239
+#: src/scalarproduct/gnunet-scalarproduct.c:238

 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 
 msgid "Please give a session key for --input_key!\n"
 msgstr ""
 

-#: src/scalarproduct/gnunet-scalarproduct.c:251
+#: src/scalarproduct/gnunet-scalarproduct.c:250

 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 

-#: src/scalarproduct/gnunet-scalarproduct.c:276
-#, fuzzy, c-format
-msgid "Could not convert `%s' to int32_t.\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/scalarproduct/gnunet-scalarproduct.c:284
+#: src/scalarproduct/gnunet-scalarproduct.c:261

 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 

-#: src/scalarproduct/gnunet-scalarproduct.c:336
+#: src/scalarproduct/gnunet-scalarproduct.c:283
+#, fuzzy, c-format
+msgid "Malformed input, could not parse `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:296

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Could not convert `%s' to integer.\n"
+msgid "Could not convert `%s' to int64_t.\n"

 msgstr "无法连接到 %s:%u：%s\n"
 
 msgstr "无法连接到 %s:%u：%s\n"
 

-#: src/scalarproduct/gnunet-scalarproduct.c:397
+#: src/scalarproduct/gnunet-scalarproduct.c:345

 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 

-#: src/scalarproduct/gnunet-scalarproduct.c:400
-msgid ""
-"A comma separated mask to select which elements should actually be compared."
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:403
+#: src/scalarproduct/gnunet-scalarproduct.c:348

 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 ""
 
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 

-#: src/scalarproduct/gnunet-scalarproduct.c:406
+#: src/scalarproduct/gnunet-scalarproduct.c:351

 msgid "Transaction ID shared with peer."
 msgstr ""
 
 msgid "Transaction ID shared with peer."
 msgstr ""
 

-#: src/scalarproduct/gnunet-scalarproduct.c:415
+#: src/scalarproduct/gnunet-scalarproduct.c:360

 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:450
-#, c-format
-msgid "Generated key set with key length %d bits.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:776
+#: src/scalarproduct/gnunet-service-scalarproduct.c:678

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Client (%p) disconnected from us.\n"
+msgid "Client %p disconnected from us.\n"

 msgstr "“%s”已连接到“%s”。\n"
 
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:848
-#: src/scalarproduct/gnunet-service-scalarproduct.c:938
+#: src/scalarproduct/gnunet-service-scalarproduct.c:748

 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:854
+#: src/scalarproduct/gnunet-service-scalarproduct.c:759

 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:948
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1027
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1165
-msgid "Could not send service-response message via mesh!)\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1391
-#, c-format
-msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:781
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1459
+#, fuzzy, c-format
+msgid "Successfully created new channel to peer (%s)!\n"
+msgstr "“%s”已连接到“%s”。\n"

 
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:1495
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1622
+#: src/scalarproduct/gnunet-service-scalarproduct.c:818
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1469
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1539

 msgid "Transmitting service request.\n"
 msgstr ""
 
 msgid "Transmitting service request.\n"
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:1504
+#: src/scalarproduct/gnunet-service-scalarproduct.c:830
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1481

 #, fuzzy
 #, fuzzy

-msgid "Could not send service-request multipart message to channel!\n"
+msgid "Could not send message to channel!\n"

 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:1544
-#, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1631
+#: src/scalarproduct/gnunet-service-scalarproduct.c:891
+#: src/scalarproduct/gnunet-service-scalarproduct.c:991

 #, fuzzy
 #, fuzzy

-msgid "Could not send message to channel!\n"
+msgid "Could not send service-response message via cadet!)\n"

 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:1688
-msgid "Too short message received from client!\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1442
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"

 msgstr ""
 
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:1701
-msgid "Invalid message received from client, session information incorrect!\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1550
+#, fuzzy
+msgid "Could not send service-request multipart message to channel!\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"

 
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:1712
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1579

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Duplicate session information received, cannot create new session with key `"
-"%s'\n"
+"Got client-responder-session with key %s and a matching service-request-"
+"session set, processing.\n"

 msgstr ""
 
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:1733
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1601

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Got client-request-session with key %s, preparing channel to remote "
-"service.\n"
+"Got client-responder-session with key %s but NO matching service-request-"
+"session set, queuing element for later use.\n"

 msgstr ""
 
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:1772
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1618

 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:1819
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1777

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1830
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
+"Duplicate session information received, can not create new session with key `"
+"%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:1860
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1862

 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "“%s”已连接到“%s”。\n"
 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "“%s”已连接到“%s”。\n"


@@ -5760,70 +6031,175 @@ msgstr "“%s”已连接到“%s”。\n"
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:2083
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2242
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2270

 #, c-format
 #, c-format

-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"

 msgstr ""
 
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:2092
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2249
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2297

 #, c-format
 #, c-format

-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "Got session with key %s and a matching element set, processing.\n"

 msgstr ""
 
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:2187
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2318

 #, c-format
 #, c-format

-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"

 msgstr ""
 
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:2471
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2565

 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:2536
-msgid "Generating Paillier-Keyset.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2659
+#, fuzzy
+msgid "Connect to CADET failed\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2664
+msgid "CADET initialized\n"

 msgstr ""
 
 msgstr ""
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:2551
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
+msgstr ""
+
+#: src/sensor/gnunet-sensor.c:148

 #, fuzzy
 #, fuzzy

-msgid "Connect to MESH failed\n"
-msgstr "“%s”已连接到“%s”。\n"
+msgid "Retrieve information about all defined sensors"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/sensor/gnunet-sensor.c:151
+#, fuzzy
+msgid "Retrieve information about a single sensor"
+msgstr "无法获取有关用户“%s”的信息：%s\n"

 
 

-#: src/scalarproduct/gnunet-service-scalarproduct.c:2555
-msgid "Mesh initialized\n"
+#: src/sensor/gnunet-sensor.c:160
+msgid "sensor"

 msgstr ""
 
 msgstr ""
 

-#: src/scalarproduct/scalarproduct_api.c:246
-msgid "# SUC responder result messages received"
+#: src/sensor/gnunet-service-sensor.c:367
+#, fuzzy
+msgid "Error reading sensor version\n"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor.c:373
+msgid "Invalid sensor version number, format should be major.minor\n"

 msgstr ""
 
 msgstr ""
 

-#: src/scalarproduct/scalarproduct_api.c:300
-msgid "# bytes sent to scalarproduct"
+#: src/sensor/gnunet-service-sensor.c:385
+#, fuzzy
+msgid "Error reading sensor category\n"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor.c:413
+#, fuzzy
+msgid "Error reading sensor run interval\n"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor.c:419
+#, c-format
+msgid "Sensor run interval too low (%<PRIu64> < %d)\n"

 msgstr ""
 
 msgstr ""
 

-#: src/scalarproduct/scalarproduct_api.c:345
-#: src/scalarproduct/scalarproduct_api.c:440
+#: src/sensor/gnunet-service-sensor.c:436

 #, fuzzy
 #, fuzzy

-msgid "Failed to connect to the scalarproduct service\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Error reading sensor source\n"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor.c:445
+msgid "Error reading sensor gnunet-statistics source information\n"
+msgstr ""

 
 

-#: src/scalarproduct/scalarproduct_api.c:353
-#: src/scalarproduct/scalarproduct_api.c:448
+#: src/sensor/gnunet-service-sensor.c:455

 #, fuzzy
 #, fuzzy

-msgid "Failed to send a message to the statistics service\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Error reading sensor process name\n"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor.c:464
+msgid "Error reading sensor expected datatype\n"
+msgstr ""

 
 

-#: src/scalarproduct/scalarproduct_api.c:387
-#: src/scalarproduct/scalarproduct_api.c:485
+#: src/sensor/gnunet-service-sensor.c:470
+msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:498
+#, fuzzy, c-format
+msgid "Failed to access sensor file: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/sensor/gnunet-service-sensor.c:506
+#, fuzzy, c-format
+msgid "Failed to load sensor definition: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/sensor/gnunet-service-sensor.c:559
+#, c-format
+msgid "Sensor `%s' already exists with same or newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:566
+#, c-format
+msgid "Upgrading sensor `%s' to a newer version\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:571
+#, c-format
+msgid ""
+"Error adding new sensor `%s' to global hashmap, this should not happen\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:595
+#, fuzzy, c-format
+msgid "Error loading sensor from file: %s\n"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor.c:599
+#, c-format
+msgid "Sensor `%s' added to global hashmap\n"
+msgstr ""
+
+#: src/sensor/gnunet-service-sensor.c:635
+#, fuzzy, c-format
+msgid "Reloading sensor definitions from directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/sensor/gnunet-service-sensor.c:640
+#, fuzzy, c-format
+msgid "Loaded %d sensors from directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/sensor/sensor_api.c:345

 #, fuzzy
 #, fuzzy

-msgid "Failed to send a message to the scalarproduct service\n"
+msgid "Timeout transmitting iteration request to `SENSOR' service."

 msgstr "初始化“%s”服务失败。\n"
 
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/set/gnunet-service-set.c:1400
+#: src/sensor/sensor_api.c:388
+#, fuzzy
+msgid "Failed to receive response from `SENSOR' service."
+msgstr "“%s”的参数无效。\n"
+
+#: src/sensor/sensor_api.c:431
+#, fuzzy
+msgid "Received invalid message from `SENSOR' service."
+msgstr "“%s”的参数无效。\n"
+
+#: src/set/gnunet-service-set.c:1431

 #, fuzzy
 #, fuzzy

-msgid "Could not connect to mesh service\n"
+msgid "Could not connect to cadet service\n"

 msgstr "无法连接到 %s:%u：%s\n"
 
 #: src/set/gnunet-set-ibf-profiler.c:221
 msgstr "无法连接到 %s:%u：%s\n"
 
 #: src/set/gnunet-set-ibf-profiler.c:221


@@ -5942,24 +6318,109 @@ msgstr ""
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 

-#: src/statistics/statistics_api.c:506
+#: src/statistics/statistics_api.c:519

 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/statistics/statistics_api.c:1074
+#: src/statistics/statistics_api.c:1090

 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 

+#: src/testbed/generate-underlay-topology.c:223
+msgid "Need atleast 2 arguments\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c: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:252
+#, c-format
+msgid "An argument is missing for given topology `%s'\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:258
+#, fuzzy, c-format
+msgid "Invalid argument `%s' given as topology argument\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/testbed/generate-underlay-topology.c:266
+#, c-format
+msgid "Filename argument missing for topology `%s'\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:280
+#, c-format
+msgid "Second argument for topology `%s' is missing\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:286
+#, fuzzy, c-format
+msgid "Invalid argument `%s'; expecting unsigned int\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/testbed/generate-underlay-topology.c:335
+#: src/testbed/gnunet-testbed-profiler.c:293
+msgid "create COUNT number of peers"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:344
+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:331
+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-blacklist.c:264
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 

-#: src/testbed/gnunet-service-testbed_cpustatus.c:727
+#: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
+#, c-format
+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:730

 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"


@@ -5993,10 +6454,6 @@ msgstr "卸载 GNUnet 服务"
 msgid "Exiting as the number of peers is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
 msgid "Exiting as the number of peers is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 

-#: src/testbed/gnunet-testbed-profiler.c:293
-msgid "create COUNT number of peers"
-msgstr ""
-

 #: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 #: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""


@@ -6033,100 +6490,100 @@ msgstr ""
 msgid "Adding host %u failed with error: %s\n"
 msgstr "“%s”以错误码 %d 失败：%s\n"
 
 msgid "Adding host %u failed with error: %s\n"
 msgstr "“%s”以错误码 %d 失败：%s\n"
 

-#: src/testbed/testbed_api_testbed.c:820
+#: src/testbed/testbed_api_testbed.c:819

 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 

-#: src/testbed/testbed_api_testbed.c:989
+#: src/testbed/testbed_api_testbed.c:988

 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 

-#: src/testbed/testbed_api_testbed.c:1055
+#: src/testbed/testbed_api_testbed.c:1054

 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 

-#: src/testbed/testbed_api_testbed.c:1144
+#: src/testbed/testbed_api_testbed.c:1143

 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 

-#: src/testbed/testbed_api_testbed.c:1148
+#: src/testbed/testbed_api_testbed.c:1147

 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 

-#: src/testbed/testbed_api_testbed.c:1186
+#: src/testbed/testbed_api_testbed.c:1185

 msgid "Cannot start the master controller"
 msgstr ""
 
 msgid "Cannot start the master controller"
 msgstr ""
 

-#: src/testbed/testbed_api_testbed.c:1204
+#: src/testbed/testbed_api_testbed.c:1203

 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 

-#: src/testbed/testbed_api_testbed.c:1264
+#: src/testbed/testbed_api_testbed.c:1263

 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 

-#: src/testbed/testbed_api_testbed.c:1276
+#: src/testbed/testbed_api_testbed.c:1275

 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 

-#: src/testbed/testbed_api_testbed.c:1300
+#: src/testbed/testbed_api_testbed.c:1299

 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 

-#: src/testbed/testbed_api_testbed.c:1350
+#: 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 ""
 
 #, 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:1366
+#: 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 ""
 
 #, 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:715
+#: src/testbed/testbed_api_topology.c:960

 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 

-#: src/testbed/testbed_api_topology.c:721
+#: src/testbed/testbed_api_topology.c:966

 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 

-#: src/testbed/testbed_api_topology.c:728
+#: src/testbed/testbed_api_topology.c:973

 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 

-#: src/testbed/testbed_api_topology.c:750
+#: src/testbed/testbed_api_topology.c:995

 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/testbed/testbed_api_topology.c:759
-#: src/testbed/testbed_api_topology.c:783
+#: 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 ""
 
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 

-#: src/testbed/testbed_api_topology.c:765
-#: src/testbed/testbed_api_topology.c:789
+#: 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"
 
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/testbed/testbed_api_topology.c:771
-#: src/testbed/testbed_api_topology.c:795
+#: 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 ""
 
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 

-#: src/testbed/testbed_api_topology.c:810
+#: 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"
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "无法连接到 %s:%u：%s\n"


@@ -6170,63 +6627,66 @@ msgstr ""
 msgid "Command line tool to access the testing library"
 msgstr ""
 
 msgid "Command line tool to access the testing library"
 msgstr ""
 

-#: src/testing/testing.c:277
-#, c-format
-msgid "Hostkeys file not found: %s\n"
+#: src/testing/list-keys.c:90
+msgid "list COUNT number of keys"

 msgstr ""
 
 msgstr ""
 

-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
+#: src/testing/list-keys.c:93
+msgid "skip COUNT number of keys in the beginning"
+msgstr ""
+
+#: src/testing/testing.c:277

 #, c-format
 #, c-format

-msgid "Incorrect hostkey file format: %s\n"
+msgid "Hostkeys file not found: %s\n"

 msgstr ""
 
 msgstr ""
 

-#: src/testing/testing.c:716
+#: src/testing/testing.c:718

 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 

-#: src/testing/testing.c:1155
+#: 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 ""
 
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 

-#: src/testing/testing.c:1164
+#: src/testing/testing.c:1166

 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/testing/testing.c:1174
+#: src/testing/testing.c:1176

 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 
 msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
 msgstr ""
 

-#: src/testing/testing.c:1187
+#: src/testing/testing.c:1189

 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/testing/testing.c:1201
+#: src/testing/testing.c:1203

 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy, c-format
 msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/testing/testing.c:1213
+#: src/testing/testing.c:1215

 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 

-#: src/testing/testing.c:1238
+#: src/testing/testing.c:1240

 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/testing/testing.c:1340
+#: src/testing/testing.c:1342

 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 

-#: src/testing/testing.c:1704
+#: src/testing/testing.c:1706

 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"


@@ -6236,6 +6696,11 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 

+#: src/topology/friends.c:154
+#, c-format
+msgid "Directory for file `%s' does not seem to be writable.\n"
+msgstr ""
+

 #: src/topology/gnunet-daemon-topology.c:255
 msgid "# peers blacklisted"
 msgstr ""
 #: src/topology/gnunet-daemon-topology.c:255
 msgid "# peers blacklisted"
 msgstr ""


@@ -6244,721 +6709,875 @@ msgstr ""
 msgid "# connect requests issued to transport"
 msgstr ""
 
 msgid "# connect requests issued to transport"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:727
-#: src/topology/gnunet-daemon-topology.c:812
+#: src/topology/gnunet-daemon-topology.c:728
+#: src/topology/gnunet-daemon-topology.c:813

 msgid "# friends connected"
 msgstr ""
 
 msgid "# friends connected"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:993

 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1021
+#: src/topology/gnunet-daemon-topology.c:1022

 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1028
+#: src/topology/gnunet-daemon-topology.c:1029

 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 

-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:1050

 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1051
+#: src/topology/gnunet-daemon-topology.c:1052

 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 

-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:1057

 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1063

 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1093
+#: src/topology/gnunet-daemon-topology.c:1094

 msgid "# HELLO messages received"
 msgstr ""
 
 msgid "# HELLO messages received"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1150
+#: src/topology/gnunet-daemon-topology.c:1151

 msgid "# HELLO messages gossipped"
 msgstr ""
 
 msgid "# HELLO messages gossipped"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1289
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:1296
+msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"

 msgstr ""
 
 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 服务"
 
 #, 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 ""
 
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_blacklist.c:455
-#: src/transport/gnunet-service-transport_blacklist.c:722
+#: src/transport/gnunet-service-transport_blacklist.c:464
+#: src/transport/gnunet-service-transport_blacklist.c:745

 msgid "# disconnects due to blacklist"
 msgstr ""
 
 msgid "# disconnects due to blacklist"
 msgstr ""
 

-#: src/transport/gnunet-service-transport.c:206
+#: src/transport/gnunet-service-transport.c:220

 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 

-#: src/transport/gnunet-service-transport.c:325
+#: src/transport/gnunet-service-transport.c:424

 msgid "# bytes total received"
 msgstr ""
 
 msgid "# bytes total received"
 msgstr ""
 

-#: src/transport/gnunet-service-transport.c:399
+#: src/transport/gnunet-service-transport.c:515

 msgid "# bytes payload received"
 msgstr ""
 
 msgid "# bytes payload received"
 msgstr ""
 

-#: src/transport/gnunet-service-transport.c:574
+#: src/transport/gnunet-service-transport.c:708

 #, fuzzy, c-format
 msgid "Could not obtain a valid network for `%s' %s (%s)\n"
 msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
 
 #, fuzzy, c-format
 msgid "Could not obtain a valid network for `%s' %s (%s)\n"
 msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
 

-#: src/transport/gnunet-service-transport.c:628
+#: src/transport/gnunet-service-transport.c:755

 #, c-format
 msgid ""
 "Address or session unknown: failed to update properties for peer `%s' plugin "
 "`%s' address `%s' session %p\n"
 msgstr ""
 
 #, 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.c:916
+#: src/transport/gnunet-service-transport.c:1106

 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置？"
 
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置？"
 

-#: src/transport/gnunet-service-transport_clients.c:384
+#: src/transport/gnunet-service-transport_clients.c:432

 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
 #, 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:391
+#: src/transport/gnunet-service-transport_clients.c:439

 msgid "# messages dropped due to slow client"
 msgstr ""
 
 msgid "# messages dropped due to slow client"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_clients.c:533
+#: src/transport/gnunet-service-transport_clients.c:596

 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_clients.c:674
+#: src/transport/gnunet-service-transport_clients.c:737

 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_clients.c:731
+#: src/transport/gnunet-service-transport_clients.c:770
+#, fuzzy, c-format
+msgid "Blacklist refuses connection attempt to peer `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-service-transport_clients.c:776
+#, fuzzy, c-format
+msgid "Blacklist allows connection attempt to peer `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-service-transport_clients.c:801

 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_hello.c:181
+#: src/transport/gnunet-service-transport_clients.c:815
+#, fuzzy, c-format
+msgid "Received a request connect message for peer `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/transport/gnunet-service-transport_clients.c:826
+msgid "# REQUEST DISCONNECT messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:840
+#, 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 ""
 
 msgid "# refreshed my HELLO"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1108
+#: src/transport/gnunet-service-transport_neighbours.c:1095

 msgid "# DISCONNECT messages sent"
 msgstr ""
 
 msgid "# DISCONNECT messages sent"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1244
-#: src/transport/gnunet-service-transport_neighbours.c:1653
+#: 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 ""
 
 msgid "# bytes in message queue for other peers"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1249
+#: src/transport/gnunet-service-transport_neighbours.c:1225

 msgid "# messages transmitted to other peers"
 msgstr ""
 
 msgid "# messages transmitted to other peers"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1254
+#: src/transport/gnunet-service-transport_neighbours.c:1230

 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1311
+#: src/transport/gnunet-service-transport_neighbours.c:1288

 msgid "# messages timed out while in transport queue"
 msgstr ""
 
 msgid "# messages timed out while in transport queue"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1368
+#: src/transport/gnunet-service-transport_neighbours.c:1349

 msgid "# keepalives sent"
 msgstr ""
 
 msgid "# keepalives sent"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1401
+#: src/transport/gnunet-service-transport_neighbours.c:1382

 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1409
+#: src/transport/gnunet-service-transport_neighbours.c:1390

 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1456
+#: src/transport/gnunet-service-transport_neighbours.c:1437

 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1465
+#: src/transport/gnunet-service-transport_neighbours.c:1446

 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1473
+#: src/transport/gnunet-service-transport_neighbours.c:1454

 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr ""
 
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1481
+#: src/transport/gnunet-service-transport_neighbours.c:1462

 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr ""
 
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1558
+#: src/transport/gnunet-service-transport_neighbours.c:1540

 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1592
+#: src/transport/gnunet-service-transport_neighbours.c:1574

 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1608
+#: src/transport/gnunet-service-transport_neighbours.c:1590

 msgid "# ms throttling suggested"
 msgstr ""
 
 msgid "# ms throttling suggested"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1700
+#: src/transport/gnunet-service-transport_neighbours.c:1685
+#, fuzzy, c-format
+msgid ""
+"Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1712
+msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1757

 msgid "# SESSION_CONNECT messages sent"
 msgstr ""
 
 msgid "# SESSION_CONNECT messages sent"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1716
+#: src/transport/gnunet-service-transport_neighbours.c:1773

 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT message via plugin to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT message via plugin to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/transport/gnunet-service-transport_neighbours.c:1759
+#: src/transport/gnunet-service-transport_neighbours.c:1800
+msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1849
+#, c-format
+msgid ""
+"Failed to send CONNECT_ACK message to peer `%s' using address `%s' session "
+"%p\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1904

 msgid "# CONNECT_ACK messages sent"
 msgstr ""
 
 msgid "# CONNECT_ACK messages sent"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2236
+#: src/transport/gnunet-service-transport_neighbours.c:1919
+#, fuzzy, c-format
+msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2196
+#, fuzzy, c-format
+msgid "Blacklisting disapproved to connect to peer `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2316

 msgid "# CONNECT messages received"
 msgstr ""
 
 msgid "# CONNECT messages received"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2241
+#: src/transport/gnunet-service-transport_neighbours.c:2321

 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2979
+#: src/transport/gnunet-service-transport_neighbours.c:2594
+msgid "# Attempts to switch addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3016
+#, fuzzy
+msgid "# Failed attempts to switch addresses (no response)"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3111

 msgid "# CONNECT_ACK messages received"
 msgstr ""
 
 msgid "# CONNECT_ACK messages received"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2987
+#: src/transport/gnunet-service-transport_neighbours.c:3119

 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:3002
-#: src/transport/gnunet-service-transport_neighbours.c:3039
+#: src/transport/gnunet-service-transport_neighbours.c:3133
+#: src/transport/gnunet-service-transport_neighbours.c:3168

 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:3052
+#: src/transport/gnunet-service-transport_neighbours.c:3180

 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:3085
+#: src/transport/gnunet-service-transport_neighbours.c:3203
+msgid "# Successful attempts to switch addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3211

 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:3265
+#: src/transport/gnunet-service-transport_neighbours.c:3399

 msgid "# SESSION_ACK messages received"
 msgstr ""
 
 msgid "# SESSION_ACK messages received"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:3284
+#: src/transport/gnunet-service-transport_neighbours.c:3435

 msgid "# unexpected SESSION_ACK messages"
 msgstr ""
 
 msgid "# unexpected SESSION_ACK messages"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:3340
+#: src/transport/gnunet-service-transport_neighbours.c:3509

 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:3355
+#: src/transport/gnunet-service-transport_neighbours.c:3524

 msgid "# disconnects due to quota of 0"
 msgstr ""
 
 msgid "# disconnects due to quota of 0"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:3383
-msgid "# disconnect messages ignored (old format)"
+#: src/transport/gnunet-service-transport_neighbours.c:3564
+msgid "# disconnect messages ignored (malformed)"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:3389
+#: src/transport/gnunet-service-transport_neighbours.c:3570

 msgid "# DISCONNECT messages received"
 msgstr ""
 
 msgid "# DISCONNECT messages received"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:3398
+#: src/transport/gnunet-service-transport_neighbours.c:3579

 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:3434
-msgid "# other peer asked to disconnect from us"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:3532
+#: src/transport/gnunet-service-transport_neighbours.c:3706

 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_plugins.c:116
+#: src/transport/gnunet-service-transport_plugins.c:120

 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_plugins.c:172
-#: src/transport/gnunet-service-transport_plugins.c:180
-#: src/transport/gnunet-service-transport_plugins.c:188
-#: src/transport/gnunet-service-transport_plugins.c:196
-#: src/transport/gnunet-service-transport_plugins.c:204
-#: src/transport/gnunet-service-transport_plugins.c:212
-#: src/transport/gnunet-service-transport_plugins.c:220
-#: src/transport/gnunet-service-transport_plugins.c:228
-#: src/transport/gnunet-service-transport_plugins.c:236
-#: src/transport/gnunet-service-transport_plugins.c:244
-#: src/transport/gnunet-service-transport_plugins.c:252
+#: src/transport/gnunet-service-transport_plugins.c:178
+#: src/transport/gnunet-service-transport_plugins.c:186
+#: src/transport/gnunet-service-transport_plugins.c:194
+#: src/transport/gnunet-service-transport_plugins.c:202
+#: src/transport/gnunet-service-transport_plugins.c:210
+#: src/transport/gnunet-service-transport_plugins.c:218
+#: src/transport/gnunet-service-transport_plugins.c:226
+#: src/transport/gnunet-service-transport_plugins.c:234
+#: src/transport/gnunet-service-transport_plugins.c:242
+#: src/transport/gnunet-service-transport_plugins.c:250
+#: src/transport/gnunet-service-transport_plugins.c:258

 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/transport/gnunet-service-transport_plugins.c:259
+#: src/transport/gnunet-service-transport_plugins.c:265

 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:456
+#: src/transport/gnunet-service-transport_validation.c:488

 msgid "# address records discarded"
 msgstr ""
 
 msgid "# address records discarded"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:526
+#: src/transport/gnunet-service-transport_validation.c:558

 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
 #, 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:584
+#: src/transport/gnunet-service-transport_validation.c:616

 msgid "# PING without HELLO messages sent"
 msgstr ""
 
 msgid "# PING without HELLO messages sent"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:685
+#: src/transport/gnunet-service-transport_validation.c:722

 msgid "# address revalidations started"
 msgstr ""
 
 msgid "# address revalidations started"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:969
+#: src/transport/gnunet-service-transport_validation.c:1011

 msgid "# PING message for different peer received"
 msgstr ""
 
 msgid "# PING message for different peer received"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1019
+#: src/transport/gnunet-service-transport_validation.c:1062

 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1029
+#: src/transport/gnunet-service-transport_validation.c:1072

 msgid "# failed address checks during validation"
 msgstr ""
 
 msgid "# failed address checks during validation"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1032
+#: src/transport/gnunet-service-transport_validation.c:1075

 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1040
+#: src/transport/gnunet-service-transport_validation.c:1083

 msgid "# successful address checks during validation"
 msgstr ""
 
 msgid "# successful address checks during validation"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1052
+#: 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 ""
 
 #, 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:1060
+#: src/transport/gnunet-service-transport_validation.c:1103

 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1114
+#: src/transport/gnunet-service-transport_validation.c:1157

 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "发送消息失败。\n"
 
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "发送消息失败。\n"
 

-#: src/transport/gnunet-service-transport_validation.c:1163
+#: src/transport/gnunet-service-transport_validation.c:1206

 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1172
+#: src/transport/gnunet-service-transport_validation.c:1215

 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1312
+#: src/transport/gnunet-service-transport_validation.c:1356

 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1327
+#: src/transport/gnunet-service-transport_validation.c:1371

 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1448
+#: src/transport/gnunet-service-transport_validation.c:1493
+#, c-format
+msgid "Validation received new %s message for peer `%s' with size %u\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1500

 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:258
+#: src/transport/gnunet-transport.c:388

 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:265
+#: src/transport/gnunet-transport.c:396

 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:296
+#: src/transport/gnunet-transport.c:436

 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/transport/gnunet-transport.c:309
+#: src/transport/gnunet-transport.c:449

 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/transport/gnunet-transport.c:318
+#: src/transport/gnunet-transport.c:459

 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/transport/gnunet-transport.c:423
+#: src/transport/gnunet-transport.c:483
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did not work!\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/transport/gnunet-transport.c:487
+#, fuzzy, c-format
+msgid "Configuration for plugin `%s' did work!\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/transport/gnunet-transport.c:491
+#, fuzzy, c-format
+msgid "Internal NAT error while running test for plugin `%s'\n"
+msgstr "未知错误。\n"
+
+#: src/transport/gnunet-transport.c:495
+#, fuzzy, c-format
+msgid "Failed to start NAT test for plugin `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:499
+#, c-format
+msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:614
+#, 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:643
+#, fuzzy, c-format
+msgid "Peer `%s' %s `%s' \n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/transport/gnunet-transport.c:717 src/transport/gnunet-transport.c:1240
+#, fuzzy
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:784

 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:798

 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
 #, 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:823
+#, fuzzy
+msgid "Failed to start resolver!\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/transport/gnunet-transport.c:866

 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:529
+#: src/transport/gnunet-transport.c:888

 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/transport/gnunet-transport.c:552
+#: src/transport/gnunet-transport.c:912

 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:587
+#: src/transport/gnunet-transport.c:943
+#, fuzzy, c-format
+msgid "Successfully disconnected from `%s'\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/transport/gnunet-transport.c:966

 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/transport/gnunet-transport.c:660
+#: src/transport/gnunet-transport.c:988 src/transport/gnunet-transport.c:1009

 #, c-format
 #, c-format

-msgid "Received %u bytes from %s\n"
+msgid "%24s: %-17s %4s   (%u connections in total)\n"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-transport.c:685
-#, fuzzy, c-format
-msgid "Peer `%s': %s %s\n"
-msgstr "运行 %s失败：%s %d\n"
+#: src/transport/gnunet-transport.c:989
+#, fuzzy
+msgid "Connected to"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/transport/gnunet-transport.c:1010
+#, fuzzy
+msgid "Disconnected from"
+msgstr "“%s”已连接到“%s”。\n"

 
 

-#: src/transport/gnunet-transport.c:704
+#: src/transport/gnunet-transport.c:1031

 #, c-format
 #, c-format

-msgid "Peer `%s': %s <unable to resolve address>\n"
+msgid "Received %u bytes from %s\n"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-transport.c:772
-#, fuzzy, c-format
-msgid "Peer `%s' disconnected\n"
+#: src/transport/gnunet-transport.c:1061
+#, c-format
+msgid "Peer `%s': %s %s in state `%s' until %s\n"

 msgstr ""
 msgstr ""

-"\n"
-"按任意键继续\n"

 
 

-#: src/transport/gnunet-transport.c:802
+#: src/transport/gnunet-transport.c:1072
+#, fuzzy, c-format
+msgid "Peer `%s': %s %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/transport/gnunet-transport.c:1300 src/transport/gnunet-transport.c:1325

 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/transport/gnunet-transport.c:848
+#: src/transport/gnunet-transport.c:1369

 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:855
+#: src/transport/gnunet-transport.c:1377

 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:878 src/transport/gnunet-transport.c:910
-#: src/transport/gnunet-transport.c:932 src/transport/gnunet-transport.c:969
+#: src/transport/gnunet-transport.c:1396 src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1456 src/transport/gnunet-transport.c:1479
+#: src/transport/gnunet-transport.c:1523

 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/transport/gnunet-transport.c:887 src/transport/gnunet-transport.c:917
+#: src/transport/gnunet-transport.c:1405 src/transport/gnunet-transport.c:1435
+#: src/transport/gnunet-transport.c:1465

 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/transport/gnunet-transport.c:937
+#: src/transport/gnunet-transport.c:1484

 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:1019
+#: src/transport/gnunet-transport.c:1569
+#, fuzzy
+msgid "print information for all peers (instead of only connected peers )"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/gnunet-transport.c:1572

 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:1022
+#: src/transport/gnunet-transport.c:1575

 #, fuzzy
 msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/transport/gnunet-transport.c:1025
+#: src/transport/gnunet-transport.c:1578
+#, fuzzy
+msgid "disconnect to a peer"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:1581
+#, fuzzy
+msgid "print information for all pending validations "
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/gnunet-transport.c:1584
+#, fuzzy
+msgid "print information for all pending validations continously"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/gnunet-transport.c:1587

 msgid "provide information about all current connections (once)"
 msgstr ""
 
 msgid "provide information about all current connections (once)"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:1593

 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:1034
+#: src/transport/gnunet-transport.c:1595

 msgid "do not resolve hostnames"
 msgstr ""
 
 msgid "do not resolve hostnames"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:1037
+#: src/transport/gnunet-transport.c:1597

 msgid "peer identity"
 msgstr ""
 
 msgid "peer identity"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:1041
+#: src/transport/gnunet-transport.c:1599

 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:1044
+#: src/transport/gnunet-transport.c:1602

 msgid "test transport configuration (involves external server)"
 msgstr ""
 
 msgid "test transport configuration (involves external server)"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:1055
+#: src/transport/gnunet-transport.c:1611

 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/transport/plugin_transport_bluetooth.c:616
+#: src/transport/plugin_transport_bluetooth.c:621

 msgid "# Bluetooth ACKs sent"
 msgstr ""
 
 msgid "# Bluetooth ACKs sent"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:635
+#: src/transport/plugin_transport_bluetooth.c:640

 msgid "# Bluetooth messages defragmented"
 msgstr ""
 
 msgid "# Bluetooth messages defragmented"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:681
-#: src/transport/plugin_transport_bluetooth.c:731
-#: src/transport/plugin_transport_bluetooth.c:1881
+#: src/transport/plugin_transport_bluetooth.c:686
+#: src/transport/plugin_transport_bluetooth.c:737
+#: src/transport/plugin_transport_bluetooth.c:1942

 msgid "# Bluetooth sessions allocated"
 msgstr ""
 
 msgid "# Bluetooth sessions allocated"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:806
+#: src/transport/plugin_transport_bluetooth.c:837

 msgid "# Bluetooth message fragments sent"
 msgstr ""
 
 msgid "# Bluetooth message fragments sent"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:830
+#: src/transport/plugin_transport_bluetooth.c:861

 msgid "# Bluetooth messages pending (with fragmentation)"
 msgstr ""
 
 msgid "# Bluetooth messages pending (with fragmentation)"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:938
-#: src/transport/plugin_transport_bluetooth.c:1023
-#: src/transport/plugin_transport_bluetooth.c:1883
+#: src/transport/plugin_transport_bluetooth.c:969
+#: src/transport/plugin_transport_bluetooth.c:1054
+#: src/transport/plugin_transport_bluetooth.c:1944

 msgid "# Bluetooth MAC endpoints allocated"
 msgstr ""
 
 msgid "# Bluetooth MAC endpoints allocated"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:1250
+#: src/transport/plugin_transport_bluetooth.c:1307

 msgid "# HELLO messages received via Bluetooth"
 msgstr ""
 
 msgid "# HELLO messages received via Bluetooth"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:1276
+#: src/transport/plugin_transport_bluetooth.c:1331

 msgid "# fragments received via Bluetooth"
 msgstr ""
 
 msgid "# fragments received via Bluetooth"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:1286
+#: src/transport/plugin_transport_bluetooth.c:1341

 msgid "# ACKs received via Bluetooth"
 msgstr ""
 
 msgid "# ACKs received via Bluetooth"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:1343
+#: src/transport/plugin_transport_bluetooth.c:1401

 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr ""
 
 msgid "# Bluetooth DATA messages discarded due to CRC32 error"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:1455
+#: src/transport/plugin_transport_bluetooth.c:1512

 msgid "# DATA messages received via Bluetooth"
 msgstr ""
 
 msgid "# DATA messages received via Bluetooth"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:1490
+#: src/transport/plugin_transport_bluetooth.c:1547

 msgid "# Bluetooth DATA messages processed"
 msgstr ""
 
 msgid "# Bluetooth DATA messages processed"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:1553
+#: src/transport/plugin_transport_bluetooth.c:1610

 msgid "# HELLO beacons sent via Bluetooth"
 msgstr ""
 
 msgid "# HELLO beacons sent via Bluetooth"
 msgstr ""
 

-#: src/transport/plugin_transport_bluetooth.c:1666
-msgid "Bluetooth address with invalid size encountered\n"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:1862
+#: src/transport/plugin_transport_bluetooth.c:1923

 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_client.c:1618
+#: src/transport/plugin_transport_http_client.c:1685

 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_client.c:1693
-#: src/transport/plugin_transport_http_server.c:3001
+#: src/transport/plugin_transport_http_client.c:1760
+#: src/transport/plugin_transport_http_server.c:3031

 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 

-#: src/transport/plugin_transport_http_client.c:1718
-#: src/transport/plugin_transport_http_server.c:3059
+#: src/transport/plugin_transport_http_client.c:1785
+#: src/transport/plugin_transport_http_server.c:3088

 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_client.c:1746
-#: src/transport/plugin_transport_http_server.c:2901
+#: src/transport/plugin_transport_http_client.c:1819
+#: src/transport/plugin_transport_http_server.c:2931

 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 

-#: src/transport/plugin_transport_http_server.c:1416
+#: src/transport/plugin_transport_http_server.c:1423

 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
 #, 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:1680
+#: src/transport/plugin_transport_http_server.c:1687

 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:1688
+#: src/transport/plugin_transport_http_server.c:1695

 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:1974
+#: src/transport/plugin_transport_http_server.c:1982

 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
 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:1998
+#: src/transport/plugin_transport_http_server.c:2006

 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:2405
+#: src/transport/plugin_transport_http_server.c:2429

 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 

-#: src/transport/plugin_transport_http_server.c:2437 src/util/service.c:696
+#: src/transport/plugin_transport_http_server.c:2461 src/util/service.c:700

 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/transport/plugin_transport_http_server.c:2454 src/util/service.c:713
+#: src/transport/plugin_transport_http_server.c:2478 src/util/service.c:719

 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/transport/plugin_transport_http_server.c:2565
+#: src/transport/plugin_transport_http_server.c:2589

 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:2637
+#: src/transport/plugin_transport_http_server.c:2661

 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:2724
+#: src/transport/plugin_transport_http_server.c:2754

 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:2738
+#: src/transport/plugin_transport_http_server.c:2768

 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:2745
+#: src/transport/plugin_transport_http_server.c:2775

 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:2756
+#: src/transport/plugin_transport_http_server.c:2786

 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 

-#: src/transport/plugin_transport_http_server.c:2763
+#: src/transport/plugin_transport_http_server.c:2793

 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:2778
+#: src/transport/plugin_transport_http_server.c:2808

 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:2788
+#: src/transport/plugin_transport_http_server.c:2818

 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 

-#: src/transport/plugin_transport_http_server.c:2809
+#: src/transport/plugin_transport_http_server.c:2839

 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:2819
+#: src/transport/plugin_transport_http_server.c:2849

 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 

-#: src/transport/plugin_transport_http_server.c:2871
+#: src/transport/plugin_transport_http_server.c:2901

 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
 

-#: src/transport/plugin_transport_http_server.c:2887
+#: src/transport/plugin_transport_http_server.c:2917

 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 

+#: src/transport/plugin_transport_http_server.c:3177
+#, 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"
 #: src/transport/plugin_transport_smtp.c:223
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"


@@ -7001,219 +7620,224 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:576
+#: src/transport/plugin_transport_tcp.c:565

 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:799
-#: src/transport/plugin_transport_tcp.c:979
-#: src/transport/plugin_transport_tcp.c:2120
-#: src/transport/plugin_transport_tcp.c:2723
+#: src/transport/plugin_transport_tcp.c:787
+#: src/transport/plugin_transport_tcp.c:962
+#: src/transport/plugin_transport_tcp.c:2047
+#: src/transport/plugin_transport_tcp.c:2620

 msgid "# TCP sessions active"
 msgstr ""
 
 msgid "# TCP sessions active"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:835
-#: src/transport/plugin_transport_tcp.c:972
-#: src/transport/plugin_transport_tcp.c:1061
-#: src/transport/plugin_transport_tcp.c:1111
-#: src/transport/plugin_transport_tcp.c:1290
-#: src/transport/plugin_transport_tcp.c:1309
+#: src/transport/plugin_transport_tcp.c:823
+#: src/transport/plugin_transport_tcp.c:955
+#: src/transport/plugin_transport_tcp.c:1045
+#: src/transport/plugin_transport_tcp.c:1093
+#: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_tcp.c:1277

 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:839
+#: src/transport/plugin_transport_tcp.c:826

 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:1065
+#: src/transport/plugin_transport_tcp.c:1048

 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:1114
+#: src/transport/plugin_transport_tcp.c:1096

 msgid "# bytes transmitted via TCP"
 msgstr ""
 
 msgid "# bytes transmitted via TCP"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:1263
+#: src/transport/plugin_transport_tcp.c:1233

 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:1520
-#: src/transport/plugin_transport_udp.c:1488
+#: src/transport/plugin_transport_tcp.c:1504

 msgid "# requests to create session with invalid address"
 msgstr ""
 
 msgid "# requests to create session with invalid address"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:1645
+#: src/transport/plugin_transport_tcp.c:1609

 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:2170
+#: src/transport/plugin_transport_tcp.c:2097

 msgid "# TCP WELCOME messages received"
 msgstr ""
 
 msgid "# TCP WELCOME messages received"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:2355
+#: src/transport/plugin_transport_tcp.c:2257

 msgid "# bytes received via TCP"
 msgstr ""
 
 msgid "# bytes received via TCP"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:2433
+#: src/transport/plugin_transport_tcp.c:2321

 msgid "# network-level TCP disconnect events"
 msgstr ""
 
 msgid "# network-level TCP disconnect events"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:2602 src/util/service.c:589
-#: src/util/service.c:595
+#: src/transport/plugin_transport_tcp.c:2490 src/util/service.c:582
+#: src/util/service.c:588

 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:2616
+#: src/transport/plugin_transport_tcp.c:2504

 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/transport/plugin_transport_tcp.c:2712
+#: src/transport/plugin_transport_tcp.c:2607

 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:2715
+#: src/transport/plugin_transport_tcp.c:2611

 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:2718
+#: src/transport/plugin_transport_tcp.c:2615

 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 

-#: src/transport/plugin_transport_udp_broadcasting.c:173
+#: src/transport/plugin_transport_udp_broadcasting.c:167

 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 

-#: src/transport/plugin_transport_udp_broadcasting.c:222
+#: src/transport/plugin_transport_udp_broadcasting.c:210

 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 

-#: src/transport/plugin_transport_udp_broadcasting.c:606
+#: src/transport/plugin_transport_udp_broadcasting.c:603

 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 

-#: src/transport/plugin_transport_udp_broadcasting.c:629
+#: 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 ""
 
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 

-#: src/transport/plugin_transport_udp.c:1599
+#: src/transport/plugin_transport_udp.c:1513

 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
 #, 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:2680
+#: src/transport/plugin_transport_udp.c:2602

 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
 #, 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:2694
+#: src/transport/plugin_transport_udp.c:2616

 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 

-#: src/transport/plugin_transport_udp.c:2993
+#: src/transport/plugin_transport_udp.c:2961

 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/transport/plugin_transport_udp.c:3091
+#: src/transport/plugin_transport_udp.c:3056

 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 

-#: src/transport/plugin_transport_udp.c:3134
+#: src/transport/plugin_transport_udp.c:3097

 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 

-#: src/transport/plugin_transport_udp.c:3200
+#: src/transport/plugin_transport_udp.c:3168

 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "发送消息失败。\n"
 
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "发送消息失败。\n"
 

-#: src/transport/plugin_transport_unix.c:1657
+#: src/transport/plugin_transport_unix.c:1321
+#, fuzzy, c-format
+msgid "Cannot create path to `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/transport/plugin_transport_unix.c:1645
+#, fuzzy
+msgid "No UNIXPATH given in configuration!\n"
+msgstr "保存配置失败。"
+
+#: src/transport/plugin_transport_unix.c:1681

 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/transport/plugin_transport_wlan.c:623
+#: src/transport/plugin_transport_wlan.c:620

 msgid "# WLAN ACKs sent"
 msgstr ""
 
 msgid "# WLAN ACKs sent"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:642
+#: src/transport/plugin_transport_wlan.c:639

 msgid "# WLAN messages defragmented"
 msgstr ""
 
 msgid "# WLAN messages defragmented"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:691
-#: src/transport/plugin_transport_wlan.c:778
-#: src/transport/plugin_transport_wlan.c:1937
+#: src/transport/plugin_transport_wlan.c:688
+#: src/transport/plugin_transport_wlan.c:772
+#: src/transport/plugin_transport_wlan.c:1948

 msgid "# WLAN sessions allocated"
 msgstr ""
 
 msgid "# WLAN sessions allocated"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:883
+#: src/transport/plugin_transport_wlan.c:876

 msgid "# WLAN message fragments sent"
 msgstr ""
 
 msgid "# WLAN message fragments sent"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:907
+#: src/transport/plugin_transport_wlan.c:900

 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:1015
-#: src/transport/plugin_transport_wlan.c:1101
-#: src/transport/plugin_transport_wlan.c:1939
+#: src/transport/plugin_transport_wlan.c:1008
+#: src/transport/plugin_transport_wlan.c:1098
+#: src/transport/plugin_transport_wlan.c:1950

 msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
 msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:1297
+#: src/transport/plugin_transport_wlan.c:1302

 msgid "# HELLO messages received via WLAN"
 msgstr ""
 
 msgid "# HELLO messages received via WLAN"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:1323
+#: src/transport/plugin_transport_wlan.c:1326

 msgid "# fragments received via WLAN"
 msgstr ""
 
 msgid "# fragments received via WLAN"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:1333
+#: src/transport/plugin_transport_wlan.c:1336

 msgid "# ACKs received via WLAN"
 msgstr ""
 
 msgid "# ACKs received via WLAN"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:1390
+#: src/transport/plugin_transport_wlan.c:1396

 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:1511
+#: src/transport/plugin_transport_wlan.c:1518

 msgid "# DATA messages received via WLAN"
 msgstr ""
 
 msgid "# DATA messages received via WLAN"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:1546
+#: src/transport/plugin_transport_wlan.c:1553

 msgid "# WLAN DATA messages processed"
 msgstr ""
 
 msgid "# WLAN DATA messages processed"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:1609
+#: src/transport/plugin_transport_wlan.c:1616

 msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
 msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:1722
-msgid "WLAN address with invalid size encountered\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1918
+#: src/transport/plugin_transport_wlan.c:1929

 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 

-#: src/transport/transport_api.c:690
+#: src/transport/transport_api.c:739

 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""


@@ -7257,12 +7881,12 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 

-#: src/util/client.c:261 src/util/client.c:857 src/util/service.c:625
+#: 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 ""
 
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 

-#: src/util/client.c:265 src/util/client.c:862 src/util/service.c:629
+#: 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"
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s：选项“%s”有歧义\n"


@@ -7279,17 +7903,17 @@ msgstr ""
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 

-#: src/util/client.c:995
+#: src/util/client.c:1008

 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 

-#: src/util/client.c:1007
+#: src/util/client.c:1020

 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 

-#: src/util/client.c:1290
+#: src/util/client.c:1303

 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 


@@ -7327,20 +7951,20 @@ msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
 msgid "INVALID"
 msgstr ""
 
 msgid "INVALID"
 msgstr ""
 

-#: src/util/common_logging.c:1150
+#: src/util/common_logging.c:1157

 msgid "unknown address"
 msgstr ""
 
 msgid "unknown address"
 msgstr ""
 

-#: src/util/common_logging.c:1189
+#: src/util/common_logging.c:1196

 msgid "invalid address"
 msgstr ""
 
 msgid "invalid address"
 msgstr ""
 

-#: src/util/common_logging.c:1207
+#: src/util/common_logging.c:1214

 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 

-#: src/util/common_logging.c:1228
+#: src/util/common_logging.c:1235

 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"


@@ -7351,24 +7975,24 @@ msgstr "配置不满足配置规范文件“%s”的约束！\n"
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 

-#: src/util/configuration.c:996
+#: 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 ""
 
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 

-#: src/util/configuration.c:1066
+#: src/util/configuration.c:1093

 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 

-#: src/util/configuration.c:1098
+#: src/util/configuration.c:1125

 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 

-#: src/util/configuration.c:1172
+#: src/util/configuration.c:1199

 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "


@@ -7391,12 +8015,12 @@ msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 

-#: src/util/connection.c:751 src/util/connection.c:909
+#: src/util/connection.c:751 src/util/connection.c:919

 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u：%s\n"
 

-#: src/util/connection.c:900
+#: src/util/connection.c:910

 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""


@@ -7408,57 +8032,57 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
 "%llu)\n"
 msgstr ""
 

-#: src/util/crypto_ecc.c:789 src/util/crypto_ecc.c:827
-#: src/util/crypto_ecc.c:945 src/util/crypto_ecc.c:983
+#: 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"
 
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 

-#: src/util/crypto_ecc.c:794 src/util/crypto_ecc.c:950
+#: 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"
 
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 

-#: src/util/crypto_ecc.c:831 src/util/crypto_ecc.c:987
+#: 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 ""
 
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 

-#: src/util/crypto_ecc.c:861 src/util/crypto_ecc.c:1017
+#: 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 ""
 
 #, 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:865 src/util/crypto_ecc.c:1021
+#: 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 ""
 
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 

-#: src/util/crypto_ecc.c:1103
+#: src/util/crypto_ecc.c:1016

 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/util/crypto_ecc.c:1207
+#: 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"
 
 #, 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:1257
+#: 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"
 
 #, 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:1331
+#: 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"
 
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 

-#: src/util/crypto_ecc.c:1388
+#: 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"
 
 #, 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:280
+#: src/util/crypto_random.c:284

 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"


@@ -7468,7 +8092,7 @@ msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 

-#: src/util/disk.c:1546 src/util/service.c:1315
+#: src/util/disk.c:1546 src/util/service.c:1323

 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"


@@ -7626,35 +8250,35 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "Could not read hostkey file: %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 msgid "Could not read hostkey file: %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/util/gnunet-ecc.c:286
+#: src/util/gnunet-ecc.c:283

 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 

-#: src/util/gnunet-ecc.c:341
+#: src/util/gnunet-ecc.c:349

 msgid "list keys included in a file (for testing)"
 msgstr ""
 
 msgid "list keys included in a file (for testing)"
 msgstr ""
 

-#: src/util/gnunet-ecc.c:344
+#: src/util/gnunet-ecc.c:352

 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 

-#: src/util/gnunet-ecc.c:347
+#: src/util/gnunet-ecc.c:355

 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 

-#: src/util/gnunet-ecc.c:350
+#: src/util/gnunet-ecc.c:358

 msgid "print the public key in ASCII format"
 msgstr ""
 
 msgid "print the public key in ASCII format"
 msgstr ""
 

-#: src/util/gnunet-ecc.c:353
+#: src/util/gnunet-ecc.c:361

 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 

-#: src/util/gnunet-ecc.c:356
+#: src/util/gnunet-ecc.c:364

 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 

-#: src/util/gnunet-ecc.c:367
+#: src/util/gnunet-ecc.c:375

 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"


@@ -7667,13 +8291,34 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 

-#: src/util/gnunet-service-resolver.c:283
+#: 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-scrypt.c:299
+#, fuzzy
+msgid "Manipulate GNUnet proof of work files"
+msgstr "更改配置文件中的一个值"
+
+#: src/util/gnunet-service-resolver.c:299

 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 

-#: src/util/gnunet-service-resolver.c:350
-#: src/util/gnunet-service-resolver.c:391
+#: src/util/gnunet-service-resolver.c:371
+#: src/util/gnunet-service-resolver.c:412

 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"


@@ -7722,7 +8367,7 @@ msgstr "创建用户出错"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 

-#: src/util/network.c:1344 src/util/network.c:1469
+#: src/util/network.c:1355 src/util/network.c:1480

 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"


@@ -7735,17 +8380,17 @@ msgid ""
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 

-#: src/util/os_installation.c:713
+#: src/util/os_installation.c:766

 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 

-#: src/util/os_installation.c:773
+#: 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"
 
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 

-#: src/util/os_installation.c:783
+#: src/util/os_installation.c:836

 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""


@@ -7770,17 +8415,17 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 

-#: src/util/program.c:262 src/util/service.c:1449
+#: src/util/program.c:246 src/util/service.c:1457

 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/util/program.c:274 src/util/service.c:1464
+#: 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"
 
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/util/program.c:279 src/util/service.c:1459
+#: src/util/program.c:263 src/util/service.c:1467

 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "解析配置文件“%s”失败\n"


@@ -7842,90 +8487,90 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 

-#: src/util/service.c:362
+#: src/util/service.c:347

 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 

-#: src/util/service.c:369
+#: src/util/service.c:354

 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 

-#: src/util/service.c:424
+#: src/util/service.c:409

 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 

-#: src/util/service.c:461
+#: src/util/service.c:446

 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 

-#: src/util/service.c:570
+#: src/util/service.c:563

 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 

-#: src/util/service.c:651
+#: 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 ""
 
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 

-#: src/util/service.c:667
+#: src/util/service.c:669

 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 

-#: src/util/service.c:901
+#: src/util/service.c:908

 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 

-#: src/util/service.c:950 src/util/service.c:968
+#: src/util/service.c:957 src/util/service.c:975

 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 

-#: src/util/service.c:993
+#: src/util/service.c:1000

 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 

-#: src/util/service.c:1163
+#: src/util/service.c:1170

 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 

-#: src/util/service.c:1204
+#: src/util/service.c:1212

 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 

-#: src/util/service.c:1253
+#: src/util/service.c:1261

 msgid "Service process failed to initialize\n"
 msgstr ""
 
 msgid "Service process failed to initialize\n"
 msgstr ""
 

-#: src/util/service.c:1257
+#: src/util/service.c:1265

 msgid "Service process could not initialize server function\n"
 msgstr ""
 
 msgid "Service process could not initialize server function\n"
 msgstr ""
 

-#: src/util/service.c:1261
+#: src/util/service.c:1269

 msgid "Service process failed to report status\n"
 msgstr ""
 
 msgid "Service process failed to report status\n"
 msgstr ""
 

-#: src/util/service.c:1316
+#: src/util/service.c:1324

 msgid "No such user"
 msgstr "无此用户"
 
 msgid "No such user"
 msgstr "无此用户"
 

-#: src/util/service.c:1329
+#: src/util/service.c:1337

 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”：%s\n"
 
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”：%s\n"
 

-#: src/util/service.c:1399
+#: src/util/service.c:1407

 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 


@@ -7938,114 +8583,114 @@ msgstr ""
 msgid "b"
 msgstr "b"
 
 msgid "b"
 msgstr "b"
 

-#: src/util/strings.c:452
+#: src/util/strings.c:433

 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 

-#: src/util/strings.c:580
+#: src/util/strings.c:561

 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 

-#: src/util/strings.c:677
+#: src/util/strings.c:658

 msgid "µs"
 msgstr ""
 
 msgid "µs"
 msgstr ""
 

-#: src/util/strings.c:681
+#: src/util/strings.c:662

 msgid "forever"
 msgstr ""
 
 msgid "forever"
 msgstr ""
 

-#: src/util/strings.c:683
+#: src/util/strings.c:664

 msgid "0 ms"
 msgstr ""
 
 msgid "0 ms"
 msgstr ""
 

-#: src/util/strings.c:689
+#: src/util/strings.c:670

 msgid "ms"
 msgstr "毫秒"
 
 msgid "ms"
 msgstr "毫秒"
 

-#: src/util/strings.c:695
+#: src/util/strings.c:676

 msgid "s"
 msgstr "秒"
 
 msgid "s"
 msgstr "秒"
 

-#: src/util/strings.c:701
+#: src/util/strings.c:682

 msgid "m"
 msgstr "分"
 
 msgid "m"
 msgstr "分"
 

-#: src/util/strings.c:707
+#: src/util/strings.c:688

 msgid "h"
 msgstr "时"
 
 msgid "h"
 msgstr "时"
 

-#: src/util/strings.c:714
+#: src/util/strings.c:695

 #, fuzzy
 msgid "day"
 msgstr " 天"
 
 #, fuzzy
 msgid "day"
 msgstr " 天"
 

-#: src/util/strings.c:716
+#: src/util/strings.c:697

 #, fuzzy
 msgid "days"
 msgstr " 天"
 
 #, fuzzy
 msgid "days"
 msgstr " 天"
 

-#: src/util/strings.c:745
+#: src/util/strings.c:726

 msgid "end of time"
 msgstr ""
 
 msgid "end of time"
 msgstr ""
 

-#: src/util/strings.c:1178
+#: src/util/strings.c:1159

 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 

-#: src/util/strings.c:1186
+#: src/util/strings.c:1167

 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 

-#: src/util/strings.c:1192
+#: src/util/strings.c:1173

 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 

-#: src/util/strings.c:1199
+#: src/util/strings.c:1180

 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 

-#: src/util/strings.c:1208
+#: src/util/strings.c:1189

 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 

-#: src/util/strings.c:1414 src/util/strings.c:1430
+#: src/util/strings.c:1395 src/util/strings.c:1411

 msgid "Port not in range\n"
 msgstr ""
 
 msgid "Port not in range\n"
 msgstr ""
 

-#: src/util/strings.c:1439
+#: src/util/strings.c:1420

 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/util/strings.c:1522 src/util/strings.c:1553 src/util/strings.c:1601
-#: src/util/strings.c:1622
+#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
+#: src/util/strings.c:1603

 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 

-#: src/util/strings.c:1579
+#: src/util/strings.c:1560

 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 

-#: src/util/strings.c:1631
+#: src/util/strings.c:1612

 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 

-#: src/util/strings.c:1683
+#: src/util/strings.c:1664

 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 

-#: src/util/strings.c:1733
+#: src/util/strings.c:1714

 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 

-#: src/util/strings.c:1764
+#: src/util/strings.c:1745

 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"


@@ -8055,23 +8700,23 @@ msgid "# Active channels"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:642
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:642

-msgid "# Bytes given to mesh for transmission"
+msgid "# Bytes given to cadet for transmission"

 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:680
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:680

-msgid "# Bytes dropped in mesh queue (overflow)"
+msgid "# Bytes dropped in cadet queue (overflow)"

 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:753
 #, fuzzy

-msgid "# Mesh channels created"
+msgid "# Cadet channels created"

 msgstr ""
 "\n"
 "按任意键继续\n"
 
 #: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy
 msgstr ""
 "\n"
 "按任意键继续\n"
 
 #: src/vpn/gnunet-service-vpn.c:784
 #, fuzzy

-msgid "Failed to setup mesh channel!\n"
+msgid "Failed to setup cadet channel!\n"

 msgstr "发送消息失败。\n"
 
 #: src/vpn/gnunet-service-vpn.c:978
 msgstr "发送消息失败。\n"
 
 #: src/vpn/gnunet-service-vpn.c:978


@@ -8106,15 +8751,15 @@ msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:1706
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:1706

-msgid "# ICMP packets received from mesh"
+msgid "# ICMP packets received from cadet"

 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:2045
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:2045

-msgid "# UDP packets received from mesh"
+msgid "# UDP packets received from cadet"

 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:2200
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:2200

-msgid "# TCP packets received from mesh"
+msgid "# TCP packets received from cadet"

 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:2351
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:2351


@@ -8133,29 +8778,29 @@ msgstr ""
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:2982
+#: src/vpn/gnunet-service-vpn.c:2987

 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
 #, fuzzy
 msgid "Must specify valid IPv6 address"
 msgstr "“%s”不可用。\n"
 

-#: src/vpn/gnunet-service-vpn.c:3006
+#: src/vpn/gnunet-service-vpn.c:3011

 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:3014
+#: src/vpn/gnunet-service-vpn.c:3019

 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:3027
+#: src/vpn/gnunet-service-vpn.c:3032

 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
 #, fuzzy
 msgid "Must specify valid IPv4 address"
 msgstr "“%s”不可用。\n"
 

-#: src/vpn/gnunet-service-vpn.c:3040
+#: src/vpn/gnunet-service-vpn.c:3045

 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:3050
+#: src/vpn/gnunet-service-vpn.c:3055

 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 


@@ -8241,6 +8886,40 @@ msgstr ""
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 

+#, fuzzy
+#~ msgid "Failed to run `upnpc` command"
+#~ msgstr "运行 %s失败：%s %d\n"
+
+#, 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 "Could not find option `%s:%s' in configuration.\n"
+#~ msgstr "找不到主机“%s”的 IP：%s\n"
+
+#, fuzzy
+#~ msgid "Peer `%s' disconnected\n"
+#~ msgstr ""
+#~ "\n"
+#~ "按任意键继续\n"
+

 #, fuzzy
 #~ msgid "Found %u transport plugins: `%s'\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 #, fuzzy
 #~ msgid "Found %u transport plugins: `%s'\n"
 #~ msgstr "解析配置文件“%s”失败\n"


@@ -8261,10 +8940,6 @@ msgstr ""
 #~ msgid "You are already in a conversation with `%s'.\n"
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #~ msgid "You are already in a conversation with `%s'.\n"
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#, fuzzy
-#~ msgid "Print information about mesh tunnels and peers."
-#~ msgstr "无法获取有关用户“%s”的信息：%s\n"
-

 #, fuzzy
 #~ msgid ""
 #~ "%s service is lacking key configuration settings (%s). Using default "
 #, fuzzy
 #~ msgid ""
 #~ "%s service is lacking key configuration settings (%s). Using default "


@@ -8320,10 +8995,6 @@ msgstr ""
 #~ msgid "Failed to read or create private zone key\n"
 #~ msgstr "无法为守护程序创建用户账户。"
 
 #~ msgid "Failed to read or create private zone key\n"
 #~ msgstr "无法为守护程序创建用户账户。"
 

-#, fuzzy
-#~ msgid "Unable to initialize resolver!\n"
-#~ msgstr "无法初始化 SQLite：%s。\n"
-

 #, fuzzy
 #~ msgid "Using default zone file `%s'\n"
 #~ msgstr "卸载 GNUnet 服务"
 #, fuzzy
 #~ msgid "Using default zone file `%s'\n"
 #~ msgstr "卸载 GNUnet 服务"


@@ -8466,14 +9137,6 @@ msgstr ""
 #~ msgid "Mesh service could not access hostkey.  Exiting.\n"
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #~ msgid "Mesh service could not access hostkey.  Exiting.\n"
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\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"
 #, fuzzy
 #~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 #~ msgstr "配置文件“%s”已写入。\n"


@@ -8551,18 +9214,10 @@ msgstr ""
 #~ msgid "Failed to queue a join notification\n"
 #~ 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 "Failed to queue a leave notification\n"
 #~ msgstr "保存配置失败。"
 

-#, fuzzy
-#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
-#~ msgstr "配置文件“%s”已写入。\n"
-

 #, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "配置文件“%s”已写入。\n"
 #, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "配置文件“%s”已写入。\n"


@@ -8579,18 +9234,10 @@ msgstr ""
 #~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 #~ msgstr "初始化“%s”服务失败。\n"
 
 #~ 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 "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 start `ssh' process.\n"
 #~ msgstr "初始化“%s”服务失败。\n"