aboutsummaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po4469
1 files changed, 2701 insertions, 1768 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b50a113..682edb2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet-0.8.1\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-06-05 15:47+0200\n"
+"POT-Creation-Date: 2013-02-05 19:22+0100\n"
"PO-Revision-Date: 2011-07-09 12:12+0800\n"
"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -16,264 +16,213 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/arm/arm_api.c:165
+#: src/arm/arm_api.c:162
msgid "Failed to transmit shutdown request to client.\n"
msgstr ""
-#: src/arm/arm_api.c:349
-#, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
-msgstr "配置不满足配置规范文件“%s”的约束!\n"
-
-#: src/arm/arm_api.c:363
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "配置不满足配置规范文件“%s”的约束!\n"
-
-#: src/arm/arm_api.c:432
-#, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
-msgstr ""
-
-#: src/arm/arm_api.c:485
-#, c-format
-msgid "Requesting start of service `%s'.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:486
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:507
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:508
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:540
-#, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr ""
-
-#: src/arm/arm_api.c:612
-#, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:159
+#: src/arm/gnunet-arm.c:166
#, fuzzy, c-format
msgid "Service `%s' is unknown to ARM.\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:171
#, fuzzy, c-format
msgid "Service `%s' has been stopped.\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:167
+#: src/arm/gnunet-arm.c:174
#, fuzzy, c-format
msgid "Service `%s' was already running.\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:172
+#: src/arm/gnunet-arm.c:179
#, fuzzy, c-format
msgid "Service `%s' has been started.\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:175
+#: src/arm/gnunet-arm.c:182
#, fuzzy, c-format
msgid "Service `%s' was already being stopped.\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:179
+#: src/arm/gnunet-arm.c:186
#, fuzzy, c-format
msgid "Service `%s' was already not running.\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:183
+#: src/arm/gnunet-arm.c:190
msgid "Request ignored as ARM is shutting down.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:187
+#: src/arm/gnunet-arm.c:194
msgid "Error communicating with ARM service.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:191
+#: src/arm/gnunet-arm.c:198
msgid "Timeout communicating with ARM service.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:195
+#: src/arm/gnunet-arm.c:202
msgid "Operation failed.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:199
+#: src/arm/gnunet-arm.c:206
msgid "Unknown response code from ARM.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:222
+#: src/arm/gnunet-arm.c:229
#, fuzzy
msgid "Error communicating with ARM. ARM not running?\n"
msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
-#: src/arm/gnunet-arm.c:225
+#: src/arm/gnunet-arm.c:232
msgid "Running services:\n"
msgstr ""
-#: src/arm/gnunet-arm.c:249
-#, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
-msgid "Fatal error initializing ARM API.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:280
+#: src/arm/gnunet-arm.c:253
#, fuzzy, c-format
msgid "Failed to remove configuration file %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-arm.c:286
+#: src/arm/gnunet-arm.c:259
#, c-format
msgid "Failed to remove servicehome directory %s\n"
msgstr ""
-#: src/arm/gnunet-arm.c:407
+#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:407 src/arm/gnunet-arm.c:424
+msgid "Fatal error initializing ARM API.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:453
#, fuzzy
msgid "stop all GNUnet services"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-arm.c:409
+#: src/arm/gnunet-arm.c:455
msgid "start a particular service"
msgstr ""
-#: src/arm/gnunet-arm.c:411
+#: src/arm/gnunet-arm.c:457
msgid "stop a particular service"
msgstr ""
-#: src/arm/gnunet-arm.c:413
+#: src/arm/gnunet-arm.c:459
#, fuzzy
msgid "start all GNUnet default services"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-arm.c:416
+#: src/arm/gnunet-arm.c:462
#, fuzzy
msgid "stop and start all GNUnet default services"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:465
msgid "delete config file and directory on exit"
msgstr ""
-#: src/arm/gnunet-arm.c:421
+#: src/arm/gnunet-arm.c:467
msgid "don't print status messages"
msgstr ""
-#: src/arm/gnunet-arm.c:424
+#: src/arm/gnunet-arm.c:470
#, fuzzy
-msgid "timeout for completing current operation"
+msgid "timeout in MSECS milliseconds for completing current operation"
msgstr "等待一次迭代完成的时间(毫秒)"
-#: src/arm/gnunet-arm.c:426
-msgid "List currently running services"
+#: src/arm/gnunet-arm.c:472
+msgid "list currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:474
+msgid "don't let gnunet-service-arm inherit standard output"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:476
+msgid "don't let gnunet-service-arm inherit standard error"
msgstr ""
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:487
msgid "Control services and the Automated Restart Manager (ARM)"
msgstr ""
-#: src/arm/gnunet-service-arm.c:332
+#: src/arm/gnunet-service-arm.c:345
#, fuzzy, c-format
msgid "Failed to start service `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-service-arm.c:335
+#: src/arm/gnunet-service-arm.c:348
#, c-format
msgid "Starting service `%s'\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:361
+#: src/arm/gnunet-service-arm.c:374
msgid "Could not send status result to client\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:393
+#: src/arm/gnunet-service-arm.c:406
#, fuzzy
msgid "Could not send list result to client\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/arm/gnunet-service-arm.c:523
+#: src/arm/gnunet-service-arm.c:537
#, fuzzy, c-format
msgid "Unable to create socket for service `%s': %s\n"
msgstr "无法创建用户账户:"
-#: src/arm/gnunet-service-arm.c:545
+#: src/arm/gnunet-service-arm.c:559
#, c-format
msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:559
+#: src/arm/gnunet-service-arm.c:573
#, c-format
msgid "ARM now monitors connections to service `%s' at `%s'\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:667
+#: src/arm/gnunet-service-arm.c:681
#, c-format
msgid "Preparing to stop `%s'\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:878
+#: src/arm/gnunet-service-arm.c:892
#, c-format
msgid "Restarting service `%s'.\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:970
+#: src/arm/gnunet-service-arm.c:985
msgid "exit"
msgstr ""
-#: src/arm/gnunet-service-arm.c:975
+#: src/arm/gnunet-service-arm.c:990
msgid "signal"
msgstr ""
-#: src/arm/gnunet-service-arm.c:980
+#: src/arm/gnunet-service-arm.c:995
#, fuzzy
msgid "unknown"
msgstr "未知错误"
-#: src/arm/gnunet-service-arm.c:986
+#: src/arm/gnunet-service-arm.c:1001
#, fuzzy, c-format
-msgid "Service `%s' took %llu ms to terminate\n"
+msgid "Service `%s' took %s to terminate\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-service-arm.c:1021
+#: src/arm/gnunet-service-arm.c:1036
#, c-format
msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1127
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/arm/gnunet-service-arm.c:1129
-msgid "option missing"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1213
+#: src/arm/gnunet-service-arm.c:1228
#, fuzzy, c-format
msgid "Starting default services `%s'\n"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-service-arm.c:1224
+#: src/arm/gnunet-service-arm.c:1239
#, c-format
msgid "Default service `%s' not configured correctly!\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1238
+#: src/arm/gnunet-service-arm.c:1253
msgid ""
"No default services configured, GNUnet will not really start right now.\n"
msgstr ""
@@ -282,297 +231,262 @@ msgstr ""
msgid "Initiating shutdown as requested by client.\n"
msgstr ""
-#: src/block/block.c:105
-#, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/chat/chat.c:175
-msgid "Could not transmit confirmation receipt\n"
-msgstr ""
-
-#: src/chat/chat.c:283
-msgid "The current user must be the the first one joined\n"
-msgstr ""
-
-#: src/chat/chat.c:412
-#, fuzzy, c-format
-msgid "Unknown message type: '%u'\n"
-msgstr "未知操作“%s”。\n"
-
-#: src/chat/chat.c:472
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/chat/chat.c:480
-#, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/chat/chat.c:498
-#, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/chat/chat.c:559
-msgid "Could not serialize metadata\n"
-msgstr ""
-
-#: src/chat/chat.c:674
-#, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/chat/chat.c:680
-msgid "Undefined mandatory parameter: joinCallback\n"
-msgstr ""
-
-#: src/chat/chat.c:686
-msgid "Undefined mandatory parameter: messageCallback\n"
+#: src/ats/ats_api_performance.c:465
+#, c-format
+msgid "Received %s message\n"
msgstr ""
-#: src/chat/chat.c:692
-msgid "Undefined mandatory parameter: memberCallback\n"
+#: src/ats/ats_api_performance.c:508
+#, c-format
+msgid "Received last message for %s \n"
msgstr ""
-#: src/chat/gnunet-chat.c:93
-msgid "Joined\n"
+#: src/ats/gnunet-service-ats_addresses.c:993
+#: src/ats/gnunet-service-ats_addresses.c:1027
+#, c-format
+msgid ""
+"Could not load quota for network `%s': `%s', assigning default bandwidth "
+"%llu\n"
msgstr ""
-#: src/chat/gnunet-chat.c:125 src/chat/gnunet-chat.c:133
-#: src/chat/gnunet-chat.c:213 src/chat/gnunet-chat.c:253
-#: src/chat/gnunet-chat.c:329 src/chat/gnunet-chat.c:371
-#: src/chat/gnunet-chat.c:400 src/chat/gnunet-chat.c:700
-msgid "anonymous"
-msgstr "匿名"
-
-#: src/chat/gnunet-chat.c:144
-#, fuzzy, c-format
-msgid "(%s) `%s' said: %s\n"
-msgstr "“%s”说:%s\n"
-
-#: src/chat/gnunet-chat.c:147 src/chat/gnunet-chat.c:150
-#, fuzzy, c-format
-msgid "(%s) `%s' said to you: %s\n"
-msgstr "“%s”对您说:%s\n"
-
-#: src/chat/gnunet-chat.c:153
-#, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
-msgstr "“%s”对您说:%s\n"
-
-#: src/chat/gnunet-chat.c:156
-#, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "“%s”对您说:%s\n"
-
-#: src/chat/gnunet-chat.c:159
+#: src/ats/gnunet-service-ats_addresses.c:999
#, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
+msgid "Outbound quota configure for network `%s' is %llu\n"
msgstr ""
-#: src/chat/gnunet-chat.c:162
+#: src/ats/gnunet-service-ats_addresses.c:1006
#, c-format
-msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
msgstr ""
-#: src/chat/gnunet-chat.c:165
+#: src/ats/gnunet-service-ats_addresses.c:1033
#, c-format
-msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
+msgid "Inbound quota configured for network `%s' is %llu\n"
msgstr ""
-#: src/chat/gnunet-chat.c:170
+#: src/ats/gnunet-service-ats_addresses.c:1040
#, c-format
msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
msgstr ""
-#: src/chat/gnunet-chat.c:173
-#, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "“%s”对您说:%s\n"
-
-#: src/chat/gnunet-chat.c:176
+#: src/ats-tool/gnunet-ats.c:141
#, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
+msgid "%u address resolutions had a timeout\n"
msgstr ""
-#: src/chat/gnunet-chat.c:217
+#: src/ats-tool/gnunet-ats.c:143
#, c-format
-msgid "'%s' acknowledged message #%d\n"
+msgid "ATS returned results for %u addresses\n"
msgstr ""
-#: src/chat/gnunet-chat.c:260
-#, c-format
-msgid "`%s' entered the room\n"
-msgstr "“%s”进入了房间\n"
-
-#: src/chat/gnunet-chat.c:260
+#: src/ats-tool/gnunet-ats.c:199
#, c-format
-msgid "`%s' left the room\n"
-msgstr "“%s”离开了房间\n"
-
-#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
-#, fuzzy
-msgid "Could not change username\n"
-msgstr "已将用户名改为“%s”。\n"
+msgid ""
+"Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
+"s, %s\n"
+msgstr ""
-#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
+#: src/ats-tool/gnunet-ats.c:326
#, c-format
-msgid "Joining room `%s' as user `%s'...\n"
+msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
msgstr ""
-#: src/chat/gnunet-chat.c:373
+#: src/ats-tool/gnunet-ats.c:345 src/namestore/gnunet-namestore.c:610
+#: src/transport/gnunet-transport.c:813
#, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "已将用户名改为“%s”。\n"
-
-#: src/chat/gnunet-chat.c:388
-#, c-format
-msgid "Users in room `%s': "
-msgstr "房间“%s”中的用户:"
+msgid "Service `%s' is not running\n"
+msgstr "服务已删除。\n"
-#: src/chat/gnunet-chat.c:434
-msgid "Syntax: /msg USERNAME MESSAGE"
-msgstr "语法:/msg 用户名 消息"
+#: src/ats-tool/gnunet-ats.c:355 src/transport/gnunet-transport.c:819
+#, fuzzy, c-format
+msgid "Failed to parse peer identity `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
-#: src/chat/gnunet-chat.c:443
+#: src/ats-tool/gnunet-ats.c:363
#, c-format
-msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgid "Please select one operation : %s or %s or %s or %s or %s\n"
msgstr ""
-#: src/chat/gnunet-chat.c:460
-#, c-format
-msgid "User `%s' is currently not in the room!\n"
-msgstr "用户“%s”当前不在房间里!\n"
+#: src/ats-tool/gnunet-ats.c:379 src/ats-tool/gnunet-ats.c:398
+#: src/ats-tool/gnunet-ats.c:415 src/ats-tool/gnunet-ats.c:440
+#, fuzzy, c-format
+msgid "Cannot connect to ATS service, exiting...\n"
+msgstr "初始化“%s”服务失败。\n"
-#: src/chat/gnunet-chat.c:513
+#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:405
#, fuzzy, c-format
-msgid "Unknown command `%s'\n"
-msgstr "未知的命令“%s”。\n"
+msgid "Cannot issue request to ATS service, exiting...\n"
+msgstr "初始化“%s”服务失败。\n"
-#: src/chat/gnunet-chat.c:524
-msgid ""
-"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
-"leave the current room"
+#: src/ats-tool/gnunet-ats.c:433
+msgid "Type required\n"
msgstr ""
-#: src/chat/gnunet-chat.c:528
-msgid ""
-"Use `/nick nickname' to change your nickname. This will cause you to leave "
-"the current room and immediately rejoin it with the new name."
+#: src/ats-tool/gnunet-ats.c:490
+msgid "get list of active addresses currently used"
msgstr ""
-#: src/chat/gnunet-chat.c:532
-msgid ""
-"Use `/msg nickname message' to send a private message to the specified user"
+#: src/ats-tool/gnunet-ats.c:493
+msgid "get list of all active addresses"
msgstr ""
-#: src/chat/gnunet-chat.c:535
-msgid "The `/notice' command is an alias for `/msg'"
-msgstr ""
+#: src/ats-tool/gnunet-ats.c:496
+#, fuzzy
+msgid "do not resolve IP addresses to hostnames"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
-#: src/chat/gnunet-chat.c:537
-msgid "The `/query' command is an alias for `/msg'"
+#: src/ats-tool/gnunet-ats.c:499
+msgid "monitor mode"
msgstr ""
-#: src/chat/gnunet-chat.c:539
-msgid "Use `/sig message' to send a signed public message"
-msgstr ""
+#: src/ats-tool/gnunet-ats.c:502
+#, fuzzy
+msgid "set preference for the given peer"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
-#: src/chat/gnunet-chat.c:542
-msgid "Use `/ack message' to require signed acknowledgment of the message"
+#: src/ats-tool/gnunet-ats.c:505
+msgid "print all configured quotas"
msgstr ""
-#: src/chat/gnunet-chat.c:545
-msgid "Use `/anonymous message' to send a public anonymous message"
+#: src/ats-tool/gnunet-ats.c:508
+msgid "peer id"
msgstr ""
-#: src/chat/gnunet-chat.c:547
-msgid "The `/anon' command is an alias for `/anonymous'"
+#: src/ats-tool/gnunet-ats.c:511
+msgid "preference type to set: latency | bandwidth"
msgstr ""
-#: src/chat/gnunet-chat.c:549
-msgid "Use `/quit' to terminate gnunet-chat"
+#: src/ats-tool/gnunet-ats.c:514
+msgid "preference value"
msgstr ""
-#: src/chat/gnunet-chat.c:551
-msgid "The `/leave' command is an alias for `/quit'"
+#: src/ats-tool/gnunet-ats.c:517
+msgid "verbose output (include ATS address properties)"
msgstr ""
-#: src/chat/gnunet-chat.c:554
-msgid "Use `/names' to list all of the current members in the chat room"
-msgstr ""
+#: src/ats-tool/gnunet-ats.c:526
+#, fuzzy
+msgid "Print information about ATS state"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
-#: src/chat/gnunet-chat.c:556
-msgid "Use `/help command' to get help for a specific command"
-msgstr ""
+#: src/block/block.c:105
+#, fuzzy, c-format
+msgid "Loading block plugin `%s'\n"
+msgstr "打开日志文件“%s”失败:%s\n"
-#: src/chat/gnunet-chat.c:672
-msgid "You must specify a nickname\n"
-msgstr "您必须指定一个昵称\n"
+#: src/consensus/gnunet-consensus.c:317
+#, fuzzy
+msgid "number of peers in consensus"
+msgstr "迭代次数"
-#: src/chat/gnunet-chat.c:688
-#, c-format
-msgid "Failed to join room `%s'\n"
+#: src/consensus/gnunet-consensus.c:320
+msgid "how many peers receive one value?"
msgstr ""
-#: src/chat/gnunet-chat.c:727
-msgid "set the nickname to use (required)"
-msgstr "设置要使用的昵称(必须)"
-
-#: src/chat/gnunet-chat.c:730
-msgid "set the chat room to join"
-msgstr "设置要加入的聊天室"
+#: src/consensus/gnunet-consensus.c:323
+#, fuzzy
+msgid "number of values"
+msgstr "迭代次数"
-#: src/chat/gnunet-chat.c:742
-msgid "Join a chat on GNUnet."
+#: src/consensus/gnunet-consensus.c:326
+msgid "consensus timeout"
msgstr ""
-#: src/chat/gnunet-service-chat.c:267
+#: src/consensus/gnunet-consensus-ibf.c:176
#, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "保存配置失败。"
+msgid "number of element in set A-B"
+msgstr "迭代次数"
-#: src/chat/gnunet-service-chat.c:546
+#: src/consensus/gnunet-consensus-ibf.c:179
#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "保存配置失败。"
+msgid "number of element in set B-A"
+msgstr "迭代次数"
-#: src/chat/gnunet-service-chat.c:729
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "保存配置失败。"
+#: src/consensus/gnunet-consensus-ibf.c:182
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:185
+msgid "hash num"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:188
+msgid "ibf size"
+msgstr ""
-#: src/chat/gnunet-service-chat.c:907
+#: src/consensus/gnunet-consensus-start-peers.c:158
+msgid "start peers with the given template configuration"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-start-peers.c:161
#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "保存配置失败。"
+msgid "number of peers to start"
+msgstr "迭代次数"
-#: src/core/core_api.c:786
+#: src/core/core_api.c:755
msgid "Client was disconnected from core service, trying to reconnect.\n"
msgstr ""
-#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
+#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:214
#, c-format
msgid "Peer `%s'\n"
msgstr ""
-#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
+#: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
+#: src/transport/gnunet-transport.c:612 src/transport/gnunet-transport.c:636
+#, c-format
+msgid "%24s: %-17s %4s (%u connections in total)\n"
+msgstr ""
+
+#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:614
+#, fuzzy
+msgid "Connected to"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:638
+#, fuzzy
+msgid "Disconnected from"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:176
+#: src/peerinfo-tool/gnunet-peerinfo.c:541
#, fuzzy, c-format
msgid "Invalid command line argument `%s'\n"
msgstr "“%s”的参数无效。\n"
-#: src/core/gnunet-core.c:95
+#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:1005
+msgid "provide information about all current connections (continuously)"
+msgstr ""
+
+#: src/core/gnunet-core.c:222
msgid "Print information about connected peers."
msgstr ""
-#: src/core/gnunet-service-core.c:97
+#: src/core/gnunet-service-core.c:109
+#, fuzzy, c-format
+msgid "Failed to read hostkey: %s\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/core/gnunet-service-core.c:123
#, c-format
msgid "Core service of `%4s' ready.\n"
msgstr ""
+#: src/core/gnunet-service-core.c:149
+#, fuzzy
+msgid "Core service is lacking HOSTKEY configuration setting. Exiting.\n"
+msgstr "立即保存配置?"
+
+#: src/core/gnunet-service-core.c:163
+#: src/transport/gnunet-service-transport.c:737
+#, fuzzy
+msgid "Transport service is unable to access hostkey. Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
#: src/core/gnunet-service-core_clients.c:370
msgid "# send requests dropped (disconnected)"
msgstr ""
@@ -581,7 +495,7 @@ msgstr ""
msgid "# messages discarded (session disconnected)"
msgstr ""
-#: src/core/gnunet-service-core_clients.c:818
+#: src/core/gnunet-service-core_clients.c:518
#, c-format
msgid "# bytes of messages of type %u received"
msgstr ""
@@ -624,7 +538,7 @@ msgid "# SET_KEY messages decrypted"
msgstr ""
#: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:810
+#: src/transport/gnunet-service-transport_validation.c:865
msgid "# PING messages received"
msgstr ""
@@ -648,7 +562,7 @@ msgid "# keepalive messages sent"
msgstr ""
#: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1031
+#: src/transport/gnunet-service-transport_validation.c:1161
msgid "# PONG messages received"
msgstr ""
@@ -664,53 +578,44 @@ msgstr ""
msgid "# rekey operations confirmed via PONG"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1381
-#: src/core/gnunet-service-core_kx.c:1398
+#: src/core/gnunet-service-core_kx.c:1383
+#: src/core/gnunet-service-core_kx.c:1400
msgid "# SET_KEY and PING messages created"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1402
+#: src/core/gnunet-service-core_kx.c:1404
msgid "# REKEY operations performed"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1537
+#: src/core/gnunet-service-core_kx.c:1539
msgid "# failed to decrypt message (no session key)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1577
-#: src/core/gnunet-service-core_kx.c:1602
+#: src/core/gnunet-service-core_kx.c:1579
+#: src/core/gnunet-service-core_kx.c:1604
msgid "# bytes dropped (duplicates)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1589
+#: src/core/gnunet-service-core_kx.c:1591
msgid "# bytes dropped (out of sequence)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1626
+#: src/core/gnunet-service-core_kx.c:1628
#, c-format
-msgid "Message received far too old (%llu ms). Content ignored.\n"
+msgid "Message received far too old (%s). Content ignored.\n"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1630
+#: src/core/gnunet-service-core_kx.c:1632
msgid "# bytes dropped (ancient message)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1638
+#: src/core/gnunet-service-core_kx.c:1640
msgid "# bytes of payload decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1700
-#, fuzzy
-msgid "Core service is lacking HOSTKEY configuration setting. Exiting.\n"
-msgstr "立即保存配置?"
-
-#: src/core/gnunet-service-core_kx.c:1708
-msgid "Core service could not access hostkey. Exiting.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:1718 src/hostlist/hostlist-server.c:551
-#: src/peerinfo-tool/gnunet-peerinfo.c:823
-#: src/transport/gnunet-service-transport.c:611
+#: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
+#: src/peerinfo-tool/gnunet-peerinfo.c:547
+#: src/transport/gnunet-service-transport.c:644
msgid "Could not access PEERINFO service. Exiting.\n"
msgstr ""
@@ -727,23 +632,23 @@ msgstr ""
msgid "# encrypted bytes given to transport"
msgstr ""
-#: src/core/gnunet-service-core_neighbours.c:418
+#: src/core/gnunet-service-core_neighbours.c:421
#, c-format
msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
msgstr ""
#: src/core/gnunet-service-core_sessions.c:206
#: src/core/gnunet-service-core_sessions.c:269
-#: src/dht/gnunet-service-dht_neighbours.c:625
-#: src/dht/gnunet-service-dht_neighbours.c:683
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
-#: src/topology/gnunet-daemon-topology.c:709
-#: src/topology/gnunet-daemon-topology.c:810
-#: src/transport/gnunet-service-transport_neighbours.c:874
-#: src/transport/gnunet-service-transport_neighbours.c:1080
-#: src/transport/gnunet-service-transport_neighbours.c:1089
-#: src/transport/gnunet-service-transport_neighbours.c:2568
-#: src/transport/gnunet-service-transport_neighbours.c:2814
+#: src/dht/gnunet-service-dht_neighbours.c:645
+#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
+#: src/topology/gnunet-daemon-topology.c:704
+#: src/topology/gnunet-daemon-topology.c:805
+#: src/transport/gnunet-service-transport_neighbours.c:1052
+#: src/transport/gnunet-service-transport_neighbours.c:1276
+#: src/transport/gnunet-service-transport_neighbours.c:1285
+#: src/transport/gnunet-service-transport_neighbours.c:2826
+#: src/transport/gnunet-service-transport_neighbours.c:3089
msgid "# peers connected"
msgstr ""
@@ -764,38 +669,49 @@ msgstr ""
msgid "# updates to my type map"
msgstr ""
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:250
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:266
#: src/datastore/gnunet-service-datastore.c:834
msgid "# bytes stored"
msgstr ""
-#: src/datacache/datacache.c:141 src/datacache/datacache.c:148
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:268
+msgid "# items stored"
+msgstr ""
+
+#: src/datacache/datacache.c:143 src/datacache/datacache.c:150
#: src/datastore/gnunet-service-datastore.c:1483
#: src/datastore/gnunet-service-datastore.c:1494
#, c-format
msgid "No `%s' specified for `%s' in configuration!\n"
msgstr ""
-#: src/datacache/datacache.c:180
+#: src/datacache/datacache.c:184
#, c-format
msgid "Loading `%s' datacache plugin\n"
msgstr ""
-#: src/datacache/datacache.c:188
+#: src/datacache/datacache.c:192
#, c-format
msgid "Failed to load datacache plugin for `%s'\n"
msgstr ""
-#: src/datacache/datacache.c:276
+#: src/datacache/datacache.c:295
msgid "# requests received"
msgstr ""
-#: src/datacache/datacache.c:284
+#: src/datacache/datacache.c:304
msgid "# requests filtered by bloom filter"
msgstr ""
-#: src/datacache/plugin_datacache_mysql.c:97
-#: src/datacache/plugin_datacache_mysql.c:104
+#: src/datacache/plugin_datacache_heap.c:406
+#, fuzzy
+msgid "Heap datacache running\n"
+msgstr "sqlite 数据仓库"
+
+#: src/datacache/plugin_datacache_postgres.c:392
+msgid "Postgres datacache running\n"
+msgstr ""
+
#: src/datacache/plugin_datacache_sqlite.c:69
#: src/datacache/plugin_datacache_sqlite.c:72
#: src/datastore/plugin_datastore_mysql.c:803
@@ -803,57 +719,50 @@ 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/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:525
-#: src/include/gnunet_common.h:532
+#: src/namestore/plugin_namestore_postgres.c:52
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ecc.c:46
+#: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
+#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
#, fuzzy, c-format
msgid "`%s' failed at %s:%d with error: %s\n"
msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
-#: src/datacache/plugin_datacache_mysql.c:450
-msgid "MySQL datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_postgres.c:367
-msgid "Postgres datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_sqlite.c:410
+#: src/datacache/plugin_datacache_sqlite.c:450
msgid "Sqlite datacache running\n"
msgstr ""
-#: src/datacache/plugin_datacache_sqlite.c:443
-#: src/datastore/plugin_datastore_sqlite.c:408
-#: src/namestore/plugin_namestore_sqlite.c:370
+#: src/datacache/plugin_datacache_sqlite.c:484
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namestore/plugin_namestore_sqlite.c:362
msgid "Tried to close sqlite without finalizing all prepared statements.\n"
msgstr ""
-#: src/datacache/plugin_datacache_sqlite.c:450
+#: src/datacache/plugin_datacache_sqlite.c:491
#, fuzzy, c-format
msgid "Failed to close statement %p: %d\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/datacache/plugin_datacache_template.c:121
+#: src/datacache/plugin_datacache_template.c:125
msgid "Template datacache running\n"
msgstr ""
-#: src/datastore/datastore_api.c:305
+#: src/datastore/datastore_api.c:310
msgid "Failed to transmit request to drop database.\n"
msgstr ""
-#: src/datastore/datastore_api.c:388
+#: src/datastore/datastore_api.c:393
msgid "# queue entry timeouts"
msgstr ""
-#: src/datastore/datastore_api.c:432
+#: src/datastore/datastore_api.c:437
msgid "# queue overflows"
msgstr ""
-#: src/datastore/datastore_api.c:459
+#: src/datastore/datastore_api.c:465
msgid "# queue entries created"
msgstr ""
-#: src/datastore/datastore_api.c:477
+#: src/datastore/datastore_api.c:483
msgid "# Requests dropped from datastore queue"
msgstr ""
@@ -861,59 +770,55 @@ msgstr ""
msgid "# datastore connections (re)created"
msgstr ""
-#: src/datastore/datastore_api.c:548
-msgid "# reconnected to DATASTORE"
-msgstr ""
-
-#: src/datastore/datastore_api.c:612
+#: src/datastore/datastore_api.c:608
msgid "# transmission request failures"
msgstr ""
-#: src/datastore/datastore_api.c:633
+#: src/datastore/datastore_api.c:630
msgid "# bytes sent to datastore"
msgstr ""
-#: src/datastore/datastore_api.c:764
+#: src/datastore/datastore_api.c:762
msgid "Failed to receive status response from database."
msgstr ""
-#: src/datastore/datastore_api.c:778
+#: src/datastore/datastore_api.c:776
msgid "Error reading response from datastore service"
msgstr ""
-#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
+#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
msgid "Invalid error message received from datastore service"
msgstr ""
-#: src/datastore/datastore_api.c:800
+#: src/datastore/datastore_api.c:798
msgid "# status messages received"
msgstr ""
-#: src/datastore/datastore_api.c:869
+#: src/datastore/datastore_api.c:867
msgid "# PUT requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:936
+#: src/datastore/datastore_api.c:934
msgid "# RESERVE requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:997
+#: src/datastore/datastore_api.c:995
msgid "# RELEASE RESERVE requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1054
+#: src/datastore/datastore_api.c:1052
msgid "# UPDATE requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1118
+#: src/datastore/datastore_api.c:1116
msgid "# REMOVE requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1163
+#: src/datastore/datastore_api.c:1161
msgid "Failed to receive response from database.\n"
msgstr ""
-#: src/datastore/datastore_api.c:1221
+#: src/datastore/datastore_api.c:1220
msgid "# Results received"
msgstr ""
@@ -925,7 +830,7 @@ msgstr ""
msgid "# GET ZERO ANONYMITY requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1409
+#: src/datastore/datastore_api.c:1410
msgid "# GET requests executed"
msgstr ""
@@ -938,10 +843,12 @@ msgid "# bytes purged (low-priority)"
msgstr ""
#: src/datastore/gnunet-service-datastore.c:480
+#: src/gns/gnunet-gns-helper-service-w32.c:159
msgid "Transmission to client failed!\n"
msgstr ""
#: src/datastore/gnunet-service-datastore.c:511
+#: src/gns/gnunet-gns-helper-service-w32.c:189
msgid "Shutdown in progress, aborting transmission.\n"
msgstr ""
@@ -1077,6 +984,11 @@ msgstr ""
msgid "Bloomfilter construction complete.\n"
msgstr ""
+#: src/datastore/plugin_datastore_heap.c:820
+#, fuzzy
+msgid "Heap database running\n"
+msgstr "sqlite 数据仓库"
+
#: src/datastore/plugin_datastore_mysql.c:780
#, fuzzy, c-format
msgid "Failed to prepare statement `%s'\n"
@@ -1097,6 +1009,7 @@ msgid "Failed to drop table from database.\n"
msgstr "发送消息失败。\n"
#: src/datastore/plugin_datastore_postgres.c:860
+#: src/namestore/plugin_namestore_postgres.c:652
msgid "Postgres database running\n"
msgstr ""
@@ -1105,215 +1018,232 @@ msgstr ""
msgid "`%s' failed at %s:%u with error: %s"
msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
-#: src/datastore/plugin_datastore_sqlite.c:233
-#: src/namestore/plugin_namestore_sqlite.c:204
-#, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr ""
-
-#: src/datastore/plugin_datastore_sqlite.c:260
-#: src/namestore/plugin_namestore_sqlite.c:229
+#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/namestore/plugin_namestore_sqlite.c:223
#, c-format
msgid "Unable to initialize SQLite: %s.\n"
msgstr "无法初始化 SQLite:%s。\n"
-#: src/datastore/plugin_datastore_sqlite.c:655
+#: src/datastore/plugin_datastore_sqlite.c:648
#, fuzzy
msgid "Invalid data in database. Trying to fix (by deletion).\n"
msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
-#: src/datastore/plugin_datastore_sqlite.c:1139
+#: src/datastore/plugin_datastore_sqlite.c:1134
msgid "sqlite version to old to determine size, assuming zero\n"
msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1158
+#: src/datastore/plugin_datastore_sqlite.c:1153
#, c-format
msgid ""
"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
"bytes)\n"
msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1198
-#: src/namestore/plugin_namestore_sqlite.c:829
+#: src/datastore/plugin_datastore_sqlite.c:1193
+#: src/namestore/plugin_namestore_sqlite.c:827
#, fuzzy
msgid "Sqlite database running\n"
msgstr "sqlite 数据仓库"
-#: src/datastore/plugin_datastore_template.c:241
+#: src/datastore/plugin_datastore_template.c:257
msgid "Template database running\n"
msgstr ""
-#: src/dht/dht_api.c:348
+#: src/dht/dht_api.c:375
#, fuzzy
msgid "Failed to connect to the DHT service!\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-get.c:132
+#, c-format
+msgid ""
+"Result %d, type %d:\n"
+"%.*s\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:156
+msgid "Must provide key for DHT GET!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#, fuzzy
+msgid "Failed to connect to DHT service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/dht/gnunet-dht-get.c:170
+msgid "Issueing DHT GET with key"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-put.c:198
msgid "the query key"
msgstr ""
-#: src/dht/gnunet-dht-get.c:204
+#: src/dht/gnunet-dht-get.c:189
msgid "how many parallel requests (replicas) to create"
msgstr ""
-#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
+#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
msgid "the type of data to look for"
msgstr ""
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
msgid "how long to execute this query before giving up?"
msgstr ""
-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-download.c:271
-#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
-#: src/fs/gnunet-unindex.c:169 src/nse/gnunet-nse-profiler.c:910
+#: src/dht/gnunet-dht-get.c:198 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-put.c:213 src/fs/gnunet-auto-share.c:753
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
+#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
+#: src/nse/gnunet-nse-profiler.c:1033
msgid "be verbose (print progress information)"
msgstr ""
-#: src/dht/gnunet-dht-get.c:232
+#: src/dht/gnunet-dht-get.c:222
msgid "Issue a GET request to the GNUnet DHT, prints results."
msgstr ""
-#: src/dht/gnunet-dht-monitor.c:299
-msgid "how long to execute? 0 = forever"
+#: src/dht/gnunet-dht-monitor.c:268
+msgid "how long should the monitor command run"
msgstr ""
-#: src/dht/gnunet-dht-monitor.c:321
+#: src/dht/gnunet-dht-monitor.c:293
msgid "Prints all packets that go through the DHT."
msgstr ""
-#: src/dht/gnunet-dht-put.c:108
-msgid "PUT request sent!\n"
+#: src/dht/gnunet-dht-put.c:118
+msgid "PUT request sent with key"
msgstr ""
-#: src/dht/gnunet-dht-put.c:111
+#: src/dht/gnunet-dht-put.c:121
msgid "Timeout sending PUT request!\n"
msgstr ""
-#: src/dht/gnunet-dht-put.c:114
+#: src/dht/gnunet-dht-put.c:124
msgid "PUT request not confirmed!\n"
msgstr ""
-#: src/dht/gnunet-dht-put.c:144
+#: src/dht/gnunet-dht-put.c:153
msgid "Must provide KEY and DATA for DHT put!\n"
msgstr ""
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/gnunet-dht-put.c:160
#, fuzzy, c-format
msgid "Could not connect to %s service!\n"
msgstr "无法连接到 %s:%u:%s\n"
-#: src/dht/gnunet-dht-put.c:157
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/dht/gnunet-dht-put.c:172
+#: src/dht/gnunet-dht-put.c:176
#, c-format
msgid "Issuing put request for `%s' with data `%s'!\n"
msgstr ""
-#: src/dht/gnunet-dht-put.c:186
+#: src/dht/gnunet-dht-put.c:192
msgid "the data to insert under the key"
msgstr ""
-#: src/dht/gnunet-dht-put.c:189
+#: src/dht/gnunet-dht-put.c:195
msgid "how long to store this entry in the dht (in seconds)"
msgstr ""
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:204
msgid "how many replicas to create"
msgstr ""
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-put.c:207
msgid "the type to insert data as"
msgstr ""
-#: src/dht/gnunet-dht-put.c:223
+#: src/dht/gnunet-dht-put.c:235
msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
msgstr ""
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
-#: src/testing/testing.c:1968 src/testing/testing.c:1998
+#: src/dht/gnunet-service-dht.c:172
#, fuzzy
msgid "Failed to connect to transport service!\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/dht/gnunet-service-dht_clients.c:407
+#: src/dht/gnunet-service-dht_clients.c:413
msgid "# GET requests from clients injected"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:500
+#: src/dht/gnunet-service-dht_clients.c:503
msgid "# PUT requests received from clients"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:584
+#: src/dht/gnunet-service-dht_clients.c:585
msgid "# GET requests received from clients"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:682
+#: src/dht/gnunet-service-dht_clients.c:791
msgid "# GET STOP requests received from clients"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:919
+#: src/dht/gnunet-service-dht_clients.c:1035
msgid "# Key match, type mismatches in REPLY to CLIENT"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:932
+#: src/dht/gnunet-service-dht_clients.c:1048
msgid "# Duplicate REPLIES to CLIENT request dropped"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:967
+#: src/dht/gnunet-service-dht_clients.c:1085
#, c-format
msgid "Unsupported block type (%u) in request!\n"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:1108
msgid "# RESULTS queued for clients"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1038
-#: src/dht/gnunet-service-dht_clients.c:1081
+#: src/dht/gnunet-service-dht_clients.c:1157
+#: src/dht/gnunet-service-dht_clients.c:1199
msgid "# REPLIES ignored for CLIENTS (no match)"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:1048
+#: src/dht/gnunet-service-dht_clients.c:1167
msgid "Could not pass reply to client, message too big!\n"
msgstr ""
-#: src/dht/gnunet-service-dht_datacache.c:93
+#: src/dht/gnunet-service-dht_datacache.c:64
#, c-format
msgid "%s request received, but have no datacache!\n"
msgstr ""
-#: src/dht/gnunet-service-dht_datacache.c:103
+#: src/dht/gnunet-service-dht_datacache.c:74
msgid "# ITEMS stored in datacache"
msgstr ""
-#: src/dht/gnunet-service-dht_datacache.c:207
+#: src/dht/gnunet-service-dht_datacache.c:159
msgid "# Good RESULTS found in datacache"
msgstr ""
-#: src/dht/gnunet-service-dht_datacache.c:218
+#: src/dht/gnunet-service-dht_datacache.c:170
msgid "# Duplicate RESULTS found in datacache"
msgstr ""
-#: src/dht/gnunet-service-dht_datacache.c:224
+#: src/dht/gnunet-service-dht_datacache.c:176
msgid "# Invalid RESULTS found in datacache"
msgstr ""
-#: src/dht/gnunet-service-dht_datacache.c:236
+#: src/dht/gnunet-service-dht_datacache.c:182
+msgid "# Irrelevant RESULTS found in datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:194
msgid "# Unsupported RESULTS found in datacache"
msgstr ""
-#: src/dht/gnunet-service-dht_datacache.c:239
+#: src/dht/gnunet-service-dht_datacache.c:197
#, c-format
msgid "Unsupported block type (%u) in local response!\n"
msgstr ""
-#: src/dht/gnunet-service-dht_datacache.c:269
+#: src/dht/gnunet-service-dht_datacache.c:227
msgid "# GET requests given to datacache"
msgstr ""
@@ -1321,81 +1251,87 @@ msgstr ""
msgid "# HELLOs obtained from peerinfo"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:481
+#: src/dht/gnunet-service-dht_neighbours.c:501
msgid "# Preference updates given to core"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:571
+#: src/dht/gnunet-service-dht_neighbours.c:591
msgid "# FIND PEER messages initiated"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:717
+#: src/dht/gnunet-service-dht_neighbours.c:737
msgid "# Queued messages discarded (peer disconnected)"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:772
+#: src/dht/gnunet-service-dht_neighbours.c:792
msgid "# Bytes transmitted to other peers"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:810
-msgid "# Bytes of bandwdith requested from core"
+#: src/dht/gnunet-service-dht_neighbours.c:830
+msgid "# Bytes of bandwidth requested from core"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1032
-#: src/dht/gnunet-service-dht_neighbours.c:1060
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1080
msgid "# Peers excluded from routing due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1041
-#: src/dht/gnunet-service-dht_neighbours.c:1075
+#: src/dht/gnunet-service-dht_neighbours.c:1061
+#: src/dht/gnunet-service-dht_neighbours.c:1095
msgid "# Peer selection failed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1207
+#: src/dht/gnunet-service-dht_neighbours.c:1229
msgid "# PUT requests routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1236
+#: src/dht/gnunet-service-dht_neighbours.c:1258
msgid "# PUT messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1315
+#: src/dht/gnunet-service-dht_neighbours.c:1265
+#: src/dht/gnunet-service-dht_neighbours.c:1378
+#: src/dht/gnunet-service-dht_neighbours.c:1478
+msgid "# P2P messages dropped due to full queue"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1343
msgid "# GET requests routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1342
+#: src/dht/gnunet-service-dht_neighbours.c:1370
msgid "# GET messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1443
+#: src/dht/gnunet-service-dht_neighbours.c:1485
msgid "# RESULT messages queued for transmission"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1531
+#: src/dht/gnunet-service-dht_neighbours.c:1573
msgid "# P2P PUT requests received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1647
+#: src/dht/gnunet-service-dht_neighbours.c:1702
msgid "# FIND PEER requests ignored due to Bloomfilter"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1655
+#: src/dht/gnunet-service-dht_neighbours.c:1710
msgid "# FIND PEER requests ignored due to lack of HELLO"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1746
+#: src/dht/gnunet-service-dht_neighbours.c:1801
msgid "# P2P GET requests received"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1788
+#: src/dht/gnunet-service-dht_neighbours.c:1843
msgid "# P2P FIND PEER requests processed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1802
+#: src/dht/gnunet-service-dht_neighbours.c:1857
msgid "# P2P GET requests ONLY routed"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:1876
+#: src/dht/gnunet-service-dht_neighbours.c:1944
msgid "# P2P RESULTS received"
msgstr ""
@@ -1415,18 +1351,26 @@ msgstr ""
msgid "# Invalid REPLIES matched against routing table"
msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:238
+#: src/dht/gnunet-service-dht_routing.c:232
+msgid "# Irrelevant REPLIES matched against routing table"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_routing.c:244
msgid "# Unsupported REPLIES matched against routing table"
msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:311
+#: src/dht/gnunet-service-dht_routing.c:317
msgid "# Entries removed from routing table"
msgstr ""
-#: src/dht/gnunet-service-dht_routing.c:352
+#: src/dht/gnunet-service-dht_routing.c:400
msgid "# Entries added to routing table"
msgstr ""
+#: src/dht/gnunet-service-dht_routing.c:418
+msgid "# DHT requests combined"
+msgstr ""
+
#: src/dht/plugin_block_dht.c:136
#, c-format
msgid "Block not of type %u\n"
@@ -1441,15 +1385,51 @@ msgstr ""
msgid "Block of type %u is malformed\n"
msgstr ""
-#: src/dns/gnunet-dns-monitor.c:337
+#: src/dns/dnsparser.c:152
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/dns/dnsparser.c:626
+#, fuzzy, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/dns/dnsstub.c:175
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "找不到主机“%s”的 IP:%s\n"
+
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/gns/gnunet-service-gns_resolver.c:1621
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/dns/dnsstub.c:299
+#, fuzzy, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/dns/dnsstub.c:368
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
+msgstr ""
+
+#: src/dns/dnsstub.c:440
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/dns/gnunet-dns-monitor.c:355
msgid "only monitor DNS queries"
msgstr ""
-#: src/dns/gnunet-dns-monitor.c:340
+#: src/dns/gnunet-dns-monitor.c:358
msgid "only monitor DNS replies"
msgstr ""
-#: src/dns/gnunet-dns-monitor.c:348
+#: src/dns/gnunet-dns-monitor.c:369
msgid "Monitor DNS queries."
msgstr ""
@@ -1461,76 +1441,58 @@ msgstr ""
msgid "set AAAA records"
msgstr ""
-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:251
msgid "Change DNS replies to point elsewhere."
msgstr ""
-#: src/dns/gnunet-service-dns.c:485
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "找不到主机“%s”的 IP:%s\n"
-
-#: src/dns/gnunet-service-dns.c:639
+#: src/dns/gnunet-service-dns.c:456
msgid "# DNS requests answered via TUN interface"
msgstr ""
-#: src/dns/gnunet-service-dns.c:822
+#: src/dns/gnunet-service-dns.c:603
msgid "# DNS exit failed (failed to open socket)"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1005
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1050
+#: src/dns/gnunet-service-dns.c:714
msgid "# External DNS response discarded (no matching request)"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1168
+#: src/dns/gnunet-service-dns.c:792
msgid "# Client response discarded (no matching request)"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1281
+#: src/dns/gnunet-service-dns.c:907
msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1297
+#: src/dns/gnunet-service-dns.c:923
msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1306
+#: src/dns/gnunet-service-dns.c:932
#, c-format
msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1315
+#: src/dns/gnunet-service-dns.c:942
msgid "# Non-DNS UDP packet received via TUN interface"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1380
+#: src/dns/gnunet-service-dns.c:1009
msgid "# DNS requests received via TUN interface"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1465
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2674
-msgid "# Inbound MESH tunnels created"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1561 src/exit/gnunet-daemon-exit.c:3032
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3351
#, c-format
msgid "`%s' must be installed SUID, refusing to run\n"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1581
-msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
-msgstr ""
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3407
+#, fuzzy
+msgid "need a valid IPv4 or IPv6 address\n"
+msgstr "无效的进程优先级“%s”\n"
-#: src/dv/dv_api.c:179
+#: src/dv/dv_api.c:189
#, fuzzy
msgid "Failed to connect to the dv service!\n"
msgstr "初始化“%s”服务失败。\n"
@@ -1540,188 +1502,192 @@ msgstr "初始化“%s”服务失败。\n"
msgid "%s Received message from %s of type %d, distance %u!\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:508
+#: src/exit/gnunet-daemon-exit.c:741
#, c-format
msgid "Got duplicate service records for `%s:%u'\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:563
+#: src/exit/gnunet-daemon-exit.c:794
msgid "# Bytes transmitted via mesh tunnels"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2069
-#: src/exit/gnunet-daemon-exit.c:2319 src/vpn/gnunet-service-vpn.c:1394
-#: src/vpn/gnunet-service-vpn.c:1795 src/vpn/gnunet-service-vpn.c:1958
+#: src/exit/gnunet-daemon-exit.c:911 src/exit/gnunet-daemon-exit.c:2343
+#: src/exit/gnunet-daemon-exit.c:2603 src/vpn/gnunet-service-vpn.c:1411
+#: src/vpn/gnunet-service-vpn.c:1812 src/vpn/gnunet-service-vpn.c:1975
msgid "# ICMPv4 packets dropped (type not allowed)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2128
-#: src/exit/gnunet-daemon-exit.c:2378 src/vpn/gnunet-service-vpn.c:1450
-#: src/vpn/gnunet-service-vpn.c:1854 src/vpn/gnunet-service-vpn.c:1991
+#: src/exit/gnunet-daemon-exit.c:948 src/exit/gnunet-daemon-exit.c:2402
+#: src/exit/gnunet-daemon-exit.c:2662 src/vpn/gnunet-service-vpn.c:1467
+#: src/vpn/gnunet-service-vpn.c:1871 src/vpn/gnunet-service-vpn.c:2008
msgid "# ICMPv6 packets dropped (type not allowed)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:756
+#: src/exit/gnunet-daemon-exit.c:988
msgid "# ICMP packets dropped (not allowed)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:763
+#: src/exit/gnunet-daemon-exit.c:995
msgid "ICMP Packet dropped, have no matching connection information\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:840
+#: src/exit/gnunet-daemon-exit.c:1072
msgid "UDP Packet dropped, have no matching connection information\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:915
+#: src/exit/gnunet-daemon-exit.c:1147
msgid "TCP Packet dropped, have no matching connection information\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:968
+#: src/exit/gnunet-daemon-exit.c:1200
msgid "# Packets received from TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:982
+#: src/exit/gnunet-daemon-exit.c:1214
msgid "# Bytes received from TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1008
+#: src/exit/gnunet-daemon-exit.c:1240
msgid "IPv4 packet options received. Ignored.\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1035
+#: src/exit/gnunet-daemon-exit.c:1267
#, c-format
msgid "IPv4 packet with unsupported next header %u received. Ignored.\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1081
+#: src/exit/gnunet-daemon-exit.c:1313
#, c-format
msgid "IPv6 packet with unsupported next header %d received. Ignored.\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1089
+#: src/exit/gnunet-daemon-exit.c:1321
#, c-format
msgid "Packet from unknown protocol %u received. Ignored.\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1471
+#: src/exit/gnunet-daemon-exit.c:1703
msgid "# TCP packets sent via TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1571
+#: src/exit/gnunet-daemon-exit.c:1814
msgid "# TCP service creation requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1574 src/exit/gnunet-daemon-exit.c:1653
-#: src/exit/gnunet-daemon-exit.c:1763 src/exit/gnunet-daemon-exit.c:1993
-#: src/exit/gnunet-daemon-exit.c:2235 src/exit/gnunet-daemon-exit.c:2516
-#: src/exit/gnunet-daemon-exit.c:2616
+#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1906
+#: src/exit/gnunet-daemon-exit.c:2026 src/exit/gnunet-daemon-exit.c:2267
+#: src/exit/gnunet-daemon-exit.c:2519 src/exit/gnunet-daemon-exit.c:2811
+#: src/exit/gnunet-daemon-exit.c:2921
msgid "# Bytes received from MESH"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1607 src/exit/gnunet-daemon-exit.c:2638
+#: src/exit/gnunet-daemon-exit.c:1850 src/exit/gnunet-daemon-exit.c:2943
#, c-format
msgid "No service found for %s on port %d!\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1611
+#: src/exit/gnunet-daemon-exit.c:1854
msgid "# TCP requests dropped (no such service)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1656
+#: src/exit/gnunet-daemon-exit.c:1909
msgid "# TCP IP-exit creation requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1766
+#: src/exit/gnunet-daemon-exit.c:2029
msgid "# TCP data requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1780
+#: src/exit/gnunet-daemon-exit.c:2043
msgid "# TCP DATA requests dropped (no session)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1830
+#: src/exit/gnunet-daemon-exit.c:2093
msgid "# ICMP packets sent via TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1996
+#: src/exit/gnunet-daemon-exit.c:2270
msgid "# ICMP IP-exit requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2238
+#: src/exit/gnunet-daemon-exit.c:2522
msgid "# ICMP service requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2304 src/vpn/gnunet-service-vpn.c:1384
-#: src/vpn/gnunet-service-vpn.c:1952
+#: src/exit/gnunet-daemon-exit.c:2588 src/vpn/gnunet-service-vpn.c:1401
+#: src/vpn/gnunet-service-vpn.c:1969
msgid "# ICMPv4 packets dropped (impossible PT to v6)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2363 src/vpn/gnunet-service-vpn.c:1420
-#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1842
+#: src/exit/gnunet-daemon-exit.c:2647 src/vpn/gnunet-service-vpn.c:1437
+#: src/vpn/gnunet-service-vpn.c:1449 src/vpn/gnunet-service-vpn.c:1859
msgid "# ICMPv6 packets dropped (impossible PT to v4)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2413
+#: src/exit/gnunet-daemon-exit.c:2697
msgid "# UDP packets sent via TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2519
+#: src/exit/gnunet-daemon-exit.c:2814
msgid "# UDP IP-exit requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2619
+#: src/exit/gnunet-daemon-exit.c:2924
msgid "# UDP service requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2642
+#: src/exit/gnunet-daemon-exit.c:2947
msgid "# UDP requests dropped (no such service)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2882
+#: src/exit/gnunet-daemon-exit.c:2980
+msgid "# Inbound MESH tunnels created"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3209
#, c-format
msgid "No addresses found for hostname `%s' of service `%s'!\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908
+#: src/exit/gnunet-daemon-exit.c:3223 src/exit/gnunet-daemon-exit.c:3235
#, c-format
msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2919
+#: src/exit/gnunet-daemon-exit.c:3246
#, c-format
msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3048
+#: src/exit/gnunet-daemon-exit.c:3364
msgid ""
"This system does not support IPv4, will disable IPv4 functions despite them "
"being enabled in the configuration\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3056
+#: src/exit/gnunet-daemon-exit.c:3372
msgid ""
"This system does not support IPv6, will disable IPv6 functions despite them "
"being enabled in the configuration\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3063
+#: src/exit/gnunet-daemon-exit.c:3379
msgid ""
"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
"ENABLE_IPv4=YES\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3069
+#: src/exit/gnunet-daemon-exit.c:3385
msgid ""
"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
"ENABLE_IPv6=YES\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3391 src/pt/gnunet-daemon-pt.c:884
msgid "No useful service enabled. Exiting.\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:3236
+#: src/exit/gnunet-daemon-exit.c:3620
msgid "Daemon to run to provide an IP exit node for the VPN"
msgstr ""
@@ -1741,108 +1707,108 @@ msgstr ""
msgid "# messages defragmented"
msgstr ""
-#: src/fragmentation/fragmentation.c:203
+#: src/fragmentation/fragmentation.c:208
msgid "# fragments transmitted"
msgstr ""
-#: src/fragmentation/fragmentation.c:206
+#: src/fragmentation/fragmentation.c:211
msgid "# fragments retransmitted"
msgstr ""
-#: src/fragmentation/fragmentation.c:232
+#: src/fragmentation/fragmentation.c:237
msgid "# fragments wrap arounds"
msgstr ""
-#: src/fragmentation/fragmentation.c:273
+#: src/fragmentation/fragmentation.c:281
msgid "# messages fragmented"
msgstr ""
-#: src/fragmentation/fragmentation.c:276
+#: src/fragmentation/fragmentation.c:284
msgid "# total size of fragmented messages"
msgstr ""
-#: src/fragmentation/fragmentation.c:363
+#: src/fragmentation/fragmentation.c:405
msgid "# fragment acknowledgements received"
msgstr ""
-#: src/fragmentation/fragmentation.c:369
+#: src/fragmentation/fragmentation.c:411
msgid "# bits removed from fragmentation ACKs"
msgstr ""
-#: src/fragmentation/fragmentation.c:393
+#: src/fragmentation/fragmentation.c:435
msgid "# fragmentation transmissions completed"
msgstr ""
-#: src/fs/fs_api.c:339
+#: src/fs/fs_api.c:465
#, fuzzy, c-format
msgid "Could not open file `%s': %s"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/fs_api.c:348
+#: src/fs/fs_api.c:474
#, fuzzy, c-format
msgid "Could not read file `%s': %s"
msgstr "无法解析“%s”(%s):%s\n"
-#: src/fs/fs_api.c:354
+#: src/fs/fs_api.c:480
#, c-format
msgid "Short read reading from file `%s'!"
msgstr ""
-#: src/fs/fs_api.c:938
+#: src/fs/fs_api.c:1061
#, fuzzy, c-format
msgid "Failed to resume publishing information `%s': %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/fs_api.c:1395
+#: src/fs/fs_api.c:1520
#, c-format
msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
msgstr ""
-#: src/fs/fs_api.c:1437
+#: src/fs/fs_api.c:1562
#, c-format
msgid "Failure while resuming publishing operation `%s': %s\n"
msgstr ""
-#: src/fs/fs_api.c:1453
+#: src/fs/fs_api.c:1578
#, fuzzy, c-format
msgid "Failed to resume publishing operation `%s': %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/fs/fs_api.c:2106
+#: src/fs/fs_api.c:2229
#, c-format
msgid "Failure while resuming unindexing operation `%s': %s\n"
msgstr ""
-#: src/fs/fs_api.c:2116
+#: src/fs/fs_api.c:2239
#, fuzzy, c-format
msgid "Failed to resume unindexing operation `%s': %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/fs/fs_api.c:2241 src/fs/fs_api.c:2480
+#: src/fs/fs_api.c:2364 src/fs/fs_api.c:2604
#, fuzzy, c-format
msgid "Failed to resume sub-download `%s': %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/fs_api.c:2258
+#: src/fs/fs_api.c:2381
#, fuzzy, c-format
msgid "Failed to resume sub-search `%s': %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/fs_api.c:2270 src/fs/fs_api.c:2289 src/fs/fs_api.c:2773
+#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2897
#, c-format
msgid "Failure while resuming search operation `%s': %s\n"
msgstr ""
-#: src/fs/fs_api.c:2471
+#: src/fs/fs_api.c:2595
#, fuzzy, c-format
msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/fs/fs_api.c:2717
+#: src/fs/fs_api.c:2841
msgid "Could not resume running search, will resume as paused search\n"
msgstr ""
-#: src/fs/fs_api.c:2811
+#: src/fs/fs_api.c:2935
#, c-format
msgid "Failure while resuming download operation `%s': %s\n"
msgstr ""
@@ -1851,63 +1817,63 @@ msgstr ""
msgid "MAGIC mismatch. This is not a GNUnet directory.\n"
msgstr ""
-#: src/fs/fs_download.c:311
+#: src/fs/fs_download.c:321
msgid ""
"Recursive downloads of directories larger than 4 GB are not supported on 32-"
"bit systems\n"
msgstr ""
-#: src/fs/fs_download.c:331
+#: src/fs/fs_download.c:341
msgid "Directory too large for system address space\n"
msgstr ""
-#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
+#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
#, fuzzy, c-format
msgid "Failed to open file `%s' for writing"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/fs_download.c:878
+#: src/fs/fs_download.c:888
#, c-format
msgid "Failed to create directory for recursive download of `%s'\n"
msgstr ""
-#: src/fs/fs_download.c:960
+#: src/fs/fs_download.c:970
#, 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:986
+#: src/fs/fs_download.c:996
msgid "internal error decrypting content"
msgstr ""
-#: src/fs/fs_download.c:1009
+#: src/fs/fs_download.c:1019
#, fuzzy, c-format
msgid "Download failed: could not open file `%s': %s"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1029
#, fuzzy, c-format
msgid "Failed to seek to offset %llu in file `%s': %s"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/fs_download.c:1028
+#: src/fs/fs_download.c:1038
#, fuzzy, c-format
msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
msgstr "解析配置文件“%s”失败\n"
-#: src/fs/fs_download.c:1125
+#: src/fs/fs_download.c:1136
#, fuzzy
msgid "internal error decoding tree"
msgstr "未知错误。\n"
-#: src/fs/fs_download.c:1888
+#: src/fs/fs_download.c:1927
#, fuzzy
msgid "Invalid URI"
msgstr "无效条目。\n"
-#: src/fs/fs_getopt.c:191
+#: src/fs/fs_getopt.c:192
#, c-format
msgid ""
"Unknown metadata type in metadata option `%s'. Using metadata type "
@@ -1949,37 +1915,36 @@ msgstr "发送消息失败。\n"
msgid "Failed to connect to datastore service"
msgstr "初始化“%s”服务失败。\n"
-#: src/fs/fs_namespace.c:57 src/fs/fs_namespace.c:83
-#, fuzzy, c-format
-msgid "Configuration fails to specify `%s' in section `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/fs/fs_namespace.c:112
+#: src/fs/fs_namespace.c:110
#, fuzzy, c-format
msgid "Failed to open `%s' for writing: %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/fs_namespace.c:134 src/fs/fs_namespace.c:222
+#: src/fs/fs_namespace.c:132 src/fs/fs_namespace.c:220
#, fuzzy, c-format
msgid "Failed to write `%s': %s\n"
msgstr "运行 %s失败:%s %d\n"
-#: src/fs/fs_namespace.c:256
+#: src/fs/fs_namespace.c:252
#, c-format
msgid "Failed to create or read private key for namespace `%s'\n"
msgstr ""
-#: src/fs/fs_namespace.c:371
+#: src/fs/fs_namespace.c:367
#, c-format
msgid "Failed to read namespace private key file `%s', deleting it!\n"
msgstr ""
-#: src/fs/fs_namespace.c:588 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:558
+msgid "Identifiers or URI too long to create SBlock"
+msgstr ""
+
+#: src/fs/fs_namespace.c:593 src/fs/fs_publish_ksk.c:295
#, fuzzy
msgid "Internal error."
msgstr "未知错误。\n"
-#: src/fs/fs_namespace.c:631
+#: src/fs/fs_namespace.c:636
msgid "Failed to connect to datastore."
msgstr ""
@@ -1988,58 +1953,58 @@ msgstr ""
msgid "Publishing failed: %s"
msgstr ""
-#: src/fs/fs_publish.c:621 src/fs/fs_publish.c:638 src/fs/fs_publish.c:677
-#: src/fs/fs_publish.c:697 src/fs/fs_publish.c:722 src/fs/fs_publish.c:862
+#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
#, c-format
msgid "Can not index file `%s': %s. Will try to insert instead.\n"
msgstr ""
-#: src/fs/fs_publish.c:623
+#: src/fs/fs_publish.c:624
msgid "timeout on index-start request to `fs' service"
msgstr ""
-#: src/fs/fs_publish.c:635
+#: src/fs/fs_publish.c:636
#, fuzzy
msgid "unknown error"
msgstr "未知错误"
-#: src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:679
msgid "failed to compute hash"
msgstr ""
-#: src/fs/fs_publish.c:698
+#: src/fs/fs_publish.c:699
msgid "filename too long"
msgstr ""
-#: src/fs/fs_publish.c:723
+#: src/fs/fs_publish.c:724
msgid "could not connect to `fs' service"
msgstr ""
-#: src/fs/fs_publish.c:746
+#: src/fs/fs_publish.c:747
#, fuzzy, c-format
msgid "Failed to get file identifiers for `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/fs/fs_publish.c:811
+#: src/fs/fs_publish.c:812
#, c-format
msgid "Recursive upload failed at `%s': %s"
msgstr ""
-#: src/fs/fs_publish.c:817
+#: src/fs/fs_publish.c:818
#, c-format
msgid "Recursive upload failed: %s"
msgstr ""
-#: src/fs/fs_publish.c:863
+#: src/fs/fs_publish.c:864
msgid "needs to be an actual file"
msgstr ""
-#: src/fs/fs_publish.c:1071
+#: src/fs/fs_publish.c:1090
#, c-format
msgid "Insufficient space for publishing: %s"
msgstr ""
-#: src/fs/fs_publish.c:1142
+#: src/fs/fs_publish.c:1161
#, c-format
msgid "Reserving space for %u entries and %llu bytes for publication\n"
msgstr ""
@@ -2048,16 +2013,11 @@ msgstr ""
msgid "Could not connect to datastore."
msgstr ""
-#: src/fs/fs_search.c:829
+#: src/fs/fs_search.c:892
#, c-format
msgid "Got result with unknown block type `%d', ignoring"
msgstr ""
-#: src/fs/fs_test_lib.c:269
-#, fuzzy, c-format
-msgid "Failed to start daemon: %s\n"
-msgstr "运行 %s失败:%s %d\n"
-
#: src/fs/fs_unindex.c:58
msgid "Failed to find given position in file"
msgstr ""
@@ -2084,95 +2044,95 @@ msgstr "“%s”的参数无效。\n"
msgid "Failed to connect to FS service for unindexing."
msgstr ""
-#: src/fs/fs_unindex.c:344
+#: src/fs/fs_unindex.c:349 src/fs/fs_unindex.c:361
#, fuzzy
msgid "Failed to get KSKs from directory scan."
msgstr "解析配置文件“%s”失败\n"
-#: src/fs/fs_unindex.c:356
+#: src/fs/fs_unindex.c:357
#, fuzzy, c-format
msgid "Internal error scanning `%s'.\n"
msgstr "未知错误。\n"
-#: src/fs/fs_unindex.c:411
+#: src/fs/fs_unindex.c:416
#, fuzzy, c-format
msgid "Failed to remove KBlock: %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/fs_unindex.c:501
+#: src/fs/fs_unindex.c:506
#, fuzzy, c-format
msgid "Failed to parse URI `%s' from KBlock!\n"
msgstr "运行 %s失败:%s %d\n"
-#: src/fs/fs_unindex.c:553 src/fs/fs_unindex.c:618
+#: src/fs/fs_unindex.c:558 src/fs/fs_unindex.c:623
#, fuzzy
msgid "Failed to connect to `datastore' service."
msgstr "初始化“%s”服务失败。\n"
-#: src/fs/fs_unindex.c:631
+#: src/fs/fs_unindex.c:636
#, fuzzy
msgid "Failed to open file for unindexing."
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/fs_unindex.c:665
+#: src/fs/fs_unindex.c:670
msgid "Failed to compute hash of file."
msgstr ""
-#: src/fs/fs_uri.c:220
-#, c-format
+#: src/fs/fs_uri.c:221
+#, no-c-format
msgid "`%' must be followed by HEX number"
msgstr ""
-#: src/fs/fs_uri.c:279
+#: src/fs/fs_uri.c:280
msgid "Malformed KSK URI (must not begin or end with `+')"
msgstr ""
-#: src/fs/fs_uri.c:297
+#: src/fs/fs_uri.c:298
msgid "`++' not allowed in KSK URI"
msgstr ""
-#: src/fs/fs_uri.c:304
+#: src/fs/fs_uri.c:305
msgid "Quotes not balanced in KSK URI"
msgstr ""
-#: src/fs/fs_uri.c:372 src/fs/fs_uri.c:379
+#: src/fs/fs_uri.c:373 src/fs/fs_uri.c:380
msgid "Malformed SKS URI"
msgstr ""
-#: src/fs/fs_uri.c:423 src/fs/fs_uri.c:438
+#: src/fs/fs_uri.c:424 src/fs/fs_uri.c:439
msgid "Malformed CHK URI"
msgstr ""
-#: src/fs/fs_uri.c:568 src/fs/fs_uri.c:583 src/fs/fs_uri.c:593
-#: src/fs/fs_uri.c:621
+#: src/fs/fs_uri.c:569 src/fs/fs_uri.c:584 src/fs/fs_uri.c:594
+#: src/fs/fs_uri.c:622
msgid "SKS URI malformed"
msgstr ""
-#: src/fs/fs_uri.c:603
+#: src/fs/fs_uri.c:604
msgid "SKS URI malformed (could not decode public key)"
msgstr ""
-#: src/fs/fs_uri.c:609
+#: src/fs/fs_uri.c:610
msgid "SKS URI malformed (could not find signature)"
msgstr ""
-#: src/fs/fs_uri.c:615
+#: src/fs/fs_uri.c:616
msgid "SKS URI malformed (could not decode signature)"
msgstr ""
-#: src/fs/fs_uri.c:628
+#: src/fs/fs_uri.c:629
msgid "SKS URI malformed (could not parse expiration time)"
msgstr ""
-#: src/fs/fs_uri.c:640
+#: src/fs/fs_uri.c:641
msgid "SKS URI malformed (signature failed validation)"
msgstr ""
-#: src/fs/fs_uri.c:678
+#: src/fs/fs_uri.c:679
msgid "Unrecognized URI type"
msgstr ""
-#: src/fs/fs_uri.c:903
+#: src/fs/fs_uri.c:904
#, fuzzy
msgid "Lacking key configuration settings.\n"
msgstr "立即保存配置?"
@@ -2190,6 +2150,68 @@ msgstr ""
msgid "Number of double-quotes not balanced!\n"
msgstr ""
+#: src/fs/gnunet-auto-share.c:236
+#, fuzzy, c-format
+msgid "Failed to load state: %s\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
+#: src/fs/gnunet-auto-share.c:309
+#, fuzzy, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:488
+#, c-format
+msgid "Publishing `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:497
+#, fuzzy, c-format
+msgid "Failed to run `%s'\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/fs/gnunet-auto-share.c:686
+#, c-format
+msgid ""
+"You must specify one and only one directory name for automatic publication.\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
+#: src/fs/gnunet-publish.c:683
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:714
+msgid "specify the priority of the content"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:304
+#: src/fs/gnunet-publish.c:721
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:770
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr ""
+
+#: src/fs/gnunet-daemon-fsprofiler.c:656
+msgid "Daemon to use file-sharing to measure its performance."
+msgstr ""
+
#: src/fs/gnunet-directory.c:49
#, c-format
msgid "\t<original file embedded in %u bytes of meta data>\n"
@@ -2220,97 +2242,97 @@ msgstr "解析配置文件“%s”失败\n"
msgid "`%s' is not a GNUnet directory\n"
msgstr "更改 GNUnet 目录的权限出错"
-#: src/fs/gnunet-directory.c:179
+#: src/fs/gnunet-directory.c:183
#, fuzzy
msgid "Display contents of a GNUnet directory"
msgstr "更改 GNUnet 目录的权限出错"
-#: src/fs/gnunet-download.c:101
+#: src/fs/gnunet-download.c:137
#, fuzzy, c-format
msgid "Starting download `%s'.\n"
msgstr "未知的命令“%s”。\n"
-#: src/fs/gnunet-download.c:110
+#: src/fs/gnunet-download.c:147
#, fuzzy
msgid "<unknown time>"
msgstr "未知错误"
-#: src/fs/gnunet-download.c:119
+#: src/fs/gnunet-download.c:157
#, c-format
msgid ""
"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
"download\n"
msgstr ""
-#: src/fs/gnunet-download.c:129
+#: src/fs/gnunet-download.c:179
#, c-format
msgid "Error downloading: %s.\n"
msgstr ""
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:194
#, c-format
msgid "Downloading `%s' done (%s/s).\n"
msgstr ""
-#: src/fs/gnunet-download.c:152 src/fs/gnunet-publish.c:190
-#: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:195
+#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
#, c-format
msgid "Unexpected status: %d\n"
msgstr ""
-#: src/fs/gnunet-download.c:177
+#: src/fs/gnunet-download.c:234
#, fuzzy
msgid "You need to specify a URI argument.\n"
msgstr "您必须指定一个昵称\n"
-#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:629
#, fuzzy, c-format
msgid "Failed to parse URI: %s\n"
msgstr "运行 %s失败:%s %d\n"
-#: src/fs/gnunet-download.c:190
+#: src/fs/gnunet-download.c:247
msgid "Only CHK or LOC URIs supported.\n"
msgstr ""
-#: src/fs/gnunet-download.c:197
+#: src/fs/gnunet-download.c:254
msgid "Target filename must be specified.\n"
msgstr ""
-#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
-#: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:607
+#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
#, fuzzy, c-format
msgid "Could not initialize `%s' subsystem.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/fs/gnunet-download.c:248 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
msgid "set the desired LEVEL of receiver-anonymity"
msgstr ""
-#: src/fs/gnunet-download.c:251
+#: src/fs/gnunet-download.c:308
msgid "delete incomplete downloads (when aborted with CTRL-C)"
msgstr ""
-#: src/fs/gnunet-download.c:254 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
msgid "only search the local peer (no P2P network search)"
msgstr ""
-#: src/fs/gnunet-download.c:257
+#: src/fs/gnunet-download.c:314
msgid "write the file to FILENAME"
msgstr ""
-#: src/fs/gnunet-download.c:261
+#: src/fs/gnunet-download.c:318
msgid "set the maximum number of parallel downloads that is allowed"
msgstr ""
-#: src/fs/gnunet-download.c:265
+#: src/fs/gnunet-download.c:322
msgid "set the maximum number of parallel requests for blocks that is allowed"
msgstr ""
-#: src/fs/gnunet-download.c:268
+#: src/fs/gnunet-download.c:325
msgid "download a GNUnet directory recursively"
msgstr ""
-#: src/fs/gnunet-download.c:278
+#: src/fs/gnunet-download.c:339
msgid ""
"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
"chk/...)"
@@ -2320,11 +2342,27 @@ msgstr ""
msgid "print a list of all indexed files"
msgstr ""
-#: src/fs/gnunet-fs.c:124
+#: src/fs/gnunet-fs.c:127
msgid "Special file-sharing operations"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:167
+#: src/fs/gnunet-fs-profiler.c:182
+msgid "run the experiment with COUNT peers"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:185
+msgid "specifies name of a file with the HOSTS the testbed should use"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:188
+msgid "automatically terminate experiment after DELAY"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:197
+msgid "run a testbed to measure file-sharing performance"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:283
#, fuzzy, c-format
msgid "Invalid argument `%s'\n"
msgstr "“%s”的参数无效。\n"
@@ -2335,10 +2373,6 @@ msgstr "“%s”的参数无效。\n"
msgid "Option `%s' ignored\n"
msgstr "%s:选项“%s”有歧义\n"
-#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr ""
-
#: src/fs/gnunet-pseudonym.c:282
msgid "create or advertise namespace NAME"
msgstr ""
@@ -2353,7 +2387,7 @@ msgid ""
"multiple times)"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:697
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:702
msgid "set the meta-data for the given TYPE to the given VALUE"
msgstr ""
@@ -2369,10 +2403,6 @@ msgstr ""
msgid "do not print names of remote namespaces"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
-msgid "set the desired replication LEVEL"
-msgstr ""
-
#: src/fs/gnunet-pseudonym.c:307
msgid "specify ID of the root of the namespace"
msgstr ""
@@ -2381,378 +2411,354 @@ msgstr ""
msgid "change rating of namespace ID by VALUE"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:318
+#: src/fs/gnunet-pseudonym.c:322
msgid "Manage GNUnet pseudonyms."
msgstr ""
-#: src/fs/gnunet-publish.c:147
+#: src/fs/gnunet-publish.c:152
#, c-format
msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
msgstr ""
-#: src/fs/gnunet-publish.c:155
+#: src/fs/gnunet-publish.c:159
#, c-format
msgid "Error publishing: %s.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:165
+#: src/fs/gnunet-publish.c:169
#, c-format
msgid "Publishing `%s' done.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:169
+#: src/fs/gnunet-publish.c:173
#, c-format
msgid "URI is `%s'.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:187
+#: src/fs/gnunet-publish.c:192
msgid "Cleanup after abort complete.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:305
+#: src/fs/gnunet-publish.c:310
#, fuzzy, c-format
msgid "Meta data for file `%s' (%s)\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/gnunet-publish.c:307
+#: src/fs/gnunet-publish.c:312
#, fuzzy, c-format
msgid "Keywords for file `%s' (%s)\n"
msgstr "无法解析“%s”(%s):%s\n"
-#: src/fs/gnunet-publish.c:358
+#: src/fs/gnunet-publish.c:363 src/fs/gnunet-publish.c:617
#, fuzzy, c-format
-msgid "Failed to create namespace `%s'\n"
+msgid "Failed to create namespace `%s' (illegal filename?)\n"
msgstr "发送消息失败。\n"
-#: src/fs/gnunet-publish.c:433
+#: src/fs/gnunet-publish.c:438
#, fuzzy
msgid "Could not publish\n"
msgstr "无法解析“%s”(%s):%s\n"
-#: src/fs/gnunet-publish.c:460
+#: src/fs/gnunet-publish.c:465
msgid "Could not start publishing.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:491
+#: src/fs/gnunet-publish.c:496
#, fuzzy, c-format
msgid "Scanning directory `%s'.\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/fs/gnunet-publish.c:493
+#: src/fs/gnunet-publish.c:498
#, fuzzy, c-format
msgid "Scanning file `%s'.\n"
msgstr "未知的命令“%s”。\n"
-#: src/fs/gnunet-publish.c:498
+#: src/fs/gnunet-publish.c:503
#, c-format
msgid "There was trouble processing file `%s', skipping it.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:503
+#: src/fs/gnunet-publish.c:508
msgid "Preprocessing complete.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:507
+#: src/fs/gnunet-publish.c:512
#, fuzzy, c-format
msgid "Extracting meta data from file `%s' complete.\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/gnunet-publish.c:511
+#: src/fs/gnunet-publish.c:516
msgid "Meta data extraction has finished.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:518
+#: src/fs/gnunet-publish.c:523
#, fuzzy
msgid "Internal error scanning directory.\n"
msgstr "未知错误。\n"
-#: src/fs/gnunet-publish.c:552
+#: src/fs/gnunet-publish.c:557
#, c-format
msgid "Cannot extract metadata from a URI!\n"
msgstr ""
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:564
#, c-format
msgid "You must specify one and only one filename for insertion.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:570
#, c-format
msgid "You must NOT specify an URI and a filename.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:573 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:578 src/vpn/gnunet-vpn.c:213
#, c-format
msgid "Option `%s' is required when using option `%s'.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:583 src/fs/gnunet-publish.c:590
-#: src/transport/gnunet-transport.c:560
+#: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
+#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
#, c-format
msgid "Option `%s' makes no sense without option `%s'.\n"
msgstr ""
-#: src/fs/gnunet-publish.c:612
-#, fuzzy, c-format
-msgid "Could not create namespace `%s'\n"
-msgstr "无法解析“%s”(%s):%s\n"
-
-#: src/fs/gnunet-publish.c:645
+#: src/fs/gnunet-publish.c:650
#, fuzzy, c-format
msgid "Failed to access `%s': %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/gnunet-publish.c:657
+#: src/fs/gnunet-publish.c:662
msgid ""
"Failed to start meta directory scanner. Is gnunet-helper-publish-fs "
"installed?\n"
msgstr ""
-#: src/fs/gnunet-publish.c:682
-msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:685
-msgid "do not use libextractor to add keywords or metadata"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:689
+#: src/fs/gnunet-publish.c:694
msgid ""
"print list of extracted keywords that would be used, but do not perform "
"upload"
msgstr ""
-#: src/fs/gnunet-publish.c:693
+#: src/fs/gnunet-publish.c:698
msgid ""
"add an additional keyword for the top-level file or directory (this option "
"can be specified multiple times)"
msgstr ""
-#: src/fs/gnunet-publish.c:700
+#: src/fs/gnunet-publish.c:705
msgid ""
"do not index, perform full insertion (stores entire file in encrypted form "
"in GNUnet database)"
msgstr ""
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:710
msgid ""
"specify ID of an updated version to be published in the future (for "
"namespace insertions only)"
msgstr ""
-#: src/fs/gnunet-publish.c:709
-msgid "specify the priority of the content"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:718
msgid "publish the files under the pseudonym NAME (place file into namespace)"
msgstr ""
-#: src/fs/gnunet-publish.c:719
+#: src/fs/gnunet-publish.c:724
msgid ""
"only simulate the process but do not do any actual publishing (useful to "
"compute URIs)"
msgstr ""
-#: src/fs/gnunet-publish.c:723
+#: src/fs/gnunet-publish.c:728
msgid ""
"set the ID of this version of the publication (for namespace insertions only)"
msgstr ""
-#: src/fs/gnunet-publish.c:727
+#: src/fs/gnunet-publish.c:732
msgid ""
"URI to be published (can be used instead of passing a file to add keywords "
"to the file with the respective URI)"
msgstr ""
-#: src/fs/gnunet-publish.c:742
+#: src/fs/gnunet-publish.c:748
msgid "Publish a file or directory on GNUnet"
msgstr ""
-#: src/fs/gnunet-search.c:111
+#: src/fs/gnunet-search.c:114
#, c-format
msgid "Failed to write directory with search results to `%s'\n"
msgstr ""
-#: src/fs/gnunet-search.c:181
+#: src/fs/gnunet-search.c:184
#, fuzzy, c-format
msgid "Error searching: %s.\n"
msgstr "创建用户出错"
-#: src/fs/gnunet-search.c:231
+#: src/fs/gnunet-search.c:233
msgid "Could not create keyword URI from arguments.\n"
msgstr ""
-#: src/fs/gnunet-search.c:255
+#: src/fs/gnunet-search.c:257
msgid "Could not start searching.\n"
msgstr ""
-#: src/fs/gnunet-search.c:291
+#: src/fs/gnunet-search.c:288
msgid "write search results to file starting with PREFIX"
msgstr ""
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/fs/gnunet-search.c:291
+msgid "automatically terminate search after DELAY"
msgstr ""
-#: src/fs/gnunet-search.c:301
+#: src/fs/gnunet-search.c:298
msgid "automatically terminate search after VALUE results are found"
msgstr ""
-#: src/fs/gnunet-search.c:308
+#: src/fs/gnunet-search.c:309
msgid "Search GNUnet for files that were published on GNUnet"
msgstr ""
-#: src/fs/gnunet-service-fs.c:240
+#: src/fs/gnunet-service-fs.c:248
msgid "# running average P2P latency (ms)"
msgstr ""
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
+#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:523
msgid "# Loopback routes suppressed"
msgstr ""
-#: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1330
-#: src/topology/gnunet-daemon-topology.c:1337
+#: src/fs/gnunet-service-fs.c:628 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/topology/gnunet-daemon-topology.c:1322
+#: src/topology/gnunet-daemon-topology.c:1329
#, fuzzy, c-format
msgid "Failed to connect to `%s' service.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/fs/gnunet-service-fs_cp.c:696
+#: src/fs/gnunet-service-fs_cp.c:711
msgid "# migration stop messages received"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:700
+#: src/fs/gnunet-service-fs_cp.c:715
#, c-format
-msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgid "Migration of content to peer `%s' blocked for %s\n"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:735
+#: src/fs/gnunet-service-fs_cp.c:751
msgid "# replies transmitted to other peers"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:741
+#: src/fs/gnunet-service-fs_cp.c:757
msgid "# replies dropped"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1324
+#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1345
msgid "# P2P searches active"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:858
+#: src/fs/gnunet-service-fs_cp.c:875
msgid "# artificial delays introduced (ms)"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:928
msgid "# replies dropped due to type mismatch"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:919
+#: src/fs/gnunet-service-fs_cp.c:936
msgid "# replies received for other peers"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:933
+#: src/fs/gnunet-service-fs_cp.c:950
msgid "# replies dropped due to insufficient cover traffic"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:971
+#: src/fs/gnunet-service-fs_cp.c:988
msgid "# P2P searches destroyed due to ultimate reply"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/fs/gnunet-service-fs_cp.c:1056
msgid "# requests done for free (low load)"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1081
msgid "# request dropped, priority insufficient"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/fs/gnunet-service-fs_cp.c:1091
msgid "# requests done for a price (normal load)"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1151
+#: src/fs/gnunet-service-fs_cp.c:1170
msgid "# GET requests received (from other peers)"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/fs/gnunet-service-fs_cp.c:1204
msgid "# requests dropped due to initiator not being connected"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1207
+#: src/fs/gnunet-service-fs_cp.c:1227
msgid "# requests dropped due to missing reverse route"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1267
+#: src/fs/gnunet-service-fs_cp.c:1288
msgid "# requests dropped due TTL underflow"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1293
+#: src/fs/gnunet-service-fs_cp.c:1314
msgid "# requests dropped due to higher-TTL request"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1322
+#: src/fs/gnunet-service-fs_cp.c:1343
msgid "# P2P query messages received and processed"
msgstr ""
-#: src/fs/gnunet-service-fs_cp.c:1687
+#: src/fs/gnunet-service-fs_cp.c:1713
msgid "# migration stop messages sent"
msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:121
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/fs/gnunet-service-fs_indexing.c:130
+#: src/fs/gnunet-service-fs_indexing.c:181
#, fuzzy, c-format
msgid "Could not open `%s'.\n"
msgstr "无法解析“%s”(%s):%s\n"
-#: src/fs/gnunet-service-fs_indexing.c:137
+#: src/fs/gnunet-service-fs_indexing.c:142
#, fuzzy, c-format
msgid "Error writing `%s'.\n"
msgstr "创建用户出错"
-#: src/fs/gnunet-service-fs_indexing.c:228
+#: src/fs/gnunet-service-fs_indexing.c:237
#, c-format
msgid ""
"Index request received for file `%s' is already indexed as `%s'. Permitting "
"anyway.\n"
msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:266
+#: src/fs/gnunet-service-fs_indexing.c:275
#, c-format
msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:481
+#: src/fs/gnunet-service-fs_indexing.c:477
#, fuzzy, c-format
msgid "Failed to delete bogus block: %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/gnunet-service-fs_indexing.c:539
+#: src/fs/gnunet-service-fs_indexing.c:542
msgid "# index blocks removed: original file inaccessible"
msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:557
#, fuzzy, c-format
msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
msgstr "无法解析“%s”(%s):%s\n"
-#: src/fs/gnunet-service-fs_indexing.c:556
+#: src/fs/gnunet-service-fs_indexing.c:559
msgid "not indexed"
msgstr ""
-#: src/fs/gnunet-service-fs_indexing.c:571
+#: src/fs/gnunet-service-fs_indexing.c:574
#, c-format
msgid "Indexed file `%s' changed at offset %llu\n"
msgstr ""
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:362
-#: src/fs/gnunet-service-fs_lc.c:488
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
msgid "# client searches active"
msgstr ""
@@ -2760,153 +2766,181 @@ msgstr ""
msgid "# replies received for local clients"
msgstr ""
-#: src/fs/gnunet-service-fs_lc.c:321
+#: src/fs/gnunet-service-fs_lc.c:328
msgid "# client searches received"
msgstr ""
-#: src/fs/gnunet-service-fs_lc.c:356
+#: src/fs/gnunet-service-fs_lc.c:363
msgid "# client searches updated (merged content seen list)"
msgstr ""
-#: src/fs/gnunet-service-fs_pe.c:265
+#: src/fs/gnunet-service-fs_pe.c:269
msgid "# average retransmission delay (ms)"
msgstr ""
-#: src/fs/gnunet-service-fs_pe.c:391
+#: src/fs/gnunet-service-fs_pe.c:400
msgid "# transmission failed (core has no bandwidth)"
msgstr ""
-#: src/fs/gnunet-service-fs_pe.c:420
+#: src/fs/gnunet-service-fs_pe.c:433
msgid "# query messages sent to other peers"
msgstr ""
-#: src/fs/gnunet-service-fs_pe.c:469
+#: src/fs/gnunet-service-fs_pe.c:482
msgid "# delay heap timeout"
msgstr ""
-#: src/fs/gnunet-service-fs_pe.c:476
+#: src/fs/gnunet-service-fs_pe.c:490
msgid "# query plans executed"
msgstr ""
-#: src/fs/gnunet-service-fs_pe.c:538
+#: src/fs/gnunet-service-fs_pe.c:550
msgid "# requests merged"
msgstr ""
-#: src/fs/gnunet-service-fs_pe.c:544
+#: src/fs/gnunet-service-fs_pe.c:558
msgid "# requests refreshed"
msgstr ""
-#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:681
-#: src/fs/gnunet-service-fs_pe.c:748
+#: src/fs/gnunet-service-fs_pe.c:612 src/fs/gnunet-service-fs_pe.c:696
+#: src/fs/gnunet-service-fs_pe.c:767
msgid "# query plan entries"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:285
+#: src/fs/gnunet-service-fs_pr.c:312
msgid "# Pending requests created"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:616
+#: src/fs/gnunet-service-fs_pr.c:404 src/fs/gnunet-service-fs_pr.c:667
msgid "# Pending requests active"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:779
+#: src/fs/gnunet-service-fs_pr.c:835
msgid "# replies received and matched"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:808
+#: src/fs/gnunet-service-fs_pr.c:868
msgid "# duplicate replies discarded (bloomfilter)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:822
+#: src/fs/gnunet-service-fs_pr.c:877
+msgid "# irrelevant replies discarded"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:891
#, c-format
msgid "Unsupported block type %u\n"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:835
+#: src/fs/gnunet-service-fs_pr.c:904
msgid "# results found locally"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:953
+#: src/fs/gnunet-service-fs_pr.c:1025
msgid "# Datastore `PUT' failures"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:980
+#: src/fs/gnunet-service-fs_pr.c:1052
msgid "# storage requests dropped due to high load"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1015
+#: src/fs/gnunet-service-fs_pr.c:1087
msgid "# Replies received from DHT"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1106
+#: src/fs/gnunet-service-fs_pr.c:1221
+msgid "# Replies received from STREAM"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1273
#, c-format
-msgid "Datastore lookup already took %llu ms!\n"
+msgid "Datastore lookup already took %s!\n"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1127
+#: src/fs/gnunet-service-fs_pr.c:1293
#, c-format
-msgid "On-demand lookup already took %llu ms!\n"
+msgid "On-demand lookup already took %s!\n"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1174
+#: src/fs/gnunet-service-fs_pr.c:1340
msgid "# Datastore lookups concluded (no results)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1355
msgid "# Datastore lookups concluded (seen all)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1197
+#: src/fs/gnunet-service-fs_pr.c:1364
msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1379
msgid "# requested DBLOCK or IBLOCK not found"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1224
+#: src/fs/gnunet-service-fs_pr.c:1393
msgid "# on-demand blocks matched requests"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1237
+#: src/fs/gnunet-service-fs_pr.c:1406
msgid "# on-demand lookups performed successfully"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1411
msgid "# on-demand lookups failed"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1269 src/fs/gnunet-service-fs_pr.c:1309
-#: src/fs/gnunet-service-fs_pr.c:1447
+#: src/fs/gnunet-service-fs_pr.c:1438 src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1619
msgid "# Datastore lookups concluded (error queueing)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1327
+#: src/fs/gnunet-service-fs_pr.c:1496
msgid "# Datastore lookups concluded (found last result)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1507
msgid "# Datastore lookups concluded (load too high)"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1595
msgid "# Datastore lookups initiated"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1680
msgid "# GAP PUT messages received"
msgstr ""
-#: src/fs/gnunet-service-fs_pr.c:1601 src/fs/gnunet-service-fs_pr.c:1610
-#, fuzzy, c-format
-msgid "Configuration fails to specify `%s', assuming default value."
-msgstr "配置文件“%s”已写入。\n"
-
#: src/fs/gnunet-service-fs_push.c:629
-#, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+msgid "time required, content pushing disabled"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_stream.c:777
+msgid "# replies received via stream"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_stream.c:791
+msgid "# replies received via stream dropped"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_stream.c:930
+#: src/fs/gnunet-service-fs_stream.c:1384
+#, fuzzy
+msgid "# stream connections active"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/fs/gnunet-service-fs_stream.c:1166
+msgid "# Blocks transferred via stream"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_stream.c:1326
+msgid "# queries received via stream"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_stream.c:1376
+msgid "# stream client connections rejected"
msgstr ""
#: src/fs/gnunet-unindex.c:89
@@ -2914,157 +2948,280 @@ msgstr ""
msgid "Unindexing at %llu/%llu (%s remaining)\n"
msgstr ""
-#: src/fs/gnunet-unindex.c:96
+#: src/fs/gnunet-unindex.c:95
#, c-format
msgid "Error unindexing: %s.\n"
msgstr ""
-#: src/fs/gnunet-unindex.c:101
+#: src/fs/gnunet-unindex.c:100
msgid "Unindexing done.\n"
msgstr ""
-#: src/fs/gnunet-unindex.c:131
+#: src/fs/gnunet-unindex.c:130
#, c-format
msgid "You must specify one and only one filename for unindexing.\n"
msgstr ""
-#: src/fs/gnunet-unindex.c:148
+#: src/fs/gnunet-unindex.c:147
msgid "Could not start unindex operation.\n"
msgstr ""
-#: src/fs/gnunet-unindex.c:176
+#: src/fs/gnunet-unindex.c:179
msgid "Unindex a file that was previously indexed with gnunet-publish."
msgstr ""
-#: src/fs/plugin_block_fs.c:131
-msgid "Reply mismatched in terms of namespace. Discarded.\n"
-msgstr ""
+#: src/gns/gns_api.c:598
+#, fuzzy
+msgid "Failed to serialize lookup reply from GNS service!\n"
+msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-gns.c:191
+#: src/gns/gnunet-dns2gns.c:192
#, fuzzy
+msgid "Failed to pack DNS response into UDP packet!\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/gns/gnunet-dns2gns.c:367
+#, c-format
+msgid "Cannot parse DNS request from %s\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:383
+#, c-format
+msgid "Received malformed DNS request from %s\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:391
+#, c-format
+msgid "Received unsupported DNS request from %s\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:679
+msgid "IP of recursive DNS resolver to use (required)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:682
+msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:685
+msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:688
+msgid "UDP port to listen on for inbound DNS requests; default: 53"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:701
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:221
+#, fuzzy, c-format
msgid "Failed to connect to GNS\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-gns.c:232
-msgid "try to shorten a given GNS name"
+#: src/gns/gnunet-gns.c:335
+#, c-format
+msgid "Please specify lookup, shorten or authority operation!\n"
msgstr ""
-#: src/gns/gnunet-gns.c:235
-msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
+#: src/gns/gnunet-gns.c:356
+#, fuzzy
+msgid "try to shorten a given name"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns.c:359
+msgid "Lookup a record for the given name"
msgstr ""
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:362
msgid "Get the authority of a particular name"
msgstr ""
-#: src/gns/gnunet-gns.c:241
-msgid "Specify the type of the record lookup"
+#: src/gns/gnunet-gns.c:365
+msgid "Specify the type of the record to lookup"
msgstr ""
-#: src/gns/gnunet-gns.c:244
+#: src/gns/gnunet-gns.c:368
msgid "No unneeded output"
msgstr ""
-#: src/gns/gnunet-gns.c:255
+#: src/gns/gnunet-gns.c:381
msgid "GNUnet GNS access tool"
msgstr ""
-#: src/gns/gnunet-gns-fcfsd.c:280
+#: src/gns/gnunet-gns-fcfsd.c:451
#, fuzzy, c-format
msgid "Unsupported form value `%s'\n"
msgstr "未知的命令“%s”。\n"
-#: src/gns/gnunet-gns-fcfsd.c:333
+#: src/gns/gnunet-gns-fcfsd.c:480
#, fuzzy, c-format
msgid "Failed to create record for domain `%s': %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/gns/gnunet-gns-fcfsd.c:377
+#: src/gns/gnunet-gns-fcfsd.c:524
#, c-format
msgid "Found existing name `%s' for the given key\n"
msgstr ""
-#: src/gns/gnunet-gns-fcfsd.c:439
+#: src/gns/gnunet-gns-fcfsd.c:586
#, c-format
msgid "Found %u existing records for domain `%s'\n"
msgstr ""
-#: src/gns/gnunet-gns-fcfsd.c:498
+#: src/gns/gnunet-gns-fcfsd.c:648
#, fuzzy, c-format
msgid "Failed to create page for `%s'\n"
msgstr "发送消息失败。\n"
-#: src/gns/gnunet-gns-fcfsd.c:514
+#: src/gns/gnunet-gns-fcfsd.c:664
#, fuzzy, c-format
msgid "Failed to setup post processor for `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/gns/gnunet-gns-fcfsd.c:725 src/gns/gnunet-gns-fcfsd.c:737
-#, fuzzy, c-format
-msgid "Option `%s' not specified in configuration section `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
+#: src/gns/gnunet-gns-fcfsd.c:700
+msgid "Domain name must not contain `.'\n"
+msgstr ""
-#: src/gns/gnunet-gns-fcfsd.c:747 src/namestore/gnunet-namestore.c:299
+#: src/gns/gnunet-gns-fcfsd.c:708
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:912 src/namestore/gnunet-namestore.c:364
#, fuzzy
msgid "Failed to read or create private zone key\n"
msgstr "无法为守护程序创建用户账户。"
-#: src/gns/gnunet-gns-fcfsd.c:757 src/namestore/gnunet-namestore.c:310
+#: src/gns/gnunet-gns-fcfsd.c:922 src/namestore/gnunet-namestore.c:375
#, fuzzy
msgid "Failed to connect to namestore\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
+#: src/gns/gnunet-gns-fcfsd.c:938 src/gns/gnunet-gns-proxy.c:2857
#, fuzzy
msgid "Failed to start HTTP server\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-gns-fcfsd.c:804
+#: src/gns/gnunet-gns-fcfsd.c:972
msgid "GNUnet GNS first come first serve registration service"
msgstr ""
-#: src/gns/gnunet-gns-proxy.c:800
-msgid "listen on specified port"
+#: src/gns/gnunet-gns-proxy.c:2494
+#, fuzzy, c-format
+msgid "Unable to import private key from file `%s'\n"
+msgstr "无法创建用户账户:"
+
+#: src/gns/gnunet-gns-proxy.c:2522
+#, fuzzy, c-format
+msgid "Unable to import certificate %s\n"
+msgstr "无法保存配置文件“%s”:"
+
+#: src/gns/gnunet-gns-proxy.c:3510
+msgid "listen on specified port (default: 7777)"
msgstr ""
-#: src/gns/gnunet-gns-proxy.c:811
+#: src/gns/gnunet-gns-proxy.c:3513
+msgid "pem file to use as CA"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3525
msgid "GNUnet GNS proxy"
msgstr ""
-#: src/hello/gnunet-hello.c:122
+#: src/gns/gnunet-service-gns.c:486
+#, c-format
+msgid "Records for name `%s' in zone %s too large to fit into DHT"
+msgstr ""
+
+#: src/gns/gnunet-service-gns.c:1216
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-service-gns.c:1277
+#, fuzzy
+msgid "Could not connect to DHT!\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/gns/gnunet-service-gns.c:1288
+#, fuzzy
+msgid "Unable to initialize resolver!\n"
+msgstr "无法初始化 SQLite:%s。\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:3439
+#, c-format
+msgid "Not a GADS TLD: `%s'\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:118
msgid "Call with name of HELLO file to modify.\n"
msgstr ""
-#: src/hello/gnunet-hello.c:128
+#: src/hello/gnunet-hello.c:124
#, fuzzy, c-format
msgid "Error accessing file `%s': %s\n"
msgstr "创建用户出错"
-#: src/hello/gnunet-hello.c:136
+#: src/hello/gnunet-hello.c:132
#, c-format
msgid "File `%s' is too big to be a HELLO\n"
msgstr ""
-#: src/hello/gnunet-hello.c:143
+#: src/hello/gnunet-hello.c:139
#, c-format
msgid "File `%s' is too small to be a HELLO\n"
msgstr ""
-#: src/hello/gnunet-hello.c:153 src/hello/gnunet-hello.c:181
+#: src/hello/gnunet-hello.c:149 src/hello/gnunet-hello.c:177
#, fuzzy, c-format
msgid "Error opening file `%s': %s\n"
msgstr "创建用户出错"
-#: src/hello/gnunet-hello.c:169
+#: src/hello/gnunet-hello.c:165
#, c-format
msgid "Did not find well-formed HELLO in file `%s'\n"
msgstr ""
-#: src/hello/gnunet-hello.c:193
+#: src/hello/gnunet-hello.c:189
#, fuzzy, c-format
msgid "Error writing HELLO to file `%s': %s\n"
msgstr "创建用户出错"
+#: src/hello/hello.c:904
+#, fuzzy
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "保存配置失败。"
+
+#: src/hello/hello.c:913
+#, fuzzy
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "保存配置失败。"
+
+#: src/hello/hello.c:923
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/hello/hello.c:933
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr ""
+
+#: src/hello/hello.c:950
+#, c-format
+msgid "Plugin `%s' not found\n"
+msgstr ""
+
+#: src/hello/hello.c:959
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/hello/hello.c:978
+#, 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:264
msgid ""
"None of the functions for the hostlist daemon were enabled. I have no "
@@ -3089,7 +3246,7 @@ msgstr ""
msgid "provide a hostlist server"
msgstr ""
-#: src/hostlist/gnunet-daemon-hostlist.c:341
+#: src/hostlist/gnunet-daemon-hostlist.c:344
msgid "GNUnet hostlist server and client"
msgstr ""
@@ -3110,173 +3267,137 @@ msgstr ""
msgid "# valid HELLOs downloaded from hostlist servers"
msgstr ""
-#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
-#, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:473 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:961 src/hostlist/hostlist-client.c:966
-#: src/transport/plugin_transport_http_client.c:110
-#: src/transport/plugin_transport_http_client.c:125
+#: 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:958 src/hostlist/hostlist-client.c:963
+#: src/transport/plugin_transport_http_client.c:1052
+#: src/transport/plugin_transport_http_client.c:1067
#, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1325
msgid "# advertised hostlist URIs"
msgstr ""
-#: src/hostlist/hostlist-client.c:623
+#: src/hostlist/hostlist-client.c:619
#, c-format
msgid "# advertised URI `%s' downloaded"
msgstr ""
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/hostlist-client.c:661
#, c-format
msgid ""
"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
"gets dismissed.\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/hostlist-client.c:799
#, c-format
msgid "Timeout trying to download hostlist from `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/hostlist-client.c:813
#, c-format
msgid "Download limit of %u bytes exceeded, stopping download\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/hostlist-client.c:833
#, fuzzy, c-format
msgid "Download of hostlist from `%s' failed: `%s'\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:839
#, c-format
msgid "Download of hostlist `%s' completed.\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/hostlist-client.c:847
#, c-format
msgid "Adding successfully tested hostlist `%s' datastore.\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/hostlist-client.c:900
#, c-format
msgid "Bootstrapping using hostlist at `%s'.\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/hostlist-client.c:908
msgid "# hostlist downloads initiated"
msgstr ""
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
+#: src/hostlist/hostlist-client.c:1035 src/hostlist/hostlist-client.c:1498
msgid "# milliseconds between hostlist downloads"
msgstr ""
-#: src/hostlist/hostlist-client.c:1046
+#: src/hostlist/hostlist-client.c:1043
#, c-format
-msgid "Have %u/%u connections. Will consider downloading hostlist in %llums\n"
+msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1084
-msgid "Scheduled saving of hostlists\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1088
-#, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127
+#: src/hostlist/hostlist-client.c:1107 src/hostlist/hostlist-client.c:1123
msgid "# active connections"
msgstr ""
-#: src/hostlist/hostlist-client.c:1242
-#, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
-msgstr ""
-
#: src/hostlist/hostlist-client.c:1273
#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1279
-#, c-format
msgid "Loading saved hostlist entries from file `%s' \n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1283
+#: src/hostlist/hostlist-client.c:1277
#, c-format
-msgid "Hostlist file `%s' is not existing\n"
+msgid "Hostlist file `%s' does not exist\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1288
#, 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:1327
+#: src/hostlist/hostlist-client.c:1321
#, c-format
msgid "%u hostlist URIs loaded from file\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/hostlist-client.c:1323
msgid "# hostlist URIs read from file"
msgstr ""
-#: src/hostlist/hostlist-client.c:1362
-#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/hostlist-client.c:1368
#, fuzzy, c-format
msgid "Could not open file `%s' for writing to save hostlists: %s\n"
msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/hostlist-client.c:1373
#, c-format
msgid "Writing %u hostlist URIs to `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/hostlist-client.c:1397 src/hostlist/hostlist-client.c:1414
#, c-format
msgid "Error writing hostlist URIs to file `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/hostlist-client.c:1409
msgid "# hostlist URIs written to file"
msgstr ""
-#: src/hostlist/hostlist-client.c:1470
+#: src/hostlist/hostlist-client.c:1463
msgid "Learning is enabled on this peer\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1473
-#, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1482
+#: src/hostlist/hostlist-client.c:1475
msgid "Learning is not enabled on this peer\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1494
+#: src/hostlist/hostlist-client.c:1487
#, c-format
msgid ""
"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1498
+#: src/hostlist/hostlist-client.c:1491
#, c-format
msgid "Hostlist file `%s' could not be removed\n"
msgstr ""
@@ -3290,9 +3411,9 @@ msgid "expired addresses encountered"
msgstr ""
#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:403
-#: src/peerinfo-tool/gnunet-peerinfo.c:519
-#: src/topology/gnunet-daemon-topology.c:927
+#: src/peerinfo-tool/gnunet-peerinfo.c:331
+#: src/peerinfo-tool/gnunet-peerinfo.c:386
+#: src/topology/gnunet-daemon-topology.c:922
#, c-format
msgid "Error in communication with PEERINFO service: %s\n"
msgstr ""
@@ -3314,10 +3435,6 @@ msgstr ""
msgid "hostlist requests refused (not HTTP GET)"
msgstr ""
-#: src/hostlist/hostlist-server.c:273
-msgid "Sending 100 CONTINUE reply\n"
-msgstr ""
-
#: src/hostlist/hostlist-server.c:279
#, c-format
msgid "Refusing `%s' request with %llu bytes of upload data\n"
@@ -3351,64 +3468,101 @@ msgstr ""
msgid "Advertisement message could not be queued by core\n"
msgstr ""
-#: src/hostlist/hostlist-server.c:561
+#: src/hostlist/hostlist-server.c:562
#, c-format
msgid "Invalid port number %llu. Exiting.\n"
msgstr ""
-#: src/hostlist/hostlist-server.c:570
+#: src/hostlist/hostlist-server.c:571
#, c-format
msgid "Hostlist service starts on %s:%llu\n"
msgstr ""
-#: src/hostlist/hostlist-server.c:584
+#: src/hostlist/hostlist-server.c:585
#, c-format
msgid "Address to obtain hostlist: `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-server.c:624
+#: src/hostlist/hostlist-server.c:625
#, fuzzy, c-format
msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
msgstr "“%s”不可用。\n"
-#: src/hostlist/hostlist-server.c:666
+#: src/hostlist/hostlist-server.c:667
#, c-format
msgid "Could not start hostlist HTTP server on port %u\n"
msgstr ""
-#: src/integration-tests/connection_watchdog.c:997
+#: src/integration-tests/connection_watchdog.c:1001
#, c-format
msgid "Transport plugin: `%s' port %llu\n"
msgstr ""
-#: src/integration-tests/connection_watchdog.c:1030
+#: src/integration-tests/connection_watchdog.c:1034
#, fuzzy, c-format
msgid "Found %u transport plugins: `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/integration-tests/connection_watchdog.c:1089
+#: src/integration-tests/connection_watchdog.c:1093
msgid "Send ping messages to test connectivity (default == NO)"
msgstr ""
-#: src/integration-tests/connection_watchdog.c:1095
-#: src/template/gnunet-template.c:68
+#: src/integration-tests/connection_watchdog.c:1102
+#: src/template/gnunet-template.c:70
msgid "help text"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:4590
-msgid "Wrong CORE service\n"
+#: src/mesh/gnunet-mesh.c:211
+msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:4784
+#: src/mesh/gnunet-mesh.c:214
#, fuzzy
-msgid "Mesh service is lacking key configuration settings. Exiting.\n"
-msgstr "立即保存配置?"
+msgid "provide information about a particular tunnel"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
-#: src/mesh/gnunet-service-mesh.c:4793
+#: src/mesh/gnunet-mesh.c:224
#, fuzzy
-msgid "Mesh service could not access hostkey. Exiting.\n"
+msgid "Print information about mesh tunnels and peers."
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/mesh/gnunet-service-mesh.c:8015 src/mesh/gnunet-service-mesh-new.c:8015
+msgid "Wrong CORE service\n"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:8232 src/mesh/gnunet-service-mesh-new.c:8232
+#, fuzzy, c-format
+msgid "Mesh service could not access hostkey: %s. Exiting.\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/mesh/gnunet-service-mesh.c:8314 src/mesh/gnunet-service-mesh.c:8326
+#: src/mesh/gnunet-service-mesh.c:8338 src/mesh/gnunet-service-mesh.c:8352
+#: src/mesh/gnunet-service-mesh.c:8364 src/mesh/gnunet-service-mesh.c:8376
+#: src/mesh/gnunet-service-mesh.c:8388 src/mesh/gnunet-service-mesh-new.c:8321
+#: src/mesh/gnunet-service-mesh-new.c:8333
+#: src/mesh/gnunet-service-mesh-new.c:8345
+#: src/mesh/gnunet-service-mesh-new.c:8359
+#: src/mesh/gnunet-service-mesh-new.c:8371
+#: src/mesh/gnunet-service-mesh-new.c:8383
+#: src/mesh/gnunet-service-mesh-new.c:8395
+#: src/regex/gnunet-daemon-regexprofiler.c:335
+#: src/regex/gnunet-daemon-regexprofiler.c:347
+#: src/regex/gnunet-daemon-regexprofiler.c:360
+#: src/regex/gnunet-daemon-regexprofiler.c:373
+#: 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:8400 src/mesh/gnunet-service-mesh.c:8410
+#: src/mesh/gnunet-service-mesh.c:8421 src/mesh/gnunet-service-mesh-new.c:8407
+#: src/mesh/gnunet-service-mesh-new.c:8417
+#: src/mesh/gnunet-service-mesh-new.c:8428
+#, 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"
@@ -3419,195 +3573,320 @@ msgstr ""
msgid "Could not access file `%s': %s\n"
msgstr "无法解析“%s”(%s):%s\n"
-#: src/namestore/gnunet-namestore.c:157
+#: src/namestore/gnunet-namestore.c:212
#, c-format
msgid "Adding record failed: %s\n"
msgstr ""
-#: src/namestore/gnunet-namestore.c:183
+#: src/namestore/gnunet-namestore.c:243
#, c-format
msgid "Deleting record failed: %s\n"
msgstr ""
-#: src/namestore/gnunet-namestore.c:239
+#: src/namestore/gnunet-namestore.c:304
#, c-format
msgid "\tCorrupt or unsupported record of type %u\n"
msgstr ""
-#: src/namestore/gnunet-namestore.c:276
-#, c-format
-msgid "Option `%s' not given, but I need a zone key file!\n"
+#: src/namestore/gnunet-namestore.c:320
+msgid "for at least"
msgstr ""
-#: src/namestore/gnunet-namestore.c:281
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "卸载 GNUnet 服务"
+#: src/namestore/gnunet-namestore.c:321
+msgid "until"
+msgstr ""
-#: src/namestore/gnunet-namestore.c:291
+#: src/namestore/gnunet-namestore.c:356
#, c-format
msgid "No options given\n"
msgstr ""
-#: src/namestore/gnunet-namestore.c:321
+#: src/namestore/gnunet-namestore.c:386
#, fuzzy, c-format
msgid "Unsupported type `%s'\n"
msgstr "未知的命令“%s”。\n"
-#: src/namestore/gnunet-namestore.c:328 src/namestore/gnunet-namestore.c:350
-#: src/namestore/gnunet-namestore.c:374 src/namestore/gnunet-namestore.c:384
-#: src/namestore/gnunet-namestore.c:409
+#: src/namestore/gnunet-namestore.c:394 src/namestore/gnunet-namestore.c:418
+#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:477
+#: src/namestore/gnunet-namestore.c:518
#, fuzzy, c-format
msgid "Missing option `%s' for operation `%s'\n"
msgstr "配置文件“%s”已写入。\n"
-#: src/namestore/gnunet-namestore.c:329 src/namestore/gnunet-namestore.c:351
+#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
msgid "add/del"
msgstr ""
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:408
#, c-format
msgid "Value `%s' invalid for record type `%s'\n"
msgstr ""
-#: src/namestore/gnunet-namestore.c:366
+#: src/namestore/gnunet-namestore.c:446
#, fuzzy, c-format
msgid "Invalid time format `%s'\n"
msgstr "IP 格式无效:“%s”\n"
-#: src/namestore/gnunet-namestore.c:375 src/namestore/gnunet-namestore.c:385
+#: src/namestore/gnunet-namestore.c:455
+#, c-format
+msgid ""
+"Deletion requires either absolute time, or no time at all. Got relative time "
+"`%s' instead.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
+#: src/namestore/gnunet-namestore.c:497
msgid "add"
msgstr ""
-#: src/namestore/gnunet-namestore.c:410
+#: src/namestore/gnunet-namestore.c:496
+#, fuzzy, c-format
+msgid "No valid expiration time for operation `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/namestore/gnunet-namestore.c:519
msgid "del"
msgstr ""
-#: src/namestore/gnunet-namestore.c:462
+#: src/namestore/gnunet-namestore.c:569
+#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/namestore/gnunet-namestore.c:625
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/namestore/gnunet-namestore.c:677
msgid "add record"
msgstr ""
-#: src/namestore/gnunet-namestore.c:465
+#: src/namestore/gnunet-namestore.c:680
msgid "delete record"
msgstr ""
-#: src/namestore/gnunet-namestore.c:468
+#: src/namestore/gnunet-namestore.c:683
msgid "display records"
msgstr ""
-#: src/namestore/gnunet-namestore.c:471
+#: src/namestore/gnunet-namestore.c:686
msgid ""
"expiration time for record to use (for adding only), \"never\" is possible"
msgstr ""
-#: src/namestore/gnunet-namestore.c:474
+#: src/namestore/gnunet-namestore.c:689
msgid "name of the record to add/delete/display"
msgstr ""
-#: src/namestore/gnunet-namestore.c:477
+#: src/namestore/gnunet-namestore.c:692
msgid "type of the record to add/delete/display"
msgstr ""
-#: src/namestore/gnunet-namestore.c:480
+#: src/namestore/gnunet-namestore.c:695
+msgid "URI to import into our zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:698
msgid "value of the record to add/delete"
msgstr ""
-#: src/namestore/gnunet-namestore.c:483
+#: src/namestore/gnunet-namestore.c:701
msgid "create or list public record"
msgstr ""
-#: src/namestore/gnunet-namestore.c:486
+#: src/namestore/gnunet-namestore.c:704
msgid "create or list non-authority record"
msgstr ""
-#: src/namestore/gnunet-namestore.c:489
+#: src/namestore/gnunet-namestore.c:707
msgid "filename with the zone key"
msgstr ""
-#: src/namestore/gnunet-namestore.c:500
+#: src/namestore/gnunet-namestore.c:718
#, fuzzy
msgid "GNUnet zone manipulation tool"
msgstr "GNUnet 配置"
-#: src/namestore/gnunet-service-namestore.c:143
-#, c-format
-msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
-msgstr ""
+#: src/namestore/gnunet-service-namestore.c:241
+#: src/namestore/gnunet-service-namestore.c:257
+#, fuzzy, c-format
+msgid "Failed to write zone key to file `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
-#: src/namestore/gnunet-service-namestore.c:154
-#, c-format
-msgid "File zone `%s' containing this key already exists\n"
+#: src/namestore/gnunet-service-namestore.c:243
+msgid "file exists but reading key failed"
msgstr ""
-#: src/namestore/gnunet-service-namestore.c:160
-#, c-format
-msgid ""
-"File zone `%s' but different zone key already exists, failed to write! \n"
+#: src/namestore/gnunet-service-namestore.c:259
+msgid "file exists with different key"
msgstr ""
-#: src/namestore/gnunet-service-namestore.c:198
+#: src/namestore/gnunet-service-namestore.c:1557
+#, fuzzy
+msgid "Failed to find record to remove\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/namestore/gnunet-service-namestore.c:2172
#, fuzzy, c-format
-msgid "Stored zonekey for zone `%s' in file `%s'\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+msgid "Could not parse zone key file `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/namestore/gnunet-service-namestore.c:1909
+#: src/namestore/gnunet-service-namestore.c:2262
msgid "No directory to load zonefiles specified in configuration\n"
msgstr ""
-#: src/namestore/gnunet-service-namestore.c:1918
+#: src/namestore/gnunet-service-namestore.c:2272
#, c-format
msgid "Creating directory `%s' for zone files failed!\n"
msgstr ""
-#: src/namestore/namestore_api.c:315 src/namestore/namestore_api.c:353
-msgid "Namestore added record successfully"
-msgstr ""
-
-#: src/namestore/namestore_api.c:323
+#: src/namestore/namestore_api.c:345
msgid "Namestore failed to add record"
msgstr ""
-#: src/namestore/namestore_api.c:361
-msgid "Namestore record already existed"
-msgstr ""
-
-#: src/namestore/namestore_api.c:368
+#: src/namestore/namestore_api.c:371
msgid "Namestore failed to add record\n"
msgstr ""
-#: src/namestore/namestore_api.c:401
+#: src/namestore/namestore_api.c:415
#, fuzzy
-msgid "Namestore removed record successfully"
-msgstr "GNUnet 服务安装成功。\n"
+msgid "Failed to create new signature"
+msgstr "发送消息失败。\n"
-#: src/namestore/namestore_api.c:408
-msgid "No records for entry"
+#: src/namestore/namestore_api.c:419
+msgid "Failed to put new set of records in database"
msgstr ""
-#: src/namestore/namestore_api.c:415
+#: src/namestore/namestore_api.c:423
#, fuzzy
-msgid "Could not find record to remove"
-msgstr "无法连接到 %s:%u:%s\n"
+msgid "Failed to remove records from database"
+msgstr "发送消息失败。\n"
-#: src/namestore/namestore_api.c:422
+#: src/namestore/namestore_api.c:427
#, fuzzy
-msgid "Failed to create new signature"
-msgstr "发送消息失败。\n"
+msgid "Failed to access database"
+msgstr "打开日志文件“%s”失败:%s\n"
-#: src/namestore/namestore_api.c:429
-msgid "Failed to put new set of records in database"
+#: src/namestore/namestore_api.c:431
+#, fuzzy
+msgid "unknown internal error in namestore"
+msgstr "未知错误。\n"
+
+#: src/namestore/namestore_api.c:436
+msgid "Protocol error"
msgstr ""
+#: src/namestore/namestore_common.c:530 src/namestore/namestore_common.c:670
+#, fuzzy, c-format
+msgid "Unsupported record type %d\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/namestore/namestore_common.c:537
+#, fuzzy, c-format
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/namestore/namestore_common.c:560
+#, fuzzy, c-format
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/namestore_common.c:583
+#, fuzzy, c-format
+msgid "Unable to parse MX record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/namestore_common.c:601
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/namestore/namestore_common.c:614
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/namestore_common.c:635
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/namestore_common.c:661
+#, 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"
+msgstr "发送消息失败。\n"
+
#: src/nat/gnunet-nat-server.c:279
#, c-format
msgid "Please pass valid port number as the first argument! (got `%s')\n"
msgstr ""
-#: src/nat/gnunet-nat-server.c:318
+#: src/nat/gnunet-nat-server.c:321
msgid "GNUnet NAT traversal test helper daemon"
msgstr ""
-#: src/nat/nat.c:799
+#: src/nat/nat_auto.c:169
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:199
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:200
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:219
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:265
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:331
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:347
+#, fuzzy, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
+
+#: src/nat/nat_auto.c:400
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:401
+msgid "upnpc not found\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:434
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:435
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:469
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:470
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+msgstr ""
+
+#: src/nat/nat.c:795
#, c-format
msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
msgstr ""
@@ -3617,27 +3896,34 @@ msgstr ""
msgid "Failed to start %s\n"
msgstr "运行 %s失败:%s %d\n"
-#: src/nat/nat.c:1111
-#, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "保存配置失败。"
+#: src/nat/nat.c:1113
+msgid "malformed"
+msgstr ""
-#: src/nat/nat.c:1177 src/nat/nat.c:1187
+#: src/nat/nat.c:1179 src/nat/nat.c:1191
#, c-format
msgid ""
"Configuration requires `%s', but binary is not installed properly (SUID bit "
"not set). Option disabled.\n"
msgstr ""
-#: src/nat/nat.c:1321
+#: src/nat/nat.c:1326
msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
msgstr ""
-#: src/nat/nat.c:1332
+#: src/nat/nat.c:1337
#, c-format
msgid "Running gnunet-helper-nat-client %s %s %u\n"
msgstr ""
+#: src/nat/nat_mini.c:170
+msgid "`external-ip' command not found\n"
+msgstr ""
+
+#: src/nat/nat_mini.c:505
+msgid "`upnpc' command not found\n"
+msgstr ""
+
#: src/nat/nat_test.c:341
msgid "Failed to connect to `gnunet-nat-server'\n"
msgstr ""
@@ -3647,81 +3933,112 @@ msgstr ""
msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
msgstr ""
-#: src/nse/gnunet-nse-profiler.c:928
+#: src/nse/gnunet-nse-profiler.c:1009
+msgid "limit to the number of connections to NSE services, 0 for none"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1012
+msgid "name of the file for writing connection information and statistics"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1015
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1018
+msgid "IP address of this system as seen by the rest of the testbed"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1021
+msgid "delay between queries to statistics during a round"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1024
+msgid "prefix of the filenames we use for writing the topology for each round"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1027
+msgid "name of the file for writing the main results"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1030
+msgid "Number of peers to run in each round, separated by commas"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1036
+msgid "delay between rounds"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1046
#, fuzzy
msgid "Measure quality and performance of the NSE service."
msgstr "无法访问该服务"
-#: src/nse/gnunet-service-nse.c:925
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
-msgstr ""
+#: src/nse/gnunet-service-nse.c:1389
+#, fuzzy, c-format
+msgid "NSE service could not access hostkey: %s\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/nse/gnunet-service-nse.c:1381 src/nse/gnunet-service-nse.c:1400
-#: src/nse/gnunet-service-nse.c:1421
+#: src/nse/gnunet-service-nse.c:1403 src/nse/gnunet-service-nse.c:1478
+#: src/nse/gnunet-service-nse.c:1495
msgid "NSE service is lacking key configuration settings. Exiting.\n"
msgstr ""
-#: src/nse/gnunet-service-nse.c:1388
+#: src/nse/gnunet-service-nse.c:1485
msgid "Invalid work requirement for NSE service. Exiting.\n"
msgstr ""
-#: src/nse/gnunet-service-nse.c:1409
-#, fuzzy
-msgid "NSE service could not access hostkey. Exiting.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
#: src/peerinfo/gnunet-service-peerinfo.c:134
#, c-format
msgid "Removing expired address of transport `%s'\n"
msgstr ""
-#: src/peerinfo/gnunet-service-peerinfo.c:203
+#: src/peerinfo/gnunet-service-peerinfo.c:230
#, fuzzy, c-format
msgid "Failed to parse HELLO in file `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/peerinfo/gnunet-service-peerinfo.c:229
+#: src/peerinfo/gnunet-service-peerinfo.c:269
msgid "# peers known"
msgstr ""
-#: src/peerinfo/gnunet-service-peerinfo.c:254
+#: src/peerinfo/gnunet-service-peerinfo.c:297
#, c-format
msgid ""
"File `%s' in directory `%s' does not match naming convention. Removed.\n"
msgstr ""
-#: src/peerinfo/gnunet-service-peerinfo.c:353
+#: src/peerinfo/gnunet-service-peerinfo.c:419
#, c-format
msgid "Still no peers found in `%s'!\n"
msgstr ""
-#: src/peerinfo/gnunet-service-peerinfo.c:710
+#: src/peerinfo/gnunet-service-peerinfo.c:807
#, c-format
msgid "Importing HELLOs from `%s'\n"
msgstr ""
-#: src/peerinfo/peerinfo_api.c:238
+#: src/peerinfo/peerinfo_api.c:239
msgid "aborted due to explicit disconnect request"
msgstr ""
-#: src/peerinfo/peerinfo_api.c:358
+#: src/peerinfo/peerinfo_api.c:359
#, fuzzy
msgid "failed to transmit request (service down?)"
msgstr "初始化“%s”服务失败。\n"
-#: src/peerinfo/peerinfo_api.c:505
+#: src/peerinfo/peerinfo_api.c:509
msgid "Failed to receive response from `PEERINFO' service."
msgstr ""
-#: src/peerinfo/peerinfo_api.c:531 src/peerinfo/peerinfo_api.c:550
-#: src/peerinfo/peerinfo_api.c:565 src/peerinfo/peerinfo_api.c:576
-#: src/peerinfo/peerinfo_api.c:587
+#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
+#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
+#: src/peerinfo/peerinfo_api.c:606
#, fuzzy
msgid "Received invalid message from `PEERINFO' service."
msgstr "“%s”的参数无效。\n"
-#: src/peerinfo/peerinfo_api.c:663
+#: src/peerinfo/peerinfo_api.c:681
#, fuzzy
msgid "Timeout transmitting iteration request to `PEERINFO' service."
msgstr "初始化“%s”服务失败。\n"
@@ -3731,91 +4048,52 @@ msgstr "初始化“%s”服务失败。\n"
msgid "Could not connect to `%s' service.\n"
msgstr "无法连接到 %s:%u:%s\n"
-#: src/peerinfo-tool/gnunet-peerinfo.c:581
-#, fuzzy
-msgid "Failed to parse HELLO message: missing expiration time\n"
-msgstr "保存配置失败。"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:589
-#, fuzzy
-msgid "Failed to parse HELLO message: invalid expiration time\n"
-msgstr "保存配置失败。"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:598
-#, fuzzy
-msgid "Failed to parse HELLO message: malformed\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:608
-msgid "Failed to parse HELLO message: missing transport plugin\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:625
-#, c-format
-msgid "Plugin `%s' not found\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:634
-#, c-format
-msgid "Plugin `%s' does not support URIs yet\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:653
-#, fuzzy, c-format
-msgid "Failed to parse `%s' as an address for plugin `%s'\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:685
+#: src/peerinfo-tool/gnunet-peerinfo.c:419
#, c-format
msgid "Failure adding HELLO: %s\n"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:833
+#: src/peerinfo-tool/gnunet-peerinfo.c:557
#, fuzzy, c-format
msgid "Could not find option `%s:%s' in configuration.\n"
msgstr "找不到主机“%s”的 IP:%s\n"
-#: src/peerinfo-tool/gnunet-peerinfo.c:840
+#: src/peerinfo-tool/gnunet-peerinfo.c:563
#, c-format
msgid "Loading hostkey from `%s' failed.\n"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:875
-#, fuzzy, c-format
-msgid "Invalid URI `%s'\n"
-msgstr "无效条目。\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:899
+#: src/peerinfo-tool/gnunet-peerinfo.c:622
#, c-format
msgid "I am peer `%s'.\n"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:936
+#: src/peerinfo-tool/gnunet-peerinfo.c:648
msgid "don't resolve host names"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:939
+#: src/peerinfo-tool/gnunet-peerinfo.c:651
msgid "output only the identity strings"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:942
+#: src/peerinfo-tool/gnunet-peerinfo.c:654
msgid "output our own identity only"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:945
+#: src/peerinfo-tool/gnunet-peerinfo.c:657
#, fuzzy
msgid "list all known peers"
msgstr "列出所有网络适配器"
-#: src/peerinfo-tool/gnunet-peerinfo.c:948
+#: src/peerinfo-tool/gnunet-peerinfo.c:660
msgid "also output HELLO uri(s)"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:951
+#: src/peerinfo-tool/gnunet-peerinfo.c:663
msgid "add given HELLO uri to the database"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:957
+#: src/peerinfo-tool/gnunet-peerinfo.c:674
#, fuzzy
msgid "Print information about peers."
msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -3902,461 +4180,551 @@ msgstr ""
msgid "Failed to connect to %s service. Exiting.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/pt/gnunet-daemon-pt.c:973
+#: src/pt/gnunet-daemon-pt.c:976
msgid "Daemon to run to perform IP protocol translation to GNUnet"
msgstr ""
-#: src/statistics/gnunet-service-statistics.c:271
-#, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+#: src/regex/gnunet-daemon-regexprofiler.c:293
+#, fuzzy, c-format
+msgid "Regexprofiler could not access hostkey: %s. Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/regex/gnunet-daemon-regexprofiler.c:452
+msgid "Daemon to announce regular expressions for the peer using mesh."
msgstr ""
-#: src/statistics/gnunet-service-statistics.c:330
-#, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+#: src/regex/gnunet-regex-profiler.c:1147
+msgid "An operation has failed while starting peers\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:122
-#, fuzzy
-msgid "Failed to obtain statistics.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/regex/gnunet-regex-profiler.c:1193
+#, fuzzy, c-format
+msgid "Creating a peer failed. Error: %s\n"
+msgstr "“%s”以错误码 %d 失败:%s\n"
-#: src/statistics/gnunet-statistics.c:199
-#, c-format
-msgid "No subsystem or name given\n"
+#: src/regex/gnunet-regex-profiler.c:1320
+msgid "An operation has failed while starting slaves\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:207
+#: src/regex/gnunet-regex-profiler.c:1342
#, fuzzy, c-format
-msgid "Failed to initialize watch routine\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "No files found in `%s'\n"
+msgstr "运行 %s失败:%s %d\n"
-#: src/statistics/gnunet-statistics.c:227
-msgid "limit output to statistics for the given NAME"
+#: src/regex/gnunet-regex-profiler.c:1397
+msgid "An operation has failed while linking\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:230
-msgid "make the value being set persistent"
+#: src/regex/gnunet-regex-profiler.c:1508
+#: src/testbed/testbed_api_testbed.c:805
+#, c-format
+msgid "Host registration failed for a host. Error: %s\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:233
-msgid "limit output to the given SUBSYSTEM"
+#: src/regex/gnunet-regex-profiler.c:1589
+msgid "Unable to connect to master controller -- Check config\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:236
-msgid "just print the statistics value"
+#: src/regex/gnunet-regex-profiler.c:1691
+#: src/testbed/testbed_api_testbed.c:970
+#, c-format
+msgid "Host %s cannot start testbed\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:239
-msgid "watch value continously"
+#: src/regex/gnunet-regex-profiler.c:1694
+#: src/testbed/testbed_api_testbed.c:974
+msgid "Testbed cannot be started on localhost\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:246
-msgid "Print statistics about GNUnet operations."
+#: src/regex/gnunet-regex-profiler.c:1734
+#, c-format
+msgid "No hosts-file specified on command line. Exiting.\n"
msgstr ""
-#: src/statistics/statistics_api.c:456
-#, fuzzy
-msgid "Could not save some persistent statistics\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/regex/gnunet-regex-profiler.c:1739
+#: src/regex/gnunet-regex-simulation-profiler.c:622
+#, c-format
+msgid "No policy directory specified on command line. Exiting.\n"
+msgstr ""
-#: src/statistics/statistics_api.c:999
-msgid ""
-"Failed to receive acknowledgement from statistics service, some statistics "
-"might have been lost!\n"
+#: src/regex/gnunet-regex-profiler.c:1745
+#: src/testbed/testbed_api_testbed.c:1065
+#, c-format
+msgid "No hosts loaded. Need at least one host\n"
msgstr ""
-#: src/testing/gnunet-testing.c:157
-#, fuzzy
-msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/regex/gnunet-regex-profiler.c:1748
+#, c-format
+msgid "Checking whether given hosts can start testbed. Please wait\n"
+msgstr ""
-#: src/testing/gnunet-testing.c:159
+#: src/regex/gnunet-regex-profiler.c:1769
+#, fuzzy, c-format
+msgid "Exiting\n"
+msgstr "退出"
+
+#: src/regex/gnunet-regex-profiler.c:1775
#, c-format
-msgid "Specified hostkey file `%s' not found!\n"
+msgid "No configuration file given. Exiting\n"
msgstr ""
-#: src/testing/gnunet-testing.c:273
-#, fuzzy
-msgid "create unique configuration files"
-msgstr "更改配置文件中的一个值"
+#: src/regex/gnunet-regex-profiler.c:1784
+#, fuzzy, c-format
+msgid "Configuration option (regex_prefix) missing. Exiting\n"
+msgstr "配置文件“%s”已写入。\n"
-#: src/testing/gnunet-testing.c:275
-msgid "create hostkey files from pre-computed hostkey list"
+#: src/regex/gnunet-regex-profiler.c:1802
+#: src/regex/gnunet-regex-simulation-profiler.c:629
+#, c-format
+msgid "Specified policies directory does not exist. Exiting.\n"
msgstr ""
-#: src/testing/gnunet-testing.c:277
-msgid "host key file"
+#: src/regex/gnunet-regex-profiler.c:1809
+#, c-format
+msgid "No search strings file given. Exiting.\n"
msgstr ""
-#: src/testing/gnunet-testing.c:279
-#, fuzzy
-msgid "number of unique configuration files or hostkeys to create"
-msgstr "打印配置文件中的一个值到标准输出"
+#: src/regex/gnunet-regex-profiler.c:1817
+#, c-format
+msgid ""
+"Error loading search strings. Given file does not contain enough strings. "
+"Exiting.\n"
+msgstr ""
-#: src/testing/gnunet-testing.c:281
+#: src/regex/gnunet-regex-profiler.c:1823
+#, fuzzy, c-format
+msgid "Error loading search strings. Exiting.\n"
+msgstr "创建用户出错"
+
+#: src/regex/gnunet-regex-profiler.c:1850
#, fuzzy
-msgid "configuration template"
-msgstr "配置已保存"
+msgid "name of the file for writing statistics"
+msgstr "初始化“%s”服务失败。\n"
-#: src/testing/gnunet-testing.c:287
-msgid "Command line tool to access the testing library"
+#: src/regex/gnunet-regex-profiler.c:1853
+msgid "create COUNT number of random links between peers"
msgstr ""
-#: src/testing/helper.c:56
-#, fuzzy
-msgid "Peer is lacking HOSTKEY configuration setting.\n"
-msgstr "立即保存配置?"
+#: src/regex/gnunet-regex-profiler.c:1856
+msgid "wait TIMEOUT before considering a string match as failed"
+msgstr ""
-#: src/testing/helper.c:64
-#, fuzzy
-msgid "Could not access hostkey.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/regex/gnunet-regex-profiler.c:1859
+msgid "wait DELAY before starting string search"
+msgstr ""
-#: src/testing/testing.c:200
-msgid "`scp' does not seem to terminate (timeout copying config).\n"
+#: src/regex/gnunet-regex-profiler.c:1862
+msgid "number of search strings to read from search strings file"
msgstr ""
-#: src/testing/testing.c:214 src/testing/testing.c:798
-msgid "`scp' did not complete cleanly.\n"
+#: src/regex/gnunet-regex-profiler.c:1865
+#: src/regex/gnunet-regex-simulation-profiler.c:692
+msgid "maximum path compression length"
msgstr ""
-#: src/testing/testing.c:237
-#, fuzzy
-msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/regex/gnunet-regex-profiler.c:1868
+msgid ""
+"if this option is set, only one peer is responsible for searching all strings"
+msgstr ""
+
+#: src/regex/gnunet-regex-profiler.c:1881
+msgid "Profiler for regex"
+msgstr ""
+
+#: src/regex/gnunet-regex-simulation-profiler.c:689
+msgid "name of the table to write DFAs"
+msgstr ""
+
+#: src/regex/gnunet-regex-simulation-profiler.c:705
+msgid "Profiler for regex library"
+msgstr ""
+
+#: src/statistics/gnunet-service-statistics.c:271
+#, c-format
+msgid "Loading %llu bytes of statistics from `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-service-statistics.c:330
+#, c-format
+msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgstr ""
-#: src/testing/testing.c:238
+#: src/statistics/gnunet-statistics.c:141
#, fuzzy
-msgid "Failed to create pipe for `ssh' process.\n"
+msgid "Failed to obtain statistics.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/testing/testing.c:286
+#: src/statistics/gnunet-statistics.c:143
#, fuzzy, c-format
-msgid "Could not start `%s' process to create hostkey.\n"
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/testing/testing.c:293
-#, fuzzy
-msgid "Failed to start `gnunet-peerinfo' process.\n"
+#: src/statistics/gnunet-statistics.c:181
+#, fuzzy, c-format
+msgid "Trying to connect to remote host, but service `%s' is not running\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/testing/testing.c:294 src/testing/testing.c:471
-#, fuzzy
-msgid "Failed to start `ssh' process.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/statistics/gnunet-statistics.c:190
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "无法连接到 %s:%u:%s\n"
-#: src/testing/testing.c:354
+#: src/statistics/gnunet-statistics.c:196
#, c-format
-msgid "Error reading from gnunet-peerinfo: %s\n"
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
msgstr ""
-#: src/testing/testing.c:358
-msgid "Malformed output from gnunet-peerinfo!\n"
+#: src/statistics/gnunet-statistics.c:210
+msgid "Missing argument: subsystem \n"
msgstr ""
-#: src/testing/testing.c:368
-#, fuzzy
-msgid "Failed to get hostkey!\n"
-msgstr "发送消息失败。\n"
+#: src/statistics/gnunet-statistics.c:216
+msgid "Missing argument: name\n"
+msgstr ""
-#: src/testing/testing.c:400
-msgid "`Failed while waiting for topology setup!\n"
+#: src/statistics/gnunet-statistics.c:247
+#, c-format
+msgid "No subsystem or name given\n"
msgstr ""
-#: src/testing/testing.c:463
+#: src/statistics/gnunet-statistics.c:255
#, fuzzy, c-format
-msgid "Could not start `%s' process to start GNUnet.\n"
+msgid "Failed to initialize watch routine\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/testing/testing.c:470
-#, fuzzy
-msgid "Failed to start `gnunet-arm' process.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/statistics/gnunet-statistics.c:310
+msgid "limit output to statistics for the given NAME"
+msgstr ""
-#: src/testing/testing.c:493 src/testing/testing.c:600
-msgid "`gnunet-arm' does not seem to terminate.\n"
+#: src/statistics/gnunet-statistics.c:313
+msgid "make the value being set persistent"
msgstr ""
-#: src/testing/testing.c:494 src/testing/testing.c:601
-#: src/testing/testing.c:621
-msgid "`ssh' does not seem to terminate.\n"
+#: src/statistics/gnunet-statistics.c:316
+msgid "limit output to the given SUBSYSTEM"
msgstr ""
-#: src/testing/testing.c:570
-msgid "Unable to get HELLO for peer!\n"
+#: src/statistics/gnunet-statistics.c:319
+msgid "just print the statistics value"
msgstr ""
-#: src/testing/testing.c:620
-msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
+#: src/statistics/gnunet-statistics.c:322
+msgid "watch value continuously"
msgstr ""
-#: src/testing/testing.c:643 src/testing/testing.c:675
-msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
+#: src/statistics/gnunet-statistics.c:325
+msgid "connect to remote host"
msgstr ""
-#: src/testing/testing.c:658 src/testing/testing.c:713
-msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
+#: src/statistics/gnunet-statistics.c:328
+msgid "port for remote host"
msgstr ""
-#: src/testing/testing.c:786
-msgid "`scp' does not seem to terminate.\n"
+#: src/statistics/gnunet-statistics.c:340
+msgid "Print statistics about GNUnet operations."
msgstr ""
-#: src/testing/testing.c:948
-#, fuzzy, c-format
-msgid "Starting service %s for peer `%4s'\n"
-msgstr "卸载 GNUnet 服务"
+#: src/statistics/statistics_api.c:511
+#, fuzzy
+msgid "Could not save some persistent statistics\n"
+msgstr "初始化“%s”服务失败。\n"
-#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
-#, fuzzy, c-format
-msgid "Could not start `%s' process to copy configuration directory.\n"
-msgstr "找不到主机“%s”的 IP:%s\n"
+#: src/statistics/statistics_api.c:1056
+msgid ""
+"Failed to receive acknowledgement from statistics service, some statistics "
+"might have been lost!\n"
+msgstr ""
-#: src/testing/testing.c:1292 src/testing/testing.c:1359
-#, fuzzy, c-format
-msgid "Terminating peer `%4s'\n"
-msgstr "未知的用户“%s”\n"
+#: src/sysmon/gnunet-service-sysmon.c:546
+#, c-format
+msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
+msgstr ""
-#: src/testing/testing.c:1448
-#, fuzzy, c-format
-msgid "Setting d->dead on peer `%4s'\n"
-msgstr "卸载 GNUnet 服务"
+#: src/testbed/gnunet-testbed-profiler.c:231
+#, c-format
+msgid "No hosts-file specified on command line\n"
+msgstr ""
-#: src/testing/testing.c:1601
-msgid "Peer not yet running, can not change configuration at this point."
+#: src/testbed/gnunet-testbed-profiler.c:261
+msgid "create COUNT number of peers"
msgstr ""
-#: src/testing/testing.c:1609
-#, fuzzy
-msgid "Failed to write new configuration to disk."
-msgstr "保存配置失败。"
+#: src/testbed/gnunet-testbed-profiler.c:264
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:276
+msgid "Profiler for testbed"
+msgstr ""
+
+#: src/testbed/ll_master.c:57
+#, c-format
+msgid "Job command file not given. Exiting\n"
+msgstr ""
-#: src/testing/testing.c:1636
+#: src/testbed/testbed_api.c:499
#, fuzzy, c-format
-msgid "Could not start `%s' process to copy configuration file.\n"
-msgstr "找不到主机“%s”的 IP:%s\n"
+msgid "Adding host %u failed with error: %s\n"
+msgstr "“%s”以错误码 %d 失败:%s\n"
-#: src/testing/testing.c:1639
-#, fuzzy
-msgid "Failed to copy new configuration to remote machine."
-msgstr "保存配置失败。"
+#: src/testbed/testbed_api_hosts.c:306
+#, c-format
+msgid "Hosts file %s not found\n"
+msgstr ""
-#: src/testing/testing.c:1794
-#, fuzzy
-msgid "Peers failed to connect"
+#: src/testbed/testbed_api_hosts.c:314
+#, c-format
+msgid "Hosts file %s has no data\n"
msgstr ""
-"\n"
-"按任意键继续\n"
-#: src/testing/testing.c:1922
-#, fuzzy
-msgid "Failed to connect to core service of first peer!\n"
-msgstr "加载 sqstore 服务失败。检查您的配置!\n"
+#: src/testbed/testbed_api_hosts.c:321
+#, c-format
+msgid "Hosts file %s cannot be read\n"
+msgstr ""
-#: src/testing/testing.c:2145
-msgid "Peers are not fully running yet, can not connect!\n"
+#: src/testbed/testbed_api_testbed.c:623
+msgid "Linking controllers failed. Exiting"
msgstr ""
-#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
-#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
-#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
-#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
-#, fuzzy, c-format
-msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
-msgstr "配置不满足配置规范文件“%s”的约束!\n"
+#: src/testbed/testbed_api_testbed.c:1009
+msgid "Cannot start the master controller"
+msgstr ""
-#: src/testing/testing_group.c:2160
-#, c-format
-msgid ""
-"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
-"greater than 0\n"
+#: src/testbed/testbed_api_testbed.c:1089
+msgid "Specified topology must be supported by testbed"
msgstr ""
-#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
+#: src/testbed/testbed_api_topology.c:668
#, c-format
-msgid ""
-"No `%s' specified in peer configuration in section `%s', cannot copy friends "
-"file!\n"
+msgid "Topology file %s not found\n"
msgstr ""
-#: src/testing/testing_group.c:3957
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
+#: src/testbed/testbed_api_topology.c:674
+#, c-format
+msgid "Topology file %s has no data\n"
msgstr ""
-#: src/testing/testing_group.c:5226
-msgid "Unknown topology specification, can't connect peers!\n"
+#: src/testbed/testbed_api_topology.c:681
+#, c-format
+msgid "Topology file %s cannot be read\n"
msgstr ""
-#: src/testing/testing_group.c:5944 src/transport/transport-testing.c:636
-#, fuzzy
-msgid "Could not read hostkeys file!\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/testing/testing_group.c:6011
+#: src/testbed/testbed_api_topology.c:704
#, fuzzy, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgid "Failed to read peer index from toology file: %s"
msgstr "解析配置文件“%s”失败\n"
-#: src/testing/testing_new.c:169
-msgid "tmppath cannot be NULL\n"
+#: src/testbed/testbed_api_topology.c:713
+#: src/testbed/testbed_api_topology.c:737
+#, c-format
+msgid "Value in given topology file: %s out of range\n"
msgstr ""
-#: src/testing/testing_new.c:356
-#, c-format
-msgid "Hostkeys file not found: %s\n"
+#: src/testbed/testbed_api_topology.c:719
+#: src/testbed/testbed_api_topology.c:743
+#, fuzzy, c-format
+msgid "Failed to read peer index from topology file: %s"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/testbed/testbed_api_topology.c:725
+#: src/testbed/testbed_api_topology.c:749
+msgid "Topology file needs more peers than given ones\n"
msgstr ""
-#: src/testing/testing_new.c:365
+#: src/testbed/testbed_api_topology.c:764
#, fuzzy, c-format
-msgid "Could not open hostkeys file: %s\n"
+msgid "Ignoring to connect peer %u to peer %u\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/testing/gnunet-testing.c:132
+#, fuzzy, c-format
+msgid "Could not extract hostkey %u (offset too large?)\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/testing/testing_new.c:380
+#: src/testing/gnunet-testing.c:203
+#, fuzzy
+msgid "create unique configuration files"
+msgstr "更改配置文件中的一个值"
+
+#: src/testing/gnunet-testing.c:205
+msgid "extract hostkey file from pre-computed hostkey list"
+msgstr ""
+
+#: src/testing/gnunet-testing.c:207
+#, fuzzy
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
+msgstr "打印配置文件中的一个值到标准输出"
+
+#: src/testing/gnunet-testing.c:209
+#, fuzzy
+msgid "configuration template"
+msgstr "配置已保存"
+
+#: src/testing/gnunet-testing.c:218
+msgid "Command line tool to access the testing library"
+msgstr ""
+
+#: src/testing/gnunet-testing-run-service.c:129
+#, c-format
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr ""
+
+#: src/testing/gnunet-testing-run-service.c:186
+#, fuzzy
+msgid "name of the template configuration file to use (optional)"
+msgstr "打印配置文件中的一个值到标准输出"
+
+#: src/testing/gnunet-testing-run-service.c:189
+msgid "name of the service to run"
+msgstr ""
+
+#: src/testing/testing.c:211
+#, c-format
+msgid "Hostkeys file not found: %s\n"
+msgstr ""
+
+#: src/testing/testing.c:227
#, c-format
msgid "Incorrect hostkey file format: %s\n"
msgstr ""
-#: src/testing/testing_new.c:437
+#: src/testing/testing.c:541
#, c-format
msgid "Key number %u does not exist\n"
msgstr ""
-#: src/testing/testing_new.c:446
+#: src/testing/testing.c:551
#, fuzzy, c-format
msgid "Error while decoding key %u\n"
msgstr "解析 dscl 输出时出错。\n"
-#: src/testing/testing_new.c:680
+#: src/testing/testing.c:865
#, fuzzy
msgid "Failed to create configuration for peer (not enough free ports?)\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/testing/testing_new.c:691
+#: src/testing/testing.c:876
#, c-format
msgid ""
"You attempted to create a testbed with more than %u hosts. Please "
"precompute more hostkeys first.\n"
msgstr ""
-#: src/testing/testing_new.c:704
+#: src/testing/testing.c:890
#, fuzzy, c-format
msgid "Failed to initialize hostkey for peer %u\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/testing/testing_new.c:734
+#: src/testing/testing.c:923
#, fuzzy, c-format
msgid "Failed to write hostkey file for peer %u: %s\n"
msgstr "发送消息失败。\n"
-#: src/testing/testing_new.c:751
+#: src/testing/testing.c:941
#, fuzzy, c-format
msgid "Failed to write configuration file `%s' for peer %u: %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/testing/testing_new.c:791
+#: src/testing/testing.c:1014
#, fuzzy, c-format
msgid "Failed to start `%s': %s\n"
msgstr "运行 %s失败:%s %d\n"
-#: src/testing/testing_new.c:959
+#: src/testing/testing.c:1219
#, fuzzy, c-format
msgid "Failed to load configuration from %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/topology/gnunet-daemon-topology.c:259
+#: src/topology/gnunet-daemon-topology.c:254
msgid "# peers blacklisted"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:392
+#: src/topology/gnunet-daemon-topology.c:387
msgid "# connect requests issued to transport"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:730
-#: src/topology/gnunet-daemon-topology.c:815
+#: src/topology/gnunet-daemon-topology.c:725
+#: src/topology/gnunet-daemon-topology.c:810
msgid "# friends connected"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:991
msgid "Failed to connect to core service, can not manage topology!\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1026
-#, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1034
#, c-format
msgid "Could not read friends list `%s'\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1045
+#: src/topology/gnunet-daemon-topology.c:1040
#, c-format
msgid "Friends file `%s' is empty.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1054
+#: src/topology/gnunet-daemon-topology.c:1049
#, c-format
msgid "Failed to read friends list from `%s': out of memory\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1057
#, c-format
msgid "Failed to read friends list from `%s'\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1082
+#: src/topology/gnunet-daemon-topology.c:1077
#, c-format
msgid ""
"Syntax error in topology specification at offset %llu, skipping bytes.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1095
+#: src/topology/gnunet-daemon-topology.c:1090
#, c-format
msgid ""
"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1105
+#: src/topology/gnunet-daemon-topology.c:1100
#, fuzzy, c-format
msgid "Found friend `%s' in configuration\n"
msgstr ""
"\n"
"结束配置。\n"
-#: src/topology/gnunet-daemon-topology.c:1111
+#: src/topology/gnunet-daemon-topology.c:1106
#, c-format
msgid "Found myself `%s' in friend list (useless, ignored)\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1121
+#: src/topology/gnunet-daemon-topology.c:1116
#, fuzzy
msgid "# friends in configuration"
msgstr ""
"\n"
"结束配置。\n"
-#: src/topology/gnunet-daemon-topology.c:1127
+#: src/topology/gnunet-daemon-topology.c:1122
msgid ""
"Fewer friends specified than required by minimum friend count. Will only "
"connect to friends.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1134
+#: src/topology/gnunet-daemon-topology.c:1129
msgid ""
"More friendly connections required than target total number of connections.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1169
+#: src/topology/gnunet-daemon-topology.c:1164
msgid "# HELLO messages received"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1224
+#: src/topology/gnunet-daemon-topology.c:1219
msgid "# HELLO messages gossipped"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1363
+#: src/topology/gnunet-daemon-topology.c:1358
msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
msgstr ""
@@ -4365,11 +4733,6 @@ msgstr ""
msgid "Could not read blacklist file `%s'\n"
msgstr "无法解析“%s”(%s):%s\n"
-#: src/transport/gnunet-service-transport_blacklist.c:252
-#, c-format
-msgid "Blacklist file `%s' is empty.\n"
-msgstr ""
-
#: src/transport/gnunet-service-transport_blacklist.c:263
#, fuzzy, c-format
msgid "Failed to read blacklist from `%s'\n"
@@ -4398,151 +4761,157 @@ msgid "Found myself `%s' in blacklist (useless, ignored)\n"
msgstr ""
#: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:747
+#: src/transport/gnunet-service-transport_blacklist.c:752
msgid "# disconnects due to blacklist"
msgstr ""
-#: src/transport/gnunet-service-transport.c:163
+#: src/transport/gnunet-service-transport.c:183
msgid "# bytes payload discarded due to not connected peer "
msgstr ""
-#: src/transport/gnunet-service-transport.c:237
+#: src/transport/gnunet-service-transport.c:258
msgid "# bytes total received"
msgstr ""
-#: src/transport/gnunet-service-transport.c:284
+#: src/transport/gnunet-service-transport.c:305
msgid "# bytes payload received"
msgstr ""
-#: src/transport/gnunet-service-transport.c:582
-msgid "Transport service is lacking key configuration settings. Exiting.\n"
-msgstr ""
+#: src/transport/gnunet-service-transport.c:614
+#, fuzzy, c-format
+msgid "Transport service could not access hostkey: %s. Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/transport/gnunet-service-transport.c:591
-msgid "Transport service could not access hostkey. Exiting.\n"
+#: src/transport/gnunet-service-transport.c:625
+#, fuzzy
+msgid "Could not access STATISTICS service. Exiting.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-service-transport.c:720
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
msgstr ""
-#: src/transport/gnunet-service-transport_clients.c:352
+#: src/transport/gnunet-service-transport_clients.c:389
#, 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:357
+#: src/transport/gnunet-service-transport_clients.c:394
msgid "# messages dropped due to slow client"
msgstr ""
-#: src/transport/gnunet-service-transport_clients.c:503
+#: src/transport/gnunet-service-transport_clients.c:546
#, c-format
msgid "Rejecting control connection from peer `%s', which is not me!\n"
msgstr ""
-#: src/transport/gnunet-service-transport_clients.c:631
+#: src/transport/gnunet-service-transport_clients.c:687
msgid "# bytes payload dropped (other peer was not connected)"
msgstr ""
-#: src/transport/gnunet-service-transport_clients.c:682
+#: src/transport/gnunet-service-transport_clients.c:738
msgid "# REQUEST CONNECT messages received"
msgstr ""
-#: src/transport/gnunet-service-transport_hello.c:172
+#: src/transport/gnunet-service-transport_hello.c:175
msgid "# refreshed my HELLO"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1032
+#: src/transport/gnunet-service-transport_neighbours.c:1227
msgid "# DISCONNECT messages sent"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1148
-#: src/transport/gnunet-service-transport_neighbours.c:1482
+#: src/transport/gnunet-service-transport_neighbours.c:1357
+#: src/transport/gnunet-service-transport_neighbours.c:1694
msgid "# bytes in message queue for other peers"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1153
+#: src/transport/gnunet-service-transport_neighbours.c:1362
msgid "# messages transmitted to other peers"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1158
+#: src/transport/gnunet-service-transport_neighbours.c:1367
msgid "# transmission failures for messages to other peers"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1215
+#: src/transport/gnunet-service-transport_neighbours.c:1424
msgid "# messages timed out while in transport queue"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1254
+#: src/transport/gnunet-service-transport_neighbours.c:1466
msgid "# keepalives sent"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1278
+#: src/transport/gnunet-service-transport_neighbours.c:1490
msgid "# KEEPALIVE messages discarded (peer unknown)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1286
+#: src/transport/gnunet-service-transport_neighbours.c:1498
msgid "# KEEPALIVE messages discarded (no session)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1323
+#: src/transport/gnunet-service-transport_neighbours.c:1535
msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1332
+#: src/transport/gnunet-service-transport_neighbours.c:1544
msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1388
+#: src/transport/gnunet-service-transport_neighbours.c:1600
msgid "# messages discarded due to lack of neighbour record"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1422
+#: src/transport/gnunet-service-transport_neighbours.c:1634
msgid "# bandwidth quota violations by other peers"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1438
+#: src/transport/gnunet-service-transport_neighbours.c:1650
msgid "# ms throttling suggested"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2544
+#: src/transport/gnunet-service-transport_neighbours.c:2802
msgid "# unexpected CONNECT_ACK messages (no peer)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2559
-#: src/transport/gnunet-service-transport_neighbours.c:2585
+#: src/transport/gnunet-service-transport_neighbours.c:2817
+#: src/transport/gnunet-service-transport_neighbours.c:2851
msgid "# unexpected CONNECT_ACK messages (not ready)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2598
+#: src/transport/gnunet-service-transport_neighbours.c:2864
msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2627
+#: src/transport/gnunet-service-transport_neighbours.c:2897
msgid "# unexpected CONNECT_ACK messages (disconnecting)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2807
+#: src/transport/gnunet-service-transport_neighbours.c:3082
msgid "# unexpected SESSION ACK messages"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2856
+#: src/transport/gnunet-service-transport_neighbours.c:3137
msgid "# SET QUOTA messages ignored (no such peer)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2870
+#: src/transport/gnunet-service-transport_neighbours.c:3151
msgid "# disconnects due to quota of 0"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2901
+#: src/transport/gnunet-service-transport_neighbours.c:3182
msgid "# disconnect messages ignored (old format)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2912
+#: src/transport/gnunet-service-transport_neighbours.c:3193
msgid "# disconnect messages ignored (timestamp)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2943
+#: src/transport/gnunet-service-transport_neighbours.c:3224
msgid "# other peer asked to disconnect from us"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:3020
+#: src/transport/gnunet-service-transport_neighbours.c:3319
msgid "# disconnected from peer upon explicit request"
msgstr ""
@@ -4550,304 +4919,488 @@ msgstr ""
msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:414
+#: src/transport/gnunet-service-transport_validation.c:425
msgid "# address records discarded"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:463
+#: src/transport/gnunet-service-transport_validation.c:487
#, 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:512
+#: src/transport/gnunet-service-transport_validation.c:536
msgid "# PING without HELLO messages sent"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:570
+#: src/transport/gnunet-service-transport_validation.c:618
msgid "# address revalidations started"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:805
+#: src/transport/gnunet-service-transport_validation.c:860
msgid "# PING message for different peer received"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:840
+#: src/transport/gnunet-service-transport_validation.c:925
#, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+msgid "Received a PING message with validation bug from `%s'\n"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:924
+#: src/transport/gnunet-service-transport_validation.c:1054
msgid "# PONGs unicast via reliable transport"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:933
+#: src/transport/gnunet-service-transport_validation.c:1063
msgid "# PONGs multicast to all available addresses"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:1055
+#: src/transport/gnunet-service-transport_validation.c:1188
msgid "# PONGs dropped, no matching pending validation"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:1080
+#: src/transport/gnunet-service-transport_validation.c:1216
msgid "# PONGs dropped, signature expired"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:1136
+#: src/transport/gnunet-service-transport_validation.c:1270
#, c-format
msgid "Adding `%s' without addresses for peer `%s'\n"
msgstr ""
-#: src/transport/gnunet-transport.c:260
-msgid "No transport plugins configured, peer will never communicate\n"
+#: src/transport/gnunet-transport.c:266
+#, c-format
+msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
msgstr ""
#: src/transport/gnunet-transport.c:273
#, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
+msgid "Received %llu bytes/s (%llu bytes in %s)\n"
msgstr ""
-#: src/transport/gnunet-transport.c:323
-#, c-format
-msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+#: src/transport/gnunet-transport.c:303
+#, fuzzy, c-format
+msgid "Failed to connect to `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:316
+#, fuzzy, c-format
+msgid "Failed to resolve address for peer `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/transport/gnunet-transport.c:325
+#, fuzzy
+msgid "Failed to list connections, timeout occured\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:429
+msgid "No transport plugins configured, peer will never communicate\n"
msgstr ""
-#: src/transport/gnunet-transport.c:330
+#: src/transport/gnunet-transport.c:442
#, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
+msgid "No port configured for plugin `%s', cannot test it\n"
msgstr ""
-#: src/transport/gnunet-transport.c:363
+#: src/transport/gnunet-transport.c:506
#, c-format
msgid "Transmitting %u bytes to %s\n"
msgstr ""
-#: src/transport/gnunet-transport.c:383
+#: src/transport/gnunet-transport.c:531
#, fuzzy, c-format
-msgid "Connected to %s\n"
+msgid "Successfully connected to `%s'\n"
msgstr "“%s”已连接到“%s”。\n"
-#: src/transport/gnunet-transport.c:414
+#: src/transport/gnunet-transport.c:553
+#, c-format
+msgid ""
+"Successfully connected to `%s', starting to send benchmark data in %u Kb "
+"blocks\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:588
#, fuzzy, c-format
-msgid "Disconnected from %s\n"
+msgid "Disconnected from peer `%s' while benchmarking\n"
msgstr "“%s”已连接到“%s”。\n"
-#: src/transport/gnunet-transport.c:443
+#: src/transport/gnunet-transport.c:664
#, c-format
msgid "Received %u bytes from %s\n"
msgstr ""
-#: src/transport/gnunet-transport.c:466
+#: src/transport/gnunet-transport.c:687
#, fuzzy, c-format
msgid "Peer `%s': %s %s\n"
msgstr "运行 %s失败:%s %d\n"
-#: src/transport/gnunet-transport.c:473
+#: src/transport/gnunet-transport.c:702
#, c-format
msgid "Peer `%s': %s <unable to resolve address>\n"
msgstr ""
-#: src/transport/gnunet-transport.c:501
+#: src/transport/gnunet-transport.c:766
#, fuzzy, c-format
msgid "Peer `%s' disconnected\n"
msgstr ""
"\n"
"按任意键继续\n"
-#: src/transport/gnunet-transport.c:569
-#, fuzzy, c-format
-msgid "Failed to parse peer identity `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/transport/gnunet-transport.c:794
+#, fuzzy
+msgid "Failed to send connect request to transport service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:828
+#, 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
+#, 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
+#, fuzzy
+msgid "Failed to connect to transport service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
+#, fuzzy
+msgid "Failed to send request to transport service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:911
+msgid "Starting to receive benchmark data\n"
+msgstr ""
-#: src/transport/gnunet-transport.c:618
-msgid "measure how fast we are receiving data (until CTRL-C)"
+#: src/transport/gnunet-transport.c:996
+msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
msgstr ""
-#: src/transport/gnunet-transport.c:621
+#: src/transport/gnunet-transport.c:999
#, fuzzy
-msgid "try to connect to the given peer"
+msgid "connect to a peer"
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/gnunet-transport.c:624
+#: src/transport/gnunet-transport.c:1002
msgid "provide information about all current connections (once)"
msgstr ""
-#: src/transport/gnunet-transport.c:627
-msgid "provide information about all current connections (continuously)"
+#: src/transport/gnunet-transport.c:1008
+msgid ""
+"provide information about all connects and disconnect events (continuously)"
msgstr ""
-#: src/transport/gnunet-transport.c:630
+#: src/transport/gnunet-transport.c:1011
msgid "do not resolve hostnames"
msgstr ""
-#: src/transport/gnunet-transport.c:634
+#: src/transport/gnunet-transport.c:1014
+msgid "peer identity"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:1018
msgid "send data for benchmarking to the other peer (until CTRL-C)"
msgstr ""
-#: src/transport/gnunet-transport.c:637
+#: src/transport/gnunet-transport.c:1021
msgid "test transport configuration (involves external server)"
msgstr ""
-#: src/transport/gnunet-transport.c:645
+#: src/transport/gnunet-transport.c:1032
#, fuzzy
msgid "Direct access to transport service."
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/plugin_transport_http.c:1100
+#: src/transport/plugin_transport_http.c:817
+#: src/transport/plugin_transport_http_server.c:2556
msgid "Disabling IPv6 since it is not supported on this system!\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:1149
+#: src/transport/plugin_transport_http.c:866
+#: src/transport/plugin_transport_http_server.c:2324
#, fuzzy
msgid "Require valid port number for service in configuration!\n"
msgstr "保存配置失败。"
-#: src/transport/plugin_transport_http.c:1174 src/util/service.c:1036
+#: src/transport/plugin_transport_http.c:898
+#: src/transport/plugin_transport_http_server.c:2356 src/util/service.c:1053
#, fuzzy, c-format
msgid "Failed to resolve `%s': %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/transport/plugin_transport_http.c:1191 src/util/service.c:1053
+#: src/transport/plugin_transport_http.c:915
+#: src/transport/plugin_transport_http_server.c:2373 src/util/service.c:1070
#, fuzzy, c-format
msgid "Failed to find %saddress for `%s'.\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/transport/plugin_transport_http.c:1296
+#: src/transport/plugin_transport_http.c:1020
+#: src/transport/plugin_transport_http_server.c:2484
#, c-format
msgid "Found %u addresses to report to NAT service\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:1309
-#, c-format
-msgid "FREEING %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1386
+#: src/transport/plugin_transport_http.c:1133
+#: src/transport/plugin_transport_http_server.c:2652
msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:1399
+#: src/transport/plugin_transport_http.c:1146
+#: src/transport/plugin_transport_http_server.c:2663
#, fuzzy
msgid "Port is required! Fix in configuration\n"
msgstr ""
"\n"
"结束配置。\n"
-#: src/transport/plugin_transport_http.c:1410
+#: src/transport/plugin_transport_http.c:1157
msgid "Port 0, client only mode\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:1430
+#: src/transport/plugin_transport_http.c:1177
#, c-format
msgid ""
"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
"Binding to all addresses!\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:1460
+#: src/transport/plugin_transport_http.c:1206
#, 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_client.c:624
+#: src/transport/plugin_transport_http.c:1223
+#: src/transport/plugin_transport_http_server.c:2745
+#, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/transport/plugin_transport_http.c:1228
+msgid "No external hostname configured\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_client.c:1516
#, c-format
msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
msgstr ""
-#: src/transport/plugin_transport_http_server.c:178
+#: src/transport/plugin_transport_http_client.c:1647
+#: src/transport/plugin_transport_http_server.c:2869
+#, fuzzy, c-format
+msgid "Shutting down plugin `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/transport/plugin_transport_http_client.c:1672
+#: src/transport/plugin_transport_http_server.c:2928
+#, c-format
+msgid "Shutdown for plugin `%s' complete\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_client.c:1700
+#: src/transport/plugin_transport_http_server.c:2775
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
+
+#: src/transport/plugin_transport_http_server.c:1342
+#, 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:1603
+#, c-format
+msgid "Accepting connection (%u of %u) from `%s'\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:1611
+#, c-format
+msgid ""
+"Server reached maximum number connections (%u), rejecting new connection\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:1912
msgid ""
"Could not create a new TLS certificate, program `gnunet-transport-"
"certificate-creation' could not be started!\n"
msgstr ""
-#: src/transport/plugin_transport_http_server.c:202
+#: src/transport/plugin_transport_http_server.c:1936
msgid "No usable TLS certificate found and creating one failed!\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:591
+#: src/transport/plugin_transport_http_server.c:2631
+#, c-format
+msgid "IPv4 support is %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2645
+#, c-format
+msgid "IPv6 support is %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2670
+#, c-format
+msgid "Using port %u\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2685
+#, c-format
+msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2695
+#, fuzzy, c-format
+msgid "Binding to IPv4 address %s\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/transport/plugin_transport_http_server.c:2716
+#, c-format
+msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2726
+#, fuzzy, c-format
+msgid "Binding to IPv6 address %s\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/transport/plugin_transport_http_server.c:2761
+#, c-format
+msgid "Notifying transport only about hostname `%s'\n"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:370
+#, c-format
+msgid "Received malformed message via %s. Ignored.\n"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:457
+msgid "SMTP filter string to invalid, lacks ': '\n"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:466
+#, 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
+#, c-format
+msgid "SMTP: `%s' failed: %s.\n"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:799
+msgid "No email-address specified, can not start SMTP transport.\n"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:811
+msgid "# bytes received via SMTP"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:812
+msgid "# bytes sent via SMTP"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:814
+msgid "# bytes dropped by SMTP (outgoing)"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:595
#, c-format
msgid "Unexpected address length: %u bytes\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:767
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:906
-#: src/transport/plugin_transport_tcp.c:992
-#: src/transport/plugin_transport_tcp.c:1086
-#: src/transport/plugin_transport_tcp.c:1103
+#: src/transport/plugin_transport_tcp.c:771
+#: src/transport/plugin_transport_tcp.c:860
+#: src/transport/plugin_transport_tcp.c:910
+#: src/transport/plugin_transport_tcp.c:996
+#: src/transport/plugin_transport_tcp.c:1139
+#: src/transport/plugin_transport_tcp.c:1156
msgid "# bytes currently in TCP buffers"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:774
-#: src/transport/plugin_transport_tcp.c:963
-#: src/transport/plugin_transport_tcp.c:1761
-#: src/transport/plugin_transport_tcp.c:2390
+#: src/transport/plugin_transport_tcp.c:778
+#: src/transport/plugin_transport_tcp.c:967
+#: src/transport/plugin_transport_tcp.c:1826
+#: src/transport/plugin_transport_tcp.c:2462
msgid "# TCP sessions active"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:860
+#: src/transport/plugin_transport_tcp.c:864
msgid "# bytes discarded by TCP (timeout)"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:913
msgid "# bytes transmitted via TCP"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:996
+#: src/transport/plugin_transport_tcp.c:1000
msgid "# bytes discarded by TCP (disconnect)"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:1290
+#: src/transport/plugin_transport_tcp.c:1113
+#, c-format
+msgid "Trying to send with invalid session %p\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1349
#, c-format
msgid "Address of unexpected length: %u\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:1401
+#: src/transport/plugin_transport_tcp.c:1466
msgid "# transport-service disconnect requests for TCP"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:1802
+#: src/transport/plugin_transport_tcp.c:1867
msgid "# TCP WELCOME messages received"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:1973
+#: src/transport/plugin_transport_tcp.c:2046
msgid "# bytes received via TCP"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2043
+#: src/transport/plugin_transport_tcp.c:2124
msgid "# network-level TCP disconnect events"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2279 src/util/service.c:940
+#: src/transport/plugin_transport_tcp.c:2350 src/util/service.c:948
+#: src/util/service.c:954
#, c-format
msgid "Require valid port number for service `%s' in configuration!\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2293
+#: src/transport/plugin_transport_tcp.c:2364
#, fuzzy
msgid "Failed to start service.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/plugin_transport_tcp.c:2355
-#, c-format
-msgid "Failed to find option %s in section %s!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2378
+#: src/transport/plugin_transport_tcp.c:2450
#, c-format
msgid "TCP transport listening on port %llu\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2382
+#: src/transport/plugin_transport_tcp.c:2454
msgid "TCP transport not listening on any port (client only)\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2386
+#: src/transport/plugin_transport_tcp.c:2458
#, c-format
msgid "TCP transport advertises itself as being on port %llu\n"
msgstr ""
@@ -4860,118 +5413,121 @@ msgstr ""
msgid "# IPv4 broadcast HELLO beacons received via udp"
msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:367
+#: src/transport/plugin_transport_udp_broadcasting.c:394
#, c-format
msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
msgstr ""
-#: src/transport/plugin_transport_udp.c:1894
+#: src/transport/plugin_transport_udp.c:2517
+#, 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:2531
#, c-format
msgid ""
-"UDP could not message to `%s': `%s'. Please check your network configuration "
-"and disable IPv6 if your connection does not have a global IPv6 address\n"
+"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"
msgstr ""
-#: src/transport/plugin_transport_udp.c:2138
+#: src/transport/plugin_transport_udp.c:2772
#, fuzzy
msgid "Failed to open UDP sockets\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/transport/plugin_transport_udp.c:2306
+#: src/transport/plugin_transport_udp.c:2848
#, c-format
msgid "Given `%s' option is out of range: %llu > %u\n"
msgstr ""
-#: src/transport/plugin_transport_udp.c:2349
+#: src/transport/plugin_transport_udp.c:2891
#, fuzzy, c-format
msgid "Invalid IPv6 address: `%s'\n"
msgstr "无效的进程优先级“%s”\n"
-#: src/transport/plugin_transport_unix.c:1356
+#: src/transport/plugin_transport_unix.c:1357
#, fuzzy
msgid "Failed to open UNIX sockets\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/transport/plugin_transport_wlan.c:561
+#: src/transport/plugin_transport_wlan.c:580
msgid "# WLAN ACKs sent"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:580
+#: src/transport/plugin_transport_wlan.c:599
msgid "# WLAN messages defragmented"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:626
-#: src/transport/plugin_transport_wlan.c:676
-#: src/transport/plugin_transport_wlan.c:1696
+#: src/transport/plugin_transport_wlan.c:645
+#: src/transport/plugin_transport_wlan.c:695
+#: src/transport/plugin_transport_wlan.c:1758
msgid "# WLAN sessions allocated"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:749
+#: src/transport/plugin_transport_wlan.c:770
msgid "# WLAN message fragments sent"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:767
+#: src/transport/plugin_transport_wlan.c:794
msgid "# WLAN messages pending (with fragmentation)"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:867
-#: src/transport/plugin_transport_wlan.c:948
-#: src/transport/plugin_transport_wlan.c:1698
+#: src/transport/plugin_transport_wlan.c:902
+#: src/transport/plugin_transport_wlan.c:987
+#: src/transport/plugin_transport_wlan.c:1760
msgid "# WLAN MAC endpoints allocated"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1119
+#: src/transport/plugin_transport_wlan.c:1169
msgid "# HELLO messages received via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1140
+#: src/transport/plugin_transport_wlan.c:1190
msgid "# fragments received via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1150
+#: src/transport/plugin_transport_wlan.c:1200
msgid "# ACKs received via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1207
+#: src/transport/plugin_transport_wlan.c:1257
msgid "# WLAN DATA messages discarded due to CRC32 error"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1306
+#: src/transport/plugin_transport_wlan.c:1358
msgid "# DATA messages received via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1341
+#: src/transport/plugin_transport_wlan.c:1393
msgid "# WLAN DATA messages processed"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1402
+#: src/transport/plugin_transport_wlan.c:1454
msgid "# HELLO beacons sent via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1511
+#: src/transport/plugin_transport_wlan.c:1563
msgid "WLAN address with invalid size encountered\n"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1668
-#, fuzzy, c-format
-msgid "Invalid configuration option `%s' in section `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/transport/plugin_transport_wlan.c:1677
+#: src/transport/plugin_transport_wlan.c:1739
#, c-format
msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1687
-#, fuzzy, c-format
-msgid "Missing configuration option `%s' in section `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/transport/transport_api.c:570
+#: src/transport/transport_api.c:659
#, c-format
msgid "Received unexpected message of type %u in %s:%u\n"
msgstr ""
+#: src/transport/transport-testing.c:586
+#, fuzzy
+msgid "Failed to initialize testing library!\n"
+msgstr "初始化“%s”服务失败。\n"
+
#: src/util/bio.c:136 src/util/bio.c:142
#, fuzzy, c-format
msgid "Error reading `%s': %s"
@@ -5001,260 +5557,309 @@ msgstr ""
msgid "Metadata `%s' failed to deserialize"
msgstr ""
-#: src/util/client.c:359
+#: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
+#, fuzzy, c-format
+msgid "Using `%s' instead\n"
+msgstr "%s:选项“%s”有歧义\n"
+
+#: src/util/client.c:371
#, c-format
msgid ""
"Could not determine valid hostname and port for service `%s' from "
"configuration.\n"
msgstr ""
-#: src/util/client.c:367
+#: src/util/client.c:379
#, c-format
msgid "Need a non-empty hostname for service `%s'.\n"
msgstr ""
-#: src/util/client.c:685
+#: src/util/client.c:698
msgid "Failure to transmit TEST request.\n"
msgstr ""
-#: src/util/client.c:740 src/util/service.c:970
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:882
+#: src/util/client.c:898
#, c-format
msgid "Could not connect to service `%s', must not be running.\n"
msgstr ""
-#: src/util/client.c:896
+#: src/util/client.c:912
#, c-format
msgid "Failure to transmit request to service `%s'\n"
msgstr ""
-#: src/util/client.c:1149
+#: src/util/client.c:1177
msgid "Could not submit request, not expecting to receive a response.\n"
msgstr ""
-#: src/util/common_logging.c:239 src/util/common_logging.c:890
+#: src/util/common_logging.c:258 src/util/common_logging.c:1007
msgid "DEBUG"
msgstr "调试"
-#: src/util/common_logging.c:241 src/util/common_logging.c:888
+#: src/util/common_logging.c:260 src/util/common_logging.c:1005
msgid "INFO"
msgstr "信息"
-#: src/util/common_logging.c:243 src/util/common_logging.c:886
+#: src/util/common_logging.c:262 src/util/common_logging.c:1003
msgid "WARNING"
msgstr "警告"
-#: src/util/common_logging.c:245 src/util/common_logging.c:884
+#: src/util/common_logging.c:264 src/util/common_logging.c:1001
msgid "ERROR"
msgstr "错误"
-#: src/util/common_logging.c:247 src/util/common_logging.c:892
+#: src/util/common_logging.c:266 src/util/common_logging.c:1009
msgid "NONE"
msgstr ""
-#: src/util/common_logging.c:610
+#: src/util/common_logging.c:395
#, fuzzy, c-format
msgid "Failed to create or access directory for log file `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/util/common_logging.c:725
+#: src/util/common_logging.c:819
#, fuzzy, c-format
msgid "Message `%.*s' repeated %u times in the last %s\n"
msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
-#: src/util/common_logging.c:893
+#: src/util/common_logging.c:1010
msgid "INVALID"
msgstr ""
-#: src/util/common_logging.c:992
+#: src/util/common_logging.c:1149
msgid "unknown address"
msgstr ""
-#: src/util/common_logging.c:1030
+#: src/util/common_logging.c:1187
msgid "invalid address"
msgstr ""
-#: src/util/configuration.c:244
+#: src/util/common_logging.c:1205
#, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "配置不满足配置规范文件“%s”的约束!\n"
+
+#: src/util/common_logging.c:1226
+#, fuzzy, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr "配置不满足配置规范文件“%s”的约束!\n"
+
+#: src/util/configuration.c:291
+#, fuzzy, c-format
+msgid "Syntax error while deserializing in line %u\n"
msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-#: src/util/configuration.c:816
+#: src/util/configuration.c:998
#, c-format
msgid ""
"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
"choices\n"
msgstr ""
-#: src/util/connection.c:420
+#: src/util/connection.c:427
#, fuzzy, c-format
msgid "Access denied to `%s'\n"
msgstr "“%s”已连接到“%s”。\n"
-#: src/util/connection.c:435
+#: src/util/connection.c:442
#, c-format
msgid "Accepting connection from `%s': %p\n"
msgstr ""
-#: src/util/connection.c:550
+#: src/util/connection.c:557
#, c-format
msgid ""
"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
msgstr ""
-#: src/util/connection.c:739 src/util/connection.c:909
+#: src/util/connection.c:755 src/util/connection.c:922
#, fuzzy, c-format
msgid "Trying to connect to `%s' (%p)\n"
msgstr "无法连接到 %s:%u:%s\n"
-#: src/util/connection.c:748
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "无法连接到 %s:%u:%s\n"
-
-#: src/util/connection.c:900
+#: src/util/connection.c:913
#, c-format
msgid "Attempt to connect to `%s' failed\n"
msgstr ""
-#: src/util/container_bloomfilter.c:510
+#: src/util/container_bloomfilter.c:518
#, c-format
msgid ""
"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
"%llu)\n"
msgstr ""
-#: src/util/crypto_random.c:280
+#: src/util/crypto_ecc.c:441
#, c-format
-msgid "Starting `%s' process to generate entropy\n"
+msgid ""
+"File `%s' does not contain a valid private key (too long, %llu bytes). "
+"Deleting it.\n"
msgstr ""
-#: src/util/crypto_random.c:309
+#: src/util/crypto_ecc.c:456 src/util/crypto_rsa.c:660
#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
+msgid ""
+"File `%s' does not contain a valid private key (failed decode, %llu bytes). "
+"Deleting it.\n"
+msgstr ""
-#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
+#: src/util/crypto_ecc.c:552 src/util/crypto_ecc.c:596
+#: src/util/crypto_rsa.c:757 src/util/crypto_rsa.c:801
#, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %s...\n"
+msgid "Could not acquire lock on file `%s': %s...\n"
msgstr "无法解析“%s”(%s):%s\n"
-#: src/util/crypto_rsa.c:666
+#: src/util/crypto_ecc.c:557 src/util/crypto_rsa.c:762
#, fuzzy
msgid "Creating a new private key. This may take a while.\n"
msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
-#: src/util/crypto_rsa.c:684
+#: src/util/crypto_ecc.c:600 src/util/crypto_rsa.c:805
+#: src/util/crypto_rsa.c:841
+msgid "This may be ok if someone is currently generating a private key.\n"
+msgstr ""
+
+#: src/util/crypto_ecc.c:631 src/util/crypto_rsa.c:836
#, c-format
-msgid "I am host `%s'. Stored new private key in `%s'.\n"
+msgid ""
+"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
msgstr ""
-#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
-msgid "This may be ok if someone is currently generating a hostkey.\n"
+#: src/util/crypto_ecc.c:636
+msgid "This may be ok if someone is currently generating a key.\n"
msgstr ""
-#: src/util/crypto_rsa.c:743
+#: src/util/crypto_ecc.c:651 src/util/crypto_rsa.c:856
#, c-format
-msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+msgid "File `%s' does not contain a valid private key. Deleting it.\n"
+msgstr ""
+
+#: src/util/crypto_ecc.c:773 src/util/crypto_rsa.c:941
+msgid "interrupted by shutdown"
+msgstr ""
+
+#: src/util/crypto_ecc.c:784
+msgid "gnunet-ecc failed"
msgstr ""
-#: src/util/crypto_rsa.c:763
+#: src/util/crypto_ecc.c:979
+#, 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:1047
#, c-format
-msgid "File `%s' does not contain a valid private key. Deleting it.\n"
+msgid "ECC signature verification failed at %s:%d: %s\n"
msgstr ""
-#: src/util/crypto_rsa.c:781
+#: src/util/crypto_random.c:313
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
+msgstr ""
+
+#: src/util/crypto_random.c:342
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
+
+#: src/util/crypto_rsa.c:644
#, c-format
-msgid "I am host `%s'. Read private key from `%s'.\n"
+msgid ""
+"File `%s' does not contain a valid private key (too long, %llu bytes). "
+"Renaming it.\n"
+msgstr ""
+
+#: src/util/crypto_rsa.c:952
+msgid "gnunet-rsa failed"
msgstr ""
-#: src/util/crypto_rsa.c:1032
+#: src/util/crypto_rsa.c:1343
#, c-format
msgid "RSA signature verification failed at %s:%d: %s\n"
msgstr ""
-#: src/util/disk.c:498
+#: src/util/disk.c:601
#, fuzzy, c-format
msgid "`%s' failed for drive `%S': %u\n"
msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
-#: src/util/disk.c:1062
+#: src/util/disk.c:1205
#, c-format
msgid "Expected `%s' to be a directory!\n"
msgstr "“%s”应为目录!\n"
-#: src/util/disk.c:1416 src/util/service.c:1650
+#: src/util/disk.c:1559 src/util/service.c:1669
#, c-format
msgid "Cannot obtain information about user `%s': %s\n"
msgstr "无法获取有关用户“%s”的信息:%s\n"
-#: src/util/disk.c:1734
+#: src/util/disk.c:1931
#, c-format
msgid "No `%s' specified for service `%s' in configuration.\n"
msgstr ""
-#: src/util/getopt.c:669
+#: src/util/getopt.c:570
#, c-format
msgid "%s: option `%s' is ambiguous\n"
msgstr "%s:选项“%s”有歧义\n"
-#: src/util/getopt.c:693
+#: src/util/getopt.c:594
#, c-format
msgid "%s: option `--%s' does not allow an argument\n"
msgstr "%s:选项“--%s”不允许有参数\n"
-#: src/util/getopt.c:698
+#: src/util/getopt.c:599
#, c-format
msgid "%s: option `%c%s' does not allow an argument\n"
msgstr "%s:选项“%c%s”不允许有参数\n"
-#: src/util/getopt.c:715 src/util/getopt.c:883
+#: src/util/getopt.c:616 src/util/getopt.c:783
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s:选项“%s”要求有一个参数\n"
-#: src/util/getopt.c:744
+#: src/util/getopt.c:645
#, c-format
msgid "%s: unrecognized option `--%s'\n"
msgstr "%s:无法识别的选项“--%s”\n"
-#: src/util/getopt.c:748
+#: src/util/getopt.c:649
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
msgstr "%s:无法识别的选项“%c%s”\n"
-#: src/util/getopt.c:773
+#: src/util/getopt.c:674
#, c-format
msgid "%s: illegal option -- %c\n"
msgstr "%s:非法选项 -- %c\n"
-#: src/util/getopt.c:775
+#: src/util/getopt.c:676
#, c-format
msgid "%s: invalid option -- %c\n"
msgstr "%s:无效选项 -- %c\n"
-#: src/util/getopt.c:803 src/util/getopt.c:931
+#: src/util/getopt.c:704 src/util/getopt.c:831
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s:选项要求有一个参数 -- %c\n"
-#: src/util/getopt.c:851
+#: src/util/getopt.c:752
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
msgstr "%s:选项“-W %s”有歧义\n"
-#: src/util/getopt.c:869
+#: src/util/getopt.c:770
#, c-format
msgid "%s: option `-W %s' does not allow an argument\n"
msgstr "%s:选项“-W %s” 不允许有参数\n"
-#: src/util/getopt.c:1035
+#: src/util/getopt.c:935
#, fuzzy, c-format
msgid "Use %s to get a list of options.\n"
msgstr "请使用 --help 获取选项列表。\n"
@@ -5265,37 +5870,110 @@ msgid ""
"Arguments mandatory for long options are also mandatory for short options.\n"
msgstr "长选项的必选参数对短选项也是必选的。\n"
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:286
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:316
#, c-format
msgid "You must pass a number to the `%s' option.\n"
msgstr "您必须向“%s”选项传递一个数字。\n"
-#: src/util/gnunet-resolver.c:148
-msgid "perform a reverse lookup"
+#: src/util/getopt_helpers.c:288
+#, fuzzy, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/util/gnunet-config.c:90
+#, fuzzy, c-format
+msgid "--section argument is required\n"
+msgstr "设置要使用的昵称(必须)"
+
+#: src/util/gnunet-config.c:133
+#, c-format
+msgid "--option argument required to set value\n"
msgstr ""
-#: src/util/gnunet-resolver.c:154
-msgid "Use build-in GNUnet stub resolver"
+#: src/util/gnunet-config.c:160
+msgid "obtain option of value as a filename (with $-expansion)"
+msgstr ""
+
+#: src/util/gnunet-config.c:163
+msgid "name of the section to access"
+msgstr ""
+
+#: src/util/gnunet-config.c:166
+msgid "name of the option to access"
+msgstr ""
+
+#: src/util/gnunet-config.c:169
+msgid "value to set"
msgstr ""
-#: src/util/gnunet-rsa.c:64
+#: src/util/gnunet-config.c:178
+#, fuzzy
+msgid "Manipulate GNUnet configuration files"
+msgstr "更改配置文件中的一个值"
+
+#: src/util/gnunet-ecc.c:107 src/util/gnunet-rsa.c:107
+#, fuzzy, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/util/gnunet-ecc.c:113 src/util/gnunet-rsa.c:113
+#, c-format
+msgid "Generating %u keys, please wait"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:128 src/util/gnunet-rsa.c:137
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/util/gnunet-ecc.c:140 src/util/gnunet-rsa.c:149
+#, c-format
+msgid "Finished!\n"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:163 src/util/gnunet-rsa.c:172
#, c-format
msgid "No hostkey file specified on command line\n"
msgstr ""
-#: src/util/gnunet-rsa.c:112
+#: src/util/gnunet-ecc.c:220 src/util/gnunet-rsa.c:229
+msgid "create COUNT public-private key pairs (for testing)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:223 src/util/gnunet-rsa.c:232
msgid "print the public key in ASCII format"
msgstr ""
-#: src/util/gnunet-rsa.c:115
+#: src/util/gnunet-ecc.c:226 src/util/gnunet-rsa.c:235
msgid "print the hash of the public key in ASCII format"
msgstr ""
-#: src/util/gnunet-rsa.c:118
+#: src/util/gnunet-ecc.c:229 src/util/gnunet-rsa.c:238
msgid "print the short hash of the public key in ASCII format"
msgstr ""
-#: src/util/gnunet-rsa.c:124
+#: src/util/gnunet-ecc.c:232 src/util/gnunet-rsa.c:241
+msgid ""
+"use insecure, weak random number generator for key generation (for testing "
+"only)"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:243
+#, fuzzy
+msgid "Manipulate GNUnet private ECC key files"
+msgstr "更改配置文件中的一个值"
+
+#: src/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
+msgstr ""
+
+#: src/util/gnunet-resolver.c:159
+msgid "Use build-in GNUnet stub resolver"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:252
msgid "Manipulate GNUnet private RSA key files"
msgstr ""
@@ -5310,70 +5988,74 @@ msgstr "无法解析“%s”(%s):%s\n"
msgid "Could not find IP of host `%s': %s\n"
msgstr "找不到主机“%s”的 IP:%s\n"
-#: src/util/helper.c:244
+#: src/util/gnunet-uri.c:90
+#, c-format
+msgid "No URI specified on command line\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:95
#, fuzzy, c-format
-msgid "Error reading from `%s': %s\n"
-msgstr "创建用户出错"
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
-#: src/util/helper.c:259
+#: src/util/gnunet-uri.c:102
#, c-format
-msgid "Got 0 bytes from helper `%s' (EOF)\n"
+msgid "Invalid URI: fails to specify subsystem\n"
msgstr ""
-#: src/util/helper.c:269
+#: src/util/gnunet-uri.c:112
#, c-format
-msgid "Got %u bytes from helper `%s'\n"
+msgid "No handler known for subsystem `%s'\n"
msgstr ""
-#: src/util/helper.c:278
+#: src/util/gnunet-uri.c:174
+msgid "Perform default-actions for GNUnet URIs"
+msgstr ""
+
+#: src/util/helper.c:260
#, fuzzy, c-format
-msgid "Failed to parse inbound message from helper `%s'\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+msgid "Error reading from `%s': %s\n"
+msgstr "创建用户出错"
-#: src/util/helper.c:310
+#: src/util/helper.c:305
#, fuzzy, c-format
-msgid "Starting HELPER process `%s'\n"
-msgstr "卸载 GNUnet 服务"
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "打开日志文件“%s”失败:%s\n"
-#: src/util/helper.c:440
+#: src/util/helper.c:499
#, fuzzy, c-format
msgid "Error writing to `%s': %s\n"
msgstr "创建用户出错"
-#: src/util/network.c:1200
+#: src/util/network.c:127
+#, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr ""
+
+#: src/util/network.c:1331
#, c-format
msgid ""
"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
msgstr ""
-#: src/util/os_installation.c:299
+#: src/util/os_installation.c:420
#, fuzzy, c-format
msgid ""
"Could not determine installation path for %s. Set `%s' environment "
"variable.\n"
msgstr "无法确定安装路径。请尝试设置“%s”\n"
-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:702
#, fuzzy, c-format
msgid "Could not find binary `%s' in PATH!\n"
msgstr "找不到主机“%s”的 IP:%s\n"
-#: src/util/os_installation.c:492
-#, fuzzy, c-format
-msgid "access (%s, X_OK) failed: %s\n"
-msgstr "“%s”说:%s\n"
-
-#: src/util/os_installation.c:507
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "“%s”说:%s\n"
-
-#: src/util/os_priority.c:305
+#: src/util/os_priority.c:302
#, fuzzy, c-format
msgid "Failed to open named pipe `%s' for reading: %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/util/os_priority.c:306
+#: src/util/os_priority.c:303
#, fuzzy, c-format
msgid "Failed to open named pipe `%s' for writing: %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
@@ -5398,12 +6080,17 @@ msgstr ""
msgid "Could not determine plugin installation path.\n"
msgstr "无法确定用户界面定义文件。"
-#: src/util/pseudonym.c:276
+#: src/util/program.c:254 src/util/service.c:1791
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/util/pseudonym.c:282
#, fuzzy, c-format
msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
+#: src/util/pseudonym.c:413 src/util/pseudonym.c:439
msgid "no-name"
msgstr "无名称"
@@ -5433,152 +6120,152 @@ msgstr ""
msgid "Could not resolve our FQDN : %s\n"
msgstr "无法解析“%s”(%s):%s\n"
-#: src/util/scheduler.c:786
+#: src/util/scheduler.c:782
msgid "Looks like we're busy waiting...\n"
msgstr ""
-#: src/util/scheduler.c:916
+#: src/util/scheduler.c:912
#, c-format
msgid "Attempt to cancel dead task %llu!\n"
msgstr ""
-#: src/util/server.c:483
+#: src/util/server.c:426
#, fuzzy, c-format
msgid "`%s' failed for port %d (%s).\n"
msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
-#: src/util/server.c:492
+#: src/util/server.c:435
#, c-format
msgid "`%s' failed for port %d (%s): address already in use\n"
msgstr ""
-#: src/util/server.c:497
+#: src/util/server.c:446
#, 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:827
+#: src/util/server.c:830
#, c-format
msgid ""
"Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+"`GNUNET_SERVER_receive_done' after %s\n"
msgstr ""
-#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
-#: src/util/service.c:225 src/util/service.c:232
+#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
+#: src/util/service.c:232 src/util/service.c:239
#, c-format
msgid "Invalid format for IP: `%s'\n"
msgstr "IP 格式无效:“%s”\n"
-#: src/util/service.c:188
+#: src/util/service.c:195
#, c-format
msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
-#: src/util/service.c:281
+#: src/util/service.c:288
#, c-format
msgid "Invalid network notation (does not end with ';': `%s')\n"
msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
-#: src/util/service.c:313
+#: src/util/service.c:320
#, c-format
msgid "Wrong format `%s' for netmask\n"
msgstr "网络掩码的格式“%s”错误\n"
-#: src/util/service.c:343
+#: src/util/service.c:350
#, c-format
msgid "Wrong format `%s' for network\n"
msgstr "网络的格式“%s”错误\n"
-#: src/util/service.c:698
+#: src/util/service.c:707
#, c-format
msgid "Access denied to UID %d / GID %d\n"
msgstr ""
-#: src/util/service.c:703
+#: src/util/service.c:712
#, c-format
msgid "Unknown address family %d\n"
msgstr ""
-#: src/util/service.c:710
+#: src/util/service.c:719
#, c-format
msgid "Access from `%s' denied to service `%s'\n"
msgstr ""
-#: src/util/service.c:765
+#: src/util/service.c:774
#, c-format
msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
msgstr ""
-#: src/util/service.c:802
+#: src/util/service.c:811
#, c-format
msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
msgstr ""
-#: src/util/service.c:920
+#: src/util/service.c:929
#, c-format
msgid ""
"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
msgstr ""
-#: src/util/service.c:990
+#: src/util/service.c:1007
#, c-format
msgid ""
"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
"domain socket: %s\n"
msgstr ""
-#: src/util/service.c:1007
+#: src/util/service.c:1024
#, c-format
msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
msgstr ""
-#: src/util/service.c:1241
+#: src/util/service.c:1258
msgid "Could not access a pre-bound socket, will try to bind myself\n"
msgstr ""
-#: src/util/service.c:1292 src/util/service.c:1310
+#: src/util/service.c:1309 src/util/service.c:1327
#, c-format
msgid "Specified value for `%s' of service `%s' is invalid\n"
msgstr ""
-#: src/util/service.c:1337
+#: src/util/service.c:1354
#, c-format
msgid "Could not access pre-bound socket %u, will try to bind myself\n"
msgstr ""
-#: src/util/service.c:1506
+#: src/util/service.c:1525
#, fuzzy, c-format
msgid "Failed to start `%s' at `%s'\n"
msgstr "运行 %s失败:%s %d\n"
-#: src/util/service.c:1539
+#: src/util/service.c:1558
#, c-format
msgid "Service `%s' runs at %s\n"
msgstr ""
-#: src/util/service.c:1588
+#: src/util/service.c:1607
msgid "Service process failed to initialize\n"
msgstr ""
-#: src/util/service.c:1592
+#: src/util/service.c:1611
msgid "Service process could not initialize server function\n"
msgstr ""
-#: src/util/service.c:1596
+#: src/util/service.c:1615
msgid "Service process failed to report status\n"
msgstr ""
-#: src/util/service.c:1651
+#: src/util/service.c:1670
msgid "No such user"
msgstr "无此用户"
-#: src/util/service.c:1664
+#: src/util/service.c:1683
#, c-format
msgid "Cannot change user/group to `%s': %s\n"
msgstr "无法更改用户/组为“%s”:%s\n"
-#: src/util/service.c:1729
+#: src/util/service.c:1749
msgid "do daemonize (detach from terminal)"
msgstr ""
@@ -5587,73 +6274,83 @@ msgstr ""
msgid "signal (%d, %p) returned %d.\n"
msgstr ""
-#: src/util/strings.c:144
+#: src/util/strings.c:146
msgid "b"
msgstr "b"
-#: src/util/strings.c:334
+#: src/util/strings.c:413
#, c-format
msgid "Character sets requested were `%s'->`%s'\n"
msgstr ""
-#: src/util/strings.c:481
+#: src/util/strings.c:528
msgid "Failed to expand `$HOME': environment variable `HOME' not set"
msgstr "扩展“$HOME”失败:没有设置环境变量“HOME”"
-#: src/util/strings.c:573
+#: src/util/strings.c:625
msgid "ms"
msgstr "毫秒"
-#: src/util/strings.c:578
-msgid "eternity"
+#: src/util/strings.c:629
+msgid "forever"
+msgstr ""
+
+#: src/util/strings.c:631
+msgid "0 ms"
msgstr ""
-#: src/util/strings.c:582
+#: src/util/strings.c:637
msgid "s"
msgstr "秒"
-#: src/util/strings.c:586
+#: src/util/strings.c:643
msgid "m"
msgstr "分"
-#: src/util/strings.c:590
+#: src/util/strings.c:649
msgid "h"
msgstr "时"
-#: src/util/strings.c:594
-msgid " days"
+#: src/util/strings.c:656
+#, fuzzy
+msgid "day"
+msgstr " 天"
+
+#: src/util/strings.c:658
+#, fuzzy
+msgid "days"
msgstr " 天"
-#: src/util/strings.c:618
+#: src/util/strings.c:685
msgid "end of time"
msgstr ""
-#: src/util/strings.c:1012
+#: src/util/strings.c:1073
msgid "IPv6 address did not start with `['\n"
msgstr ""
-#: src/util/strings.c:1020
+#: src/util/strings.c:1081
msgid "IPv6 address did contain ':' to separate port number\n"
msgstr ""
-#: src/util/strings.c:1026
+#: src/util/strings.c:1087
msgid "IPv6 address did contain ']' before ':' to separate port number\n"
msgstr ""
-#: src/util/strings.c:1033
+#: src/util/strings.c:1094
msgid "IPv6 address did contain a valid port number after the last ':'\n"
msgstr ""
-#: src/util/strings.c:1042
+#: src/util/strings.c:1103
#, fuzzy, c-format
msgid "Invalid IPv6 address `%s': %s\n"
msgstr "无效的进程优先级“%s”\n"
-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1071
+#: src/vpn/gnunet-service-vpn.c:512 src/vpn/gnunet-service-vpn.c:1088
msgid "# Active tunnels"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
+#: src/vpn/gnunet-service-vpn.c:609 src/vpn/gnunet-service-vpn.c:646
#, fuzzy
msgid "# peers connected to mesh tunnels"
msgstr ""
@@ -5668,79 +6365,79 @@ msgstr ""
msgid "# Bytes dropped in mesh queue (overflow)"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:772
+#: src/vpn/gnunet-service-vpn.c:771
msgid "# Mesh tunnels created"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:795
+#: src/vpn/gnunet-service-vpn.c:794
#, fuzzy
msgid "Failed to setup mesh tunnel!\n"
msgstr "发送消息失败。\n"
-#: src/vpn/gnunet-service-vpn.c:973
+#: src/vpn/gnunet-service-vpn.c:990
#, c-format
msgid "Protocol %u not supported, dropping\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1291
+#: src/vpn/gnunet-service-vpn.c:1308
msgid "# ICMPv4 packets dropped (not allowed)"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1312
+#: src/vpn/gnunet-service-vpn.c:1329
msgid "# ICMPv6 packets dropped (not allowed)"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1517
+#: src/vpn/gnunet-service-vpn.c:1534
msgid "# Packets received from TUN interface"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1555 src/vpn/gnunet-service-vpn.c:1596
+#: src/vpn/gnunet-service-vpn.c:1572 src/vpn/gnunet-service-vpn.c:1613
#, c-format
msgid "Packet received for unmapped destination `%s' (dropping it)\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1606
+#: src/vpn/gnunet-service-vpn.c:1623
msgid "Received IPv4 packet with options (dropping it)\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1620
+#: src/vpn/gnunet-service-vpn.c:1637
#, c-format
msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1704
+#: src/vpn/gnunet-service-vpn.c:1721
msgid "# ICMP packets received from mesh"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2045
+#: src/vpn/gnunet-service-vpn.c:2062
msgid "# UDP packets received from mesh"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2203
+#: src/vpn/gnunet-service-vpn.c:2220
msgid "# TCP packets received from mesh"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2354
+#: src/vpn/gnunet-service-vpn.c:2371
msgid "Failed to find unallocated IPv4 address in VPN's range\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2409
+#: src/vpn/gnunet-service-vpn.c:2426
msgid "Failed to find unallocated IPv6 address in VPN's range\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2448 src/vpn/gnunet-service-vpn.c:2661
+#: src/vpn/gnunet-service-vpn.c:2465 src/vpn/gnunet-service-vpn.c:2678
msgid "# Active destinations"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2734
+#: src/vpn/gnunet-service-vpn.c:2751
msgid "Failed to allocate IP address for new destination\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3141
+#: src/vpn/gnunet-service-vpn.c:3138
msgid "IPv6 support disabled as this system does not support IPv6\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3173
+#: src/vpn/gnunet-service-vpn.c:3170
msgid "IPv4 support disabled as this system does not support IPv4\n"
msgstr ""
@@ -5749,96 +6446,358 @@ msgstr ""
msgid "Error creating tunnel\n"
msgstr "创建用户出错"
-#: src/vpn/gnunet-vpn.c:195 src/vpn/gnunet-vpn.c:226
+#: src/vpn/gnunet-vpn.c:194 src/vpn/gnunet-vpn.c:225
#, c-format
msgid "Option `%s' makes no sense with option `%s'.\n"
msgstr ""
-#: src/vpn/gnunet-vpn.c:208
+#: src/vpn/gnunet-vpn.c:207
#, fuzzy, c-format
msgid "Option `%s' or `%s' is required.\n"
msgstr "%s:选项“%s”有歧义\n"
-#: src/vpn/gnunet-vpn.c:220
+#: src/vpn/gnunet-vpn.c:219
#, c-format
msgid "Option `%s' or `%s' is required when using option `%s'.\n"
msgstr ""
-#: src/vpn/gnunet-vpn.c:238
+#: src/vpn/gnunet-vpn.c:237
#, fuzzy, c-format
msgid "`%s' is not a valid peer identifier.\n"
msgstr "“%s”不可用。\n"
-#: src/vpn/gnunet-vpn.c:260
+#: src/vpn/gnunet-vpn.c:259
#, fuzzy, c-format
msgid "`%s' is not a valid IP address.\n"
msgstr "“%s”不可用。\n"
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:295
msgid "request that result should be an IPv4 address"
msgstr ""
-#: src/vpn/gnunet-vpn.c:299
+#: src/vpn/gnunet-vpn.c:298
msgid "request that result should be an IPv6 address"
msgstr ""
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:301
msgid "print IP address only after mesh tunnel has been created"
msgstr ""
-#: src/vpn/gnunet-vpn.c:305
+#: src/vpn/gnunet-vpn.c:304
msgid "how long should the mapping be valid for new tunnels?"
msgstr ""
-#: src/vpn/gnunet-vpn.c:308
+#: src/vpn/gnunet-vpn.c:307
msgid "destination IP for the tunnel"
msgstr ""
-#: src/vpn/gnunet-vpn.c:311
+#: src/vpn/gnunet-vpn.c:310
msgid "peer offering the service we would like to access"
msgstr ""
-#: src/vpn/gnunet-vpn.c:314
+#: src/vpn/gnunet-vpn.c:313
msgid "name of the service we would like to access"
msgstr ""
-#: src/vpn/gnunet-vpn.c:317
+#: src/vpn/gnunet-vpn.c:316
msgid "service is offered via TCP"
msgstr ""
-#: src/vpn/gnunet-vpn.c:320
+#: src/vpn/gnunet-vpn.c:319
msgid "service is offered via UDP"
msgstr ""
-#: src/vpn/gnunet-vpn.c:329
+#: src/vpn/gnunet-vpn.c:331
msgid "Setup tunnels via VPN."
msgstr ""
-#: src/include/gnunet_common.h:497 src/include/gnunet_common.h:502
-#: src/include/gnunet_common.h:508
+#: src/include/gnunet_common.h:579 src/include/gnunet_common.h:584
+#: src/include/gnunet_common.h:590
#, c-format
msgid "Assertion failed at %s:%d.\n"
msgstr ""
-#: src/include/gnunet_common.h:518
+#: src/include/gnunet_common.h:600
#, c-format
msgid "External protocol violation detected at %s:%d.\n"
msgstr ""
-#: src/include/gnunet_common.h:539 src/include/gnunet_common.h:546
+#: src/include/gnunet_common.h:621 src/include/gnunet_common.h:628
#, c-format
msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
msgstr ""
#, fuzzy
-#~ msgid "# Peers connected"
+#~ msgid "Mesh service could not access hostkey. Exiting.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Connected to %s\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "list information for all peers"
+#~ msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#, fuzzy
+#~ msgid "Malformed %s `%s' given in configuration!\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Starting HELPER process `%s'\n"
+#~ msgstr "卸载 GNUnet 服务"
+
+#, fuzzy
+#~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Unknown message type: '%u'\n"
+#~ msgstr "未知操作“%s”。\n"
+
+#, fuzzy
+#~ msgid "Configuration option `%s' in section `%s' missing\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Failed to access chat home directory `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Failed to create/open key in file `%s'\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the chat service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#~ msgid "anonymous"
+#~ msgstr "匿名"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said: %s\n"
+#~ msgstr "“%s”说:%s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you: %s\n"
+#~ msgstr "“%s”对您说:%s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said for sure: %s\n"
+#~ msgstr "“%s”对您说:%s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you for sure: %s\n"
+#~ msgstr "“%s”对您说:%s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said off the record: %s\n"
+#~ msgstr "“%s”对您说:%s\n"
+
+#~ msgid "`%s' entered the room\n"
+#~ msgstr "“%s”进入了房间\n"
+
+#~ msgid "`%s' left the room\n"
+#~ msgstr "“%s”离开了房间\n"
+
+#, fuzzy
+#~ msgid "Could not change username\n"
+#~ msgstr "已将用户名改为“%s”。\n"
+
+#, fuzzy
+#~ msgid "Changed username to `%s'\n"
+#~ msgstr "已将用户名改为“%s”。\n"
+
+#~ msgid "Users in room `%s': "
+#~ msgstr "房间“%s”中的用户:"
+
+#~ msgid "Syntax: /msg USERNAME MESSAGE"
+#~ msgstr "语法:/msg 用户名 消息"
+
+#~ msgid "User `%s' is currently not in the room!\n"
+#~ msgstr "用户“%s”当前不在房间里!\n"
+
+#, fuzzy
+#~ msgid "Unknown command `%s'\n"
+#~ msgstr "未知的命令“%s”。\n"
+
+#~ msgid "You must specify a nickname\n"
+#~ msgstr "您必须指定一个昵称\n"
+
+#~ msgid "set the chat room to join"
+#~ msgstr "设置要加入的聊天室"
+
+#, fuzzy
+#~ msgid "Failed to queue a message notification\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Failed to queue a join notification\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Failed to queue a confirmation receipt\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Failed to queue a leave notification\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Connected to %s service!\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Failed to start daemon: %s\n"
+#~ msgstr "运行 %s失败:%s %d\n"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s', assuming default value."
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Option `%s' not specified in configuration section `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Peer is lacking HOSTKEY configuration setting.\n"
+#~ msgstr "立即保存配置?"
+
+#, fuzzy
+#~ msgid "Could not access hostkey.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `ssh' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to create hostkey.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to start `ssh' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to get hostkey!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to start GNUnet.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-arm' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Starting service %s for peer `%4s'\n"
+#~ msgstr "卸载 GNUnet 服务"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration directory.\n"
+#~ msgstr "找不到主机“%s”的 IP:%s\n"
+
+#, fuzzy
+#~ msgid "Terminating peer `%4s'\n"
+#~ msgstr "未知的用户“%s”\n"
+
+#, fuzzy
+#~ msgid "Setting d->dead on peer `%4s'\n"
+#~ msgstr "卸载 GNUnet 服务"
+
+#, fuzzy
+#~ 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 "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Peers failed to connect"
#~ msgstr ""
#~ "\n"
#~ "按任意键继续\n"
#, fuzzy
-#~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
-#~ msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+#~ msgid "Failed to connect to core service of first peer!\n"
+#~ msgstr "加载 sqstore 服务失败。检查您的配置!\n"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Invalid configuration option `%s' in section `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Missing configuration option `%s' in section `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "internal error"
+#~ msgstr "未知错误。\n"
+
+#, fuzzy
+#~ msgid "Could not create namespace `%s'\n"
+#~ msgstr "无法解析“%s”(%s):%s\n"
+
+#, fuzzy
+#~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
+
+#, fuzzy
+#~ msgid "Namestore removed record successfully"
+#~ msgstr "GNUnet 服务安装成功。\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Could not open hostkeys file: %s\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ 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 ""
+#~ "\n"
+#~ "按任意键继续\n"
#, fuzzy
#~ msgid "Unable to initialize Postgres with configuration `%s': %s"
@@ -5860,12 +6819,6 @@ msgstr ""
#~ msgid "Failed during blacklist file copying!\n"
#~ msgstr "解析配置文件“%s”失败\n"
-#, fuzzy
-#~ msgid "# fast reconnects failed"
-#~ msgstr ""
-#~ "\n"
-#~ "按任意键继续\n"
-
#~ msgid "Unknown user `%s'\n"
#~ msgstr "未知的用户“%s”\n"
@@ -5874,10 +6827,6 @@ msgstr ""
#~ msgstr "初始化“%s”服务失败。\n"
#, fuzzy
-#~ msgid "Failed to send to `%s': %s\n"
-#~ msgstr "打开日志文件“%s”失败:%s\n"
-
-#, fuzzy
#~ msgid "Could not access file: %s\n"
#~ msgstr "错误:无法访问服务:%s\n"
@@ -5898,10 +6847,6 @@ msgstr ""
#~ msgstr "服务已删除。\n"
#, fuzzy
-#~ msgid "Unable to start service `%s': %s\n"
-#~ msgstr "无法保存配置文件“%s”:"
-
-#, fuzzy
#~ msgid "Unable to accept connection for service `%s': %s\n"
#~ msgstr "无法保存配置文件“%s”:"
@@ -6154,9 +7099,6 @@ msgstr ""
#~ msgid "Back"
#~ msgstr "后退"
-#~ msgid "Exit"
-#~ msgstr "退出"
-
#~ msgid "Up"
#~ msgstr "向上"
@@ -6191,9 +7133,6 @@ msgstr ""
#~ msgid "install GNUnet as Windows service"
#~ msgstr "以 Windows 服务方式安装 GNUnet"
-#~ msgid "increase the maximum number of TCP/IP connections"
-#~ msgstr "增加 TCP/IP 的最大连接数"
-
#~ msgid "display a file's hash value"
#~ msgstr "显示一个文件的散列值"
@@ -6462,9 +7401,6 @@ msgstr ""
#~ msgid "Real-time delay violation (%llu ms) at %s:%u\n"
#~ msgstr "实时延迟冲突(%llu 毫秒),于 %s:%u\n"
-#~ msgid "`%s' failed with error code %d: %s\n"
-#~ msgstr "“%s”以错误码 %d 失败:%s\n"
-
#~ msgid "Deadlock due to `%s'.\n"
#~ msgstr "“%s”造成了死锁。\n"
@@ -6489,9 +7425,6 @@ msgstr ""
#~ msgid "output in gnuplot format"
#~ msgstr "以 gnuplot 格式输出"
-#~ msgid "number of iterations"
-#~ msgstr "迭代次数"
-
#~ msgid "number of messages to use per iteration"
#~ msgstr "每次迭代所使用的消息数量"