1 files changed, 361 insertions, 262 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 245743ddd..d300b2a54 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-11-05 22:48+0100\n"
+"POT-Creation-Date: 2012-11-14 15:54+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"
@@ -126,19 +126,19 @@ msgstr ""
 
 #: src/arm/gnunet-arm.c:433
 #, fuzzy
-msgid "timeout for completing current operation"
+msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
 #: src/arm/gnunet-arm.c:435
-msgid "List currently running services"
+msgid "list currently running services"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:437
-msgid "Don't let gnunet-service-arm inherit standard output"
+msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:439
-msgid "Don't let gnunet-service-arm inherit standard error"
+msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
 #: src/arm/gnunet-arm.c:450
@@ -231,44 +231,66 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:67
+#: src/ats-tool/gnunet-ats.c:75
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', bandwidth out: %u Bytes/s, bandwidth in "
 "%u Bytes/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:129
+#: src/ats-tool/gnunet-ats.c:137
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:131
+#: src/ats-tool/gnunet-ats.c:139
 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:142 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:617
+#: src/ats-tool/gnunet-ats.c:153 src/namestore/gnunet-namestore.c:610
+#: src/transport/gnunet-transport.c:744
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:149
+#: src/ats-tool/gnunet-ats.c:162 src/transport/gnunet-transport.c:750
+#, fuzzy, c-format
+msgid "Failed to parse peer identity `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/ats-tool/gnunet-ats.c:167 src/ats-tool/gnunet-ats.c:182
+msgid "Type required\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:189 src/ats-tool/gnunet-ats.c:199
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:194
+#: src/ats-tool/gnunet-ats.c:247
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:197
+#: src/ats-tool/gnunet-ats.c:250
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:206
+#: src/ats-tool/gnunet-ats.c:253
+#, fuzzy
+msgid "set preference for the given peer"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/ats-tool/gnunet-ats.c:256
+msgid "preference type to set: latency | bandwidth"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:259
+msgid "preference value"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:268
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
@@ -288,17 +310,17 @@ msgid "Peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
-#: src/transport/gnunet-transport.c:453 src/transport/gnunet-transport.c:477
+#: src/transport/gnunet-transport.c:571 src/transport/gnunet-transport.c:595
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:455
+#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:573
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:479
+#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:597
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
@@ -308,7 +330,7 @@ msgstr "“%s”已连接到“%s”。\n"
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:724
+#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:933
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -345,7 +367,7 @@ msgstr ""
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:818
+#: src/core/gnunet-service-core_clients.c:518
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
@@ -489,16 +511,16 @@ msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-#: src/dht/gnunet-service-dht_neighbours.c:634
-#: src/dht/gnunet-service-dht_neighbours.c:692
+#: src/dht/gnunet-service-dht_neighbours.c:639
+#: src/dht/gnunet-service-dht_neighbours.c:697
 #: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
 #: src/topology/gnunet-daemon-topology.c:704
 #: src/topology/gnunet-daemon-topology.c:805
-#: src/transport/gnunet-service-transport_neighbours.c:872
-#: src/transport/gnunet-service-transport_neighbours.c:1089
-#: src/transport/gnunet-service-transport_neighbours.c:1098
-#: src/transport/gnunet-service-transport_neighbours.c:2635
-#: src/transport/gnunet-service-transport_neighbours.c:2897
+#: src/transport/gnunet-service-transport_neighbours.c:874
+#: src/transport/gnunet-service-transport_neighbours.c:1091
+#: src/transport/gnunet-service-transport_neighbours.c:1100
+#: src/transport/gnunet-service-transport_neighbours.c:2637
+#: src/transport/gnunet-service-transport_neighbours.c:2899
 msgid "# peers connected"
 msgstr ""
 
