adding nat clique test

[oweals/gnunet.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7831467ae6d88f54a420a26748065d25a7a96eb9..dd312b989bf93f61282de40eedbb8d3be808de3c 100644 (file)
--- 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: 2011-09-19 13:28+0200\n"
+"POT-Creation-Date: 2011-11-30 16:20+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -16,2325 +16,2384 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fragmentation/defragmentation.c:270
-msgid "# acknowledgements sent for fragment"
-msgstr ""
+#: src/datastore/plugin_datastore_sqlite.c:61
+#: 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/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:90 src/datacache/plugin_datacache_sqlite.c:71
+#: src/datacache/plugin_datacache_sqlite.c:74
+#: 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/include/gnunet_common.h:394
+#: src/include/gnunet_common.h:401
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/fragmentation/defragmentation.c:454
-msgid "# fragments received"
-msgstr ""
+#: src/datastore/plugin_datastore_sqlite.c:61
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%u with error: %s"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/fragmentation/defragmentation.c:513
-msgid "# duplicate fragments received"
+#: src/datastore/plugin_datastore_sqlite.c:239
+#, c-format
+msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:532
-msgid "# messages defragmented"
-msgstr ""
+#: src/datastore/plugin_datastore_sqlite.c:266
+#, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/fragmentation/fragmentation.c:183
-msgid "# fragments transmitted"
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/datacache/plugin_datacache_sqlite.c:457
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:186
-msgid "# fragments retransmitted"
-msgstr ""
+#: src/datastore/plugin_datastore_sqlite.c:671
+#, fuzzy
+msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/fragmentation/fragmentation.c:248
-msgid "# messages fragmented"
+#: src/datastore/plugin_datastore_sqlite.c:1124
+msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:251
-msgid "# total size of fragmented messages"
+#: src/datastore/plugin_datastore_sqlite.c:1143
+#, c-format
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:335
-msgid "# fragment acknowledgements received"
-msgstr ""
+#: src/datastore/plugin_datastore_sqlite.c:1182
+#, fuzzy
+msgid "Sqlite database running\n"
+msgstr "sqlite 数据仓库"
 
-#: src/fragmentation/fragmentation.c:341
-msgid "# bits removed from fragmentation ACKs"
+#: src/datastore/plugin_datastore_mysql.c:316
+#: src/datacache/plugin_datacache_mysql.c:224
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:365
-msgid "# fragmentation transmissions completed"
-msgstr ""
+#: src/datastore/plugin_datastore_mysql.c:322
+#: src/datacache/plugin_datacache_mysql.c:230
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/nat/nat.c:778
-#, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+#: src/datastore/plugin_datastore_mysql.c:529
+#, fuzzy, c-format
+msgid "Failed to prepare statement `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/datastore/plugin_datastore_mysql.c:622
+#, 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:1500
+msgid "Mysql database running\n"
 msgstr ""
 
-#: src/nat/nat.c:828
+#: src/datastore/plugin_datastore_postgres.c:93
+#: src/datacache/plugin_datacache_postgres.c:79
 #, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "运行 %s失败：%s %d\n"
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/nat/nat.c:1096
+#: src/datastore/plugin_datastore_postgres.c:173
 #, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "保存配置失败。"
+msgid "Unable to initialize Postgres with configuration `%s': %s"
+msgstr "无法保存配置文件“%s”："
 
-#: src/nat/nat.c:1158 src/nat/nat.c:1168
-#, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
+#: src/datastore/plugin_datastore_postgres.c:979
+msgid "Postgres database running\n"
 msgstr ""
 
-#: src/nat/nat.c:1300
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/datastore/datastore_api.c:289
+msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/nat/nat.c:1312
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+#: src/datastore/datastore_api.c:372
+msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
+#: src/datastore/datastore_api.c:418
+msgid "# queue overflows"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/datastore/datastore_api.c:445
+msgid "# queue entries created"
 msgstr ""
 
-#: src/nat/nat_test.c:349
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/datastore/datastore_api.c:465
+msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/nat/nat_test.c:419
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+#: src/datastore/datastore_api.c:513
+msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1279 src/template/gnunet-template.c:68
-#: src/core/test_core_api_send_to_self.c:217
-msgid "help text"
+#: src/datastore/datastore_api.c:540
+msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-exit.c:1493
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/datastore/datastore_api.c:608
+msgid "# transmission request failures"
 msgstr ""
 
-#: src/datacache/datacache.c:108 src/datacache/datacache.c:236
-#: src/datastore/gnunet-service-datastore.c:824
-msgid "# bytes stored"
+#: src/datastore/datastore_api.c:631
+msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/datacache/datacache.c:134 src/datacache/datacache.c:142
-#: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486
-#: src/datastore/test_plugin_datastore.c:192
-#: src/datastore/test_plugin_datastore.c:315
-#: src/datastore/perf_plugin_datastore.c:309
-#: src/datastore/perf_plugin_datastore.c:413
-#, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
+#: src/datastore/datastore_api.c:768
+msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/datacache/datacache.c:167
-#, c-format
-msgid "Loading `%s' datacache plugin\n"
+#: src/datastore/datastore_api.c:781
+msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datacache/datacache.c:176
-#, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
+#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
+msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/datacache/datacache.c:262
-msgid "# requests received"
+#: src/datastore/datastore_api.c:805
+msgid "# status messages received"
 msgstr ""
 
-#: src/datacache/datacache.c:268
-msgid "# requests filtered by bloom filter"
+#: src/datastore/datastore_api.c:876
+msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:121
-msgid "Template datacache running\n"
+#: src/datastore/datastore_api.c:947
+msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:66
-#: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:122
-#: src/datacache/plugin_datacache_sqlite.c:191
-#: src/datacache/plugin_datacache_sqlite.c:232
-#: src/datacache/plugin_datacache_sqlite.c:295
-#: src/datacache/plugin_datacache_sqlite.c:304
-#: src/datacache/plugin_datacache_sqlite.c:315
-#: src/datacache/plugin_datacache_sqlite.c:322
-#: src/datacache/plugin_datacache_sqlite.c:332
-#: src/datacache/plugin_datacache_sqlite.c:340
-#: src/datacache/plugin_datacache_sqlite.c:348
-#: 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/util/crypto_rsa.c:84
-#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:581
-#: src/dht/plugin_dhtlog_mysql.c:590 src/dht/plugin_dhtlog_mysql.c:648
-#: src/dht/plugin_dhtlog_mysql.c:663
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: 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/include/gnunet_common.h:324
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
-
-#: src/datacache/plugin_datacache_sqlite.c:413
-msgid "Sqlite datacache running\n"
+#: src/datastore/datastore_api.c:1012
+msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:446
-#: src/datastore/plugin_datastore_sqlite.c:420
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/datastore/datastore_api.c:1073
+msgid "# UPDATE requests executed"
 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:500
-msgid "Postgres datacache running\n"
+#: src/datastore/datastore_api.c:1141
+msgid "# REMOVE requests executed"
 msgstr ""
 
-#: 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"
+#: src/datastore/datastore_api.c:1186
+msgid "Failed to receive response from database.\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/datastore/datastore_api.c:1246
+msgid "# Results received"
+msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:979
-msgid "MySQL datacache running\n"
+#: src/datastore/datastore_api.c:1317
+msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:1903 src/testing/testing_group.c:1915
-#: src/testing/testing_group.c:2016 src/testing/testing_group.c:2075
-#: src/testing/testing_group.c:2164 src/testing/testing_group.c:2184
-#: src/testing/testing_group.c:2321 src/testing/test_testing_topology.c:1078
-#: src/testing/test_testing_topology_blacklist.c:448
-#: src/testing/testing_peergroup.c:876
-#: src/testing/test_testing_large_topology.c:1022
-#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3897
-#: src/dv/test_transport_api_dv.c:1132
-#, c-format
-msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+#: src/datastore/datastore_api.c:1384
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:1925
-#, c-format
-msgid "Target is %d connections per peer."
+#: src/datastore/datastore_api.c:1448
+msgid "# GET requests executed"
 msgstr ""
 
-#: src/testing/testing_group.c:2172
-#, c-format
-msgid ""
-"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
-"greater than 0\n"
+#: src/datastore/plugin_datastore_template.c:241
+msgid "Template database running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2202 src/testing/testing_group.c:2395
-#, c-format
-msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
+#: src/datastore/gnunet-service-datastore.c:52
+msgid "# bytes used in file-sharing datastore"
 msgstr ""
 
-#: src/testing/testing_group.c:2239
-#, c-format
-msgid "natural log of %d is %d, will run %d iterations\n"
+#: src/datastore/gnunet-service-datastore.c:331
+msgid "# bytes expired"
 msgstr ""
 
-#: src/testing/testing_group.c:2242
-#, c-format
-msgid "Total connections added thus far: %u!\n"
+#: src/datastore/gnunet-service-datastore.c:397
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/testing/testing_group.c:2283
-#, c-format
-msgid "Total connections added for small world: %d!\n"
+#: src/datastore/gnunet-service-datastore.c:457
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2335
-#, c-format
-msgid "rand is %f probability is %f\n"
+#: src/datastore/gnunet-service-datastore.c:610
+msgid "# results found"
 msgstr ""
 
-#: src/testing/testing_group.c:2910 src/testing/testing_group.c:3109
+#: src/datastore/gnunet-service-datastore.c:655
 #, c-format
 msgid ""
-"No `%s' specified in peer configuration in section `%s', cannot copy friends "
-"file!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3011
-msgid "Finished copying all friend files!\n"
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3124
-#, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
-msgstr "“%s”以错误码 %s 失败：%s\n"
-
-#: src/testing/testing_group.c:3147
+#: src/datastore/gnunet-service-datastore.c:666
 #, c-format
-msgid "Copying file with command scp %s %s\n"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3164
-#, c-format
-msgid "Checking copy status of file %d\n"
+#: src/datastore/gnunet-service-datastore.c:670
+msgid ""
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/testing/testing_group.c:3182
-#, c-format
-msgid "File %d copied\n"
+#: src/datastore/gnunet-service-datastore.c:676
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/testing/testing_group.c:3197
-msgid "Finished copying all blacklist files!\n"
+#: src/datastore/gnunet-service-datastore.c:681
+#: src/datastore/gnunet-service-datastore.c:735
+#: src/datastore/gnunet-service-datastore.c:956
+#: src/datastore/gnunet-service-datastore.c:1441
+msgid "# reserved"
 msgstr ""
 
-#: src/testing/testing_group.c:3580 src/testing/testing_group.c:3717
-#: src/testing/testing_group.c:4925 src/testing/testing_group.c:5066
-msgid "Delaying connect, we have too many outstanding connections!\n"
+#: src/datastore/gnunet-service-datastore.c:750
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/testing/testing_group.c:3590 src/testing/testing_group.c:4935
-#: src/testing/testing_group.c:5076
-#, c-format
-msgid "Creating connection, outstanding_connections is %d\n"
+#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
+#: src/datacache/datacache.c:248
+msgid "# bytes stored"
 msgstr ""
 
-#: src/testing/testing_group.c:3602
+#: src/datastore/gnunet-service-datastore.c:838
 #, c-format
-msgid "Offering Hello of peer %s to peer %s\n"
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3728
-#, c-format
-msgid "Creating connection, outstanding_connections is %d (max %d)\n"
+#: src/datastore/gnunet-service-datastore.c:1004
+msgid "# GET requests received"
 msgstr ""
 
-#: src/testing/testing_group.c:3983
-msgid "Creating clique topology\n"
+#: src/datastore/gnunet-service-datastore.c:1018
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/testing/testing_group.c:3990
-msgid "Creating small world (ring) topology\n"
+#: src/datastore/gnunet-service-datastore.c:1046
+msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/testing/testing_group.c:3997
-msgid "Creating small world (2d-torus) topology\n"
+#: src/datastore/gnunet-service-datastore.c:1080
+msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/testing/testing_group.c:4003
-msgid "Creating ring topology\n"
+#: src/datastore/gnunet-service-datastore.c:1115
+msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/testing/testing_group.c:4009
-msgid "Creating 2d torus topology\n"
+#: src/datastore/gnunet-service-datastore.c:1142
+msgid "Content not found"
 msgstr ""
 
-#: src/testing/testing_group.c:4015
-msgid "Creating Erdos-Renyi topology\n"
+#: src/datastore/gnunet-service-datastore.c:1152
+msgid "# bytes removed (explicit request)"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1186
+msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/testing/testing_group.c:4021
-msgid "Creating InterNAT topology\n"
+#: src/datastore/gnunet-service-datastore.c:1230
+#, c-format
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4027
-msgid "Creating Scale Free topology\n"
+#: src/datastore/gnunet-service-datastore.c:1295
+#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
+#: src/datacache/datacache.c:151
+#, c-format
+msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4034
-msgid "Creating straight line topology\n"
+#: src/datastore/gnunet-service-datastore.c:1303
+#, c-format
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4040
-msgid "Creating topology from file!\n"
+#: src/datastore/gnunet-service-datastore.c:1312
+#, fuzzy, c-format
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/datastore/gnunet-service-datastore.c:1491
+msgid "# quota"
 msgstr ""
 
-#: src/testing/testing_group.c:4058
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
+#: src/datastore/gnunet-service-datastore.c:1493
+msgid "# cache size"
 msgstr ""
 
-#: src/testing/testing_group.c:4075
-msgid "Failed during friend file copying!\n"
+#: src/datastore/gnunet-service-datastore.c:1503
+#, c-format
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4083
-msgid "Friend files created/copied successfully!\n"
+#: src/datastore/gnunet-service-datastore.c:1516
+#, fuzzy
+msgid "Failed to initialize bloomfilter.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/core/gnunet-service-core_sessions.c:208
+#: src/core/gnunet-service-core_sessions.c:273
+msgid "# entries in session map"
 msgstr ""
 
-#: src/testing/testing_group.c:4102
-msgid "Blacklisting all but clique topology\n"
+#: src/core/gnunet-service-core_sessions.c:238
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/testing/testing_group.c:4110
-msgid "Blacklisting all but small world (ring) topology\n"
+#: src/core/gnunet-service-core_sessions.c:414
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/testing/testing_group.c:4118
-msgid "Blacklisting all but small world (2d-torus) topology\n"
+#: src/core/gnunet-core-list-connections.c:77
+#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#, c-format
+msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4126
-msgid "Blacklisting all but ring topology\n"
+#: src/core/gnunet-core-list-connections.c:175
+#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#, fuzzy, c-format
+msgid "Invalid command line argument `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/core/gnunet-core-list-connections.c:196
+#: src/peerinfo-tool/gnunet-peerinfo.c:252
+msgid "don't resolve host names"
 msgstr ""
 
-#: src/testing/testing_group.c:4134
-msgid "Blacklisting all but 2d torus topology\n"
+#: src/core/gnunet-core-list-connections.c:203
+msgid "Print information about connected peers."
 msgstr ""
 
-#: src/testing/testing_group.c:4142
-msgid "Blacklisting all but Erdos-Renyi topology\n"
+#: src/core/gnunet-service-core_clients.c:360
+msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/testing/testing_group.c:4150
-msgid "Blacklisting all but InterNAT topology\n"
+#: src/core/gnunet-service-core_clients.c:465
+msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/testing/testing_group.c:4187
-msgid "Blacklisting all but Scale Free topology\n"
+#: src/core/gnunet-service-core_clients.c:801
+#, c-format
+msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/testing/testing_group.c:4195
-msgid "Blacklisting all but straight line topology\n"
+#: src/core/gnunet-service-core.c:99
+#, c-format
+msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4212
-msgid "Failed during blacklist file copying!\n"
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
+msgid "# type maps received"
 msgstr ""
 
-#: src/testing/testing_group.c:4220
-msgid "Blacklist files created/copied successfully!\n"
+#: src/core/gnunet-service-core_typemap.c:151
+msgid "# updates to my type map"
 msgstr ""
 
-#: src/testing/testing_group.c:5301
-msgid "Creating clique CONNECT topology\n"
+#: src/core/gnunet-service-core_neighbours.c:163
+msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/testing/testing_group.c:5308
-msgid "Creating small world (ring) CONNECT topology\n"
+#: src/core/gnunet-service-core_neighbours.c:180
+#: src/core/gnunet-service-core_neighbours.c:343
+msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/testing/testing_group.c:5315
-msgid "Creating small world (2d-torus) CONNECT topology\n"
+#: src/core/gnunet-service-core_neighbours.c:252
+msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/testing/testing_group.c:5321
-msgid "Creating ring CONNECT topology\n"
+#: src/core/gnunet-service-core_neighbours.c:431
+#, c-format
+msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5328
-msgid "Creating 2d torus CONNECT topology\n"
+#: src/core/gnunet-service-core_kx.c:491
+msgid "# bytes encrypted"
 msgstr ""
 
-#: src/testing/testing_group.c:5335
-msgid "Creating Erdos-Renyi CONNECT topology\n"
+#: src/core/gnunet-service-core_kx.c:541
+msgid "# bytes decrypted"
 msgstr ""
 
-#: src/testing/testing_group.c:5342
-msgid "Creating InterNAT CONNECT topology\n"
+#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
+#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#, c-format
+msgid "Error in communication with PEERINFO service\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5349
-msgid "Creating Scale Free CONNECT topology\n"
+#: src/core/gnunet-service-core_kx.c:618
+msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/testing/testing_group.c:5356
-msgid "Creating straight line CONNECT topology\n"
+#: src/core/gnunet-service-core_kx.c:668
+msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/testing/testing_group.c:5362
-msgid "Creating no CONNECT topology\n"
+#: src/core/gnunet-service-core_kx.c:689
+msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/testing/testing_group.c:5368
-msgid "Unknown topology specification, can't connect peers!\n"
+#: src/core/gnunet-service-core_kx.c:741
+msgid "# session keys received"
 msgstr ""
 
-#: src/testing/testing_group.c:5378
+#: src/core/gnunet-service-core_kx.c:760
 #, c-format
-msgid "Connecting random subset (%'.2f percent) of possible peers\n"
+msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5386
-#, c-format
-msgid "Connecting a minimum of %u peers each (if possible)\n"
+#: src/core/gnunet-service-core_kx.c:798
+msgid "# SET_KEY messages decrypted"
 msgstr ""
 
-#: src/testing/testing_group.c:5395
-#, c-format
-msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
+#: src/core/gnunet-service-core_kx.c:878
+#: src/transport/gnunet-service-transport_validation.c:778
+msgid "# PING messages received"
 msgstr ""
 
-#: src/testing/testing_group.c:5405
+#: src/core/gnunet-service-core_kx.c:912
 #, c-format
-msgid "Finding additional %u closest peers each (if possible)\n"
+msgid ""
+"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
+"%s'\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6084
-msgid "Could not read hostkeys file!\n"
+#: src/core/gnunet-service-core_kx.c:933
+msgid "# PONG messages created"
 msgstr ""
 
-#: src/testing/testing_group.c:6154
-#, fuzzy, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/core/gnunet-service-core_kx.c:1021
+msgid "# sessions terminated by timeout"
+msgstr ""
 
-#: src/testing/testing_group.c:6298 src/testing/testing.c:1273
-#, c-format
-msgid "Could not start `%s' process to copy configuration directory.\n"
+#: src/core/gnunet-service-core_kx.c:1032
+msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/testing/testing.c:209
-msgid "`scp' does not seem to terminate (timeout copying config).\n"
+#: src/core/gnunet-service-core_kx.c:1090
+#: src/transport/gnunet-service-transport_validation.c:983
+msgid "# PONG messages received"
 msgstr ""
 
-#: src/testing/testing.c:223 src/testing/testing.c:823
-msgid "`scp' did not complete cleanly.\n"
+#: src/core/gnunet-service-core_kx.c:1120
+msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/testing/testing.c:246
-msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+#: src/core/gnunet-service-core_kx.c:1152
+msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/testing/testing.c:247
-#, fuzzy
-msgid "Failed to create pipe for `ssh' process.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/core/gnunet-service-core_kx.c:1216
+msgid "# SET_KEY and PING messages created"
+msgstr ""
 
-#: src/testing/testing.c:303
-#, c-format
-msgid "Could not start `%s' process to create hostkey.\n"
+#: src/core/gnunet-service-core_kx.c:1357
+msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/testing/testing.c:310
-msgid "Failed to start `gnunet-peerinfo' process.\n"
+#: src/core/gnunet-service-core_kx.c:1399
+#: src/core/gnunet-service-core_kx.c:1424
+msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/testing/testing.c:311 src/testing/testing.c:509
-#, fuzzy
-msgid "Failed to start `ssh' process.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/core/gnunet-service-core_kx.c:1411
+msgid "# bytes dropped (out of sequence)"
+msgstr ""
 
-#: src/testing/testing.c:373
+#: src/core/gnunet-service-core_kx.c:1448
 #, c-format
-msgid "Error reading from gnunet-peerinfo: %s\n"
+msgid "Message received far too old (%llu ms). Content ignored.\n"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1452
+msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/testing/testing.c:377
-msgid "Malformed output from gnunet-peerinfo!\n"
+#: src/core/gnunet-service-core_kx.c:1460
+msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/testing/testing.c:387
+#: src/core/gnunet-service-core_kx.c:1521
 #, fuzzy
-msgid "`Failed to get hostkey!\n"
-msgstr "发送消息失败。\n"
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "立即保存配置？"
 
-#: src/testing/testing.c:421
-msgid "`Failed while waiting for topology setup!\n"
+#: src/core/gnunet-service-core_kx.c:1529
+msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/testing/testing.c:501
+#: src/core/gnunet-service-core_kx.c:1539
+#: src/transport/gnunet-service-transport.c:542
+#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
 #, c-format
-msgid "Could not start `%s' process to start GNUnet.\n"
+msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/testing/testing.c:508
-msgid "Failed to start `gnunet-arm' process.\n"
+#: src/core/core_api.c:798
+msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/testing/testing.c:532 src/testing/testing.c:631
-msgid "`gnunet-arm' does not seem to terminate.\n"
+#: src/vpn/gnunet-daemon-exit.c:1494
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/testing/testing.c:533 src/testing/testing.c:632
-#: src/testing/testing.c:652
-msgid "`ssh' does not seem to terminate.\n"
+#: src/vpn/gnunet-daemon-vpn.c:1288
+msgid "help text"
 msgstr ""
 
-#: src/testing/testing.c:572 src/testing/testing.c:2074
-#: src/testing/testing.c:2093
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/util/getopt_helpers.c:84
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr "长选项的必选参数对短选项也是必选的。\n"
 
-#: src/testing/testing.c:601
-msgid "Unable to get HELLO for peer!\n"
-msgstr ""
+#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/testing/testing.c:651
-msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
-msgstr ""
+#: src/util/common_logging.c:239 src/util/common_logging.c:860
+msgid "DEBUG"
+msgstr "调试"
+
+#: src/util/common_logging.c:241 src/util/common_logging.c:858
+msgid "INFO"
+msgstr "信息"
+
+#: src/util/common_logging.c:243 src/util/common_logging.c:856
+msgid "WARNING"
+msgstr "警告"
+
+#: src/util/common_logging.c:245 src/util/common_logging.c:854
+msgid "ERROR"
+msgstr "错误"
 
-#: src/testing/testing.c:674 src/testing/testing.c:708
-msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
+#: src/util/common_logging.c:247 src/util/common_logging.c:862
+msgid "NONE"
 msgstr ""
 
-#: src/testing/testing.c:689 src/testing/testing.c:738
-msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
+#: src/util/common_logging.c:578
+#, fuzzy, c-format
+msgid "Failed to create or access directory for log file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/util/common_logging.c:695
+#, fuzzy, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
+
+#: src/util/common_logging.c:863
+msgid "INVALID"
 msgstr ""
 
-#: src/testing/testing.c:811
-msgid "`scp' does not seem to terminate.\n"
+#: src/util/common_logging.c:945
+msgid "unknown address"
 msgstr ""
 
-#: src/testing/testing.c:989
-#, c-format
-msgid "Starting service %s for peer `%4s'\n"
+#: src/util/common_logging.c:983
+msgid "invalid address"
 msgstr ""
 
-#: src/testing/testing.c:1361 src/testing/testing.c:1444
-#: src/testing/testing.c:1582
+#: src/util/plugin.c:89
 #, c-format
-msgid "Terminating peer `%4s'\n"
-msgstr ""
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "插件机构初始化失败：%s！\n"
 
-#: src/testing/testing.c:1534
+#: src/util/plugin.c:146
 #, c-format
-msgid "Setting d->dead on peer `%4s'\n"
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1669
-msgid "Peer not yet running, can not change configuration at this point."
+#: src/util/plugin.c:219
+#, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1677
+#: src/util/plugin.c:349
 #, fuzzy
-msgid "Failed to write new configuration to disk."
-msgstr "保存配置失败。"
+msgid "Could not determine plugin installation path.\n"
+msgstr "无法确定用户界面定义文件。"
+
+#: src/util/configuration.c:245
+#, fuzzy, c-format
+msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/testing/testing.c:1708
+#: src/util/configuration.c:817
 #, c-format
-msgid "Could not start `%s' process to copy configuration file.\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/testing/testing.c:1711
-#, fuzzy
-msgid "Failed to copy new configuration to remote machine."
-msgstr "保存配置失败。"
+#: src/util/getopt.c:672
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s：选项“%s”有歧义\n"
 
-#: src/testing/testing.c:1883
-#, fuzzy
-msgid "Peers failed to connect"
-msgstr ""
-"\n"
-"按任意键继续\n"
+#: src/util/getopt.c:696
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s：选项“--%s”不允许有参数\n"
 
-#: src/testing/testing.c:2038
-#, fuzzy
-msgid "Failed to connect to core service of first peer!\n"
-msgstr "加载 sqstore 服务失败。检查您的配置！\n"
+#: src/util/getopt.c:701
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: src/testing/testing.c:2238
-msgid "Peers are not fully running yet, can not connect!\n"
-msgstr ""
+#: src/util/getopt.c:718 src/util/getopt.c:886
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s：选项“%s”要求有一个参数\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:136
+#: src/util/getopt.c:747
 #, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr ""
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s：无法识别的选项“--%s”\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:197
-msgid "# peers known"
-msgstr ""
+#: src/util/getopt.c:751
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s：无法识别的选项“%c%s”\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:241
+#: src/util/getopt.c:776
 #, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
+msgid "%s: illegal option -- %c\n"
+msgstr "%s：非法选项 -- %c\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:306
+#: src/util/getopt.c:778
 #, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
+msgid "%s: invalid option -- %c\n"
+msgstr "%s：无效选项 -- %c\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:257
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "无法连接到 %s:%u：%s\n"
+#: src/util/getopt.c:806 src/util/getopt.c:934
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s：选项要求有一个参数 -- %c\n"
 
-#: src/peerinfo/test_peerinfo_api.c:109 src/hostlist/hostlist-server.c:437
-#: src/peerinfo-tool/gnunet-peerinfo.c:157 src/dv/gnunet-service-dv.c:2998
-#: src/core/gnunet-service-core.c:3034 src/core/gnunet-service-core.c:3328
+#: src/util/getopt.c:854
 #, c-format
-msgid "Error in communication with PEERINFO service\n"
-msgstr ""
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s：选项“-W %s”有歧义\n"
 
-#: src/peerinfo/peerinfo_api.c:276
-#, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/util/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s：选项“-W %s” 不允许有参数\n"
 
-#: src/peerinfo/peerinfo_api.c:432
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/util/getopt.c:1038
+#, c-format
+msgid "Use --help to get a list of options.\n"
+msgstr "请使用 --help 获取选项列表。\n"
+
+#: src/util/scheduler.c:870
+msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
-msgid "Received invalid message from `PEERINFO' service.\n"
+#: src/util/scheduler.c:1000
+#, c-format
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:521
-#, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/util/connection.c:461
+#, fuzzy, c-format
+msgid "Access denied to `%s'\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/peerinfo/peerinfo_api.c:555
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+#: src/util/connection.c:476
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:259
-#: src/hostlist/hostlist-client.c:622
+#: src/util/connection.c:642
 #, c-format
-msgid "# advertised URI `%s' downloaded"
+msgid ""
+"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:274
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1338
-msgid "# advertised hostlist URIs"
-msgstr ""
+#: src/util/connection.c:852 src/util/connection.c:1025
+#, fuzzy, c-format
+msgid "Trying to connect to `%s' (%p)\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:286
-#: src/hostlist/hostlist-server.c:353
-msgid "# hostlist advertisements send"
-msgstr ""
+#: src/util/connection.c:862
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' (%p)\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:389
+#: src/util/connection.c:1015
 #, c-format
-msgid "Hostlist file `%s' was removed\n"
+msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:253
+#: src/util/connection.c:1528
+#, c-format
 msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+"Could not satisfy pending transmission request, socket closed or connect "
+"failed (%p).\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:286
-#: src/topology/gnunet-daemon-topology.c:1315
-#: src/topology/gnunet-daemon-topology.c:1322 src/fs/gnunet-service-fs.c:519
+#: src/util/connection.c:1564
 #, fuzzy, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Failed to send to `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:306
-msgid "advertise our hostlist to other peers"
+#: src/util/signal.c:80
+#, c-format
+msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/util/network.c:1197
+#, c-format
 msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:314
-msgid "enable learning about hostlist servers from other peers"
-msgstr ""
+#: src/util/os_installation.c:295
+#, fuzzy, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:318
-msgid "provide a hostlist server"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist.c:330
-msgid "GNUnet hostlist server and client"
-msgstr ""
-
-#: src/hostlist/hostlist-server.c:134
-msgid "bytes in hostlist"
-msgstr ""
-
-#: src/hostlist/hostlist-server.c:160
-msgid "expired addresses encountered"
-msgstr ""
-
-#: src/hostlist/hostlist-server.c:187
-#: src/topology/gnunet-daemon-topology.c:900
-#, c-format
-msgid "Error in communication with PEERINFO service: %s\n"
-msgstr ""
+#: src/util/os_installation.c:477
+#, fuzzy, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/hostlist/hostlist-server.c:208
-msgid "HELLOs without addresses encountered (ignored)"
-msgstr ""
+#: src/util/os_installation.c:483
+#, fuzzy, c-format
+msgid "stat (%s) failed: %s\n"
+msgstr "“%s”说：%s\n"
 
-#: src/hostlist/hostlist-server.c:224
-msgid "bytes not included in hostlist (size limit)"
-msgstr ""
+#: src/util/strings.c:143
+msgid "b"
+msgstr "b"
 
-#: src/hostlist/hostlist-server.c:272
+#: src/util/strings.c:355
 #, c-format
-msgid "Refusing `%s' request to hostlist server\n"
+msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:275
-msgid "hostlist requests refused (not HTTP GET)"
-msgstr ""
+#: src/util/strings.c:433
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
-#: src/hostlist/hostlist-server.c:283
-msgid "Sending 100 CONTINUE reply\n"
-msgstr ""
+#: src/util/strings.c:525
+msgid "ms"
+msgstr "毫秒"
 
-#: src/hostlist/hostlist-server.c:290
-#, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
+#: src/util/strings.c:530
+msgid "eternity"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:294
-msgid "hostlist requests refused (upload data)"
-msgstr ""
+#: src/util/strings.c:534
+msgid "s"
+msgstr "秒"
 
-#: src/hostlist/hostlist-server.c:302
-msgid "Could not handle hostlist request since I do not have a response yet\n"
-msgstr ""
+#: src/util/strings.c:538
+msgid "m"
+msgstr "分"
 
-#: src/hostlist/hostlist-server.c:305
-msgid "hostlist requests refused (not ready)"
-msgstr ""
+#: src/util/strings.c:542
+msgid "h"
+msgstr "时"
 
-#: src/hostlist/hostlist-server.c:309
-msgid "Received request for our hostlist\n"
-msgstr ""
+#: src/util/strings.c:546
+msgid " days"
+msgstr " 天"
 
-#: src/hostlist/hostlist-server.c:310
-msgid "hostlist requests processed"
+#: src/util/strings.c:570
+msgid "end of time"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:398
-msgid "Advertisement message could not be queued by core\n"
-msgstr ""
+#: src/util/server.c:388
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/hostlist/hostlist-server.c:556
-#: src/transport/gnunet-service-transport.c:462
-#: src/peerinfo-tool/gnunet-peerinfo.c:208 src/core/gnunet-service-core.c:4607
+#: src/util/server.c:397
 #, c-format
-msgid "Could not access PEERINFO service.  Exiting.\n"
+msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:566
-#, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
-msgstr ""
+#: src/util/server.c:402
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/hostlist/hostlist-server.c:575
+#: src/util/server.c:617
 #, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+msgid ""
+"Processing code for message of type %u did not call "
+"GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:589
+#: src/util/crypto_random.c:280
 #, c-format
-msgid "Address to obtain hostlist: `%s'\n"
+msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:627
+#: src/util/crypto_random.c:308
 #, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:286
-msgid "# bytes downloaded from hostlist servers"
-msgstr ""
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
-msgid "# invalid HELLOs downloaded from hostlist servers"
-msgstr ""
+#: src/util/disk.c:434
+#, fuzzy, c-format
+msgid "`%s' failed for drive `%s': %u\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/util/disk.c:834
 #, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:330
-msgid "# valid HELLOs downloaded from hostlist servers"
-msgstr ""
+msgid "Expected `%s' to be a directory!\n"
+msgstr "“%s”应为目录！\n"
 
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/util/disk.c:1186 src/util/service.c:1452
 #, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
-msgstr ""
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
-#: src/transport/test_plugin_transport_https.c:829
-#: src/transport/test_plugin_transport_https.c:837
-#: src/transport/plugin_transport_http.c:2059
-#: src/transport/plugin_transport_http.c:2067
-#: src/transport/test_plugin_transport_http.c:795
-#: src/transport/test_plugin_transport_http.c:803
+#: src/util/disk.c:1491
 #, c-format
-msgid "%s failed at %s:%d: `%s'\n"
+msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
+#: src/util/service.c:207 src/util/service.c:214
 #, c-format
-msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
-msgstr ""
+msgid "Invalid format for IP: `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
 
-#: src/hostlist/hostlist-client.c:805
+#: src/util/service.c:170
 #, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
-msgstr ""
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/hostlist/hostlist-client.c:822
+#: src/util/service.c:263
 #, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:842
-#, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/util/service.c:296
 #, c-format
-msgid "Download of hostlist `%s' completed.\n"
-msgstr ""
+msgid "Wrong format `%s' for netmask\n"
+msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/hostlist/hostlist-client.c:856
+#: src/util/service.c:326
 #, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
-msgstr ""
+msgid "Wrong format `%s' for network\n"
+msgstr "网络的格式“%s”错误\n"
 
-#: src/hostlist/hostlist-client.c:909
+#: src/util/service.c:629
 #, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
+msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
-msgid "# hostlist downloads initiated"
+#: src/util/service.c:634
+#, c-format
+msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1511
-msgid "# milliseconds between hostlist downloads"
+#: src/util/service.c:641
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/util/service.c:685
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
-msgid "Scheduled saving of hostlists\n"
+#: src/util/service.c:713
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/util/service.c:830
 #, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1117 src/hostlist/hostlist-client.c:1133
-msgid "# active connections"
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1249
+#: src/util/service.c:880 src/util/client.c:707
 #, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/util/service.c:900
 #, c-format
 msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1286
+#: src/util/service.c:917
 #, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
-#, c-format
-msgid "Hostlist file `%s' is not existing\n"
-msgstr ""
+#: src/util/service.c:947 src/transport/plugin_transport_http.c:996
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/hostlist/hostlist-client.c:1301
+#: src/util/service.c:964 src/transport/plugin_transport_http.c:1013
 #, fuzzy, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
-msgstr "æ\97 æ³\95解æ\9e\90â\80\9c%sâ\80\9dæ\9d¥ç¡®å®\9aå·²æ\96¹ç\9a\84 IP å\9c°å\9d\80ï¼\9a%s\n"
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "æ\89¾ä¸\8då\88°æ\8e¥å\8f£â\80\9c%sâ\80\9dç\9a\84ä¸\80个 IP å\9c°å\9d\80ã\80\82\n"
 
-#: src/hostlist/hostlist-client.c:1334
+#: src/util/service.c:1120 src/util/service.c:1138
 #, c-format
-msgid "%u hostlist URIs loaded from file\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:1336
-msgid "# hostlist URIs read from file"
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1369
+#: src/util/service.c:1165
 #, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1383
+#: src/util/service.c:1314
 #, fuzzy, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
-msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/hostlist/hostlist-client.c:1388
+#: src/util/service.c:1347
 #, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
+msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1412 src/hostlist/hostlist-client.c:1429
-#, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
+#: src/util/service.c:1393
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1424
-msgid "# hostlist URIs written to file"
+#: src/util/service.c:1397
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1476
-msgid "Learning is enabled on this peer\n"
+#: src/util/service.c:1401
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1479
+#: src/util/service.c:1453
+msgid "No such user"
+msgstr "无此用户"
+
+#: src/util/service.c:1466
 #, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
-msgstr ""
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "无法更改用户/组为“%s”：%s\n"
 
-#: src/hostlist/hostlist-client.c:1488
-msgid "Learning is not enabled on this peer\n"
+#: src/util/service.c:1529
+msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1500
-#, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+#: src/util/gnunet-resolver.c:76
+msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
+#: src/util/os_priority.c:114
 #, c-format
-msgid "Hostlist file `%s' could not be removed\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:250
-msgid "# peers blacklisted"
+msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:402
-msgid "# connect requests issued to core"
+#: src/util/resolver_api.c:202
+#, c-format
+msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:676
-#: src/topology/gnunet-daemon-topology.c:778
-#: src/transport/gnunet-service-transport_neighbours.c:465
-#: src/transport/gnunet-service-transport_neighbours.c:662
-msgid "# peers connected"
+#: src/util/resolver_api.c:221
+#, c-format
+msgid ""
+"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:697
-#: src/topology/gnunet-daemon-topology.c:783
-msgid "# friends connected"
-msgstr ""
+#: src/util/resolver_api.c:358
+#, fuzzy, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/topology/gnunet-daemon-topology.c:977
-msgid "Failed to connect to core service, can not manage topology!\n"
+#: src/util/resolver_api.c:362
+#, c-format
+msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/util/resolver_api.c:430
 #, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
+msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1021
+#: src/util/resolver_api.c:791
 #, c-format
-msgid "Could not read friends list `%s'\n"
+msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1027
+#: src/util/resolver_api.c:875
 #, c-format
-msgid "Friends file `%s' is empty.\n"
+msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1036
-#, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1044
-#, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1064
-#, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1077
-#, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1087
-#, fuzzy, c-format
-msgid "Found friend `%s' in configuration\n"
-msgstr ""
-"\n"
-"结束配置。\n"
-
-#: src/topology/gnunet-daemon-topology.c:1093
-#, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1103
-#, fuzzy
-msgid "# friends in configuration"
-msgstr ""
-"\n"
-"结束配置。\n"
-
-#: src/topology/gnunet-daemon-topology.c:1109
-msgid ""
-"Fewer friends specified than required by minimum friend count. Will only "
-"connect to friends.\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1116
-msgid ""
-"More friendly connections required than target total number of connections.\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1151
-msgid "# HELLO messages received"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1208
-msgid "# HELLO messages gossipped"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1348
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
-msgstr ""
-
-#: src/statistics/statistics_api.c:326
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/statistics/gnunet-statistics.c:89
+#: src/util/resolver_api.c:880
 #, fuzzy, c-format
-msgid "Failed to obtain statistics.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/statistics/gnunet-statistics.c:155
-msgid "limit output to statistcs for the given NAME"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:158
-msgid "make the value being set persistent"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:161
-msgid "limit output to the given SUBSYSTEM"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:168
-msgid "Print statistics about GNUnet operations."
-msgstr ""
-
-#: src/statistics/gnunet-service-statistics.c:208
-#, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-service-statistics.c:266
-#, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
-msgstr ""
+msgid "Could not resolve our FQDN : %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/os_priority.c:110
+#: src/util/resolver_api.c:912
 #, c-format
-msgid "Not installing a handler because $%s=%s\n"
-msgstr ""
-
-#: src/util/os_installation.c:291
-#, fuzzy, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
-msgstr "无法确定安装路径。请尝试设置“%s”\n"
-
-#: src/util/os_installation.c:474
-#, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
-
-#: src/util/os_installation.c:479
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "“%s”说：%s\n"
-
-#: src/util/common_logging.c:154 src/util/common_logging.c:500
-#: src/util/test_common_logging.c:75
-msgid "DEBUG"
-msgstr "调试"
-
-#: src/util/common_logging.c:156 src/util/common_logging.c:498
-#: src/util/test_common_logging.c:72
-msgid "INFO"
-msgstr "信息"
-
-#: src/util/common_logging.c:158 src/util/common_logging.c:496
-#: src/util/test_common_logging.c:68
-msgid "WARNING"
-msgstr "警告"
-
-#: src/util/common_logging.c:160 src/util/common_logging.c:494
-#: src/util/test_common_logging.c:65
-msgid "ERROR"
-msgstr "错误"
-
-#: src/util/common_logging.c:162
-msgid "NONE"
-msgstr ""
-
-#: src/util/common_logging.c:214 src/dht/plugin_dhtlog_mysql_dump.c:909
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:669
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:700
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:732
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:764
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:796
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:827
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:858
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:889
-#, fuzzy, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/util/common_logging.c:331
-#, fuzzy, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
-msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
-
-#: src/util/common_logging.c:501
-msgid "INVALID"
-msgstr ""
-
-#: src/util/common_logging.c:583
-msgid "unknown address"
-msgstr ""
-
-#: src/util/common_logging.c:621
-msgid "invalid address"
+msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/util/pseudonym.c:263
+#: src/util/pseudonym.c:266
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/pseudonym.c:327
+#: src/util/pseudonym.c:330
 msgid "no-name"
 msgstr "无名称"
 
-#: src/util/test_strings.c:42 src/util/strings.c:139
-msgid "b"
-msgstr "b"
-
-#: src/util/test_strings.c:45 src/util/strings.c:145
-msgid "KiB"
-msgstr "KiB"
-
-#: src/util/test_strings.c:48 src/util/strings.c:157
-msgid "TiB"
-msgstr "TiB"
-
-#: src/util/test_strings.c:51 src/util/strings.c:363
-msgid "ms"
-msgstr "毫秒"
-
-#: src/util/test_strings.c:56 src/util/strings.c:372
-msgid "s"
-msgstr "秒"
-
-#: src/util/test_strings.c:61 src/util/strings.c:380
-msgid "h"
-msgstr "时"
+#: src/util/gnunet-service-resolver.c:261
+#, c-format
+msgid "Could not resolve `%s' (%s): %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/connection.c:457
-#, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "“%s”已连接到“%s”。\n"
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
+#, c-format
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/connection.c:472
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
-msgid "Accepting connection from `%s': %p\n"
+msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/connection.c:640
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
+msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/util/connection.c:852 src/util/connection.c:1028
+#: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "无法连接到 %s:%u：%s\n"
+msgid "Error reading `%s': %s"
+msgstr "创建用户出错"
 
-#: src/util/connection.c:863
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "无法连接到 %s:%u：%s\n"
+#: src/util/bio.c:143
+msgid "End of file"
+msgstr ""
 
-#: src/util/connection.c:1018
+#: src/util/bio.c:195
 #, c-format
-msgid "Attempt to connect to `%s' failed\n"
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/connection.c:1534
+#: src/util/bio.c:205
 #, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
+msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/connection.c:1570
-#, fuzzy, c-format
-msgid "Failed to send to `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/util/plugin.c:87
+#: src/util/bio.c:250
 #, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "插件机构初始化失败：%s！\n"
+msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+msgstr ""
 
-#: src/util/plugin.c:144
+#: src/util/bio.c:264
 #, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/plugin.c:217
+#: src/util/client.c:301
 #, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
+msgid ""
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
 msgstr ""
 
-#: src/util/bio.c:134 src/util/bio.c:140
-#, fuzzy, c-format
-msgid "Error reading `%s': %s"
-msgstr "创建用户出错"
-
-#: src/util/bio.c:141
-msgid "End of file"
+#: src/util/client.c:309
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/bio.c:193
-#, c-format
-msgid "Error reading length of string `%s'"
+#: src/util/client.c:647
+msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/bio.c:203
+#: src/util/client.c:849
 #, c-format
-msgid "String `%s' longer than allowed (%u > %u)"
+msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/bio.c:248
+#: src/util/client.c:865
 #, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/bio.c:262
-#, c-format
-msgid "Metadata `%s' failed to deserialize"
+#: src/util/client.c:1133
+msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:611 src/util/crypto_rsa.c:658
+#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/crypto_rsa.c:616
+#: src/util/crypto_rsa.c:621
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_rsa.c:634
+#: src/util/crypto_rsa.c:639
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:662 src/util/crypto_rsa.c:698
+#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:693
+#: src/util/crypto_rsa.c:698
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:714
+#: src/util/crypto_rsa.c:718
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:732
+#: src/util/crypto_rsa.c:736
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:953
+#: src/util/crypto_rsa.c:957
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/server.c:384
-#, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/util/server.c:392
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
+#: src/nse/gnunet-nse-profiler.c:634 src/dht/gnunet-dht-get.c:213
+#: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
+#: src/fs/gnunet-download.c:263
+msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/util/server.c:397
-#, fuzzy, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+#: src/nse/gnunet-nse-profiler.c:652
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "无法访问该服务"
 
-#: src/util/server.c:612
+#: src/nse/gnunet-service-nse.c:903
 #, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/util/network.c:1194
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+#: src/nse/gnunet-service-nse.c:1328 src/nse/gnunet-service-nse.c:1347
+#: src/nse/gnunet-service-nse.c:1368
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/util/crypto_random.c:236
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
+#: src/nse/gnunet-service-nse.c:1335
+msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/util/crypto_random.c:263
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
+#: src/nse/gnunet-service-nse.c:1356
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/test_resolver_api.c:53
+#: src/peerinfo/gnunet-service-peerinfo.c:133
 #, c-format
-msgid "Got IP address `%s' for our host.\n"
+msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:147 src/util/resolver_api.c:873
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:195
+msgid "# peers known"
 msgstr ""
 
-#: src/util/test_resolver_api.c:154
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s %u\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/util/test_resolver_api.c:264
+#: src/peerinfo/gnunet-service-peerinfo.c:239
 #, c-format
-msgid "gethostbyname() could not lookup IP address: %s\n"
-msgstr ""
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
 
-#: src/util/test_resolver_api.c:329
+#: src/peerinfo/gnunet-service-peerinfo.c:304
 #, c-format
-msgid "gethostbyaddr() could not lookup hostname: %s\n"
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/util/configuration.c:244
+#: src/peerinfo/peerinfo_api_notify.c:258
 #, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %u.\n"
-msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+msgid "Could not connect to `%s' service.\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/configuration.c:801
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+#: src/peerinfo/peerinfo_api.c:279
+#, fuzzy, c-format
+msgid "Failed to transmit message to `%s' service.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/peerinfo/peerinfo_api.c:435
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/util/gnunet-resolver.c:76
-msgid "Test GNUnet DNS resolver code."
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
+msgid "Received invalid message from `PEERINFO' service.\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:523
+#, fuzzy
+msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/peerinfo/peerinfo_api.c:557
+msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+msgstr ""
+
+#: src/datacache/plugin_datacache_sqlite.c:424
+msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/util/client.c:304
+#: src/datacache/datacache.c:176
 #, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/util/client.c:312
+#: src/datacache/datacache.c:184
 #, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/util/client.c:669
-msgid "Failure to transmit TEST request.\n"
+#: src/datacache/datacache.c:274
+msgid "# requests received"
 msgstr ""
 
-#: src/util/client.c:729 src/util/service.c:880
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+#: src/datacache/datacache.c:284
+msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/util/client.c:871
-#, c-format
-msgid "Could not connect to service `%s', must not be running.\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:500
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/util/client.c:887
-#, c-format
-msgid "Failure to transmit request to service `%s'\n"
+#: src/datacache/plugin_datacache_template.c:121
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/util/client.c:1158
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/datacache/plugin_datacache_mysql.c:979
+msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/util/scheduler.c:859
-msgid "Looks like we're busy waiting...\n"
+#: src/dht/gnunet-service-dht_neighbours.c:479
+msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/util/scheduler.c:990
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:571
+msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/util/strings.c:149
-msgid "MiB"
-msgstr "MiB"
+#: src/dht/gnunet-service-dht_neighbours.c:627
+#: src/dht/gnunet-service-dht_neighbours.c:687
+#, fuzzy
+msgid "# Peers connected"
+msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/util/strings.c:153
-msgid "GiB"
-msgstr "GiB"
+#: src/dht/gnunet-service-dht_neighbours.c:721
+msgid "# Queued messages discarded (peer disconnected)"
+msgstr ""
 
-#: src/util/strings.c:193
-#, c-format
-msgid "Character set requested was `%s'\n"
+#: src/dht/gnunet-service-dht_neighbours.c:776
+msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/util/strings.c:271
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
+#: src/dht/gnunet-service-dht_neighbours.c:814
+msgid "# Bytes of bandwdith requested from core"
+msgstr ""
 
-#: src/util/strings.c:368
-msgid "eternity"
+#: src/dht/gnunet-service-dht_neighbours.c:1038
+#: src/dht/gnunet-service-dht_neighbours.c:1066
+msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/util/strings.c:376
-msgid "m"
-msgstr "分"
+#: src/dht/gnunet-service-dht_neighbours.c:1047
+#: src/dht/gnunet-service-dht_neighbours.c:1083
+msgid "# Peer selection failed"
+msgstr ""
 
-#: src/util/strings.c:384
-msgid " days"
-msgstr " 天"
+#: src/dht/gnunet-service-dht_neighbours.c:1219
+msgid "# PUT requests routed"
+msgstr ""
 
-#: src/util/strings.c:408
-msgid "end of time"
+#: src/dht/gnunet-service-dht_neighbours.c:1250
+msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/util/disk.c:429
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%s': %u\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1331
+msgid "# GET requests routed"
+msgstr ""
 
-#: src/util/disk.c:829
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "“%s”应为目录！\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1362
+msgid "# GET messages queued for transmission"
+msgstr ""
 
-#: src/util/disk.c:1180 src/util/service.c:1456
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1465
+msgid "# RESULT messages queued for transmission"
+msgstr ""
 
-#: src/util/disk.c:1486
-#, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1553
+msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/util/resolver_api.c:198
-#, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1662
+msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/util/resolver_api.c:217
-#, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1670
+msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/util/resolver_api.c:354
-#, fuzzy, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr "GNUnet 现在使用 IP 地址 %s。\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1761
+msgid "# P2P GET requests received"
+msgstr ""
 
-#: src/util/resolver_api.c:358
-#, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1805
+msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/util/resolver_api.c:427
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1819
+msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/util/resolver_api.c:789
-#, c-format
-msgid "Resolver returns `%s'.\n"
+#: src/dht/gnunet-service-dht_neighbours.c:1885
+msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/util/resolver_api.c:879
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+#: src/dht/dht_api.c:229
+#, fuzzy
+msgid "Failed to connect to the DHT service!\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/util/resolver_api.c:911
-#, c-format
-msgid "Resolving our hostname `%s'\n"
+#: src/dht/gnunet-service-dht.c:163
+#, fuzzy
+msgid "Failed to connect to transport service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
+msgid "the query key"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:261
-#, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+#: src/dht/gnunet-dht-get.c:204
+msgid "how many parallel requests (replicas) to create"
+msgstr ""
 
-#: src/util/gnunet-service-resolver.c:317
-#: src/util/gnunet-service-resolver.c:362
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
+#: src/dht/gnunet-dht-get.c:207
+msgid "the type of data to look for"
+msgstr ""
 
-#: src/util/gnunet-service-resolver.c:460
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:508
-#, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
+#: src/dht/gnunet-dht-get.c:232
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/util/getopt.c:668
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s：选项“%s”有歧义\n"
+#: src/dht/gnunet-service-dht_clients.c:311
+msgid "# GET requests from clients injected"
+msgstr ""
 
-#: src/util/getopt.c:692
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s：选项“--%s”不允许有参数\n"
+#: src/dht/gnunet-service-dht_clients.c:402
+msgid "# PUT requests received from clients"
+msgstr ""
 
-#: src/util/getopt.c:697
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s：选项“%c%s”不允许有参数\n"
+#: src/dht/gnunet-service-dht_clients.c:469
+msgid "# GET requests received from clients"
+msgstr ""
 
-#: src/util/getopt.c:714 src/util/getopt.c:882
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s：选项“%s”要求有一个参数\n"
+#: src/dht/gnunet-service-dht_clients.c:564
+msgid "# GET STOP requests received from clients"
+msgstr ""
 
-#: src/util/getopt.c:743
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s：无法识别的选项“--%s”\n"
+#: src/dht/gnunet-service-dht_clients.c:757
+msgid "# Key match, type mismatches in REPLY to CLIENT"
+msgstr ""
 
-#: src/util/getopt.c:747
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s：无法识别的选项“%c%s”\n"
+#: src/dht/gnunet-service-dht_clients.c:772
+msgid "# Duplicate REPLIES to CLIENT request dropped"
+msgstr ""
 
-#: src/util/getopt.c:772
+#: src/dht/gnunet-service-dht_clients.c:809
 #, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s：非法选项 -- %c\n"
+msgid "Unsupported block type (%u) in request!\n"
+msgstr ""
 
-#: src/util/getopt.c:774
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s：无效选项 -- %c\n"
+#: src/dht/gnunet-service-dht_clients.c:831
+msgid "# RESULTS queued for clients"
+msgstr ""
 
-#: src/util/getopt.c:802 src/util/getopt.c:930
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s：选项要求有一个参数 -- %c\n"
+#: src/dht/gnunet-service-dht_clients.c:882
+#: src/dht/gnunet-service-dht_clients.c:925
+msgid "# REPLIES ignored for CLIENTS (no match)"
+msgstr ""
 
-#: src/util/getopt.c:850
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s：选项“-W %s”有歧义\n"
+#: src/dht/gnunet-service-dht_clients.c:892
+msgid "Could not pass reply to client, message too big!\n"
+msgstr ""
 
-#: src/util/getopt.c:868
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s：选项“-W %s” 不允许有参数\n"
+#: src/dht/gnunet-service-dht_nse.c:59
+msgid "# Network size estimates received"
+msgstr ""
 
-#: src/util/getopt.c:1034
+#: src/dht/gnunet-dht-put.c:100
 #, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "请使用 --help 获取选项列表。\n"
+msgid "PUT request sent!\n"
+msgstr ""
 
-#: src/util/signal.c:78
+#: src/dht/gnunet-dht-put.c:124
 #, c-format
-msgid "signal (%d, %p) returned %d.\n"
+msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:82
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr "长选项的必选参数对短选项也是必选的。\n"
+#: src/dht/gnunet-dht-put.c:132
+#, fuzzy, c-format
+msgid "Could not connect to %s service!\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/getopt_helpers.c:253 src/util/getopt_helpers.c:281
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "您必须向“%s”选项传递一个数字。\n"
+#: src/dht/gnunet-dht-put.c:137
+#, fuzzy, c-format
+msgid "Connected to %s service!\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/util/service.c:112 src/util/service.c:138 src/util/service.c:182
-#: src/util/service.c:202 src/util/service.c:209
+#: src/dht/gnunet-dht-put.c:152
 #, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "IP 格式无效：“%s”\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
 
-#: src/util/service.c:165
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
+#: src/dht/gnunet-dht-put.c:166
+msgid "the data to insert under the key"
+msgstr ""
 
-#: src/util/service.c:258
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
+#: src/dht/gnunet-dht-put.c:169
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
 
-#: src/util/service.c:292
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "网络掩码的格式“%s”错误\n"
+#: src/dht/gnunet-dht-put.c:175
+msgid "how many replicas to create"
+msgstr ""
 
-#: src/util/service.c:323
-#, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "网络的格式“%s”错误\n"
+#: src/dht/gnunet-dht-put.c:178
+msgid "the type to insert data as"
+msgstr ""
 
-#: src/util/service.c:627
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
+#: src/dht/gnunet-dht-put.c:203
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/util/service.c:632
-#, c-format
-msgid "Unknown address family %d\n"
+#: src/dht/gnunet-service-dht_routing.c:211
+msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/util/service.c:639
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+#: src/dht/gnunet-service-dht_routing.c:220
+msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/util/service.c:683
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+#: src/dht/gnunet-service-dht_routing.c:226
+msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/util/service.c:712
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+#: src/dht/gnunet-service-dht_routing.c:236
+msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/util/service.c:829
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
+msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1927
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+#: src/dht/gnunet-service-dht_routing.c:324
+msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/util/service.c:900
+#: src/dht/gnunet-service-dht_datacache.c:93
 #, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/util/service.c:917
-#, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+#: src/dht/gnunet-service-dht_datacache.c:103
+msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/util/service.c:947
-#, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/dht/gnunet-service-dht_datacache.c:209
+msgid "# Good RESULTS found in datacache"
+msgstr ""
 
-#: src/util/service.c:965
+#: src/dht/gnunet-service-dht_datacache.c:220
+msgid "# Duplicate RESULTS found in datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:226
+msgid "# Invalid RESULTS found in datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:238
+msgid "# Unsupported RESULTS found in datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:241
+#, c-format
+msgid "Unsupported block type (%u) in local response!\n"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:271
+msgid "# GET requests given to datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_hello.c:82
+msgid "# HELLOs obtained from peerinfo"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:161
 #, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+msgid "Service `%s' has been started.\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-arm.c:165
+#, fuzzy, c-format
+msgid "Failed to stop service `%s'!\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/service.c:1121 src/util/service.c:1139
+#: src/arm/gnunet-arm.c:171
+#, fuzzy, c-format
+msgid "Service `%s' has been stopped.\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-arm.c:175
+#, fuzzy, c-format
+msgid "Failed to start service `%s'!\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/arm/gnunet-arm.c:181
 #, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgid "Some error communicating with service `%s'.\n"
 msgstr ""
 
-#: src/util/service.c:1166
+#: src/arm/gnunet-arm.c:207
 #, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+msgid "Service `%s' is running.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:212
+#, c-format
+msgid "Service `%s' is not running.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:238
+#, c-format
+msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
+msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/util/service.c:1315
+#: src/arm/gnunet-arm.c:269
 #, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "è¿\90è¡\8c %s失败ï¼\9a%s %d\n"
+msgid "Failed to remove configuration file %s\n"
+msgstr "解æ\9e\90é\85\8dç½®æ\96\87件â\80\9c%sâ\80\9d失败\n"
 
-#: src/util/service.c:1349
+#: src/arm/gnunet-arm.c:275
 #, c-format
-msgid "Service `%s' runs at %s\n"
+msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/util/service.c:1397
-msgid "Service process failed to initialize\n"
+#: src/arm/gnunet-arm.c:387
+#, fuzzy
+msgid "stop all GNUnet services"
+msgstr "卸载 GNUnet 服务"
+
+#: src/arm/gnunet-arm.c:389
+msgid "start a particular service"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:391
+msgid "stop a particular service"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:393
+#, fuzzy
+msgid "start all GNUnet default services"
+msgstr "卸载 GNUnet 服务"
+
+#: src/arm/gnunet-arm.c:396
+#, fuzzy
+msgid "stop and start all GNUnet default services"
+msgstr "卸载 GNUnet 服务"
+
+#: src/arm/gnunet-arm.c:399
+msgid "test if a particular service is running"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:402
+msgid "delete config file and directory on exit"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:404
+msgid "don't print status messages"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:407
+#, fuzzy
+msgid "timeout for completing current operation"
+msgstr "等待一次迭代完成的时间(毫秒)"
+
+#: src/arm/gnunet-arm.c:418
+msgid "Control services and the Automated Restart Manager (ARM)"
+msgstr ""
+
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
+msgid "Failed to transmit shutdown ACK.\n"
+msgstr ""
+
+#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
+msgid "Transmitting shutdown ACK.\n"
+msgstr ""
+
+#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
+msgid "Initiating shutdown as requested by client.\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:206
+#, c-format
+msgid "Restarting service `%s' due to configuration file change.\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:234
+msgid "Could not send status result to client\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:268
+msgid "Not sending status result to client: no client known\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:406
+#, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/arm/gnunet-service-arm.c:409
+#, c-format
+msgid "Starting service `%s'\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:435
+#, c-format
+msgid "ARM is shutting down, service `%s' not started.\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:443
+#, c-format
+msgid "Service `%s' already running.\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:453
+#, c-format
+msgid "Binary implementing service `%s' not known!\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:464
+#, fuzzy, c-format
+msgid "Configuration file `%s' for service `%s' not known!\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/arm/gnunet-service-arm.c:498
+#, c-format
+msgid "Preparing to stop `%s'\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:666
+msgid "Stopping all services\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:723
+#, c-format
+msgid "Restarting service `%s'.\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:796
+msgid "exit"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:801
+msgid "signal"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:806
+#, fuzzy
+msgid "unknown"
+msgstr "未知错误"
+
+#: src/arm/gnunet-service-arm.c:813
+#, fuzzy, c-format
+msgid "Service `%s' stopped\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-service-arm.c:827
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
+msgstr ""
+
+#: src/arm/arm_api.c:201
+msgid "Failed to transmit shutdown request to client.\n"
+msgstr ""
+
+#: src/arm/arm_api.c:389
+#, fuzzy, c-format
+msgid "Configuration failes to specify option `%s' in section `%s'!\n"
+msgstr "配置不满足配置规范文件“%s”的约束！\n"
+
+#: src/arm/arm_api.c:403
+#, fuzzy, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "配置不满足配置规范文件“%s”的约束！\n"
+
+#: src/arm/arm_api.c:467
+#, c-format
+msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
+msgstr ""
+
+#: src/arm/arm_api.c:536
+#, c-format
+msgid "Requesting start of service `%s'.\n"
+msgstr ""
+
+#: src/arm/arm_api.c:537
+#, c-format
+msgid "Requesting termination of service `%s'.\n"
+msgstr ""
+
+#: src/arm/arm_api.c:559
+#, c-format
+msgid "Error while trying to transmit request to start `%s' to ARM\n"
+msgstr ""
+
+#: src/arm/arm_api.c:560
+#, c-format
+msgid "Error while trying to transmit request to stop `%s' to ARM\n"
+msgstr ""
+
+#: src/arm/arm_api.c:592
+#, c-format
+msgid "Asked to start service `%s' within %llu ms\n"
+msgstr ""
+
+#: src/arm/arm_api.c:664
+#, c-format
+msgid "Stopping service `%s' within %llu ms\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm_interceptor.c:803
+#, c-format
+msgid "Unable to forward to service `%s': shutdown\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm_interceptor.c:812
+#, c-format
+msgid "Unable to forward to service `%s': timeout before connect\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm_interceptor.c:868
+#, fuzzy, c-format
+msgid "Unable to start service `%s': %s\n"
+msgstr "无法保存配置文件“%s”："
+
+#: src/arm/gnunet-service-arm_interceptor.c:936
+#, fuzzy, c-format
+msgid "Unable to accept connection for service `%s': %s\n"
+msgstr "无法保存配置文件“%s”："
+
+#: src/arm/gnunet-service-arm_interceptor.c:952
+#, fuzzy, c-format
+msgid "Service `%s' started\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-service-arm_interceptor.c:1080
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "无法创建用户账户："
+
+#: src/arm/gnunet-service-arm_interceptor.c:1102
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm_interceptor.c:1116
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
+msgstr ""
+
+#: src/fragmentation/defragmentation.c:270
+msgid "# acknowledgements sent for fragment"
+msgstr ""
+
+#: src/fragmentation/defragmentation.c:454
+msgid "# fragments received"
+msgstr ""
+
+#: src/fragmentation/defragmentation.c:513
+msgid "# duplicate fragments received"
+msgstr ""
+
+#: src/fragmentation/defragmentation.c:526
+msgid "# messages defragmented"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:188
+msgid "# fragments transmitted"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:191
+msgid "# fragments retransmitted"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:255
+msgid "# messages fragmented"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:258
+msgid "# total size of fragmented messages"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:343
+msgid "# fragment acknowledgements received"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:349
+msgid "# bits removed from fragmentation ACKs"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:373
+msgid "# fragmentation transmissions completed"
+msgstr ""
+
+#: src/statistics/gnunet-service-statistics.c:208
+#, c-format
+msgid "Loading %llu bytes of statistics from `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-service-statistics.c:266
+#, c-format
+msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgstr ""
+
+#: src/statistics/statistics_api.c:327
+#, fuzzy
+msgid "Failed to connect to statistics service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/statistics/gnunet-statistics.c:89
+#, fuzzy, c-format
+msgid "Failed to obtain statistics.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/statistics/gnunet-statistics.c:155
+msgid "limit output to statistcs for the given NAME"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:158
+msgid "make the value being set persistent"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:161
+msgid "limit output to the given SUBSYSTEM"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:168
+msgid "Print statistics about GNUnet operations."
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:89
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/util/service.c:1401
-msgid "Service process could not initialize server function\n"
+#: src/fs/gnunet-unindex.c:96
+#, c-format
+msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/util/service.c:1405
-msgid "Service process failed to report status\n"
+#: src/fs/gnunet-unindex.c:101
+#, c-format
+msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/util/service.c:1457
-msgid "No such user"
-msgstr "无此用户"
-
-#: src/util/service.c:1471
+#: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
+#: src/fs/gnunet-publish.c:158 src/fs/gnunet-download.c:144
 #, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "无法更改用户/组为“%s”：%s\n"
-
-#: src/util/service.c:1534
-msgid "do daemonize (detach from terminal)"
+msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:214
+#: src/fs/gnunet-unindex.c:131
 #, c-format
-msgid "`%' must be followed by HEX number"
+msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:273
-msgid "Malformed KSK URI (must not begin or end with `+')"
-msgstr ""
+#: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
+#: src/fs/gnunet-publish.c:412 src/fs/gnunet-download.c:203
+#, fuzzy, c-format
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_uri.c:291
-msgid "`++' not allowed in KSK URI"
+#: src/fs/gnunet-unindex.c:148
+#, c-format
+msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:298
-msgid "Quotes not balanced in KSK URI"
+#: src/fs/gnunet-unindex.c:176
+msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
-msgid "Malformed SKS URI"
+#: src/fs/gnunet-pseudonym.c:165
+#, c-format
+msgid "Namespace `%s' unknown.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
-msgid "Malformed CHK URI"
-msgstr ""
+#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
+#: src/fs/gnunet-pseudonym.c:249
+#, fuzzy, c-format
+msgid "Option `%s' ignored\n"
+msgstr "%s：选项“%s”有歧义\n"
 
-#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
-#: src/fs/fs_uri.c:615
-msgid "SKS URI malformed"
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:538
+msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
-msgid "SKS URI malformed (could not decode public key)"
+#: src/fs/gnunet-pseudonym.c:272
+msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/fs_uri.c:603
-msgid "SKS URI malformed (could not find signature)"
+#: src/fs/gnunet-pseudonym.c:275
+msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/fs_uri.c:609
-msgid "SKS URI malformed (could not decode signature)"
+#: src/fs/gnunet-pseudonym.c:278
+msgid ""
+"add an additional keyword for the advertisment (this option can be specified "
+"multiple times)"
 msgstr ""
 
-#: src/fs/fs_uri.c:622
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:557
+msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/fs_uri.c:634
-msgid "SKS URI malformed (signature failed validation)"
+#: src/fs/gnunet-pseudonym.c:285
+msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/fs_uri.c:672
-msgid "Unrecognized URI type"
+#: src/fs/gnunet-pseudonym.c:288
+msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/fs_uri.c:897
-#, fuzzy
-msgid "Lacking key configuration settings.\n"
-msgstr "立即保存配置？"
-
-#: src/fs/fs_uri.c:904
-#, fuzzy, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/fs/gnunet-pseudonym.c:291
+msgid "do not print names of remote namespaces"
+msgstr ""
 
-#: src/fs/fs_uri.c:1212 src/fs/fs_uri.c:1239
-msgid "No keywords specified!\n"
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:576
+msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/fs_uri.c:1245
-msgid "Number of double-quotes not balanced!\n"
+#: src/fs/gnunet-pseudonym.c:297
+msgid "specify ID of the root of the namespace"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
-#, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
+#: src/fs/gnunet-pseudonym.c:300
+msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:117
-#, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+#: src/fs/gnunet-pseudonym.c:308
+msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:164
+#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
 #, fuzzy, c-format
-msgid "Failed to not connect to `%s' service.\n"
-msgstr "å\88\9då§\8bå\8c\96â\80\9c%sâ\80\9dæ\9c\8då\8a¡å¤±è´¥ã\80\82\n"
+msgid "Configuration fails to specify `%s' in section `%s'\n"
+msgstr "é\85\8dç½®æ\96\87件â\80\9c%sâ\80\9då·²å\86\99å\85¥ã\80\82\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
-#: src/fs/gnunet-service-fs_lc.c:480
-msgid "# client searches active"
-msgstr ""
+#: src/fs/fs_namespace.c:119
+#, fuzzy, c-format
+msgid "Failed to open `%s' for writing: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-service-fs_lc.c:254
-msgid "# replies received for local clients"
-msgstr ""
+#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
+#, fuzzy, c-format
+msgid "Failed to write `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-service-fs_lc.c:312
-msgid "# client searches received"
-msgstr ""
+#: src/fs/fs_namespace.c:335
+#, fuzzy
+msgid "Unknown error"
+msgstr "未知错误"
 
-#: src/fs/gnunet-service-fs_lc.c:351
-msgid "# client searches updated (merged content seen list)"
-msgstr ""
+#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
+#, fuzzy
+msgid "Failed to serialize meta data"
+msgstr "发送消息失败。\n"
 
-#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
-#, c-format
-msgid "Publishing failed: %s"
-msgstr ""
+#: src/fs/fs_namespace.c:464
+#, fuzzy
+msgid "Failed to connect to datastore service"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
-#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
+#: src/fs/fs_namespace.c:507
 #, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:649
-msgid "timeout on index-start request to `fs' service"
+#: src/fs/fs_namespace.c:609
+#, c-format
+msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:661
+#: src/fs/fs_namespace.c:834 src/fs/fs_publish.c:1523
 #, fuzzy
-msgid "unknown error"
-msgstr "未知错误"
-
-#: src/fs/fs_publish.c:704
-msgid "failed to compute hash"
-msgstr ""
+msgid "Internal error."
+msgstr "未知错误。\n"
 
-#: src/fs/fs_publish.c:724
-msgid "filename too long"
+#: src/fs/fs_namespace.c:878
+msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:751
-msgid "could not connect to `fs' service"
+#: src/fs/gnunet-search.c:111
+#, c-format
+msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:775
+#: src/fs/gnunet-search.c:181
 #, fuzzy, c-format
-msgid "Failed to get file identifiers for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "Error searching: %s.\n"
+msgstr "创建用户出错"
 
-#: src/fs/fs_publish.c:845
+#: src/fs/gnunet-search.c:231
 #, c-format
-msgid "Recursive upload failed at `%s': %s"
+msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:851
+#: src/fs/gnunet-search.c:255
 #, c-format
-msgid "Recursive upload failed: %s"
+msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:899
-msgid "needs to be an actual file"
+#: src/fs/gnunet-search.c:285 src/fs/gnunet-download.c:240
+msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/fs_publish.c:1078
-#, c-format
-msgid "Insufficient space for publishing: %s"
+#: src/fs/gnunet-search.c:288 src/fs/gnunet-download.c:246
+msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/fs_publish.c:1149
-#, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+#: src/fs/gnunet-search.c:291
+msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/fs_publish.c:1482
-msgid "Could not connect to datastore."
+#: src/fs/gnunet-search.c:294
+msgid "automatically terminate search after VALUE ms"
 msgstr ""
 
-#: src/fs/fs_publish.c:1518 src/fs/fs_namespace.c:822
-#, fuzzy
-msgid "Internal error."
-msgstr "未知错误。\n"
-
-#: src/fs/gnunet-download.c:100
-#, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/fs/gnunet-download.c:112
-#, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-download.c:121
-#, c-format
-msgid "Error downloading: %s.\n"
+#: src/fs/gnunet-search.c:308
+msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-download.c:129
+#: src/fs/fs_uri.c:214
 #, c-format
-msgid "Downloading `%s' done (%s/s).\n"
+msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/gnunet-download.c:144 src/fs/gnunet-unindex.c:109
-#: src/fs/gnunet-search.c:190 src/fs/gnunet-publish.c:155
-#, c-format
-msgid "Unexpected status: %d\n"
+#: src/fs/fs_uri.c:273
+msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/gnunet-download.c:169
-#, fuzzy, c-format
-msgid "You need to specify a URI argument.\n"
-msgstr "您必须指定一个昵称\n"
-
-#: src/fs/gnunet-download.c:175 src/fs/gnunet-publish.c:426
-#, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/fs/gnunet-download.c:182
-#, c-format
-msgid "Only CHK or LOC URIs supported.\n"
+#: src/fs/fs_uri.c:291
+msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
-#, c-format
-msgid "Target filename must be specified.\n"
+#: src/fs/fs_uri.c:298
+msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/gnunet-download.c:203 src/fs/gnunet-unindex.c:141
-#: src/fs/gnunet-search.c:241 src/fs/gnunet-publish.c:404
-#, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
+msgid "Malformed SKS URI"
+msgstr ""
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-search.c:285
-msgid "set the desired LEVEL of receiver-anonymity"
+#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
+msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/gnunet-download.c:243
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
+#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
+#: src/fs/fs_uri.c:615
+msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:246 src/fs/gnunet-search.c:288
-msgid "only search the local peer (no P2P network search)"
+#: src/fs/fs_uri.c:597
+msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:249
-msgid "write the file to FILENAME"
+#: src/fs/fs_uri.c:603
+msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/fs/fs_uri.c:609
+msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/fs/fs_uri.c:622
+msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:260
-msgid "download a GNUnet directory recursively"
+#: src/fs/fs_uri.c:634
+msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:263 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:585
-#: src/mesh/test_mesh_small.c:676 src/dht/gnunet-dht-get-peer.c:190
-#: src/dht/gnunet-dht-put.c:176 src/dht/gnunet-dht-get.c:204
-#: src/nse/gnunet-nse-profiler.c:655
-msgid "be verbose (print progress information)"
+#: src/fs/fs_uri.c:672
+msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/gnunet-download.c:270
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
-msgstr ""
+#: src/fs/fs_uri.c:897
+#, fuzzy
+msgid "Lacking key configuration settings.\n"
+msgstr "立即保存配置？"
 
-#: src/fs/gnunet-unindex.c:89
-#, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
+#: src/fs/fs_uri.c:904
+#, fuzzy, c-format
+msgid "Could not access hostkey file `%s'.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
+msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:96
-#, c-format
-msgid "Error unindexing: %s.\n"
+#: src/fs/fs_uri.c:1265
+msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:101
+#: src/fs/gnunet-publish.c:118
 #, c-format
-msgid "Unindexing done.\n"
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:131
+#: src/fs/gnunet-publish.c:126
 #, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
+msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:148
+#: src/fs/gnunet-publish.c:137
 #, c-format
-msgid "Could not start unindex operation.\n"
+msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:176
-msgid "Unindex a file that was previously indexed with gnunet-publish."
+#: src/fs/gnunet-publish.c:141
+#, c-format
+msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
-#, fuzzy, c-format
-msgid "Configuration fails to specify `%s' in section `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/fs/fs_namespace.c:107
+#: src/fs/gnunet-publish.c:267
 #, fuzzy, c-format
-msgid "Failed to open `%s' for writing: %s\n"
+msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
+#: src/fs/gnunet-publish.c:269
 #, fuzzy, c-format
-msgid "Failed to write `%s': %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/fs/fs_namespace.c:323
-#, fuzzy
-msgid "Unknown error"
-msgstr "未知错误"
+msgid "Keywords for file `%s' (%s)\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
-#, fuzzy
-msgid "Failed to serialize meta data"
+#: src/fs/gnunet-publish.c:320
+#, fuzzy, c-format
+msgid "Failed to create namespace `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_namespace.c:452
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "初始化“%s”服务失败。\n"
+#: src/fs/gnunet-publish.c:362
+#, c-format
+msgid "Cannot extract metadata from a URI!\n"
+msgstr ""
 
-#: src/fs/fs_namespace.c:495
+#: src/fs/gnunet-publish.c:369
 #, c-format
-msgid "Failed to create or read private key for namespace `%s'\n"
+msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:597
+#: src/fs/gnunet-publish.c:375
 #, c-format
-msgid "Failed to read namespace private key file `%s', deleting it!\n"
+msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:866
-msgid "Failed to connect to datastore."
+#: src/fs/gnunet-publish.c:383
+#, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:165
+#: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
+#: src/transport/gnunet-transport.c:506
 #, c-format
-msgid "Namespace `%s' unknown.\n"
+msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/fs/gnunet-publish.c:422
 #, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s：选项“%s”有歧义\n"
-
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:532
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr ""
+msgid "Could not create namespace `%s'\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-pseudonym.c:272
-msgid "create or advertise namespace NAME"
-msgstr ""
+#: src/fs/gnunet-publish.c:434 src/fs/gnunet-download.c:175
+#, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-pseudonym.c:275
-msgid "delete namespace NAME "
-msgstr ""
+#: src/fs/gnunet-publish.c:467
+#, fuzzy, c-format
+msgid "Could not access file: %s\n"
+msgstr "错误：无法访问服务：%s\n"
 
-#: src/fs/gnunet-pseudonym.c:278
-msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
-msgstr ""
+#: src/fs/gnunet-publish.c:492
+#, fuzzy, c-format
+msgid "Could not publish `%s': %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:551
-msgid "set the meta-data for the given TYPE to the given VALUE"
+#: src/fs/gnunet-publish.c:515
+#, c-format
+msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
-msgid "print names of local namespaces"
+#: src/fs/gnunet-publish.c:542
+msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
-msgid "use the given PRIORITY for the advertisments"
+#: src/fs/gnunet-publish.c:545
+msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
-msgid "do not print names of remote namespaces"
+#: src/fs/gnunet-publish.c:549
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:570
-msgid "set the desired replication LEVEL"
+#: src/fs/gnunet-publish.c:553
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
-msgid "specify ID of the root of the namespace"
+#: src/fs/gnunet-publish.c:560
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:300
-msgid "change rating of namespace ID by VALUE"
+#: src/fs/gnunet-publish.c:565
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "Manage GNUnet pseudonyms."
+#: src/fs/gnunet-publish.c:569
+msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-search.c:111
-#, c-format
-msgid "Failed to write directory with search results to `%s'\n"
+#: src/fs/gnunet-publish.c:573
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:181
-#, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "创建用户出错"
-
-#: src/fs/gnunet-search.c:231
-#, c-format
-msgid "Could not create keyword URI from arguments.\n"
+#: src/fs/gnunet-publish.c:579
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:255
-#, c-format
-msgid "Could not start searching.\n"
+#: src/fs/gnunet-publish.c:583
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:291
-msgid "write search results to file starting with PREFIX"
+#: src/fs/gnunet-publish.c:587
+msgid ""
+"URI to be published (can be used instead of passing a file to add keywords "
+"to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/fs/gnunet-publish.c:600
+msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
-msgid "automatically terminate search after VALUE results are found"
+#: src/fs/fs_search.c:803
+#, c-format
+msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-search.c:308
-msgid "Search GNUnet for files that were published on GNUnet"
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
+#: src/fs/gnunet-service-fs_lc.c:490
+msgid "# client searches active"
 msgstr ""
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/fs/gnunet-service-fs_lc.c:254
+msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
-#, fuzzy
-msgid "Failed to read file"
-msgstr "发送消息失败。\n"
-
-#: src/fs/fs_unindex.c:235
-msgid "Unexpected time for a response from `fs' service."
+#: src/fs/gnunet-service-fs_lc.c:319
+msgid "# client searches received"
 msgstr ""
 
-#: src/fs/fs_unindex.c:243
-msgid "Timeout waiting for `fs' service."
+#: src/fs/gnunet-service-fs_lc.c:358
+msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/fs_unindex.c:251
-#, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "“%s”的参数无效。\n"
-
-#: src/fs/fs_unindex.c:296
-msgid "Failed to connect to FS service for unindexing."
+#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:331
-#, fuzzy
-msgid "Failed to connect to `datastore' service."
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/fs/fs_unindex.c:344
-#, fuzzy
-msgid "Failed to open file for unindexing."
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/fs_unindex.c:378
-msgid "Failed to compute hash of file."
+#: src/fs/fs_misc.c:126
+#, c-format
+msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
 #: src/fs/gnunet-directory.c:49
@@ -2367,315 +2426,232 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Display contents of a GNUnet directory"
 msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/fs/fs_file_information.c:349
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s': %s"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/fs/fs_test_lib.c:269
-#, fuzzy, c-format
-msgid "Failed to start daemon: %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/fs/gnunet-service-fs_pe.c:228
-msgid "# average retransmission delay (ms)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:334
-msgid "# queries messages sent to other peers"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:457
-msgid "# requests merged"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:463
-msgid "# requests refreshed"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:511 src/fs/gnunet-service-fs_pe.c:586
-#: src/fs/gnunet-service-fs_pe.c:622
-msgid "# query plan entries"
+#: src/fs/gnunet-service-fs_pr.c:287
+msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/fs_getopt.c:191
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+#: src/fs/gnunet-service-fs_pr.c:368 src/fs/gnunet-service-fs_pr.c:622
+msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/fs_misc.c:126
-#, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
+#: src/fs/gnunet-service-fs_pr.c:786
+msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:115
-#, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
+#: src/fs/gnunet-service-fs_pr.c:813
+msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:123
+#: src/fs/gnunet-service-fs_pr.c:829
 #, c-format
-msgid "Error publishing: %s.\n"
+msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:134
-#, c-format
-msgid "Publishing `%s' done.\n"
+#: src/fs/gnunet-service-fs_pr.c:844
+msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:138
-#, c-format
-msgid "URI is `%s'.\n"
+#: src/fs/gnunet-service-fs_pr.c:936
+msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:265
-#, fuzzy, c-format
-msgid "Meta data for file `%s' (%s)\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/gnunet-publish.c:267
-#, fuzzy, c-format
-msgid "Keywords for file `%s' (%s)\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+#: src/fs/gnunet-service-fs_pr.c:963
+msgid "# storage requests dropped due to high load"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:312
-#, fuzzy, c-format
-msgid "Failed to create namespace `%s'\n"
-msgstr "发送消息失败。\n"
+#: src/fs/gnunet-service-fs_pr.c:998
+msgid "# Replies received from DHT"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:354
+#: src/fs/gnunet-service-fs_pr.c:1088
 #, c-format
-msgid "Cannot extract metadata from a URI!\n"
+msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:361
+#: src/fs/gnunet-service-fs_pr.c:1109
 #, c-format
-msgid "You must specify one and only one filename for insertion.\n"
+msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:367
-#, c-format
-msgid "You must NOT specify an URI and a filename.\n"
+#: src/fs/gnunet-service-fs_pr.c:1156
+msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:375
-#, c-format
-msgid "Option `%s' is required when using option `%s'.\n"
+#: src/fs/gnunet-service-fs_pr.c:1170
+msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:385 src/fs/gnunet-publish.c:392
-#, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
+#: src/fs/gnunet-service-fs_pr.c:1179
+msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:414
-#, fuzzy, c-format
-msgid "Could not create namespace `%s'\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+#: src/fs/gnunet-service-fs_pr.c:1195
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:459
-#, fuzzy, c-format
-msgid "Could not access file: %s\n"
-msgstr "错误：无法访问服务：%s\n"
+#: src/fs/gnunet-service-fs_pr.c:1212
+msgid "# on-demand blocks matched requests"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:484
-#, fuzzy, c-format
-msgid "Could not publish `%s': %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+#: src/fs/gnunet-service-fs_pr.c:1225
+msgid "# on-demand lookups performed successfully"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:507
-#, c-format
-msgid "Could not start publishing.\n"
+#: src/fs/gnunet-service-fs_pr.c:1230
+msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:536
-msgid "disable adding the creation time to the metadata of the uploaded file"
+#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
+#: src/fs/gnunet-service-fs_pr.c:1437
+msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:539
-msgid "do not use libextractor to add keywords or metadata"
+#: src/fs/gnunet-service-fs_pr.c:1315
+msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:543
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
+#: src/fs/gnunet-service-fs_pr.c:1328
+msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:547
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
+#: src/fs/gnunet-service-fs_pr.c:1414
+msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:554
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
+#: src/fs/gnunet-service-fs_pr.c:1495
+msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:559
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
+#: src/fs/gnunet-service-fs_pr.c:1586 src/fs/gnunet-service-fs_pr.c:1595
+#, fuzzy, c-format
+msgid "Configuration fails to specify `%s', assuming default value."
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/fs/gnunet-service-fs_pe.c:265
+msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:563
-msgid "specify the priority of the content"
+#: src/fs/gnunet-service-fs_pe.c:394
+msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:567
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
+#: src/fs/gnunet-service-fs_pe.c:425
+msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:573
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
+#: src/fs/gnunet-service-fs_pe.c:478
+msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:577
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
+#: src/fs/gnunet-service-fs_pe.c:485
+msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:581
-msgid ""
-"URI to be published (can be used instead of passing a file to add keywords "
-"to the file with the respective URI)"
+#: src/fs/gnunet-service-fs_pe.c:549
+msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:594
-msgid "Publish a file or directory on GNUnet"
+#: src/fs/gnunet-service-fs_pe.c:555
+msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
-msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+#: src/fs/gnunet-service-fs_pe.c:608 src/fs/gnunet-service-fs_pe.c:694
+#: src/fs/gnunet-service-fs_pe.c:736
+msgid "# query plan entries"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
+#: src/transport/gnunet-service-transport_neighbours.c:934
+#: src/transport/gnunet-service-transport_neighbours.c:939
+#: src/transport/gnunet-service-transport_neighbours.c:1263
+#: src/transport/gnunet-service-transport_neighbours.c:2364
+#: src/transport/gnunet-service-transport_neighbours.c:2430
+#: src/topology/gnunet-daemon-topology.c:654
+#: src/topology/gnunet-daemon-topology.c:756
+msgid "# peers connected"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:696
+msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:694
+#: src/fs/gnunet-service-fs_cp.c:700
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:729
+#: src/fs/gnunet-service-fs_cp.c:735
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:735
+#: src/fs/gnunet-service-fs_cp.c:741
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:764 src/fs/gnunet-service-fs_cp.c:880
-#: src/fs/gnunet-service-fs_cp.c:1290 src/fs/gnunet-service-fs_cp.c:1327
+#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
+#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:837
+#: src/fs/gnunet-service-fs_cp.c:843
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:900
+#: src/fs/gnunet-service-fs_cp.c:906
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:914
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:952
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1019
+#: src/fs/gnunet-service-fs_cp.c:1025
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1043
+#: src/fs/gnunet-service-fs_cp.c:1049
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1053
+#: src/fs/gnunet-service-fs_cp.c:1059
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1132
+#: src/fs/gnunet-service-fs_cp.c:1138
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1166
+#: src/fs/gnunet-service-fs_cp.c:1172
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1190
+#: src/fs/gnunet-service-fs_cp.c:1196
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1256
+#: src/fs/gnunet-service-fs_cp.c:1262
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1284
+#: src/fs/gnunet-service-fs_cp.c:1290
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1325
+#: src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/fs_download.c:309
-msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
-msgstr ""
-
-#: src/fs/fs_download.c:329
-msgid "Directory too large for system address space\n"
-msgstr ""
-
-#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
-#, fuzzy, c-format
-msgid "Failed to open file `%s' for writing"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/fs_download.c:872
-#, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
-msgstr ""
-
-#: src/fs/fs_download.c:958
+#: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
-msgstr ""
-
-#: src/fs/fs_download.c:985
-msgid "internal error decrypting content"
+"Invalid value specified for option `%s' in section `%s', content pushing "
+"disabled\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1008
-#, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/fs_download.c:1020
-#, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/fs_download.c:1029
-#, fuzzy, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/fs/fs_download.c:1826
-#, fuzzy
-msgid "Invalid URI"
-msgstr "无效条目。\n"
-
 #: src/fs/gnunet-service-fs_indexing.c:113
 #: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
@@ -2710,1244 +2686,1134 @@ msgstr ""
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:552
+#: src/fs/gnunet-service-fs_indexing.c:545
+msgid "# index blocks removed: original file inaccessible"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_indexing.c:560
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:562
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:569
+#: src/fs/gnunet-service-fs_indexing.c:577
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/fs_search.c:798
+#: src/fs/fs_list_indexed.c:90
 #, c-format
-msgid "Got result with unknown block type `%d', ignoring"
+msgid "Failed to receive response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:300
-msgid "# Pending requests created"
+#: src/fs/fs_list_indexed.c:117
+#, c-format
+msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:379 src/fs/gnunet-service-fs_pr.c:638
-msgid "# Pending requests active"
+#: src/fs/fs_list_indexed.c:164
+#, fuzzy, c-format
+msgid "Failed to not connect to `%s' service.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/fs/fs_unindex.c:58
+msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:802
-msgid "# replies received and matched"
+#: src/fs/fs_unindex.c:63
+#, fuzzy
+msgid "Failed to read file"
+msgstr "发送消息失败。\n"
+
+#: src/fs/fs_unindex.c:235
+msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
-msgid "# duplicate replies discarded (bloomfilter)"
+#: src/fs/fs_unindex.c:243
+msgid "Timeout waiting for `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:251
+#, fuzzy
+msgid "Invalid response from `fs' service."
+msgstr "“%s”的参数无效。\n"
+
+#: src/fs/fs_unindex.c:296
+msgid "Failed to connect to FS service for unindexing."
+msgstr ""
+
+#: src/fs/fs_unindex.c:331
+#, fuzzy
+msgid "Failed to connect to `datastore' service."
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/fs/fs_unindex.c:344
+#, fuzzy
+msgid "Failed to open file for unindexing."
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_unindex.c:378
+msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:845
+#: src/fs/gnunet-download.c:100
+#, fuzzy, c-format
+msgid "Starting download `%s'.\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/fs/gnunet-download.c:112
 #, c-format
-msgid "Unsupported block type %u\n"
+msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:860
-msgid "# results found locally"
+#: src/fs/gnunet-download.c:121
+#, c-format
+msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:952
-msgid "# Datastore `PUT' failures"
+#: src/fs/gnunet-download.c:129
+#, c-format
+msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:979
-msgid "# storage requests dropped due to high load"
+#: src/fs/gnunet-download.c:169
+#, fuzzy, c-format
+msgid "You need to specify a URI argument.\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/fs/gnunet-download.c:182
+#, c-format
+msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1012
-msgid "# Replies received from DHT"
+#: src/fs/gnunet-download.c:189
+#, c-format
+msgid "Target filename must be specified.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:243
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
+msgstr ""
+
+#: src/fs/gnunet-download.c:249
+msgid "write the file to FILENAME"
+msgstr ""
+
+#: src/fs/gnunet-download.c:253
+msgid "set the maximum number of parallel downloads that is allowed"
+msgstr ""
+
+#: src/fs/gnunet-download.c:257
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr ""
+
+#: src/fs/gnunet-download.c:260
+msgid "download a GNUnet directory recursively"
+msgstr ""
+
+#: src/fs/gnunet-download.c:270
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1102
+#: src/fs/fs_getopt.c:191
 #, c-format
-msgid "Datastore lookup already took %llu ms!\n"
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1123
+#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
 #, c-format
-msgid "On-demand lookup already took %llu ms!\n"
+msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1170
-msgid "# Datastore lookups concluded (no results)"
+#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
+#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
+#, c-format
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1184
-msgid "# Datastore lookups concluded (seen all)"
+#: src/fs/fs_publish.c:654
+msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1193
-msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
+#: src/fs/fs_publish.c:666
+#, fuzzy
+msgid "unknown error"
+msgstr "未知错误"
+
+#: src/fs/fs_publish.c:709
+msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1209
-msgid "# requested DBLOCK or IBLOCK not found"
+#: src/fs/fs_publish.c:729
+msgid "filename too long"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1226
-msgid "# on-demand blocks matched requests"
+#: src/fs/fs_publish.c:756
+msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1239
-msgid "# on-demand lookups performed successfully"
-msgstr ""
+#: src/fs/fs_publish.c:780
+#, fuzzy, c-format
+msgid "Failed to get file identifiers for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1244
-msgid "# on-demand lookups failed"
+#: src/fs/fs_publish.c:850
+#, c-format
+msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1270 src/fs/gnunet-service-fs_pr.c:1311
-#: src/fs/gnunet-service-fs_pr.c:1426
-msgid "# Datastore lookups concluded (error queueing)"
+#: src/fs/fs_publish.c:856
+#, c-format
+msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1329
-msgid "# Datastore lookups concluded (found ultimate result)"
+#: src/fs/fs_publish.c:904
+msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1342
-msgid "# Datastore lookups concluded (load too high)"
+#: src/fs/fs_publish.c:1083
+#, c-format
+msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1404
-msgid "# Datastore lookups initiated"
+#: src/fs/fs_publish.c:1154
+#, c-format
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1487
-msgid "# GAP PUT messages received"
+#: src/fs/fs_publish.c:1487
+msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1576
-#, fuzzy, c-format
-msgid "Configuration fails to specify `%s', assuming default value."
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/fs/fs.c:284
+#: src/fs/fs_api.c:284
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs.c:293
+#: src/fs/fs_api.c:293
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/fs.c:299
+#: src/fs/fs_api.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:877
+#: src/fs/fs_api.c:877
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs.c:1323
+#: src/fs/fs_api.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1364
+#: src/fs/fs_api.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1380
+#: src/fs/fs_api.c:1380
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs.c:1984
+#: src/fs/fs_api.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1994
+#: src/fs/fs_api.c:1994
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs.c:2107 src/fs/fs.c:2346
+#: src/fs/fs_api.c:2107 src/fs/fs_api.c:2346
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs.c:2124
+#: src/fs/fs_api.c:2124
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
+#: src/fs/fs_api.c:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2337
+#: src/fs/fs_api.c:2337
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs.c:2583
+#: src/fs/fs_api.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2669
+#: src/fs/fs_api.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:642
-#, c-format
+#: src/fs/fs_download.c:309
 msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
-msgstr ""
-
-#: src/block/plugin_block_fs.c:128
-msgid "Reply mismatched in terms of namespace.  Discarded.\n"
-msgstr ""
-
-#: src/block/plugin_block_dht.c:99
-#, c-format
-msgid "Block not of type %u\n"
-msgstr ""
-
-#: src/block/plugin_block_dht.c:106
-msgid "Size mismatch for block\n"
-msgstr ""
-
-#: src/block/plugin_block_dht.c:115
-#, c-format
-msgid "Block of type %u is malformed\n"
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
 msgstr ""
 
-#: src/block/block.c:108
-#, c-format
-msgid "Loading block plugins `%s'\n"
+#: src/fs/fs_download.c:329
+msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/block/block.c:118
+#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
 #, fuzzy, c-format
-msgid "Failed to load block plugin `%s'\n"
+msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/mesh/test_mesh_small.c:689
-msgid "Test mesh in a small network."
-msgstr ""
-
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
-msgid "Transmitting shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
-msgid "Initiating shutdown as requested by client.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:206
-#, c-format
-msgid "Restarting service `%s' due to configuration file change.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:234
-msgid "Could not send status result to client\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:268
-msgid "Not sending status result to client: no client known\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:406
-#, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/arm/gnunet-service-arm.c:409
-#, c-format
-msgid "Starting service `%s'\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:435
-#, c-format
-msgid "ARM is shutting down, service `%s' not started.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:443
-#, c-format
-msgid "Service `%s' already running.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:453
-#, c-format
-msgid "Binary implementing service `%s' not known!\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:464
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not known!\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/arm/gnunet-service-arm.c:498
+#: src/fs/fs_download.c:873
 #, c-format
-msgid "Preparing to stop `%s'\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:666
-msgid "Stopping all services\n"
+msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:723
+#: src/fs/fs_download.c:959
 #, c-format
-msgid "Restarting service `%s'.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:796
-msgid "exit"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:801
-msgid "signal"
+msgid ""
+"Internal error or bogus download URI (expected %u bytes at depth %u and "
+"offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:806
-#, fuzzy
-msgid "unknown"
-msgstr "未知错误"
-
-#: src/arm/gnunet-service-arm.c:813
-#, fuzzy, c-format
-msgid "Service `%s' stopped\n"
-msgstr "服务已删除。\n"
-
-#: src/arm/gnunet-service-arm.c:827
-#, c-format
-msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
+#: src/fs/fs_download.c:986
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:161
-#, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "服务已删除。\n"
-
-#: src/arm/gnunet-arm.c:165
+#: src/fs/fs_download.c:1009
 #, fuzzy, c-format
-msgid "Failed to stop service `%s'!\n"
+msgid "Download failed: could not open file `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/arm/gnunet-arm.c:171
-#, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "服务已删除。\n"
-
-#: src/arm/gnunet-arm.c:175
+#: src/fs/fs_download.c:1021
 #, fuzzy, c-format
-msgid "Failed to start service `%s'!\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/arm/gnunet-arm.c:181
-#, c-format
-msgid "Some error communicating with service `%s'.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:207
-#, c-format
-msgid "Service `%s' is running.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:212
-#, c-format
-msgid "Service `%s' is not running.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:238
-#, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
-msgid "Fatal error initializing ARM API.\n"
-msgstr ""
+msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/arm/gnunet-arm.c:269
+#: src/fs/fs_download.c:1030
 #, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:275
-#, c-format
-msgid "Failed to remove servicehome directory %s\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:387
-#, fuzzy
-msgid "stop all GNUnet services"
-msgstr "卸载 GNUnet 服务"
-
-#: src/arm/gnunet-arm.c:389
-msgid "start a particular service"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:391
-msgid "stop a particular service"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:393
-#, fuzzy
-msgid "start all GNUnet default services"
-msgstr "卸载 GNUnet 服务"
-
-#: src/arm/gnunet-arm.c:396
-#, fuzzy
-msgid "stop and start all GNUnet default services"
-msgstr "卸载 GNUnet 服务"
-
-#: src/arm/gnunet-arm.c:399
-msgid "test if a particular service is running"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:402
-msgid "delete config file and directory on exit"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:404
-msgid "don't print status messages"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:407
+#: src/fs/fs_download.c:1829
 #, fuzzy
-msgid "timeout for completing current operation"
-msgstr "等待一次迭代完成的时间(毫秒)"
-
-#: src/arm/gnunet-arm.c:418
-msgid "Control services and the Automated Restart Manager (ARM)"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:803
-#, c-format
-msgid "Unable to forward to service `%s': shutdown\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:812
-#, c-format
-msgid "Unable to forward to service `%s': timeout before connect\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm_interceptor.c:868
-#, fuzzy, c-format
-msgid "Unable to start service `%s': %s\n"
-msgstr "无法保存配置文件“%s”："
+msgid "Invalid URI"
+msgstr "无效条目。\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:936
-#, fuzzy, c-format
-msgid "Unable to accept connection for service `%s': %s\n"
-msgstr "无法保存配置文件“%s”："
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
+msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:952
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
+msgid "# Loopback routes suppressed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:581 src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
+#: src/hostlist/gnunet-daemon-hostlist.c:295
 #, fuzzy, c-format
-msgid "Service `%s' started\n"
-msgstr "服务已删除。\n"
+msgid "Failed to connect to `%s' service.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1080
+#: src/fs/fs_file_information.c:350
 #, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "无法创建用户账户："
+msgid "`%s' failed on file `%s': %s"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1102
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+#: src/transport/gnunet-service-transport_neighbours.c:466
+msgid "# failed connection attempts due to timeout"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1116
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+#: src/transport/gnunet-service-transport_neighbours.c:855
+msgid "# peers disconnected due to external request"
 msgstr ""
 
-#: src/arm/arm_api.c:201 src/arm/test_exponential_backoff.c:192
-msgid "Failed to transmit shutdown request to client.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:942
+#, fuzzy
+msgid "# fast reconnects failed"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/arm/arm_api.c:390
-#, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
-msgstr "配置不满足配置规范文件“%s”的约束！\n"
-
-#: src/arm/arm_api.c:405
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "配置不满足配置规范文件“%s”的约束！\n"
+#: src/transport/gnunet-service-transport_neighbours.c:997
+msgid "# peers disconnected due to timeout"
+msgstr ""
 
-#: src/arm/arm_api.c:469
-#, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1022
+msgid "# keepalives sent"
 msgstr ""
 
-#: src/arm/arm_api.c:539
-#, c-format
-msgid "Requesting start of service `%s'.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1064
+msgid "# peers disconnected due to global disconnect"
 msgstr ""
 
-#: src/arm/arm_api.c:540
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1778
+#: src/transport/gnunet-service-transport_neighbours.c:1799
+msgid "# messages not sent (no such peer or not connected)"
 msgstr ""
 
-#: src/arm/arm_api.c:563
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1815
+msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/arm/arm_api.c:566
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1867
+msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/arm/arm_api.c:598 src/arm/arm_api.c:602
-#, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1903
+msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/arm/arm_api.c:675
-#, c-format
-msgid "Stopping service `%s' within %llu ms\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1921
+msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/dht/dhtlog.c:56
-#, c-format
-msgid "Loading `%s' dhtlog plugin\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1950
+msgid "# KEEPALIVE messages discarded (not connected)"
 msgstr ""
 
-#: src/dht/dhtlog.c:65
-#, fuzzy, c-format
-msgid "Failed to load dhtlog plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/transport/gnunet-service-transport_neighbours.c:2002
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr ""
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:895
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:655
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:686
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:718
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:750
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:782
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:813
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:844
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:875
-#, fuzzy, c-format
-msgid "Failed to get full path for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/transport/gnunet-service-transport_neighbours.c:2010
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr ""
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:924
-#, fuzzy
-msgid "Failed to create file for dhtlog.\n"
-msgstr "无法为守护程序创建用户账户。"
+#: src/transport/gnunet-service-transport_neighbours.c:2076
+msgid "# SET QUOTA messages ignored (no such peer)"
+msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:84
-#, c-format
-msgid "Found %u peers\n"
+#: src/transport/gnunet-service-transport_neighbours.c:2094
+msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:115
-#, fuzzy, c-format
-msgid "Found peer `%s'\n"
-msgstr "未知的用户“%s”\n"
+#: src/transport/gnunet-service-transport_neighbours.c:2212
+msgid "# disconnect messages ignored (old format)"
+msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:184 src/dht/gnunet-dht-put.c:161
-#: src/dht/gnunet-dht-get.c:195
-msgid "the query key"
+#: src/transport/gnunet-service-transport_neighbours.c:2225
+msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:187 src/dht/gnunet-dht-put.c:170
-#: src/dht/gnunet-dht-get.c:201
-msgid "how long to execute this query before giving up?"
+#: src/transport/gnunet-service-transport_neighbours.c:2302
+msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:209
-msgid "Issue a GET PEER request to the GNUnet DHT, print results."
+#: src/transport/gnunet-service-transport_neighbours.c:2319
+msgid "# unexpected CONNECT_ACK messages"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:95
-#, c-format
-msgid "PUT request sent!\n"
+#: src/transport/gnunet-service-transport_neighbours.c:2410
+msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:119
+#: src/transport/gnunet-service-transport_blacklist.c:247
+#, fuzzy, c-format
+msgid "Could not read blacklist file `%s'\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:254
 #, c-format
-msgid "Must provide KEY and DATA for DHT put!\n"
+msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:127
+#: src/transport/gnunet-service-transport_blacklist.c:266
 #, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
-msgstr "无法连接到 %s:%u：%s\n"
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
 #, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "“%s”已连接到“%s”。\n"
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/dht/gnunet-dht-put.c:147
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
 #, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:164
-msgid "the data to insert under the key"
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:167
-msgid "the type to insert data as"
-msgstr ""
+#: src/transport/gnunet-service-transport_blacklist.c:350
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/dht/gnunet-dht-put.c:173
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/transport/gnunet-service-transport_blacklist.c:364
+#, c-format
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/transport/gnunet-service-transport_blacklist.c:522
+#: src/transport/gnunet-service-transport_blacklist.c:756
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198
-msgid "the type of data to look for"
+#: src/transport/plugin_transport_http_server.c:191
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:223
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/transport/plugin_transport_http_server.c:215
+msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/dht/dht_api.c:235
-#, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/dht/plugin_dhtlog_mysql.c:1550
-msgid "Failed to initialize MySQL database connection for dhtlog.\n"
+#: src/transport/gnunet-service-transport_hello.c:172
+msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:185
-#: src/transport/test_plugin_transport_https.c:1271
-#: src/transport/test_plugin_transport.c:202
-#: src/transport/gnunet-service-transport.c:439
-#: src/transport/test_plugin_transport_http.c:1232
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+#: src/transport/plugin_transport_udp.c:1529
+msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:195
-#: src/transport/test_plugin_transport_https.c:1335
-#: src/transport/test_plugin_transport.c:212
-#: src/transport/gnunet-service-transport.c:448
-#: src/transport/test_plugin_transport_http.c:1255
-msgid "Transport service could not access hostkey.  Exiting.\n"
+#: src/transport/plugin_transport_udp.c:1567
+msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:205
-msgid "Loading udp transport plugin\n"
+#: src/transport/plugin_transport_udp.c:2063
+#: src/transport/plugin_transport_udp_new.c:1218
+#, c-format
+msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:213
-msgid "Failed to load transport plugin for udp\n"
-msgstr ""
+#: src/transport/plugin_transport_udp.c:2114
+#: src/transport/plugin_transport_udp_new.c:1268
+#, fuzzy, c-format
+msgid "Invalid IPv6 address: `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_wlan.c:1436
-#: src/transport/plugin_transport_wlan.c:1631
-#: src/transport/plugin_transport_wlan.c:1750
+#: src/transport/plugin_transport_udp.c:2258
 #, c-format
-msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1868
+#: src/transport/plugin_transport_udp.c:2325
+#: src/transport/plugin_transport_udp_new.c:1396
+#, fuzzy
+msgid "Failed to open UDP sockets\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/plugin_transport_http_client.c:108
+#: src/transport/plugin_transport_http_client.c:123
+#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
+#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
+#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
+#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
 #, c-format
-msgid "Wlan Address len %d is wrong\n"
+msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2728
+#: src/transport/plugin_transport_http_client.c:620
 #, c-format
-msgid "Finished reading from wlan-helper stdout with code: %d\n"
+msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:246
+#: src/transport/plugin_transport_tcp.c:504
 #, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:251
-msgid "# messages dropped due to slow client"
+#: src/transport/plugin_transport_tcp.c:590
+#: src/transport/plugin_transport_tcp.c:679
+#: src/transport/plugin_transport_tcp.c:731
+#: src/transport/plugin_transport_tcp.c:820
+#: src/transport/plugin_transport_tcp.c:1156
+msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:394
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:846
+#: src/transport/plugin_transport_tcp.c:1544
+msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:511
-msgid "# bytes payload received for other peers"
+#: src/transport/plugin_transport_tcp.c:683
+msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:528
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/transport/plugin_transport_tcp.c:734
+msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:579
-msgid "# REQUEST CONNECT messages received"
+#: src/transport/plugin_transport_tcp.c:824
+msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:607
-msgid "# SET QUOTA messages received"
+#: src/transport/plugin_transport_tcp.c:945
+msgid "# bytes TCP was asked to transmit"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:811
-msgid "# messages not sent (no such peer or not connected)"
+#: src/transport/plugin_transport_tcp.c:996
+msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:831
-msgid "# bytes in message queue for other peers"
+#: src/transport/plugin_transport_tcp.c:1039
+#, c-format
+msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:899
-msgid "# bandwidth quota violations by other peers"
+#: src/transport/plugin_transport_tcp.c:1056
+msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:917
-msgid "# ms throttling suggested"
+#: src/transport/plugin_transport_tcp.c:1107
+msgid "# bytes discarded by TCP (failed to connect)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:942
-msgid "# KEEPALIVE messages discarded (not connected)"
+#: src/transport/plugin_transport_tcp.c:1224
+msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:972
-msgid "# SET QUOTA messages ignored (no such peer)"
+#: src/transport/plugin_transport_tcp.c:1587
+msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:984
-msgid "# disconnects due to quota of 0"
+#: src/transport/plugin_transport_tcp.c:1732
+msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:108
-msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+#: src/transport/plugin_transport_tcp.c:1796
+msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:115
+#: src/transport/plugin_transport_tcp.c:1949
+#, fuzzy
+msgid "Failed to start service.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/plugin_transport_tcp.c:2009
 #, c-format
-msgid "Starting transport plugins `%s'\n"
+msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:119
+#: src/transport/plugin_transport_tcp.c:2032
 #, c-format
-msgid "Loading `%s' transport plugin\n"
+msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:139
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/transport/test_plugin_transport_https.c:409
-msgid "Phase 0: Test plugin functions failed\n"
+#: src/transport/plugin_transport_tcp.c:2036
+msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:418
-msgid "Phase 1: Test connect with wrong data failed\n"
+#: src/transport/plugin_transport_tcp.c:2040
+#, c-format
+msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:427
-msgid "Phase 2: Test session selection failed\n"
+#: src/transport/plugin_transport_http.c:923
+msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:435
-msgid "Phase 3: Test sending with plugin failed\n"
-msgstr ""
+#: src/transport/plugin_transport_http.c:971
+#, fuzzy
+msgid "Require valid port number for service in configuration!\n"
+msgstr "保存配置失败。"
 
-#: src/transport/test_plugin_transport_https.c:726
-#: src/transport/test_plugin_transport_http.c:692
+#: src/transport/plugin_transport_http.c:1118
 #, c-format
-msgid "curl failed for `%s' at %s:%d: `%s'\n"
+msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:746
-#: src/transport/test_plugin_transport_http.c:712
-msgid "Connecting to peer without any peer identification: test failed\n"
+#: src/transport/plugin_transport_http.c:1131
+#, c-format
+msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:759
-#: src/transport/test_plugin_transport_http.c:725
-msgid "Connecting to peer with too short peer identification: test failed\n"
+#: src/transport/plugin_transport_http.c:1206
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:772
-#: src/transport/test_plugin_transport_http.c:738
-msgid "Connecting to peer with too long peer identification: test failed\n"
+#: src/transport/plugin_transport_http.c:1219
+#, fuzzy
+msgid "Port is required! Fix in configuration\n"
 msgstr ""
+"\n"
+"结束配置。\n"
 
-#: src/transport/test_plugin_transport_https.c:785
-msgid "Connecting to peer with valid peer identification: test failed\n"
+#: src/transport/plugin_transport_http.c:1230
+msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:924
-#: src/transport/test_plugin_transport_http.c:887
+#: src/transport/plugin_transport_http.c:1250
 #, c-format
-msgid "Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"
+msgid ""
+"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:930
-#: src/transport/test_plugin_transport_http.c:893
+#: src/transport/plugin_transport_http.c:1280
 #, c-format
-msgid "Transport plugin notification for address: `%s':%u\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_https.c:1038
-#: src/transport/test_plugin_transport_http.c:1002
-msgid "Connecting to peer without any peer identification.\n"
+msgid ""
+"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1053
-#: src/transport/test_plugin_transport_http.c:1017
-msgid "Connecting to peer with too short peer identification.\n"
-msgstr ""
+#: src/transport/plugin_transport_unix.c:1087
+#, fuzzy
+msgid "Failed to open UNIX sockets\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/test_plugin_transport_https.c:1069
-#: src/transport/test_plugin_transport_http.c:1033
-msgid "Connecting to peer with too long peer identification.\n"
+#: src/transport/plugin_transport_smtp.c:367
+#, c-format
+msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1083
-#: src/transport/test_plugin_transport_http.c:1047
-msgid "Connecting to peer with valid peer identification.\n"
+#: src/transport/plugin_transport_smtp.c:454
+msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1093
-msgid ""
-"\n"
-"Phase 1: transmit data to all suggested addresses\n"
-"\n"
+#: src/transport/plugin_transport_smtp.c:463
+#, c-format
+msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1151
-msgid ""
-"\n"
-"Phase 2: session selection\n"
-"\n"
+#: src/transport/plugin_transport_smtp.c:558
+#: src/transport/plugin_transport_smtp.c:568
+#: src/transport/plugin_transport_smtp.c:581
+#: src/transport/plugin_transport_smtp.c:600
+#: src/transport/plugin_transport_smtp.c:623
+#: src/transport/plugin_transport_smtp.c:631
+#: src/transport/plugin_transport_smtp.c:644
+#: src/transport/plugin_transport_smtp.c:655
+#, c-format
+msgid "SMTP: `%s' failed: %s.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1187
-msgid ""
-"\n"
-"Phase 3: send multiple or big messages after disconnect\n"
-"\n"
+#: src/transport/plugin_transport_smtp.c:798
+msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1193
-#, fuzzy
-msgid "Phase 3: sending messages\n"
-msgstr "发送消息失败。\n"
-
-#: src/transport/test_plugin_transport_https.c:1284
-#: src/transport/plugin_transport_http.c:3323
-#: src/transport/test_plugin_transport_http.c:1245
-#, c-format
-msgid "Require valid port number for transport plugin `%s' in configuration!\n"
+#: src/transport/plugin_transport_smtp.c:810
+msgid "# bytes received via SMTP"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1352
-#, c-format
-msgid "Loading HTTPS transport plugin `%s'\n"
+#: src/transport/plugin_transport_smtp.c:811
+msgid "# bytes sent via SMTP"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1358
-msgid "Failed to load transport plugin for https\n"
+#: src/transport/plugin_transport_smtp.c:813
+msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1368
-#, c-format
-msgid "Transport plugin returned %u addresses to connect to\n"
+#: src/transport/gnunet-service-transport_plugins.c:109
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1444
-msgid ""
-"\n"
-"Phase 0\n"
-"\n"
+#: src/transport/gnunet-service-transport_plugins.c:116
+#, c-format
+msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1507
-#: src/transport/test_plugin_transport_https.c:1510
-msgid ""
-"\n"
-"delete\n"
-"\n"
+#: src/transport/gnunet-service-transport_plugins.c:120
+#, c-format
+msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
-#: src/transport/test_transport_api.c:120
-#, fuzzy
-msgid "Fail! Could not connect peers\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/transport/gnunet-transport-list-connections.c:91
-#: src/peerinfo-tool/gnunet-peerinfo.c:200
-#: src/core/gnunet-core-list-connections.c:166
+#: src/transport/gnunet-service-transport_plugins.c:147
 #, fuzzy, c-format
-msgid "Invalid command line argument `%s'\n"
-msgstr "“%s”的参数无效。\n"
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-transport-list-connections.c:112
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
-#: src/core/gnunet-core-list-connections.c:187
-msgid "don't resolve host names"
+#: src/transport/plugin_transport_wlan.c:884
+msgid "# wlan session timeouts"
 msgstr ""
 
-#: src/transport/gnunet-transport-list-connections.c:119
-#: src/core/gnunet-core-list-connections.c:194
-msgid "Print information about connected peers."
+#: src/transport/plugin_transport_wlan.c:908
+msgid "# wlan session created"
 msgstr ""
 
-#: src/transport/test_plugin_transport.c:224
-msgid "Loading tcp transport plugin\n"
+#: src/transport/plugin_transport_wlan.c:992
+#: src/transport/plugin_transport_wlan.c:1155
+#: src/transport/plugin_transport_wlan.c:1176
+#: src/transport/plugin_transport_wlan.c:1207
+#: src/transport/plugin_transport_wlan.c:2412
+#: src/transport/plugin_transport_wlan.c:3273
+msgid "# wlan pending sessions"
 msgstr ""
 
-#: src/transport/test_plugin_transport.c:232
-msgid "Failed to load transport plugin for tcp\n"
+#: src/transport/plugin_transport_wlan.c:1250
+#: src/transport/plugin_transport_wlan.c:1967
+msgid "# wlan pending fragments"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:176
-msgid "# refreshed my HELLO"
+#: src/transport/plugin_transport_wlan.c:1441
+#, c-format
+msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:698
-#: src/transport/plugin_transport_http.c:1231
-#: src/transport/plugin_transport_http.c:2551
-msgid "# HTTP peers active"
+#: src/transport/plugin_transport_wlan.c:1808
+msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:993
-#: src/transport/plugin_transport_http.c:1306
-msgid "# HTTP inbound sessions for peers active"
+#: src/transport/plugin_transport_wlan.c:1841
+#: src/transport/plugin_transport_wlan.c:2056
+#: src/transport/plugin_transport_wlan.c:2151
+#, c-format
+msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1889
-#, c-format
-msgid "Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"
+#: src/transport/plugin_transport_wlan.c:2042
+msgid "# wlan acks send"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1915
-#, c-format
-msgid "Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"
+#: src/transport/plugin_transport_wlan.c:2113
+msgid "# wlan fragments send"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:2193
-#: src/transport/plugin_transport_http.c:2305
+#: src/transport/plugin_transport_wlan.c:2279
 #, c-format
-msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
+msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:2592
-msgid "# HTTP outbound sessions for peers active"
+#: src/transport/plugin_transport_wlan.c:2284
+msgid "# wlan messages queued"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3351
-#: src/transport/plugin_transport_http.c:3380
-msgid "Misconfigured address to bind to in configuration!\n"
+#: src/transport/plugin_transport_wlan.c:2373
+#: src/transport/plugin_transport_wlan.c:3029
+#: src/transport/plugin_transport_wlan.c:3276
+msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3406
-#, c-format
-msgid "Required configuration options missing in section `%s'\n"
+#: src/transport/plugin_transport_wlan.c:2601
+msgid "# wlan whole messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3444
-msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
+#: src/transport/plugin_transport_wlan.c:2803
+msgid "# wlan hello messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3460
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/plugin_transport_wlan.c:2840
+msgid "# wlan fragments received"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3612
-#, c-format
-msgid ""
-"HTTP Server with %s could not be started on port %u! %s plugin failed!\n"
+#: src/transport/plugin_transport_wlan.c:2892
+msgid "# wlan acks received"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3628
-#, c-format
-msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+#: src/transport/plugin_transport_wlan.c:2989
+msgid "# wlan mac endpoints timeouts"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:504
-#, c-format
-msgid "Unexpected address length: %u bytes\n"
+#: src/transport/plugin_transport_wlan.c:3013
+msgid "# wlan mac endpoints created"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:590
-#: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:728
-#: src/transport/plugin_transport_tcp.c:817
-#: src/transport/plugin_transport_tcp.c:1142
-msgid "# bytes currently in TCP buffers"
+#: src/transport/plugin_transport_wlan.c:3071
+msgid "# wlan WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:843
-#: src/transport/plugin_transport_tcp.c:1531
-msgid "# TCP sessions active"
+#: src/transport/plugin_transport_wlan.c:3127
+msgid "# wlan messages for this client received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:683
-msgid "# bytes discarded by TCP (timeout)"
+#: src/transport/plugin_transport_wlan.c:3138
+msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:731
-msgid "# bytes transmitted via TCP"
+#: src/transport/gnunet-transport.c:250
+#, c-format
+msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:821
-msgid "# bytes discarded by TCP (disconnect)"
+#: src/transport/gnunet-transport.c:263
+#, c-format
+msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:942
-msgid "# bytes TCP was asked to transmit"
+#: src/transport/gnunet-transport.c:313
+#, c-format
+msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:993
-msgid "# bytes discarded by TCP (no address and no connection)"
+#: src/transport/gnunet-transport.c:320
+#, c-format
+msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1034
+#: src/transport/gnunet-transport.c:353
 #, c-format
-msgid "Address of unexpected length: %u\n"
+msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1051
-msgid "Found valid IPv4 NAT address (creating session)!\n"
+#: src/transport/gnunet-transport.c:373
+#, fuzzy, c-format
+msgid "Connected to %s\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/transport/gnunet-transport.c:404
+#, fuzzy, c-format
+msgid "Disconnected from %s\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/transport/gnunet-transport.c:433
+#, c-format
+msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1103
-msgid "# bytes discarded by TCP (failed to connect)"
+#: src/transport/gnunet-transport.c:447
+#, fuzzy, c-format
+msgid "Peer `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/transport/gnunet-transport.c:515
+#, fuzzy, c-format
+msgid "Failed to parse peer identity `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/gnunet-transport.c:552
+msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1211
-msgid "# transport-service disconnect requests for TCP"
+#: src/transport/gnunet-transport.c:555
+#, fuzzy
+msgid "try to connect to the given peer"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:558
+msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1574
-msgid "# TCP WELCOME messages received"
+#: src/transport/gnunet-transport.c:562
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1722
-msgid "# bytes received via TCP"
+#: src/transport/gnunet-transport.c:565
+msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1788
-msgid "# network-level TCP disconnect events"
+#: src/transport/gnunet-transport.c:568
+msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1941
+#: src/transport/gnunet-transport.c:576
 #, fuzzy
-msgid "Failed to start service.\n"
+msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2001
-#, c-format
-msgid "Failed to find option %s in section %s!\n"
+#: src/transport/gnunet-service-transport_validation.c:408
+msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2024
+#: src/transport/gnunet-service-transport_validation.c:457
 #, c-format
-msgid "TCP transport listening on port %llu\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2028
-msgid "TCP transport not listening on any port (client only)\n"
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2032
-#, c-format
-msgid "TCP transport advertises itself as being on port %llu\n"
+#: src/transport/gnunet-service-transport_validation.c:494
+msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:518
-msgid "# address records discarded"
+#: src/transport/gnunet-service-transport_validation.c:552
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:604
-#: src/core/gnunet-service-core.c:4187
-msgid "# PING messages received"
+#: src/transport/gnunet-service-transport_validation.c:773
+msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:626
+#: src/transport/gnunet-service-transport_validation.c:808
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:683
+#: src/transport/gnunet-service-transport_validation.c:876
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:692
+#: src/transport/gnunet-service-transport_validation.c:885
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:756
+#: src/transport/gnunet-service-transport_validation.c:1007
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1032
+msgid "# PONGs dropped, signature expired"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1091
 #, c-format
-msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:790
-msgid "# PING without HELLO messages sent"
+#: src/transport/gnunet-service-transport_clients.c:254
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:862
-msgid "# address revalidations started"
+#: src/transport/gnunet-service-transport_clients.c:259
+msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:921
-#: src/core/gnunet-service-core.c:4210
-msgid "# PONG messages received"
+#: src/transport/gnunet-service-transport_clients.c:406
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:943
-msgid "# PONGs dropped, no matching pending validation"
+#: src/transport/gnunet-service-transport_clients.c:523
+msgid "# bytes payload received for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:959
-msgid "# PONGs dropped, signature expired"
+#: src/transport/gnunet-service-transport_clients.c:540
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:367
+#: src/transport/gnunet-service-transport_clients.c:591
+msgid "# REQUEST CONNECT messages received"
+msgstr ""
+
+#: src/transport/transport_api.c:588
 #, c-format
-msgid "Received malformed message via %s. Ignored.\n"
+msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:454
-msgid "SMTP filter string to invalid, lacks ': '\n"
+#: src/transport/gnunet-service-transport.c:158
+msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:463
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
+#: src/transport/gnunet-service-transport.c:519
+msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:558
-#: src/transport/plugin_transport_smtp.c:568
-#: src/transport/plugin_transport_smtp.c:581
-#: src/transport/plugin_transport_smtp.c:600
-#: src/transport/plugin_transport_smtp.c:623
-#: src/transport/plugin_transport_smtp.c:631
-#: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:655
-#, c-format
-msgid "SMTP: `%s' failed: %s.\n"
+#: src/transport/gnunet-service-transport.c:528
+msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:798
-msgid "No email-address specified, can not start SMTP transport.\n"
+#: src/dv/plugin_transport_dv.c:159
+#, c-format
+msgid "%s Received message from %s of type %d, distance %u!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:810
-msgid "# bytes received via SMTP"
+#: src/dv/dv_api.c:179
+#, fuzzy
+msgid "Failed to connect to the dv service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/topology/gnunet-daemon-topology.c:244
+msgid "# peers blacklisted"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:811
-msgid "# bytes sent via SMTP"
+#: src/topology/gnunet-daemon-topology.c:380
+msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:813
-msgid "# bytes dropped by SMTP (outgoing)"
+#: src/topology/gnunet-daemon-topology.c:675
+#: src/topology/gnunet-daemon-topology.c:761
+msgid "# friends connected"
 msgstr ""
 
-#: src/transport/test_plugin_transport_http.c:1271
+#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184
 #, c-format
-msgid "Loading HTTP transport plugin `%s'\n"
+msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_http.c:1278
-msgid "Failed to load transport plugin for http\n"
+#: src/topology/gnunet-daemon-topology.c:950
+msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_http.c:1364
-msgid ""
-"Phase 0\n"
-"\n"
+#: src/topology/gnunet-daemon-topology.c:982
+#, c-format
+msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1280
+#: src/topology/gnunet-daemon-topology.c:994
 #, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1330
-#, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "无效的进程优先级“%s”\n"
+#: src/topology/gnunet-daemon-topology.c:1000
+#, c-format
+msgid "Friends file `%s' is empty.\n"
+msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1456
-#, fuzzy
-msgid "Failed to open UDP sockets\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/topology/gnunet-daemon-topology.c:1009
+#, c-format
+msgid "Failed to read friends list from `%s': out of memory\n"
+msgstr ""
 
-#: src/transport/transport_api.c:570
+#: src/topology/gnunet-daemon-topology.c:1017
 #, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
+msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1092
-#, fuzzy
-msgid "Failed to open UNIX sockets\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/topology/gnunet-daemon-topology.c:1037
+#, c-format
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes.\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/topology/gnunet-daemon-topology.c:1050
+#, c-format
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:1060
 #, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+msgid "Found friend `%s' in configuration\n"
+msgstr ""
+"\n"
+"结束配置。\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/topology/gnunet-daemon-topology.c:1066
 #, c-format
-msgid "Blacklist file `%s' is empty.\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
-#, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/topology/gnunet-daemon-topology.c:1076
+#, fuzzy
+msgid "# friends in configuration"
+msgstr ""
+"\n"
+"结束配置。\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+#: src/topology/gnunet-daemon-topology.c:1082
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
-#, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+#: src/topology/gnunet-daemon-topology.c:1089
+msgid ""
+"More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+#: src/topology/gnunet-daemon-topology.c:1126
+msgid "# HELLO messages received"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
-#, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+#: src/topology/gnunet-daemon-topology.c:1183
+msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:754
-msgid "# disconnects due to blacklist"
+#: src/topology/gnunet-daemon-topology.c:1323
+msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
 #: src/chat/chat.c:175
@@ -3999,6 +3865,26 @@ msgstr ""
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
+#: src/chat/gnunet-service-chat.c:267
+#, fuzzy
+msgid "Failed to queue a message notification\n"
+msgstr "保存配置失败。"
+
+#: src/chat/gnunet-service-chat.c:546
+#, fuzzy
+msgid "Failed to queue a join notification\n"
+msgstr "保存配置失败。"
+
+#: src/chat/gnunet-service-chat.c:729
+#, fuzzy
+msgid "Failed to queue a confirmation receipt\n"
+msgstr "保存配置失败。"
+
+#: src/chat/gnunet-service-chat.c:907
+#, fuzzy
+msgid "Failed to queue a leave notification\n"
+msgstr "保存配置失败。"
+
 #: src/chat/gnunet-chat.c:92
 #, c-format
 msgid "Joined\n"
@@ -4193,587 +4079,408 @@ msgstr "设置要加入的聊天室"
 msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:267
-#, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "保存配置失败。"
-
-#: src/chat/gnunet-service-chat.c:546
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "保存配置失败。"
-
-#: src/chat/gnunet-service-chat.c:729
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "保存配置失败。"
-
-#: src/chat/gnunet-service-chat.c:907
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "保存配置失败。"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
-#: src/core/gnunet-core-list-connections.c:77
+#: src/nat/gnunet-nat-server.c:289
 #, c-format
-msgid "Peer `%s'\n"
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:222
-#, fuzzy, c-format
-msgid "Could not find option `%s:%s' in configuration.\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
+#: src/nat/gnunet-nat-server.c:328
+msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#: src/nat/nat.c:803
 #, c-format
-msgid "I am peer `%s'.\n"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
-msgid "output only the identity strings"
-msgstr ""
-
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
-msgid "output our own identity only"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:270
-#, fuzzy
-msgid "Print information about peers."
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/nat/nat.c:852
 #, 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
-#, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr ""
-
-#: src/datastore/plugin_datastore_sqlite.c:266
-#, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "无法初始化 SQLite：%s。\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:677
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
+msgid "Failed to start %s\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1130
-msgid "sqlite version to old to determine size, assuming zero\n"
-msgstr ""
+#: src/nat/nat.c:1121
+#, fuzzy, c-format
+msgid "Malformed %s `%s' given in configuration!\n"
+msgstr "保存配置失败。"
 
-#: src/datastore/plugin_datastore_sqlite.c:1149
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
 #, c-format
 msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
-msgstr ""
-
-#: src/datastore/plugin_datastore_sqlite.c:1188
-#, fuzzy
-msgid "Sqlite database running\n"
-msgstr "sqlite 数据仓库"
-
-#: src/datastore/gnunet-service-datastore.c:52
-msgid "# bytes used in file-sharing datastore"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:331
-msgid "# bytes expired"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:397
-msgid "# bytes purged (low-priority)"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:457
-msgid "Transmission to client failed!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:610
-msgid "# results found"
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:655
-#, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+#: src/nat/nat.c:1329
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:666
+#: src/nat/nat.c:1341
 #, c-format
-msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:670
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:676
-msgid "Insufficient space to satisfy request"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:681
-#: src/datastore/gnunet-service-datastore.c:735
-#: src/datastore/gnunet-service-datastore.c:956
-#: src/datastore/gnunet-service-datastore.c:1441
-msgid "# reserved"
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:750
-msgid "Could not find matching reservation"
+#: src/nat/nat_test.c:348
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:838
+#: src/nat/nat_test.c:418
 #, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1004
-msgid "# GET requests received"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1018
-msgid "# requests filtered by bloomfilter"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1046
-msgid "# UPDATE requests received"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1080
-msgid "# GET REPLICATION requests received"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1115
-msgid "# GET ZERO ANONYMITY requests received"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1142
-msgid "Content not found"
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1152
-msgid "# bytes removed (explicit request)"
+#: src/dht/plugin_block_dht.c:124
+#, c-format
+msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1186
-msgid "# REMOVE requests received"
+#: src/dht/plugin_block_dht.c:131
+msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1230
+#: src/dht/plugin_block_dht.c:140
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1303
-#: src/datastore/test_plugin_datastore.c:322
-#: src/datastore/perf_plugin_datastore.c:420
-#, c-format
-msgid "Loading `%s' datastore plugin\n"
+#: src/fs/plugin_block_fs.c:131
+msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1312
+#: src/block/block.c:105
 #, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/datastore/gnunet-service-datastore.c:1491
-msgid "# quota"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1493
-msgid "# cache size"
-msgstr ""
+msgid "Loading block plugin `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1503
-#, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+#: src/mesh/gnunet-service-mesh.c:4212
+msgid "MESH: Wrong CORE service\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1516
+#: src/mesh/gnunet-service-mesh.c:4417
 #, fuzzy
-msgid "Failed to initialize bloomfilter.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/datastore/plugin_datastore_template.c:241
-msgid "Template database running\n"
-msgstr ""
-
-#: src/datastore/datastore_api.c:287
-msgid "Failed to transmit request to drop database.\n"
-msgstr ""
-
-#: src/datastore/datastore_api.c:370
-msgid "# queue entry timeouts"
-msgstr ""
-
-#: src/datastore/datastore_api.c:417
-msgid "# queue overflows"
-msgstr ""
-
-#: src/datastore/datastore_api.c:444
-msgid "# queue entries created"
-msgstr ""
-
-#: src/datastore/datastore_api.c:465
-msgid "# Requests dropped from datastore queue"
-msgstr ""
-
-#: src/datastore/datastore_api.c:514
-msgid "# datastore connections (re)created"
-msgstr ""
-
-#: src/datastore/datastore_api.c:541
-msgid "# reconnected to DATASTORE"
-msgstr ""
-
-#: src/datastore/datastore_api.c:606
-msgid "Failed to transmit request to DATASTORE.\n"
-msgstr ""
-
-#: src/datastore/datastore_api.c:608
-msgid "# transmission request failures"
-msgstr ""
-
-#: src/datastore/datastore_api.c:631
-msgid "# bytes sent to datastore"
-msgstr ""
-
-#: src/datastore/datastore_api.c:768
-msgid "Failed to receive status response from database."
-msgstr ""
-
-#: src/datastore/datastore_api.c:781
-msgid "Error reading response from datastore service"
-msgstr ""
-
-#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
-msgid "Invalid error message received from datastore service"
-msgstr ""
-
-#: src/datastore/datastore_api.c:806
-msgid "# status messages received"
-msgstr ""
+msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
+msgstr "立即保存配置？"
 
-#: src/datastore/datastore_api.c:878
-msgid "# PUT requests executed"
-msgstr ""
+#: src/mesh/gnunet-service-mesh.c:4426
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/datastore/datastore_api.c:950
-msgid "# RESERVE requests executed"
+#: src/hostlist/hostlist-client.c:286
+msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1015
-msgid "# RELEASE RESERVE requests executed"
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
+msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1078
-msgid "# UPDATE requests executed"
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#, c-format
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1148
-msgid "# REMOVE requests executed"
+#: src/hostlist/hostlist-client.c:330
+msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1193
-msgid "Failed to receive response from database.\n"
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#, c-format
+msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1254
-msgid "# Results received"
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1326
-msgid "# GET REPLICATION requests executed"
+#: src/hostlist/hostlist-client.c:622
+#, c-format
+msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1393
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/hostlist/hostlist-client.c:663
+#, c-format
+msgid ""
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1457
-msgid "# GET requests executed"
+#: src/hostlist/hostlist-client.c:805
+#, c-format
+msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/datastore/plugin_datastore_mysql.c:622
-#, 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:1500
-msgid "Mysql database running\n"
+#: src/hostlist/hostlist-client.c:822
+#, c-format
+msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:173
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "无法保存配置文件“%s”："
+msgid "%s failed for `%s' at %s:%d: `%s'\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/datastore/plugin_datastore_postgres.c:979
-msgid "Postgres database running\n"
+#: src/hostlist/hostlist-client.c:848
+#, c-format
+msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:159
+#: src/hostlist/hostlist-client.c:856
 #, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/dv/dv_api.c:178
-#, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/nse/gnunet-service-nse.c:866
+#: src/hostlist/hostlist-client.c:909
 #, c-format
-msgid "Proof of work invalid: %llu!\n"
+msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1288 src/nse/gnunet-service-nse.c:1307
-#: src/nse/gnunet-service-nse.c:1328
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+#: src/hostlist/hostlist-client.c:917
+msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1295
-msgid "Invalid work requirement for NSE service. Exiting.\n"
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1316
-#, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/hostlist/hostlist-client.c:1054
+#, c-format
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:673
-#, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "无法访问该服务"
+#: src/hostlist/hostlist-client.c:1092
+msgid "Scheduled saving of hostlists\n"
+msgstr ""
 
-#: src/core/gnunet-service-core.c:920
-msgid "# total peer preference"
+#: src/hostlist/hostlist-client.c:1096
+#, c-format
+msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1040
-msgid "# peer status changes"
+#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
+msgid "# active connections"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1236
-msgid "# send requests dropped (disconnected)"
+#: src/hostlist/hostlist-client.c:1253
+#, c-format
+msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1712
+#: src/hostlist/hostlist-client.c:1284
 #, c-format
 msgid ""
-"Client asked for preference change with peer `%s', which is not connected!\n"
+"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1793 src/core/gnunet-service-core.c:4240
-#: src/core/gnunet-service-core.c:4456
-msgid "# established sessions"
+#: src/hostlist/hostlist-client.c:1290
+#, c-format
+msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1838
-msgid "# bytes encrypted"
+#: src/hostlist/hostlist-client.c:1294
+#, c-format
+msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1964 src/core/gnunet-service-core.c:2793
-#: src/core/gnunet-service-core.c:4532
-msgid "# neighbour entries allocated"
-msgstr ""
+#: src/hostlist/hostlist-client.c:1305
+#, fuzzy, c-format
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/core/gnunet-service-core.c:2031
-msgid "# encrypted bytes given to transport"
+#: src/hostlist/hostlist-client.c:1338
+#, c-format
+msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2134
-msgid "# bytes decrypted"
+#: src/hostlist/hostlist-client.c:1340
+msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2314
-msgid "# transmissions delayed due to corking"
+#: src/hostlist/hostlist-client.c:1373
+#, c-format
+msgid ""
+"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2517
-msgid "# messages discarded (expired prior to transmission)"
-msgstr ""
+#: src/hostlist/hostlist-client.c:1387
+#, fuzzy, c-format
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/core/gnunet-service-core.c:2857
-msgid "# messages discarded (disconnected)"
+#: src/hostlist/hostlist-client.c:1392
+#, c-format
+msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2909 src/core/gnunet-service-core.c:4644
-msgid "# discarded CORE_SEND requests"
+#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#, c-format
+msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2924 src/core/gnunet-service-core.c:4648
-msgid "# discarded lower priority CORE_SEND requests"
+#: src/hostlist/hostlist-client.c:1428
+msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2996
-msgid "# connection requests received"
+#: src/hostlist/hostlist-client.c:1480
+msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3008
-msgid "# connection requests ignored (already connected)"
+#: src/hostlist/hostlist-client.c:1483
+#, c-format
+msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3054 src/core/gnunet-service-core.c:3697
-msgid "# SET_KEY messages deferred (need public key)"
+#: src/hostlist/hostlist-client.c:1492
+msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3067
-msgid "# Delayed connecting due to lack of public key"
+#: src/hostlist/hostlist-client.c:1504
+#, c-format
+msgid ""
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3099
-msgid "# Error extracting public key from HELLO"
+#: src/hostlist/hostlist-client.c:1508
+#, c-format
+msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3145
-msgid "# Asking transport to connect (for SET_KEY)"
+#: src/hostlist/gnunet-daemon-hostlist.c:262
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3270
-msgid "# SET_KEY and PING messages created"
+#: src/hostlist/gnunet-daemon-hostlist.c:315
+msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3349
-#, c-format
+#: src/hostlist/gnunet-daemon-hostlist.c:320
 msgid ""
-"Ignoring `%s' message due to lack of public key for peer `%4s' (failed to "
-"obtain one).\n"
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3444
-msgid "# PING messages decrypted"
+#: src/hostlist/gnunet-daemon-hostlist.c:323
+msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3456
-#, c-format
-msgid ""
-"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
-"%s'\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:327
+msgid "provide a hostlist server"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3481
-msgid "# PONG messages created"
+#: src/hostlist/gnunet-daemon-hostlist.c:339
+msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3534
-msgid "# PONG messages decrypted"
+#: src/hostlist/hostlist-server.c:134
+msgid "bytes in hostlist"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3572
-msgid "# Session keys confirmed via PONG"
+#: src/hostlist/hostlist-server.c:157
+msgid "expired addresses encountered"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3706
-#, c-format
-msgid "Received `%s' message that was for `%s', not for me.  Ignoring.\n"
+#: src/hostlist/hostlist-server.c:205
+msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3748
-msgid "# SET_KEY messages decrypted"
+#: src/hostlist/hostlist-server.c:221
+msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3894
+#: src/hostlist/hostlist-server.c:269
 #, c-format
-msgid "# bytes of messages of type %u received"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:3941
-msgid "# messages not delivered to any client"
+msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4011 src/core/gnunet-service-core.c:4036
-msgid "# bytes dropped (duplicates)"
+#: src/hostlist/hostlist-server.c:272
+msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4023
-msgid "# bytes dropped (out of sequence)"
+#: src/hostlist/hostlist-server.c:280
+msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4060
+#: src/hostlist/hostlist-server.c:287
 #, c-format
-msgid "Message received far too old (%llu ms). Content ignored.\n"
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4064
-msgid "# bytes dropped (ancient message)"
+#: src/hostlist/hostlist-server.c:291
+msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4094
-msgid "# bytes of payload decrypted"
+#: src/hostlist/hostlist-server.c:299
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4157
-msgid "# session keys received"
+#: src/hostlist/hostlist-server.c:302
+msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4173
-msgid "# failed to decrypt message (no session key)"
+#: src/hostlist/hostlist-server.c:306
+msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4229
-#, c-format
-msgid "Unsupported message of type %u received.\n"
+#: src/hostlist/hostlist-server.c:307
+msgid "hostlist requests processed"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4403 src/core/gnunet-service-core.c:4485
-msgid "# peers connected (transport)"
+#: src/hostlist/hostlist-server.c:350
+msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4599
-msgid "Core service is lacking key configuration settings.  Exiting.\n"
+#: src/hostlist/hostlist-server.c:397
+msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4617
-msgid "Core service could not access hostkey.  Exiting.\n"
+#: src/hostlist/hostlist-server.c:565
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4656
+#: src/hostlist/hostlist-server.c:574
 #, c-format
-msgid "Core service of `%4s' ready.\n"
+msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/core/core_api.c:832
-msgid "Client was disconnected from core service, trying to reconnect.\n"
+#: src/hostlist/hostlist-server.c:588
+#, c-format
+msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:296 src/include/gnunet_common.h:301
-#: src/include/gnunet_common.h:307
+#: src/hostlist/hostlist-server.c:626
 #, c-format
-msgid "Assertion failed at %s:%d.\n"
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:317
+#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#, fuzzy, c-format
+msgid "Could not find option `%s:%s' in configuration.\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:223
 #, c-format
-msgid "External protocol violation detected at %s:%d.\n"
+msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:331
+#: src/peerinfo-tool/gnunet-peerinfo.c:235
 #, c-format
-msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
+msgid "I am peer `%s'.\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:255
+msgid "output only the identity strings"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+msgid "output our own identity only"
 msgstr ""
 
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#, fuzzy
+msgid "Print information about peers."
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
 #: src/include/gnunet_getopt_lib.h:144
 msgid "print this help"
 msgstr ""
@@ -4798,6 +4505,98 @@ msgstr ""
 msgid "use configuration file FILENAME"
 msgstr ""
 
+#: src/include/gnunet_common.h:366 src/include/gnunet_common.h:371
+#: src/include/gnunet_common.h:377
+#, c-format
+msgid "Assertion failed at %s:%d.\n"
+msgstr ""
+
+#: src/include/gnunet_common.h:387
+#, c-format
+msgid "External protocol violation detected at %s:%d.\n"
+msgstr ""
+
+#: src/include/gnunet_common.h:408 src/include/gnunet_common.h:415
+#, c-format
+msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
+msgstr ""
+
+#~ msgid "KiB"
+#~ msgstr "KiB"
+
+#~ msgid "MiB"
+#~ msgstr "MiB"
+
+#~ msgid "GiB"
+#~ msgstr "GiB"
+
+#~ msgid "TiB"
+#~ msgstr "TiB"
+
+#, fuzzy
+#~ msgid "Copying file with command cp %s %s\n"
+#~ msgstr "“%s”以错误码 %s 失败：%s\n"
+
+#, fuzzy
+#~ msgid "Could not create configuration for peer number %u on `%s'!\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `ssh' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to start `ssh' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "`Failed to get hostkey!\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to write new configuration to disk."
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Failed to copy new configuration to remote machine."
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Failed to connect to core service of first peer!\n"
+#~ msgstr "加载 sqstore 服务失败。检查您的配置！\n"
+
+#, fuzzy
+#~ msgid "Could not resolve our FQDN : %s %u\n"
+#~ msgstr "无法解析“%s”(%s)：%s\n"
+
+#, fuzzy
+#~ msgid "Failed to start daemon: %s\n"
+#~ msgstr "运行 %s失败：%s %d\n"
+
+#, fuzzy
+#~ msgid "Failed to load dhtlog plugin for `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Failed to get full path for `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Failed to create file for dhtlog.\n"
+#~ msgstr "无法为守护程序创建用户账户。"
+
+#, fuzzy
+#~ msgid "Found peer `%s'\n"
+#~ msgstr "未知的用户“%s”\n"
+
+#, fuzzy
+#~ msgid "Phase 3: sending messages\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Fail! Could not connect peers\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
+
 #, fuzzy
 #~ msgid "Failed to connect to core service\n"
 #~ msgstr "初始化“%s”服务失败。\n"
@@ -5462,9 +5261,6 @@ msgstr ""
 #~ msgid "Unsupported command `%s'.  Aborting.\n"
 #~ msgstr "未知的命令“%s”。\n"
 
-#~ msgid "Could not determine UI definition filename."
-#~ msgstr "无法确定用户界面定义文件。"
-
 #~ msgid ""
 #~ "OS tells us about very large message (%u bytes) pending on UDP socket, "
 #~ "truncating at 64k\n"