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.po1028
1 files changed, 584 insertions, 444 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 966abf80b5..05391aa6c4 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: 2014-01-05 13:20+0100\n"
+"POT-Creation-Date: 2014-01-14 18:39+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"
@@ -355,49 +355,49 @@ msgstr ""
msgid "Received last message for %s \n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:1948
-#: src/ats/gnunet-service-ats_addresses.c:1992
+#: src/ats/gnunet-service-ats_addresses.c:1974
+#: src/ats/gnunet-service-ats_addresses.c:2018
#, c-format
msgid ""
"Could not load quota for network `%s': `%s', assigning default bandwidth "
"%llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:1955
+#: src/ats/gnunet-service-ats_addresses.c:1981
#, c-format
msgid "Outbound quota configure for network `%s' is %llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:1963
+#: src/ats/gnunet-service-ats_addresses.c:1989
#, c-format
msgid ""
"No outbound quota configured for network `%s', assigning default bandwidth "
"%llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:1999
+#: src/ats/gnunet-service-ats_addresses.c:2025
#, c-format
msgid "Inbound quota configured for network `%s' is %llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:2007
+#: src/ats/gnunet-service-ats_addresses.c:2033
#, c-format
msgid ""
"No outbound quota configure for network `%s', assigning default bandwidth "
"%llu\n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:2184
+#: src/ats/gnunet-service-ats_addresses.c:2211
#, c-format
msgid "Initializing solver `%s '`%s'\n"
msgstr ""
-#: src/ats/gnunet-service-ats_addresses.c:2187
+#: src/ats/gnunet-service-ats_addresses.c:2214
#, fuzzy, c-format
msgid "Failed to initialize solver `%s'!\n"
msgstr "无法初始化 SQLite:%s。\n"
-#: src/ats/gnunet-service-ats_addresses.c:2210
+#: src/ats/gnunet-service-ats_addresses.c:2237
#, fuzzy
msgid "Failed to initialize solver!\n"
msgstr "无法初始化 SQLite:%s。\n"
@@ -475,12 +475,12 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
msgstr ""
#: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
-#: src/transport/gnunet-transport.c:829
+#: src/transport/gnunet-transport.c:940
#, fuzzy, c-format
msgid "Service `%s' is not running\n"
msgstr "服务已删除。\n"
-#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:838
+#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:949
#, fuzzy, c-format
msgid "Failed to parse peer identity `%s'\n"
msgstr "解析配置文件“%s”失败\n"
@@ -563,6 +563,7 @@ msgid "Print information about ATS state"
msgstr "无法获取有关用户“%s”的信息:%s\n"
#: src/consensus/gnunet-consensus-profiler.c:420
+#: src/secretsharing/gnunet-secretsharing-profiler.c:300
#, fuzzy
msgid "number of peers in consensus"
msgstr "迭代次数"
@@ -583,6 +584,7 @@ msgid "consensus timeout"
msgstr ""
#: src/consensus/gnunet-consensus-profiler.c:432
+#: src/secretsharing/gnunet-secretsharing-profiler.c:309
msgid "be more verbose (print received values)"
msgstr ""
@@ -591,254 +593,259 @@ msgstr ""
msgid "Connection to conversation service lost, trying to reconnect\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:252
+#: src/conversation/gnunet-conversation.c:264
#, c-format
msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:274
+#: src/conversation/gnunet-conversation.c:286
#, c-format
msgid "Call from `%s' terminated\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:307
+#: src/conversation/gnunet-conversation.c:319
#, c-format
msgid "Call from `%s' suspended by other user\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:312
+#: src/conversation/gnunet-conversation.c:324
#, c-format
msgid "Call from `%s' resumed by other user\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:330
+#: src/conversation/gnunet-conversation.c:342
#, c-format
msgid "Ego `%s' no longer available, phone is now down.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:344
+#: src/conversation/gnunet-conversation.c:356
#, fuzzy
msgid "Failed to setup phone (internal error)\n"
msgstr "发送消息失败。\n"
-#: src/conversation/gnunet-conversation.c:356
+#: src/conversation/gnunet-conversation.c:368
#, c-format
msgid ""
"Phone active on line %u. Type `/help' for a list of available commands\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:390
#, c-format
msgid "Resolved address of `%s'. Now ringing other party.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:385
+#: src/conversation/gnunet-conversation.c:397
#, fuzzy, c-format
msgid "Connection established to `%s'\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/conversation/gnunet-conversation.c:392
+#: src/conversation/gnunet-conversation.c:404
#, fuzzy, c-format
msgid "Failed to resolve `%s'\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/conversation/gnunet-conversation.c:399
+#: src/conversation/gnunet-conversation.c:411
msgid "Call terminated\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:405
+#: src/conversation/gnunet-conversation.c:417
#, c-format
msgid "Connection to `%s' suspended (by other user)\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:411
+#: src/conversation/gnunet-conversation.c:423
#, c-format
msgid "Connection to `%s' resumed (by other user)\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:416
+#: src/conversation/gnunet-conversation.c:428
msgid "Error with the call, restarting it\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:483
+#: src/conversation/gnunet-conversation.c:495
#, fuzzy, c-format
msgid "Unknown command `%s'\n"
msgstr "未知的命令“%s”。\n"
-#: src/conversation/gnunet-conversation.c:499
-#: src/conversation/gnunet-conversation.c:513
+#: src/conversation/gnunet-conversation.c:511
+#: src/conversation/gnunet-conversation.c:525
#, c-format
msgid "Ego `%s' not available\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:506
-#: src/conversation/gnunet-conversation.c:563
+#: src/conversation/gnunet-conversation.c:518
+#: src/conversation/gnunet-conversation.c:575
msgid "You are calling someone else already, hang up first!\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:521
-#: src/conversation/gnunet-conversation.c:576
+#: src/conversation/gnunet-conversation.c:533
+#: src/conversation/gnunet-conversation.c:588
#, c-format
msgid "You are answering call from `%s', hang up or suspend that call first!\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:532
+#: src/conversation/gnunet-conversation.c:544
msgid "Call recipient missing.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:587
+#: src/conversation/gnunet-conversation.c:599
msgid "There is no incoming call to accept here!\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:604
+#: src/conversation/gnunet-conversation.c:616
#, c-format
msgid "There is no incoming call `%s' to accept right now!\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:632
+#: src/conversation/gnunet-conversation.c:644
msgid "We currently do not have an address.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:655
+#: src/conversation/gnunet-conversation.c:667
#, c-format
msgid "We are currently trying to locate the private key for the ego `%s'.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:660
+#: src/conversation/gnunet-conversation.c:672
#, c-format
msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:666
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:678
+#: src/conversation/gnunet-conversation.c:702
#, c-format
msgid "You are having a conversation with `%s'.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:671
+#: src/conversation/gnunet-conversation.c:683
msgid ""
"We had an internal error setting up our phone line. You can still make "
"calls.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:680
+#: src/conversation/gnunet-conversation.c:692
#, fuzzy, c-format
msgid "We are trying to find the network address to call `%s'.\n"
msgstr "GNUnet 现在使用 IP 地址 %s。\n"
-#: src/conversation/gnunet-conversation.c:685
+#: src/conversation/gnunet-conversation.c:697
#, c-format
msgid "We are calling `%s', his phone should be ringing.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:704
+#: src/conversation/gnunet-conversation.c:716
msgid "Calls waiting:\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:710
+#: src/conversation/gnunet-conversation.c:722
#, fuzzy, c-format
msgid "#%u: `%s'\n"
msgstr "运行 %s失败:%s %d\n"
-#: src/conversation/gnunet-conversation.c:738
-#: src/conversation/gnunet-conversation.c:753
+#: src/conversation/gnunet-conversation.c:750
+#: src/conversation/gnunet-conversation.c:765
msgid "There is no call that could be suspended right now.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:786
-#: src/conversation/gnunet-conversation.c:802
+#: src/conversation/gnunet-conversation.c:798
+#: src/conversation/gnunet-conversation.c:814
msgid "There is no call that could be resumed right now.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:809
+#: src/conversation/gnunet-conversation.c:821
#, c-format
msgid "Already talking with `%s', cannot resume a call right now.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:818
+#: src/conversation/gnunet-conversation.c:830
msgid "There is no incoming call to resume here!\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:835
+#: src/conversation/gnunet-conversation.c:847
#, c-format
msgid "There is no incoming call `%s' to resume right now!\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:870
+#: src/conversation/gnunet-conversation.c:882
msgid "There is no call that could be cancelled right now.\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:878
+#: src/conversation/gnunet-conversation.c:890
msgid "There is no incoming call to refuse here!\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:895
+#: src/conversation/gnunet-conversation.c:907
#, c-format
msgid "There is no incoming call `%s' to refuse right now!\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:922
+#: src/conversation/gnunet-conversation.c:934
msgid "Use `/address' to find out which address this phone should have in GNS"
msgstr ""
-#: src/conversation/gnunet-conversation.c:924
+#: src/conversation/gnunet-conversation.c:936
msgid "Use `/call USER.gnu' to call USER"
msgstr ""
-#: src/conversation/gnunet-conversation.c:926
+#: src/conversation/gnunet-conversation.c:938
msgid "Use `/accept #NUM' to accept incoming call #NUM"
msgstr ""
-#: src/conversation/gnunet-conversation.c:928
+#: src/conversation/gnunet-conversation.c:940
msgid "Use `/suspend' to suspend the active call"
msgstr ""
-#: src/conversation/gnunet-conversation.c:930
+#: src/conversation/gnunet-conversation.c:942
msgid ""
"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
"calls, no argument is needed to resume the current outgoing call."
msgstr ""
-#: src/conversation/gnunet-conversation.c:932
+#: src/conversation/gnunet-conversation.c:944
msgid "Use `/cancel' to reject or terminate a call"
msgstr ""
-#: src/conversation/gnunet-conversation.c:934
+#: src/conversation/gnunet-conversation.c:946
msgid "Use `/status' to print status information"
msgstr ""
-#: src/conversation/gnunet-conversation.c:936
+#: src/conversation/gnunet-conversation.c:948
msgid "Use `/quit' to terminate gnunet-conversation"
msgstr ""
-#: src/conversation/gnunet-conversation.c:938
+#: src/conversation/gnunet-conversation.c:950
msgid "Use `/help command' to get help for a specific command"
msgstr ""
-#: src/conversation/gnunet-conversation.c:1093
+#: src/conversation/gnunet-conversation.c:1148
#, fuzzy, c-format
msgid "Name of our ego changed to `%s'\n"
msgstr "发送消息失败。\n"
-#: src/conversation/gnunet-conversation.c:1106
+#: src/conversation/gnunet-conversation.c:1161
#, c-format
msgid "Our ego `%s' was deleted!\n"
msgstr ""
-#: src/conversation/gnunet-conversation.c:1141
+#: src/conversation/gnunet-conversation.c:1196
#, fuzzy
msgid "You must specify the NAME of an ego to use\n"
msgstr "您必须指定一个昵称\n"
-#: src/conversation/gnunet-conversation.c:1167
+#: src/conversation/gnunet-conversation.c:1220
+#, fuzzy
+msgid "Failed to start gnunet-helper-w32-console\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/conversation/gnunet-conversation.c:1246
msgid "sets the NAME of the ego to use for the phone (and name resolution)"
msgstr ""
-#: src/conversation/gnunet-conversation.c:1170
+#: src/conversation/gnunet-conversation.c:1249
msgid "sets the LINE to use for the phone"
msgstr ""
-#: src/conversation/gnunet-conversation.c:1185
+#: src/conversation/gnunet-conversation.c:1273
msgid "Enables having a conversation with other GNUnet users."
msgstr ""
@@ -880,12 +887,12 @@ msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
msgstr ""
#: src/conversation/gnunet-helper-audio-playback.c:211
-#: src/conversation/gnunet-helper-audio-record.c:362
+#: src/conversation/gnunet-helper-audio-record.c:365
msgid "Connection established.\n"
msgstr ""
#: src/conversation/gnunet-helper-audio-playback.c:216
-#: src/conversation/gnunet-helper-audio-record.c:367
+#: src/conversation/gnunet-helper-audio-record.c:370
#, fuzzy, c-format
msgid "pa_stream_new() failed: %s\n"
msgstr "“%s”说:%s\n"
@@ -896,34 +903,34 @@ msgid "pa_stream_connect_playback() failed: %s\n"
msgstr ""
#: src/conversation/gnunet-helper-audio-playback.c:243
-#: src/conversation/gnunet-helper-audio-record.c:393
+#: src/conversation/gnunet-helper-audio-record.c:396
#, fuzzy, c-format
msgid "Connection failure: %s\n"
msgstr "“%s”已连接到“%s”。\n"
#: src/conversation/gnunet-helper-audio-playback.c:264
-#: src/conversation/gnunet-helper-audio-record.c:416
+#: src/conversation/gnunet-helper-audio-record.c:419
msgid "Wrong Spec\n"
msgstr ""
#: src/conversation/gnunet-helper-audio-playback.c:270
-#: src/conversation/gnunet-helper-audio-record.c:422
+#: src/conversation/gnunet-helper-audio-record.c:425
msgid "pa_mainloop_new() failed.\n"
msgstr ""
#: src/conversation/gnunet-helper-audio-playback.c:284
-#: src/conversation/gnunet-helper-audio-record.c:437
+#: src/conversation/gnunet-helper-audio-record.c:440
msgid "pa_context_new() failed.\n"
msgstr ""
#: src/conversation/gnunet-helper-audio-playback.c:291
-#: src/conversation/gnunet-helper-audio-record.c:443
+#: src/conversation/gnunet-helper-audio-record.c:446
#, fuzzy, c-format
msgid "pa_context_connect() failed: %s\n"
msgstr "“%s”说:%s\n"
#: src/conversation/gnunet-helper-audio-playback.c:297
-#: src/conversation/gnunet-helper-audio-record.c:449
+#: src/conversation/gnunet-helper-audio-record.c:452
msgid "pa_mainloop_run() failed.\n"
msgstr ""
@@ -932,46 +939,51 @@ msgstr ""
msgid "Read error from STDIN: %s\n"
msgstr ""
-#: src/conversation/gnunet-helper-audio-record.c:237
+#: src/conversation/gnunet-helper-audio-playback-gst.c:341
+#, c-format
+msgid "Read error from STDIN: %d %s\n"
+msgstr ""
+
+#: src/conversation/gnunet-helper-audio-record.c:240
#, fuzzy, c-format
msgid "pa_stream_peek() failed: %s\n"
msgstr "“%s”说:%s\n"
-#: src/conversation/gnunet-helper-audio-record.c:275
+#: src/conversation/gnunet-helper-audio-record.c:278
msgid "Got signal, exiting.\n"
msgstr ""
-#: src/conversation/gnunet-helper-audio-record.c:300
+#: src/conversation/gnunet-helper-audio-record.c:303
#, fuzzy
msgid "Stream successfully created.\n"
msgstr "“%s”已连接到“%s”。\n"
-#: src/conversation/gnunet-helper-audio-record.c:305
+#: src/conversation/gnunet-helper-audio-record.c:308
#, fuzzy, c-format
msgid "pa_stream_get_buffer_attr() failed: %s\n"
msgstr "“%s”说:%s\n"
-#: src/conversation/gnunet-helper-audio-record.c:313
+#: src/conversation/gnunet-helper-audio-record.c:316
#, c-format
msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
msgstr ""
-#: src/conversation/gnunet-helper-audio-record.c:317
+#: src/conversation/gnunet-helper-audio-record.c:320
#, c-format
msgid "Using sample spec '%s', channel map '%s'.\n"
msgstr ""
-#: src/conversation/gnunet-helper-audio-record.c:324
+#: src/conversation/gnunet-helper-audio-record.c:327
#, fuzzy, c-format
msgid "Connected to device %s (%u, %ssuspended).\n"
msgstr "“%s”已连接到“%s”。\n"
-#: src/conversation/gnunet-helper-audio-record.c:333
+#: src/conversation/gnunet-helper-audio-record.c:336
#, c-format
msgid "Stream error: %s\n"
msgstr ""
-#: src/conversation/gnunet-helper-audio-record.c:380
+#: src/conversation/gnunet-helper-audio-record.c:383
#, fuzzy, c-format
msgid "pa_stream_connect_record() failed: %s\n"
msgstr "“%s”说:%s\n"
@@ -1015,17 +1027,17 @@ msgid "Peer `%s'\n"
msgstr ""
#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:609 src/transport/gnunet-transport.c:634
+#: src/transport/gnunet-transport.c:630 src/transport/gnunet-transport.c:650
#, c-format
msgid "%24s: %-17s %4s (%u connections in total)\n"
msgstr ""
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:611
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:631
#, fuzzy
msgid "Connected to"
msgstr "“%s”已连接到“%s”。\n"
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:636
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:651
#, fuzzy
msgid "Disconnected from"
msgstr "“%s”已连接到“%s”。\n"
@@ -1035,7 +1047,7 @@ msgstr "“%s”已连接到“%s”。\n"
msgid "Invalid command line argument `%s'\n"
msgstr "“%s”的参数无效。\n"
-#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1028
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1127
msgid "provide information about all current connections (continuously)"
msgstr ""
@@ -1102,7 +1114,7 @@ msgid "# EPHEMERAL_KEY messages received"
msgstr ""
#: src/core/gnunet-service-core_kx.c:950
-#: src/transport/gnunet-service-transport_validation.c:974
+#: src/transport/gnunet-service-transport_validation.c:968
msgid "# PING messages received"
msgstr ""
@@ -1130,7 +1142,7 @@ msgid "# keepalive messages sent"
msgstr ""
#: src/core/gnunet-service-core_kx.c:1095
-#: src/transport/gnunet-service-transport_validation.c:1285
+#: src/transport/gnunet-service-transport_validation.c:1280
msgid "# PONG messages received"
msgstr ""
@@ -1220,11 +1232,11 @@ msgstr ""
#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
#: src/topology/gnunet-daemon-topology.c:706
#: src/topology/gnunet-daemon-topology.c:807
-#: src/transport/gnunet-service-transport_neighbours.c:929
-#: src/transport/gnunet-service-transport_neighbours.c:1161
-#: src/transport/gnunet-service-transport_neighbours.c:1170
-#: src/transport/gnunet-service-transport_neighbours.c:3015
-#: src/transport/gnunet-service-transport_neighbours.c:3291
+#: src/transport/gnunet-service-transport_neighbours.c:837
+#: src/transport/gnunet-service-transport_neighbours.c:1069
+#: src/transport/gnunet-service-transport_neighbours.c:1078
+#: src/transport/gnunet-service-transport_neighbours.c:2920
+#: src/transport/gnunet-service-transport_neighbours.c:3181
msgid "# peers connected"
msgstr ""
@@ -1299,6 +1311,9 @@ msgstr ""
#: src/namecache/plugin_namecache_sqlite.c:52
#: src/namestore/plugin_namestore_postgres.c:52
#: src/namestore/plugin_namestore_sqlite.c:52
+#: src/testbed/generate-underlay-topology.c:47
+#: src/testbed/gnunet-daemon-latency-logger.c:52
+#: src/testbed/gnunet-daemon-testbed-underlay.c:55
#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
#: src/include/gnunet_common.h:602 src/include/gnunet_common.h:611
#: src/scalarproduct/scalarproduct.h:61
@@ -1616,6 +1631,9 @@ msgid "Postgres database running\n"
msgstr ""
#: src/datastore/plugin_datastore_sqlite.c:57
+#: src/testbed/generate-underlay-topology.c:50
+#: src/testbed/gnunet-daemon-latency-logger.c:55
+#: src/testbed/gnunet-daemon-testbed-underlay.c:58
#, fuzzy, c-format
msgid "`%s' failed at %s:%u with error: %s"
msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
@@ -3272,7 +3290,7 @@ msgid "Option `%s' is required when using option `%s'.\n"
msgstr ""
#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:865 src/transport/gnunet-transport.c:899
+#: src/transport/gnunet-transport.c:977 src/transport/gnunet-transport.c:1007
#, c-format
msgid "Option `%s' makes no sense without option `%s'.\n"
msgstr ""
@@ -3888,8 +3906,8 @@ msgstr ""
#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
#: src/hostlist/hostlist-client.c:968
-#: src/transport/plugin_transport_http_client.c:1070
-#: src/transport/plugin_transport_http_client.c:1085
+#: src/transport/plugin_transport_http_client.c:1062
+#: src/transport/plugin_transport_http_client.c:1077
#, c-format
msgid "%s failed at %s:%d: `%s'\n"
msgstr ""
@@ -4181,36 +4199,36 @@ msgstr "创建用户出错"
msgid "Modified %u addresses \n"
msgstr ""
-#: src/hello/hello.c:943
+#: src/hello/hello.c:944
#, fuzzy
msgid "Failed to parse HELLO message: missing expiration time\n"
msgstr "保存配置失败。"
-#: src/hello/hello.c:952
+#: src/hello/hello.c:953
#, fuzzy
msgid "Failed to parse HELLO message: invalid expiration time\n"
msgstr "保存配置失败。"
-#: src/hello/hello.c:962
+#: src/hello/hello.c:963
#, fuzzy
msgid "Failed to parse HELLO message: malformed\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/hello/hello.c:972
+#: src/hello/hello.c:973
msgid "Failed to parse HELLO message: missing transport plugin\n"
msgstr ""
-#: src/hello/hello.c:989
+#: src/hello/hello.c:990
#, c-format
msgid "Plugin `%s' not found\n"
msgstr ""
-#: src/hello/hello.c:998
+#: src/hello/hello.c:999
#, c-format
msgid "Plugin `%s' does not support URIs yet\n"
msgstr ""
-#: src/hello/hello.c:1017
+#: src/hello/hello.c:1018
#, fuzzy, c-format
msgid "Failed to parse `%s' as an address for plugin `%s'\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -4453,7 +4471,7 @@ msgid "Advertisement message could not be queued by core\n"
msgstr ""
#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
-#: src/transport/gnunet-service-transport.c:946
+#: src/transport/gnunet-service-transport.c:867
msgid "Could not access PEERINFO service. Exiting.\n"
msgstr ""
@@ -4564,48 +4582,34 @@ msgstr "解析配置文件“%s”失败\n"
msgid "Failed to create directory `%s' for storing egos\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/mesh/gnunet-mesh.c:342
+#: src/mesh/gnunet-mesh.c:343
#, fuzzy, c-format
msgid "Invalid target `%s'\n"
msgstr "“%s”的参数无效。\n"
-#: src/mesh/gnunet-mesh.c:503
+#: src/mesh/gnunet-mesh.c:521
#, fuzzy, c-format
msgid "Invalid tunnel owner `%s'\n"
msgstr "IP 格式无效:“%s”\n"
-#: src/mesh/gnunet-mesh.c:568
+#: src/mesh/gnunet-mesh.c:586
msgid "You must NOT give a TARGET when using options\n"
msgstr ""
-#: src/mesh/gnunet-mesh.c:645
-#, fuzzy
-msgid "provide information about a particular channel"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
-#: src/mesh/gnunet-mesh.c:648
-#, fuzzy
-msgid "provide information about a particular connection"
-msgstr "无法获取有关用户“%s”的信息:%s\n"
-
-#: src/mesh/gnunet-mesh.c:651
+#: src/mesh/gnunet-mesh.c:669
msgid "activate echo mode"
msgstr ""
-#: src/mesh/gnunet-mesh.c:654
+#: src/mesh/gnunet-mesh.c:672
#, fuzzy
msgid "provide information about all tunnels"
msgstr "无法获取有关用户“%s”的信息:%s\n"
-#: src/mesh/gnunet-mesh.c:657
-msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:660
+#: src/mesh/gnunet-mesh.c:678
msgid "port to listen to (default; 0)"
msgstr ""
-#: src/mesh/gnunet-mesh.c:663
+#: src/mesh/gnunet-mesh.c:681
#, fuzzy
msgid "provide information about a particular tunnel"
msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -4730,7 +4734,7 @@ msgid "del"
msgstr ""
#: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:703
+#: src/peerinfo-tool/gnunet-peerinfo.c:702
#, fuzzy, c-format
msgid "Invalid URI `%s'\n"
msgstr "无效条目。\n"
@@ -4900,53 +4904,53 @@ msgstr ""
msgid "NAT traversal with ICMP Server timed out.\n"
msgstr ""
-#: src/nat/nat_auto.c:200
+#: src/nat/nat_auto.c:203
msgid "NAT traversal with ICMP Server succeeded.\n"
msgstr ""
-#: src/nat/nat_auto.c:201
+#: src/nat/nat_auto.c:204
msgid "NAT traversal with ICMP Server failed.\n"
msgstr ""
-#: src/nat/nat_auto.c:222
+#: src/nat/nat_auto.c:225
msgid "Testing connection reversal with ICMP server.\n"
msgstr ""
-#: src/nat/nat_auto.c:269
+#: src/nat/nat_auto.c:274
#, c-format
msgid "Detected external IP `%s'\n"
msgstr ""
-#: src/nat/nat_auto.c:339
+#: src/nat/nat_auto.c:344
msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
msgstr ""
-#: src/nat/nat_auto.c:355
+#: src/nat/nat_auto.c:360
#, fuzzy, c-format
msgid "Detected internal network address `%s'.\n"
msgstr "GNUnet 现在使用 IP 地址 %s。\n"
-#: src/nat/nat_auto.c:408
+#: src/nat/nat_auto.c:413
msgid "upnpc found, enabling its use\n"
msgstr ""
-#: src/nat/nat_auto.c:409
+#: src/nat/nat_auto.c:414
msgid "upnpc not found\n"
msgstr ""
-#: src/nat/nat_auto.c:442
+#: src/nat/nat_auto.c:447
msgid "gnunet-helper-nat-server found, testing it\n"
msgstr ""
-#: src/nat/nat_auto.c:443
+#: src/nat/nat_auto.c:448
msgid "No working gnunet-helper-nat-server found\n"
msgstr ""
-#: src/nat/nat_auto.c:477
+#: src/nat/nat_auto.c:482
msgid "gnunet-helper-nat-client found, enabling it\n"
msgstr ""
-#: src/nat/nat_auto.c:478
+#: src/nat/nat_auto.c:483
msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
msgstr ""
@@ -4960,39 +4964,64 @@ msgstr ""
msgid "Failed to start %s\n"
msgstr "运行 %s失败:%s %d\n"
-#: src/nat/nat.c:1203
+#: src/nat/nat.c:1205
msgid "malformed"
msgstr ""
-#: src/nat/nat.c:1274 src/nat/nat.c:1286
+#: src/nat/nat.c:1276 src/nat/nat.c:1288
#, c-format
msgid ""
"Configuration requires `%s', but binary is not installed properly (SUID bit "
"not set). Option disabled.\n"
msgstr ""
-#: src/nat/nat.c:1424
+#: src/nat/nat.c:1426
msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
msgstr ""
-#: src/nat/nat.c:1440
+#: src/nat/nat.c:1442
#, c-format
msgid "Running gnunet-helper-nat-client %s %s %u\n"
msgstr ""
-#: src/nat/nat_mini.c:170
+#: src/nat/nat_mini.c:155
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat_mini.c:175
+msgid "`external-ip' command not found"
+msgstr ""
+
+#: src/nat/nat_mini.c:201
msgid "`external-ip' command not found\n"
msgstr ""
-#: src/nat/nat_mini.c:505
+#: src/nat/nat_mini.c:366
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/nat/nat_mini.c:512
+msgid "`upnpc' command took too long, process killed"
+msgstr ""
+
+#: src/nat/nat_mini.c:540
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat_mini.c:604
msgid "`upnpc' command not found\n"
msgstr ""
-#: src/nat/nat_test.c:348
+#: src/nat/nat_mini.c:608
+msgid "`upnpc` command not found"
+msgstr ""
+
+#: src/nat/nat_test.c:351
msgid "Failed to connect to `gnunet-nat-server'\n"
msgstr ""
-#: src/nat/nat_test.c:420
+#: src/nat/nat_test.c:423
#, c-format
msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
msgstr ""
@@ -5027,15 +5056,11 @@ msgid "Measure quality and performance of the NSE service."
msgstr "无法访问该服务"
#: src/nse/gnunet-service-nse.c:1461
-#: src/revocation/gnunet-service-revocation.c:789
+#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
#, fuzzy
msgid "Value is too large.\n"
msgstr "值不在合法范围内。"
-#: src/nse/gnunet-service-nse.c:1488
-msgid "NSE service is lacking key configuration settings. Exiting.\n"
-msgstr ""
-
#: src/peerinfo/gnunet-service-peerinfo.c:215
#, c-format
msgid "Removing expired address of transport `%s'\n"
@@ -5147,55 +5172,50 @@ msgstr ""
msgid "Failure adding HELLO: %s\n"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:661
-#, fuzzy, c-format
-msgid "Could not find option `%s:%s' in configuration.\n"
-msgstr "找不到主机“%s”的 IP:%s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:667
+#: src/peerinfo-tool/gnunet-peerinfo.c:666 src/util/gnunet-scrypt.c:224
#, c-format
msgid "Loading hostkey from `%s' failed.\n"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:725
+#: src/peerinfo-tool/gnunet-peerinfo.c:724
#, c-format
msgid "I am peer `%s'.\n"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:769
+#: src/peerinfo-tool/gnunet-peerinfo.c:768
msgid "don't resolve host names"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:772
+#: src/peerinfo-tool/gnunet-peerinfo.c:771
msgid "output only the identity strings"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/peerinfo-tool/gnunet-peerinfo.c:774
msgid "include friend-only information"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:778
+#: src/peerinfo-tool/gnunet-peerinfo.c:777
msgid "output our own identity only"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:781
+#: src/peerinfo-tool/gnunet-peerinfo.c:780
#, fuzzy
msgid "list all known peers"
msgstr "列出所有网络适配器"
-#: src/peerinfo-tool/gnunet-peerinfo.c:784
+#: src/peerinfo-tool/gnunet-peerinfo.c:783
msgid "dump hello to file"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:787
+#: src/peerinfo-tool/gnunet-peerinfo.c:786
msgid "also output HELLO uri(s)"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:790
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
msgid "add given HELLO uri to the database"
msgstr ""
-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:800
#, fuzzy
msgid "Print information about peers."
msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -5825,6 +5845,14 @@ msgstr "初始化“%s”服务失败。\n"
msgid "Failed to send a message to the scalarproduct service\n"
msgstr "初始化“%s”服务失败。\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:303
+msgid "dkg timeout"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:306
+msgid "threshold"
+msgstr ""
+
#: src/set/gnunet-service-set.c:1416
#, fuzzy
msgid "Could not connect to mesh service\n"
@@ -5957,19 +5985,94 @@ msgid ""
"might have been lost!\n"
msgstr ""
+#: src/testbed/generate-underlay-topology.c:223
+msgid "Need atleast 2 arguments\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:228
+msgid "Database filename missing\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:235
+msgid "Topology string missing\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:240
+#, fuzzy, c-format
+msgid "Invalid topology: %s\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/testbed/generate-underlay-topology.c:252
+#, c-format
+msgid "An argument is missing for given topology `%s'\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:258
+#, fuzzy, c-format
+msgid "Invalid argument `%s' given as topology argument\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/testbed/generate-underlay-topology.c:266
+#, c-format
+msgid "Filename argument missing for topology `%s'\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:280
+#, c-format
+msgid "Second argument for topology `%s' is missing\n"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:286
+#, fuzzy, c-format
+msgid "Invalid argument `%s'; expecting unsigned int\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/testbed/generate-underlay-topology.c:335
+#: src/testbed/gnunet-testbed-profiler.c:293
+msgid "create COUNT number of peers"
+msgstr ""
+
+#: src/testbed/generate-underlay-topology.c:344
+msgid ""
+"Generates SQLite3 database representing a given underlay topology.\n"
+"Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
+"The following options are available for TOPO followed by TOPOOPTS if "
+"applicable:\n"
+"\t LINE\n"
+"\t RING\n"
+"\t RANDOM <num_rnd_links>\n"
+"\t SMALL_WORLD <num_rnd_links>\n"
+"\t SMALL_WORLD_RING <num_rnd_links>\n"
+"\t CLIQUE\n"
+"\t 2D_TORUS\n"
+"\t SCALE_FREE <cap> <m>\n"
+"\t FROM_FILE <filename>\n"
+"TOPOOPTS:\n"
+"\t num_rnd_links: The number of random links\n"
+"\t cap: the maximum number of links a node can have\n"
+"\t m: the number of links a node should have while joining the network\n"
+"\t filename: the path of the file which contains topology information\n"
+"NOTE: the format of the above file is descibed here: https://www.gnunet.org/"
+"content/topology-file-format\n"
+msgstr ""
+
+#: src/testbed/gnunet-daemon-latency-logger.c:325
+msgid "Daemon to log latency values of connections to neighbours"
+msgstr ""
+
#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
msgid ""
"Daemon to restrict incoming transport layer connections during testbed "
"deployments"
msgstr ""
-#: src/testbed/gnunet-daemon-testbed-underlay.c:300 src/testing/testing.c:293
-#: src/util/gnunet-ecc.c:217
+#: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
#, c-format
msgid "Incorrect hostkey file format: %s\n"
msgstr ""
-#: src/testbed/gnunet-daemon-testbed-underlay.c:553
+#: src/testbed/gnunet-daemon-testbed-underlay.c:474
msgid "Daemon to restrict underlay network in testbed deployments"
msgstr ""
@@ -6007,10 +6110,6 @@ msgstr "卸载 GNUnet 服务"
msgid "Exiting as the number of peers is %u\n"
msgstr "增加 TCP/IP 的最大连接数"
-#: src/testbed/gnunet-testbed-profiler.c:293
-msgid "create COUNT number of peers"
-msgstr ""
-
#: src/testbed/gnunet-testbed-profiler.c:296
msgid "tolerate COUNT number of continious timeout failures"
msgstr ""
@@ -6047,100 +6146,100 @@ msgstr ""
msgid "Adding host %u failed with error: %s\n"
msgstr "“%s”以错误码 %d 失败:%s\n"
-#: src/testbed/testbed_api_testbed.c:820
+#: src/testbed/testbed_api_testbed.c:819
msgid "Linking controllers failed. Exiting"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:989
+#: src/testbed/testbed_api_testbed.c:988
#, c-format
msgid "Host registration failed for a host. Error: %s\n"
msgstr ""
-#: src/testbed/testbed_api_testbed.c:1055
+#: src/testbed/testbed_api_testbed.c:1054