@@ -519,38 +541,49 @@ msgstr ""
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:250
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:266
 #: src/datastore/gnunet-service-datastore.c:834
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:141 src/datacache/datacache.c:148
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:268
+msgid "# items stored"
+msgstr ""
+
+#: src/datacache/datacache.c:143 src/datacache/datacache.c:150
 #: src/datastore/gnunet-service-datastore.c:1483
 #: src/datastore/gnunet-service-datastore.c:1494
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/datacache/datacache.c:180
+#: src/datacache/datacache.c:184
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:188
+#: src/datacache/datacache.c:192
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:276
+#: src/datacache/datacache.c:295
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:284
+#: src/datacache/datacache.c:304
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:97
-#: src/datacache/plugin_datacache_mysql.c:104
+#: src/datacache/plugin_datacache_heap.c:406
+#, fuzzy
+msgid "Heap datacache running\n"
+msgstr "sqlite 数据仓库"
+
+#: src/datacache/plugin_datacache_postgres.c:392
+msgid "Postgres datacache running\n"
+msgstr ""
+
 #: src/datacache/plugin_datacache_sqlite.c:69
 #: src/datacache/plugin_datacache_sqlite.c:72
 #: src/datastore/plugin_datastore_mysql.c:803
@@ -566,30 +599,22 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datacache/plugin_datacache_mysql.c:450
-msgid "MySQL datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_postgres.c:367
-msgid "Postgres datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_sqlite.c:405
+#: src/datacache/plugin_datacache_sqlite.c:448
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:438
+#: src/datacache/plugin_datacache_sqlite.c:482
 #: src/datastore/plugin_datastore_sqlite.c:401
 #: src/namestore/plugin_namestore_sqlite.c:362
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:445
+#: src/datacache/plugin_datacache_sqlite.c:489
 #, fuzzy, c-format
 msgid "Failed to close statement %p: %d\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datacache/plugin_datacache_template.c:121
+#: src/datacache/plugin_datacache_template.c:125
 msgid "Template datacache running\n"
 msgstr ""
 
@@ -871,18 +896,18 @@ msgstr "无法初始化 SQLite：%s。\n"
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1132
+#: src/datastore/plugin_datastore_sqlite.c:1134
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1151
+#: src/datastore/plugin_datastore_sqlite.c:1153
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1191
+#: src/datastore/plugin_datastore_sqlite.c:1193
 #: src/namestore/plugin_namestore_sqlite.c:827
 #, fuzzy
 msgid "Sqlite database running\n"
@@ -892,7 +917,7 @@ msgstr "sqlite 数据仓库"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:348
+#: src/dht/dht_api.c:375
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1013,75 +1038,79 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:500
+#: src/dht/gnunet-service-dht_clients.c:497
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:584
+#: src/dht/gnunet-service-dht_clients.c:579
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:682
+#: src/dht/gnunet-service-dht_clients.c:775
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:919
+#: src/dht/gnunet-service-dht_clients.c:1012
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:932
+#: src/dht/gnunet-service-dht_clients.c:1025
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:967
+#: src/dht/gnunet-service-dht_clients.c:1062
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:990
+#: src/dht/gnunet-service-dht_clients.c:1085
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1039
-#: src/dht/gnunet-service-dht_clients.c:1082
+#: src/dht/gnunet-service-dht_clients.c:1134
+#: src/dht/gnunet-service-dht_clients.c:1177
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1049
+#: src/dht/gnunet-service-dht_clients.c:1144
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:93
+#: src/dht/gnunet-service-dht_datacache.c:64
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:103
+#: src/dht/gnunet-service-dht_datacache.c:74
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:207
+#: src/dht/gnunet-service-dht_datacache.c:159
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:218
+#: src/dht/gnunet-service-dht_datacache.c:170
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:224
+#: src/dht/gnunet-service-dht_datacache.c:176
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:236
+#: src/dht/gnunet-service-dht_datacache.c:182
+msgid "# Irrelevant RESULTS found in datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:194
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:239
+#: src/dht/gnunet-service-dht_datacache.c:197
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:269
+#: src/dht/gnunet-service-dht_datacache.c:227
 msgid "# GET requests given to datacache"
 msgstr ""
 
