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.po2516
1 files changed, 1313 insertions, 1203 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3137f5698b..fe942d9ddc 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-03-13 15:25+0100\n"
+"POT-Creation-Date: 2012-05-13 03:22+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,51 +16,51 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/arm/arm_api.c:192
+#: src/arm/arm_api.c:165
msgid "Failed to transmit shutdown request to client.\n"
msgstr ""
-#: src/arm/arm_api.c:382
+#: 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:396
+#: 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:471
+#: 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:527
+#: src/arm/arm_api.c:485
#, c-format
msgid "Requesting start of service `%s'.\n"
msgstr ""
-#: src/arm/arm_api.c:528
+#: src/arm/arm_api.c:486
#, c-format
msgid "Requesting termination of service `%s'.\n"
msgstr ""
-#: src/arm/arm_api.c:550
+#: 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:552
+#: 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:585
+#: src/arm/arm_api.c:540
#, c-format
msgid "Asked to start service `%s' within %llu ms\n"
msgstr ""
-#: src/arm/arm_api.c:658
+#: src/arm/arm_api.c:612
#, c-format
msgid "Stopping service `%s' within %llu ms\n"
msgstr ""
@@ -187,106 +187,98 @@ msgstr ""
msgid "Control services and the Automated Restart Manager (ARM)"
msgstr ""
-#: src/arm/gnunet-service-arm.c:334
+#: 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:337
+#: src/arm/gnunet-service-arm.c:335
#, c-format
msgid "Starting service `%s'\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:363
+#: src/arm/gnunet-service-arm.c:361
msgid "Could not send status result to client\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:397
+#: 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:527
+#: 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:549
+#: 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:563
+#: 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:671
+#: src/arm/gnunet-service-arm.c:667
#, c-format
msgid "Preparing to stop `%s'\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:884
+#: src/arm/gnunet-service-arm.c:878
#, c-format
msgid "Restarting service `%s'.\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:979
+#: src/arm/gnunet-service-arm.c:970
msgid "exit"
msgstr ""
-#: src/arm/gnunet-service-arm.c:984
+#: src/arm/gnunet-service-arm.c:975
msgid "signal"
msgstr ""
-#: src/arm/gnunet-service-arm.c:989
+#: src/arm/gnunet-service-arm.c:980
#, fuzzy
msgid "unknown"
msgstr "未知错误"
-#: src/arm/gnunet-service-arm.c:995
+#: 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:1030
+#: 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:1076 src/arm/mockup-service.c:41
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1175
+#: 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:1177
+#: src/arm/gnunet-service-arm.c:1129
msgid "option missing"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1262
+#: src/arm/gnunet-service-arm.c:1213
#, fuzzy, c-format
msgid "Starting default services `%s'\n"
msgstr "卸载 GNUnet 服务"
-#: src/arm/gnunet-service-arm.c:1273
+#: src/arm/gnunet-service-arm.c:1224
#, c-format
msgid "Default service `%s' not configured correctly!\n"
msgstr ""
-#: src/arm/gnunet-service-arm.c:1287
+#: 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 ""
@@ -558,197 +550,198 @@ 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:240
+#: 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:717
+#: 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:836
-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:817
#, 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/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3002
msgid "Error in communication with PEERINFO service\n"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:625
+#: 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:677
+#: src/core/gnunet-service-core_kx.c:753
msgid "# key exchanges initiated"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:698
+#: src/core/gnunet-service-core_kx.c:775
msgid "# key exchanges stopped"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:750
+#: src/core/gnunet-service-core_kx.c:828
msgid "# session keys received"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:769
+#: 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:807
+#: src/core/gnunet-service-core_kx.c:890
msgid "# SET_KEY messages decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:887
-#: 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:921
+#: 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:942
+#: src/core/gnunet-service-core_kx.c:1029
msgid "# PONG messages created"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1030
+#: src/core/gnunet-service-core_kx.c:1125
msgid "# sessions terminated by timeout"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1041
+#: src/core/gnunet-service-core_kx.c:1135
msgid "# keepalive messages sent"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1099
-#: 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:1129
+#: src/core/gnunet-service-core_kx.c:1275
msgid "# PONG messages decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1303
msgid "# session keys confirmed via PONG"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1227
+#: 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:1368
+#: 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:1410
-#: src/core/gnunet-service-core_kx.c:1435
+#: 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:1422
+#: src/core/gnunet-service-core_kx.c:1589
msgid "# bytes dropped (out of sequence)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1459
+#: 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:1463
+#: src/core/gnunet-service-core_kx.c:1630
msgid "# bytes dropped (ancient message)"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1471
+#: src/core/gnunet-service-core_kx.c:1638
msgid "# bytes of payload decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1532
+#: src/core/gnunet-service-core_kx.c:1699
#, fuzzy
msgid "Core service is lacking HOSTKEY configuration setting. Exiting.\n"
msgstr "立即保存配置?"
-#: src/core/gnunet-service-core_kx.c:1540
+#: src/core/gnunet-service-core_kx.c:1707
msgid "Core service could not access hostkey. Exiting.\n"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1550 src/hostlist/hostlist-server.c:561
-#: src/peerinfo-tool/gnunet-peerinfo.c:723
-#: src/transport/gnunet-service-transport.c:595
+#: src/core/gnunet-service-core_kx.c:1717 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 ""
-#: src/core/gnunet-service-core_neighbours.c:165
+#: src/core/gnunet-service-core_neighbours.c:163
msgid "# sessions terminated by transport disconnect"
msgstr ""
-#: src/core/gnunet-service-core_neighbours.c:182
-#: src/core/gnunet-service-core_neighbours.c:344
+#: src/core/gnunet-service-core_neighbours.c:180
+#: src/core/gnunet-service-core_neighbours.c:334
msgid "# neighbour entries allocated"
msgstr ""
-#: src/core/gnunet-service-core_neighbours.c:253
+#: src/core/gnunet-service-core_neighbours.c:247
msgid "# encrypted bytes given to transport"
msgstr ""
-#: src/core/gnunet-service-core_neighbours.c:432
+#: 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
+#: src/core/gnunet-service-core_sessions.c:206
+#: src/core/gnunet-service-core_sessions.c:269
msgid "# entries in session map"
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 ""
@@ -761,400 +754,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:50 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:516
-#: src/include/gnunet_common.h:523
+#: 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:369
+#: 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 ""
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1018
msgid "# requests filtered by bloomfilter"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1046
msgid "# UPDATE requests received"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1110
+#: src/datastore/gnunet-service-datastore.c:1076
msgid "# GET REPLICATION requests received"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1145
+#: src/datastore/gnunet-service-datastore.c:1109
msgid "# GET ZERO ANONYMITY requests received"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1172
+#: src/datastore/gnunet-service-datastore.c:1134
msgid "Content not found"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1182
+#: src/datastore/gnunet-service-datastore.c:1142
msgid "# bytes removed (explicit request)"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1174
msgid "# REMOVE requests received"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/datastore/gnunet-service-datastore.c:1216
#, c-format
msgid "Datastore payload inaccurate (%lld < %lld). Trying to fix.\n"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/datastore/gnunet-service-datastore.c:1277
#, c-format
msgid "Loading `%s' datastore plugin\n"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/datastore/gnunet-service-datastore.c:1286
#, fuzzy, c-format
msgid "Failed to load datastore plugin for `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1488
#, c-format
msgid "# bytes used in file-sharing datastore `%s'"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1547
+#: src/datastore/gnunet-service-datastore.c:1499
msgid "# quota"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1549
+#: src/datastore/gnunet-service-datastore.c:1501
msgid "# cache size"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1562
+#: src/datastore/gnunet-service-datastore.c:1514
#, c-format
msgid "Could not use specified filename `%s' for bloomfilter.\n"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:1532
+#: src/datastore/gnunet-service-datastore.c:1548
#, fuzzy, c-format
msgid "Failed to remove bogus bloomfilter file `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/datastore/gnunet-service-datastore.c:1626
+#: src/datastore/gnunet-service-datastore.c:1578
#, fuzzy
msgid "Failed to initialize bloomfilter.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/datastore/gnunet-service-datastore.c:1655
+#: src/datastore/gnunet-service-datastore.c:1607
msgid "Rebuilding bloomfilter. Please be patient.\n"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1660
+#: src/datastore/gnunet-service-datastore.c:1612
msgid "Plugin does not support get_keys function. Please fix!\n"
msgstr ""
-#: src/datastore/gnunet-service-datastore.c:1663
+#: src/datastore/gnunet-service-datastore.c:1615
msgid "Bloomfilter construction complete.\n"
msgstr ""
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/datastore/plugin_datastore_mysql.c:780
#, fuzzy, c-format
msgid "Failed to prepare statement `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/datastore/plugin_datastore_mysql.c:788
#, fuzzy, c-format
msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
-#: src/datastore/plugin_datastore_mysql.c:1581
+#: src/datastore/plugin_datastore_mysql.c:1019
msgid "Mysql database running\n"
msgstr ""
-#: src/datastore/plugin_datastore_postgres.c:173
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "无法保存配置文件“%s”:"
+#: src/datastore/plugin_datastore_postgres.c:824
+#, fuzzy
+msgid "Failed to drop table from database.\n"
+msgstr "发送消息失败。\n"
-#: src/datastore/plugin_datastore_postgres.c:1017
+#: src/datastore/plugin_datastore_postgres.c:860
msgid "Postgres database running\n"
msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/datastore/plugin_datastore_sqlite.c:57
#, fuzzy, c-format
msgid "`%s' failed at %s:%u with error: %s"
msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
-#: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:203
+#: 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:266
-#: src/namestore/plugin_namestore_sqlite.c:228
+#: src/datastore/plugin_datastore_sqlite.c:260
+#: src/namestore/plugin_namestore_sqlite.c:229
#, c-format
msgid "Unable to initialize SQLite: %s.\n"
msgstr "无法初始化 SQLite:%s。\n"
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:655
#, fuzzy
msgid "Invalid data in database. Trying to fix (by deletion).\n"
msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
-#: src/datastore/plugin_datastore_sqlite.c:1159
+#: src/datastore/plugin_datastore_sqlite.c:1139
msgid "sqlite version to old to determine size, assuming zero\n"
msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1178
+#: src/datastore/plugin_datastore_sqlite.c:1158
#, c-format
msgid ""
"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
"bytes)\n"
msgstr ""
-#: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:864
+#: src/datastore/plugin_datastore_sqlite.c:1198
+#: src/namestore/plugin_namestore_sqlite.c:829
#, fuzzy
msgid "Sqlite database running\n"
msgstr "sqlite 数据仓库"
@@ -1163,13 +1133,13 @@ msgstr "sqlite 数据仓库"
msgid "Template database running\n"
msgstr ""
-#: src/dht/dht_api.c:280
+#: src/dht/dht_api.c:348
#, fuzzy
msgid "Failed to connect to the DHT service!\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-#: src/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-put.c:192 src/gns/gnunet-gns-lookup.c:179
msgid "the query key"
msgstr ""
@@ -1177,19 +1147,21 @@ msgstr ""
msgid "how many parallel requests (replicas) to create"
msgstr ""
-#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:185
+#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
+#: src/gns/gnunet-gns-lookup.c:185
msgid "the type of data to look for"
msgstr ""
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
#: src/gns/gnunet-gns-lookup.c:188
msgid "how long to execute this query before giving up?"
msgstr ""
-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:730
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
-#: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
+#: 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:270
+#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-unindex.c:169 src/gns/gnunet-gns-lookup.c:191
+#: src/nse/gnunet-nse-profiler.c:910
msgid "be verbose (print progress information)"
msgstr ""
@@ -1197,94 +1169,110 @@ msgstr ""
msgid "Issue a GET request to the GNUnet DHT, prints results."
msgstr ""
-#: src/dht/gnunet-dht-put.c:100
+#: src/dht/gnunet-dht-monitor.c:299
+msgid "how long to execute? 0 = forever"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:321
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:108
msgid "PUT request sent!\n"
msgstr ""
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:111
+msgid "Timeout sending PUT request!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:114
+msgid "PUT request not confirmed!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:144
msgid "Must provide KEY and DATA for DHT put!\n"
msgstr ""
-#: src/dht/gnunet-dht-put.c:132
+#: src/dht/gnunet-dht-put.c:152
#, fuzzy, c-format
msgid "Could not connect to %s service!\n"
msgstr "无法连接到 %s:%u:%s\n"
-#: src/dht/gnunet-dht-put.c:137
+#: 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:152
+#: src/dht/gnunet-dht-put.c:172
#, c-format
msgid "Issuing put request for `%s' with data `%s'!\n"
msgstr ""
-#: src/dht/gnunet-dht-put.c:166
+#: src/dht/gnunet-dht-put.c:186
msgid "the data to insert under the key"
msgstr ""
-#: src/dht/gnunet-dht-put.c:169
+#: src/dht/gnunet-dht-put.c:189
msgid "how long to store this entry in the dht (in seconds)"
msgstr ""
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:195
msgid "how many replicas to create"
msgstr ""
-#: src/dht/gnunet-dht-put.c:178
+#: src/dht/gnunet-dht-put.c:198
msgid "the type to insert data as"
msgstr ""
-#: src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-put.c:223
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:560
-#: src/testing/testing.c:2024 src/testing/testing.c:2054
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
+#: src/testing/testing.c:1968 src/testing/testing.c:1998
#, fuzzy
msgid "Failed to connect to transport service!\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/dht/gnunet-service-dht_clients.c:371
+#: src/dht/gnunet-service-dht_clients.c:407
msgid "# GET requests from clients injected"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:462
+#: src/dht/gnunet-service-dht_clients.c:500
msgid "# PUT requests received from clients"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:529
+#: src/dht/gnunet-service-dht_clients.c:584
msgid "# GET requests received from clients"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:682
msgid "# GET STOP requests received from clients"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:854
+#: src/dht/gnunet-service-dht_clients.c:919
msgid "# Key match, type mismatches in REPLY to CLIENT"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:869
+#: src/dht/gnunet-service-dht_clients.c:932
msgid "# Duplicate REPLIES to CLIENT request dropped"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:906
+#: src/dht/gnunet-service-dht_clients.c:967
#, c-format
msgid "Unsupported block type (%u) in request!\n"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:928
+#: src/dht/gnunet-service-dht_clients.c:989
msgid "# RESULTS queued for clients"
msgstr ""
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
+#: src/dht/gnunet-service-dht_clients.c:1038
+#: src/dht/gnunet-service-dht_clients.c:1081
msgid "# REPLIES ignored for CLIENTS (no match)"
msgstr ""