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.po3134
1 files changed, 1702 insertions, 1432 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cb4721c..b50a113 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-02-28 18:30+0100\n"
+"POT-Creation-Date: 2012-06-05 15:47+0200\n"
"PO-Revision-Date: 2011-07-09 12:12+0800\n"
"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -16,254 +16,269 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:165
msgid "Failed to transmit shutdown request to client.\n"
msgstr ""
-#: src/arm/arm_api.c:378
+#: 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:392
+#: 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:467
+#: 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:523
+#: src/arm/arm_api.c:485
#, c-format
msgid "Requesting start of service `%s'.\n"
msgstr ""
-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:486
#, c-format
msgid "Requesting termination of service `%s'.\n"
msgstr ""
-#: src/arm/arm_api.c:546
+#: 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:548
+#: 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:581
+#: src/arm/arm_api.c:540
#, c-format
msgid "Asked to start service `%s' within %llu ms\n"
msgstr ""
-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:612
#, c-format
msgid "Stopping service `%s' within %llu ms\n"
msgstr ""
-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:159
#, fuzzy, c-format
msgid "Service `%s' is unknown to ARM.\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:164
#, fuzzy, c-format
msgid "Service `%s' has been stopped.\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:167
#, fuzzy, c-format
msgid "Service `%s' was already running.\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:172
#, fuzzy, c-format
msgid "Service `%s' has been started.\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:175
#, fuzzy, c-format
msgid "Service `%s' was already being stopped.\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:179
#, fuzzy, c-format
msgid "Service `%s' was already not running.\n"
msgstr "服务已删除。\n"
-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:183
msgid "Request ignored as ARM is shutting down.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:187
msgid "Error communicating with ARM service.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:191
msgid "Timeout communicating with ARM service.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:195
msgid "Operation failed.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:199
msgid "Unknown response code from ARM.\n"
msgstr ""
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:222
+#, fuzzy
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
+
+#: src/arm/gnunet-arm.c:225
+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:224 src/arm/gnunet-arm.c:324
+#: 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:247
+#: src/arm/gnunet-arm.c:280
#, fuzzy, c-format
msgid "Failed to remove configuration file %s\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:286
#, c-format
msgid "Failed to remove servicehome directory %s\n"
msgstr ""
-#: src/arm/gnunet-arm.c:355
+#: src/arm/gnunet-arm.c:407
#, fuzzy
msgid "stop all GNUnet services"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:409
msgid "start a particular service"
msgstr ""
-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:411
msgid "stop a particular service"
msgstr ""
-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:413
#, fuzzy
msgid "start all GNUnet default services"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:416
#, fuzzy
msgid "stop and start all GNUnet default services"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:419
msgid "delete config file and directory on exit"
msgstr ""
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:421
msgid "don't print status messages"
msgstr ""
-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:424
#, fuzzy
msgid "timeout for completing current operation"
msgstr "等待一次迭代完成的时间(毫秒)"
-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:426
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:437
msgid "Control services and the Automated Restart Manager (ARM)"
msgstr ""
-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:332
#, fuzzy, c-format
msgid "Failed to start service `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:335
#, c-format
msgid "Starting service `%s'\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:361
msgid "Could not send status result to client\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:393
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/arm/gnunet-service-arm.c:523
#, fuzzy, c-format
msgid "Unable to create socket for service `%s': %s\n"
msgstr "无法创建用户账户:"
-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:545
#, c-format
msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:559
#, c-format
msgid "ARM now monitors connections to service `%s' at `%s'\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:667
#, c-format
msgid "Preparing to stop `%s'\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:878
#, c-format
msgid "Restarting service `%s'.\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:970
msgid "exit"
msgstr ""
-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:975
msgid "signal"
msgstr ""
-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:980
#, fuzzy
msgid "unknown"
msgstr "未知错误"
-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:986
+#, fuzzy, c-format
+msgid "Service `%s' took %llu ms to terminate\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-service-arm.c:1021
#, c-format
msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1067
+#: 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:1069
+#: src/arm/gnunet-service-arm.c:1129
msgid "option missing"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1213
#, fuzzy, c-format
msgid "Starting default services `%s'\n"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1224
#, c-format
msgid "Default service `%s' not configured correctly!\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1238
msgid ""
"No default services configured, GNUnet will not really start right now.\n"
msgstr ""
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/mockup-service.c:69
+#: src/arm/mockup-service.c:44
msgid "Initiating shutdown as requested by client.\n"
msgstr ""
@@ -321,194 +336,197 @@ msgstr ""
msgid "Undefined mandatory parameter: memberCallback\n"
msgstr ""
-#: src/chat/gnunet-chat.c:92
+#: src/chat/gnunet-chat.c:93
msgid "Joined\n"
msgstr ""
-#: src/chat/gnunet-chat.c:124
+#: 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:130
+#: src/chat/gnunet-chat.c:144
#, fuzzy, c-format
msgid "(%s) `%s' said: %s\n"
msgstr "“%s”说:%s\n"
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: 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:139
+#: 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:142
+#: 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:145
+#: src/chat/gnunet-chat.c:159
#, c-format
msgid "(%s) `%s' was confirmed that you received: %s\n"
msgstr ""
-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:162
#, c-format
msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
msgstr ""
-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:165
#, c-format
msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
msgstr ""
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:170
#, c-format
msgid ""
"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
msgstr ""
-#: src/chat/gnunet-chat.c:159
+#: 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:162
+#: src/chat/gnunet-chat.c:176
#, c-format
msgid "(%s) <%s> said using an unknown message type: %s\n"
msgstr ""
-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:217
#, c-format
msgid "'%s' acknowledged message #%d\n"
msgstr ""
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
#, c-format
msgid "`%s' entered the room\n"
msgstr "“%s”进入了房间\n"
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
#, c-format
msgid "`%s' left the room\n"
msgstr "“%s”离开了房间\n"
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
#, fuzzy
msgid "Could not change username\n"
msgstr "已将用户名改为“%s”。\n"
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
#, c-format
msgid "Joining room `%s' as user `%s'...\n"
msgstr ""
-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:373
#, fuzzy, c-format
msgid "Changed username to `%s'\n"
msgstr "已将用户名改为“%s”。\n"
-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:388
#, c-format
msgid "Users in room `%s': "
msgstr "房间“%s”中的用户:"
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:434
msgid "Syntax: /msg USERNAME MESSAGE"
msgstr "语法:/msg 用户名 消息"
-#: src/chat/gnunet-chat.c:379
+#: src/chat/gnunet-chat.c:443
#, c-format
-msgid "Unknown user `%s'\n"
-msgstr "未知的用户“%s”\n"
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgstr ""
-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:460
#, c-format
msgid "User `%s' is currently not in the room!\n"
msgstr "用户“%s”当前不在房间里!\n"
-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:513
#, fuzzy, c-format
msgid "Unknown command `%s'\n"
msgstr "未知的命令“%s”。\n"
-#: src/chat/gnunet-chat.c:459
+#: 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"
msgstr ""
-#: src/chat/gnunet-chat.c:463
+#: 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."
msgstr ""
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:532
msgid ""
"Use `/msg nickname message' to send a private message to the specified user"
msgstr ""
-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:535
msgid "The `/notice' command is an alias for `/msg'"
msgstr ""
-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:537
msgid "The `/query' command is an alias for `/msg'"
msgstr ""
-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:539
msgid "Use `/sig message' to send a signed public message"
msgstr ""
-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:542
msgid "Use `/ack message' to require signed acknowledgment of the message"
msgstr ""
-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:545
msgid "Use `/anonymous message' to send a public anonymous message"
msgstr ""
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:547
msgid "The `/anon' command is an alias for `/anonymous'"
msgstr ""
-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:549
msgid "Use `/quit' to terminate gnunet-chat"
msgstr ""
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:551
msgid "The `/leave' command is an alias for `/quit'"
msgstr ""
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:554
msgid "Use `/names' to list all of the current members in the chat room"
msgstr ""
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:556
msgid "Use `/help command' to get help for a specific command"
msgstr ""
-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:672
msgid "You must specify a nickname\n"
msgstr "您必须指定一个昵称\n"
-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:688
#, c-format
msgid "Failed to join room `%s'\n"
msgstr ""
-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:727
msgid "set the nickname to use (required)"
msgstr "设置要使用的昵称(必须)"
-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:730
msgid "set the chat room to join"
msgstr "设置要加入的聊天室"
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:742
msgid "Join a chat on GNUnet."
msgstr ""
@@ -532,166 +550,167 @@ msgstr "保存配置失败。"
msgid "Failed to queue a leave notification\n"
msgstr "保存配置失败。"
-#: src/core/core_api.c:798
+#: src/core/core_api.c:786
msgid "Client was disconnected from core service, trying to reconnect.\n"
msgstr ""
-#: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
#, c-format
msgid "Peer `%s'\n"
msgstr ""
-#: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
#, fuzzy, c-format
msgid "Invalid command line argument `%s'\n"
msgstr "“%s”的参数无效。\n"
-#: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
-msgid "don't resolve host names"
-msgstr ""
-
-#: src/core/gnunet-core-list-connections.c:203
+#: src/core/gnunet-core.c:95
msgid "Print information about connected peers."
msgstr ""
-#: src/core/gnunet-service-core.c:99
+#: src/core/gnunet-service-core.c:97
#, c-format
msgid "Core service of `%4s' ready.\n"
msgstr ""
-#: src/core/gnunet-service-core_clients.c:360
+#: src/core/gnunet-service-core_clients.c:370
msgid "# send requests dropped (disconnected)"
msgstr ""
-#: src/core/gnunet-service-core_clients.c:465
+#: src/core/gnunet-service-core_clients.c:475
msgid "# messages discarded (session disconnected)"
msgstr ""
-#: src/core/gnunet-service-core_clients.c:801
+#: src/core/gnunet-service-core_clients.c:818
#, c-format
msgid "# bytes of messages of type %u received"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:493
+#: src/core/gnunet-service-core_kx.c:565
msgid "# bytes encrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:543
+#: src/core/gnunet-service-core_kx.c:617
msgid "# bytes decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
msgid "Error in communication with PEERINFO service\n"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:700
msgid "# Delayed connecting due to lack of public key"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:753
msgid "# key exchanges initiated"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:775
msgid "# key exchanges stopped"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:828
msgid "# session keys received"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:845
#, c-format
msgid "`%s' is for `%s', not for me. Ignoring.\n"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:890
msgid "# SET_KEY messages decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:883
-#: src/transport/gnunet-service-transport_validation.c:803
+#: src/core/gnunet-service-core_kx.c:977
+#: src/transport/gnunet-service-transport_validation.c:810
msgid "# PING messages received"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:1010
#, c-format
msgid ""
"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
"%s'\n"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:1029
msgid "# PONG messages created"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1125
msgid "# sessions terminated by timeout"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1135
msgid "# keepalive messages sent"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1095
-#: src/transport/gnunet-service-transport_validation.c:1026
+#: src/core/gnunet-service-core_kx.c:1236
+#: src/transport/gnunet-service-transport_validation.c:1031
msgid "# PONG messages received"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1275
msgid "# PONG messages decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1303
msgid "# session keys confirmed via PONG"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1223
+#: src/core/gnunet-service-core_kx.c:1329
+msgid "# rekey operations confirmed via PONG"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1381
+#: src/core/gnunet-service-core_kx.c:1398
msgid "# SET_KEY and PING messages created"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1402
+msgid "# REKEY operations performed"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1537
msgid "# failed to decrypt message (no session key)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1577
+#: src/core/gnunet-service-core_kx.c:1602
msgid "# bytes dropped (duplicates)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1589
msgid "# bytes dropped (out of sequence)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1626
#, c-format
msgid "Message received far too old (%llu ms). Content ignored.\n"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1630
msgid "# bytes dropped (ancient message)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1638
msgid "# bytes of payload decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1528
+#: 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:1536
+#: 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:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
-#: src/transport/gnunet-service-transport.c:595
+#: 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
msgid "Could not access PEERINFO service. Exiting.\n"
msgstr ""
@@ -700,29 +719,39 @@ msgid "# sessions terminated by transport disconnect"
msgstr ""
#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:334
msgid "# neighbour entries allocated"
msgstr ""
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:247
msgid "# encrypted bytes given to transport"
msgstr ""
-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:418
#, c-format
msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
msgstr ""
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
+#: 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
+msgid "# peers connected"
msgstr ""
-#: src/core/gnunet-service-core_sessions.c:238
+#: src/core/gnunet-service-core_sessions.c:236
msgid "# type map refreshes sent"
msgstr ""
-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:406
msgid "# messages discarded (expired prior to transmission)"
msgstr ""
@@ -735,400 +764,377 @@ msgstr ""
msgid "# updates to my type map"
msgstr ""
-#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:854
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:834
msgid "# bytes stored"
msgstr ""
-#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542
+#: src/datacache/datacache.c:141 src/datacache/datacache.c:148
+#: 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:183
+#: src/datacache/datacache.c:180
#, c-format
msgid "Loading `%s' datacache plugin\n"
msgstr ""
-#: src/datacache/datacache.c:191
+#: src/datacache/datacache.c:188
#, c-format
msgid "Failed to load datacache plugin for `%s'\n"
msgstr ""
-#: src/datacache/datacache.c:281
+#: src/datacache/datacache.c:276
msgid "# requests received"
msgstr ""
-#: src/datacache/datacache.c:291
+#: src/datacache/datacache.c:284
msgid "# requests filtered by bloom filter"
msgstr ""
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614
-#: src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/datacache/plugin_datacache_mysql.c:97
+#: src/datacache/plugin_datacache_mysql.c:104
+#: src/datacache/plugin_datacache_sqlite.c:69
+#: src/datacache/plugin_datacache_sqlite.c:72
+#: src/datastore/plugin_datastore_mysql.c:803
+#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_sqlite.c:57 src/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
#, 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:224
-#: src/datastore/plugin_datastore_mysql.c:316
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_mysql.c:230
-#: src/datastore/plugin_datastore_mysql.c:322
-#, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "无法解析“%s”(%s):%s\n"
-
-#: src/datacache/plugin_datacache_mysql.c:979
+#: src/datacache/plugin_datacache_mysql.c:450
msgid "MySQL datacache running\n"
msgstr ""
-#: src/datacache/plugin_datacache_postgres.c:79
-#: src/datastore/plugin_datastore_postgres.c:93
-#, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
-
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "无法初始化 SQLite:%s。\n"
-
-#: src/datacache/plugin_datacache_postgres.c:499
+#: src/datacache/plugin_datacache_postgres.c:367
msgid "Postgres datacache running\n"
msgstr ""
-#: src/datacache/plugin_datacache_sqlite.c:424
+#: src/datacache/plugin_datacache_sqlite.c:410
msgid "Sqlite datacache running\n"
msgstr ""
-#: src/datacache/plugin_datacache_sqlite.c:457
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:443
+#: src/datastore/plugin_datastore_sqlite.c:408
+#: src/namestore/plugin_namestore_sqlite.c:370
msgid "Tried to close sqlite without finalizing all prepared statements.\n"
msgstr ""
+#: src/datacache/plugin_datacache_sqlite.c:450
+#, fuzzy, c-format
+msgid "Failed to close statement %p: %d\n"
+msgstr "解析配置文件“%s”失败\n"
+
#: src/datacache/plugin_datacache_template.c:121
msgid "Template datacache running\n"
msgstr ""
-#: src/datastore/datastore_api.c:289
+#: src/datastore/datastore_api.c:305
msgid "Failed to transmit request to drop database.\n"
msgstr ""
-#: src/datastore/datastore_api.c:372
+#: src/datastore/datastore_api.c:388
msgid "# queue entry timeouts"
msgstr ""
-#: src/datastore/datastore_api.c:418
+#: src/datastore/datastore_api.c:432
msgid "# queue overflows"
msgstr ""
-#: src/datastore/datastore_api.c:445
+#: src/datastore/datastore_api.c:459
msgid "# queue entries created"
msgstr ""
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:477
msgid "# Requests dropped from datastore queue"
msgstr ""
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:525
msgid "# datastore connections (re)created"
msgstr ""
-#: src/datastore/datastore_api.c:540
+#: src/datastore/datastore_api.c:548
msgid "# reconnected to DATASTORE"
msgstr ""
-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:612
msgid "# transmission request failures"
msgstr ""
-#: src/datastore/datastore_api.c:631
+#: src/datastore/datastore_api.c:633
msgid "# bytes sent to datastore"
msgstr ""
-#: src/datastore/datastore_api.c:772
+#: src/datastore/datastore_api.c:764
msgid "Failed to receive status response from database."
msgstr ""
-#: src/datastore/datastore_api.c:786
+#: src/datastore/datastore_api.c:778
msgid "Error reading response from datastore service"
msgstr ""
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
msgid "Invalid error message received from datastore service"
msgstr ""
-#: src/datastore/datastore_api.c:810
+#: src/datastore/datastore_api.c:800
msgid "# status messages received"
msgstr ""
-#: src/datastore/datastore_api.c:883
+#: src/datastore/datastore_api.c:869
msgid "# PUT requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:954
+#: src/datastore/datastore_api.c:936
msgid "# RESERVE requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1019
+#: src/datastore/datastore_api.c:997
msgid "# RELEASE RESERVE requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1080
+#: src/datastore/datastore_api.c:1054
msgid "# UPDATE requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1148
+#: src/datastore/datastore_api.c:1118
msgid "# REMOVE requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1193
+#: src/datastore/datastore_api.c:1163
msgid "Failed to receive response from database.\n"
msgstr ""
-#: src/datastore/datastore_api.c:1253
+#: src/datastore/datastore_api.c:1221
msgid "# Results received"
msgstr ""
-#: src/datastore/datastore_api.c:1324
+#: src/datastore/datastore_api.c:1286
msgid "# GET REPLICATION requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1391
+#: src/datastore/datastore_api.c:1349
msgid "# GET ZERO ANONYMITY requests executed"
msgstr ""
-#: src/datastore/datastore_api.c:1455
+#: src/datastore/datastore_api.c:1409
msgid "# GET requests executed"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:349
msgid "# bytes expired"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:426
+#: src/datastore/gnunet-service-datastore.c:422
msgid "# bytes purged (low-priority)"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:486
+#: src/datastore/gnunet-service-datastore.c:480
msgid "Transmission to client failed!\n"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:640
+#: src/datastore/gnunet-service-datastore.c:511
+msgid "Shutdown in progress, aborting transmission.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:626
msgid "# results found"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:685
+#: src/datastore/gnunet-service-datastore.c:669
#, c-format
msgid ""
"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
"%llu bytes\n"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:680
#, c-format
msgid ""
"The requested amount (%llu bytes) is larger than the cache size (%llu "
"bytes)\n"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:700
+#: src/datastore/gnunet-service-datastore.c:684
msgid ""
"Insufficient space to satisfy request and requested amount is larger than "
"cache size"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:706
+#: src/datastore/gnunet-service-datastore.c:690
msgid "Insufficient space to satisfy request"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
+#: src/datastore/gnunet-service-datastore.c:695
+#: src/datastore/gnunet-service-datastore.c:747
+#: src/datastore/gnunet-service-datastore.c:960
+#: src/datastore/gnunet-service-datastore.c:1417
msgid "# reserved"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:780
+#: src/datastore/gnunet-service-datastore.c:760
msgid "Could not find matching reservation"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:868
+#: src/datastore/gnunet-service-datastore.c:846
#, c-format
msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1034
+#: src/datastore/gnunet-service-datastore.c:1006
msgid "# GET requests received"
msgstr ""