@@ -1089,87 +1118,87 @@ msgstr ""
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:490
+#: src/dht/gnunet-service-dht_neighbours.c:495
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:580
+#: src/dht/gnunet-service-dht_neighbours.c:585
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:726
+#: src/dht/gnunet-service-dht_neighbours.c:731
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:781
+#: src/dht/gnunet-service-dht_neighbours.c:786
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:819
-msgid "# Bytes of bandwdith requested from core"
+#: src/dht/gnunet-service-dht_neighbours.c:824
+msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1041
-#: src/dht/gnunet-service-dht_neighbours.c:1069
+#: src/dht/gnunet-service-dht_neighbours.c:1046
+#: src/dht/gnunet-service-dht_neighbours.c:1074
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1050
-#: src/dht/gnunet-service-dht_neighbours.c:1084
+#: src/dht/gnunet-service-dht_neighbours.c:1055
+#: src/dht/gnunet-service-dht_neighbours.c:1089
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1216
+#: src/dht/gnunet-service-dht_neighbours.c:1223
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1245
+#: src/dht/gnunet-service-dht_neighbours.c:1252
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1252
-#: src/dht/gnunet-service-dht_neighbours.c:1365
-#: src/dht/gnunet-service-dht_neighbours.c:1465
+#: src/dht/gnunet-service-dht_neighbours.c:1259
+#: src/dht/gnunet-service-dht_neighbours.c:1372
+#: src/dht/gnunet-service-dht_neighbours.c:1472
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1330
+#: src/dht/gnunet-service-dht_neighbours.c:1337
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1357
+#: src/dht/gnunet-service-dht_neighbours.c:1364
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1472
+#: src/dht/gnunet-service-dht_neighbours.c:1479
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1560
+#: src/dht/gnunet-service-dht_neighbours.c:1567
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1676
+#: src/dht/gnunet-service-dht_neighbours.c:1694
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1684
+#: src/dht/gnunet-service-dht_neighbours.c:1702
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1775
+#: src/dht/gnunet-service-dht_neighbours.c:1793
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1817
+#: src/dht/gnunet-service-dht_neighbours.c:1835
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1831
+#: src/dht/gnunet-service-dht_neighbours.c:1849
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1905
+#: src/dht/gnunet-service-dht_neighbours.c:1934
 msgid "# P2P RESULTS received"
 msgstr ""
 
@@ -1189,19 +1218,23 @@ msgstr ""
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:238
+#: src/dht/gnunet-service-dht_routing.c:232
+msgid "# Irrelevant REPLIES matched against routing table"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:311
+#: src/dht/gnunet-service-dht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:394
+#: src/dht/gnunet-service-dht_routing.c:400
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:411
+#: src/dht/gnunet-service-dht_routing.c:417
 msgid "# DHT requests combined"
 msgstr ""
 
@@ -2327,7 +2360,7 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
 #: src/fs/gnunet-publish.c:585 src/fs/gnunet-publish.c:592
-#: src/transport/gnunet-transport.c:623
+#: src/transport/gnunet-transport.c:774 src/transport/gnunet-transport.c:804
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -2622,95 +2655,95 @@ msgstr ""
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:385 src/fs/gnunet-service-fs_pr.c:639
+#: src/fs/gnunet-service-fs_pr.c:385 src/fs/gnunet-service-fs_pr.c:643
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:802
+#: src/fs/gnunet-service-fs_pr.c:806
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:835
+#: src/fs/gnunet-service-fs_pr.c:839
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:850
+#: src/fs/gnunet-service-fs_pr.c:854
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:863
+#: src/fs/gnunet-service-fs_pr.c:867
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:984
+#: src/fs/gnunet-service-fs_pr.c:988
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1011
+#: src/fs/gnunet-service-fs_pr.c:1015
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1046
+#: src/fs/gnunet-service-fs_pr.c:1050
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1137
+#: src/fs/gnunet-service-fs_pr.c:1145
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1157
+#: src/fs/gnunet-service-fs_pr.c:1165
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1204
+#: src/fs/gnunet-service-fs_pr.c:1212
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1219
+#: src/fs/gnunet-service-fs_pr.c:1227
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1228
+#: src/fs/gnunet-service-fs_pr.c:1236
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1243
+#: src/fs/gnunet-service-fs_pr.c:1251
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1257
+#: src/fs/gnunet-service-fs_pr.c:1265
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1270
+#: src/fs/gnunet-service-fs_pr.c:1278
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1275
+#: src/fs/gnunet-service-fs_pr.c:1283
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1302 src/fs/gnunet-service-fs_pr.c:1342
-#: src/fs/gnunet-service-fs_pr.c:1482
+#: src/fs/gnunet-service-fs_pr.c:1310 src/fs/gnunet-service-fs_pr.c:1350
+#: src/fs/gnunet-service-fs_pr.c:1490
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1360
+#: src/fs/gnunet-service-fs_pr.c:1368
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1371
+#: src/fs/gnunet-service-fs_pr.c:1379
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1458
+#: src/fs/gnunet-service-fs_pr.c:1466
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1543
+#: src/fs/gnunet-service-fs_pr.c:1551
 msgid "# GAP PUT messages received"
 msgstr ""
 
