msgstr ""
"Project-Id-Version: gnunet-0.8.1\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-09-16 15:01+0200\n"
+"POT-Creation-Date: 2014-04-08 11:11+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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/arm/arm_api.c:335
+#: src/arm/arm_api.c:337
msgid "Client was disconnected from arm service, trying to reconnect.\n"
msgstr ""
msgid "Failed to remove configuration file %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:170
#, c-format
msgid "Failed to remove servicehome directory %s\n"
msgstr ""
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:971
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
msgid "Message was sent successfully"
msgstr ""
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:218
#, fuzzy
msgid "Misconfiguration (can not connect to the ARM service)"
msgstr "初始化“%s”服务失败。\n"
-#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:975
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
msgid "We disconnected from ARM before we could send a request"
msgstr ""
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:977
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
msgid "ARM API is busy"
msgstr ""
-#: src/arm/gnunet-arm.c:222
+#: src/arm/gnunet-arm.c:224
msgid "Request does not fit into a message"
msgstr ""
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:981
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
msgid "Request timed out"
msgstr ""
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:983
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
#, fuzzy
msgid "Unknown request status"
msgstr "未知的用户“%s”\n"
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:999
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
#, c-format
msgid "%s is stopped"
msgstr ""
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1001
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
#, c-format
msgid "%s is starting"
msgstr ""
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1003
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
#, c-format
msgid "%s is stopping"
msgstr ""
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1005
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
#, c-format
msgid "%s is starting already"
msgstr ""
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1007
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
#, c-format
msgid "%s is stopping already"
msgstr ""
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1009
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
#, c-format
msgid "%s is started already"
msgstr ""
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1011
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
#, c-format
msgid "%s is stopped already"
msgstr ""
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
#, fuzzy, c-format
msgid "%s service is not known to ARM"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1015
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
#, fuzzy, c-format
msgid "%s service failed to start"
msgstr "运行 %s失败：%s %d\n"
-#: src/arm/gnunet-arm.c:260
+#: src/arm/gnunet-arm.c:262
#, c-format
msgid "%s service cannot be started because ARM is shutting down"
msgstr ""
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1019
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
#, c-format
msgid "%.s Unknown result code."
msgstr ""
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:297
msgid "Fatal error initializing ARM API.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
#, fuzzy, c-format
msgid "Failed to start the ARM service: %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:369
#, fuzzy, c-format
msgid "Failed to send a stop request to the ARM service: %s\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/arm/gnunet-arm.c:377
+#: src/arm/gnunet-arm.c:379
#, fuzzy, c-format
msgid "Failed to stop the ARM service: %s\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:421
#, fuzzy, c-format
msgid "Failed to send a request to start the `%s' service: %%s\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/arm/gnunet-arm.c:427
+#: src/arm/gnunet-arm.c:431
#, fuzzy, c-format
msgid "Failed to start the `%s' service: %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-arm.c:463
+#: src/arm/gnunet-arm.c:468
#, fuzzy, c-format
msgid "Failed to send a request to kill the `%s' service: %%s\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/arm/gnunet-arm.c:474
+#: src/arm/gnunet-arm.c:479
#, fuzzy, c-format
msgid "Failed to kill the `%s' service: %s\n"
msgstr "运行 %s失败：%s %d\n"
-#: src/arm/gnunet-arm.c:510
+#: src/arm/gnunet-arm.c:517
#, fuzzy, c-format
msgid "Failed to request a list of services: %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-arm.c:517
+#: src/arm/gnunet-arm.c:525
#, fuzzy
msgid "Error communicating with ARM. ARM not running?\n"
msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
-#: src/arm/gnunet-arm.c:521
+#: src/arm/gnunet-arm.c:530
msgid "Running services:\n"
msgstr ""
-#: src/arm/gnunet-arm.c:603
+#: src/arm/gnunet-arm.c:612
#, c-format
msgid "Now only monitoring, press CTRL-C to stop.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:634
+#: src/arm/gnunet-arm.c:643
#, c-format
msgid "Stopped %s.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:637
+#: src/arm/gnunet-arm.c:646
#, fuzzy, c-format
msgid "Starting %s...\n"
msgstr "未知的命令“%s”。\n"
-#: src/arm/gnunet-arm.c:640
+#: src/arm/gnunet-arm.c:649
#, c-format
msgid "Stopping %s...\n"
msgstr ""
-#: src/arm/gnunet-arm.c:651
+#: src/arm/gnunet-arm.c:660
#, fuzzy, c-format
msgid "Unknown status %u for service %s.\n"
msgstr "未知的用户“%s”\n"
-#: src/arm/gnunet-arm.c:715
+#: src/arm/gnunet-arm.c:724
#, fuzzy
msgid "stop all GNUnet services"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-arm.c:717
+#: src/arm/gnunet-arm.c:726
msgid "start a particular service"
msgstr ""
-#: src/arm/gnunet-arm.c:719
+#: src/arm/gnunet-arm.c:728
msgid "stop a particular service"
msgstr ""
-#: src/arm/gnunet-arm.c:721
+#: src/arm/gnunet-arm.c:730
#, fuzzy
msgid "start all GNUnet default services"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:733
#, fuzzy
msgid "stop and start all GNUnet default services"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-arm.c:727
+#: src/arm/gnunet-arm.c:736
msgid "delete config file and directory on exit"
msgstr ""
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:739
msgid "monitor ARM activities"
msgstr ""
-#: src/arm/gnunet-arm.c:732
+#: src/arm/gnunet-arm.c:741
msgid "don't print status messages"
msgstr ""
-#: src/arm/gnunet-arm.c:735
+#: src/arm/gnunet-arm.c:744
#, fuzzy
msgid "timeout in MSECS milliseconds for completing current operation"
msgstr "等待一次迭代完成的时间(毫秒)"
-#: src/arm/gnunet-arm.c:737
+#: src/arm/gnunet-arm.c:746
msgid "list currently running services"
msgstr ""
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:748
msgid "don't let gnunet-service-arm inherit standard output"
msgstr ""
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:750
msgid "don't let gnunet-service-arm inherit standard error"
msgstr ""
-#: src/arm/gnunet-arm.c:752
+#: src/arm/gnunet-arm.c:761
msgid "Control services and the Automated Restart Manager (ARM)"
msgstr ""
-#: src/arm/gnunet-service-arm.c:257
+#: src/arm/gnunet-service-arm.c:266
msgid "Could not send status result to client\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:291
+#: src/arm/gnunet-service-arm.c:302
#, fuzzy
msgid "Could not send list result to client\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/arm/gnunet-service-arm.c:500
+#: src/arm/gnunet-service-arm.c:529
#, fuzzy, c-format
msgid "Failed to start service `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-service-arm.c:507
+#: src/arm/gnunet-service-arm.c:540
#, c-format
msgid "Starting service `%s'\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:602
+#: src/arm/gnunet-service-arm.c:639
#, fuzzy, c-format
msgid "Unable to create socket for service `%s': %s\n"
msgstr "无法创建用户账户："
-#: src/arm/gnunet-service-arm.c:624
+#: src/arm/gnunet-service-arm.c:661
#, c-format
msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:638
+#: src/arm/gnunet-service-arm.c:695
#, c-format
msgid "ARM now monitors connections to service `%s' at `%s'\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:771
+#: src/arm/gnunet-service-arm.c:831
#, c-format
msgid "Preparing to stop `%s'\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1022
+#: src/arm/gnunet-service-arm.c:1100
#, c-format
msgid "Restarting service `%s'.\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1115
+#: src/arm/gnunet-service-arm.c:1193
msgid "exit"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1120
+#: src/arm/gnunet-service-arm.c:1198
msgid "signal"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1125
+#: src/arm/gnunet-service-arm.c:1203
#, fuzzy
msgid "unknown"
msgstr "未知错误"
-#: src/arm/gnunet-service-arm.c:1131
+#: src/arm/gnunet-service-arm.c:1209
#, fuzzy, c-format
msgid "Service `%s' took %s to terminate\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-service-arm.c:1153
+#: src/arm/gnunet-service-arm.c:1231
#, c-format
msgid "Service `%s' terminated normally, will restart at any time\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1168
+#: src/arm/gnunet-service-arm.c:1246
#, c-format
msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1386
+#: src/arm/gnunet-service-arm.c:1500
#, fuzzy, c-format
msgid "Starting default services `%s'\n"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-service-arm.c:1397
+#: src/arm/gnunet-service-arm.c:1511
#, c-format
msgid "Default service `%s' not configured correctly!\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1411
+#: src/arm/gnunet-service-arm.c:1524
msgid ""
"No default services configured, GNUnet will not really start right now.\n"
msgstr ""
-#: src/arm/mockup-service.c:46
+#: src/arm/mockup-service.c:41
msgid "Initiating shutdown as requested by client.\n"
msgstr ""
-#: src/ats/ats_api_performance.c:475
+#: src/ats/ats_api_performance.c:468
#, c-format
msgid "Received %s message\n"
msgstr ""
-#: src/ats/ats_api_performance.c:518
+#: src/ats/ats_api_performance.c:511
#, c-format
msgid "Received last message for %s \n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:1607
-#: src/ats/gnunet-service-ats_addresses.c:1641
+#: src/ats/gnunet-ats-solver-eval.c:2199 src/ats/gnunet-ats-solver-eval.c:2233
+#: src/ats/gnunet-service-ats_addresses.c:1980
+#: src/ats/gnunet-service-ats_addresses.c:2024
#, c-format
msgid ""
"Could not load quota for network `%s': `%s', assigning default bandwidth "
"%llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:1613
+#: src/ats/gnunet-ats-solver-eval.c:2205
+#: src/ats/gnunet-service-ats_addresses.c:1987
#, c-format
msgid "Outbound quota configure for network `%s' is %llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:1620
+#: src/ats/gnunet-ats-solver-eval.c:2212
+#: src/ats/gnunet-service-ats_addresses.c:1995
#, c-format
msgid ""
"No outbound quota configured for network `%s', assigning default bandwidth "
"%llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:1647
+#: src/ats/gnunet-ats-solver-eval.c:2239
+#: src/ats/gnunet-service-ats_addresses.c:2031
#, c-format
msgid "Inbound quota configured for network `%s' is %llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:1654
+#: src/ats/gnunet-ats-solver-eval.c:2246
+#: src/ats/gnunet-service-ats_addresses.c:2039
#, c-format
msgid ""
"No outbound quota configure for network `%s', assigning default bandwidth "
"%llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:1888
+#: src/ats/gnunet-ats-solver-eval.c:2671
+#: src/ats-tests/gnunet-solver-eval.c:919
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2674 src/ats/gnunet-ats-solver-eval.c:2677
+#: 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:2680
+#, fuzzy
+msgid "print logging"
+msgstr "未知的命令“%s”。\n"
+
+#: src/ats/gnunet-service-ats_addresses.c:2217
+#, c-format
+msgid "Initializing solver `%s '`%s'\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:2220
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/ats/gnunet-service-ats_addresses.c:2243
#, fuzzy
msgid "Failed to initialize solver!\n"
msgstr "无法初始化 SQLite：%s。\n"
-#: src/ats/gnunet-service-ats-solver_mlp.c:849
+#: src/ats/plugin_ats_mlp.c:892
msgid "Problem size too large, cannot allocate memory!\n"
msgstr ""
-#: src/ats/gnunet-service-ats-solver_mlp.c:1193
+#: src/ats/plugin_ats_mlp.c:1329
#, c-format
msgid "Adding address for peer `%s' multiple times\n"
msgstr ""
-#: src/ats/gnunet-service-ats-solver_mlp.c:1238
+#: src/ats/plugin_ats_mlp.c:1376
#, c-format
msgid "Updating address property `%s' for peer `%s' %p not added before\n"
msgstr ""
-#: src/ats/gnunet-service-ats-solver_mlp.c:1956
+#: src/ats/plugin_ats_mlp.c:2122
#, c-format
msgid ""
"Adjusting inconsistent outbound quota configuration for network `%s', is "
"%llu must be at least %llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats-solver_mlp.c:1964
+#: src/ats/plugin_ats_mlp.c:2131
#, c-format
msgid ""
"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
"must be at least %llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats-solver_mlp.c:1974
+#: src/ats/plugin_ats_mlp.c:2142
#, c-format
msgid ""
"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
msgstr ""
-#: src/ats/gnunet-service-ats-solver_mlp.c:1982
+#: src/ats/plugin_ats_mlp.c:2150
#, c-format
msgid ""
"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
msgstr ""
-#: src/ats/gnunet-service-ats-solver_mlp.c:1993
+#: src/ats/plugin_ats_mlp.c:2161
#, c-format
msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats-solver_proportional.c:1296
+#: src/ats/plugin_ats_proportional.c:1511
#, 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:671
+#, 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 ""
-#: 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 ""
-#: src/ats-tool/gnunet-ats.c:204
+#: src/ats-tool/gnunet-ats.c:232
#, 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:328
+#: src/ats-tool/gnunet-ats.c:413
#, c-format
msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
msgstr ""
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:438
-#: src/transport/gnunet-transport.c:812
+#: src/ats-tool/gnunet-ats.c:433 src/core/gnunet-core.c:163
+#: src/namestore/gnunet-namestore.c:550 src/transport/gnunet-transport.c:1246
#, fuzzy, c-format
msgid "Service `%s' is not running\n"
msgstr "服务已删除。\n"
-#: src/ats-tool/gnunet-ats.c:357 src/transport/gnunet-transport.c:819
+#: src/ats-tool/gnunet-ats.c:445 src/transport/gnunet-transport.c:1255
#, fuzzy, c-format
msgid "Failed to parse peer identity `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/ats-tool/gnunet-ats.c:365
+#: src/ats-tool/gnunet-ats.c:454
#, c-format
msgid "Please select one operation : %s or %s or %s or %s or %s\n"
msgstr ""
-#: src/ats-tool/gnunet-ats.c:381 src/ats-tool/gnunet-ats.c:400
-#: src/ats-tool/gnunet-ats.c:417 src/ats-tool/gnunet-ats.c:455
+#: src/ats-tool/gnunet-ats.c:470 src/ats-tool/gnunet-ats.c:489
+#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543
#, fuzzy, c-format
msgid "Cannot connect to ATS service, exiting...\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/ats-tool/gnunet-ats.c:390 src/ats-tool/gnunet-ats.c:407
+#: src/ats-tool/gnunet-ats.c:478 src/ats-tool/gnunet-ats.c:495
#, fuzzy, c-format
msgid "Cannot issue request to ATS service, exiting...\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/ats-tool/gnunet-ats.c:425
+#: src/ats-tool/gnunet-ats.c:515
#, fuzzy, c-format
msgid "No preference type given!\n"
msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/ats-tool/gnunet-ats.c:430
+#: src/ats-tool/gnunet-ats.c:520
#, c-format
msgid "No peer given!\n"
msgstr ""
-#: src/ats-tool/gnunet-ats.c:448
+#: src/ats-tool/gnunet-ats.c:536
msgid "Valid type required\n"
msgstr ""
-#: src/ats-tool/gnunet-ats.c:506
+#: src/ats-tool/gnunet-ats.c:594
msgid "get list of active addresses currently used"
msgstr ""
-#: src/ats-tool/gnunet-ats.c:509
+#: src/ats-tool/gnunet-ats.c:596
msgid "get list of all active addresses"
msgstr ""
-#: src/ats-tool/gnunet-ats.c:512
+#: src/ats-tool/gnunet-ats.c:599
#, fuzzy
msgid "do not resolve IP addresses to hostnames"
msgstr "GNUnet 现在使用 IP 地址 %s。\n"
-#: src/ats-tool/gnunet-ats.c:515
+#: src/ats-tool/gnunet-ats.c:601
msgid "monitor mode"
msgstr ""
-#: src/ats-tool/gnunet-ats.c:518
+#: src/ats-tool/gnunet-ats.c:603
#, fuzzy
msgid "set preference for the given peer"
msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/ats-tool/gnunet-ats.c:521
+#: src/ats-tool/gnunet-ats.c:605
msgid "print all configured quotas"
msgstr ""
-#: src/ats-tool/gnunet-ats.c:524
+#: src/ats-tool/gnunet-ats.c:607
msgid "peer id"
msgstr ""
-#: src/ats-tool/gnunet-ats.c:527
+#: src/ats-tool/gnunet-ats.c:610
msgid "preference type to set: latency | bandwidth"
msgstr ""
-#: src/ats-tool/gnunet-ats.c:530
+#: src/ats-tool/gnunet-ats.c:612
msgid "preference value"
msgstr ""
-#: src/ats-tool/gnunet-ats.c:533
+#: src/ats-tool/gnunet-ats.c:615
msgid "verbose output (include ATS address properties)"
msgstr ""
-#: src/ats-tool/gnunet-ats.c:542
+#: src/ats-tool/gnunet-ats.c:622
#, fuzzy
msgid "Print information about ATS state"
msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/block/block.c:105
-#, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/consensus/gnunet-consensus-profiler.c:393
+#: src/consensus/gnunet-consensus-profiler.c:437
+#: src/secretsharing/gnunet-secretsharing-profiler.c:535
#, fuzzy
msgid "number of peers in consensus"
msgstr "迭代次数"
-#: src/consensus/gnunet-consensus-profiler.c:396
+#: src/consensus/gnunet-consensus-profiler.c:440
msgid "how many peers receive one value?"
msgstr ""
-#: src/consensus/gnunet-consensus-profiler.c:399
-#: src/set/gnunet-set-profiler.c:287 src/set/gnunet-set-profiler.c:290
-#: src/set/gnunet-set-profiler.c:293
+#: 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/consensus/gnunet-consensus-profiler.c:446
+msgid "consensus timeout"
+msgstr ""
+
+#: 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:550
+msgid "be more verbose (print received values)"
+msgstr ""
+
+#: src/conversation/conversation_api.c:557
+#: src/conversation/conversation_api_call.c:470
+msgid "Connection to conversation service lost, trying to reconnect\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:264
+#, c-format
+msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:286
+#, c-format
+msgid "Call from `%s' terminated\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:319
+#, c-format
+msgid "Call from `%s' suspended by other user\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:324
+#, c-format
+msgid "Call from `%s' resumed by other user\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:342
+#, c-format
+msgid "Ego `%s' no longer available, phone is now down.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:356
+#, fuzzy
+msgid "Failed to setup phone (internal error)\n"
+msgstr "发送消息失败。\n"
+
+#: src/conversation/gnunet-conversation.c:368
+#, c-format
+msgid ""
+"Phone active on line %u. Type `/help' for a list of available commands\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:390
+#, c-format
+msgid "Resolved address of `%s'. Now ringing other party.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:397
+#, fuzzy, c-format
+msgid "Connection established to `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/conversation/gnunet-conversation.c:404
+#, fuzzy, c-format
+msgid "Failed to resolve `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/conversation/gnunet-conversation.c:411
+msgid "Call terminated\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:417
+#, c-format
+msgid "Connection to `%s' suspended (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:423
+#, c-format
+msgid "Connection to `%s' resumed (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:428
+msgid "Error with the call, restarting it\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:495
+#, fuzzy, c-format
+msgid "Unknown command `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:525
+#, c-format
+msgid "Ego `%s' not available\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:518
+#: src/conversation/gnunet-conversation.c:575
+msgid "You are calling someone else already, hang up first!\n"
+msgstr ""
+
+#: 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 ""
+
+#: src/conversation/gnunet-conversation.c:544
+msgid "Call recipient missing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:599
+msgid "There is no incoming call to accept here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:616
+#, c-format
+msgid "There is no incoming call `%s' to accept right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:647
+msgid "We currently do not have an address.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:670
+#, c-format
+msgid "We are currently trying to locate the private key for the ego `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:675
+#, c-format
+msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:681
+#: src/conversation/gnunet-conversation.c:705
+#, c-format
+msgid "You are having a conversation with `%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:686
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
+msgstr ""
+
+#: 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"
+
+#: src/conversation/gnunet-conversation.c:700
+#, c-format
+msgid "We are calling `%s', his phone should be ringing.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:719
+msgid "Calls waiting:\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:725
+#, fuzzy, c-format
+msgid "#%u: `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: 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 ""
+
+#: 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 ""
+
+#: src/conversation/gnunet-conversation.c:824
+#, c-format
+msgid "Already talking with `%s', cannot resume a call right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:833
+msgid "There is no incoming call to resume here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:850
+#, c-format
+msgid "There is no incoming call `%s' to resume right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:885
+msgid "There is no call that could be cancelled right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:893
+msgid "There is no incoming call to refuse here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:910
+#, c-format
+msgid "There is no incoming call `%s' to refuse right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:937
+msgid "Use `/address' to find out which address this phone should have in GNS"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:939
+msgid "Use `/call USER.gnu' to call USER"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:941
+msgid "Use `/accept #NUM' to accept incoming call #NUM"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:943
+msgid "Use `/suspend' to suspend the active call"
+msgstr ""
+
+#: 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 ""
+
+#: src/conversation/gnunet-conversation.c:947
+msgid "Use `/cancel' to reject or terminate a call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:949
+msgid "Use `/status' to print status information"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:951
+msgid "Use `/quit' to terminate gnunet-conversation"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:953
+msgid "Use `/help command' to get help for a specific command"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:1151
+#, fuzzy, c-format
+msgid "Name of our ego changed to `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/conversation/gnunet-conversation.c:1164
+#, c-format
+msgid "Our ego `%s' was deleted!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:1199
+#, fuzzy
+msgid "You must specify the NAME of an ego to use\n"
+msgstr "您必须指定一个昵称\n"
+
+#: 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 ""
+
+#: src/conversation/gnunet-conversation.c:1252
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:1276
+msgid "Enables having a conversation with other GNUnet users."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:121
+#, c-format
+msgid ""
+"\n"
+"End of transmission. Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:149
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back. If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:215
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:248
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
+#: src/template/gnunet-template.c:70
+msgid "help text"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:305
+#, fuzzy, c-format
+msgid "pa_stream_write() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:587
+msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:612
+#: src/conversation/gnunet-helper-audio-record.c:545
+msgid "Connection established.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:617
+#: src/conversation/gnunet-helper-audio-record.c:550
+#, fuzzy, c-format
+msgid "pa_stream_new() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:631
+#, c-format
+msgid "pa_stream_connect_playback() failed: %s\n"
+msgstr ""
+
+#: 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"
+
+#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-record.c:599
+msgid "Wrong Spec\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:671
+#: src/conversation/gnunet-helper-audio-record.c:605
+msgid "pa_mainloop_new() failed.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:685
+#: src/conversation/gnunet-helper-audio-record.c:620
+msgid "pa_context_new() failed.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-record.c:626
+#, fuzzy, c-format
+msgid "pa_context_connect() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-playback.c:698
+#: src/conversation/gnunet-helper-audio-record.c:632
+msgid "pa_mainloop_run() failed.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback.c:768
+#, c-format
+msgid "Read error from STDIN: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-playback-gst.c:325
+#, c-format
+msgid "Read error from STDIN: %d %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:344
+#, fuzzy, c-format
+msgid "opus_encode_float() failed: %s. Aborting\n"
+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"
+
+#: src/conversation/gnunet-helper-audio-record.c:458
+msgid "Got signal, exiting.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:483
+#, fuzzy
+msgid "Stream successfully created.\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:488
+#, fuzzy, c-format
+msgid "pa_stream_get_buffer_attr() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:496
+#, c-format
+msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:500
+#, c-format
+msgid "Using sample spec '%s', channel map '%s'.\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:507
+#, fuzzy, c-format
+msgid "Connected to device %s (%u, %ssuspended).\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:516
+#, c-format
+msgid "Stream error: %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:563
+#, fuzzy, c-format
+msgid "pa_stream_connect_record() failed: %s\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:676
+#, fuzzy
+msgid "ogg_stream_init() failed.\n"
+msgstr "“%s”说：%s\n"
+
+#: src/conversation/gnunet-helper-audio-record.c:721
+#, fuzzy, c-format
+msgid "Failed to allocate %d bytes for second packet\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/conversation/gnunet-service-conversation.c:841
+msgid "Mesh audio channel not ready; audio data dropped\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:932
+#, c-format
+msgid ""
+"No available phone for incoming call on line %u, sending HANG_UP signal\n"
+msgstr ""
+
+#: src/conversation/gnunet-service-conversation.c:1338
+#, fuzzy, c-format
+msgid "Received incoming channel on port %u\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/conversation/microphone.c:121
#, fuzzy
-msgid "number of values"
-msgstr "迭代次数"
+msgid "Could not start record audio helper\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
-#: src/consensus/gnunet-consensus-profiler.c:402
-msgid "consensus timeout"
-msgstr ""
+#: src/conversation/plugin_gnsrecord_conversation.c:116
+#, fuzzy, c-format
+msgid "Unable to parse PHONE record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
-#: src/consensus/gnunet-consensus-profiler.c:405
-msgid "be more verbose (print received values)"
+#: src/conversation/speaker.c:75
+msgid "Could not start playback audio helper.\n"
msgstr ""
-#: src/core/core_api.c:752
+#: src/core/core_api.c:767
msgid "Client was disconnected from core service, trying to reconnect.\n"
msgstr ""
-#: src/core/gnunet-core.c:83
+#: src/core/gnunet-core.c:80
#, c-format
msgid "Peer `%s'\n"
msgstr ""
-#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
-#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
+#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
+#: src/transport/gnunet-transport.c:910 src/transport/gnunet-transport.c:930
#, c-format
msgid "%24s: %-17s %4s (%u connections in total)\n"
msgstr ""
-#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:911
#, fuzzy
msgid "Connected to"
msgstr "“%s”已连接到“%s”。\n"
-#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931
#, fuzzy
msgid "Disconnected from"
msgstr "“%s”已连接到“%s”。\n"
-#: src/core/gnunet-core.c:166 src/mesh/gnunet-mesh.c:170
-#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694
#, fuzzy, c-format
msgid "Invalid command line argument `%s'\n"
msgstr "“%s”的参数无效。\n"
-#: src/core/gnunet-core.c:203 src/transport/gnunet-transport.c:1004
+#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486
msgid "provide information about all current connections (continuously)"
msgstr ""
-#: src/core/gnunet-core.c:214
+#: src/core/gnunet-core.c:244
msgid "Print information about connected peers."
msgstr ""
msgid "# send requests dropped (disconnected)"
msgstr ""
-#: src/core/gnunet-service-core_clients.c:475
+#: src/core/gnunet-service-core_clients.c:480
msgid "# messages discarded (session disconnected)"
msgstr ""
-#: src/core/gnunet-service-core_clients.c:518
+#: src/core/gnunet-service-core_clients.c:526
#, c-format
msgid "# bytes of messages of type %u received"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:532
+#: src/core/gnunet-service-core_kx.c:535
msgid "# bytes encrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:583
+#: src/core/gnunet-service-core_kx.c:586
msgid "# bytes decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:667
+#: src/core/gnunet-service-core_kx.c:673
msgid "# key exchanges initiated"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:697
+#: src/core/gnunet-service-core_kx.c:713
msgid "# key exchanges stopped"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:761
+#: src/core/gnunet-service-core_kx.c:810
msgid "# old ephemeral keys ignored"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:767
+#: src/core/gnunet-service-core_kx.c:816
msgid "# ephemeral keys received"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:850
#, 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:819
-msgid "# EPHEMERAL_KEY messages decrypted"
+#: src/core/gnunet-service-core_kx.c:861
+msgid "# EPHEMERAL_KEY messages received"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:922
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/core/gnunet-service-core_kx.c:951
+#: src/transport/gnunet-service-transport_validation.c:1016
msgid "# PING messages received"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:930
+#: src/core/gnunet-service-core_kx.c:959
msgid "# PING messages dropped (out of order)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:957
+#: src/core/gnunet-service-core_kx.c:986
#, 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:974
+#: src/core/gnunet-service-core_kx.c:1003
msgid "# PONG messages created"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1000
+#: src/core/gnunet-service-core_kx.c:1029
msgid "# sessions terminated by timeout"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1010
+#: src/core/gnunet-service-core_kx.c:1039
msgid "# keepalive messages sent"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1067
-#: src/transport/gnunet-service-transport_validation.c:1224
+#: src/core/gnunet-service-core_kx.c:1096
+#: src/transport/gnunet-service-transport_validation.c:1328
msgid "# PONG messages received"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1073
+#: src/core/gnunet-service-core_kx.c:1102
msgid "# PONG messages dropped (connection down)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1078
+#: src/core/gnunet-service-core_kx.c:1107
msgid "# PONG messages dropped (out of order)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1108
+#: src/core/gnunet-service-core_kx.c:1137
msgid "# PONG messages decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1142
+#: src/core/gnunet-service-core_kx.c:1171
msgid "# session keys confirmed via PONG"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1152
+#: src/core/gnunet-service-core_kx.c:1181
msgid "# timeouts prevented via PONG"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1159
+#: src/core/gnunet-service-core_kx.c:1188
msgid "# rekey operations confirmed via PONG"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1299
+#: src/core/gnunet-service-core_kx.c:1328
msgid "# DATA message dropped (out of order)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1306
+#: src/core/gnunet-service-core_kx.c:1335
#, 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:1309
+#: src/core/gnunet-service-core_kx.c:1338
msgid "# sessions terminated by key expiration"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1352
-#: src/core/gnunet-service-core_kx.c:1377
+#: src/core/gnunet-service-core_kx.c:1383
+#: src/core/gnunet-service-core_kx.c:1408
msgid "# bytes dropped (duplicates)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1395
msgid "# bytes dropped (out of sequence)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1405
+#: src/core/gnunet-service-core_kx.c:1437
msgid "# bytes dropped (ancient message)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1413
+#: src/core/gnunet-service-core_kx.c:1445
msgid "# bytes of payload decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1444
+#: src/core/gnunet-service-core_kx.c:1480
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 ""
-#: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:328
+#: src/core/gnunet-service-core_neighbours.c:184
+#: src/core/gnunet-service-core_neighbours.c:335
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 ""
-#: src/core/gnunet-service-core_neighbours.c:411
+#: src/core/gnunet-service-core_neighbours.c:418
#, c-format
msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
msgstr ""
-#: src/core/gnunet-service-core_sessions.c:209
-#: src/core/gnunet-service-core_sessions.c:279
-#: src/dht/gnunet-service-dht_neighbours.c:641
-#: src/dht/gnunet-service-dht_neighbours.c:700
-#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
-#: src/topology/gnunet-daemon-topology.c:700
-#: src/topology/gnunet-daemon-topology.c:801
-#: src/transport/gnunet-service-transport_neighbours.c:1041
-#: src/transport/gnunet-service-transport_neighbours.c:1265
-#: src/transport/gnunet-service-transport_neighbours.c:1274
-#: src/transport/gnunet-service-transport_neighbours.c:2799
-#: src/transport/gnunet-service-transport_neighbours.c:3053
+#: src/core/gnunet-service-core_sessions.c:216
+#: src/core/gnunet-service-core_sessions.c:288
+#: src/dht/gnunet-service-dht_neighbours.c:662
+#: src/dht/gnunet-service-dht_neighbours.c:727
+#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: 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:3142
+#: src/transport/gnunet-service-transport_neighbours.c:3438
msgid "# peers connected"
msgstr ""
-#: src/core/gnunet-service-core_sessions.c:247
+#: src/core/gnunet-service-core_sessions.c:255
msgid "# type map refreshes sent"
msgstr ""
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:426
msgid "# messages discarded (expired prior to transmission)"
msgstr ""
#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namecache/plugin_namecache_postgres.c:52
+#: src/namecache/plugin_namecache_sqlite.c:52
#: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:54
-#: src/include/gnunet_common.h:654 src/include/gnunet_common.h:663
-#: src/scalarproduct/scalarproduct.h:56
+#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/testbed/generate-underlay-topology.c:47
+#: src/testbed/gnunet-daemon-latency-logger.c:52
+#: src/testbed/gnunet-daemon-testbed-underlay.c:55
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:50
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error: %s\n"
msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
msgstr ""
#: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namestore/plugin_namestore_sqlite.c:374
+#: 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"
msgstr ""
msgid "Failed to transmit request to drop database.\n"
msgstr ""
-#: src/datastore/datastore_api.c:393
+#: src/datastore/datastore_api.c:394
msgid "# queue entry timeouts"
msgstr ""
-#: src/datastore/datastore_api.c:437
+#: src/datastore/datastore_api.c:443
msgid "# queue overflows"
msgstr ""
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:471
msgid "# queue entries created"
msgstr ""
-#: src/datastore/datastore_api.c:483
+#: src/datastore/datastore_api.c:491
msgid "# Requests dropped from datastore queue"
msgstr ""
-#: src/datastore/datastore_api.c:525
+#: src/datastore/datastore_api.c:533
msgid "# datastore connections (re)created"
msgstr ""
-#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:276
+#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
msgid "# transmission request failures"
msgstr ""
-#: src/datastore/datastore_api.c:630
+#: src/datastore/datastore_api.c:638
msgid "# bytes sent to datastore"
msgstr ""
-#: src/datastore/datastore_api.c:762
+#: src/datastore/datastore_api.c:770
msgid "Failed to receive status response from database."
msgstr ""
-#: src/datastore/datastore_api.c:776
+#: src/datastore/datastore_api.c:784
msgid "Error reading response from datastore service"
msgstr ""
-#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
+#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
msgid "Invalid error message received from datastore service"
msgstr ""
-#: src/datastore/datastore_api.c:798
+#: src/datastore/datastore_api.c:806
msgid "# status messages received"
msgstr ""
-#: src/datastore/datastore_api.c:868
+#: src/datastore/datastore_api.c:876
msgid "# PUT requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:935
+#: src/datastore/datastore_api.c:944
msgid "# RESERVE requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:996
+#: src/datastore/datastore_api.c:1005
msgid "# RELEASE RESERVE requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1055
+#: src/datastore/datastore_api.c:1065
msgid "# UPDATE requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1119
+#: src/datastore/datastore_api.c:1129
msgid "# REMOVE requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1164
+#: src/datastore/datastore_api.c:1174
msgid "Failed to receive response from database.\n"
msgstr ""
-#: src/datastore/datastore_api.c:1223
+#: src/datastore/datastore_api.c:1233
msgid "# Results received"
msgstr ""
-#: src/datastore/datastore_api.c:1290
+#: src/datastore/datastore_api.c:1300
msgid "# GET REPLICATION requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1353
+#: src/datastore/datastore_api.c:1363
msgid "# GET ZERO ANONYMITY requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1414
+#: src/datastore/datastore_api.c:1424
msgid "# GET requests executed"
msgstr ""
msgstr ""
#: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:155
+#: src/gns/gnunet-gns-helper-service-w32.c:223
msgid "Transmission to client failed!\n"
msgstr ""
#: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:183
+#: src/gns/gnunet-gns-helper-service-w32.c:262
msgid "Shutdown in progress, aborting transmission.\n"
msgstr ""
msgstr "发送消息失败。\n"
#: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:735
+#: src/namecache/plugin_namecache_postgres.c:414
+#: src/namestore/plugin_namestore_postgres.c:569
msgid "Postgres database running\n"
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"
-#: src/datastore/plugin_datastore_sqlite.c:253
-#: src/namestore/plugin_namestore_sqlite.c:220
+#: src/datastore/plugin_datastore_sqlite.c:255
+#: src/namecache/plugin_namecache_sqlite.c:193
+#: src/namestore/plugin_namestore_sqlite.c:204
#: src/psycstore/plugin_psycstore_sqlite.c:319
#, 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"
-#: 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 ""
-#: 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 ""
-#: src/datastore/plugin_datastore_sqlite.c:1194
-#: src/namestore/plugin_namestore_sqlite.c:893
+#: src/datastore/plugin_datastore_sqlite.c:1215
+#: src/namecache/plugin_namecache_sqlite.c:583
+#: src/namestore/plugin_namestore_sqlite.c:719
#, fuzzy
msgid "Sqlite database running\n"
msgstr "sqlite 数据仓库"
msgid "Template database running\n"
msgstr ""
-#: src/dht/dht_api.c:375
+#: src/dht/dht_api.c:376
#, fuzzy
msgid "Failed to connect to the DHT service!\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/dht/gnunet-dht-get.c:132
+#: src/dht/gnunet-dht-get.c:133
#, 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 ""
-#: 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"
-#: src/dht/gnunet-dht-get.c:170
+#: src/dht/gnunet-dht-get.c:173
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-get.c:189
+#: src/dht/gnunet-dht-get.c:192
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 ""
-#: 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 ""
-#: 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 ""
-#: 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:864
-#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:904
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
+#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
+#: src/nse/gnunet-nse-profiler.c:873
msgid "be verbose (print progress information)"
msgstr ""
-#: src/dht/gnunet-dht-get.c:222
+#: src/dht/gnunet-dht-get.c:225
msgid "Issue a GET request to the GNUnet DHT, prints results."
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 ""
-#: src/dht/gnunet-service-dht.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:414
+#: src/dht/gnunet-service-dht_clients.c:417
+#: src/dht/gnunet-service-xdht_clients.c:838
msgid "# GET requests from clients injected"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:508
+#: src/dht/gnunet-service-dht_clients.c:513
+#: src/dht/gnunet-service-xdht_clients.c:927
msgid "# PUT requests received from clients"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:592
+#: src/dht/gnunet-service-dht_clients.c:597
+#: src/dht/gnunet-service-xdht_clients.c:1013
msgid "# GET requests received from clients"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:793
+#: src/dht/gnunet-service-dht_clients.c:798
+#: src/dht/gnunet-service-xdht_clients.c:1214
msgid "# GET STOP requests received from clients"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1033
+#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-xdht_clients.c:498
msgid "# Key match, type mismatches in REPLY to CLIENT"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1046
+#: src/dht/gnunet-service-dht_clients.c:1052
+#: src/dht/gnunet-service-xdht_clients.c:511
msgid "# Duplicate REPLIES to CLIENT request dropped"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1083
+#: src/dht/gnunet-service-dht_clients.c:1089
+#: src/dht/gnunet-service-xdht_clients.c:548
#, c-format
msgid "Unsupported block type (%u) in request!\n"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1106
+#: src/dht/gnunet-service-dht_clients.c:1112
+#: src/dht/gnunet-service-xdht_clients.c:571
msgid "# RESULTS queued for clients"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1157
-#: src/dht/gnunet-service-dht_clients.c:1199
+#: src/dht/gnunet-service-dht_clients.c:1166
+#: src/dht/gnunet-service-dht_clients.c:1209
+#: src/dht/gnunet-service-xdht_clients.c:625
+#: src/dht/gnunet-service-xdht_clients.c:668
msgid "# REPLIES ignored for CLIENTS (no match)"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1176
+#: 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
+#: src/dht/gnunet-service-xdht_datacache.c:68
#, 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
msgid "# ITEMS stored in datacache"
msgstr ""
#: src/dht/gnunet-service-dht_datacache.c:165
+#: src/dht/gnunet-service-xdht_datacache.c:165
msgid "# Good RESULTS found in datacache"
msgstr ""
#: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-xdht_datacache.c:176
msgid "# Duplicate RESULTS found in datacache"
msgstr ""
#: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-xdht_datacache.c:182
msgid "# Invalid RESULTS found in datacache"
msgstr ""
#: src/dht/gnunet-service-dht_datacache.c:188
+#: src/dht/gnunet-service-xdht_datacache.c:188
msgid "# Irrelevant RESULTS found in datacache"
msgstr ""
#: src/dht/gnunet-service-dht_datacache.c:200
+#: src/dht/gnunet-service-xdht_datacache.c:200
msgid "# Unsupported RESULTS found in datacache"
msgstr ""
#: src/dht/gnunet-service-dht_datacache.c:203
+#: src/dht/gnunet-service-xdht_datacache.c:203
#, 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
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:501
+#: src/dht/gnunet-service-dht_neighbours.c:516
msgid "# Preference updates given to core"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:591
+#: src/dht/gnunet-service-dht_neighbours.c:610
msgid "# FIND PEER messages initiated"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:734
+#: src/dht/gnunet-service-dht_neighbours.c:764
msgid "# Queued messages discarded (peer disconnected)"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:789
+#: src/dht/gnunet-service-dht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:703
msgid "# Bytes transmitted to other peers"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:827
+#: src/dht/gnunet-service-dht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_neighbours.c:742
msgid "# Bytes of bandwidth requested from core"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:859
+#: src/dht/gnunet-service-dht_neighbours.c:889
msgid "# requests TTL-dropped"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1086
+#: src/dht/gnunet-service-dht_neighbours.c:1093
+#: src/dht/gnunet-service-dht_neighbours.c:1130
msgid "# Peers excluded from routing due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1067
-#: src/dht/gnunet-service-dht_neighbours.c:1101
+#: src/dht/gnunet-service-dht_neighbours.c:1108
+#: src/dht/gnunet-service-dht_neighbours.c:1145
msgid "# Peer selection failed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1235
+#: src/dht/gnunet-service-dht_neighbours.c:1287
msgid "# PUT requests routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1264
+#: src/dht/gnunet-service-dht_neighbours.c:1316
msgid "# PUT messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1271
-#: src/dht/gnunet-service-dht_neighbours.c:1384
-#: src/dht/gnunet-service-dht_neighbours.c:1484
+#: 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:794
+#: src/dht/gnunet-service-xdht_neighbours.c:860
+#: src/dht/gnunet-service-xdht_neighbours.c:919
+#: src/dht/gnunet-service-xdht_neighbours.c:981
+#: src/dht/gnunet-service-xdht_neighbours.c:1041
msgid "# P2P messages dropped due to full queue"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1349
+#: src/dht/gnunet-service-dht_neighbours.c:1405
msgid "# GET requests routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1376
+#: src/dht/gnunet-service-dht_neighbours.c:1432
msgid "# GET messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1491
+#: src/dht/gnunet-service-dht_neighbours.c:1550
msgid "# RESULT messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1573
+#: src/dht/gnunet-service-dht_neighbours.c:1636
msgid "# P2P PUT requests received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1576
+#: src/dht/gnunet-service-dht_neighbours.c:1639
msgid "# P2P PUT bytes received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1731
+#: src/dht/gnunet-service-dht_neighbours.c:1803
msgid "# FIND PEER requests ignored due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1739
+#: src/dht/gnunet-service-dht_neighbours.c:1811
msgid "# FIND PEER requests ignored due to lack of HELLO"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1830
+#: src/dht/gnunet-service-dht_neighbours.c:1904
msgid "# P2P GET requests received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1833
+#: src/dht/gnunet-service-dht_neighbours.c:1907
msgid "# P2P GET bytes received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1886
+#: src/dht/gnunet-service-dht_neighbours.c:1961
msgid "# P2P FIND PEER requests processed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1975
msgid "# P2P GET requests ONLY routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1977
+#: src/dht/gnunet-service-dht_neighbours.c:2052
msgid "# P2P RESULTS received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1980
+#: src/dht/gnunet-service-dht_neighbours.c:2055
msgid "# P2P RESULT bytes received"
msgstr ""
-#: src/dht/gnunet-service-dht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
msgid "# Network size estimates received"
msgstr ""
msgid "# DHT requests combined"
msgstr ""
-#: src/dht/plugin_block_dht.c:136
+#: src/dht/gnunet-service-xdht_neighbours.c:1398
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,my_identity = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1514
+#: src/dht/gnunet-service-xdht_neighbours.c:1524
+#: src/dht/gnunet-service-xdht_neighbours.c:1530
+#: src/dht/gnunet-service-xdht_neighbours.c:1536
+#: src/dht/gnunet-service-xdht_neighbours.c:1545
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d"
+msgstr ""
+
+#: src/dht/plugin_block_dht.c:138
#, c-format
msgid "Block not of type %u\n"
msgstr ""
-#: src/dht/plugin_block_dht.c:143
+#: src/dht/plugin_block_dht.c:145
msgid "Size mismatch for block\n"
msgstr ""
-#: src/dht/plugin_block_dht.c:152
+#: src/dht/plugin_block_dht.c:155
#, c-format
msgid "Block of type %u is malformed\n"
msgstr ""
-#: src/dns/dnsparser.c:233
+#: src/dns/dnsparser.c:257
#, fuzzy, c-format
msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/dns/dnsparser.c:751
+#: src/dns/dnsparser.c:856
#, fuzzy, c-format
msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/dns/dnsstub.c:176
+#: src/dns/dnsstub.c:175
#, fuzzy, c-format
msgid "Could not bind to any port: %s\n"
msgstr "找不到主机“%s”的 IP：%s\n"
-#: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
#, fuzzy, c-format
msgid "Failed to send DNS request to %s\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/dns/dnsstub.c:300
+#: src/dns/dnsstub.c:299
#, fuzzy, c-format
msgid "Sent DNS request to %s\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/dns/dnsstub.c:369
+#: src/dns/dnsstub.c:368
#, c-format
msgid "Configured DNS exit `%s' is not working / valid.\n"
msgstr ""
-#: src/dns/dnsstub.c:441
+#: src/dns/dnsstub.c:440
#, c-format
msgid "Received DNS response that is too small (%u bytes)"
msgstr ""
msgid "# DNS requests received via TUN interface"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3359
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
#, c-format
msgid "`%s' must be installed SUID, refusing to run\n"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3415
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571
#, fuzzy
msgid "need a valid IPv4 or IPv6 address\n"
msgstr "无效的进程优先级“%s”\n"
-#: src/dv/gnunet-dv.c:165
+#: src/dv/gnunet-dv.c:169
msgid "verbose output"
msgstr ""
-#: src/dv/gnunet-dv.c:174
+#: src/dv/gnunet-dv.c:178
#, fuzzy
msgid "Print information about DV state"
msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/exit/gnunet-daemon-exit.c:756
+#: src/exit/gnunet-daemon-exit.c:802
#, c-format
msgid "Got duplicate service records for `%s:%u'\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:807
-msgid "# Bytes transmitted via mesh tunnels"
+#: src/exit/gnunet-daemon-exit.c:853
+#, fuzzy
+msgid "# Bytes transmitted via mesh channels"
msgstr ""
+"\n"
+"按任意键继续\n"
-#: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
-#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1451
-#: src/vpn/gnunet-service-vpn.c:1850 src/vpn/gnunet-service-vpn.c:2013
+#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
+#: src/exit/gnunet-daemon-exit.c:2654 src/vpn/gnunet-service-vpn.c:1407
+#: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960
msgid "# ICMPv4 packets dropped (type not allowed)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1507
-#: src/vpn/gnunet-service-vpn.c:1909 src/vpn/gnunet-service-vpn.c:2046
+#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
+#: src/exit/gnunet-daemon-exit.c:2713 src/vpn/gnunet-service-vpn.c:1463
+#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
msgid "# ICMPv6 packets dropped (type not allowed)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1001
+#: src/exit/gnunet-daemon-exit.c:1047
msgid "# ICMP packets dropped (not allowed)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1008
+#: src/exit/gnunet-daemon-exit.c:1054
msgid "ICMP Packet dropped, have no matching connection information\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1084
+#: src/exit/gnunet-daemon-exit.c:1130
msgid "UDP Packet dropped, have no matching connection information\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1158
+#: src/exit/gnunet-daemon-exit.c:1204
msgid "TCP Packet dropped, have no matching connection information\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1210
+#: src/exit/gnunet-daemon-exit.c:1256
msgid "# Packets received from TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1224
+#: src/exit/gnunet-daemon-exit.c:1270
msgid "# Bytes received from TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1250
+#: src/exit/gnunet-daemon-exit.c:1296
msgid "IPv4 packet options received. Ignored.\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1277
+#: src/exit/gnunet-daemon-exit.c:1323
#, c-format
msgid "IPv4 packet with unsupported next header %u received. Ignored.\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1323
+#: src/exit/gnunet-daemon-exit.c:1369
#, c-format
msgid "IPv6 packet with unsupported next header %d received. Ignored.\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1331
+#: src/exit/gnunet-daemon-exit.c:1377
#, c-format
msgid "Packet from unknown protocol %u received. Ignored.\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1713
+#: src/exit/gnunet-daemon-exit.c:1759
msgid "# TCP packets sent via TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1826
+#: src/exit/gnunet-daemon-exit.c:1872
msgid "# TCP service creation requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1829 src/exit/gnunet-daemon-exit.c:1919
-#: src/exit/gnunet-daemon-exit.c:2035 src/exit/gnunet-daemon-exit.c:2273
-#: src/exit/gnunet-daemon-exit.c:2522 src/exit/gnunet-daemon-exit.c:2811
-#: src/exit/gnunet-daemon-exit.c:2918
+#: 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"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1861 src/exit/gnunet-daemon-exit.c:2940
+#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
#, c-format
-msgid "No service found for %s on port %d!\n"
+msgid "No service %s found for %s on port %d!\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1865
+#: src/exit/gnunet-daemon-exit.c:1914
msgid "# TCP requests dropped (no such service)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1922
+#: src/exit/gnunet-daemon-exit.c:1971
msgid "# TCP IP-exit creation requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2038
+#: src/exit/gnunet-daemon-exit.c:2076
msgid "# TCP data requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2052
+#: src/exit/gnunet-daemon-exit.c:2090
msgid "# TCP DATA requests dropped (no session)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2102
+#: src/exit/gnunet-daemon-exit.c:2150
msgid "# ICMP packets sent via TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2276
+#: src/exit/gnunet-daemon-exit.c:2324
msgid "# ICMP IP-exit requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2525
+#: src/exit/gnunet-daemon-exit.c:2573
msgid "# ICMP service requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1441
-#: src/vpn/gnunet-service-vpn.c:2007
+#: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
+#: src/vpn/gnunet-service-vpn.c:1954
msgid "# ICMPv4 packets dropped (impossible PT to v6)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1477
-#: src/vpn/gnunet-service-vpn.c:1489 src/vpn/gnunet-service-vpn.c:1897
+#: src/exit/gnunet-daemon-exit.c:2698 src/vpn/gnunet-service-vpn.c:1433
+#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
msgid "# ICMPv6 packets dropped (impossible PT to v4)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2700
+#: src/exit/gnunet-daemon-exit.c:2748
msgid "# UDP packets sent via TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2814
+#: src/exit/gnunet-daemon-exit.c:2862
msgid "# UDP IP-exit requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2921
+#: src/exit/gnunet-daemon-exit.c:2969
msgid "# UDP service requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2944
+#: src/exit/gnunet-daemon-exit.c:2995
msgid "# UDP requests dropped (no such service)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2977
-msgid "# Inbound MESH tunnels created"
+#: src/exit/gnunet-daemon-exit.c:3031
+msgid "# Inbound MESH channels created"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#, 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
+#, c-format
+msgid "`%s' is not a valid port number (for domain `%s')!"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3216
+#: src/exit/gnunet-daemon-exit.c:3300
#, c-format
msgid "No addresses found for hostname `%s' of service `%s'!\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3230 src/exit/gnunet-daemon-exit.c:3242
+#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
#, c-format
msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3253
+#: src/exit/gnunet-daemon-exit.c:3337
#, c-format
msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3372
+#: src/exit/gnunet-daemon-exit.c:3527
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:3380
+#: src/exit/gnunet-daemon-exit.c:3535
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:3387
+#: src/exit/gnunet-daemon-exit.c:3542
msgid ""
"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
"ENABLE_IPv4=YES\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3393
+#: src/exit/gnunet-daemon-exit.c:3548
msgid ""
"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
"ENABLE_IPv6=YES\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3399 src/pt/gnunet-daemon-pt.c:887
+#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
+#: src/pt/gnunet-daemon-pt.c:1247
msgid "No useful service enabled. Exiting.\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3647
+#: src/exit/gnunet-daemon-exit.c:3664
+msgid "Must be a number"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3813
msgid "Daemon to run to provide an IP exit node for the VPN"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation.c:56
+#: src/experimentation/gnunet-daemon-experimentation.c:55
msgid "Experimentation daemon shutting down ...\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation.c:78
+#: src/experimentation/gnunet-daemon-experimentation.c:77
msgid "Experimentation daemon starting ...\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation.c:84
+#: src/experimentation/gnunet-daemon-experimentation.c:83
#, fuzzy
msgid "Failed to create statistics!\n"
msgstr "发送消息失败。\n"
-#: src/experimentation/gnunet-daemon-experimentation.c:121
+#: src/experimentation/gnunet-daemon-experimentation.c:120
msgid "GNUnet experimentation daemon"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:264
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
#, c-format
msgid "Experiment `%s': Experiment signature is invalid\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:271
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
#, c-format
msgid ""
"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
"sec. \n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:316
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
#, c-format
msgid "Experiment `%s': Issuer missing\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:321
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
#, c-format
msgid "Experiment `%s': Issuer invalid\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:327
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
#, c-format
msgid "Experiment `%s': Issuer not accepted!\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:336
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
#, c-format
msgid "Experiment `%s': Version missing or invalid \n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:344
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
#, c-format
msgid "Experiment `%s': Required capabilities missing \n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:349
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
#, c-format
msgid "Experiment `%s': Required capabilities invalid \n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:392
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
#, fuzzy, c-format
msgid "Failed to parse file `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:418
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:443
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
msgid ""
-"No valid experiment issuers configured! Set value to peer id of issuer! "
-"Exit...\n"
+"No valid experiment issuers configured! Set value to public keys of issuers! "
+"Exiting.\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:428
-#, fuzzy, c-format
-msgid "Invalid value `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-#, fuzzy, c-format
-msgid "Invalid public key `%s'\n"
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
+#, fuzzy
+msgid "Invalid value for public key\n"
msgstr "“%s”的参数无效。\n"
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:459
-#, fuzzy, c-format
-msgid "Found issuer for public key `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:462
-#, fuzzy, c-format
-msgid "No issuer for public key `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:479
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
#, fuzzy, c-format
msgid "Cannot read experiments file `%s'\n"
msgstr "无法解析“%s”(%s)：%s\n"
msgid "Cannot send message to peer `%s' for experiment `%s'\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:291
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
#, c-format
msgid "Sending experimentation request to peer %s\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:422
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
#, c-format
msgid "Added peer `%s' as active node\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:849
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
#, fuzzy, c-format
msgid "Connected to peer %s\n"
msgstr "“%s”已连接到“%s”。\n"
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:878
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
#, fuzzy, c-format
msgid "Disconnected from peer %s\n"
msgstr "“%s”已连接到“%s”。\n"
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1058
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
#, fuzzy
msgid "Failed to connect to CORE service!\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:109
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
#, c-format
msgid "Peer `%s' did not respond to request for experiment `%s'\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:144
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
#, c-format
msgid "Starting inbound experiment `%s' with peer `%s'\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:278
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
#, c-format
msgid "Starting outbound experiment `%s' with peer `%s'\n"
msgstr ""
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:296
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
#, c-format
msgid "Received %s message from peer %s for experiment `%s'\n"
msgstr ""
msgid "Short read reading from file `%s'!"
msgstr ""
-#: src/fs/fs_api.c:1062
+#: src/fs/fs_api.c:1066
#, fuzzy, c-format
msgid "Failed to resume publishing information `%s': %s\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/fs/fs_api.c:1565
+#: src/fs/fs_api.c:1571
#, c-format
msgid "Failure while resuming publishing operation `%s': %s\n"
msgstr ""
-#: src/fs/fs_api.c:1579
+#: src/fs/fs_api.c:1585
#, fuzzy, c-format
msgid "Failed to resume publishing operation `%s': %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/fs/fs_api.c:2236
+#: src/fs/fs_api.c:2242
#, c-format
msgid "Failure while resuming unindexing operation `%s': %s\n"
msgstr ""
-#: src/fs/fs_api.c:2246
+#: src/fs/fs_api.c:2252
#, fuzzy, c-format
msgid "Failed to resume unindexing operation `%s': %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/fs/fs_api.c:2372 src/fs/fs_api.c:2612
+#: 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"
-#: src/fs/fs_api.c:2389
+#: src/fs/fs_api.c:2395
#, fuzzy, c-format
msgid "Failed to resume sub-search `%s': %s\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/fs/fs_api.c:2402 src/fs/fs_api.c:2421 src/fs/fs_api.c:2904
+#: 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 ""
-#: src/fs/fs_api.c:2603
+#: 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"
-#: src/fs/fs_api.c:2848
+#: src/fs/fs_api.c:2855
msgid "Could not resume running search, will resume as paused search\n"
msgstr ""
-#: src/fs/fs_api.c:2942
+#: src/fs/fs_api.c:2949
#, 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 "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"
-#: 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 ""
-#: 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 ""
-#: src/fs/fs_download.c:997
+#: src/fs/fs_download.c:1013
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"
-#: 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"
-#: 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"
-#: src/fs/fs_download.c:1137
+#: src/fs/fs_download.c:1153
#, 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"
msgid "Failed to connect to datastore."
msgstr ""
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:414
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
#, c-format
msgid "Publishing failed: %s"
msgstr ""
-#: src/fs/fs_publish.c:642 src/fs/fs_publish.c:659 src/fs/fs_publish.c:698
-#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:743 src/fs/fs_publish.c:889
+#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
#, c-format
msgid "Can not index file `%s': %s. Will try to insert instead.\n"
msgstr ""
-#: src/fs/fs_publish.c:644
+#: src/fs/fs_publish.c:669
msgid "timeout on index-start request to `fs' service"
msgstr ""
-#: src/fs/fs_publish.c:656
+#: src/fs/fs_publish.c:681
#, fuzzy
msgid "unknown error"
msgstr "未知错误"
-#: src/fs/fs_publish.c:700
+#: src/fs/fs_publish.c:725
msgid "failed to compute hash"
msgstr ""
-#: src/fs/fs_publish.c:720
+#: src/fs/fs_publish.c:745
msgid "filename too long"
msgstr ""
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:770
msgid "could not connect to `fs' service"
msgstr ""
-#: src/fs/fs_publish.c:768
+#: src/fs/fs_publish.c:793
#, fuzzy, c-format
msgid "Failed to get file identifiers for `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/fs/fs_publish.c:837
+#: src/fs/fs_publish.c:862
#, c-format
msgid "Recursive upload failed at `%s': %s"
msgstr ""
-#: src/fs/fs_publish.c:843
+#: src/fs/fs_publish.c:868
#, c-format
msgid "Recursive upload failed: %s"
msgstr ""
-#: src/fs/fs_publish.c:890
+#: src/fs/fs_publish.c:915
msgid "needs to be an actual file"
msgstr ""
-#: src/fs/fs_publish.c:1126
+#: src/fs/fs_publish.c:1151
#, c-format
msgid "Insufficient space for publishing: %s"
msgstr ""
-#: src/fs/fs_publish.c:1198
+#: src/fs/fs_publish.c:1243
#, c-format
msgid "Reserving space for %u entries and %llu bytes for publication\n"
msgstr ""
msgid "Internal error."
msgstr "未知错误。\n"
-#: src/fs/fs_search.c:815
+#: src/fs/fs_search.c:813
#, fuzzy, c-format
msgid "Failed to parse URI `%s': %s\n"
msgstr "运行 %s失败：%s %d\n"
-#: src/fs/fs_search.c:874
+#: src/fs/fs_search.c:872
#, c-format
msgid "Got result with unknown block type `%d', ignoring"
msgstr ""
msgid "Malformed CHK URI"
msgstr ""
-#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:629
+#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
msgid "SKS URI malformed"
msgstr ""
-#: src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
+#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
msgid "LOC URI malformed"
msgstr ""
-#: src/fs/fs_uri.c:611
+#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553
msgid "LOC URI malformed (could not decode public key)"
msgstr ""
-#: src/fs/fs_uri.c:617
+#: src/fs/fs_uri.c:559
msgid "SKS URI malformed (could not find signature)"
msgstr ""
-#: src/fs/fs_uri.c:623
+#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574
msgid "SKS URI malformed (could not decode signature)"
msgstr ""
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:586
msgid "SKS URI malformed (could not parse expiration time)"
msgstr ""
-#: src/fs/fs_uri.c:648
+#: src/fs/fs_uri.c:598
msgid "SKS URI malformed (signature failed validation)"
msgstr ""
-#: src/fs/fs_uri.c:686
+#: src/fs/fs_uri.c:636
msgid "Unrecognized URI type"
msgstr ""
-#: src/fs/fs_uri.c:912
+#: src/fs/fs_uri.c:860
#, fuzzy
msgid "Lacking key configuration settings.\n"
msgstr "立即保存配置？"
-#: src/fs/fs_uri.c:918
+#: src/fs/fs_uri.c:866
#, fuzzy, c-format
msgid "Could not access hostkey file `%s'.\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/fs/fs_uri.c:1102 src/fs/fs_uri.c:1129
+#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
msgid "No keywords specified!\n"
msgstr ""
-#: src/fs/fs_uri.c:1135
+#: src/fs/fs_uri.c:1083
msgid "Number of double-quotes not balanced!\n"
msgstr ""
"You must specify one and only one directory name for automatic publication.\n"
msgstr ""
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:811
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
msgid "set the desired LEVEL of sender-anonymity"
msgstr ""
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:815
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
msgid "disable adding the creation time to the metadata of the uploaded file"
msgstr ""
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:818
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
msgid "do not use libextractor to add keywords or metadata"
msgstr ""
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:842
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
msgid "specify the priority of the content"
msgstr ""
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:849
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
msgid "set the desired replication LEVEL"
msgstr ""
msgid "Automatically publish files from a directory on GNUnet"
msgstr ""
-#: src/fs/gnunet-daemon-fsprofiler.c:657
+#: src/fs/gnunet-daemon-fsprofiler.c:660
msgid "Daemon to use file-sharing to measure its performance."
msgstr ""
msgid "Downloading `%s' done (%s/s).\n"
msgstr ""
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:273
-#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
#, c-format
msgid "Unexpected status: %d\n"
msgstr ""
msgid "You need to specify a URI argument.\n"
msgstr "您必须指定一个昵称\n"
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:652
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
#, fuzzy, c-format
msgid "Failed to parse URI: %s\n"
msgstr "运行 %s失败：%s %d\n"
msgid "Target filename must be specified.\n"
msgstr ""
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:784
-#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
+#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
#, fuzzy, c-format
msgid "Could not initialize `%s' subsystem.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
msgid "set the desired LEVEL of receiver-anonymity"
msgstr ""
msgid "delete incomplete downloads (when aborted with CTRL-C)"
msgstr ""
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
msgid "only search the local peer (no P2P network search)"
msgstr ""
msgid "run a testbed to measure file-sharing performance"
msgstr ""
-#: src/fs/gnunet-publish.c:230
+#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
#, c-format
msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
msgstr ""
-#: src/fs/gnunet-publish.c:237
+#: src/fs/gnunet-publish.c:250
#, c-format
msgid "Error publishing: %s.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:247
+#: src/fs/gnunet-publish.c:260
#, c-format
msgid "Publishing `%s' done.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:251
+#: src/fs/gnunet-publish.c:264
#, c-format
msgid "URI is `%s'.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:270
+#: src/fs/gnunet-publish.c:283
msgid "Cleanup after abort complete.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:388
+#: src/fs/gnunet-publish.c:401
#, fuzzy, c-format
msgid "Meta data for file `%s' (%s)\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/fs/gnunet-publish.c:390
+#: src/fs/gnunet-publish.c:403
#, fuzzy, c-format
msgid "Keywords for file `%s' (%s)\n"
msgstr "无法解析“%s”(%s)：%s\n"
-#: src/fs/gnunet-publish.c:529
+#: src/fs/gnunet-publish.c:542
#, fuzzy
msgid "Could not publish\n"
msgstr "无法解析“%s”(%s)：%s\n"
-#: src/fs/gnunet-publish.c:552
+#: src/fs/gnunet-publish.c:565
msgid "Could not start publishing.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:585
+#: src/fs/gnunet-publish.c:598
#, fuzzy, c-format
msgid "Scanning directory `%s'.\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/fs/gnunet-publish.c:587
+#: src/fs/gnunet-publish.c:600
#, fuzzy, c-format
msgid "Scanning file `%s'.\n"
msgstr "未知的命令“%s”。\n"
-#: src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:605
#, c-format
msgid "There was trouble processing file `%s', skipping it.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:597
+#: src/fs/gnunet-publish.c:610
msgid "Preprocessing complete.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:601
+#: src/fs/gnunet-publish.c:614
#, fuzzy, c-format
msgid "Extracting meta data from file `%s' complete.\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:618
msgid "Meta data extraction has finished.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:612
+#: src/fs/gnunet-publish.c:625
#, fuzzy
msgid "Internal error scanning directory.\n"
msgstr "未知错误。\n"
-#: src/fs/gnunet-publish.c:643
+#: src/fs/gnunet-publish.c:656
#, c-format
msgid "Selected pseudonym `%s' unknown\n"
msgstr ""
-#: src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-publish.c:682
#, fuzzy, c-format
msgid "Failed to access `%s': %s\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:695
msgid ""
"Failed to start meta directory scanner. Is gnunet-helper-publish-fs "
"installed?\n"
msgstr ""
-#: src/fs/gnunet-publish.c:734
+#: src/fs/gnunet-publish.c:747
#, c-format
msgid "Cannot extract metadata from a URI!\n"
msgstr ""
-#: src/fs/gnunet-publish.c:741
+#: src/fs/gnunet-publish.c:754
#, c-format
msgid "You must specify one and only one filename for insertion.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:760
#, c-format
msgid "You must NOT specify an URI and a filename.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:755 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
#, c-format
msgid "Option `%s' is required when using option `%s'.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:765 src/fs/gnunet-publish.c:772
-#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
+#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
+#: src/transport/gnunet-transport.c:1284 src/transport/gnunet-transport.c:1314
+#: src/transport/gnunet-transport.c:1344
#, c-format
msgid "Option `%s' makes no sense without option `%s'.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:822
+#: src/fs/gnunet-publish.c:835
msgid ""
"print list of extracted keywords that would be used, but do not perform "
"upload"
msgstr ""
-#: src/fs/gnunet-publish.c:826
+#: src/fs/gnunet-publish.c:839
msgid ""
"add an additional keyword for the top-level file or directory (this option "
"can be specified multiple times)"
msgstr ""
-#: src/fs/gnunet-publish.c:830
+#: src/fs/gnunet-publish.c:843
msgid "set the meta-data for the given TYPE to the given VALUE"
msgstr ""
-#: src/fs/gnunet-publish.c:833
+#: src/fs/gnunet-publish.c:846
msgid ""
"do not index, perform full insertion (stores entire file in encrypted form "
"in GNUnet database)"
msgstr ""
-#: src/fs/gnunet-publish.c:838
+#: src/fs/gnunet-publish.c:851
msgid ""
"specify ID of an updated version to be published in the future (for "
"namespace insertions only)"
msgstr ""
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-publish.c:859
msgid "publish the files under the pseudonym NAME (place file into namespace)"
msgstr ""
-#: src/fs/gnunet-publish.c:852
+#: src/fs/gnunet-publish.c:865
msgid ""
"only simulate the process but do not do any actual publishing (useful to "
"compute URIs)"
msgstr ""
-#: src/fs/gnunet-publish.c:856
+#: src/fs/gnunet-publish.c:869
msgid ""
"set the ID of this version of the publication (for namespace insertions only)"
msgstr ""
-#: src/fs/gnunet-publish.c:860
+#: src/fs/gnunet-publish.c:873
msgid ""
"URI to be published (can be used instead of passing a file to add keywords "
"to the file with the respective URI)"
msgstr ""
-#: src/fs/gnunet-publish.c:876
+#: src/fs/gnunet-publish.c:889
msgid "Publish a file or directory on GNUnet"
msgstr ""
msgid "Failed to write directory with search results to `%s'\n"
msgstr ""
-#: src/fs/gnunet-search.c:184
+#: src/fs/gnunet-search.c:191
#, fuzzy, c-format
msgid "Error searching: %s.\n"
msgstr "创建用户出错"
-#: src/fs/gnunet-search.c:233
+#: src/fs/gnunet-search.c:240
msgid "Could not create keyword URI from arguments.\n"
msgstr ""
-#: src/fs/gnunet-search.c:257
+#: src/fs/gnunet-search.c:264
msgid "Could not start searching.\n"
msgstr ""
-#: src/fs/gnunet-search.c:288
+#: src/fs/gnunet-search.c:295
msgid "write search results to file starting with PREFIX"
msgstr ""
-#: src/fs/gnunet-search.c:291
+#: src/fs/gnunet-search.c:298
msgid "automatically terminate search after DELAY"
msgstr ""
-#: src/fs/gnunet-search.c:298
+#: src/fs/gnunet-search.c:305
msgid "automatically terminate search after VALUE results are found"
msgstr ""
-#: src/fs/gnunet-search.c:309
+#: src/fs/gnunet-search.c:316
msgid "Search GNUnet for files that were published on GNUnet"
msgstr ""
msgid "# Loopback routes suppressed"
msgstr ""
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
-#: src/topology/gnunet-daemon-topology.c:1315
-#: src/topology/gnunet-daemon-topology.c:1322
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
+#: src/topology/gnunet-daemon-topology.c:1254
+#: src/topology/gnunet-daemon-topology.c:1261
#, fuzzy, c-format
msgid "Failed to connect to `%s' service.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/fs/gnunet-service-fs_cp.c:677
+#: src/fs/gnunet-service-fs_cp.c:682
msgid "# migration stop messages received"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:681
+#: src/fs/gnunet-service-fs_cp.c:686
#, c-format
msgid "Migration of content to peer `%s' blocked for %s\n"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:716
+#: src/fs/gnunet-service-fs_cp.c:721
msgid "# replies transmitted to other peers"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:722
+#: src/fs/gnunet-service-fs_cp.c:727
msgid "# replies dropped"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:747 src/fs/gnunet-service-fs_cp.c:1296
+#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
msgid "# P2P searches active"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:840
+#: src/fs/gnunet-service-fs_cp.c:845
msgid "# artificial delays introduced (ms)"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:893
+#: src/fs/gnunet-service-fs_cp.c:898
msgid "# replies dropped due to type mismatch"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:901
+#: src/fs/gnunet-service-fs_cp.c:906
msgid "# replies received for other peers"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:915
+#: src/fs/gnunet-service-fs_cp.c:920
msgid "# replies dropped due to insufficient cover traffic"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:953
+#: src/fs/gnunet-service-fs_cp.c:958
msgid "# P2P searches destroyed due to ultimate reply"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1021
+#: src/fs/gnunet-service-fs_cp.c:1026
msgid "# requests done for free (low load)"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1046
+#: src/fs/gnunet-service-fs_cp.c:1051
msgid "# request dropped, priority insufficient"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1056
+#: src/fs/gnunet-service-fs_cp.c:1061
msgid "# requests done for a price (normal load)"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1134
+#: src/fs/gnunet-service-fs_cp.c:1139
msgid "# GET requests received (from other peers)"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1168
+#: src/fs/gnunet-service-fs_cp.c:1173
msgid "# requests dropped due to initiator not being connected"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1191
+#: src/fs/gnunet-service-fs_cp.c:1195
msgid "# requests dropped due to missing reverse route"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1241
+#: src/fs/gnunet-service-fs_cp.c:1246
msgid "# requests dropped due TTL underflow"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1265
+#: src/fs/gnunet-service-fs_cp.c:1270
msgid "# requests dropped due to higher-TTL request"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1294
+#: src/fs/gnunet-service-fs_cp.c:1299
msgid "# P2P query messages received and processed"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1664
+#: src/fs/gnunet-service-fs_cp.c:1670
msgid "# migration stop messages sent"
msgstr ""
msgid "Indexed file `%s' changed at offset %llu\n"
msgstr ""
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
msgid "# client searches active"
msgstr ""
msgid "# replies received for local clients"
msgstr ""
-#: src/fs/gnunet-service-fs_lc.c:328
+#: src/fs/gnunet-service-fs_lc.c:327
msgid "# client searches received"
msgstr ""
-#: src/fs/gnunet-service-fs_lc.c:363
+#: src/fs/gnunet-service-fs_lc.c:362
msgid "# client searches updated (merged content seen list)"
msgstr ""
-#: src/fs/gnunet-service-fs_mesh_client.c:475
+#: src/fs/gnunet-service-fs_mesh_client.c:484
msgid "# replies received via mesh"
msgstr ""
-#: src/fs/gnunet-service-fs_mesh_client.c:489
+#: src/fs/gnunet-service-fs_mesh_client.c:498
msgid "# replies received via mesh dropped"
msgstr ""
-#: src/fs/gnunet-service-fs_mesh_server.c:259
+#: src/fs/gnunet-service-fs_mesh_server.c:260
msgid "# Blocks transferred via mesh"
msgstr ""
-#: src/fs/gnunet-service-fs_mesh_server.c:412
+#: 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:455
+#: 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:461
-#: src/fs/gnunet-service-fs_mesh_server.c:501
+#: src/fs/gnunet-service-fs_mesh_server.c:482
+#: src/fs/gnunet-service-fs_mesh_server.c:522
#, fuzzy
msgid "# mesh connections active"
msgstr ""
msgid "# requests refreshed"
msgstr ""
-#: src/fs/gnunet-service-fs_pe.c:614 src/fs/gnunet-service-fs_pe.c:698
-#: src/fs/gnunet-service-fs_pe.c:769
+#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
+#: src/fs/gnunet-service-fs_pe.c:771
msgid "# query plan entries"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:310
+#: src/fs/gnunet-service-fs_pr.c:311
msgid "# Pending requests created"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:393 src/fs/gnunet-service-fs_pr.c:644
+#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
msgid "# Pending requests active"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:812
+#: src/fs/gnunet-service-fs_pr.c:814
msgid "# replies received and matched"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:842
+#: src/fs/gnunet-service-fs_pr.c:844
msgid "# duplicate replies discarded (bloomfilter)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:851
+#: src/fs/gnunet-service-fs_pr.c:853
msgid "# irrelevant replies discarded"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:865
+#: src/fs/gnunet-service-fs_pr.c:867
#, c-format
msgid "Unsupported block type %u\n"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:878
+#: src/fs/gnunet-service-fs_pr.c:880
msgid "# results found locally"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:999
+#: src/fs/gnunet-service-fs_pr.c:1001
msgid "# Datastore `PUT' failures"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1026
+#: src/fs/gnunet-service-fs_pr.c:1029
msgid "# storage requests dropped due to high load"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1061
+#: src/fs/gnunet-service-fs_pr.c:1064
msgid "# Replies received from DHT"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1189
+#: src/fs/gnunet-service-fs_pr.c:1192
msgid "# Replies received from MESH"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1241
+#: src/fs/gnunet-service-fs_pr.c:1244
#, c-format
msgid "Datastore lookup already took %s!\n"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1261
+#: src/fs/gnunet-service-fs_pr.c:1264
#, c-format
msgid "On-demand lookup already took %s!\n"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1308
+#: src/fs/gnunet-service-fs_pr.c:1311
msgid "# Datastore lookups concluded (no results)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1323
+#: src/fs/gnunet-service-fs_pr.c:1326
msgid "# Datastore lookups concluded (seen all)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1332
+#: src/fs/gnunet-service-fs_pr.c:1335
msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1347
+#: src/fs/gnunet-service-fs_pr.c:1350
msgid "# requested DBLOCK or IBLOCK not found"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1361
+#: src/fs/gnunet-service-fs_pr.c:1364
msgid "# on-demand blocks matched requests"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1374
+#: src/fs/gnunet-service-fs_pr.c:1377
msgid "# on-demand lookups performed successfully"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1379
+#: src/fs/gnunet-service-fs_pr.c:1382
msgid "# on-demand lookups failed"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1406 src/fs/gnunet-service-fs_pr.c:1446
-#: src/fs/gnunet-service-fs_pr.c:1587
+#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1590
msgid "# Datastore lookups concluded (error queueing)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1464
+#: src/fs/gnunet-service-fs_pr.c:1467
msgid "# Datastore lookups concluded (found last result)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1475
+#: src/fs/gnunet-service-fs_pr.c:1478
msgid "# Datastore lookups concluded (load too high)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1563
+#: src/fs/gnunet-service-fs_pr.c:1566
msgid "# Datastore lookups initiated"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1648
+#: src/fs/gnunet-service-fs_pr.c:1651
msgid "# GAP PUT messages received"
msgstr ""
-#: src/fs/gnunet-service-fs_push.c:629
+#: src/fs/gnunet-service-fs_push.c:631
msgid "time required, content pushing disabled"
msgstr ""
msgid "Unindex a file that was previously indexed with gnunet-publish."
msgstr ""
-#: src/gns/gns_api.c:385
+#: 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
+#, c-format
+msgid "Refusing `%s' request to HTTP server\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
+#, c-format
+msgid "Invalid port number %llu. Exiting.\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:360
+#, c-format
+msgid "Businesscard HTTP server starts on %llu\n"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:374
+#, fuzzy, c-format
+msgid "Could not start businesscard HTTP server on port %u\n"
msgstr "初始化“%s”服务失败。\n"
+#: src/gns/gnunet-bcd.c:519
+msgid "Run HTTP serve on port PORT (default is 8888)"
+msgstr ""
+
+#: src/gns/gnunet-bcd.c:531
+msgid "GNUnet HTTP server to create business cards"
+msgstr ""
+
#: src/gns/gnunet-dns2gns.c:228
#, fuzzy
msgid "Failed to pack DNS response into UDP packet!\n"
msgid "Received unsupported DNS request from %s\n"
msgstr ""
-#: src/gns/gnunet-dns2gns.c:703
+#: src/gns/gnunet-dns2gns.c:701
msgid "No ego configured for `dns2gns` subsystem\n"
msgstr ""
-#: src/gns/gnunet-dns2gns.c:729
+#: src/gns/gnunet-dns2gns.c:727
msgid "No DNS server specified!\n"
msgstr ""
-#: src/gns/gnunet-dns2gns.c:751
+#: src/gns/gnunet-dns2gns.c:749
msgid "No valid GNS zone specified!\n"
msgstr ""
-#: src/gns/gnunet-dns2gns.c:772
+#: src/gns/gnunet-dns2gns.c:770
msgid "IP of recursive DNS resolver to use (required)"
msgstr ""
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:773
msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
msgstr ""
-#: src/gns/gnunet-dns2gns.c:778
+#: src/gns/gnunet-dns2gns.c:776
msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
msgstr ""
-#: src/gns/gnunet-dns2gns.c:781
+#: src/gns/gnunet-dns2gns.c:779
msgid "UDP port to listen on for inbound DNS requests; default: 53"
msgstr ""
-#: src/gns/gnunet-dns2gns.c:784
+#: src/gns/gnunet-dns2gns.c:782
msgid "Public key of the GNS zone to use (overrides default)"
msgstr ""
-#: src/gns/gnunet-dns2gns.c:797
+#: src/gns/gnunet-dns2gns.c:795
msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
msgstr ""
-#: src/gns/gnunet-gns.c:205
+#: src/gns/gnunet-gns.c:227
#, c-format
msgid "Please specify name to lookup!\n"
msgstr ""
-#: src/gns/gnunet-gns.c:285
+#: src/gns/gnunet-gns.c:308
#, c-format
msgid "Ego for `%s' not found, cannot perform lookup.\n"
msgstr ""
-#: src/gns/gnunet-gns.c:323
+#: src/gns/gnunet-gns.c:347 src/gns/gnunet-gns-helper-service-w32.c:798
#, c-format
msgid ""
-"Ego for `master-zone' not found, cannot perform lookup. Did you run gnunet-"
+"Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-"
"gns-import.sh?\n"
msgstr ""
-#: src/gns/gnunet-gns.c:352
+#: 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"
-#: src/gns/gnunet-gns.c:365
+#: src/gns/gnunet-gns.c:399
#, c-format
msgid "Public key `%s' is not well-formed\n"
msgstr ""
-#: src/gns/gnunet-gns.c:414
+#: src/gns/gnunet-gns.c:449
msgid "Lookup a record for the given name"
msgstr ""
-#: src/gns/gnunet-gns.c:417
+#: src/gns/gnunet-gns.c:452
msgid "Specify the type of the record to lookup"
msgstr ""
-#: src/gns/gnunet-gns.c:420
+#: src/gns/gnunet-gns.c:455
+msgid "Specify timeout for the lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:458
msgid "No unneeded output"
msgstr ""
-#: src/gns/gnunet-gns.c:423
+#: src/gns/gnunet-gns.c:461
msgid "Specify the public key of the zone to lookup the record in"
msgstr ""
-#: src/gns/gnunet-gns.c:426
+#: src/gns/gnunet-gns.c:464
msgid "Specify the name of the ego of the zone to lookup the record in"
msgstr ""
-#: src/gns/gnunet-gns.c:439
+#: src/gns/gnunet-gns.c:478
#, fuzzy
msgid "GNUnet GNS resolver tool"
msgstr "GNUnet 错误日志"
-#: src/gns/gnunet-gns-proxy.c:60 src/hostlist/hostlist-client.c:469
-#: src/hostlist/hostlist-client.c:680 src/hostlist/hostlist-client.c:686
-#: src/hostlist/hostlist-client.c:738 src/hostlist/hostlist-client.c:747
-#: src/hostlist/hostlist-client.c:868 src/hostlist/hostlist-client.c:960
-#: src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1068
-#: src/transport/plugin_transport_http_client.c:1083
+#: src/gns/gnunet-gns-helper-service-w32.c:768
+#, c-format
+msgid ""
+"Ego for `gns-short' not found. This is not really fatal, but i'll pretend "
+"that it is and refuse to perform a lookup. Did you run gnunet-gns-import."
+"sh?\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-helper-service-w32.c:838
+#, fuzzy, c-format
+msgid "Failed to connect to identity service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns-import.c:479
+msgid "This program will import some GNS authorities into your GNS namestore."
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
+#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
+#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
+#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:968
+#: src/transport/plugin_transport_http_client.c:1062
+#: src/transport/plugin_transport_http_client.c:1077
#, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr ""
-#: src/gns/gnunet-gns-proxy.c:2344
+#: src/gns/gnunet-gns-proxy.c:833
+#, fuzzy, c-format
+msgid "Unsupported CURL SSL backend %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:856
+#, fuzzy, c-format
+msgid "Failed to fetch CN from cert: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/gns/gnunet-gns-proxy.c:879
+#, fuzzy, c-format
+msgid "Failed to initialize DANE: %s\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/gns/gnunet-gns-proxy.c:892
+#, fuzzy, c-format
+msgid "Failed to parse DANE record: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/gns/gnunet-gns-proxy.c:907
+#, fuzzy, c-format
+msgid "Failed to verify TLS connection using DANE: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/gnunet-gns-proxy.c:917
+#, c-format
+msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:941
+#, c-format
+msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1086
+#, c-format
+msgid "Cookie domain `%s' supplied by server is invalid\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:1602
+#, fuzzy, c-format
+msgid "Unsupported HTTP method `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:1973
#, fuzzy, c-format
msgid "Unable to import private key from file `%s'\n"
msgstr "无法创建用户账户："
-#: src/gns/gnunet-gns-proxy.c:2372
+#: src/gns/gnunet-gns-proxy.c:2003
#, fuzzy, c-format
msgid "Unable to import certificate %s\n"
msgstr "无法保存配置文件“%s”："
-#: src/gns/gnunet-gns-proxy.c:2637 src/namestore/gnunet-namestore-fcfsd.c:958
+#: src/gns/gnunet-gns-proxy.c:2177
+#, fuzzy, c-format
+msgid "Failed to start HTTPS server for `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2196
#, fuzzy
-msgid "Failed to start HTTP server\n"
+msgid "Failed to pass client to MHD\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-gns-proxy.c:3020
+#: src/gns/gnunet-gns-proxy.c:2504
+#, fuzzy, c-format
+msgid "Unsupported socks version %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2533
+#, fuzzy, c-format
+msgid "Unsupported socks command %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+msgid "SSL connection to plain IPv4 address requested\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:2631
+#, fuzzy, c-format
+msgid "Unsupported socks address type %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-proxy.c:2970
msgid "No ego configured for `shorten-zone`\n"
msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3060
-msgid "No ego configured for `master-zone`\n"
+#: src/gns/gnunet-gns-proxy.c:3010
+#, c-format
+msgid "No ego configured for `%s`\n"
msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3120
+#: src/gns/gnunet-gns-proxy.c:3072
#, fuzzy, c-format
msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/gns/gnunet-gns-proxy.c:3156
+#: src/gns/gnunet-gns-proxy.c:3113
msgid "listen on specified port (default: 7777)"
msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3159
+#: src/gns/gnunet-gns-proxy.c:3116
msgid "pem file to use as CA"
msgstr ""
-#: src/gns/gnunet-gns-proxy.c:3178
+#: src/gns/gnunet-gns-proxy.c:3135
msgid "GNUnet GNS proxy"
msgstr ""
-#: src/gns/gnunet-service-gns.c:649
+#: src/gns/gnunet-service-gns.c:862
#, fuzzy
msgid "Failed to connect to the namestore!\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-service-gns.c:692
+#: src/gns/gnunet-service-gns.c:870
+#, fuzzy
+msgid "Failed to connect to the namecache!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-service-gns.c:903
#, fuzzy
msgid "Could not connect to DHT!\n"
msgstr "无法连接到 %s:%u：%s\n"
-#: src/gns/gnunet-service-gns.c:708
+#: src/gns/gnunet-service-gns.c:919
#, fuzzy
msgid "valid public key required"
msgstr "“%s”的参数无效。\n"
-#: src/gns/gnunet-service-gns_interceptor.c:201
+#: src/gns/gnunet-service-gns_interceptor.c:263
msgid "Error converting GNS response to DNS response!\n"
msgstr ""
-#: src/gns/gnunet-service-gns_interceptor.c:307
+#: src/gns/gnunet-service-gns_interceptor.c:369
#, fuzzy
msgid "Failed to connect to the DNS service!\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-service-gns_resolver.c:717
+#: src/gns/gnunet-service-gns_resolver.c:816
#, fuzzy
msgid "Failed to parse DNS response\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/gns/gnunet-service-gns_resolver.c:843
+#: src/gns/gnunet-service-gns_resolver.c:958
#, c-format
msgid "Skipping record of unsupported type %d\n"
msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1475
+#: src/gns/gnunet-service-gns_resolver.c:1317
#, c-format
msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1499
+#: src/gns/gnunet-service-gns_resolver.c:1817
msgid "GNS lookup recursion failed (no delegation record found)\n"
msgstr ""
-#: src/gns/gnunet-service-gns_resolver.c:1523
+#: src/gns/gnunet-service-gns_resolver.c:1841
#, fuzzy, c-format
msgid "Failed to cache GNS resolution: %s\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/gns/gnunet-service-gns_resolver.c:1782
+#: src/gns/gnunet-service-gns_resolver.c:2123
+#, c-format
+msgid "Zone %s was revoked, resolution fails\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2272
#, c-format
msgid "Hostname `%s' is not well-formed, resolution fails\n"
msgstr ""
+#: src/gns/plugin_gnsrecord_gns.c:151
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:180
+#, fuzzy, c-format
+msgid "Unable to parse GNS2DNS record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:201
+#, fuzzy, c-format
+msgid "Failed to serialize GNS2DNS record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/plugin_gnsrecord_gns.c:217
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:293
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:314
+#, fuzzy, c-format
+msgid "Failed to serialize NS record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:336
+#, fuzzy, c-format
+msgid "Failed to serialize CNAME record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:420
+#, fuzzy, c-format
+msgid "Failed to serialize CERT record with %u bytes\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:471
+#, fuzzy, c-format
+msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:494
+#, fuzzy, c-format
+msgid "Failed to serialize PTR record with value `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:514
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:529
+#, fuzzy, c-format
+msgid "Failed to serialize MX record with hostname `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:549
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:567
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
#: src/hello/gnunet-hello.c:123
msgid "Call with name of HELLO file to modify.\n"
msgstr ""
msgid "Modified %u addresses \n"
msgstr ""
-#: src/hello/hello.c:947
+#: src/hello/hello.c:944
#, fuzzy
msgid "Failed to parse HELLO message: missing expiration time\n"
msgstr "保存配置失败。"
-#: src/hello/hello.c:956
+#: src/hello/hello.c:953
#, fuzzy
msgid "Failed to parse HELLO message: invalid expiration time\n"
msgstr "保存配置失败。"
-#: src/hello/hello.c:966
+#: src/hello/hello.c:963
#, fuzzy
msgid "Failed to parse HELLO message: malformed\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/hello/hello.c:976
+#: src/hello/hello.c:973
msgid "Failed to parse HELLO message: missing transport plugin\n"
msgstr ""
-#: src/hello/hello.c:993
+#: src/hello/hello.c:990
#, c-format
msgid "Plugin `%s' not found\n"
msgstr ""
-#: src/hello/hello.c:1002
+#: src/hello/hello.c:999
#, c-format
msgid "Plugin `%s' does not support URIs yet\n"
msgstr ""
-#: src/hello/hello.c:1021
+#: src/hello/hello.c:1018
#, 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:260
+#: src/hostlist/gnunet-daemon-hostlist.c:259
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:313
+#: src/hostlist/gnunet-daemon-hostlist.c:308
msgid "advertise our hostlist to other peers"
msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:318
+#: src/hostlist/gnunet-daemon-hostlist.c:313
msgid ""
"bootstrap using hostlists (it is highly recommended that you always use this "
"option)"
msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:321
+#: src/hostlist/gnunet-daemon-hostlist.c:316
msgid "enable learning about hostlist servers from other peers"
msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:320
msgid "provide a hostlist server"
msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:340
+#: src/hostlist/gnunet-daemon-hostlist.c:335
msgid "GNUnet hostlist server and client"
msgstr ""
-#: src/hostlist/hostlist-client.c:289
+#: src/hostlist/hostlist-client.c:288
msgid "# bytes downloaded from hostlist servers"
msgstr ""
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
+#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
msgid "# invalid HELLOs downloaded from hostlist servers"
msgstr ""
-#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
+#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
#, c-format
msgid "Invalid `%s' message received from hostlist at `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:331
+#: src/hostlist/hostlist-client.c:330
msgid "# valid HELLOs downloaded from hostlist servers"
msgstr ""
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1330
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
msgid "# advertised hostlist URIs"
msgstr ""
-#: src/hostlist/hostlist-client.c:619
+#: src/hostlist/hostlist-client.c:622
#, c-format
msgid "# advertised URI `%s' downloaded"
msgstr ""
-#: src/hostlist/hostlist-client.c:661
+#: src/hostlist/hostlist-client.c:664
#, c-format
msgid ""
"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
"gets dismissed.\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:799
+#: src/hostlist/hostlist-client.c:802
#, c-format
msgid "Timeout trying to download hostlist from `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:813
+#: src/hostlist/hostlist-client.c:816
#, c-format
msgid "Download limit of %u bytes exceeded, stopping download\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:833
+#: src/hostlist/hostlist-client.c:836
#, fuzzy, c-format
msgid "Download of hostlist from `%s' failed: `%s'\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/hostlist/hostlist-client.c:839
+#: src/hostlist/hostlist-client.c:842
#, c-format
msgid "Download of hostlist `%s' completed.\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:847
+#: src/hostlist/hostlist-client.c:850
#, c-format
msgid "Adding successfully tested hostlist `%s' datastore.\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:900
+#: src/hostlist/hostlist-client.c:903
#, c-format
msgid "Bootstrapping using hostlist at `%s'.\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:908
+#: src/hostlist/hostlist-client.c:911
msgid "# hostlist downloads initiated"
msgstr ""
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1503
+#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
msgid "# milliseconds between hostlist downloads"
msgstr ""
-#: src/hostlist/hostlist-client.c:1046
+#: src/hostlist/hostlist-client.c:1049
#, c-format
msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1106 src/hostlist/hostlist-client.c:1122
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
msgid "# active connections"
msgstr ""
-#: src/hostlist/hostlist-client.c:1278
+#: src/hostlist/hostlist-client.c:1280
#, c-format
msgid "Loading saved hostlist entries from file `%s' \n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1282
+#: src/hostlist/hostlist-client.c:1285
#, c-format
msgid "Hostlist file `%s' does not exist\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1293
+#: src/hostlist/hostlist-client.c:1296
#, 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:1326
+#: src/hostlist/hostlist-client.c:1329
#, c-format
msgid "%u hostlist URIs loaded from file\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1328
+#: src/hostlist/hostlist-client.c:1331
msgid "# hostlist URIs read from file"
msgstr ""
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1376
#, 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:1378
+#: src/hostlist/hostlist-client.c:1381
#, c-format
msgid "Writing %u hostlist URIs to `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1402 src/hostlist/hostlist-client.c:1419
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
#, c-format
msgid "Error writing hostlist URIs to file `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1414
+#: src/hostlist/hostlist-client.c:1417
msgid "# hostlist URIs written to file"
msgstr ""
-#: src/hostlist/hostlist-client.c:1468
+#: src/hostlist/hostlist-client.c:1471
msgid "Learning is enabled on this peer\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1483
msgid "Learning is not enabled on this peer\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1495
#, c-format
msgid ""
"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1496
+#: src/hostlist/hostlist-client.c:1499
#, c-format
msgid "Hostlist file `%s' could not be removed\n"
msgstr ""
msgid "expired addresses encountered"
msgstr ""
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:358
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
-#: src/peerinfo-tool/gnunet-peerinfo.c:499
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
+#: src/peerinfo-tool/gnunet-peerinfo.c:350
+#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:490
+#: src/topology/gnunet-daemon-topology.c:925
#, c-format
msgid "Error in communication with PEERINFO service: %s\n"
msgstr ""
msgid "# hostlist advertisements send"
msgstr ""
-#: src/hostlist/hostlist-server.c:389
+#: src/hostlist/hostlist-server.c:390
msgid "Advertisement message could not be queued by core\n"
msgstr ""
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
-#: src/transport/gnunet-service-transport.c:806
+#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
+#: src/transport/gnunet-service-transport.c:1114
msgid "Could not access PEERINFO service. Exiting.\n"
msgstr ""
-#: src/hostlist/hostlist-server.c:570
-#, c-format
-msgid "Invalid port number %llu. Exiting.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-server.c:579
+#: src/hostlist/hostlist-server.c:576
#, c-format
msgid "Hostlist service starts on %s:%llu\n"
msgstr ""
-#: src/hostlist/hostlist-server.c:593
+#: src/hostlist/hostlist-server.c:590
#, c-format
msgid "Address to obtain hostlist: `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-server.c:633
+#: src/hostlist/hostlist-server.c:630
#, fuzzy, c-format
msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
msgstr "“%s”不可用。\n"
-#: src/hostlist/hostlist-server.c:676
+#: src/hostlist/hostlist-server.c:673
#, c-format
msgid "Could not start hostlist HTTP server on port %u\n"
msgstr ""
msgid "Maintain egos"
msgstr ""
-#: src/identity/gnunet-service-identity.c:337
+#: src/identity/gnunet-service-identity.c:338
msgid "no default known"
msgstr ""
-#: src/identity/gnunet-service-identity.c:360
+#: src/identity/gnunet-service-identity.c:362
msgid "default configured, but ego unknown (internal error)"
msgstr ""
-#: src/identity/gnunet-service-identity.c:437
-#: src/identity/gnunet-service-identity.c:668
-#: src/identity/gnunet-service-identity.c:776
+#: src/identity/gnunet-service-identity.c:439
+#: src/identity/gnunet-service-identity.c:670
+#: src/identity/gnunet-service-identity.c:778
#, fuzzy, c-format
msgid "Failed to write subsystem default identifier map to `%s'.\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/identity/gnunet-service-identity.c:444
+#: src/identity/gnunet-service-identity.c:446
msgid "Unknown ego specified for service (internal error)"
msgstr ""
-#: src/identity/gnunet-service-identity.c:514
+#: src/identity/gnunet-service-identity.c:516
msgid "identifier already in use for another ego"
msgstr ""
-#: src/identity/gnunet-service-identity.c:645
+#: src/identity/gnunet-service-identity.c:647
msgid "target name already exists"
msgstr ""
-#: src/identity/gnunet-service-identity.c:684
-#: src/identity/gnunet-service-identity.c:793
+#: src/identity/gnunet-service-identity.c:686
+#: src/identity/gnunet-service-identity.c:795
msgid "no matching ego found"
msgstr ""
-#: src/identity/gnunet-service-identity.c:827
+#: src/identity/gnunet-service-identity.c:829
#, fuzzy, c-format
msgid "Failed to parse ego information in `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/identity/gnunet-service-identity.c:900
+#: src/identity/gnunet-service-identity.c:902
#, fuzzy, c-format
msgid "Failed to parse subsystem identity configuration file `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/identity/gnunet-service-identity.c:912
+#: src/identity/gnunet-service-identity.c:914
#, fuzzy, c-format
msgid "Failed to create directory `%s' for storing egos\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/integration-tests/connection_watchdog.c:998
-#, c-format
-msgid "Transport plugin: `%s' port %llu\n"
-msgstr ""
+#: src/mesh/gnunet-mesh.c:357
+#, fuzzy, c-format
+msgid "Invalid target `%s'\n"
+msgstr "“%s”的参数无效。\n"
-#: src/integration-tests/connection_watchdog.c:1031
+#: src/mesh/gnunet-mesh.c:607
#, fuzzy, c-format
-msgid "Found %u transport plugins: `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "Invalid peer ID `%s'\n"
+msgstr "无效条目。\n"
-#: src/integration-tests/connection_watchdog.c:1091
-msgid "Send ping messages to test connectivity (default == NO)"
+#: src/mesh/gnunet-mesh.c:650
+#, fuzzy, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/mesh/gnunet-mesh.c:716
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
msgstr ""
-#: src/integration-tests/connection_watchdog.c:1100
-#: src/multicast/gnunet-multicast.c:70 src/template/gnunet-template.c:70
-msgid "help text"
+#: src/mesh/gnunet-mesh.c:807
+#, fuzzy
+msgid "provide information about a particular connection"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/mesh/gnunet-mesh.c:810
+msgid "activate echo mode"
msgstr ""
-#: src/mesh/gnunet-mesh.c:205
-msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
+#: src/mesh/gnunet-mesh.c:816
+msgid "port to listen to (default; 0)"
msgstr ""
-#: src/mesh/gnunet-mesh.c:208
+#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822
+#, fuzzy
+msgid "provide information about all peers"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/mesh/gnunet-mesh.c:825
#, fuzzy
msgid "provide information about a particular tunnel"
msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/mesh/gnunet-mesh.c:218
+#: src/mesh/gnunet-mesh.c:828
#, fuzzy
-msgid "Print information about mesh tunnels and peers."
+msgid "provide information about all tunnels"
msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/mesh/gnunet-service-mesh.c:5634 src/mesh/gnunet-service-mesh-enc.c:7060
+#: src/mesh/gnunet-service-mesh_peer.c:390
msgid "Wrong CORE service\n"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:5774 src/mesh/gnunet-service-mesh.c:5786
-#: src/mesh/gnunet-service-mesh.c:5798 src/mesh/gnunet-service-mesh.c:5810
-#: src/mesh/gnunet-service-mesh.c:5822 src/mesh/gnunet-service-mesh.c:5834
-#: src/nse/gnunet-service-nse.c:1440 src/nse/gnunet-service-nse.c:1458
-#: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-regex-simulation-profiler.c:659
-#, fuzzy, c-format
-msgid "%s service is lacking key configuration settings (%s). Exiting.\n"
-msgstr "立即保存配置？"
-
-#: src/mesh/gnunet-service-mesh.c:5846 src/mesh/gnunet-service-mesh.c:5856
-#: src/mesh/gnunet-service-mesh.c:5881
-#, fuzzy, c-format
-msgid ""
-"%s service is lacking key configuration settings (%s). Using default (%u).\n"
-msgstr "立即保存配置？"
-
#: src/mysql/mysql.c:174
#, c-format
msgid "Trying to use file `%s' for MySQL configuration.\n"
msgid "Could not access file `%s': %s\n"
msgstr "无法解析“%s”(%s)：%s\n"
-#: src/namestore/gnunet-namestore.c:258
+#: 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
+#, fuzzy, c-format
+msgid "Invalid public key for reverse lookup `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/namecache/gnunet-namecache.c:203
+#, fuzzy, c-format
+msgid "You must specify a name\n"
+msgstr "您必须指定一个接收方！\n"
+
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/namecache/gnunet-namecache.c:237
+msgid "spezifies the public key of the zone to look in"
+msgstr ""
+
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet 配置"
+
+#: src/namecache/namecache_api.c:276
+msgid "Namecache failed to cache block"
+msgstr ""
+
+#: src/namecache/plugin_namecache_postgres.c:89
+#: src/namestore/plugin_namestore_postgres.c:96
+#, fuzzy
+msgid "Failed to create indices\n"
+msgstr "发送消息失败。\n"
+
+#: src/namestore/gnunet-namestore.c:303
#, c-format
msgid "Adding record failed: %s\n"
msgstr ""
-#: src/namestore/gnunet-namestore.c:289
+#: src/namestore/gnunet-namestore.c:332
#, c-format
-msgid "Deleting record failed: %s\n"
+msgid "Deleting record failed, record does not exist%s%s\n"
msgstr ""
-#: src/namestore/gnunet-namestore.c:338
+#: src/namestore/gnunet-namestore.c:339
#, c-format
-msgid "\tCorrupt or unsupported record of type %u\n"
+msgid "Deleting record failed%s%s\n"
msgstr ""
-#: src/namestore/gnunet-namestore.c:446
+#: src/namestore/gnunet-namestore.c:558
#, c-format
msgid "No options given\n"
msgstr ""
-#: src/namestore/gnunet-namestore.c:456
-#: src/namestore/gnunet-namestore-fcfsd.c:992
+#: src/namestore/gnunet-namestore.c:569
+#: src/namestore/gnunet-namestore-fcfsd.c:970
#, fuzzy
msgid "Failed to connect to namestore\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/namestore/gnunet-namestore.c:464 src/namestore/gnunet-namestore.c:473
-#: src/namestore/gnunet-namestore.c:490 src/namestore/gnunet-namestore.c:512
-#: src/namestore/gnunet-namestore.c:554
+#: 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
#, fuzzy, c-format
msgid "Missing option `%s' for operation `%s'\n"
msgstr "配置文件“%s”已写入。\n"
-#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:474
-#: src/namestore/gnunet-namestore.c:491 src/namestore/gnunet-namestore.c:513
+#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
msgid "add"
msgstr ""
-#: src/namestore/gnunet-namestore.c:482
+#: src/namestore/gnunet-namestore.c:595
#, fuzzy, c-format
msgid "Unsupported type `%s'\n"
msgstr "未知的命令“%s”。\n"
-#: src/namestore/gnunet-namestore.c:502
+#: src/namestore/gnunet-namestore.c:615
#, c-format
msgid "Value `%s' invalid for record type `%s'\n"
msgstr ""
-#: src/namestore/gnunet-namestore.c:538
+#: src/namestore/gnunet-namestore.c:651
#, fuzzy, c-format
msgid "Invalid time format `%s'\n"
msgstr "IP 格式无效：“%s”\n"
-#: src/namestore/gnunet-namestore.c:555
+#: src/namestore/gnunet-namestore.c:666
msgid "del"
msgstr ""
-#: src/namestore/gnunet-namestore.c:588
-#: src/peerinfo-tool/gnunet-peerinfo.c:711
+#: src/namestore/gnunet-namestore.c:715
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
#, fuzzy, c-format
msgid "Invalid URI `%s'\n"
msgstr "无效条目。\n"
-#: src/namestore/gnunet-namestore.c:645
+#: src/namestore/gnunet-namestore.c:750
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/namestore/gnunet-namestore.c:790
#, c-format
msgid "Ego `%s' not known to identity service\n"
msgstr ""
-#: src/namestore/gnunet-namestore.c:674
+#: src/namestore/gnunet-namestore.c:817
+#, c-format
+msgid "No default ego configured in identity service\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:853
#, fuzzy, c-format
-msgid "You must specify which zone should be accessed\n"
-msgstr "您必须指定一个昵称\n"
+msgid "Identity service is not running\n"
+msgstr "服务已删除。\n"
+
+#: src/namestore/gnunet-namestore.c:865
+#, fuzzy, c-format
+msgid "Cannot connect to identity service\n"
+msgstr "无法连接到 %s:%u：%s\n"
-#: src/namestore/gnunet-namestore.c:702
+#: src/namestore/gnunet-namestore.c:913
msgid "add record"
msgstr ""
-#: src/namestore/gnunet-namestore.c:705
+#: src/namestore/gnunet-namestore.c:916
msgid "delete record"
msgstr ""
-#: src/namestore/gnunet-namestore.c:708
+#: src/namestore/gnunet-namestore.c:919
msgid "display records"
msgstr ""
-#: src/namestore/gnunet-namestore.c:711
+#: src/namestore/gnunet-namestore.c:922
msgid ""
"expiration time for record to use (for adding only), \"never\" is possible"
msgstr ""
-#: src/namestore/gnunet-namestore.c:714
+#: src/namestore/gnunet-namestore.c:925
+#, fuzzy
+msgid "set the desired nick name for the zone"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/namestore/gnunet-namestore.c:928
#, fuzzy
msgid "monitor changes in the namestore"
msgstr "初始化“%s”服务失败。\n"
-#: src/namestore/gnunet-namestore.c:717
-msgid "name of the record to add/delete/display"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:934
+#, fuzzy
+msgid "determine our name for the given PKEY"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/namestore/gnunet-namestore.c:720
+#: src/namestore/gnunet-namestore.c:937
msgid "type of the record to add/delete/display"
msgstr ""
-#: src/namestore/gnunet-namestore.c:723
+#: src/namestore/gnunet-namestore.c:940
msgid "URI to import into our zone"
msgstr ""
-#: src/namestore/gnunet-namestore.c:726
+#: src/namestore/gnunet-namestore.c:943
msgid "value of the record to add/delete"
msgstr ""
-#: src/namestore/gnunet-namestore.c:729
+#: src/namestore/gnunet-namestore.c:946
msgid "create or list public record"
msgstr ""
-#: src/namestore/gnunet-namestore.c:732
+#: src/namestore/gnunet-namestore.c:949
msgid ""
"create shadow record (only valid if all other records of the same type have "
"expired"
msgstr ""
-#: src/namestore/gnunet-namestore.c:735
+#: src/namestore/gnunet-namestore.c:952
msgid "name of the ego controlling the zone"
msgstr ""
-#: src/namestore/gnunet-namestore.c:746
-#, fuzzy
-msgid "GNUnet zone manipulation tool"
-msgstr "GNUnet 配置"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:456
+#: src/namestore/gnunet-namestore-fcfsd.c:464
#, fuzzy, c-format
msgid "Unsupported form value `%s'\n"
msgstr "未知的命令“%s”。\n"
-#: src/namestore/gnunet-namestore-fcfsd.c:485
+#: src/namestore/gnunet-namestore-fcfsd.c:491
#, fuzzy, c-format
msgid "Failed to create record for domain `%s': %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/namestore/gnunet-namestore-fcfsd.c:520
+#: src/namestore/gnunet-namestore-fcfsd.c:525
#, c-format
msgid "Found existing name `%s' for the given key\n"
msgstr ""
-#: src/namestore/gnunet-namestore-fcfsd.c:560
+#: src/namestore/gnunet-namestore-fcfsd.c:534
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:596
#, c-format
msgid "Found %u existing records for domain `%s'\n"
msgstr ""
-#: src/namestore/gnunet-namestore-fcfsd.c:670
+#: src/namestore/gnunet-namestore-fcfsd.c:652
#, fuzzy, c-format
msgid "Failed to create page for `%s'\n"
msgstr "发送消息失败。\n"
-#: src/namestore/gnunet-namestore-fcfsd.c:686
+#: src/namestore/gnunet-namestore-fcfsd.c:668
#, fuzzy, c-format
msgid "Failed to setup post processor for `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/namestore/gnunet-namestore-fcfsd.c:722
+#: src/namestore/gnunet-namestore-fcfsd.c:704
msgid "Domain name must not contain `.'\n"
msgstr ""
-#: src/namestore/gnunet-namestore-fcfsd.c:730
+#: src/namestore/gnunet-namestore-fcfsd.c:712
msgid "Domain name must not contain `+'\n"
msgstr ""
-#: src/namestore/gnunet-namestore-fcfsd.c:932
+#: src/namestore/gnunet-namestore-fcfsd.c:910
msgid "No ego configured for `fcfsd` subsystem\n"
msgstr ""
-#: src/namestore/gnunet-namestore-fcfsd.c:1027
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
-#: src/namestore/gnunet-service-namestore.c:674
-msgid "Failed to cache encrypted block of my own zone!\n"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:936
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "初始化“%s”服务失败。\n"
-#: src/namestore/namestore_api.c:319
-msgid "Namestore failed to cache block"
-msgstr ""
+#: src/namestore/gnunet-namestore-fcfsd.c:978
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "初始化“%s”服务失败。\n"
-#: src/namestore/namestore_api.c:345
-msgid "Namestore failed to store record\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:1011
+msgid "GNU Name System First Come First Serve name registration service"
msgstr ""
-#: src/namestore/namestore_api_common.c:691
-#: src/namestore/namestore_api_common.c:831
-#, fuzzy, c-format
-msgid "Unsupported record type %d\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/namestore/namestore_api_common.c:698
-#, fuzzy, c-format
-msgid "Unable to parse IPv4 address `%s'\n"
-msgstr "无效的进程优先级“%s”\n"
-
-#: src/namestore/namestore_api_common.c:721
-#, fuzzy, c-format
-msgid "Unable to parse SOA record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/namestore_api_common.c:744
-#, fuzzy, c-format
-msgid "Unable to parse MX record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/namestore_api_common.c:762
-#, fuzzy, c-format
-msgid "Unable to parse IPv6 address `%s'\n"
-msgstr "无效的进程优先级“%s”\n"
-
-#: src/namestore/namestore_api_common.c:775
-#, fuzzy, c-format
-msgid "Unable to parse PKEY record `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/namestore_api_common.c:796
-#, fuzzy, c-format
-msgid "Unable to parse VPN record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/namestore_api_common.c:822
+#: src/namestore/gnunet-service-namestore.c:655
#, fuzzy, c-format
-msgid "Unable to parse TLSA record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/plugin_namestore_postgres.c:95
-#, fuzzy
-msgid "Failed to create indices\n"
+msgid "Failed to replicate block in namecache: %s\n"
msgstr "发送消息失败。\n"
+#: src/namestore/namestore_api.c:275
+msgid "Namestore failed to store record\n"
+msgstr ""
+
#: src/nat/gnunet-nat-server.c:279
#, c-format
msgid "Please pass valid port number as the first argument! (got `%s')\n"
msgid "GNUnet NAT traversal test helper daemon"
msgstr ""
-#: src/nat/nat_auto.c:169
+#: src/nat/nat_auto.c:170
msgid "NAT traversal with ICMP Server timed out.\n"
msgstr ""
-#: src/nat/nat_auto.c:199
+#: src/nat/nat_auto.c:203
msgid "NAT traversal with ICMP Server succeeded.\n"
msgstr ""
-#: src/nat/nat_auto.c:200
+#: src/nat/nat_auto.c:204
msgid "NAT traversal with ICMP Server failed.\n"
msgstr ""
-#: src/nat/nat_auto.c:219
+#: src/nat/nat_auto.c:225
msgid "Testing connection reversal with ICMP server.\n"
msgstr ""
-#: src/nat/nat_auto.c:265
+#: src/nat/nat_auto.c:274
#, c-format
msgid "Detected external IP `%s'\n"
msgstr ""
-#: src/nat/nat_auto.c:331
+#: src/nat/nat_auto.c:344
msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
msgstr ""
-#: src/nat/nat_auto.c:347
+#: src/nat/nat_auto.c:360
#, fuzzy, c-format
msgid "Detected internal network address `%s'.\n"
msgstr "GNUnet 现在使用 IP 地址 %s。\n"
-#: src/nat/nat_auto.c:400
+#: src/nat/nat_auto.c:413
msgid "upnpc found, enabling its use\n"
msgstr ""
-#: src/nat/nat_auto.c:401
+#: src/nat/nat_auto.c:414
msgid "upnpc not found\n"
msgstr ""
-#: src/nat/nat_auto.c:434
+#: src/nat/nat_auto.c:447
msgid "gnunet-helper-nat-server found, testing it\n"
msgstr ""
-#: src/nat/nat_auto.c:435
+#: src/nat/nat_auto.c:448
msgid "No working gnunet-helper-nat-server found\n"
msgstr ""
-#: src/nat/nat_auto.c:469
+#: src/nat/nat_auto.c:482
msgid "gnunet-helper-nat-client found, enabling it\n"
msgstr ""
-#: src/nat/nat_auto.c:470
+#: src/nat/nat_auto.c:483
msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
msgstr ""
-#: src/nat/nat.c:834
+#: src/nat/nat.c:867
#, c-format
msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
msgstr ""
-#: src/nat/nat.c:883
+#: src/nat/nat.c:917
#, fuzzy, c-format
msgid "Failed to start %s\n"
msgstr "运行 %s失败：%s %d\n"
-#: src/nat/nat.c:1152
+#: src/nat/nat.c:1205
msgid "malformed"
msgstr ""
-#: src/nat/nat.c:1218 src/nat/nat.c:1230
+#: src/nat/nat.c:1276 src/nat/nat.c:1288
#, c-format
msgid ""
"Configuration requires `%s', but binary is not installed properly (SUID bit "
"not set). Option disabled.\n"
msgstr ""
-#: src/nat/nat.c:1365
+#: src/nat/nat.c:1426
msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
msgstr ""
-#: src/nat/nat.c:1376
+#: src/nat/nat.c:1442
#, c-format
msgid "Running gnunet-helper-nat-client %s %s %u\n"
msgstr ""
-#: src/nat/nat_mini.c:170
+#: src/nat/nat_mini.c:155
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat_mini.c:175
+msgid "`external-ip' command not found"
+msgstr ""
+
+#: src/nat/nat_mini.c:201
msgid "`external-ip' command not found\n"
msgstr ""
-#: src/nat/nat_mini.c:505
+#: src/nat/nat_mini.c:366
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/nat/nat_mini.c:512
+msgid "`upnpc' command took too long, process killed"
+msgstr ""
+
+#: src/nat/nat_mini.c:540
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat_mini.c:604
msgid "`upnpc' command not found\n"
msgstr ""
-#: src/nat/nat_test.c:341
+#: src/nat/nat_mini.c:608
+msgid "`upnpc` command not found"
+msgstr ""
+
+#: src/nat/nat_test.c:351
msgid "Failed to connect to `gnunet-nat-server'\n"
msgstr ""
-#: src/nat/nat_test.c:411
+#: src/nat/nat_test.c:423
#, c-format
msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
msgstr ""
-#: src/nse/gnunet-nse-profiler.c:889
+#: 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:892
+#: src/nse/gnunet-nse-profiler.c:861
msgid "name of the file for writing connection information and statistics"
msgstr ""
-#: src/nse/gnunet-nse-profiler.c:895 src/testbed/gnunet-testbed-profiler.c:287
+#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
msgid "name of the file with the login information for the testbed"
msgstr ""
-#: src/nse/gnunet-nse-profiler.c:898
+#: src/nse/gnunet-nse-profiler.c:867
msgid "name of the file for writing the main results"
msgstr ""
-#: src/nse/gnunet-nse-profiler.c:901
+#: src/nse/gnunet-nse-profiler.c:870
msgid "Number of peers to run in each round, separated by commas"
msgstr ""
-#: src/nse/gnunet-nse-profiler.c:907
+#: src/nse/gnunet-nse-profiler.c:876
msgid "delay between rounds"
msgstr ""
-#: src/nse/gnunet-nse-profiler.c:916
+#: src/nse/gnunet-nse-profiler.c:885
#, fuzzy
msgid "Measure quality and performance of the NSE service."
msgstr "无法访问该服务"
-#: src/nse/gnunet-service-nse.c:1448
-msgid "Invalid work requirement for NSE service. Exiting.\n"
-msgstr ""
-
-#: src/nse/gnunet-service-nse.c:1487
-msgid "NSE service is lacking key configuration settings. Exiting.\n"
-msgstr ""
+#: 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 "值不在合法范围内。"
#: src/peerinfo/gnunet-service-peerinfo.c:215
#, c-format
msgid "Removing expired address of transport `%s'\n"
msgstr ""
-#: src/peerinfo/gnunet-service-peerinfo.c:353
+#: src/peerinfo/gnunet-service-peerinfo.c:352
#, fuzzy, c-format
msgid "Failed to parse HELLO in file `%s': %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/peerinfo/gnunet-service-peerinfo.c:370
+#: 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': %s %u \n"
+msgid "Failed to parse HELLO in file `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/peerinfo/gnunet-service-peerinfo.c:448
+#: src/peerinfo/gnunet-service-peerinfo.c:466
msgid "# peers known"
msgstr ""
-#: src/peerinfo/gnunet-service-peerinfo.c:484
+#: src/peerinfo/gnunet-service-peerinfo.c:503
#, c-format
msgid ""
"File `%s' in directory `%s' does not match naming convention. Removed.\n"
msgstr ""
-#: src/peerinfo/gnunet-service-peerinfo.c:637
+#: src/peerinfo/gnunet-service-peerinfo.c:653
#, fuzzy, c-format
msgid "Scanning directory `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/peerinfo/gnunet-service-peerinfo.c:642
+#: src/peerinfo/gnunet-service-peerinfo.c:658
#, c-format
msgid "Still no peers found in `%s'!\n"
msgstr ""
-#: src/peerinfo/gnunet-service-peerinfo.c:975
+#: src/peerinfo/gnunet-service-peerinfo.c:994
#, fuzzy, c-format
msgid "Cleaning up directory `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/peerinfo/gnunet-service-peerinfo.c:1265
+#: src/peerinfo/gnunet-service-peerinfo.c:1287
#, c-format
msgid "Importing HELLOs from `%s'\n"
msgstr ""
-#: src/peerinfo/peerinfo_api.c:239
+#: 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:359
+#: src/peerinfo/peerinfo_api.c:356
#, fuzzy
msgid "failed to transmit request (service down?)"
msgstr "初始化“%s”服务失败。\n"
-#: src/peerinfo/peerinfo_api.c:509
+#: src/peerinfo/peerinfo_api.c:506
msgid "Failed to receive response from `PEERINFO' service."
msgstr ""
-#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
-#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
-#: src/peerinfo/peerinfo_api.c:606
+#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
+#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
+#: src/peerinfo/peerinfo_api.c:603
#, fuzzy
msgid "Received invalid message from `PEERINFO' service."
msgstr "“%s”的参数无效。\n"
-#: src/peerinfo/peerinfo_api.c:681
+#: src/peerinfo/peerinfo_api.c:678
#, fuzzy
msgid "Timeout transmitting iteration request to `PEERINFO' service."
msgstr "初始化“%s”服务失败。\n"
-#: src/peerinfo/peerinfo_api_notify.c:269
+#: src/peerinfo/peerinfo_api_notify.c:268
#, fuzzy, c-format
msgid "Could not connect to `%s' service.\n"
msgstr "无法连接到 %s:%u：%s\n"
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/peerinfo-tool/gnunet-peerinfo.c:232
#, fuzzy, c-format
msgid "%sPeer `%s'\n"
msgstr "运行 %s失败：%s %d\n"
-#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
#, c-format
msgid "\tExpires: %s \t %s\n"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:437
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
#, fuzzy, c-format
msgid "Failure: Did not receive %s\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
+#: src/peerinfo-tool/gnunet-peerinfo.c:436
#, c-format
msgid "Failure: Received invalid %s\n"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:454
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
#, fuzzy, c-format
msgid "Failed to write HELLO with %u bytes to file `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/peerinfo-tool/gnunet-peerinfo.c:467
+#: src/peerinfo-tool/gnunet-peerinfo.c:458
#, c-format
msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:531
+#: src/peerinfo-tool/gnunet-peerinfo.c:522
#, c-format
msgid "Failure adding HELLO: %s\n"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:669
+#: src/peerinfo-tool/gnunet-peerinfo.c:633
#, 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:675
+#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
#, c-format
msgid "Loading hostkey from `%s' failed.\n"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:734
+#: src/peerinfo-tool/gnunet-peerinfo.c:745
#, c-format
msgid "I am peer `%s'.\n"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
msgid "don't resolve host names"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
msgid "output only the identity strings"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:783
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
msgid "include friend-only information"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:786
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
msgid "output our own identity only"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
#, fuzzy
msgid "list all known peers"
msgstr "列出所有网络适配器"
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
+#: src/peerinfo-tool/gnunet-peerinfo.c:804
msgid "dump hello to file"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
+#: src/peerinfo-tool/gnunet-peerinfo.c:807
msgid "also output HELLO uri(s)"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/peerinfo-tool/gnunet-peerinfo.c:810
msgid "add given HELLO uri to the database"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:809
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
#, 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:123
+#: 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
-#: src/transport/gnunet-service-transport_plugins.c:127
+#: 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
-#: src/transport/gnunet-service-transport_plugins.c:157
+#: src/transport/gnunet-service-transport_plugins.c:165
#, fuzzy, c-format
msgid "Failed to load transport plugin for `%s'\n"
msgstr "解析配置文件“%s”失败\n"
msgid "Unable to initialize Postgres: %s"
msgstr "无法初始化 SQLite：%s。\n"
-#: src/psycstore/gnunet-service-psycstore.c:203
+#: src/psycstore/gnunet-service-psycstore.c:200
#, fuzzy
msgid "Failed to store membership information!\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/psycstore/gnunet-service-psycstore.c:227
+#: src/psycstore/gnunet-service-psycstore.c:224
#, fuzzy
msgid "Failed to test membership!\n"
msgstr "发送消息失败。\n"
-#: src/psycstore/gnunet-service-psycstore.c:249
+#: src/psycstore/gnunet-service-psycstore.c:246
#, fuzzy
msgid "Failed to store fragment!\n"
msgstr "运行 %s失败：%s %d\n"
-#: src/psycstore/gnunet-service-psycstore.c:275
+#: src/psycstore/gnunet-service-psycstore.c:272
#, fuzzy
msgid "Failed to get fragment!\n"
msgstr "发送消息失败。\n"
-#: src/psycstore/gnunet-service-psycstore.c:302
+#: src/psycstore/gnunet-service-psycstore.c:299
#, fuzzy
msgid "Failed to get message!\n"
msgstr "发送消息失败。\n"
-#: src/psycstore/gnunet-service-psycstore.c:331
+#: src/psycstore/gnunet-service-psycstore.c:328
#, fuzzy
msgid "Failed to get message fragment!\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/psycstore/gnunet-service-psycstore.c:357
+#: src/psycstore/gnunet-service-psycstore.c:356
#, fuzzy
msgid "Failed to get master counters!\n"
msgstr "发送消息失败。\n"
-#: src/psycstore/gnunet-service-psycstore.c:395
-#, fuzzy
-msgid "Failed to get slave counters!\n"
-msgstr "发送消息失败。\n"
-
-#: src/psycstore/gnunet-service-psycstore.c:429
-#: src/psycstore/gnunet-service-psycstore.c:502
+#: src/psycstore/gnunet-service-psycstore.c:392
+#: src/psycstore/gnunet-service-psycstore.c:465
msgid "Tried to set invalid state variable name!\n"
msgstr ""
-#: src/psycstore/gnunet-service-psycstore.c:445
+#: src/psycstore/gnunet-service-psycstore.c:408
#, fuzzy
msgid "Failed to begin modifying state!\n"
msgstr "运行 %s失败：%s %d\n"
-#: src/psycstore/gnunet-service-psycstore.c:468
+#: src/psycstore/gnunet-service-psycstore.c:431
#, fuzzy, c-format
msgid "Unknown operator: %c\n"
msgstr "未知错误"
-#: src/psycstore/gnunet-service-psycstore.c:478
+#: src/psycstore/gnunet-service-psycstore.c:441
#, fuzzy
msgid "Failed to end modifying state!\n"
msgstr "运行 %s失败：%s %d\n"
-#: src/psycstore/gnunet-service-psycstore.c:516
+#: src/psycstore/gnunet-service-psycstore.c:479
#, fuzzy
msgid "Failed to begin synchronizing state!\n"
msgstr "发送消息失败。\n"
-#: src/psycstore/gnunet-service-psycstore.c:532
+#: src/psycstore/gnunet-service-psycstore.c:495
#, fuzzy
msgid "Failed to end synchronizing state!\n"
msgstr "发送消息失败。\n"
-#: src/psycstore/gnunet-service-psycstore.c:552
-#: src/psycstore/gnunet-service-psycstore.c:571
+#: src/psycstore/gnunet-service-psycstore.c:515
+#: src/psycstore/gnunet-service-psycstore.c:534
#, fuzzy
msgid "Failed to reset state!\n"
msgstr "发送消息失败。\n"
-#: src/psycstore/gnunet-service-psycstore.c:594
-#: src/psycstore/gnunet-service-psycstore.c:645
+#: src/psycstore/gnunet-service-psycstore.c:557
+#: src/psycstore/gnunet-service-psycstore.c:608
msgid "Tried to get invalid state variable name!\n"
msgstr ""
-#: src/psycstore/gnunet-service-psycstore.c:621
-#: src/psycstore/gnunet-service-psycstore.c:660
+#: src/psycstore/gnunet-service-psycstore.c:584
+#: src/psycstore/gnunet-service-psycstore.c:623
#, fuzzy
msgid "Failed to get state variable!\n"
msgstr "发送消息失败。\n"
msgid "SQLite database running\n"
msgstr "sqlite 数据仓库"
-#: src/pt/gnunet-daemon-pt.c:266
+#: src/pt/gnunet-daemon-pt.c:482
msgid "Failed to pack DNS request. Dropping.\n"
msgstr ""
-#: src/pt/gnunet-daemon-pt.c:272
+#: src/pt/gnunet-daemon-pt.c:488
msgid "# DNS requests mapped to VPN"
msgstr ""
-#: src/pt/gnunet-daemon-pt.c:325
+#: src/pt/gnunet-daemon-pt.c:541
msgid "# DNS records modified"
msgstr ""
-#: src/pt/gnunet-daemon-pt.c:502
+#: src/pt/gnunet-daemon-pt.c:717
msgid "# DNS replies intercepted"
msgstr ""
-#: src/pt/gnunet-daemon-pt.c:508
+#: src/pt/gnunet-daemon-pt.c:723
msgid "Failed to parse DNS request. Dropping.\n"
msgstr ""
-#: src/pt/gnunet-daemon-pt.c:604
+#: src/pt/gnunet-daemon-pt.c:826
msgid "# DNS requests dropped (timeout)"
msgstr ""
-#: src/pt/gnunet-daemon-pt.c:634
+#: src/pt/gnunet-daemon-pt.c:883
msgid "# DNS requests intercepted"
msgstr ""
-#: src/pt/gnunet-daemon-pt.c:639
-msgid "# DNS requests dropped (DNS mesh tunnel down)"
+#: src/pt/gnunet-daemon-pt.c:888
+msgid "# DNS requests dropped (DNS mesh channel down)"
msgstr ""
-#: src/pt/gnunet-daemon-pt.c:647
+#: src/pt/gnunet-daemon-pt.c:896
msgid "# DNS requests dropped (malformed)"
msgstr ""
-#: src/pt/gnunet-daemon-pt.c:715
+#: src/pt/gnunet-daemon-pt.c:969
msgid "# DNS replies received"
msgstr ""
-#: src/pt/gnunet-daemon-pt.c:729
+#: src/pt/gnunet-daemon-pt.c:985
msgid "# DNS replies dropped (too late?)"
msgstr ""
-#: src/pt/gnunet-daemon-pt.c:747 src/pt/gnunet-daemon-pt.c:759
-msgid "# DNS requests aborted (tunnel down)"
-msgstr ""
-
-#: src/pt/gnunet-daemon-pt.c:901 src/pt/gnunet-daemon-pt.c:910
-#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
+#: src/pt/gnunet-daemon-pt.c:1261 src/pt/gnunet-daemon-pt.c:1270
+#: src/pt/gnunet-daemon-pt.c:1290 src/pt/gnunet-daemon-pt.c:1301
+#: src/pt/gnunet-daemon-pt.c:1310
#, fuzzy, c-format
msgid "Failed to connect to %s service. Exiting.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/pt/gnunet-daemon-pt.c:977
+#: src/pt/gnunet-daemon-pt.c:1347
msgid "Daemon to run to perform IP protocol translation to GNUnet"
msgstr ""
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-regex-simulation-profiler.c:659
+#, fuzzy, c-format
+msgid "%s service is lacking key configuration settings (%s). Exiting.\n"
+msgstr "立即保存配置？"
+
#: src/regex/gnunet-daemon-regexprofiler.c:380
msgid "Daemon to announce regular expressions for the peer using mesh."
msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1281
+#: src/regex/gnunet-regex-profiler.c:1288
msgid "No configuration file given. Exiting\n"
msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1292
+#: src/regex/gnunet-regex-profiler.c:1299
#, fuzzy
msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
msgstr "配置文件“%s”已写入。\n"
-#: src/regex/gnunet-regex-profiler.c:1321
+#: src/regex/gnunet-regex-profiler.c:1328
#: src/regex/gnunet-regex-simulation-profiler.c:622
#, c-format
msgid "No policy directory specified on command line. Exiting.\n"
msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1327
+#: src/regex/gnunet-regex-profiler.c:1334
#: src/regex/gnunet-regex-simulation-profiler.c:629
#, c-format
msgid "Specified policies directory does not exist. Exiting.\n"
msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1334
+#: src/regex/gnunet-regex-profiler.c:1341
#, fuzzy, c-format
msgid "No files found in `%s'\n"
msgstr "运行 %s失败：%s %d\n"
-#: src/regex/gnunet-regex-profiler.c:1343
+#: src/regex/gnunet-regex-profiler.c:1350
msgid "No search strings file given. Exiting.\n"
msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1363
+#: src/regex/gnunet-regex-profiler.c:1370
#, fuzzy
msgid "Error loading search strings. Exiting.\n"
msgstr "创建用户出错"
-#: src/regex/gnunet-regex-profiler.c:1445
+#: src/regex/gnunet-regex-profiler.c:1455
#, fuzzy
msgid "name of the file for writing statistics"
msgstr "初始化“%s”服务失败。\n"
-#: src/regex/gnunet-regex-profiler.c:1448
+#: src/regex/gnunet-regex-profiler.c:1458
msgid "wait TIMEOUT before ending the experiment"
msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1451
+#: src/regex/gnunet-regex-profiler.c:1461
msgid "directory with policy files"
msgstr ""
-#: src/regex/gnunet-regex-profiler.c:1454
+#: src/regex/gnunet-regex-profiler.c:1464
#, fuzzy
msgid "name of file with input strings"
msgstr "初始化“%s”服务失败。\n"
-#: src/regex/gnunet-regex-profiler.c:1457
+#: src/regex/gnunet-regex-profiler.c:1467
#, fuzzy
msgid "name of file with hosts' names"
msgstr "初始化“%s”服务失败。\n"
-#: src/regex/gnunet-regex-profiler.c:1469
+#: src/regex/gnunet-regex-profiler.c:1479
msgid "Profiler for regex"
msgstr ""
msgid "Profiler for regex library"
msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:195
+#: src/regex/regex_api.c:131
+#, fuzzy, c-format
+msgid "Regex `%s' is too long!\n"
+msgstr "服务已删除。\n"
+
+#: src/revocation/gnunet-revocation.c:126
+#, c-format
+msgid "Key `%s' is valid\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:131
+#, fuzzy, c-format
+msgid "Key `%s' has been revoked\n"
+msgstr "服务已删除。\n"
+
+#: src/revocation/gnunet-revocation.c:137
+#, fuzzy
+msgid "Internal error\n"
+msgstr "未知错误。\n"
+
+#: src/revocation/gnunet-revocation.c:163
+#, c-format
+msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:168
+msgid "Revocation failed (!)\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:173
+#, c-format
+msgid "Key for ego `%s' has been successfully revoked\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:178
+msgid "Revocation successful.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:183
+msgid "Internal error, key revocation might have failed\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:294
+#, c-format
+msgid "Revocation certificate for `%s' stored in `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:324
+#, c-format
+msgid "Ego `%s' not found.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:345
+#, c-format
+msgid "Error: revocation certificate in `%s' is not for `%s'\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:365
+msgid "Revocation certificate ready\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:375
+msgid "Revocation certificate not ready, calculating proof of work\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:407
+#, fuzzy, c-format
+msgid "Public key `%s' malformed\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/revocation/gnunet-revocation.c:421
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:441
+#, fuzzy
+msgid "No filename to store revocation certificate given.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/revocation/gnunet-revocation.c:463
+#, fuzzy, c-format
+msgid "Failed to read revocation certificate from `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/revocation/gnunet-revocation.c:488
+#, fuzzy
+msgid "No action specified. Nothing to do.\n"
+msgstr "没有指定接口，将使用默认。\n"
+
+#: src/revocation/gnunet-revocation.c:504
+msgid "use NAME for the name of the revocation file"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:507
+msgid ""
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:510
+msgid "actually perform revocation, otherwise we just do the precomputation"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:513
+msgid "test if the public key KEY has been revoked"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:272
+msgid "Duplicate revocation received from peer. Ignored.\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:434
+#, c-format
+msgid "Error computing revocation set union with %s\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:486
+msgid "SET service crashed, terminating revocation service\n"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:812
+#, fuzzy
+msgid "Could not open revocation database file!"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:225
#, fuzzy
msgid "You must specify at least one message ID to check!\n"
msgstr "您必须指定一个昵称\n"
-#: src/scalarproduct/gnunet-scalarproduct.c:201
+#: src/scalarproduct/gnunet-scalarproduct.c:232
msgid "This program needs a session identifier for comparing vectors.\n"
msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:207
+#: src/scalarproduct/gnunet-scalarproduct.c:239
msgid "Please give a session key for --input_key!\n"
msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:216
+#: src/scalarproduct/gnunet-scalarproduct.c:251
#, 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:240
-#: src/scalarproduct/gnunet-scalarproduct.c:298
+#: src/scalarproduct/gnunet-scalarproduct.c:278
+#: src/scalarproduct/gnunet-scalarproduct.c:314
#, fuzzy, c-format
msgid "Could not convert `%s' to int32_t.\n"
msgstr "无法连接到 %s:%u：%s\n"
-#: src/scalarproduct/gnunet-scalarproduct.c:247
+#: src/scalarproduct/gnunet-scalarproduct.c:286
msgid "Need elements to compute the vectorproduct, got none.\n"
msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:346
+#, fuzzy, c-format
+msgid "Could not convert `%s' to integer.\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:407
msgid ""
"A comma separated list of elements to compare as vector with our remote peer."
msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:410
msgid ""
"A comma separated mask to select which elements should actually be compared."
msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:354
+#: src/scalarproduct/gnunet-scalarproduct.c:413
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:357
+#: src/scalarproduct/gnunet-scalarproduct.c:416
msgid "Transaction ID shared with peer."
msgstr ""
-#: src/scalarproduct/gnunet-scalarproduct.c:366
+#: src/scalarproduct/gnunet-scalarproduct.c:425
msgid "Calculate the Vectorproduct with a GNUnet peer."
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:381
-#, c-format
-msgid "Generated key set with key length %d bits.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:691
+#: src/scalarproduct/gnunet-service-scalarproduct.c:541
#, fuzzy, c-format
msgid "Client (%p) disconnected from us.\n"
msgstr "“%s”已连接到“%s”。\n"
-#: src/scalarproduct/gnunet-service-scalarproduct.c:762
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1696
+#: src/scalarproduct/gnunet-service-scalarproduct.c:613
+#: src/scalarproduct/gnunet-service-scalarproduct.c:702
#, fuzzy, c-format
msgid "Could not send message to client (%p)!\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/scalarproduct/gnunet-service-scalarproduct.c:768
+#: src/scalarproduct/gnunet-service-scalarproduct.c:619
#, c-format
msgid "Sending session-end notification to client (%p) for session %s\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:891
-msgid "Message too large, fragmentation is currently not supported!)\n"
+#: src/scalarproduct/gnunet-service-scalarproduct.c:712
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:896
+#: src/scalarproduct/gnunet-service-scalarproduct.c:766
+#: src/scalarproduct/gnunet-service-scalarproduct.c:855
msgid "Could not send service-response message via mesh!)\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1092
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1028
#, c-format
msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1145
-#, fuzzy, c-format
-msgid "Successfully created new tunnel to peer (%s)!\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1157
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1873
-msgid "Message too large, fragmentation is currently not supported!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1223
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1099
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1208
msgid "Transmitting service request.\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1233
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1108
+#, fuzzy
+msgid "Could not send service-request multipart message to channel!\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1147
+#, fuzzy, c-format
+msgid "Successfully created new channel to peer (%s)!\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1217
#, fuzzy
-msgid "Could not send mutlicast message to tunnel!\n"
+msgid "Could not send message to channel!\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1283
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1274
msgid "Too short message received from client!\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1297
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1287
msgid "Invalid message received from client, session information incorrect!\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1309
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1298
#, c-format
msgid ""
"Duplicate session information received, cannot create new session with key `"
"%s'\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1330
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1318
#, c-format
msgid ""
-"Got client-request-session with key %s, preparing tunnel to remote service.\n"
+"Got client-request-session with key %s, preparing channel to remote "
+"service.\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1369
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1354
#, c-format
-msgid "Creating new tunnel to for session with key %s.\n"
+msgid "Creating new channel for session with key %s.\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1417
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1399
#, 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:1425
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1409
#, c-format
msgid ""
"Got client-responder-session with key %s but NO matching service-request-"
"session set, queuing element for later use.\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
-#, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
-msgstr ""
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1439
+#, fuzzy, c-format
+msgid "New incoming channel from peer %s.\n"
+msgstr "“%s”已连接到“%s”。\n"
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1706
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1471
#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgid "Peer disconnected, terminating session %s with peer (%s)\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1790
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1672
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1814
#, c-format
-msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1813
-msgid "Could not translate remote public key to sexpression!\n"
+msgid "Got session with key %s and a matching element set, processing.\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1849
-#, fuzzy, c-format
-msgid ""
-"Could not translate E[a%d] to MPI!\n"
-"%s/%s\n"
-msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1857
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1681
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1821
#, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid "Got session with key %s without a matching element set, queueing.\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1866
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1771
#, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
msgstr ""
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2039
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2014
msgid "Shutting down, initiating cleanup.\n"
msgstr ""
#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
-msgid "Generating Paillier-Keyset.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2116
#, fuzzy
msgid "Connect to MESH failed\n"
msgstr "“%s”已连接到“%s”。\n"
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2120
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2104
msgid "Mesh initialized\n"
msgstr ""
-#: src/scalarproduct/scalarproduct_api.c:243
+#: src/scalarproduct/scalarproduct_api.c:246
msgid "# SUC responder result messages received"
msgstr ""
-#: src/scalarproduct/scalarproduct_api.c:297
+#: src/scalarproduct/scalarproduct_api.c:300
msgid "# bytes sent to scalarproduct"
msgstr ""
-#: src/scalarproduct/scalarproduct_api.c:340
-#: src/scalarproduct/scalarproduct_api.c:433
+#: src/scalarproduct/scalarproduct_api.c:345
+#: src/scalarproduct/scalarproduct_api.c:440
#, fuzzy
msgid "Failed to connect to the scalarproduct service\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/scalarproduct/scalarproduct_api.c:348
-#: src/scalarproduct/scalarproduct_api.c:441
+#: src/scalarproduct/scalarproduct_api.c:353
+#: src/scalarproduct/scalarproduct_api.c:448
#, fuzzy
msgid "Failed to send a message to the statistics service\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/scalarproduct/scalarproduct_api.c:382
-#: src/scalarproduct/scalarproduct_api.c:478
+#: src/scalarproduct/scalarproduct_api.c:387
+#: src/scalarproduct/scalarproduct_api.c:485
#, fuzzy
msgid "Failed to send a message to the scalarproduct service\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/set/gnunet-set-ibf-profiler.c:224
+#: src/secretsharing/gnunet-secretsharing-profiler.c:538
+msgid "dkg start delay"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:541
+msgid "dkg timeout"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:544
+msgid "threshold"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:547
+msgid "also profile decryption"
+msgstr ""
+
+#: src/set/gnunet-service-set.c:1431
+#, fuzzy
+msgid "Could not connect to mesh service\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/set/gnunet-set-ibf-profiler.c:221
#, fuzzy
msgid "number of element in set A-B"
msgstr "迭代次数"
-#: src/set/gnunet-set-ibf-profiler.c:227
+#: src/set/gnunet-set-ibf-profiler.c:224
#, fuzzy
msgid "number of element in set B-A"
msgstr "迭代次数"
-#: src/set/gnunet-set-ibf-profiler.c:230
+#: src/set/gnunet-set-ibf-profiler.c:227
msgid "number of common elements in A and B"
msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:233
+#: src/set/gnunet-set-ibf-profiler.c:230
msgid "hash num"
msgstr ""
-#: src/set/gnunet-set-ibf-profiler.c:236
+#: src/set/gnunet-set-ibf-profiler.c:233
msgid "ibf size"
msgstr ""
-#: src/set/gnunet-set-profiler.c:296
+#: src/set/gnunet-set-profiler.c:295
msgid "oeration to execute"
msgstr ""
-#: src/statistics/gnunet-service-statistics.c:271
+#: src/statistics/gnunet-service-statistics.c:280
#, c-format
msgid "Loading %llu bytes of statistics from `%s'\n"
msgstr ""
-#: src/statistics/gnunet-service-statistics.c:330
+#: src/statistics/gnunet-service-statistics.c:346
#, c-format
msgid "Wrote %llu bytes of statistics to `%s'\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:140
#, fuzzy
msgid "Failed to obtain statistics.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/statistics/gnunet-statistics.c:144
+#: src/statistics/gnunet-statistics.c:142
#, fuzzy, c-format
msgid "Failed to obtain statistics from host `%s:%llu'\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/statistics/gnunet-statistics.c:191
+#: src/statistics/gnunet-statistics.c:189
msgid "Missing argument: subsystem \n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:197
+#: src/statistics/gnunet-statistics.c:195
msgid "Missing argument: name\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:228
+#: src/statistics/gnunet-statistics.c:226
#, c-format
msgid "No subsystem or name given\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:236
+#: src/statistics/gnunet-statistics.c:234
#, fuzzy, c-format
msgid "Failed to initialize watch routine\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/statistics/gnunet-statistics.c:263
+#: src/statistics/gnunet-statistics.c:261
#, fuzzy, c-format
msgid "Trying to connect to remote host, but service `%s' is not running\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/statistics/gnunet-statistics.c:271
+#: src/statistics/gnunet-statistics.c:269
#, fuzzy, c-format
msgid "A port is required to connect to host `%s'\n"
msgstr "无法连接到 %s:%u：%s\n"
-#: src/statistics/gnunet-statistics.c:278
+#: src/statistics/gnunet-statistics.c:276
#, c-format
msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:310
+#: src/statistics/gnunet-statistics.c:308
#, fuzzy, c-format
msgid "Invalid argument `%s'\n"
msgstr "“%s”的参数无效。\n"
-#: src/statistics/gnunet-statistics.c:336
+#: src/statistics/gnunet-statistics.c:334
msgid "limit output to statistics for the given NAME"
msgstr ""
-#: src/statistics/gnunet-statistics.c:339
+#: src/statistics/gnunet-statistics.c:337
msgid "make the value being set persistent"
msgstr ""
-#: src/statistics/gnunet-statistics.c:342
+#: src/statistics/gnunet-statistics.c:340
msgid "limit output to the given SUBSYSTEM"
msgstr ""
-#: src/statistics/gnunet-statistics.c:345
+#: src/statistics/gnunet-statistics.c:343
msgid "just print the statistics value"
msgstr ""
-#: src/statistics/gnunet-statistics.c:348
+#: src/statistics/gnunet-statistics.c:346
msgid "watch value continuously"
msgstr ""
-#: src/statistics/gnunet-statistics.c:351
+#: src/statistics/gnunet-statistics.c:349
msgid "connect to remote host"
msgstr ""
-#: src/statistics/gnunet-statistics.c:354
+#: src/statistics/gnunet-statistics.c:352
msgid "port for remote host"
msgstr ""
-#: src/statistics/gnunet-statistics.c:366
+#: src/statistics/gnunet-statistics.c:364
msgid "Print statistics about GNUnet operations."
msgstr ""
-#: src/statistics/statistics_api.c:512
+#: src/statistics/statistics_api.c:519
#, fuzzy
msgid "Could not save some persistent statistics\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/statistics/statistics_api.c:1057
+#: src/statistics/statistics_api.c:1090
msgid ""
"Failed to receive acknowledgement from statistics service, some statistics "
"might have been lost!\n"
msgstr ""
-#: src/testbed/gnunet-service-testbed_cpustatus.c:727
+#: 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:325
+msgid "Daemon to log latency values of connections to neighbours"
+msgstr ""
+
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
+msgid ""
+"Daemon to restrict incoming transport layer connections during testbed "
+"deployments"
+msgstr ""
+
+#: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c: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"
msgstr ""
-#: src/testbed/gnunet-service-testbed_peers.c:973
+#: src/testbed/gnunet-service-testbed_peers.c:1015
#, fuzzy
msgid "Misconfiguration (can't connect to the ARM service)"
msgstr "初始化“%s”服务失败。\n"
-#: src/testbed/gnunet-service-testbed_peers.c:979
+#: src/testbed/gnunet-service-testbed_peers.c:1021
msgid "Request doesn't fit into a message"
msgstr ""
-#: src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/testbed/gnunet-service-testbed_peers.c:1059
#, c-format
msgid "%s service can't be started because ARM is shutting down"
msgstr ""
-#: src/testbed/gnunet_testbed_ll_master.c:57
-#, c-format
-msgid "Job command file not given. Exiting\n"
-msgstr ""
-
#: src/testbed/gnunet_testbed_mpi_spawn.c:125
msgid "Waiting for child to exit.\n"
msgstr ""
msgid "Spawning process `%s'\n"
msgstr "卸载 GNUnet 服务"
-#: src/testbed/gnunet-testbed-profiler.c:254
+#: src/testbed/gnunet-testbed-profiler.c:267
#, fuzzy, c-format
msgid "Exiting as the number of peers is %u\n"
msgstr "增加 TCP/IP 的最大连接数"
-#: src/testbed/gnunet-testbed-profiler.c:280
-msgid "create COUNT number of peers"
+#: src/testbed/gnunet-testbed-profiler.c:296
+msgid "tolerate COUNT number of continious timeout failures"
msgstr ""
-#: src/testbed/gnunet-testbed-profiler.c:283
-msgid "tolerate COUNT number of continious timeout failures"
+#: src/testbed/gnunet-testbed-profiler.c:299
+msgid ""
+"run profiler in non-interactive mode where upon testbed setup the profiler "
+"does not wait for a keystroke but continues to run until a termination "
+"signal is received"
msgstr ""
#: src/testbed/testbed_api_hosts.c:415
msgid "The function %s is only available when compiled with (--with-ll)\n"
msgstr ""
-#: src/testbed/testbed_api_hosts.c:1572
+#: src/testbed/testbed_api_hosts.c:1586
#, fuzzy, c-format
msgid "Adding host %u failed with error: %s\n"
msgstr "“%s”以错误码 %d 失败：%s\n"
-#: src/testbed/testbed_api_testbed.c:820
+#: src/testbed/testbed_api_testbed.c:819
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 ""
-#: src/testbed/testbed_api_testbed.c:1055
+#: src/testbed/testbed_api_testbed.c:1054
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 ""
-#: src/testbed/testbed_api_testbed.c:1148
+#: src/testbed/testbed_api_testbed.c:1147
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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/testbed/testbed_api_testbed.c:1300
+#: src/testbed/testbed_api_testbed.c:1299
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 ""
-#: 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 ""
-#: src/testbed/testbed_api_topology.c:716
+#: src/testbed/testbed_api_topology.c:960
#, c-format
msgid "Topology file %s not found\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:722
+#: src/testbed/testbed_api_topology.c:966
#, c-format
msgid "Topology file %s has no data\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:729
+#: src/testbed/testbed_api_topology.c:973
#, c-format
msgid "Topology file %s cannot be read\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:751
+#: src/testbed/testbed_api_topology.c:995
#, fuzzy, c-format
msgid "Failed to read peer index from toology file: %s"
msgstr "解析配置文件“%s”失败\n"
-#: src/testbed/testbed_api_topology.c:760
-#: src/testbed/testbed_api_topology.c:784
+#: src/testbed/testbed_api_topology.c:1004
+#: src/testbed/testbed_api_topology.c:1028
#, c-format
msgid "Value in given topology file: %s out of range\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:766
-#: src/testbed/testbed_api_topology.c:790
+#: src/testbed/testbed_api_topology.c:1010
+#: src/testbed/testbed_api_topology.c:1034
#, fuzzy, c-format
msgid "Failed to read peer index from topology file: %s"
msgstr "解析配置文件“%s”失败\n"
-#: src/testbed/testbed_api_topology.c:772
-#: src/testbed/testbed_api_topology.c:796
+#: src/testbed/testbed_api_topology.c:1016
+#: src/testbed/testbed_api_topology.c:1040
msgid "Topology file needs more peers than given ones\n"
msgstr ""
-#: src/testbed/testbed_api_topology.c:811
+#: 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"
msgid "Command line tool to access the testing library"
msgstr ""
-#: src/testing/testing.c:276
-#, c-format
-msgid "Hostkeys file not found: %s\n"
+#: src/testing/list-keys.c:90
+msgid "list COUNT number of keys"
+msgstr ""
+
+#: src/testing/list-keys.c:93
+msgid "skip COUNT number of keys in the beginning"
msgstr ""
-#: src/testing/testing.c:292
+#: src/testing/testing.c:277
#, c-format
-msgid "Incorrect hostkey file format: %s\n"
+msgid "Hostkeys file not found: %s\n"
msgstr ""
-#: src/testing/testing.c:711
+#: src/testing/testing.c:718
#, c-format
msgid "Key number %u does not exist\n"
msgstr ""
-#: src/testing/testing.c:722
-#, fuzzy, c-format
-msgid "Error while decoding key %u\n"
-msgstr "解析 dscl 输出时出错。\n"
-
-#: src/testing/testing.c:1158
+#: src/testing/testing.c:1157
#, c-format
msgid ""
"You attempted to create a testbed with more than %u hosts. Please "
"precompute more hostkeys first.\n"
msgstr ""
-#: src/testing/testing.c:1167
+#: src/testing/testing.c:1166
#, fuzzy, c-format
msgid "Failed to initialize hostkey for peer %u\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/testing/testing.c:1177
+#: src/testing/testing.c:1176
msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
msgstr ""
-#: src/testing/testing.c:1190
+#: src/testing/testing.c:1189
#, fuzzy
msgid "Failed to create configuration for peer (not enough free ports?)\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/testing/testing.c:1204
+#: src/testing/testing.c:1203
#, fuzzy, c-format
msgid "Cannot open hostkey file `%s': %s\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/testing/testing.c:1216
+#: src/testing/testing.c:1215
#, fuzzy, c-format
msgid "Failed to write hostkey file for peer %u: %s\n"
msgstr "发送消息失败。\n"
-#: src/testing/testing.c:1238
+#: src/testing/testing.c:1240
#, fuzzy, c-format
msgid "Failed to write configuration file `%s' for peer %u: %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/testing/testing.c:1338
+#: src/testing/testing.c:1342
#, fuzzy, c-format
msgid "Failed to start `%s': %s\n"
msgstr "运行 %s失败：%s %d\n"
-#: src/testing/testing.c:1702
+#: src/testing/testing.c:1706
#, fuzzy, c-format
msgid "Failed to load configuration from %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/topology/gnunet-daemon-topology.c:254
-msgid "# peers blacklisted"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:387
-msgid "# connect requests issued to transport"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:721
-#: src/topology/gnunet-daemon-topology.c:806
-msgid "# friends connected"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:986
-msgid "Failed to connect to core service, can not manage topology!\n"
-msgstr ""
+#: src/topology/friends.c:100
+#, fuzzy, c-format
+msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-#: src/topology/gnunet-daemon-topology.c:1031
+#: src/topology/friends.c:154
#, c-format
-msgid "Could not read friends list `%s'\n"
+msgid "Directory for file `%s' does not seem to be writable.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1037
-#, c-format
-msgid "Friends file `%s' is empty.\n"
+#: src/topology/gnunet-daemon-topology.c:255
+msgid "# peers blacklisted"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1046
-#, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
+#: src/topology/gnunet-daemon-topology.c:388
+msgid "# connect requests issued to transport"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1054
-#, c-format
-msgid "Failed to read friends list from `%s'\n"
+#: src/topology/gnunet-daemon-topology.c:728
+#: src/topology/gnunet-daemon-topology.c:813
+msgid "# friends connected"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1074
-#, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
+#: src/topology/gnunet-daemon-topology.c:993
+msgid "Failed to connect to core service, can not manage topology!\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1087
+#: src/topology/gnunet-daemon-topology.c:1022
#, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1097
+#: src/topology/gnunet-daemon-topology.c:1029
#, fuzzy, c-format
msgid "Found friend `%s' in configuration\n"
msgstr ""
"\n"
"结束配置。\n"
-#: src/topology/gnunet-daemon-topology.c:1103
-#, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+#: src/topology/gnunet-daemon-topology.c:1050
+msgid "Encountered errors parsing friends list!\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1113
+#: src/topology/gnunet-daemon-topology.c:1052
#, fuzzy
msgid "# friends in configuration"
msgstr ""
"\n"
"结束配置。\n"
-#: src/topology/gnunet-daemon-topology.c:1119
+#: src/topology/gnunet-daemon-topology.c:1057
msgid ""
"Fewer friends specified than required by minimum friend count. Will only "
"connect to friends.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1063
msgid ""
"More friendly connections required than target total number of connections.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1157
+#: src/topology/gnunet-daemon-topology.c:1094
msgid "# HELLO messages received"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1212
+#: src/topology/gnunet-daemon-topology.c:1151
msgid "# HELLO messages gossipped"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1351
+#: src/topology/gnunet-daemon-topology.c:1290
msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
msgstr ""
-#: src/transport/gnunet-service-transport_blacklist.c:267
+#: src/transport/gnunet-service-transport_blacklist.c:271
#, fuzzy, c-format
msgid "Adding blacklisting entry for peer `%s'\n"
msgstr "卸载 GNUnet 服务"
-#: src/transport/gnunet-service-transport_blacklist.c:275
+#: src/transport/gnunet-service-transport_blacklist.c:279
#, c-format
msgid "Adding blacklisting entry for peer `%s':`%s'\n"
msgstr ""
-#: src/transport/gnunet-service-transport_blacklist.c:453
-#: src/transport/gnunet-service-transport_blacklist.c:717
+#: src/transport/gnunet-service-transport_blacklist.c:464
+#: src/transport/gnunet-service-transport_blacklist.c:745
msgid "# disconnects due to blacklist"
msgstr ""
-#: src/transport/gnunet-service-transport.c:168
-msgid "# bytes payload discarded due to not connected peer "
+#: src/transport/gnunet-service-transport.c:220
+msgid "# bytes payload discarded due to not connected peer"
msgstr ""
-#: src/transport/gnunet-service-transport.c:234
+#: src/transport/gnunet-service-transport.c:424
msgid "# bytes total received"
msgstr ""
-#: src/transport/gnunet-service-transport.c:281
+#: src/transport/gnunet-service-transport.c:515
msgid "# bytes payload received"
msgstr ""
-#: src/transport/gnunet-service-transport.c:432
+#: src/transport/gnunet-service-transport.c:686
#, fuzzy, c-format
-msgid "Could not obtain a valid network for `%s' %s\n"
+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:480
+#: src/transport/gnunet-service-transport.c:733
#, 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:775
-msgid "Transport service is lacking key configuration settings. Exiting.\n"
-msgstr ""
+#: src/transport/gnunet-service-transport.c:1084
+#, fuzzy
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
+msgstr "立即保存配置？"
-#: src/transport/gnunet-service-transport_clients.c:389
+#: src/transport/gnunet-service-transport_clients.c:432
#, c-format
msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
msgstr ""
-#: src/transport/gnunet-service-transport_clients.c:394
+#: src/transport/gnunet-service-transport_clients.c:439
msgid "# messages dropped due to slow client"
msgstr ""
-#: src/transport/gnunet-service-transport_clients.c:536
+#: src/transport/gnunet-service-transport_clients.c:596
#, c-format
msgid "Rejecting control connection from peer `%s', which is not me!\n"
msgstr ""
-#: src/transport/gnunet-service-transport_clients.c:677
+#: src/transport/gnunet-service-transport_clients.c:737
msgid "# bytes payload dropped (other peer was not connected)"
msgstr ""
-#: src/transport/gnunet-service-transport_clients.c:733
+#: src/transport/gnunet-service-transport_clients.c: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 ""
-#: src/transport/gnunet-service-transport_hello.c:179
+#: 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:181
msgid "# refreshed my HELLO"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1216
+#: src/transport/gnunet-service-transport_neighbours.c:1095
msgid "# DISCONNECT messages sent"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1346
-#: src/transport/gnunet-service-transport_neighbours.c:1681
+#: src/transport/gnunet-service-transport_neighbours.c:1220
+#: src/transport/gnunet-service-transport_neighbours.c:1629
msgid "# bytes in message queue for other peers"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1351
+#: src/transport/gnunet-service-transport_neighbours.c:1225
msgid "# messages transmitted to other peers"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1356
+#: src/transport/gnunet-service-transport_neighbours.c:1230
msgid "# transmission failures for messages to other peers"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1413
+#: src/transport/gnunet-service-transport_neighbours.c:1287
msgid "# messages timed out while in transport queue"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1455
+#: src/transport/gnunet-service-transport_neighbours.c:1343
msgid "# keepalives sent"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1479
+#: src/transport/gnunet-service-transport_neighbours.c:1376
msgid "# KEEPALIVE messages discarded (peer unknown)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1487
+#: src/transport/gnunet-service-transport_neighbours.c:1384
msgid "# KEEPALIVE messages discarded (no session)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1520
+#: src/transport/gnunet-service-transport_neighbours.c:1431
msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1529
+#: src/transport/gnunet-service-transport_neighbours.c:1440
msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1586
+#: src/transport/gnunet-service-transport_neighbours.c:1448
+msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1456
+msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1534
msgid "# messages discarded due to lack of neighbour record"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1620
+#: src/transport/gnunet-service-transport_neighbours.c:1568
msgid "# bandwidth quota violations by other peers"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1636
+#: src/transport/gnunet-service-transport_neighbours.c:1584
msgid "# ms throttling suggested"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2775
+#: src/transport/gnunet-service-transport_neighbours.c:1678
+#, 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:1705
+msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1751
+msgid "# SESSION_CONNECT messages sent"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1767
+#, fuzzy, c-format
+msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1794
+msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1844
+#, 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:1899
+msgid "# CONNECT_ACK messages sent"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1914
+#, 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:2192
+#, fuzzy, c-format
+msgid "Blacklisting disapproved to connect to peer `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2312
+msgid "# CONNECT messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2317
+#, c-format
+msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2590
+msgid "# Attempts to switch addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3012
+#, fuzzy
+msgid "# Failed attempts to switch addresses (no response)"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:3107
+msgid "# CONNECT_ACK messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3115
msgid "# unexpected CONNECT_ACK messages (no peer)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2790
-#: src/transport/gnunet-service-transport_neighbours.c:2821
+#: src/transport/gnunet-service-transport_neighbours.c:3129
+#: src/transport/gnunet-service-transport_neighbours.c:3164
msgid "# unexpected CONNECT_ACK messages (not ready)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2834
+#: src/transport/gnunet-service-transport_neighbours.c:3176
msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2865
+#: src/transport/gnunet-service-transport_neighbours.c:3200
+msgid "# Successful attempts to switch addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3208
msgid "# unexpected CONNECT_ACK messages (disconnecting)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3046
-msgid "# unexpected SESSION ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3396
+msgid "# SESSION_ACK messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:3424
+msgid "# unexpected SESSION_ACK messages"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3099
+#: src/transport/gnunet-service-transport_neighbours.c:3490
msgid "# SET QUOTA messages ignored (no such peer)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3113
+#: src/transport/gnunet-service-transport_neighbours.c:3505
msgid "# disconnects due to quota of 0"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3144
-msgid "# disconnect messages ignored (old format)"
+#: src/transport/gnunet-service-transport_neighbours.c:3545
+msgid "# disconnect messages ignored (malformed)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3155
-msgid "# disconnect messages ignored (timestamp)"
+#: src/transport/gnunet-service-transport_neighbours.c:3551
+msgid "# DISCONNECT messages received"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3194
-msgid "# other peer asked to disconnect from us"
+#: src/transport/gnunet-service-transport_neighbours.c:3560
+msgid "# disconnect messages ignored (timestamp)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3289
+#: src/transport/gnunet-service-transport_neighbours.c:3687
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 ""
-#: src/transport/gnunet-service-transport_plugins.c:170
#: 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: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"
-#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:265
#, c-format
msgid "Did not load plugin `%s' due to missing functions\n"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:455
+#: src/transport/gnunet-service-transport_validation.c:488
msgid "# address records discarded"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:518
+#: 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 ""
-#: src/transport/gnunet-service-transport_validation.c:575
+#: src/transport/gnunet-service-transport_validation.c:616
msgid "# PING without HELLO messages sent"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:660
+#: src/transport/gnunet-service-transport_validation.c:722
msgid "# address revalidations started"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:1011
msgid "# PING message for different peer received"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:987
+#: src/transport/gnunet-service-transport_validation.c:1062
+#, c-format
+msgid "Plugin `%s' not available, cannot confirm having this address\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1072
msgid "# failed address checks during validation"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:997
+#: src/transport/gnunet-service-transport_validation.c:1075
+#, c-format
+msgid "Address `%s' is not one of my addresses, not confirming PING\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1083
msgid "# successful address checks during validation"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:1016
+#: src/transport/gnunet-service-transport_validation.c:1095
+#, c-format
+msgid ""
+"Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
+"having this address.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1103
#, c-format
msgid "Received a PING message with validation bug from `%s'\n"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:1070
+#: src/transport/gnunet-service-transport_validation.c:1157
#, fuzzy, c-format
msgid "Failed to create PONG signature for peer `%s'\n"
msgstr "发送消息失败。\n"
-#: src/transport/gnunet-service-transport_validation.c:1115
+#: src/transport/gnunet-service-transport_validation.c:1206
msgid "# PONGs unicast via reliable transport"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:1124
+#: src/transport/gnunet-service-transport_validation.c:1215
msgid "# PONGs multicast to all available addresses"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:1251
+#: src/transport/gnunet-service-transport_validation.c:1356
msgid "# PONGs dropped, no matching pending validation"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:1266
+#: src/transport/gnunet-service-transport_validation.c:1371
msgid "# PONGs dropped, signature expired"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:1372
+#: 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 ""
-#: src/transport/gnunet-transport.c:266
+#: src/transport/gnunet-transport.c:367
#, c-format
msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
msgstr ""
-#: src/transport/gnunet-transport.c:273
+#: src/transport/gnunet-transport.c:375
#, c-format
msgid "Received %llu bytes/s (%llu bytes in %s)\n"
msgstr ""
-#: src/transport/gnunet-transport.c:303
+#: src/transport/gnunet-transport.c:415
#, fuzzy, c-format
msgid "Failed to connect to `%s'\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:316
+#: src/transport/gnunet-transport.c:428
#, fuzzy, c-format
msgid "Failed to resolve address for peer `%s'\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/transport/gnunet-transport.c:325
+#: src/transport/gnunet-transport.c:438
#, fuzzy
msgid "Failed to list connections, timeout occured\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:429
+#: src/transport/gnunet-transport.c:559
+#, 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:586
+#, fuzzy, c-format
+msgid "Peer `%s' %s `%s' \n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/transport/gnunet-transport.c:712
msgid "No transport plugins configured, peer will never communicate\n"
msgstr ""
-#: src/transport/gnunet-transport.c:442
+#: src/transport/gnunet-transport.c:726
#, 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:789
#, c-format
msgid "Transmitting %u bytes to %s\n"
msgstr ""
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:810
#, fuzzy, c-format
msgid "Successfully connected to `%s'\n"
msgstr "“%s”已连接到“%s”。\n"
-#: src/transport/gnunet-transport.c:550
+#: src/transport/gnunet-transport.c:834
#, c-format
msgid ""
"Successfully connected to `%s', starting to send benchmark data in %u Kb "
"blocks\n"
msgstr ""
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:865
+#, fuzzy, c-format
+msgid "Successfully disconnected from `%s'\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/transport/gnunet-transport.c:888
#, fuzzy, c-format
msgid "Disconnected from peer `%s' while benchmarking\n"
msgstr "“%s”已连接到“%s”。\n"
-#: src/transport/gnunet-transport.c:655
+#: src/transport/gnunet-transport.c:950
#, c-format
msgid "Received %u bytes from %s\n"
msgstr ""
-#: src/transport/gnunet-transport.c:678
-#, fuzzy, c-format
-msgid "Peer `%s': %s %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/transport/gnunet-transport.c:693
+#: src/transport/gnunet-transport.c:975
#, c-format
-msgid "Peer `%s': %s <unable to resolve address>\n"
+msgid "Peer `%s': %s %s in state `%s' until %s\n"
msgstr ""
-#: src/transport/gnunet-transport.c:757
+#: src/transport/gnunet-transport.c:986
#, fuzzy, c-format
-msgid "Peer `%s' disconnected\n"
-msgstr ""
-"\n"
-"按任意键继续\n"
+msgid "Peer `%s': %s %s\n"
+msgstr "运行 %s失败：%s %d\n"
-#: src/transport/gnunet-transport.c:785
+#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222
#, fuzzy
msgid "Failed to send connect request to transport service\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:828
+#: src/transport/gnunet-transport.c:1266
#, c-format
msgid ""
"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
"%s, %s\n"
msgstr ""
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:1274
#, c-format
msgid ""
"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
msgstr ""
-#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
-#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
+#: src/transport/gnunet-transport.c:1293 src/transport/gnunet-transport.c:1323
+#: src/transport/gnunet-transport.c:1353 src/transport/gnunet-transport.c:1376
+#: src/transport/gnunet-transport.c:1419
#, fuzzy
msgid "Failed to connect to transport service\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
+#: src/transport/gnunet-transport.c:1302 src/transport/gnunet-transport.c:1332
+#: src/transport/gnunet-transport.c:1362
#, fuzzy
msgid "Failed to send request to transport service\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:911
+#: src/transport/gnunet-transport.c:1381
msgid "Starting to receive benchmark data\n"
msgstr ""
-#: src/transport/gnunet-transport.c:995
+#: src/transport/gnunet-transport.c:1465
+#, fuzzy
+msgid "print information for all peers (instead of only connected peers )"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/gnunet-transport.c:1468
msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
msgstr ""
-#: src/transport/gnunet-transport.c:998
+#: src/transport/gnunet-transport.c:1471
#, fuzzy
msgid "connect to a peer"
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:1001
+#: src/transport/gnunet-transport.c:1474
+#, fuzzy
+msgid "disconnect to a peer"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:1477
+#, fuzzy
+msgid "print information for all pending validations "
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/gnunet-transport.c:1480
+#, fuzzy
+msgid "print information for all pending validations continously"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/gnunet-transport.c:1483
msgid "provide information about all current connections (once)"
msgstr ""
-#: src/transport/gnunet-transport.c:1007
+#: src/transport/gnunet-transport.c:1489
msgid ""
"provide information about all connects and disconnect events (continuously)"
msgstr ""
-#: src/transport/gnunet-transport.c:1010
+#: src/transport/gnunet-transport.c:1491
msgid "do not resolve hostnames"
msgstr ""
-#: src/transport/gnunet-transport.c:1013
+#: src/transport/gnunet-transport.c:1493
msgid "peer identity"
msgstr ""
-#: src/transport/gnunet-transport.c:1017
+#: src/transport/gnunet-transport.c:1495
msgid "send data for benchmarking to the other peer (until CTRL-C)"
msgstr ""
-#: src/transport/gnunet-transport.c:1020
+#: src/transport/gnunet-transport.c:1498
msgid "test transport configuration (involves external server)"
msgstr ""
-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:1507
#, fuzzy
msgid "Direct access to transport service."
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/plugin_transport_bluetooth.c:612
+#: src/transport/plugin_transport_bluetooth.c:621
msgid "# Bluetooth ACKs sent"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:631
+#: src/transport/plugin_transport_bluetooth.c:640
msgid "# Bluetooth messages defragmented"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:677
-#: src/transport/plugin_transport_bluetooth.c:727
-#: src/transport/plugin_transport_bluetooth.c:1833
+#: src/transport/plugin_transport_bluetooth.c:686
+#: src/transport/plugin_transport_bluetooth.c:737
+#: src/transport/plugin_transport_bluetooth.c:1942
msgid "# Bluetooth sessions allocated"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:802
+#: src/transport/plugin_transport_bluetooth.c:837
msgid "# Bluetooth message fragments sent"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:826
+#: src/transport/plugin_transport_bluetooth.c:861
msgid "# Bluetooth messages pending (with fragmentation)"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:934
-#: src/transport/plugin_transport_bluetooth.c:1019
-#: src/transport/plugin_transport_bluetooth.c:1835
+#: src/transport/plugin_transport_bluetooth.c:969
+#: src/transport/plugin_transport_bluetooth.c:1054
+#: src/transport/plugin_transport_bluetooth.c:1944
msgid "# Bluetooth MAC endpoints allocated"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:1214
+#: src/transport/plugin_transport_bluetooth.c:1307
msgid "# HELLO messages received via Bluetooth"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:1240
+#: src/transport/plugin_transport_bluetooth.c:1331
msgid "# fragments received via Bluetooth"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:1250
+#: src/transport/plugin_transport_bluetooth.c:1341
msgid "# ACKs received via Bluetooth"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:1307
+#: src/transport/plugin_transport_bluetooth.c:1401
msgid "# Bluetooth DATA messages discarded due to CRC32 error"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:1419
+#: src/transport/plugin_transport_bluetooth.c:1512
msgid "# DATA messages received via Bluetooth"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:1454
+#: src/transport/plugin_transport_bluetooth.c:1547
msgid "# Bluetooth DATA messages processed"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:1517
+#: src/transport/plugin_transport_bluetooth.c:1610
msgid "# HELLO beacons sent via Bluetooth"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:1630
+#: src/transport/plugin_transport_bluetooth.c:1723
msgid "Bluetooth address with invalid size encountered\n"
msgstr ""
-#: src/transport/plugin_transport_bluetooth.c:1814
+#: src/transport/plugin_transport_bluetooth.c:1923
#, c-format
msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2614
-msgid "Disabling IPv6 since it is not supported on this system!\n"
+#: src/transport/plugin_transport_http_client.c:1622
+#, c-format
+msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2382
-#, fuzzy
-msgid "Require valid port number for service in configuration!\n"
-msgstr "保存配置失败。"
-
-#: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2414 src/util/service.c:1062
-#, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2431 src/util/service.c:1079
+#: src/transport/plugin_transport_http_client.c:1697
+#: src/transport/plugin_transport_http_server.c:3007
#, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "æ\89¾ä¸\8då\88°æ\8e¥å\8f£â\80\9c%sâ\80\9dç\9a\84ä¸\80个 IP å\9c°å\9d\80。\n"
+msgid "Shutting down plugin `%s'\n"
+msgstr "æ\9cªç\9f¥ç\9a\84å\91½ä»¤â\80\9c%sâ\80\9d。\n"
-#: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2542
+#: src/transport/plugin_transport_http_client.c:1722
+#: src/transport/plugin_transport_http_server.c:3063
#, c-format
-msgid "Found %u addresses to report to NAT service\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2722
-msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2733
-#, fuzzy
-msgid "Port is required! Fix in configuration\n"
+msgid "Shutdown for plugin `%s' complete\n"
msgstr ""
-"\n"
-"结束配置。\n"
-#: src/transport/plugin_transport_http.c:1155
-msgid "Port 0, client only mode\n"
-msgstr ""
+#: src/transport/plugin_transport_http_client.c:1750
+#: src/transport/plugin_transport_http_server.c:2907
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
-#: src/transport/plugin_transport_http.c:1175
+#: src/transport/plugin_transport_http_server.c:1402
#, c-format
msgid ""
-"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
+"Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
+"size %u\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:1204
+#: src/transport/plugin_transport_http_server.c:1663
#, c-format
-msgid ""
-"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2848
-#, fuzzy, c-format
-msgid "Using external hostname `%s'\n"
-msgstr "卸载 GNUnet 服务"
-
-#: src/transport/plugin_transport_http.c:1226
-msgid "No external hostname configured\n"
+msgid "Accepting connection (%u of %u) from `%s'\n"
msgstr ""
-#: src/transport/plugin_transport_http_client.c:1587
+#: src/transport/plugin_transport_http_server.c:1671
#, c-format
-msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgid ""
+"Server reached maximum number connections (%u), rejecting new connection\n"
msgstr ""
-#: src/transport/plugin_transport_http_client.c:1724
-#: src/transport/plugin_transport_http_server.c:2978
-#, fuzzy, c-format
-msgid "Shutting down plugin `%s'\n"
-msgstr "未知的命令“%s”。\n"
+#: src/transport/plugin_transport_http_server.c:1958
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
+msgstr ""
-#: src/transport/plugin_transport_http_client.c:1749
-#: src/transport/plugin_transport_http_server.c:3038
+#: src/transport/plugin_transport_http_server.c:1982
#, c-format
-msgid "Shutdown for plugin `%s' complete\n"
+msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
msgstr ""
-#: src/transport/plugin_transport_http_client.c:1777
-#: src/transport/plugin_transport_http_server.c:2878
-#, fuzzy, c-format
-msgid "Maximum number of connections is %u\n"
-msgstr "增加 TCP/IP 的最大连接数"
+#: src/transport/plugin_transport_http_server.c:2405
+#, fuzzy
+msgid "Require valid port number for service in configuration!\n"
+msgstr "保存配置失败。"
-#: src/transport/plugin_transport_http_server.c:1379
-#, 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:2437 src/util/service.c:698
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
-#: src/transport/plugin_transport_http_server.c:1644
-#, c-format
-msgid "Accepting connection (%u of %u) from `%s'\n"
-msgstr ""
+#: src/transport/plugin_transport_http_server.c:2454 src/util/service.c:715
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/transport/plugin_transport_http_server.c:1652
+#: src/transport/plugin_transport_http_server.c:2565
#, c-format
-msgid ""
-"Server reached maximum number connections (%u), rejecting new connection\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_server.c:1953
-msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
+msgid "Found %u addresses to report to NAT service\n"
msgstr ""
-#: src/transport/plugin_transport_http_server.c:1977
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/plugin_transport_http_server.c:2637
+msgid "Disabling IPv6 since it is not supported on this system!\n"
msgstr ""
-#: src/transport/plugin_transport_http_server.c:2701
+#: src/transport/plugin_transport_http_server.c:2730
#, c-format
msgid "IPv4 support is %s\n"
msgstr ""
-#: src/transport/plugin_transport_http_server.c:2715
+#: src/transport/plugin_transport_http_server.c:2744
#, c-format
msgid "IPv6 support is %s\n"
msgstr ""
-#: src/transport/plugin_transport_http_server.c:2740
+#: src/transport/plugin_transport_http_server.c:2751
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2762
+#, fuzzy
+msgid "Port is required! Fix in configuration\n"
+msgstr ""
+"\n"
+"结束配置。\n"
+
+#: src/transport/plugin_transport_http_server.c:2769
#, c-format
msgid "Using port %u\n"
msgstr ""
-#: src/transport/plugin_transport_http_server.c:2755
+#: src/transport/plugin_transport_http_server.c:2784
#, c-format
msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
msgstr ""
-#: src/transport/plugin_transport_http_server.c:2765
+#: src/transport/plugin_transport_http_server.c:2794
#, fuzzy, c-format
msgid "Binding to IPv4 address %s\n"
msgstr "无效的进程优先级“%s”\n"
-#: src/transport/plugin_transport_http_server.c:2786
+#: src/transport/plugin_transport_http_server.c:2815
#, c-format
msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
msgstr ""
-#: src/transport/plugin_transport_http_server.c:2796
+#: src/transport/plugin_transport_http_server.c:2825
#, fuzzy, c-format
msgid "Binding to IPv6 address %s\n"
msgstr "无效的进程优先级“%s”\n"
-#: src/transport/plugin_transport_http_server.c:2864
+#: src/transport/plugin_transport_http_server.c:2877
+#, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/transport/plugin_transport_http_server.c:2893
#, c-format
msgid "Notifying transport only about hostname `%s'\n"
msgstr ""
-#: src/transport/plugin_transport_smtp.c:370
+#: src/transport/plugin_transport_smtp.c:223
#, c-format
msgid "Received malformed message via %s. Ignored.\n"
msgstr ""
-#: src/transport/plugin_transport_smtp.c:457
+#: src/transport/plugin_transport_smtp.c:310
msgid "SMTP filter string to invalid, lacks ': '\n"
msgstr ""
-#: src/transport/plugin_transport_smtp.c:466
+#: src/transport/plugin_transport_smtp.c:319
#, c-format
msgid "SMTP filter string to long, capped to `%s'\n"
msgstr ""
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
+#: src/transport/plugin_transport_smtp.c:414
+#: src/transport/plugin_transport_smtp.c:424
+#: src/transport/plugin_transport_smtp.c:437
+#: src/transport/plugin_transport_smtp.c:456
+#: src/transport/plugin_transport_smtp.c:479
+#: src/transport/plugin_transport_smtp.c:487
+#: src/transport/plugin_transport_smtp.c:500
+#: src/transport/plugin_transport_smtp.c:511
#, c-format
msgid "SMTP: `%s' failed: %s.\n"
msgstr ""
-#: src/transport/plugin_transport_smtp.c:799
+#: src/transport/plugin_transport_smtp.c:652
msgid "No email-address specified, can not start SMTP transport.\n"
msgstr ""
-#: src/transport/plugin_transport_smtp.c:811
+#: src/transport/plugin_transport_smtp.c:664
msgid "# bytes received via SMTP"
msgstr ""
-#: src/transport/plugin_transport_smtp.c:812
+#: src/transport/plugin_transport_smtp.c:665
msgid "# bytes sent via SMTP"
msgstr ""
-#: src/transport/plugin_transport_smtp.c:814
+#: src/transport/plugin_transport_smtp.c:667
msgid "# bytes dropped by SMTP (outgoing)"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:626
+#: src/transport/plugin_transport_tcp.c:555
#, c-format
msgid "Unexpected address length: %u bytes\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:834
-#: src/transport/plugin_transport_tcp.c:923
-#: src/transport/plugin_transport_tcp.c:973
-#: src/transport/plugin_transport_tcp.c:1059
-#: src/transport/plugin_transport_tcp.c:1202
+#: src/transport/plugin_transport_tcp.c:762
+#: src/transport/plugin_transport_tcp.c:928
+#: src/transport/plugin_transport_tcp.c:2005
+#: src/transport/plugin_transport_tcp.c:2558
+msgid "# TCP sessions active"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:795
+#: src/transport/plugin_transport_tcp.c:921
+#: src/transport/plugin_transport_tcp.c:1009
+#: src/transport/plugin_transport_tcp.c:1056
#: src/transport/plugin_transport_tcp.c:1219
+#: src/transport/plugin_transport_tcp.c:1237
msgid "# bytes currently in TCP buffers"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:841
-#: src/transport/plugin_transport_tcp.c:1030
-#: src/transport/plugin_transport_tcp.c:2009
-#: src/transport/plugin_transport_tcp.c:2690
-msgid "# TCP sessions active"
+#: src/transport/plugin_transport_tcp.c:798
+msgid "# bytes discarded by TCP (disconnect)"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:927
+#: src/transport/plugin_transport_tcp.c:1012
msgid "# bytes discarded by TCP (timeout)"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:976
+#: src/transport/plugin_transport_tcp.c:1059
msgid "# bytes transmitted via TCP"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:1063
-msgid "# bytes discarded by TCP (disconnect)"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1176
+#: src/transport/plugin_transport_tcp.c:1193
#, c-format
msgid "Trying to send with invalid session %p\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:1413
-#: src/transport/plugin_transport_udp.c:1449
+#: src/transport/plugin_transport_tcp.c:1462
msgid "# requests to create session with invalid address"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:1530
+#: src/transport/plugin_transport_tcp.c:1567
msgid "# transport-service disconnect requests for TCP"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2059
+#: src/transport/plugin_transport_tcp.c:2055
msgid "# TCP WELCOME messages received"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2242
+#: src/transport/plugin_transport_tcp.c:2215
msgid "# bytes received via TCP"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2322
+#: src/transport/plugin_transport_tcp.c:2279
msgid "# network-level TCP disconnect events"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2570 src/util/service.c:957
-#: src/util/service.c:963
+#: src/transport/plugin_transport_tcp.c:2437 src/util/service.c:582
+#: src/util/service.c:588
#, c-format
msgid "Require valid port number for service `%s' in configuration!\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2584
+#: src/transport/plugin_transport_tcp.c:2451
#, fuzzy
msgid "Failed to start service.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/plugin_transport_tcp.c:2677
+#: src/transport/plugin_transport_tcp.c:2547
#, c-format
msgid "TCP transport listening on port %llu\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2681
+#: src/transport/plugin_transport_tcp.c:2551
msgid "TCP transport not listening on any port (client only)\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2685
+#: src/transport/plugin_transport_tcp.c:2554
#, c-format
msgid "TCP transport advertises itself as being on port %llu\n"
msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:134
+#: src/transport/plugin_transport_udp_broadcasting.c:167
msgid "# IPv6 multicast HELLO beacons received via udp"
msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:184
+#: src/transport/plugin_transport_udp_broadcasting.c:210
msgid "# IPv4 broadcast HELLO beacons received via udp"
msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:402
+#: src/transport/plugin_transport_udp_broadcasting.c:603
msgid ""
"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:419
+#: src/transport/plugin_transport_udp_broadcasting.c:626
#, c-format
msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
msgstr ""
-#: src/transport/plugin_transport_udp.c:1555
+#: 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 ""
-#: src/transport/plugin_transport_udp.c:2590
+#: 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 ""
-#: src/transport/plugin_transport_udp.c:2604
-#, c-format
+#: src/transport/plugin_transport_udp.c:2616
msgid ""
-"UDP could not transmit message to `%s': Please check your network "
-"configuration and disable IPv6 if your connection does not have a global "
-"IPv6 address\n"
+"UDP could not transmit IPv6 message! Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
msgstr ""
-#: src/transport/plugin_transport_udp.c:2905
+#: src/transport/plugin_transport_udp.c:2961
#, fuzzy
msgid "Failed to open UDP sockets\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/transport/plugin_transport_udp.c:3003
+#: src/transport/plugin_transport_udp.c:3056
#, c-format
msgid "Given `%s' option is out of range: %llu > %u\n"
msgstr ""
-#: src/transport/plugin_transport_udp.c:3046
+#: src/transport/plugin_transport_udp.c:3097
#, fuzzy, c-format
msgid "Invalid IPv6 address: `%s'\n"
msgstr "无效的进程优先级“%s”\n"
-#: src/transport/plugin_transport_udp.c:3105
+#: src/transport/plugin_transport_udp.c:3168
#, fuzzy
msgid "Failed to create network sockets, plugin failed\n"
msgstr "发送消息失败。\n"
-#: src/transport/plugin_transport_unix.c:1640
+#: 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:1652
+#, fuzzy
+msgid "No UNIXPATH given in configuration!\n"
+msgstr "保存配置失败。"
+
+#: src/transport/plugin_transport_unix.c:1688
#, 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 ""
-#: src/transport/plugin_transport_wlan.c:642
+#: src/transport/plugin_transport_wlan.c:639
msgid "# WLAN messages defragmented"
msgstr ""
#: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:756
-#: src/transport/plugin_transport_wlan.c:1899
+#: src/transport/plugin_transport_wlan.c:772
+#: src/transport/plugin_transport_wlan.c:1948
msgid "# WLAN sessions allocated"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:860
+#: src/transport/plugin_transport_wlan.c:876
msgid "# WLAN message fragments sent"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:884
+#: src/transport/plugin_transport_wlan.c:900
msgid "# WLAN messages pending (with fragmentation)"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:992
-#: src/transport/plugin_transport_wlan.c:1077
-#: src/transport/plugin_transport_wlan.c:1901
+#: 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 ""
-#: src/transport/plugin_transport_wlan.c:1272
+#: src/transport/plugin_transport_wlan.c:1302
msgid "# HELLO messages received via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1298
+#: src/transport/plugin_transport_wlan.c:1326
msgid "# fragments received via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1308
+#: src/transport/plugin_transport_wlan.c:1336
msgid "# ACKs received via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1365
+#: src/transport/plugin_transport_wlan.c:1396
msgid "# WLAN DATA messages discarded due to CRC32 error"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1485
+#: src/transport/plugin_transport_wlan.c:1518
msgid "# DATA messages received via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1520
+#: src/transport/plugin_transport_wlan.c:1553
msgid "# WLAN DATA messages processed"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1583
+#: src/transport/plugin_transport_wlan.c:1616
msgid "# HELLO beacons sent via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:1729
msgid "WLAN address with invalid size encountered\n"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1880
+#: src/transport/plugin_transport_wlan.c:1929
#, c-format
msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
msgstr ""
-#: src/transport/transport_api.c:651
+#: src/transport/transport_api.c:739
#, c-format
msgid "Received unexpected message of type %u in %s:%u\n"
msgstr ""
-#: src/transport/transport-testing.c:585
+#: src/transport/transport-testing.c:584
#, fuzzy
msgid "Failed to initialize testing library!\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/util/bio.c:137 src/util/bio.c:145
+#: src/tun/regex.c:129
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/util/bio.c:170 src/util/bio.c:178
#, fuzzy, c-format
msgid "Error reading `%s': %s"
msgstr "创建用户出错"
-#: src/util/bio.c:147
+#: src/util/bio.c:180
msgid "End of file"
msgstr ""
-#: src/util/bio.c:199
+#: src/util/bio.c:237
#, c-format
msgid "Error reading length of string `%s'"
msgstr ""
-#: src/util/bio.c:209
+#: src/util/bio.c:247
#, c-format
msgid "String `%s' longer than allowed (%u > %u)"
msgstr ""
-#: src/util/bio.c:254
+#: src/util/bio.c:293
#, c-format
msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
msgstr ""
-#: src/util/bio.c:268
+#: src/util/bio.c:307
#, c-format
msgid "Metadata `%s' failed to deserialize"
msgstr ""
-#: src/util/client.c:261 src/util/client.c:839 src/util/service.c:993
+#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:619
#, c-format
msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
msgstr ""
-#: src/util/client.c:265 src/util/client.c:843 src/util/service.c:997
+#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:623
#, fuzzy, c-format
msgid "Using `%s' instead\n"
msgstr "%s：选项“%s”有歧义\n"
-#: src/util/client.c:357
+#: src/util/client.c:360
#, c-format
msgid ""
"Could not determine valid hostname and port for service `%s' from "
"configuration.\n"
msgstr ""
-#: src/util/client.c:365
+#: src/util/client.c:368
#, c-format
msgid "Need a non-empty hostname for service `%s'.\n"
msgstr ""
-#: src/util/client.c:981
+#: src/util/client.c:1008
#, fuzzy, c-format
msgid "Could not connect to service `%s', configuration broken.\n"
msgstr "无法连接到 %s:%u：%s\n"
-#: src/util/client.c:993
+#: src/util/client.c:1020
#, c-format
msgid "Failure to transmit request to service `%s'\n"
msgstr ""
-#: src/util/client.c:1259
+#: src/util/client.c:1303
msgid "Could not submit request, not expecting to receive a response.\n"
msgstr ""
-#: src/util/common_logging.c:256 src/util/common_logging.c:1033
+#: src/util/common_logging.c:254 src/util/common_logging.c:1039
msgid "DEBUG"
msgstr "调试"
-#: src/util/common_logging.c:258 src/util/common_logging.c:1031
+#: src/util/common_logging.c:256 src/util/common_logging.c:1037
msgid "INFO"
msgstr "信息"
-#: src/util/common_logging.c:260 src/util/common_logging.c:1029
+#: src/util/common_logging.c:258 src/util/common_logging.c:1035
msgid "WARNING"
msgstr "警告"
-#: src/util/common_logging.c:262 src/util/common_logging.c:1027
+#: src/util/common_logging.c:260 src/util/common_logging.c:1033
msgid "ERROR"
msgstr "错误"
-#: src/util/common_logging.c:264 src/util/common_logging.c:1035
+#: src/util/common_logging.c:262 src/util/common_logging.c:1041
msgid "NONE"
msgstr ""
-#: src/util/common_logging.c:393
+#: src/util/common_logging.c:391
#, fuzzy, c-format
msgid "Failed to create or access directory for log file `%s'\n"
msgstr "解析配置文件“%s”失败\n"
msgid "Message `%.*s' repeated %u times in the last %s\n"
msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
-#: src/util/common_logging.c:1036
+#: src/util/common_logging.c:1042
msgid "INVALID"
msgstr ""
-#: src/util/common_logging.c:1138
+#: src/util/common_logging.c:1157
msgid "unknown address"
msgstr ""
-#: src/util/common_logging.c:1177
+#: src/util/common_logging.c:1196
msgid "invalid address"
msgstr ""
-#: src/util/common_logging.c:1195
+#: src/util/common_logging.c:1214
#, fuzzy, c-format
msgid "Configuration fails to specify option `%s' in section `%s'!\n"
msgstr "配置不满足配置规范文件“%s”的约束！\n"
-#: src/util/common_logging.c:1216
+#: src/util/common_logging.c:1235
#, fuzzy, c-format
msgid ""
"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
msgstr "配置不满足配置规范文件“%s”的约束！\n"
-#: src/util/configuration.c:291
+#: src/util/configuration.c:288
#, fuzzy, c-format
msgid "Syntax error while deserializing in line %u\n"
msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-#: src/util/configuration.c:984
+#: src/util/configuration.c:996
#, c-format
msgid ""
"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
"choices\n"
msgstr ""
-#: src/util/connection.c:424
+#: src/util/configuration.c:1066
+#, c-format
+msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
+msgstr ""
+
+#: src/util/configuration.c:1098
+#, fuzzy, c-format
+msgid "Missing closing `%s' in option `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/util/configuration.c:1172
+#, c-format
+msgid ""
+"Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
+"as an environmental variable\n"
+msgstr ""
+
+#: src/util/connection.c:423
#, fuzzy, c-format
msgid "Access denied to `%s'\n"
msgstr "“%s”已连接到“%s”。\n"
-#: src/util/connection.c:439
+#: src/util/connection.c:438
#, c-format
msgid "Accepting connection from `%s': %p\n"
msgstr ""
-#: src/util/connection.c:554
+#: src/util/connection.c:553
#, c-format
msgid ""
"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
msgstr ""
-#: src/util/connection.c:752 src/util/connection.c:919
+#: 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"
msgid "Attempt to connect to `%s' failed\n"
msgstr ""
-#: src/util/container_bloomfilter.c:518
+#: src/util/container_bloomfilter.c:531
#, c-format
msgid ""
"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
"%llu)\n"
msgstr ""
-#: src/util/crypto_ecc.c:580 src/util/crypto_ecc.c:618
+#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
+#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
#, fuzzy, c-format
msgid "Could not acquire lock on file `%s': %s...\n"
msgstr "无法解析“%s”(%s)：%s\n"
-#: src/util/crypto_ecc.c:585
+#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
#, fuzzy
msgid "Creating a new private key. This may take a while.\n"
msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
-#: src/util/crypto_ecc.c:622
+#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
msgid "This may be ok if someone is currently generating a private key.\n"
msgstr ""
-#: src/util/crypto_ecc.c:653
+#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
#, c-format
msgid ""
"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
msgstr ""
-#: src/util/crypto_ecc.c:658
+#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934
msgid "This may be ok if someone is currently generating a key.\n"
msgstr ""
-#: src/util/crypto_ecc.c:741
+#: src/util/crypto_ecc.c:1016
#, fuzzy
msgid "Could not load peer's private key\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/util/crypto_ecc.c:803
+#: src/util/crypto_ecc.c:1120
#, fuzzy, c-format
msgid "ECC signing failed at %s:%d: %s\n"
msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-#: src/util/crypto_ecc.c:883
-#, c-format
-msgid "ECC signature verification failed at %s:%d: %s\n"
-msgstr ""
+#: src/util/crypto_ecc.c:1170
+#, fuzzy, c-format
+msgid "EdDSA signing failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-#: src/util/crypto_random.c:281
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
-msgstr ""
+#: src/util/crypto_ecc.c:1244
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#: src/util/crypto_ecc.c:1301
+#, fuzzy, c-format
+msgid "EdDSA signature verification failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-#: src/util/crypto_random.c:312
+#: src/util/crypto_random.c:284
#, c-format
msgid "libgcrypt has not the expected version (version %s is required).\n"
msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
-#: src/util/disk.c:1150
+#: src/util/disk.c:1184
#, c-format
msgid "Expected `%s' to be a directory!\n"
msgstr "“%s”应为目录！\n"
-#: src/util/disk.c:1507 src/util/service.c:1674
+#: src/util/disk.c:1546 src/util/service.c:1318
#, c-format
msgid "Cannot obtain information about user `%s': %s\n"
msgstr "无法获取有关用户“%s”的信息：%s\n"
-#: src/util/disk.c:1954
-#, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
-msgstr ""
-
-#: src/util/getopt.c:570
+#: src/util/getopt.c:568
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s：选项“%s”有歧义\n"
-#: src/util/getopt.c:594
+#: src/util/getopt.c:592
#, c-format
msgid "%s: option `--%s' does not allow an argument\n"
msgstr "%s：选项“--%s”不允许有参数\n"
-#: src/util/getopt.c:599
+#: src/util/getopt.c:597
#, c-format
msgid "%s: option `%c%s' does not allow an argument\n"
msgstr "%s：选项“%c%s”不允许有参数\n"
-#: src/util/getopt.c:616 src/util/getopt.c:783
+#: src/util/getopt.c:614 src/util/getopt.c:781
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s：选项“%s”要求有一个参数\n"
-#: src/util/getopt.c:645
+#: src/util/getopt.c:643
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s：无法识别的选项“--%s”\n"
-#: src/util/getopt.c:649
+#: src/util/getopt.c:647
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s：无法识别的选项“%c%s”\n"
-#: src/util/getopt.c:674
+#: src/util/getopt.c:672
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s：非法选项 -- %c\n"
-#: src/util/getopt.c:676
+#: src/util/getopt.c:674
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s：无效选项 -- %c\n"
-#: src/util/getopt.c:704 src/util/getopt.c:831
+#: src/util/getopt.c:702 src/util/getopt.c:829
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s：选项要求有一个参数 -- %c\n"
-#: src/util/getopt.c:752
+#: src/util/getopt.c:750
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s：选项“-W %s”有歧义\n"
-#: src/util/getopt.c:770
+#: src/util/getopt.c:768
#, c-format
msgid "%s: option `-W %s' does not allow an argument\n"
msgstr "%s：选项“-W %s” 不允许有参数\n"
-#: src/util/getopt.c:935
+#: src/util/getopt.c:933
#, fuzzy, c-format
msgid "Use %s to get a list of options.\n"
msgstr "请使用 --help 获取选项列表。\n"
-#: src/util/getopt_helpers.c:86
+#: src/util/getopt_helpers.c:84
#, c-format
msgid ""
"Arguments mandatory for long options are also mandatory for short options.\n"
msgstr "长选项的必选参数对短选项也是必选的。\n"
-#: src/util/getopt_helpers.c:270 src/util/getopt_helpers.c:328
+#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
#, c-format
msgid "You must pass a number to the `%s' option.\n"
msgstr "您必须向“%s”选项传递一个数字。\n"
-#: src/util/getopt_helpers.c:300
+#: src/util/getopt_helpers.c:298
#, fuzzy, c-format
msgid "You must pass relative time to the `%s' option.\n"
msgstr "您必须向“%s”选项传递一个数字。\n"
msgid "Manipulate GNUnet configuration files"
msgstr "更改配置文件中的一个值"
-#: src/util/gnunet-ecc.c:60
+#: src/util/gnunet-ecc.c:75
#, fuzzy, c-format
msgid "Failed to open `%s': %s\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/util/gnunet-ecc.c:66
+#: src/util/gnunet-ecc.c:81
#, c-format
msgid "Generating %u keys, please wait"
msgstr ""
-#: src/util/gnunet-ecc.c:82
+#: src/util/gnunet-ecc.c:97
#, fuzzy, c-format
msgid ""
"\n"
"Failed to write to `%s': %s\n"
msgstr "运行 %s失败：%s %d\n"
-#: src/util/gnunet-ecc.c:92
+#: src/util/gnunet-ecc.c:107
#, c-format
msgid ""
"\n"
"Finished!\n"
msgstr ""
-#: src/util/gnunet-ecc.c:95
+#: src/util/gnunet-ecc.c:110
#, c-format
msgid ""
"\n"
"Error, %u keys not generated\n"
msgstr ""
-#: src/util/gnunet-ecc.c:118
+#: src/util/gnunet-ecc.c:199
#, c-format
+msgid "Hostkeys file `%s' not found\n"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:210
+#, fuzzy, c-format
+msgid "Hostkeys file `%s' is empty\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/util/gnunet-ecc.c:232
+#, fuzzy, c-format
+msgid "Could not read hostkey file: %s\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/util/gnunet-ecc.c:283
msgid "No hostkey file specified on command line\n"
msgstr ""
-#: src/util/gnunet-ecc.c:163
+#: src/util/gnunet-ecc.c:349
+msgid "list keys included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:352
+msgid "number of keys to list included in a file (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:355
msgid "create COUNT public-private key pairs (for testing)"
msgstr ""
-#: src/util/gnunet-ecc.c:166
+#: src/util/gnunet-ecc.c:358
msgid "print the public key in ASCII format"
msgstr ""
-#: src/util/gnunet-ecc.c:169
+#: src/util/gnunet-ecc.c:361
msgid "print the hash of the public key in ASCII format"
msgstr ""
-#: src/util/gnunet-ecc.c:180
+#: src/util/gnunet-ecc.c:364
+msgid "print examples of ECC operations (used for compatibility testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:375
#, fuzzy
msgid "Manipulate GNUnet private ECC key files"
msgstr "更改配置文件中的一个值"
msgid "Use build-in GNUnet stub resolver"
msgstr ""
-#: src/util/gnunet-service-resolver.c:288
+#: 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"
-#: src/util/gnunet-service-resolver.c:358
-#: src/util/gnunet-service-resolver.c:399
+#: 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"
-#: src/util/gnunet-uri.c:90
+#: src/util/gnunet-uri.c:84
#, c-format
msgid "No URI specified on command line\n"
msgstr ""
-#: src/util/gnunet-uri.c:95
+#: src/util/gnunet-uri.c:89
#, fuzzy, c-format
msgid "Invalid URI: does not start with `%s'\n"
msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
-#: src/util/gnunet-uri.c:102
+#: src/util/gnunet-uri.c:96
#, c-format
msgid "Invalid URI: fails to specify subsystem\n"
msgstr ""
-#: src/util/gnunet-uri.c:112
+#: src/util/gnunet-uri.c:106
#, c-format
msgid "No handler known for subsystem `%s'\n"
msgstr ""
-#: src/util/gnunet-uri.c:174
+#: src/util/gnunet-uri.c:168
msgid "Perform default-actions for GNUnet URIs"
msgstr ""
-#: src/util/helper.c:330
+#: src/util/helper.c:338
#, fuzzy, c-format
msgid "Error reading from `%s': %s\n"
msgstr "创建用户出错"
-#: src/util/helper.c:375
+#: src/util/helper.c:383
#, fuzzy, c-format
msgid "Failed to parse inbound message from helper `%s'\n"
msgstr "打开日志文件“%s”失败：%s\n"
-#: src/util/helper.c:572
+#: src/util/helper.c:609
#, fuzzy, c-format
msgid "Error writing to `%s': %s\n"
msgstr "创建用户出错"
-#: src/util/network.c:132
+#: src/util/network.c:134
#, c-format
msgid "Unable to shorten unix path `%s' while keeping name unique\n"
msgstr ""
-#: src/util/network.c:1370
+#: 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"
msgstr ""
-#: src/util/os_installation.c:423
+#: src/util/os_installation.c:421
#, fuzzy, c-format
msgid ""
"Could not determine installation path for %s. Set `%s' environment "
"variable.\n"
msgstr "无法确定安装路径。请尝试设置“%s”\n"
-#: src/util/os_installation.c:709
+#: src/util/os_installation.c:766
#, fuzzy, c-format
msgid "Could not find binary `%s' in PATH!\n"
msgstr "找不到主机“%s”的 IP：%s\n"
-#: src/util/os_installation.c:769
+#: src/util/os_installation.c:826
#, fuzzy, c-format
msgid "CreateProcess failed for binary %s (%d).\n"
msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-#: src/util/os_installation.c:779
+#: src/util/os_installation.c:836
#, c-format
msgid "GetExitCodeProcess failed for binary %s (%d).\n"
msgstr ""
-#: src/util/plugin.c:89
+#: src/util/plugin.c:87
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "插件机构初始化失败：%s！\n"
-#: src/util/plugin.c:146
+#: src/util/plugin.c:148
#, c-format
msgid "`%s' failed to resolve method '%s' with error: %s\n"
msgstr ""
-#: src/util/plugin.c:219
+#: src/util/plugin.c:223
#, c-format
msgid "`%s' failed for library `%s' with error: %s\n"
msgstr ""
-#: src/util/plugin.c:349
+#: src/util/plugin.c:382
#, fuzzy
msgid "Could not determine plugin installation path.\n"
msgstr "无法确定用户界面定义文件。"
-#: src/util/program.c:254 src/util/service.c:1796
+#: src/util/program.c:246 src/util/service.c:1452
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/util/program.c:258 src/util/service.c:1467
#, fuzzy, c-format
msgid "Could not access configuration file `%s'\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/util/program.c:263 src/util/service.c:1462
+#, fuzzy
+msgid "Malformed configuration, exit ...\n"
+msgstr "解析配置文件“%s”失败\n"
+
#: src/util/resolver_api.c:198
#, c-format
msgid "Must specify `%s' for `%s' in configuration!\n"
msgstr ""
-#: src/util/resolver_api.c:217
+#: src/util/resolver_api.c:216
#, c-format
msgid ""
"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
msgstr ""
-#: src/util/resolver_api.c:343
+#: src/util/resolver_api.c:348
#, fuzzy, c-format
msgid "Timeout trying to resolve IP address `%s'.\n"
msgstr "GNUnet 现在使用 IP 地址 %s。\n"
-#: src/util/resolver_api.c:347
+#: src/util/resolver_api.c:352
#, c-format
msgid "Timeout trying to resolve hostname `%s'.\n"
msgstr ""
-#: src/util/resolver_api.c:886
+#: src/util/resolver_api.c:908
#, fuzzy, c-format
msgid "Could not resolve our FQDN : %s\n"
msgstr "无法解析“%s”(%s)：%s\n"
-#: src/util/scheduler.c:802
+#: src/util/scheduler.c:813
msgid "Looks like we're busy waiting...\n"
msgstr ""
-#: src/util/scheduler.c:933
+#: src/util/scheduler.c:948
#, c-format
msgid "Attempt to cancel dead task %llu!\n"
msgstr ""
-#: src/util/server.c:482
+#: src/util/server.c:484
#, fuzzy, c-format
msgid "`%s' failed for port %d (%s).\n"
msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-#: src/util/server.c:491
+#: src/util/server.c:493
#, c-format
msgid "`%s' failed for port %d (%s): address already in use\n"
msgstr ""
-#: src/util/server.c:502
+#: src/util/server.c:499
#, fuzzy, c-format
-msgid "`%s' failed for `%.*s': address already in use\n"
+msgid "`%s' failed for `%s': address already in use\n"
msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-#: src/util/server.c:894
+#: src/util/server.c:892
#, c-format
msgid ""
"Processing code for message of type %u did not call "
"`GNUNET_SERVER_receive_done' after %s\n"
msgstr ""
-#: src/util/service.c:151 src/util/service.c:177 src/util/service.c:220
-#: src/util/service.c:241 src/util/service.c:248
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "IP 格式无效：“%s”\n"
-
-#: src/util/service.c:204
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
-
-#: src/util/service.c:297
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
-
-#: src/util/service.c:329
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "网络掩码的格式“%s”错误\n"
-
-#: src/util/service.c:359
-#, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "网络的格式“%s”错误\n"
-
-#: src/util/service.c:716
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
-msgstr ""
-
-#: src/util/service.c:721
+#: src/util/service.c:347
#, c-format
msgid "Unknown address family %d\n"
msgstr ""
-#: src/util/service.c:728
+#: src/util/service.c:354
#, c-format
msgid "Access from `%s' denied to service `%s'\n"
msgstr ""
-#: src/util/service.c:783
+#: src/util/service.c:409
#, c-format
msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
msgstr ""
-#: src/util/service.c:820
+#: src/util/service.c:446
#, c-format
msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
msgstr ""
-#: src/util/service.c:938
+#: src/util/service.c:563
#, c-format
msgid ""
"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
msgstr ""
-#: src/util/service.c:1016
+#: src/util/service.c:653
#, c-format
msgid ""
"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
"domain socket: %s\n"
msgstr ""
-#: src/util/service.c:1033
+#: src/util/service.c:669
#, c-format
msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
msgstr ""
-#: src/util/service.c:1267
+#: src/util/service.c:903
msgid "Could not access a pre-bound socket, will try to bind myself\n"
msgstr ""
-#: src/util/service.c:1316 src/util/service.c:1334
+#: src/util/service.c:952 src/util/service.c:970
#, c-format
msgid "Specified value for `%s' of service `%s' is invalid\n"
msgstr ""
-#: src/util/service.c:1359
+#: src/util/service.c:995
#, c-format
msgid "Could not access pre-bound socket %u, will try to bind myself\n"
msgstr ""
-#: src/util/service.c:1530
+#: src/util/service.c:1165
#, fuzzy, c-format
msgid "Failed to start `%s' at `%s'\n"
msgstr "运行 %s失败：%s %d\n"
-#: src/util/service.c:1563
+#: src/util/service.c:1207
#, c-format
msgid "Service `%s' runs at %s\n"
msgstr ""
-#: src/util/service.c:1612
+#: src/util/service.c:1256
msgid "Service process failed to initialize\n"
msgstr ""
-#: src/util/service.c:1616
+#: src/util/service.c:1260
msgid "Service process could not initialize server function\n"
msgstr ""
-#: src/util/service.c:1620
+#: src/util/service.c:1264
msgid "Service process failed to report status\n"
msgstr ""
-#: src/util/service.c:1675
+#: src/util/service.c:1319
msgid "No such user"
msgstr "无此用户"
-#: src/util/service.c:1688
+#: src/util/service.c:1332
#, c-format
msgid "Cannot change user/group to `%s': %s\n"
msgstr "无法更改用户/组为“%s”：%s\n"
-#: src/util/service.c:1754
+#: src/util/service.c:1402
msgid "do daemonize (detach from terminal)"
msgstr ""
-#: src/util/signal.c:80
+#: src/util/signal.c:89
#, c-format
msgid "signal (%d, %p) returned %d.\n"
msgstr ""
-#: src/util/strings.c:146
+#: src/util/strings.c:145
msgid "b"
msgstr "b"
-#: src/util/strings.c:429
+#: src/util/strings.c:433
#, c-format
msgid "Character sets requested were `%s'->`%s'\n"
msgstr ""
-#: src/util/strings.c:544
+#: src/util/strings.c:561
msgid "Failed to expand `$HOME': environment variable `HOME' not set"
msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
-#: src/util/strings.c:641
+#: src/util/strings.c:658
msgid "µs"
msgstr ""
-#: src/util/strings.c:645
+#: src/util/strings.c:662
msgid "forever"
msgstr ""
-#: src/util/strings.c:647
+#: src/util/strings.c:664
msgid "0 ms"
msgstr ""
-#: src/util/strings.c:653
+#: src/util/strings.c:670
msgid "ms"
msgstr "毫秒"
-#: src/util/strings.c:659
+#: src/util/strings.c:676
msgid "s"
msgstr "秒"
-#: src/util/strings.c:665
+#: src/util/strings.c:682
msgid "m"
msgstr "分"
-#: src/util/strings.c:671
+#: src/util/strings.c:688
msgid "h"
msgstr "时"
-#: src/util/strings.c:678
+#: src/util/strings.c:695
#, fuzzy
msgid "day"
msgstr " 天"
-#: src/util/strings.c:680
+#: src/util/strings.c:697
#, fuzzy
msgid "days"
msgstr " 天"
-#: src/util/strings.c:708
+#: src/util/strings.c:726
msgid "end of time"
msgstr ""
-#: src/util/strings.c:1109
+#: src/util/strings.c:1159
msgid "IPv6 address did not start with `['\n"
msgstr ""
-#: src/util/strings.c:1117
+#: src/util/strings.c:1167
msgid "IPv6 address did contain ':' to separate port number\n"
msgstr ""
-#: src/util/strings.c:1123
+#: src/util/strings.c:1173
msgid "IPv6 address did contain ']' before ':' to separate port number\n"
msgstr ""
-#: src/util/strings.c:1130
+#: src/util/strings.c:1180
msgid "IPv6 address did contain a valid port number after the last ':'\n"
msgstr ""
-#: src/util/strings.c:1139
+#: src/util/strings.c:1189
#, fuzzy, c-format
msgid "Invalid IPv6 address `%s': %s\n"
msgstr "无效的进程优先级“%s”\n"
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1128
-msgid "# Active tunnels"
+#: src/util/strings.c:1395 src/util/strings.c:1411
+msgid "Port not in range\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:622 src/vpn/gnunet-service-vpn.c:661
-#, fuzzy
-msgid "# peers connected to mesh tunnels"
+#: src/util/strings.c:1420
+#, fuzzy, c-format
+msgid "Malformed port policy `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
+#: src/util/strings.c:1603
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/util/strings.c:1560
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
+
+#: src/util/strings.c:1612
+#, fuzzy, c-format
+msgid "Invalid format: `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/util/strings.c:1664
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
+
+#: src/util/strings.c:1714
+#, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "网络掩码的格式“%s”错误\n"
+
+#: src/util/strings.c:1745
+#, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "网络的格式“%s”错误\n"
+
+#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
+msgid "# Active channels"
msgstr ""
-"\n"
-"按任意键继续\n"
-#: src/vpn/gnunet-service-vpn.c:712
+#: src/vpn/gnunet-service-vpn.c:642
msgid "# Bytes given to mesh for transmission"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:750
+#: src/vpn/gnunet-service-vpn.c:680
msgid "# Bytes dropped in mesh queue (overflow)"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:814
-msgid "# Mesh tunnels created"
+#: src/vpn/gnunet-service-vpn.c:753
+#, fuzzy
+msgid "# Mesh channels created"
msgstr ""
+"\n"
+"按任意键继续\n"
-#: src/vpn/gnunet-service-vpn.c:839
+#: src/vpn/gnunet-service-vpn.c:784
#, fuzzy
-msgid "Failed to setup mesh tunnel!\n"
+msgid "Failed to setup mesh channel!\n"
msgstr "发送消息失败。\n"
-#: src/vpn/gnunet-service-vpn.c:1032
+#: src/vpn/gnunet-service-vpn.c:978
#, c-format
msgid "Protocol %u not supported, dropping\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1348
+#: src/vpn/gnunet-service-vpn.c:1305
msgid "# ICMPv4 packets dropped (not allowed)"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1369
+#: src/vpn/gnunet-service-vpn.c:1326
msgid "# ICMPv6 packets dropped (not allowed)"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1574
+#: src/vpn/gnunet-service-vpn.c:1531
msgid "# Packets received from TUN interface"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1653
+#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
#, c-format
msgid "Packet received for unmapped destination `%s' (dropping it)\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1663
+#: src/vpn/gnunet-service-vpn.c:1610
msgid "Received IPv4 packet with options (dropping it)\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1677
+#: src/vpn/gnunet-service-vpn.c:1624
#, c-format
msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1759
+#: src/vpn/gnunet-service-vpn.c:1706
msgid "# ICMP packets received from mesh"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2098
+#: src/vpn/gnunet-service-vpn.c:2045
msgid "# UDP packets received from mesh"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2253
+#: src/vpn/gnunet-service-vpn.c:2200
msgid "# TCP packets received from mesh"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2404
+#: src/vpn/gnunet-service-vpn.c:2351
msgid "Failed to find unallocated IPv4 address in VPN's range\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2459
+#: src/vpn/gnunet-service-vpn.c:2406
msgid "Failed to find unallocated IPv6 address in VPN's range\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2498 src/vpn/gnunet-service-vpn.c:2711
+#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
msgid "# Active destinations"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2784
+#: src/vpn/gnunet-service-vpn.c:2715
msgid "Failed to allocate IP address for new destination\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3112
+#: src/vpn/gnunet-service-vpn.c:2982
#, fuzzy
msgid "Must specify valid IPv6 address"
msgstr "“%s”不可用。\n"
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3006
msgid "Must specify valid IPv6 mask"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3141
+#: src/vpn/gnunet-service-vpn.c:3014
msgid "IPv6 support disabled as this system does not support IPv6\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3153
+#: src/vpn/gnunet-service-vpn.c:3027
#, fuzzy
msgid "Must specify valid IPv4 address"
msgstr "“%s”不可用。\n"
-#: src/vpn/gnunet-service-vpn.c:3164
+#: src/vpn/gnunet-service-vpn.c:3040
msgid "Must specify valid IPv4 mask"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3173
+#: src/vpn/gnunet-service-vpn.c:3050
msgid "IPv4 support disabled as this system does not support IPv4\n"
msgstr ""
-#: src/vpn/gnunet-vpn.c:151
+#: src/vpn/gnunet-vpn.c:147
#, fuzzy
msgid "Error creating tunnel\n"
msgstr "创建用户出错"
-#: src/vpn/gnunet-vpn.c:194 src/vpn/gnunet-vpn.c:225
+#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
#, c-format
msgid "Option `%s' makes no sense with option `%s'.\n"
msgstr ""
-#: src/vpn/gnunet-vpn.c:207
+#: src/vpn/gnunet-vpn.c:203
#, fuzzy, c-format
msgid "Option `%s' or `%s' is required.\n"
msgstr "%s：选项“%s”有歧义\n"
-#: src/vpn/gnunet-vpn.c:219
+#: src/vpn/gnunet-vpn.c:215
#, c-format
msgid "Option `%s' or `%s' is required when using option `%s'.\n"
msgstr ""
-#: src/vpn/gnunet-vpn.c:237
+#: src/vpn/gnunet-vpn.c:235
#, fuzzy, c-format
msgid "`%s' is not a valid peer identifier.\n"
msgstr "“%s”不可用。\n"
-#: src/vpn/gnunet-vpn.c:259
+#: src/vpn/gnunet-vpn.c:255
#, fuzzy, c-format
msgid "`%s' is not a valid IP address.\n"
msgstr "“%s”不可用。\n"
-#: src/vpn/gnunet-vpn.c:295
+#: src/vpn/gnunet-vpn.c:290
msgid "request that result should be an IPv4 address"
msgstr ""
-#: src/vpn/gnunet-vpn.c:298
+#: src/vpn/gnunet-vpn.c:293
msgid "request that result should be an IPv6 address"
msgstr ""
-#: src/vpn/gnunet-vpn.c:301
-msgid "print IP address only after mesh tunnel has been created"
-msgstr ""
-
-#: src/vpn/gnunet-vpn.c:304
+#: src/vpn/gnunet-vpn.c:296
msgid "how long should the mapping be valid for new tunnels?"
msgstr ""
-#: src/vpn/gnunet-vpn.c:307
+#: src/vpn/gnunet-vpn.c:299
msgid "destination IP for the tunnel"
msgstr ""
-#: src/vpn/gnunet-vpn.c:310
+#: src/vpn/gnunet-vpn.c:302
msgid "peer offering the service we would like to access"
msgstr ""
-#: src/vpn/gnunet-vpn.c:313
+#: src/vpn/gnunet-vpn.c:305
msgid "name of the service we would like to access"
msgstr ""
-#: src/vpn/gnunet-vpn.c:316
+#: src/vpn/gnunet-vpn.c:308
msgid "service is offered via TCP"
msgstr ""
-#: src/vpn/gnunet-vpn.c:319
+#: src/vpn/gnunet-vpn.c:311
msgid "service is offered via UDP"
msgstr ""
-#: src/vpn/gnunet-vpn.c:331
+#: src/vpn/gnunet-vpn.c:323
msgid "Setup tunnels via VPN."
msgstr ""
-#: src/include/gnunet_common.h:618 src/include/gnunet_common.h:625
-#: src/include/gnunet_common.h:633
+#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
+#: src/include/gnunet_common.h:581
#, c-format
msgid "Assertion failed at %s:%d.\n"
msgstr ""
-#: src/include/gnunet_common.h:645
+#: src/include/gnunet_common.h:593
#, c-format
msgid "External protocol violation detected at %s:%d.\n"
msgstr ""
-#: src/include/gnunet_common.h:672 src/include/gnunet_common.h:681
+#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
#, c-format
msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
msgstr ""
+#, fuzzy
+#~ msgid "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 "Failed to parse HELLO in file `%s': %s %u \n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Internal error %d\n"
+#~ msgstr "未知错误。\n"
+
+#, fuzzy
+#~ msgid "Aborting call to `%s'\n"
+#~ msgstr "创建用户出错"
+
+#, fuzzy
+#~ msgid "You are already in a conversation with `%s'.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s service is lacking key configuration settings (%s). Using default "
+#~ "(%u).\n"
+#~ msgstr "立即保存配置？"
+
+#, fuzzy
+#~ msgid "Loading block plugin `%s'\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
+
+#, fuzzy
+#~ msgid "Invalid value `%s'\n"
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "Found issuer for public key `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "No issuer for public key `%s'\n"
+#~ msgstr "运行 %s失败：%s %d\n"
+
+#, fuzzy
+#~ msgid "Failed to get slave counters!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not translate E[a%d] to MPI!\n"
+#~ "%s/%s\n"
+#~ msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
+
+#, fuzzy
+#~ msgid "Error while decoding key %u\n"
+#~ msgstr "解析 dscl 输出时出错。\n"
+
#, fuzzy
#~ msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
#~ msgstr "打开日志文件“%s”失败：%s\n"
#~ msgid "Transport service is unable to access hostkey. Exiting.\n"
#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#, fuzzy
-#~ msgid "Failed to read private key for namespace `%s'\n"
-#~ msgstr "发送消息失败。\n"
-
-#, fuzzy
-#~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
-#~ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
#, fuzzy
#~ msgid "Failed to create namespace `%s' (illegal filename?)\n"
#~ msgstr "发送消息失败。\n"
#~ msgid "`%s' failed for drive `%S': %u\n"
#~ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-#, fuzzy
-#~ msgid "Service `%s' has been stopped.\n"
-#~ msgstr "服务已删除。\n"
-
#, fuzzy
#~ msgid "Service `%s' was already running.\n"
#~ msgstr "服务已删除。\n"
#~ msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
#~ msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-#, fuzzy
-#~ msgid ""
-#~ "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-#~ msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-
#, fuzzy
#~ msgid "Failed to read hostkey: %s\n"
#~ msgstr "运行 %s失败：%s %d\n"
#~ msgid "Failed to serialize meta data"
#~ msgstr "发送消息失败。\n"
-#, fuzzy
-#~ msgid "Failed to connect to datastore service"
-#~ msgstr "初始化“%s”服务失败。\n"
-
#, fuzzy
#~ msgid "Failed to parse URI `%s' from KBlock!\n"
#~ msgstr "运行 %s失败：%s %d\n"
#~ 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"
#~ msgid "User `%s' is currently not in the room!\n"
#~ msgstr "用户“%s”当前不在房间里！\n"
-#, fuzzy
-#~ msgid "Unknown command `%s'\n"
-#~ msgstr "未知的命令“%s”。\n"
-
#~ msgid "set the chat room to join"
#~ msgstr "设置要加入的聊天室"
#~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
#~ msgstr "初始化“%s”服务失败。\n"
-#, fuzzy
-#~ msgid "Failed to create pipe for `ssh' process.\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
#, fuzzy
#~ msgid "Could not start `%s' process to create hostkey.\n"
#~ msgstr "初始化“%s”服务失败。\n"
-#, fuzzy
-#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
#, fuzzy
#~ msgid "Failed to start `ssh' process.\n"
#~ msgstr "初始化“%s”服务失败。\n"
#~ msgid "Failed to write new configuration to disk."
#~ msgstr "保存配置失败。"
-#, fuzzy
-#~ msgid "Could not start `%s' process to copy configuration file.\n"
-#~ msgstr "找不到主机“%s”的 IP：%s\n"
-
#, fuzzy
#~ msgid "Failed to copy new configuration to remote machine."
#~ msgstr "保存配置失败。"
#~ msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
#~ msgstr "配置不满足配置规范文件“%s”的约束！\n"
-#, fuzzy
-#~ msgid "Could not read hostkeys file `%s'!\n"
-#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
#, fuzzy
#~ msgid "Could not create configuration for peer number %u on `%s'!\n"
#~ msgstr "解析配置文件“%s”失败\n"
#~ msgid "access (%s, X_OK) failed: %s\n"
#~ msgstr "“%s”说：%s\n"
-#, fuzzy
-#~ msgid "stat (%s) failed: %s\n"
-#~ msgstr "“%s”说：%s\n"
-
#, fuzzy
#~ msgid "# Peers connected"
#~ msgstr ""
#~ msgid "Invalid input, expecting integer."
#~ msgstr "无效输入，应为整数。"
-#~ msgid "Value is not in legal range."
-#~ msgstr "值不在合法范围内。"
-
#~ msgid "Configuration unchanged, no need to save.\n"
#~ msgstr "配置未更改，无须保存。\n"
#~ msgid "Too many arguments.\n"
#~ msgstr "参数过多。\n"
-#~ msgid "No interface specified, using default.\n"
-#~ msgstr "没有指定接口，将使用默认。\n"
-
#~ msgid "Configuration file `%s' must be a filename (but is a directory).\n"
#~ msgstr "配置文件“%s”必须是一个文件名(但是一个目录)。\n"
#~ msgid "Error establishing connection with gnunetd.\n"
#~ msgstr "通过 gnunetd 建立连接失败。\n"
-#~ msgid "You must specify a receiver!\n"
-#~ msgstr "您必须指定一个接收方！\n"
-
#~ msgid "Time:\n"
#~ msgstr "时间：\n"
projects / oweals / gnunet.git / blobdiff