@@ -3248,146 +3281,172 @@ msgstr ""
 msgid "help text"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1087
-#: src/testbed/gnunet-testbed-profiler.c:323
+#: src/mesh/gnunet-daemon-regexprofiler.c:209
+#: src/mesh/gnunet-daemon-regexprofiler.c:222
+#: src/mesh/gnunet-daemon-regexprofiler.c:235
+#: src/mesh/gnunet-service-mesh.c:8376 src/mesh/gnunet-service-mesh.c:8388
+#: src/mesh/gnunet-service-mesh.c:8400 src/mesh/gnunet-service-mesh.c:8414
+#: src/mesh/gnunet-service-mesh.c:8426 src/mesh/gnunet-service-mesh.c:8438
+#: src/mesh/gnunet-service-mesh.c:8450 src/mesh/gnunet-service-mesh-new.c:8292
+#: src/mesh/gnunet-service-mesh-new.c:8304
+#: src/mesh/gnunet-service-mesh-new.c:8316
+#: src/mesh/gnunet-service-mesh-new.c:8329
+#: src/mesh/gnunet-service-mesh-new.c:8344
+#: src/mesh/gnunet-service-mesh-new.c:8356
+#: src/mesh/gnunet-service-mesh-new.c:8368
+#, fuzzy, c-format
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+msgstr "立即保存配置？"
+
+#: src/mesh/gnunet-daemon-regexprofiler.c:298
+msgid "Daemon to announce regular expressions for the peer using mesh."
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1146
+#: src/testbed/gnunet-testbed-profiler.c:320
 msgid "An operation has failed while starting peers\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1141
-#: src/testbed/gnunet-testbed-profiler.c:390
+#: src/mesh/gnunet-regex-profiler.c:1192
+#: src/testbed/gnunet-testbed-profiler.c:389
 #, fuzzy, c-format
 msgid "Creating a peer failed. Error: %s\n"
 msgstr "“%s”以错误码 %d 失败：%s\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1268
-#: src/testbed/gnunet-testbed-profiler.c:495
+#: src/mesh/gnunet-regex-profiler.c:1319
+#: src/testbed/gnunet-testbed-profiler.c:494
 msgid "An operation has failed while starting slaves\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1290
+#: src/mesh/gnunet-regex-profiler.c:1341
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1345
+#: src/mesh/gnunet-regex-profiler.c:1396
 msgid "An operation has failed while linking\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1456
-#: src/testbed/gnunet-testbed-profiler.c:597
+#: src/mesh/gnunet-regex-profiler.c:1507
+#: src/testbed/gnunet-testbed-profiler.c:598
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1536
-#: src/testbed/gnunet-testbed-profiler.c:676
+#: src/mesh/gnunet-regex-profiler.c:1587
+#: src/testbed/gnunet-testbed-profiler.c:677
 msgid "Unable to connect to master controller -- Check config\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1635
+#: src/mesh/gnunet-regex-profiler.c:1686
 #, c-format
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1640
+#: src/mesh/gnunet-regex-profiler.c:1691
 #: src/regex/gnunet-regex-simulation-profiler.c:498
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1646
+#: src/mesh/gnunet-regex-profiler.c:1697
+#: src/testbed/gnunet-testbed-profiler.c:717
 #, c-format
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1653
-#: src/testbed/gnunet-testbed-profiler.c:723
+#: src/mesh/gnunet-regex-profiler.c:1704
+#: src/testbed/gnunet-testbed-profiler.c:724
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1660
-#: src/testbed/gnunet-testbed-profiler.c:730
+#: src/mesh/gnunet-regex-profiler.c:1711
+#: src/testbed/gnunet-testbed-profiler.c:731
 #, fuzzy, c-format
 msgid "Exiting\n"
 msgstr "退出"
 
-#: src/mesh/gnunet-regex-profiler.c:1666
+#: src/mesh/gnunet-regex-profiler.c:1717
 #, c-format
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1683
+#: src/mesh/gnunet-regex-profiler.c:1726
+#, fuzzy, c-format
+msgid "Configuration option (regex_prefix) missing. Exiting\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1744
 #: src/regex/gnunet-regex-simulation-profiler.c:504
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1690
+#: src/mesh/gnunet-regex-profiler.c:1751
 #, c-format
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1698
+#: src/mesh/gnunet-regex-profiler.c:1759
 #, c-format
 msgid ""
 "Error loading search strings. Given file does not contain enough strings. "
 "Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1704
+#: src/mesh/gnunet-regex-profiler.c:1765
 #, fuzzy, c-format
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/mesh/gnunet-regex-profiler.c:1738
+#: src/mesh/gnunet-regex-profiler.c:1799
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1741
+#: src/mesh/gnunet-regex-profiler.c:1802
 msgid "create COUNT number of random links between peers"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1744
+#: src/mesh/gnunet-regex-profiler.c:1805
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1747
+#: src/mesh/gnunet-regex-profiler.c:1808
 msgid "wait DELAY before starting string search"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1750
+#: src/mesh/gnunet-regex-profiler.c:1811
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1753
+#: src/mesh/gnunet-regex-profiler.c:1814
 #: src/regex/gnunet-regex-simulation-profiler.c:555
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1765
+#: src/mesh/gnunet-regex-profiler.c:1817
+msgid ""
+"if this option is set, only one peer is responsible for searching all strings"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1829
 msgid "Profiler for regex/mesh"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8038
+#: src/mesh/gnunet-service-mesh.c:8082 src/mesh/gnunet-service-mesh-new.c:7998
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8243
+#: src/mesh/gnunet-service-mesh.c:8287 src/mesh/gnunet-service-mesh-new.c:8203
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344
-#: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369
-#: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396
-#: src/mesh/gnunet-service-mesh.c:8408
-#, fuzzy, c-format
-msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
-msgstr "立即保存配置？"
-
-#: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431
+#: src/mesh/gnunet-service-mesh.c:8462 src/mesh/gnunet-service-mesh.c:8473
+#: src/mesh/gnunet-service-mesh-new.c:8380
+#: src/mesh/gnunet-service-mesh-new.c:8391
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -4084,46 +4143,41 @@ msgstr ""
 msgid "Could not save some persistent statistics\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/statistics_api.c:1053
+#: src/statistics/statistics_api.c:1056
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:705
+#: src/testbed/gnunet-testbed-profiler.c:706
 #, c-format
 msgid "No hosts-file specified on command line\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:716
-#, c-format
-msgid "No hosts loaded. Need atleast one host\n"
-msgstr ""
-
-#: src/testbed/gnunet-testbed-profiler.c:779
+#: src/testbed/gnunet-testbed-profiler.c:780
 msgid "Only `CLIQUE' and `RANDOM' are permitted.\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:794
+#: src/testbed/gnunet-testbed-profiler.c:795
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:797
+#: src/testbed/gnunet-testbed-profiler.c:798
 msgid "create COUNT number of random links"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:800
+#: src/testbed/gnunet-testbed-profiler.c:801
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:803
+#: src/testbed/gnunet-testbed-profiler.c:804
 msgid ""
 "Try to acheive TOPOLOGY. This options takes either CLIQUE or RANDOM. For "
 "CLIQUE the parameter -n is ignored. The default is to acheive a random graph "
 "topology."
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:818
+#: src/testbed/gnunet-testbed-profiler.c:819
 msgid "Profiler for testbed"
 msgstr ""
 
@@ -4406,25 +4460,25 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:353
+#: src/transport/gnunet-service-transport_clients.c:388
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:358
+#: src/transport/gnunet-service-transport_clients.c:393
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:510
+#: src/transport/gnunet-service-transport_clients.c:545
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:651
+#: src/transport/gnunet-service-transport_clients.c:686
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:702
+#: src/transport/gnunet-service-transport_clients.c:737
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
@@ -4432,101 +4486,101 @@ msgstr ""
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1040
+#: src/transport/gnunet-service-transport_neighbours.c:1042
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1170
-#: src/transport/gnunet-service-transport_neighbours.c:1507
+#: src/transport/gnunet-service-transport_neighbours.c:1172
+#: src/transport/gnunet-service-transport_neighbours.c:1509
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1175
+#: src/transport/gnunet-service-transport_neighbours.c:1177
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1180
+#: src/transport/gnunet-service-transport_neighbours.c:1182
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1237
+#: src/transport/gnunet-service-transport_neighbours.c:1239
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1279
+#: src/transport/gnunet-service-transport_neighbours.c:1281
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1303
+#: src/transport/gnunet-service-transport_neighbours.c:1305
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
+#: src/transport/gnunet-service-transport_neighbours.c:1313
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1348
+#: src/transport/gnunet-service-transport_neighbours.c:1350
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1357
+#: src/transport/gnunet-service-transport_neighbours.c:1359
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1413
+#: src/transport/gnunet-service-transport_neighbours.c:1415
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1447
+#: src/transport/gnunet-service-transport_neighbours.c:1449
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1463
+#: src/transport/gnunet-service-transport_neighbours.c:1465
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2611
+#: src/transport/gnunet-service-transport_neighbours.c:2613
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2626
-#: src/transport/gnunet-service-transport_neighbours.c:2660
+#: src/transport/gnunet-service-transport_neighbours.c:2628
+#: src/transport/gnunet-service-transport_neighbours.c:2662
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2673
+#: src/transport/gnunet-service-transport_neighbours.c:2675
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2706
+#: src/transport/gnunet-service-transport_neighbours.c:2708
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2890
+#: src/transport/gnunet-service-transport_neighbours.c:2892
 msgid "# unexpected SESSION ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2945
+#: src/transport/gnunet-service-transport_neighbours.c:2947
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2959
+#: src/transport/gnunet-service-transport_neighbours.c:2961
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2990
+#: src/transport/gnunet-service-transport_neighbours.c:2992
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3001
+#: src/transport/gnunet-service-transport_neighbours.c:3003
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3032
+#: src/transport/gnunet-service-transport_neighbours.c:3034
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3127
+#: src/transport/gnunet-service-transport_neighbours.c:3129
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -4583,93 +4637,142 @@ msgstr ""
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:265
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:278
+#: src/transport/gnunet-transport.c:262
 #, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
+msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:328
+#: src/transport/gnunet-transport.c:269
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:336
+#: src/transport/gnunet-transport.c:285
+#, fuzzy, c-format
+msgid "Failed to connect to `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:388
+msgid "No transport plugins configured, peer will never communicate\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:401
 #, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
+msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:375
+#: src/transport/gnunet-transport.c:465
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:395
+#: src/transport/gnunet-transport.c:490
 #, fuzzy, c-format
-msgid "Connected to %s\n"
+msgid "Successfully connected to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:427
+#: src/transport/gnunet-transport.c:512
+#, c-format
+msgid ""
+"Successfully connected to `%s', starting to send benchmark data in %u Kb "
+"blocks\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:547
 #, fuzzy, c-format
-msgid "Disconnected from %s\n"
+msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:505
+#: src/transport/gnunet-transport.c:623
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:649
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:535
+#: src/transport/gnunet-transport.c:658
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:563
+#: src/transport/gnunet-transport.c:694
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/gnunet-transport.c:632
-#, fuzzy, c-format
-msgid "Failed to parse peer identity `%s'\n"
-msgstr "���析配置���件“%s”失败\n"
+#: src/transport/gnunet-transport.c:724
+#, fuzzy
+msgid "Failed to send connect request to transport service\n"
+msgstr "初�����“%s”服������败。\n"
 
-#: src/transport/gnunet-transport.c:715
-msgid "measure how fast we are receiving data (until CTRL-C)"
+#: src/transport/gnunet-transport.c:759
+#, c-format
+msgid ""
+"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
+"%s, %s\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:765
+#, c-format
+msgid ""
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:718
+#: src/transport/gnunet-transport.c:785 src/transport/gnunet-transport.c:815
+#: src/transport/gnunet-transport.c:837 src/transport/gnunet-transport.c:874
 #, fuzzy
-msgid "try to connect to the given peer"
+msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:721
+#: src/transport/gnunet-transport.c:792 src/transport/gnunet-transport.c:822
+#, fuzzy
+msgid "Failed to send request to transport service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:842
+msgid "Starting to receive benchmark data\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:924
+msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:927
+#, fuzzy
+msgid "connect to a peer"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:930
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:727
+#: src/transport/gnunet-transport.c:936
+msgid ""
+"provide information about all connects and disconnect events (continuously)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:939
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:731
+#: src/transport/gnunet-transport.c:942
+msgid "peer identity"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:946
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:734
+#: src/transport/gnunet-transport.c:949
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:745
+#: src/transport/gnunet-transport.c:960
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
@@ -4893,8 +4996,8 @@ msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
-#: src/transport/plugin_transport_tcp.c:1816
-#: src/transport/plugin_transport_tcp.c:2435
+#: src/transport/plugin_transport_tcp.c:1817
+#: src/transport/plugin_transport_tcp.c:2436
 msgid "# TCP sessions active"
 msgstr ""
 
@@ -4910,48 +5013,48 @@ msgstr ""
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1341
+#: src/transport/plugin_transport_tcp.c:1342
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1456
+#: src/transport/plugin_transport_tcp.c:1457
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1857
+#: src/transport/plugin_transport_tcp.c:1858
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2031
+#: src/transport/plugin_transport_tcp.c:2032
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2101
+#: src/transport/plugin_transport_tcp.c:2102
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2325 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2326 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2339
+#: src/transport/plugin_transport_tcp.c:2340
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2423
+#: src/transport/plugin_transport_tcp.c:2424
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2427
+#: src/transport/plugin_transport_tcp.c:2428
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2431
+#: src/transport/plugin_transport_tcp.c:2432
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5069,7 +5172,7 @@ msgstr ""
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:598
+#: src/transport/transport_api.c:654
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
@@ -5333,17 +5436,17 @@ msgstr ""
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/disk.c:1136
+#: src/util/disk.c:1171
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
-#: src/util/disk.c:1490 src/util/service.c:1667
+#: src/util/disk.c:1525 src/util/service.c:1667
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/util/disk.c:1862
+#: src/util/disk.c:1897
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -5582,14 +5685,14 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:416
+#: src/util/os_installation.c:417
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:646
+#: src/util/os_installation.c:653
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
@@ -6072,8 +6175,8 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
-#~ msgid "list information for the given peer"
-#~ msgstr "无法获取有关用户“%s”的������：%s\n"
+#~ msgid "Connected to %s\n"
+#~ msgstr "“%s”已������到“%s”。\n"
 
 #, fuzzy
 #~ msgid "list information for all peers"
@@ -6196,10 +6299,6 @@ msgstr ""
 #~ msgstr "运行 %s失败：%s %d\n"
 
 #, fuzzy
-#~ msgid "Configuration option `%s' in section `%s' missing.\n"
-#~ msgstr "配置文件“%s”已写入。\n"
-
-#, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "配置文件“%s”已写入。\n"