-updating PO files

1 files changed, 3431 insertions, 2441 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 00eada69d..c8a3da5e6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-01-07 20:53+0100\n"
+"POT-Creation-Date: 2012-02-24 16:13+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,374 +16,524 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: 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/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 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:458
-#: src/include/gnunet_common.h:465
+#: src/arm/arm_api.c:187
+msgid "Failed to transmit shutdown request to client.\n"
+msgstr ""
+
+#: src/arm/arm_api.c:378
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "“%s�于 %s:%d 处失败，错误为：%s\n"
+msgid "Configuration failes to specify option `%s' in section `%s'!\n"
+msgstr "�置�满足�置规范文件“%s�的约��\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/arm/arm_api.c:392
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%u with error: %s"
-msgstr "“%s�于 %s:%d 处失败，错误为：%s\n"
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "�置�满足�置规范文件“%s�的约��\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/arm/arm_api.c:465
 #, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
+msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/arm/arm_api.c:521
 #, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "无法�始化 SQLite：%s。\n"
-
-#: 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"
+msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:671
-#, fuzzy
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "%s 中有无效数�。请�试修�(删除之)。\n"
+#: src/arm/arm_api.c:522
+#, c-format
+msgid "Requesting termination of service `%s'.\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1161
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/arm/arm_api.c:544
+#, c-format
+msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1180
+#: src/arm/arm_api.c:546
 #, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1220
-#, fuzzy
-msgid "Sqlite database running\n"
-msgstr "sqlite 数�仓库"
+#: src/arm/arm_api.c:579
+#, c-format
+msgid "Asked to start service `%s' within %llu ms\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:316
-#: src/datacache/plugin_datacache_mysql.c:224
+#: src/arm/arm_api.c:652
 #, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:322
-#: src/datacache/plugin_datacache_mysql.c:230
+#: src/arm/gnunet-arm.c:149
 #, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "无法解�“%s�(%s)：%s\n"
+msgid "Service `%s' is unknown to ARM.\n"
+msgstr "�务已删除。\n"
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/arm/gnunet-arm.c:154
 #, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
-msgstr "解��置文件“%s�失败\n"
+msgid "Service `%s' has been stopped.\n"
+msgstr "�务已删除。\n"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/arm/gnunet-arm.c:157
 #, fuzzy, c-format
-msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
-msgstr "“%s�于 %s:%d 处失败，错误为：%s\n"
+msgid "Service `%s' was already running.\n"
+msgstr "�务已删除。\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1581
-msgid "Mysql database running\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:162
+#, fuzzy, c-format
+msgid "Service `%s' has been started.\n"
+msgstr "�务已删除。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:93
-#: src/datacache/plugin_datacache_postgres.c:79
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "“%s�于 %s:%d 处失败，错误为：%s\n"
+msgid "Service `%s' was already being stopped.\n"
+msgstr "�务已删除。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:173
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "无法�存�置文件“%s�："
+msgid "Service `%s' was already not running.\n"
+msgstr "�务已删除。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1017
-msgid "Postgres database running\n"
+#: src/arm/gnunet-arm.c:173
+msgid "Request ignored as ARM is shutting down.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:289
-msgid "Failed to transmit request to drop database.\n"
+#: src/arm/gnunet-arm.c:177
+msgid "Error communicating with ARM service.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:372
-msgid "# queue entry timeouts"
+#: src/arm/gnunet-arm.c:181
+msgid "Timeout communicating with ARM service.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:418
-msgid "# queue overflows"
+#: src/arm/gnunet-arm.c:185
+msgid "Operation failed.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:445
-msgid "# queue entries created"
+#: src/arm/gnunet-arm.c:189
+msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
-msgid "# Requests dropped from datastore queue"
+#: src/arm/gnunet-arm.c:216
+#, c-format
+msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:513
-msgid "# datastore connections (re)created"
+#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:540
-msgid "# reconnected to DATASTORE"
-msgstr ""
+#: src/arm/gnunet-arm.c:247
+#, fuzzy, c-format
+msgid "Failed to remove configuration file %s\n"
+msgstr "解��置文件“%s�失败\n"
 
-#: src/datastore/datastore_api.c:608
-msgid "# transmission request failures"
+#: src/arm/gnunet-arm.c:253
+#, c-format
+msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:631
-msgid "# bytes sent to datastore"
-msgstr ""
+#: src/arm/gnunet-arm.c:355
+#, fuzzy
+msgid "stop all GNUnet services"
+msgstr "�载 GNUnet �务"
 
-#: src/datastore/datastore_api.c:772
-msgid "Failed to receive status response from database."
+#: src/arm/gnunet-arm.c:357
+msgid "start a particular service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:786
-msgid "Error reading response from datastore service"
+#: src/arm/gnunet-arm.c:359
+msgid "stop a particular service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
-msgid "Invalid error message received from datastore service"
-msgstr ""
+#: src/arm/gnunet-arm.c:361
+#, fuzzy
+msgid "start all GNUnet default services"
+msgstr "�载 GNUnet �务"
 
-#: src/datastore/datastore_api.c:810
-msgid "# status messages received"
-msgstr ""
+#: src/arm/gnunet-arm.c:364
+#, fuzzy
+msgid "stop and start all GNUnet default services"
+msgstr "�载 GNUnet �务"
 
-#: src/datastore/datastore_api.c:883
-msgid "# PUT requests executed"
+#: src/arm/gnunet-arm.c:367
+msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/datastore/datastore_api.c:954
-msgid "# RESERVE requests executed"
+#: src/arm/gnunet-arm.c:369
+msgid "don't print status messages"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1019
-msgid "# RELEASE RESERVE requests executed"
-msgstr ""
+#: src/arm/gnunet-arm.c:372
+#, fuzzy
+msgid "timeout for completing current operation"
+msgstr "等待一次迭代完�的时间(毫秒)"
 
-#: src/datastore/datastore_api.c:1080
-msgid "# UPDATE requests executed"
+#: src/arm/gnunet-arm.c:383
+msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1148
-msgid "# REMOVE requests executed"
+#: src/arm/gnunet-service-arm.c:321
+#, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "解��置文件“%s�失败\n"
+
+#: src/arm/gnunet-service-arm.c:324
+#, c-format
+msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1193
-msgid "Failed to receive response from database.\n"
+#: src/arm/gnunet-service-arm.c:350
+msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1253
-msgid "# Results received"
+#: src/arm/gnunet-service-arm.c:477
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "无法创建用户账户："
+
+#: src/arm/gnunet-service-arm.c:499
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1324
-msgid "# GET REPLICATION requests executed"
+#: src/arm/gnunet-service-arm.c:513
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1391
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/arm/gnunet-service-arm.c:621
+#, c-format
+msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1455
-msgid "# GET requests executed"
+#: src/arm/gnunet-service-arm.c:775
+#, c-format
+msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:241
-msgid "Template database running\n"
+#: src/arm/gnunet-service-arm.c:870
+msgid "exit"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:351
-msgid "# bytes expired"
+#: src/arm/gnunet-service-arm.c:875
+msgid "signal"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:426
-msgid "# bytes purged (low-priority)"
+#: src/arm/gnunet-service-arm.c:880
+#, fuzzy
+msgid "unknown"
+msgstr "未知错误"
+
+#: src/arm/gnunet-service-arm.c:914
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:486
-msgid "Transmission to client failed!\n"
+#: src/arm/gnunet-service-arm.c:960 src/arm/mockup-service.c:41
+msgid "Failed to transmit shutdown ACK.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:640
-msgid "# results found"
+#: src/arm/gnunet-service-arm.c:1060
+#, fuzzy, c-format
+msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+msgstr "�置文件“%s�已写入。\n"
+
+#: src/arm/gnunet-service-arm.c:1062
+msgid "option missing"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:685
+#: src/arm/gnunet-service-arm.c:1139
+#, fuzzy, c-format
+msgid "Starting default services `%s'\n"
+msgstr "�载 GNUnet �务"
+
+#: src/arm/gnunet-service-arm.c:1150
 #, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
-#, c-format
+#: src/arm/gnunet-service-arm.c:1164
 msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+"No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:700
-msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+#: src/arm/mockup-service.c:46
+msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:706
-msgid "Insufficient space to satisfy request"
+#: src/arm/mockup-service.c:69
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
-msgid "# reserved"
+#: src/block/block.c:105
+#, fuzzy, c-format
+msgid "Loading block plugin `%s'\n"
+msgstr "打开日志文件“%s�失败：%s\n"
+
+#: src/chat/chat.c:175
+msgid "Could not transmit confirmation receipt\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:780
-msgid "Could not find matching reservation"
+#: src/chat/chat.c:283
+msgid "The current user must be the the first one joined\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:854 src/datacache/datacache.c:118
-#: src/datacache/datacache.c:255
-msgid "# bytes stored"
+#: src/chat/chat.c:412
+#, fuzzy, c-format
+msgid "Unknown message type: '%u'\n"
+msgstr "未知�作“%s�。\n"
+
+#: src/chat/chat.c:472
+#, fuzzy, c-format
+msgid "Configuration option `%s' in section `%s' missing\n"
+msgstr "�置文件“%s�已写入。\n"
+
+#: src/chat/chat.c:480
+#, fuzzy, c-format
+msgid "Failed to access chat home directory `%s'\n"
+msgstr "解��置文件“%s�失败\n"
+
+#: src/chat/chat.c:498
+#, fuzzy, c-format
+msgid "Failed to create/open key in file `%s'\n"
+msgstr "打开日志文件“%s�失败：%s\n"
+
+#: src/chat/chat.c:559
+msgid "Could not serialize metadata\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:868
-#, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
+#: src/chat/chat.c:674
+#, fuzzy
+msgid "Failed to connect to the chat service\n"
+msgstr "�始化“%s��务失败。\n"
+
+#: src/chat/chat.c:680
+msgid "Undefined mandatory parameter: joinCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1034
-msgid "# GET requests received"
+#: src/chat/chat.c:686
+msgid "Undefined mandatory parameter: messageCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1048
-msgid "# requests filtered by bloomfilter"
+#: src/chat/chat.c:692
+msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1076
-msgid "# UPDATE requests received"
+#: src/chat/gnunet-chat.c:92
+msgid "Joined\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1110
-msgid "# GET REPLICATION requests received"
+#: src/chat/gnunet-chat.c:124
+msgid "anonymous"
+msgstr "匿�"
+
+#: src/chat/gnunet-chat.c:130
+#, fuzzy, c-format
+msgid "(%s) `%s' said: %s\n"
+msgstr "“%s�说：%s\n"
+
+#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#, fuzzy, c-format
+msgid "(%s) `%s' said to you: %s\n"
+msgstr "“%s�对您说：%s\n"
+
+#: src/chat/gnunet-chat.c:139
+#, fuzzy, c-format
+msgid "(%s) `%s' said for sure: %s\n"
+msgstr "“%s�对您说：%s\n"
+
+#: src/chat/gnunet-chat.c:142
+#, fuzzy, c-format
+msgid "(%s) `%s' said to you for sure: %s\n"
+msgstr "“%s�对您说：%s\n"
+
+#: src/chat/gnunet-chat.c:145
+#, c-format
+msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1145
-msgid "# GET ZERO ANONYMITY requests received"
+#: src/chat/gnunet-chat.c:148
+#, c-format
+msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1172
-msgid "Content not found"
+#: src/chat/gnunet-chat.c:151
+#, c-format
+msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1182
-msgid "# bytes removed (explicit request)"
+#: src/chat/gnunet-chat.c:156
+#, c-format
+msgid ""
+"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
-msgid "# REMOVE requests received"
+#: src/chat/gnunet-chat.c:159
+#, fuzzy, c-format
+msgid "(%s) `%s' said off the record: %s\n"
+msgstr "“%s�对您说：%s\n"
+
+#: src/chat/gnunet-chat.c:162
+#, c-format
+msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/chat/gnunet-chat.c:193
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/chat/gnunet-chat.c:224
 #, c-format
-msgid "Loading `%s' datastore plugin\n"
+msgid "`%s' entered the room\n"
+msgstr "“%s�进入了房间\n"
+
+#: src/chat/gnunet-chat.c:224
+#, c-format
+msgid "`%s' left the room\n"
+msgstr "“%s�离开了房间\n"
+
+#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#, fuzzy
+msgid "Could not change username\n"
+msgstr "已将用户�改为“%s�。\n"
+
+#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#, c-format
+msgid "Joining room `%s' as user `%s'...\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/chat/gnunet-chat.c:320
 #, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "解��置文件“%s�失败\n"
+msgid "Changed username to `%s'\n"
+msgstr "已将用户�改为“%s�。\n"
 
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542 src/datacache/datacache.c:144
-#: src/datacache/datacache.c:151
+#: src/chat/gnunet-chat.c:333
 #, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
-msgstr ""
+msgid "Users in room `%s': "
+msgstr "房间“%s�中的用户："
 
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/chat/gnunet-chat.c:371
+msgid "Syntax: /msg USERNAME MESSAGE"
+msgstr "语法：/msg 用户� 消�"
+
+#: src/chat/gnunet-chat.c:379
 #, c-format
-msgid "# bytes used in file-sharing datastore `%s'"
+msgid "Unknown user `%s'\n"
+msgstr "未知的用户“%s�\n"
+
+#: src/chat/gnunet-chat.c:395
+#, c-format
+msgid "User `%s' is currently not in the room!\n"
+msgstr "用户“%s�当��在房间里�\n"
+
+#: src/chat/gnunet-chat.c:448
+#, fuzzy, c-format
+msgid "Unknown command `%s'\n"
+msgstr "未知的命令“%s�。\n"
+
+#: src/chat/gnunet-chat.c:459
+msgid ""
+"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
+"leave the current room"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1547
-msgid "# quota"
+#: src/chat/gnunet-chat.c:463
+msgid ""
+"Use `/nick nickname' to change your nickname.  This will cause you to leave "
+"the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1549
-msgid "# cache size"
+#: src/chat/gnunet-chat.c:467
+msgid ""
+"Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1562
-#, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+#: src/chat/gnunet-chat.c:470
+msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
-#, fuzzy, c-format
-msgid "Failed to remove bogus bloomfilter file `%s'\n"
-msgstr "解��置文件“%s�失败\n"
+#: src/chat/gnunet-chat.c:472
+msgid "The `/query' command is an alias for `/msg'"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1626
-#, fuzzy
-msgid "Failed to initialize bloomfilter.\n"
-msgstr "�始化“%s��务失败。\n"
+#: src/chat/gnunet-chat.c:474
+msgid "Use `/sig message' to send a signed public message"
+msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1655
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
+#: src/chat/gnunet-chat.c:477
+msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1660
-msgid "Plugin does not support get_keys function. Please fix!\n"
+#: src/chat/gnunet-chat.c:480
+msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1663
-msgid "Bloomfilter construction complete.\n"
+#: src/chat/gnunet-chat.c:482
+msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
+#: src/chat/gnunet-chat.c:484
+msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:238
-msgid "# type map refreshes sent"
+#: src/chat/gnunet-chat.c:486
+msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:414
-msgid "# messages discarded (expired prior to transmission)"
+#: src/chat/gnunet-chat.c:489
+msgid "Use `/names' to list all of the current members in the chat room"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:491
+msgid "Use `/help command' to get help for a specific command"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:606
+msgid "You must specify a nickname\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/chat/gnunet-chat.c:622
+#, c-format
+msgid "Failed to join room `%s'\n"
+msgstr ""
+
+#: src/chat/gnunet-chat.c:655
+msgid "set the nickname to use (required)"
+msgstr "设置�使用的昵称(必须)"
+
+#: src/chat/gnunet-chat.c:658
+msgid "set the chat room to join"
+msgstr "设置�加入的�天室"
+
+#: src/chat/gnunet-chat.c:670
+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/core/core_api.c:798
+msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
 #: src/core/gnunet-core-list-connections.c:77
@@ -407,6 +557,11 @@ msgstr ""
 msgid "Print information about connected peers."
 msgstr ""
 
+#: src/core/gnunet-service-core.c:99
+#, c-format
+msgid "Core service of `%4s' ready.\n"
+msgstr ""
+
 #: src/core/gnunet-service-core_clients.c:360
 msgid "# send requests dropped (disconnected)"
 msgstr ""
@@ -420,38 +575,6 @@ msgstr ""
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:99
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
-msgid "# type maps received"
-msgstr ""
-
-#: src/core/gnunet-service-core_typemap.c:151
-msgid "# updates to my type map"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:163
-msgid "# sessions terminated by transport disconnect"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:343
-msgid "# neighbour entries allocated"
-msgstr ""
-
-#: src/core/gnunet-service-core_neighbours.c:252
-msgid "# encrypted bytes given to transport"
-msgstr ""
-
-#: 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/core/gnunet-service-core_kx.c:493
 msgid "# bytes encrypted"
 msgstr ""
@@ -491,7 +614,7 @@ msgid "# SET_KEY messages decrypted"
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:880
-#: src/transport/gnunet-service-transport_validation.c:780
+#: src/transport/gnunet-service-transport_validation.c:803
 msgid "# PING messages received"
 msgstr ""
 
@@ -515,7 +638,7 @@ msgid "# keepalive messages sent"
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1092
-#: src/transport/gnunet-service-transport_validation.c:985
+#: src/transport/gnunet-service-transport_validation.c:1026
 msgid "# PONG messages received"
 msgstr ""
 
@@ -566,787 +689,615 @@ msgstr "立��存�置？"
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1541
-#: src/transport/gnunet-service-transport.c:578
-#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/core/gnunet-service-core_kx.c:1541 src/hostlist/hostlist-server.c:555
+#: src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/transport/gnunet-service-transport.c:595
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/core/core_api.c:798
-msgid "Client was disconnected from core service, trying to reconnect.\n"
+#: src/core/gnunet-service-core_neighbours.c:163
+msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-exit.c:1496
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/core/gnunet-service-core_neighbours.c:180
+#: src/core/gnunet-service-core_neighbours.c:342
+msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1804
-msgid "help text"
+#: src/core/gnunet-service-core_neighbours.c:251
+msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/util/getopt_helpers.c:84
+#: src/core/gnunet-service-core_neighbours.c:430
 #, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr "长选项的必选�数对短选项也是必选的。\n"
-
-#: 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/util/common_logging.c:239 src/util/common_logging.c:890
-msgid "DEBUG"
-msgstr "调试"
-
-#: src/util/common_logging.c:241 src/util/common_logging.c:888
-msgid "INFO"
-msgstr "信�"
-
-#: src/util/common_logging.c:243 src/util/common_logging.c:886
-msgid "WARNING"
-msgstr "警告"
-
-#: src/util/common_logging.c:245 src/util/common_logging.c:884
-msgid "ERROR"
-msgstr "错误"
-
-#: src/util/common_logging.c:247 src/util/common_logging.c:892
-msgid "NONE"
+msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:610
-#, fuzzy, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "解��置文件“%s�失败\n"
-
-#: src/util/common_logging.c:725
-#, fuzzy, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
-msgstr "消�“%.*s���了 %u 次，在最近 %llu 秒内\n"
-
-#: src/util/common_logging.c:893
-msgid "INVALID"
+#: src/core/gnunet-service-core_sessions.c:208
+#: src/core/gnunet-service-core_sessions.c:273
+msgid "# entries in session map"
 msgstr ""
 
-#: src/util/common_logging.c:975
-msgid "unknown address"
+#: src/core/gnunet-service-core_sessions.c:238
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/util/common_logging.c:1013
-msgid "invalid address"
+#: src/core/gnunet-service-core_sessions.c:414
+msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/util/plugin.c:89
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "�件机构�始化失败：%s�\n"
-
-#: src/util/plugin.c:146
-#, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
+#: src/core/gnunet-service-core_typemap.c:110
+#: src/core/gnunet-service-core_typemap.c:121
+msgid "# type maps received"
 msgstr ""
 
-#: src/util/plugin.c:219
-#, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
+#: src/core/gnunet-service-core_typemap.c:151
+msgid "# updates to my type map"
 msgstr ""
 
-#: src/util/plugin.c:349
-#, fuzzy
-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/util/configuration.c:817
-#, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
+#: src/datastore/gnunet-service-datastore.c:854
+msgid "# bytes stored"
 msgstr ""
 
-#: src/util/getopt.c:672
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s：选项“%s�有歧义\n"
-
-#: src/util/getopt.c:696
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s：选项“--%s���许有�数\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/util/getopt.c:718 src/util/getopt.c:886
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s：选项“%s��求有一个�数\n"
-
-#: src/util/getopt.c:747
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s：无法识别的选项“--%s�\n"
-
-#: src/util/getopt.c:751
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s：无法识别的选项“%c%s�\n"
-
-#: src/util/getopt.c:776
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s：�法选项 -- %c\n"
-
-#: src/util/getopt.c:778
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s：无效选项 -- %c\n"
-
-#: src/util/getopt.c:806 src/util/getopt.c:934
+#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
+#: src/datastore/gnunet-service-datastore.c:1531
+#: src/datastore/gnunet-service-datastore.c:1542
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s：选项�求有一个�数 -- %c\n"
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr ""
 
-#: src/util/getopt.c:854
+#: src/datacache/datacache.c:183
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s：选项“-W %s�有歧义\n"
+msgid "Loading `%s' datacache plugin\n"
+msgstr ""
 
-#: src/util/getopt.c:872
+#: src/datacache/datacache.c:191
 #, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s：选项“-W %s� ��许有�数\n"
-
-#: src/util/getopt.c:1038
-#, fuzzy, c-format
-msgid "Use %s to get a list of options.\n"
-msgstr "请使用 --help 获�选项列表。\n"
+msgid "Failed to load datacache plugin for `%s'\n"
+msgstr ""
 
-#: src/util/scheduler.c:870
-msgid "Looks like we're busy waiting...\n"
+#: src/datacache/datacache.c:281
+msgid "# requests received"
 msgstr ""
 
-#: src/util/scheduler.c:1000
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
+#: src/datacache/datacache.c:291
+msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/util/connection.c:461
+#: src/datacache/plugin_datacache_mysql.c:103
+#: src/datacache/plugin_datacache_mysql.c:110
+#: src/datacache/plugin_datacache_mysql.c:517
+#: src/datacache/plugin_datacache_mysql.c:526
+#: src/datacache/plugin_datacache_mysql.c:598
+#: src/datacache/plugin_datacache_mysql.c:614
+#: src/datacache/plugin_datacache_sqlite.c:71
+#: src/datacache/plugin_datacache_sqlite.c:74
+#: src/datastore/plugin_datastore_mysql.c:139
+#: src/datastore/plugin_datastore_mysql.c:146
+#: src/datastore/plugin_datastore_mysql.c:613
+#: src/datastore/plugin_datastore_mysql.c:673
+#: src/datastore/plugin_datastore_mysql.c:685
+#: src/datastore/plugin_datastore_mysql.c:1362
+#: src/datastore/plugin_datastore_mysql.c:1376
+#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
+#: src/include/gnunet_common.h:514
 #, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "“%s�已连接到“%s�。\n"
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "“%s�于 %s:%d 处失败，错误为：%s\n"
 
-#: src/util/connection.c:476
+#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_mysql.c:316
 #, c-format
-msgid "Accepting connection from `%s': %p\n"
+msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/util/connection.c:642
-#, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
+#: src/datacache/plugin_datacache_mysql.c:230
+#: src/datastore/plugin_datastore_mysql.c:322
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "无法解�“%s�(%s)：%s\n"
+
+#: src/datacache/plugin_datacache_mysql.c:979
+msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:852 src/util/connection.c:1025
+#: src/datacache/plugin_datacache_postgres.c:79
+#: src/datastore/plugin_datastore_postgres.c:93
 #, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "无法连接到 %s:%u：%s\n"
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "“%s�于 %s:%d 处失败，错误为：%s\n"
 
-#: src/util/connection.c:862
+#: src/datacache/plugin_datacache_postgres.c:149
 #, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "无法连接到 %s:%u：%s\n"
+msgid "Unable to initialize Postgres: %s"
+msgstr "无法�始化 SQLite：%s。\n"
 
-#: src/util/connection.c:1015
-#, c-format
-msgid "Attempt to connect to `%s' failed\n"
+#: src/datacache/plugin_datacache_postgres.c:499
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:1528
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
+#: src/datacache/plugin_datacache_sqlite.c:424
+msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/util/connection.c:1564
-#, fuzzy, c-format
-msgid "Failed to send to `%s': %s\n"
-msgstr "打开日志文件“%s�失败：%s\n"
-
-#: src/util/signal.c:80
-#, c-format
-msgid "signal (%d, %p) returned %d.\n"
+#: src/datacache/plugin_datacache_sqlite.c:457
+#: src/datastore/plugin_datastore_sqlite.c:414
+#: src/namestore/plugin_namestore_sqlite.c:381
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/util/network.c:1204
-#, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+#: src/datacache/plugin_datacache_template.c:121
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/util/os_installation.c:299
-#, fuzzy, c-format
-msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
-msgstr "无法确定安装路径。请�试设置“%s�\n"
-
-#: src/util/os_installation.c:486
-#, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "找�到主机“%s�的 IP：%s\n"
-
-#: src/util/os_installation.c:492
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "“%s�说：%s\n"
-
-#: src/util/strings.c:143
-msgid "b"
-msgstr "b"
-
-#: src/util/strings.c:354
-#, c-format
-msgid "Character sets requested were `%s'->`%s'\n"
+#: src/datastore/datastore_api.c:289
+msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/util/strings.c:462
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr "扩展“$HOME�失败：没有设置环境��“HOME�"
+#: src/datastore/datastore_api.c:372
+msgid "# queue entry timeouts"
+msgstr ""
 
-#: src/util/strings.c:554
-msgid "ms"
-msgstr "毫秒"
+#: src/datastore/datastore_api.c:418
+msgid "# queue overflows"
+msgstr ""
 
-#: src/util/strings.c:559
-msgid "eternity"
+#: src/datastore/datastore_api.c:445
+msgid "# queue entries created"
 msgstr ""
 
-#: src/util/strings.c:563
-msgid "s"
-msgstr "秒"
+#: src/datastore/datastore_api.c:465
+msgid "# Requests dropped from datastore queue"
+msgstr ""
 
-#: src/util/strings.c:567
-msgid "m"
-msgstr "分"
+#: src/datastore/datastore_api.c:513
+msgid "# datastore connections (re)created"
+msgstr ""
 
-#: src/util/strings.c:571
-msgid "h"
-msgstr "æ—¶"
+#: src/datastore/datastore_api.c:540
+msgid "# reconnected to DATASTORE"
+msgstr ""
 
-#: src/util/strings.c:575
-msgid " days"
-msgstr " 天"
+#: src/datastore/datastore_api.c:608
+msgid "# transmission request failures"
+msgstr ""
 
-#: src/util/strings.c:599
-msgid "end of time"
+#: src/datastore/datastore_api.c:631
+msgid "# bytes sent to datastore"
 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/datastore/datastore_api.c:772
+msgid "Failed to receive status response from database."
+msgstr ""
 
-#: src/util/server.c:397
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
+#: src/datastore/datastore_api.c:786
+msgid "Error reading response from datastore service"
 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/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+msgid "Invalid error message received from datastore service"
+msgstr ""
 
-#: src/util/server.c:617
-#, c-format
-msgid ""
-"Processing code for message of type %u did not call "
-"GNUNET_SERVER_receive_done after %llums\n"
+#: src/datastore/datastore_api.c:810
+msgid "# status messages received"
 msgstr ""
 
-#: src/util/crypto_random.c:280
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
+#: src/datastore/datastore_api.c:883
+msgid "# PUT requests executed"
 msgstr ""
 
-#: src/util/crypto_random.c:308
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt 的版本�符�预期(�求版本 %s)。\n"
+#: src/datastore/datastore_api.c:954
+msgid "# RESERVE requests executed"
+msgstr ""
 
-#: src/util/disk.c:479
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%S': %u\n"
-msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
+#: src/datastore/datastore_api.c:1019
+msgid "# RELEASE RESERVE requests executed"
+msgstr ""
 
-#: src/util/disk.c:883
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "“%s�应为目录�\n"
+#: src/datastore/datastore_api.c:1080
+msgid "# UPDATE requests executed"
+msgstr ""
 
-#: src/util/disk.c:1235 src/util/service.c:1541
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "无法获�有关用户“%s�的信�：%s\n"
+#: src/datastore/datastore_api.c:1148
+msgid "# REMOVE requests executed"
+msgstr ""
 
-#: src/util/disk.c:1553
-#, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
+#: src/datastore/datastore_api.c:1193
+msgid "Failed to receive response from database.\n"
 msgstr ""
 
-#: 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 "Invalid format for IP: `%s'\n"
-msgstr "IP 格�无效：“%s�\n"
+#: src/datastore/datastore_api.c:1253
+msgid "# Results received"
+msgstr ""
 
-#: src/util/service.c:170
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "网络表示法无效(“/%d� 在 IPv4 CIDR 中是�法的)。"
+#: src/datastore/datastore_api.c:1324
+msgid "# GET REPLICATION requests executed"
+msgstr ""
 
-#: src/util/service.c:263
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "无效的网络表示法(没有以“;�结尾：“%s�)\n"
+#: src/datastore/datastore_api.c:1391
+msgid "# GET ZERO ANONYMITY requests executed"
+msgstr ""
 
-#: src/util/service.c:296
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "网络掩�的格�“%s�错误\n"
+#: src/datastore/datastore_api.c:1455
+msgid "# GET requests executed"
+msgstr ""
 
-#: src/util/service.c:326
-#, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "网络的格�“%s�错误\n"
+#: src/datastore/gnunet-service-datastore.c:351
+msgid "# bytes expired"
+msgstr ""
 
-#: src/util/service.c:629
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
+#: src/datastore/gnunet-service-datastore.c:426
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/util/service.c:634
-#, c-format
-msgid "Unknown address family %d\n"
+#: src/datastore/gnunet-service-datastore.c:486
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/util/service.c:641
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+#: src/datastore/gnunet-service-datastore.c:640
+msgid "# results found"
 msgstr ""
 
-#: src/util/service.c:685
+#: src/datastore/gnunet-service-datastore.c:685
 #, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/util/service.c:713
+#: src/datastore/gnunet-service-datastore.c:696
 #, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/service.c:830
-#, c-format
+#: src/datastore/gnunet-service-datastore.c:700
 msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:2228
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+#: src/datastore/gnunet-service-datastore.c:706
+msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/util/service.c:880 src/util/client.c:707
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+#: src/datastore/gnunet-service-datastore.c:711
+#: src/datastore/gnunet-service-datastore.c:765
+#: src/datastore/gnunet-service-datastore.c:986
+#: src/datastore/gnunet-service-datastore.c:1465
+msgid "# reserved"
 msgstr ""
 
-#: src/util/service.c:900
-#, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+#: src/datastore/gnunet-service-datastore.c:780
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/util/service.c:917
+#: src/datastore/gnunet-service-datastore.c:868
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/util/service.c:947 src/transport/plugin_transport_http.c:1057
-#, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
-msgstr "打开日志文件“%s�失败：%s\n"
-
-#: src/util/service.c:964 src/transport/plugin_transport_http.c:1074
-#, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "找�到接�“%s�的一个 IP 地�。\n"
-
-#: src/util/service.c:1152
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
+#: src/datastore/gnunet-service-datastore.c:1034
+msgid "# GET requests received"
 msgstr ""
 
-#: src/util/service.c:1203 src/util/service.c:1221
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
+#: src/datastore/gnunet-service-datastore.c:1048
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/util/service.c:1248
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+#: src/datastore/gnunet-service-datastore.c:1076
+msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/util/service.c:1403
-#, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "�行 %s失败：%s %d\n"
-
-#: src/util/service.c:1436
-#, c-format
-msgid "Service `%s' runs at %s\n"
+#: src/datastore/gnunet-service-datastore.c:1110
+msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/util/service.c:1482
-msgid "Service process failed to initialize\n"
+#: src/datastore/gnunet-service-datastore.c:1145
+msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/util/service.c:1486
-msgid "Service process could not initialize server function\n"
+#: src/datastore/gnunet-service-datastore.c:1172
+msgid "Content not found"
 msgstr ""
 
-#: src/util/service.c:1490
-msgid "Service process failed to report status\n"
+#: src/datastore/gnunet-service-datastore.c:1182
+msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/util/service.c:1542
-msgid "No such user"
-msgstr "无此用户"
+#: src/datastore/gnunet-service-datastore.c:1216
+msgid "# REMOVE requests received"
+msgstr ""
 
-#: src/util/service.c:1555
+#: src/datastore/gnunet-service-datastore.c:1260
 #, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "无法更改用户/组为“%s�：%s\n"
-
-#: src/util/service.c:1618
-msgid "do daemonize (detach from terminal)"
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:76
-msgid "Test GNUnet DNS resolver code."
+#: src/datastore/gnunet-service-datastore.c:1323
+#, c-format
+msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:507
+#: src/datastore/gnunet-service-datastore.c:1332
+#, fuzzy, c-format
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "解��置文件“%s�失败\n"
+
+#: src/datastore/gnunet-service-datastore.c:1536
 #, c-format
-msgid ""
-"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
-"%llu)\n"
+msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/util/os_priority.c:117
-#, c-format
-msgid "Not installing a handler because $%s=%s\n"
+#: src/datastore/gnunet-service-datastore.c:1547
+msgid "# quota"
 msgstr ""
 
-#: src/util/resolver_api.c:202
-#, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
+#: src/datastore/gnunet-service-datastore.c:1549
+msgid "# cache size"
 msgstr ""
 
-#: src/util/resolver_api.c:221
+#: src/datastore/gnunet-service-datastore.c:1562
 #, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:358
+#: src/datastore/gnunet-service-datastore.c:1580
+#: src/datastore/gnunet-service-datastore.c:1596
 #, fuzzy, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr "GNUnet 现在使用 IP 地� %s。\n"
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "解��置文件“%s�失败\n"
 
-#: src/util/resolver_api.c:362
-#, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:1626
+#, fuzzy
+msgid "Failed to initialize bloomfilter.\n"
+msgstr "�始化“%s��务失败。\n"
 
-#: src/util/resolver_api.c:430
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
+#: src/datastore/gnunet-service-datastore.c:1655
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:791
-#, c-format
-msgid "Resolver returns `%s'.\n"
+#: src/datastore/gnunet-service-datastore.c:1660
+msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:875
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
+#: src/datastore/gnunet-service-datastore.c:1663
+msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:880
+#: src/datastore/plugin_datastore_mysql.c:529
+#: src/datastore/plugin_datastore_mysql.c:1336
 #, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "无法解�“%s�(%s)：%s\n"
+msgid "Failed to prepare statement `%s'\n"
+msgstr "解��置文件“%s�失败\n"
 
-#: src/util/resolver_api.c:912
-#, c-format
-msgid "Resolving our hostname `%s'\n"
+#: src/datastore/plugin_datastore_mysql.c:622
+#: src/datastore/plugin_datastore_mysql.c:1346
+#, fuzzy, c-format
+msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
+msgstr "“%s�于 %s:%d 处失败，错误为：%s\n"
+
+#: src/datastore/plugin_datastore_mysql.c:1581
+msgid "Mysql database running\n"
 msgstr ""
 
-#: src/util/pseudonym.c:273
+#: src/datastore/plugin_datastore_postgres.c:173
 #, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "打开日志文件“%s�失败：%s\n"
-
-#: src/util/pseudonym.c:337
-msgid "no-name"
-msgstr "无�称"
+msgid "Unable to initialize Postgres with configuration `%s': %s"
+msgstr "无法�存�置文件“%s�："
 
-#: src/util/gnunet-service-resolver.c:261
-#, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "无法解�“%s�(%s)：%s\n"
+#: src/datastore/plugin_datastore_postgres.c:1017
+msgid "Postgres database running\n"
+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/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/util/gnunet-service-resolver.c:460
+#: src/datastore/plugin_datastore_sqlite.c:239
+#: src/namestore/plugin_namestore_sqlite.c:223
 #, c-format
-msgid "Resolver asked to look up `%s'.\n"
+msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:508
+#: src/datastore/plugin_datastore_sqlite.c:266
+#: src/namestore/plugin_namestore_sqlite.c:248
 #, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
-msgstr ""
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "无法�始化 SQLite：%s。\n"
 
-#: src/util/bio.c:136 src/util/bio.c:142
-#, fuzzy, c-format
-msgid "Error reading `%s': %s"
-msgstr "创建用户出错"
+#: src/datastore/plugin_datastore_sqlite.c:669
+#, fuzzy
+msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+msgstr "%s 中有无效数�。请�试修�(删除之)。\n"
 
-#: src/util/bio.c:143
-msgid "End of file"
+#: src/datastore/plugin_datastore_sqlite.c:1159
+msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/util/bio.c:195
+#: src/datastore/plugin_datastore_sqlite.c:1178
 #, c-format
-msgid "Error reading length of string `%s'"
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/bio.c:205
-#, c-format
-msgid "String `%s' longer than allowed (%u > %u)"
+#: src/datastore/plugin_datastore_sqlite.c:1218
+#: src/namestore/plugin_namestore_sqlite.c:779
+#, fuzzy
+msgid "Sqlite database running\n"
+msgstr "sqlite 数�仓库"
+
+#: src/datastore/plugin_datastore_template.c:241
+msgid "Template database running\n"
 msgstr ""
 
-#: src/util/bio.c:250
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+#: src/dht/dht_api.c:280
+#, fuzzy
+msgid "Failed to connect to the DHT service!\n"
+msgstr "�始化“%s��务失败。\n"
+
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
+#: src/gns/gnunet-gns-lookup.c:185
+msgid "the query key"
 msgstr ""
 
-#: src/util/bio.c:264
-#, c-format
-msgid "Metadata `%s' failed to deserialize"
+#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:188
+msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/util/client.c:301
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:191
+msgid "the type of data to look for"
 msgstr ""
 
-#: src/util/client.c:309
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
+#: src/gns/gnunet-gns-lookup.c:194
+msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/util/client.c:647
-msgid "Failure to transmit TEST request.\n"
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
+#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
+#: src/gns/gnunet-gns-lookup.c:197 src/nse/gnunet-nse-profiler.c:908
+msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/util/client.c:849
-#, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
+#: src/dht/gnunet-dht-get.c:232
+msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/util/client.c:865
-#, c-format
-msgid "Failure to transmit request to service `%s'\n"
+#: src/dht/gnunet-dht-put.c:100
+msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/util/client.c:1133
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/dht/gnunet-dht-put.c:124
+msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/dht/gnunet-dht-put.c:132
 #, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %s...\n"
-msgstr "无法解�“%s�(%s)：%s\n"
+msgid "Could not connect to %s service!\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/crypto_rsa.c:623
-#, fuzzy
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr "正在�动数�仓库转�(�能需�一段时间)。\n"
+#: src/dht/gnunet-dht-put.c:137
+#, fuzzy, c-format
+msgid "Connected to %s service!\n"
+msgstr "“%s�已连接到“%s�。\n"
 
-#: src/util/crypto_rsa.c:641
+#: src/dht/gnunet-dht-put.c:152
 #, c-format
-msgid "I am host `%s'.  Stored new private key in `%s'.\n"
-msgstr ""
-
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
-msgid "This may be ok if someone is currently generating a hostkey.\n"
+msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
-#, c-format
-msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+#: src/dht/gnunet-dht-put.c:166
+msgid "the data to insert under the key"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
-#, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+#: src/dht/gnunet-dht-put.c:169
+msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/util/crypto_rsa.c:738
-#, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
+#: src/dht/gnunet-dht-put.c:175
+msgid "how many replicas to create"
 msgstr ""
 
-#: src/util/crypto_rsa.c:959
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
+#: src/dht/gnunet-dht-put.c:178
+msgid "the type to insert data as"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:882 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:596
-#: src/fs/gnunet-download.c:263
-msgid "be verbose (print progress information)"
+#: src/dht/gnunet-dht-put.c:203
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:900
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:588
+#: src/testing/testing.c:2087 src/testing/testing.c:2121
 #, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "无法访问该�务"
+msgid "Failed to connect to transport service!\n"
+msgstr "�始化“%s��务失败。\n"
 
-#: src/nse/gnunet-service-nse.c:938
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
+#: src/dht/gnunet-service-dht_clients.c:371
+msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1393 src/nse/gnunet-service-nse.c:1412
-#: src/nse/gnunet-service-nse.c:1433
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+#: src/dht/gnunet-service-dht_clients.c:462
+msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1400
-msgid "Invalid work requirement for NSE service. Exiting.\n"
+#: src/dht/gnunet-service-dht_clients.c:529
+msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1421
-#, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "找�到接�“%s�的一个 IP 地�。\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:133
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
+#: src/dht/gnunet-service-dht_clients.c:624
+msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
-msgid "# peers known"
+#: src/dht/gnunet-service-dht_clients.c:854
+msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+#: src/dht/gnunet-service-dht_clients.c:869
+msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/dht/gnunet-service-dht_clients.c:906
 #, c-format
-msgid "Still no peers found in `%s'!\n"
+msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:258
-#, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "无法连接到 %s:%u：%s\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."
+#: src/dht/gnunet-service-dht_clients.c:928
+msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
-msgid "Received invalid message from `PEERINFO' service.\n"
+#: src/dht/gnunet-service-dht_clients.c:979
+#: src/dht/gnunet-service-dht_clients.c:1022
+msgid "# REPLIES ignored for CLIENTS (no match)"
 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"
+#: src/dht/gnunet-service-dht_clients.c:989
+msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:424
-msgid "Sqlite datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:93
+#, c-format
+msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/datacache/datacache.c:183
-#, c-format
-msgid "Loading `%s' datacache plugin\n"
+#: src/dht/gnunet-service-dht_datacache.c:103
+msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:191
-#, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
+#: src/dht/gnunet-service-dht_datacache.c:209
+msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:281
-msgid "# requests received"
+#: src/dht/gnunet-service-dht_datacache.c:220
+msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/datacache.c:291
-msgid "# requests filtered by bloom filter"
+#: src/dht/gnunet-service-dht_datacache.c:226
+msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "无法�始化 SQLite：%s。\n"
+#: src/dht/gnunet-service-dht_datacache.c:238
+msgid "# Unsupported RESULTS found in datacache"
+msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:500
-msgid "Postgres datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:241
+#, c-format
+msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:121
-msgid "Template datacache running\n"
+#: src/dht/gnunet-service-dht_datacache.c:271
+msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:979
-msgid "MySQL datacache running\n"
+#: src/dht/gnunet-service-dht_hello.c:82
+msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:481
@@ -1435,437 +1386,330 @@ msgstr ""
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/dht_api.c:282
-#, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "�始化“%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/dht/gnunet-dht-get.c:204
-msgid "how many parallel requests (replicas) to create"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:207
-msgid "the type of data to look for"
+#: src/dht/gnunet-service-dht_nse.c:59
+msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-msgid "how long to execute this query before giving up?"
+#: src/dht/gnunet-service-dht_routing.c:211
+msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:232
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/dht/gnunet-service-dht_routing.c:220
+msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:371
-msgid "# GET requests from clients injected"
+#: src/dht/gnunet-service-dht_routing.c:226
+msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:462
-msgid "# PUT requests received from clients"
+#: src/dht/gnunet-service-dht_routing.c:236
+msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:529
-msgid "# GET requests received from clients"
+#: src/dht/gnunet-service-dht_routing.c:314
+#: src/dht/gnunet-service-dht_routing.c:368
+msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:624
-msgid "# GET STOP requests received from clients"
+#: src/dht/gnunet-service-dht_routing.c:324
+msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:854
-msgid "# Key match, type mismatches in REPLY to CLIENT"
+#: src/dht/plugin_block_dht.c:124
+#, c-format
+msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:869
-msgid "# Duplicate REPLIES to CLIENT request dropped"
+#: src/dht/plugin_block_dht.c:131
+msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:906
+#: src/dht/plugin_block_dht.c:140
 #, c-format
-msgid "Unsupported block type (%u) in request!\n"
+msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:928
-msgid "# RESULTS queued for clients"
+#: src/dns/gnunet-dns-monitor.c:337
+msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
-msgid "# REPLIES ignored for CLIENTS (no match)"
+#: src/dns/gnunet-dns-monitor.c:340
+msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
-msgid "Could not pass reply to client, message too big!\n"
+#: src/dns/gnunet-dns-monitor.c:348
+msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59
-msgid "# Network size estimates received"
+#: src/dns/gnunet-dns-redirector.c:236
+msgid "set A records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:100
-msgid "PUT request sent!\n"
+#: src/dns/gnunet-dns-redirector.c:239
+msgid "set AAAA records"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
-msgid "Must provide KEY and DATA for DHT put!\n"
+#: src/dns/gnunet-dns-redirector.c:247
+msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/dns/gnunet-service-dns.c:480
 #, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/dht/gnunet-dht-put.c:137
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "“%s�已连接到“%s�。\n"
-
-#: src/dht/gnunet-dht-put.c:152
-#, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
-msgstr ""
+msgid "Could not bind to any port: %s\n"
+msgstr "找�到主机“%s�的 IP：%s\n"
 
-#: src/dht/gnunet-dht-put.c:166
-msgid "the data to insert under the key"
+#: src/dns/gnunet-service-dns.c:634
+msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/dns/gnunet-service-dns.c:818
+msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
-msgid "how many replicas to create"
+#: src/dns/gnunet-service-dns.c:1001
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:178
-msgid "the type to insert data as"
+#: src/dns/gnunet-service-dns.c:1046
+msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/dns/gnunet-service-dns.c:1165
+msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:211
-msgid "# Good REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1198
+msgid "Changing DNS reply according to client specifications\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Duplicate REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1279
+msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
-msgid "# Invalid REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1294
+msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Unsupported REPLIES matched against routing table"
+#: src/dns/gnunet-service-dns.c:1303
+#, c-format
+msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
-msgid "# Entries removed from routing table"
+#: src/dns/gnunet-service-dns.c:1312
+msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
-msgid "# Entries added to routing table"
+#: src/dns/gnunet-service-dns.c:1377
+msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:93
+#: src/dns/gnunet-service-dns.c:1461
 #, c-format
-msgid "%s request received, but have no datacache!\n"
+msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:103
-msgid "# ITEMS stored in datacache"
+#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2671
+msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
-msgid "# Good RESULTS found in datacache"
+#: src/dns/gnunet-service-dns.c:1567
+msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
-#: 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/dv/dv_api.c:179
+#, fuzzy
+msgid "Failed to connect to the dv service!\n"
+msgstr "�始化“%s��务失败。\n"
 
-#: src/dht/gnunet-service-dht_datacache.c:238
-msgid "# Unsupported RESULTS found in datacache"
+#: src/dv/plugin_transport_dv.c:159
+#, c-format
+msgid "%s Received message from %s of type %d, distance %u!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
+#: src/exit/gnunet-daemon-exit.c:508
 #, c-format
-msgid "Unsupported block type (%u) in local response!\n"
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:271
-msgid "# GET requests given to datacache"
+#: src/exit/gnunet-daemon-exit.c:563
+msgid "# Bytes transmitted via mesh tunnels"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:82
-msgid "# HELLOs obtained from peerinfo"
+#: src/exit/gnunet-daemon-exit.c:678 src/exit/gnunet-daemon-exit.c:2066
+#: src/exit/gnunet-daemon-exit.c:2316 src/vpn/gnunet-service-vpn.c:1388
+#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:149
-#, fuzzy, c-format
-msgid "Service `%s' is unknown to ARM.\n"
-msgstr "�务已删除。\n"
-
-#: src/arm/gnunet-arm.c:154
-#, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "�务已删除。\n"
-
-#: src/arm/gnunet-arm.c:157
-#, fuzzy, c-format
-msgid "Service `%s' was already running.\n"
-msgstr "�务已删除。\n"
-
-#: src/arm/gnunet-arm.c:162
-#, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "�务已删除。\n"
+#: src/exit/gnunet-daemon-exit.c:714 src/exit/gnunet-daemon-exit.c:2125
+#: src/exit/gnunet-daemon-exit.c:2375 src/vpn/gnunet-service-vpn.c:1444
+#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+msgid "# ICMPv6 packets dropped (type not allowed)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:165
-#, fuzzy, c-format
-msgid "Service `%s' was already being stopped.\n"
-msgstr "�务已删除。\n"
+#: src/exit/gnunet-daemon-exit.c:754
+msgid "# ICMP packets dropped (not allowed)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:169
-#, fuzzy, c-format
-msgid "Service `%s' was already not running.\n"
-msgstr "�务已删除。\n"
+#: src/exit/gnunet-daemon-exit.c:761
+msgid "ICMP Packet dropped, have no matching connection information\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:173
-msgid "Request ignored as ARM is shutting down.\n"
+#: src/exit/gnunet-daemon-exit.c:838
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:177
-msgid "Error communicating with ARM service.\n"
+#: src/exit/gnunet-daemon-exit.c:913
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:181
-msgid "Timeout communicating with ARM service.\n"
+#: src/exit/gnunet-daemon-exit.c:966
+msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:185
-msgid "Operation failed.\n"
+#: src/exit/gnunet-daemon-exit.c:980
+msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:189
-msgid "Unknown response code from ARM.\n"
+#: src/exit/gnunet-daemon-exit.c:1006
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/exit/gnunet-daemon-exit.c:1033
 #, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
-msgid "Fatal error initializing ARM API.\n"
+#: src/exit/gnunet-daemon-exit.c:1079
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
-#, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "解��置文件“%s�失败\n"
-
-#: src/arm/gnunet-arm.c:253
+#: src/exit/gnunet-daemon-exit.c:1087
 #, c-format
-msgid "Failed to remove servicehome directory %s\n"
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:355
-#, fuzzy
-msgid "stop all GNUnet services"
-msgstr "�载 GNUnet �务"
-
-#: src/arm/gnunet-arm.c:357
-msgid "start a particular service"
+#: src/exit/gnunet-daemon-exit.c:1468
+msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
-msgid "stop a particular service"
+#: src/exit/gnunet-daemon-exit.c:1568
+msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
-#, fuzzy
-msgid "start all GNUnet default services"
-msgstr "�载 GNUnet �务"
-
-#: src/arm/gnunet-arm.c:364
-#, fuzzy
-msgid "stop and start all GNUnet default services"
-msgstr "�载 GNUnet �务"
-
-#: src/arm/gnunet-arm.c:367
-msgid "delete config file and directory on exit"
+#: src/exit/gnunet-daemon-exit.c:1571 src/exit/gnunet-daemon-exit.c:1650
+#: src/exit/gnunet-daemon-exit.c:1760 src/exit/gnunet-daemon-exit.c:1990
+#: src/exit/gnunet-daemon-exit.c:2232 src/exit/gnunet-daemon-exit.c:2513
+#: src/exit/gnunet-daemon-exit.c:2613
+msgid "# Bytes received from MESH"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
-msgid "don't print status messages"
+#: src/exit/gnunet-daemon-exit.c:1604 src/exit/gnunet-daemon-exit.c:2635
+#, c-format
+msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
-#, fuzzy
-msgid "timeout for completing current operation"
-msgstr "等待一次迭代完�的时间(毫秒)"
-
-#: src/arm/gnunet-arm.c:383
-msgid "Control services and the Automated Restart Manager (ARM)"
+#: src/exit/gnunet-daemon-exit.c:1608
+msgid "# TCP requests dropped (no such service)"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:959
-msgid "Failed to transmit shutdown ACK.\n"
+#: src/exit/gnunet-daemon-exit.c:1653
+msgid "# TCP IP-exit creation requests received via mesh"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
+#: src/exit/gnunet-daemon-exit.c:1763
+msgid "# TCP data requests received via mesh"
 msgstr ""
 
-#: src/arm/mockup-service.c:69
-msgid "Initiating shutdown as requested by client.\n"
+#: src/exit/gnunet-daemon-exit.c:1777
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:320
-#, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "解��置文件“%s�失败\n"
-
-#: src/arm/gnunet-service-arm.c:323
-#, c-format
-msgid "Starting service `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:1827
+msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:349
-msgid "Could not send status result to client\n"
+#: src/exit/gnunet-daemon-exit.c:1993
+msgid "# ICMP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:476
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "无法创建用户账户："
-
-#: src/arm/gnunet-service-arm.c:498
-#, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+#: src/exit/gnunet-daemon-exit.c:2235
+msgid "# ICMP service requests received via mesh"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:512
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:2301 src/vpn/gnunet-service-vpn.c:1378
+#: src/vpn/gnunet-service-vpn.c:1945
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:620
-#, c-format
-msgid "Preparing to stop `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:2360 src/vpn/gnunet-service-vpn.c:1414
+#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:774
-#, c-format
-msgid "Restarting service `%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:2410
+msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:869
-msgid "exit"
+#: src/exit/gnunet-daemon-exit.c:2516
+msgid "# UDP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:874
-msgid "signal"
+#: src/exit/gnunet-daemon-exit.c:2616
+msgid "# UDP service requests received via mesh"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:879
-#, fuzzy
-msgid "unknown"
-msgstr "未知错误"
+#: src/exit/gnunet-daemon-exit.c:2639
+msgid "# UDP requests dropped (no such service)"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:913
+#: src/exit/gnunet-daemon-exit.c:2879
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1052
-#, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-msgstr "�置文件“%s�已写入。\n"
-
-#: src/arm/gnunet-service-arm.c:1054
-msgid "option missing"
+#: src/exit/gnunet-daemon-exit.c:2893 src/exit/gnunet-daemon-exit.c:2905
+#, c-format
+msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1131
-#, fuzzy, c-format
-msgid "Starting default services `%s'\n"
-msgstr "�载 GNUnet �务"
-
-#: src/arm/gnunet-service-arm.c:1142
+#: src/exit/gnunet-daemon-exit.c:2916
 #, c-format
-msgid "Default service `%s' not configured correctly!\n"
+msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1156
+#: src/exit/gnunet-daemon-exit.c:3045
 msgid ""
-"No default services configured, GNUnet will not really start right now.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:187
-msgid "Failed to transmit shutdown request to client.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:378
-#, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
-msgstr "�置�满足�置规范文件“%s�的约��\n"
-
-#: src/arm/arm_api.c:392
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "�置�满足�置规范文件“%s�的约��\n"
-
-#: src/arm/arm_api.c:465
-#, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
+"This system does not support IPv4, will disable IPv4 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/arm/arm_api.c:521
-#, c-format
-msgid "Requesting start of service `%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:3053
+msgid ""
+"This system does not support IPv6, will disable IPv6 functions despite them "
+"being enabled in the configuration\n"
 msgstr ""
 
-#: src/arm/arm_api.c:522
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
+#: src/exit/gnunet-daemon-exit.c:3060
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/arm/arm_api.c:544
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
+#: src/exit/gnunet-daemon-exit.c:3066
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/arm/arm_api.c:546
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
+#: src/exit/gnunet-daemon-exit.c:3072 src/pt/gnunet-daemon-pt.c:884
+msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:579
-#, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr ""
-
-#: src/arm/arm_api.c:652
-#, c-format
-msgid "Stopping service `%s' within %llu ms\n"
+#: src/exit/gnunet-daemon-exit.c:3233
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
 #: src/fragmentation/defragmentation.c:270
@@ -1912,240 +1756,324 @@ msgstr ""
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:207
+#: src/fs/fs_api.c:284
+#, fuzzy, c-format
+msgid "Could not open file `%s': %s"
+msgstr "打开日志文件“%s�失败：%s\n"
+
+#: src/fs/fs_api.c:293
+#, fuzzy, c-format
+msgid "Could not read file `%s': %s"
+msgstr "无法解�“%s�(%s)：%s\n"
+
+#: src/fs/fs_api.c:299
 #, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:263
+#: 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_api.c:1334
 #, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:390
-#, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "�始化“%s��务失败。\n"
-
-#: src/statistics/gnunet-statistics.c:98
-#, fuzzy
-msgid "Failed to obtain statistics.\n"
-msgstr "�始化“%s��务失败。\n"
+#: src/fs/fs_api.c:1376
+#, c-format
+msgid "Failure while resuming publishing operation `%s': %s\n"
+msgstr ""
 
-#: src/statistics/gnunet-statistics.c:126 src/fs/gnunet-pseudonym.c:151
+#: src/fs/fs_api.c:1392
 #, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "“%s�的�数无效。\n"
+msgid "Failed to resume publishing operation `%s': %s\n"
+msgstr "解��置文件“%s�失败\n"
 
-#: src/statistics/gnunet-statistics.c:164
-msgid "limit output to statistics for the given NAME"
+#: src/fs/fs_api.c:2004
+#, c-format
+msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:167
-msgid "make the value being set persistent"
-msgstr ""
+#: src/fs/fs_api.c:2014
+#, fuzzy, c-format
+msgid "Failed to resume unindexing operation `%s': %s\n"
+msgstr "解��置文件“%s�失败\n"
 
-#: src/statistics/gnunet-statistics.c:170
-msgid "limit output to the given SUBSYSTEM"
-msgstr ""
+#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#, fuzzy, c-format
+msgid "Failed to resume sub-download `%s': %s\n"
+msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/statistics/gnunet-statistics.c:173
-msgid "just print the statistics value"
-msgstr ""
+#: src/fs/fs_api.c:2156
+#, fuzzy, c-format
+msgid "Failed to resume sub-search `%s': %s\n"
+msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/statistics/gnunet-statistics.c:180
-msgid "Print statistics about GNUnet operations."
+#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#, c-format
+msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:89
-#, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
+#: src/fs/fs_api.c:2369
+#, fuzzy, c-format
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+msgstr "解��置文件“%s�失败\n"
+
+#: src/fs/fs_api.c:2615
+msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:96
+#: src/fs/fs_api.c:2709
 #, c-format
-msgid "Error unindexing: %s.\n"
+msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:101
-msgid "Unindexing done.\n"
+#: src/fs/fs_directory.c:210
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
-#: src/fs/gnunet-publish.c:163 src/fs/gnunet-download.c:144
-#, c-format
-msgid "Unexpected status: %d\n"
+#: src/fs/fs_download.c:313
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:131
-#, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
+#: src/fs/fs_download.c:333
+msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
-#: src/fs/gnunet-publish.c:417 src/fs/gnunet-download.c:203
+#: src/fs/fs_download.c:491 src/fs/fs_download.c:503
 #, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "�始化“%s��务失败。\n"
+msgid "Failed to open file `%s' for writing"
+msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/fs/gnunet-unindex.c:148
-msgid "Could not start unindex operation.\n"
+#: src/fs/fs_download.c:877
+#, c-format
+msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:176
-msgid "Unindex a file that was previously indexed with gnunet-publish."
+#: src/fs/fs_download.c:963
+#, 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/gnunet-pseudonym.c:165
-#, c-format
-msgid "Namespace `%s' unknown.\n"
+#: src/fs/fs_download.c:989
+msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/fs/fs_download.c:1012
 #, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s：选项“%s�有歧义\n"
+msgid "Download failed: could not open file `%s': %s\n"
+msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:543
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr ""
+#: src/fs/fs_download.c:1024
+#, fuzzy, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/fs/gnunet-pseudonym.c:272
-msgid "create or advertise namespace NAME"
-msgstr ""
+#: src/fs/fs_download.c:1033
+#, fuzzy, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
+msgstr "解��置文件“%s�失败\n"
 
-#: src/fs/gnunet-pseudonym.c:275
-msgid "delete namespace NAME "
-msgstr ""
+#: src/fs/fs_download.c:1875
+#, fuzzy
+msgid "Invalid URI"
+msgstr "无效�目。\n"
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/fs_getopt.c:191
+#, c-format
 msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:562
-msgid "set the meta-data for the given TYPE to the given VALUE"
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
-msgid "print names of local namespaces"
+#: src/fs/fs_list_indexed.c:90
+#, c-format
+msgid "Failed to receive response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
-msgid "use the given PRIORITY for the advertisments"
+#: src/fs/fs_list_indexed.c:113
+#, c-format
+msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
-msgid "do not print names of remote namespaces"
-msgstr ""
+#: src/fs/fs_list_indexed.c:151
+#, fuzzy, c-format
+msgid "Failed to not connect to `%s' service.\n"
+msgstr "�始化“%s��务失败。\n"
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:581
-msgid "set the desired replication LEVEL"
+#: src/fs/fs_misc.c:126
+#, c-format
+msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
-msgid "specify ID of the root of the namespace"
-msgstr ""
+#: src/fs/fs_namespace_advertise.c:150
+#, fuzzy
+msgid "Unknown error"
+msgstr "未知错误"
 
-#: src/fs/gnunet-pseudonym.c:300
-msgid "change rating of namespace ID by VALUE"
-msgstr ""
+#: src/fs/fs_namespace_advertise.c:238 src/fs/fs_namespace_advertise.c:259
+#, fuzzy
+msgid "Failed to serialize meta data"
+msgstr "��消�失败。\n"
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "Manage GNUnet pseudonyms."
-msgstr ""
+#: src/fs/fs_namespace_advertise.c:278
+#, fuzzy
+msgid "Failed to connect to datastore service"
+msgstr "�始化“%s��务失败。\n"
 
-#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
+#: src/fs/fs_namespace.c:57 src/fs/fs_namespace.c:83
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr "�置文件“%s�已写入。\n"
 
-#: src/fs/fs_namespace.c:119
+#: src/fs/fs_namespace.c:112
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:134 src/fs/fs_namespace.c:222
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "�行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:338
-#, fuzzy
-msgid "Unknown error"
-msgstr "未知错误"
-
-#: src/fs/fs_namespace.c:427 src/fs/fs_namespace.c:448
-#, fuzzy
-msgid "Failed to serialize meta data"
-msgstr "��消�失败。\n"
-
-#: src/fs/fs_namespace.c:467
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "�始化“%s��务失败。\n"
-
-#: src/fs/fs_namespace.c:510
+#: src/fs/fs_namespace.c:256
 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:612
+#: src/fs/fs_namespace.c:371
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:840 src/fs/fs_publish.c:1535
+#: src/fs/fs_namespace.c:588 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_namespace.c:884
+#: src/fs/fs_namespace.c:631
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/gnunet-search.c:111
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
 #, c-format
-msgid "Failed to write directory with search results to `%s'\n"
+msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/gnunet-search.c:181
+#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
+#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
+#, c-format
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:618
+msgid "timeout on index-start request to `fs' service"
+msgstr ""
+
+#: src/fs/fs_publish.c:630
+#, fuzzy
+msgid "unknown error"
+msgstr "未知错误"
+
+#: src/fs/fs_publish.c:673
+msgid "failed to compute hash"
+msgstr ""
+
+#: src/fs/fs_publish.c:693
+msgid "filename too long"
+msgstr ""
+
+#: src/fs/fs_publish.c:718
+msgid "could not connect to `fs' service"
+msgstr ""
+
+#: src/fs/fs_publish.c:741
 #, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "创建用户出错"
+msgid "Failed to get file identifiers for `%s'\n"
+msgstr "解��置文件“%s�失败\n"
 
-#: src/fs/gnunet-search.c:231
-msgid "Could not create keyword URI from arguments.\n"
+#: src/fs/fs_publish.c:806
+#, c-format
+msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/gnunet-search.c:255
-msgid "Could not start searching.\n"
+#: src/fs/fs_publish.c:812
+#, c-format
+msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/gnunet-search.c:285 src/fs/gnunet-download.c:240
-msgid "set the desired LEVEL of receiver-anonymity"
+#: src/fs/fs_publish.c:858
+msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/gnunet-search.c:288 src/fs/gnunet-download.c:246
-msgid "only search the local peer (no P2P network search)"
+#: src/fs/fs_publish.c:1067
+#, c-format
+msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/gnunet-search.c:291
-msgid "write search results to file starting with PREFIX"
+#: src/fs/fs_publish.c:1138
+#, c-format
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/fs/fs_publish_ksk.c:258
+msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
-msgid "automatically terminate search after VALUE results are found"
+#: src/fs/fs_search.c:810
+#, 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/fs_test_lib.c:269
+#, fuzzy, c-format
+msgid "Failed to start daemon: %s\n"
+msgstr "�行 %s失败：%s %d\n"
+
+#: src/fs/fs_unindex.c:58
+msgid "Failed to find given position in file"
+msgstr ""
+
+#: src/fs/fs_unindex.c:63
+#, fuzzy
+msgid "Failed to read file"
+msgstr "��消�失败。\n"
+
+#: src/fs/fs_unindex.c:236
+msgid "Unexpected time for a response from `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:244
+msgid "Timeout waiting for `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:252
+#, fuzzy
+msgid "Invalid response from `fs' service."
+msgstr "“%s�的�数无效。\n"
+
+#: src/fs/fs_unindex.c:297
+msgid "Failed to connect to FS service for unindexing."
+msgstr ""
+
+#: src/fs/fs_unindex.c:332
+#, fuzzy
+msgid "Failed to connect to `datastore' service."
+msgstr "�始化“%s��务失败。\n"
+
+#: src/fs/fs_unindex.c:345
+#, fuzzy
+msgid "Failed to open file for unindexing."
+msgstr "打开日志文件“%s�失败：%s\n"
+
+#: src/fs/fs_unindex.c:379
+msgid "Failed to compute hash of file."
 msgstr ""
 
 #: src/fs/fs_uri.c:220
@@ -2220,359 +2148,447 @@ msgstr ""
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:118
-#, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:126
+#: src/fs/gnunet-directory.c:49
 #, c-format
-msgid "Error publishing: %s.\n"
+msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:137
+#: src/fs/gnunet-directory.c:94
 #, c-format
-msgid "Publishing `%s' done.\n"
+msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:141
+#: src/fs/gnunet-directory.c:97
 #, c-format
-msgid "URI is `%s'.\n"
+msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:160
-msgid "Cleanup after abort complete.\n"
-msgstr ""
+#: src/fs/gnunet-directory.c:132
+#, fuzzy
+msgid "You must specify a filename to inspect.\n"
+msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-publish.c:272
+#: src/fs/gnunet-directory.c:145
 #, fuzzy, c-format
-msgid "Meta data for file `%s' (%s)\n"
-msgstr "打开日志文件“%s�失败：%s\n"
+msgid "Failed to read directory `%s'\n"
+msgstr "解��置文件“%s�失败\n"
 
-#: src/fs/gnunet-publish.c:274
+#: src/fs/gnunet-directory.c:154
 #, fuzzy, c-format
-msgid "Keywords for file `%s' (%s)\n"
-msgstr "无法解�“%s�(%s)：%s\n"
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "更改 GNUnet 目录的��出错"
+
+#: src/fs/gnunet-directory.c:179
+#, fuzzy
+msgid "Display contents of a GNUnet directory"
+msgstr "更改 GNUnet 目录的��出错"
 
-#: src/fs/gnunet-publish.c:325
+#: src/fs/gnunet-download.c:100
 #, fuzzy, c-format
-msgid "Failed to create namespace `%s'\n"
-msgstr "��消�失败。\n"
+msgid "Starting download `%s'.\n"
+msgstr "未知的命令“%s�。\n"
 
-#: src/fs/gnunet-publish.c:367
-#, c-format
-msgid "Cannot extract metadata from a URI!\n"
-msgstr ""
+#: src/fs/gnunet-download.c:109
+#, fuzzy
+msgid "<unknown time>"
+msgstr "未知错误"
 
-#: src/fs/gnunet-publish.c:374
+#: src/fs/gnunet-download.c:118
 #, c-format
-msgid "You must specify one and only one filename for insertion.\n"
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:380
+#: src/fs/gnunet-download.c:128
 #, c-format
-msgid "You must NOT specify an URI and a filename.\n"
+msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:388
+#: src/fs/gnunet-download.c:136
 #, c-format
-msgid "Option `%s' is required when using option `%s'.\n"
+msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:398 src/fs/gnunet-publish.c:405
-#: src/transport/gnunet-transport.c:503
+#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
+msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:427
-#, fuzzy, c-format
-msgid "Could not create namespace `%s'\n"
-msgstr "无法解�“%s�(%s)：%s\n"
+#: src/fs/gnunet-download.c:176
+#, fuzzy
+msgid "You need to specify a URI argument.\n"
+msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-publish.c:439 src/fs/gnunet-download.c:175
+#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "�行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-publish.c:472
-#, fuzzy, c-format
-msgid "Could not access file: %s\n"
-msgstr "错误：无法访问�务：%s\n"
+#: src/fs/gnunet-download.c:189
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-download.c:196
+msgid "Target filename must be specified.\n"
+msgstr ""
+
+#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
-msgid "Could not publish `%s': %s\n"
-msgstr "无法解�“%s�(%s)：%s\n"
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "�始化“%s��务失败。\n"
 
-#: src/fs/gnunet-publish.c:520
-msgid "Could not start publishing.\n"
+#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:547
-msgid "disable adding the creation time to the metadata of the uploaded file"
+#: src/fs/gnunet-download.c:250
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:550
-msgid "do not use libextractor to add keywords or metadata"
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:554
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
+#: src/fs/gnunet-download.c:256
+msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:558
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
+#: src/fs/gnunet-download.c:260
+msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:565
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
+#: src/fs/gnunet-download.c:264
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr ""
+
+#: src/fs/gnunet-download.c:267
+msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-download.c:277
 msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:574
-msgid "specify the priority of the content"
+#: src/fs/gnunet-fs.c:117
+msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:578
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
+#: src/fs/gnunet-fs.c:124
+msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:584
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
+#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "“%s�的�数无效。\n"
+
+#: src/fs/gnunet-pseudonym.c:165
+#, c-format
+msgid "Namespace `%s' unknown.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:588
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
+#: 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/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-pseudonym.c:272
+msgid "create or advertise namespace NAME"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:275
+msgid "delete namespace NAME "
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:278
 msgid ""
-"URI to be published (can be used instead of passing a file to add keywords "
-"to the file with the respective URI)"
+"add an additional keyword for the advertisment (this option can be specified "
+"multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:605
-msgid "Publish a file or directory on GNUnet"
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/fs_search.c:810
-#, c-format
-msgid "Got result with unknown block type `%d', ignoring"
+#: src/fs/gnunet-pseudonym.c:285
+msgid "print names of local namespaces"
 msgstr ""
 
-#: 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"
+#: src/fs/gnunet-pseudonym.c:288
+msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:254
-msgid "# replies received for local clients"
+#: src/fs/gnunet-pseudonym.c:291
+msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:319
-msgid "# client searches received"
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:358
-msgid "# client searches updated (merged content seen list)"
+#: src/fs/gnunet-pseudonym.c:297
+msgid "specify ID of the root of the namespace"
 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-pseudonym.c:300
+msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/fs_misc.c:126
+#: src/fs/gnunet-pseudonym.c:308
+msgid "Manage GNUnet pseudonyms."
+msgstr ""
+
+#: src/fs/gnunet-publish.c:147
 #, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:49
+#: src/fs/gnunet-publish.c:155
 #, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
+#: src/fs/gnunet-publish.c:165
 #, c-format
-msgid "Directory `%s' meta data:\n"
+msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:97
+#: src/fs/gnunet-publish.c:169
 #, c-format
-msgid "Directory `%s' contents:\n"
+msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:132
-#, fuzzy
-msgid "You must specify a filename to inspect."
-msgstr "您必须指定一个昵称\n"
+#: src/fs/gnunet-publish.c:187
+msgid "Cleanup after abort complete.\n"
+msgstr ""
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-publish.c:299
 #, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "解��置文件“%s�失败\n"
+msgid "Meta data for file `%s' (%s)\n"
+msgstr "打开日志文件“%s�失败：%s\n"
+
+#: src/fs/gnunet-publish.c:301
+#, fuzzy, c-format
+msgid "Keywords for file `%s' (%s)\n"
+msgstr "无法解�“%s�(%s)：%s\n"
+
+#: src/fs/gnunet-publish.c:352
+#, fuzzy, c-format
+msgid "Failed to create namespace `%s'\n"
+msgstr "��消�失败。\n"
 
-#: src/fs/gnunet-directory.c:176
+#: src/fs/gnunet-publish.c:427
 #, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "更改 GNUnet 目录的��出错"
+msgid "Could not publish\n"
+msgstr "无法解�“%s�(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_pr.c:287
-msgid "# Pending requests created"
+#: src/fs/gnunet-publish.c:454
+msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:623
-msgid "# Pending requests active"
+#: src/fs/gnunet-publish.c:485
+#, fuzzy, c-format
+msgid "Scanning directory `%s'.\n"
+msgstr "解��置文件“%s�失败\n"
+
+#: src/fs/gnunet-publish.c:487
+#, fuzzy, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "未知的命令“%s�。\n"
+
+#: src/fs/gnunet-publish.c:492
+#, c-format
+msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:787
-msgid "# replies received and matched"
+#: src/fs/gnunet-publish.c:497
+msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
-msgid "# duplicate replies discarded (bloomfilter)"
+#: src/fs/gnunet-publish.c:501
+#, fuzzy, c-format
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr "打开日志文件“%s�失败：%s\n"
+
+#: src/fs/gnunet-publish.c:505
+msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:830
+#: src/fs/gnunet-publish.c:512
+#, fuzzy
+msgid "Internal error scanning directory.\n"
+msgstr "未知错误。\n"
+
+#: src/fs/gnunet-publish.c:546
 #, c-format
-msgid "Unsupported block type %u\n"
+msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:845
-msgid "# results found locally"
+#: src/fs/gnunet-publish.c:553
+#, c-format
+msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:965
-msgid "# Datastore `PUT' failures"
+#: src/fs/gnunet-publish.c:559
+#, c-format
+msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:992
-msgid "# storage requests dropped due to high load"
+#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#, c-format
+msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1027
-msgid "# Replies received from DHT"
+#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
+#: src/transport/gnunet-transport.c:530
+#, c-format
+msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1120
-#, c-format
-msgid "Datastore lookup already took %llu ms!\n"
+#: src/fs/gnunet-publish.c:606
+#, fuzzy, c-format
+msgid "Could not create namespace `%s'\n"
+msgstr "无法解�“%s�(%s)：%s\n"
+
+#: src/fs/gnunet-publish.c:639
+#, fuzzy, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "打开日志文件“%s�失败：%s\n"
+
+#: src/fs/gnunet-publish.c:651
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1141
-#, c-format
-msgid "On-demand lookup already took %llu ms!\n"
+#: src/fs/gnunet-publish.c:676
+msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1188
-msgid "# Datastore lookups concluded (no results)"
+#: src/fs/gnunet-publish.c:679
+msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1202
-msgid "# Datastore lookups concluded (seen all)"
+#: src/fs/gnunet-publish.c:683
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
-msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
+#: src/fs/gnunet-publish.c:687
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1227
-msgid "# requested DBLOCK or IBLOCK not found"
+#: src/fs/gnunet-publish.c:694
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
-msgid "# on-demand blocks matched requests"
+#: src/fs/gnunet-publish.c:699
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1257
-msgid "# on-demand lookups performed successfully"
+#: src/fs/gnunet-publish.c:703
+msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1262
-msgid "# on-demand lookups failed"
+#: src/fs/gnunet-publish.c:707
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1289 src/fs/gnunet-service-fs_pr.c:1329
-#: src/fs/gnunet-service-fs_pr.c:1469
-msgid "# Datastore lookups concluded (error queueing)"
+#: src/fs/gnunet-publish.c:713
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1347
-msgid "# Datastore lookups concluded (found last result)"
+#: src/fs/gnunet-publish.c:717
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1360
-msgid "# Datastore lookups concluded (load too high)"
+#: src/fs/gnunet-publish.c:721
+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-service-fs_pr.c:1446
-msgid "# Datastore lookups initiated"
+#: src/fs/gnunet-publish.c:736
+msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1530
-msgid "# GAP PUT messages received"
+#: src/fs/gnunet-search.c:111
+#, c-format
+msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1629 src/fs/gnunet-service-fs_pr.c:1638
+#: src/fs/gnunet-search.c:181
 #, fuzzy, c-format
-msgid "Configuration fails to specify `%s', assuming default value."
-msgstr "�置文件“%s�已写入。\n"
+msgid "Error searching: %s.\n"
+msgstr "创建用户出错"
 
-#: src/fs/gnunet-service-fs_pe.c:265
-msgid "# average retransmission delay (ms)"
+#: src/fs/gnunet-search.c:231
+msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:394
-msgid "# transmission failed (core has no bandwidth)"
+#: src/fs/gnunet-search.c:255
+msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:425
-msgid "# query messages sent to other peers"
+#: src/fs/gnunet-search.c:291
+msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:478
-msgid "# delay heap timeout"
+#: src/fs/gnunet-search.c:294
+msgid "automatically terminate search after VALUE ms"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:485
-msgid "# query plans executed"
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:549
-msgid "# requests merged"
+#: src/fs/gnunet-search.c:308
+msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:555
-msgid "# requests refreshed"
+#: src/fs/gnunet-service-fs.c:240
+msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: 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"
+#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
+msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1544
-#: src/transport/gnunet-service-transport_neighbours.c:936
-#: src/transport/gnunet-service-transport_neighbours.c:1263
-#: src/transport/gnunet-service-transport_neighbours.c:1735
-#: src/transport/gnunet-service-transport_neighbours.c:2369
-#: src/transport/gnunet-service-transport_neighbours.c:2437
+#: src/fs/gnunet-service-fs.c:583 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/topology/gnunet-daemon-topology.c:1290
+#: src/topology/gnunet-daemon-topology.c:1297
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' service.\n"
+msgstr "�始化“%s��务失败。\n"
+
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1546
 #: src/topology/gnunet-daemon-topology.c:654
 #: src/topology/gnunet-daemon-topology.c:756
+#: src/transport/gnunet-service-transport_neighbours.c:960
+#: src/transport/gnunet-service-transport_neighbours.c:1289
+#: src/transport/gnunet-service-transport_neighbours.c:1841
+#: src/transport/gnunet-service-transport_neighbours.c:2499
+#: src/transport/gnunet-service-transport_neighbours.c:2566
 msgid "# peers connected"
 msgstr ""
 
@@ -2593,7 +2609,7 @@ msgstr ""
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1334
+#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1336
 msgid "# P2P searches active"
 msgstr ""
 
@@ -2601,69 +2617,62 @@ msgstr ""
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:909
+#: src/fs/gnunet-service-fs_cp.c:911
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:919
+#: src/fs/gnunet-service-fs_cp.c:921
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:933
+#: src/fs/gnunet-service-fs_cp.c:935
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:971
+#: src/fs/gnunet-service-fs_cp.c:973
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/fs/gnunet-service-fs_cp.c:1040
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1064
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/fs/gnunet-service-fs_cp.c:1074
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1151
+#: src/fs/gnunet-service-fs_cp.c:1153
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/fs/gnunet-service-fs_cp.c:1187
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1209
+#: src/fs/gnunet-service-fs_cp.c:1211
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1275
+#: src/fs/gnunet-service-fs_cp.c:1277
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1303
+#: src/fs/gnunet-service-fs_cp.c:1305
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1332
+#: src/fs/gnunet-service-fs_cp.c:1334
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1699
+#: src/fs/gnunet-service-fs_cp.c:1701
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:653
-#, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
-msgstr ""
-
 #: src/fs/gnunet-service-fs_indexing.c:113
 #: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
@@ -2716,1016 +2725,1237 @@ msgstr ""
 msgid "Indexed file `%s' changed at offset %llu\n"
 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-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:494
+msgid "# client searches active"
 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-service-fs_lc.c:256
+msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:164
-#, fuzzy, c-format
-msgid "Failed to not connect to `%s' service.\n"
-msgstr "�始化“%s��务失败。\n"
+#: src/fs/gnunet-service-fs_lc.c:323
+msgid "# client searches received"
+msgstr ""
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/fs/gnunet-service-fs_lc.c:362
+msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
-#, fuzzy
-msgid "Failed to read file"
-msgstr "��消�失败。\n"
+#: src/fs/gnunet-service-fs_pe.c:265
+msgid "# average retransmission delay (ms)"
+msgstr ""
 
-#: src/fs/fs_unindex.c:236
-msgid "Unexpected time for a response from `fs' service."
+#: src/fs/gnunet-service-fs_pe.c:394
+msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/fs_unindex.c:244
-msgid "Timeout waiting for `fs' service."
+#: src/fs/gnunet-service-fs_pe.c:425
+msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/fs_unindex.c:252
-#, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "“%s�的�数无效。\n"
+#: src/fs/gnunet-service-fs_pe.c:478
+msgid "# delay heap timeout"
+msgstr ""
 
-#: src/fs/fs_unindex.c:297
-msgid "Failed to connect to FS service for unindexing."
+#: src/fs/gnunet-service-fs_pe.c:485
+msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/fs_unindex.c:332
-#, fuzzy
-msgid "Failed to connect to `datastore' service."
-msgstr "�始化“%s��务失败。\n"
+#: src/fs/gnunet-service-fs_pe.c:549
+msgid "# requests merged"
+msgstr ""
 
-#: src/fs/fs_unindex.c:345
-#, fuzzy
-msgid "Failed to open file for unindexing."
-msgstr "打开日志文件“%s�失败：%s\n"
+#: src/fs/gnunet-service-fs_pe.c:555
+msgid "# requests refreshed"
+msgstr ""
 
-#: src/fs/fs_unindex.c:379
-msgid "Failed to compute hash of file."
+#: src/fs/gnunet-service-fs_pe.c:608 src/fs/gnunet-service-fs_pe.c:694
+#: src/fs/gnunet-service-fs_pe.c:761
+msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-download.c:100
-#, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "未知的命令“%s�。\n"
+#: src/fs/gnunet-service-fs_pr.c:287
+msgid "# Pending requests created"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:369 src/fs/gnunet-service-fs_pr.c:622
+msgid "# Pending requests active"
+msgstr ""
 
-#: src/fs/gnunet-download.c:112
+#: src/fs/gnunet-service-fs_pr.c:787
+msgid "# replies received and matched"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:816
+msgid "# duplicate replies discarded (bloomfilter)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:832
 #, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:121
+#: src/fs/gnunet-service-fs_pr.c:847
+msgid "# results found locally"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:969
+msgid "# Datastore `PUT' failures"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:996
+msgid "# storage requests dropped due to high load"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1031
+msgid "# Replies received from DHT"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1124
 #, c-format
-msgid "Error downloading: %s.\n"
+msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:129
+#: src/fs/gnunet-service-fs_pr.c:1145
 #, c-format
-msgid "Downloading `%s' done (%s/s).\n"
+msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:169
-#, fuzzy
-msgid "You need to specify a URI argument.\n"
-msgstr "您必须指定一个昵称\n"
+#: src/fs/gnunet-service-fs_pr.c:1192
+msgid "# Datastore lookups concluded (no results)"
+msgstr ""
 
-#: src/fs/gnunet-download.c:182
-msgid "Only CHK or LOC URIs supported.\n"
+#: src/fs/gnunet-service-fs_pr.c:1206
+msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
-msgid "Target filename must be specified.\n"
+#: src/fs/gnunet-service-fs_pr.c:1215
+msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:243
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
+#: src/fs/gnunet-service-fs_pr.c:1231
+msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-download.c:249
-msgid "write the file to FILENAME"
+#: src/fs/gnunet-service-fs_pr.c:1248
+msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/fs/gnunet-service-fs_pr.c:1261
+msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/fs/gnunet-service-fs_pr.c:1266
+msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:260
-msgid "download a GNUnet directory recursively"
+#: src/fs/gnunet-service-fs_pr.c:1293 src/fs/gnunet-service-fs_pr.c:1333
+#: src/fs/gnunet-service-fs_pr.c:1473
+msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:270
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+#: src/fs/gnunet-service-fs_pr.c:1351
+msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/fs_getopt.c:191
+#: src/fs/gnunet-service-fs_pr.c:1364
+msgid "# Datastore lookups concluded (load too high)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1450
+msgid "# Datastore lookups initiated"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1534
+msgid "# GAP PUT messages received"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1633 src/fs/gnunet-service-fs_pr.c:1642
+#, fuzzy, c-format
+msgid "Configuration fails to specify `%s', assuming default value."
+msgstr "�置文件“%s�已写入。\n"
+
+#: src/fs/gnunet-service-fs_push.c:653
 #, c-format
 msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+"Invalid value specified for option `%s' in section `%s', content pushing "
+"disabled\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:150 src/fs/fs_publish.c:421
+#: src/fs/gnunet-unindex.c:89
 #, c-format
-msgid "Publishing failed: %s"
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:658 src/fs/fs_publish.c:675 src/fs/fs_publish.c:714
-#: src/fs/fs_publish.c:734 src/fs/fs_publish.c:761 src/fs/fs_publish.c:909
+#: src/fs/gnunet-unindex.c:96
 #, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:660
-msgid "timeout on index-start request to `fs' service"
+#: src/fs/gnunet-unindex.c:101
+msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:672
+#: src/fs/gnunet-unindex.c:131
+#, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:148
+msgid "Could not start unindex operation.\n"
+msgstr ""
+
+#: src/fs/gnunet-unindex.c:176
+msgid "Unindex a file that was previously indexed with gnunet-publish."
+msgstr ""
+
+#: src/fs/plugin_block_fs.c:131
+msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+msgstr ""
+
+#: src/gns/gns_api.c:221
 #, fuzzy
-msgid "unknown error"
-msgstr "未知错误"
+msgid "Failed to connect to the GNS service!\n"
+msgstr "�始化“%s��务失败。\n"
 
-#: src/fs/fs_publish.c:715
-msgid "failed to compute hash"
+#: src/gns/gnunet-gns-lookup.c:216
+msgid "Issue a request to the GNUnet Naming System, prints results."
 msgstr ""
 
-#: src/fs/fs_publish.c:735
-msgid "filename too long"
+#: src/hostlist/gnunet-daemon-hostlist.c:264
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:762
-msgid "could not connect to `fs' service"
+#: src/hostlist/gnunet-daemon-hostlist.c:317
+msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/fs/fs_publish.c:786
-#, fuzzy, c-format
-msgid "Failed to get file identifiers for `%s'\n"
-msgstr "解��置文件“%s�失败\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:322
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
+msgstr ""
 
-#: src/fs/fs_publish.c:856
-#, c-format
-msgid "Recursive upload failed at `%s': %s"
+#: src/hostlist/gnunet-daemon-hostlist.c:325
+msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/fs/fs_publish.c:862
-#, c-format
-msgid "Recursive upload failed: %s"
+#: src/hostlist/gnunet-daemon-hostlist.c:329
+msgid "provide a hostlist server"
 msgstr ""
 
-#: src/fs/fs_publish.c:910
-msgid "needs to be an actual file"
+#: src/hostlist/gnunet-daemon-hostlist.c:341
+msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/fs/fs_publish.c:1092
-#, c-format
-msgid "Insufficient space for publishing: %s"
+#: src/hostlist/hostlist-client.c:286
+msgid "# bytes downloaded from hostlist servers"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
+msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/fs/fs_publish.c:1163
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
 #, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1499
-msgid "Could not connect to datastore."
+#: src/hostlist/hostlist-client.c:330
+msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/fs/fs_api.c:284
-#, fuzzy, c-format
-msgid "Could not open file `%s': %s"
-msgstr "打开日志文件“%s�失败：%s\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/fs/fs_api.c:293
-#, fuzzy, c-format
-msgid "Could not read file `%s': %s"
-msgstr "无法解�“%s�(%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/plugin_transport_http_client.c:108
+#: src/transport/plugin_transport_http_client.c:123
+#, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr ""
 
-#: src/fs/fs_api.c:299
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+msgid "# advertised hostlist URIs"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:622
 #, c-format
-msgid "Short read reading from file `%s'!"
+msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/fs/fs_api.c:877
-#, fuzzy, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
-msgstr "打开日志文件“%s�失败：%s\n"
+#: 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/fs/fs_api.c:1323
+#: src/hostlist/hostlist-client.c:805
 #, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1365
+#: src/hostlist/hostlist-client.c:822
 #, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1381
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
-msgstr "解��置文件“%s�失败\n"
+msgid "%s failed for `%s' at %s:%d: `%s'\n"
+msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
 
-#: src/fs/fs_api.c:1993
+#: src/hostlist/hostlist-client.c:848
 #, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
+msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2003
-#, fuzzy, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
-msgstr "解��置文件“%s�失败\n"
+#: src/hostlist/hostlist-client.c:856
+#, c-format
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
+msgstr ""
 
-#: src/fs/fs_api.c:2129 src/fs/fs_api.c:2368
-#, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
-msgstr "打开日志文件“%s�失败：%s\n"
+#: src/hostlist/hostlist-client.c:909
+#, c-format
+msgid "Bootstrapping using hostlist at `%s'.\n"
+msgstr ""
 
-#: src/fs/fs_api.c:2146
-#, fuzzy, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
-msgstr "打开日志文件“%s�失败：%s\n"
+#: src/hostlist/hostlist-client.c:917
+msgid "# hostlist downloads initiated"
+msgstr ""
 
-#: src/fs/fs_api.c:2158 src/fs/fs_api.c:2177 src/fs/fs_api.c:2653
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+msgid "# milliseconds between hostlist downloads"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1054
 #, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2359
-#, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
-msgstr "解��置文件“%s�失败\n"
+#: src/hostlist/hostlist-client.c:1092
+msgid "Scheduled saving of hostlists\n"
+msgstr ""
 
-#: src/fs/fs_api.c:2605
-msgid "Could not resume running search, will resume as paused search\n"
+#: src/hostlist/hostlist-client.c:1096
+#, c-format
+msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2691
+#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
+msgid "# active connections"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1253
 #, c-format
-msgid "Failure while resuming download operation `%s': %s\n"
+msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/fs/fs_download.c:309
+#: src/hostlist/hostlist-client.c:1284
+#, c-format
 msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
+"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:329
-msgid "Directory too large for system address space\n"
+#: src/hostlist/hostlist-client.c:1290
+#, c-format
+msgid "Loading saved hostlist entries from file `%s' \n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1294
+#, c-format
+msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
+#: src/hostlist/hostlist-client.c:1305
 #, fuzzy, c-format
-msgid "Failed to open file `%s' for writing"
-msgstr "打开日志文件“%s�失败：%s\n"
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgstr "无法解�“%s��确定已方的 IP 地�：%s\n"
 
-#: src/fs/fs_download.c:873
+#: src/hostlist/hostlist-client.c:1338
 #, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
+msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/fs/fs_download.c:959
+#: src/hostlist/hostlist-client.c:1340
+msgid "# hostlist URIs read from file"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1373
 #, c-format
 msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:986
-msgid "internal error decrypting content"
+#: 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/hostlist/hostlist-client.c:1392
+#, c-format
+msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1009
-#, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
-msgstr "打开日志文件“%s�失败：%s\n"
+#: 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/fs/fs_download.c:1021
-#, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
-msgstr "打开日志文件“%s�失败：%s\n"
+#: src/hostlist/hostlist-client.c:1428
+msgid "# hostlist URIs written to file"
+msgstr ""
 
-#: src/fs/fs_download.c:1030
-#, fuzzy, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr "解��置文件“%s�失败\n"
+#: src/hostlist/hostlist-client.c:1480
+msgid "Learning is enabled on this peer\n"
+msgstr ""
 
-#: src/fs/fs_download.c:1829
-#, fuzzy
-msgid "Invalid URI"
-msgstr "无效�目。\n"
+#: src/hostlist/hostlist-client.c:1483
+#, c-format
+msgid "Hostlists will be saved to file again in  %llums\n"
+msgstr ""
 
-#: src/fs/gnunet-service-fs.c:240
-msgid "# running average P2P latency (ms)"
+#: src/hostlist/hostlist-client.c:1492
+msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:491
-msgid "# Loopback routes suppressed"
+#: 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/fs/gnunet-service-fs.c:583 src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
-#: src/hostlist/gnunet-daemon-hostlist.c:297
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr "�始化“%s��务失败。\n"
+#: src/hostlist/hostlist-client.c:1508
+#, c-format
+msgid "Hostlist file `%s' could not be removed\n"
+msgstr ""
 
-#: src/fs/fs_file_information.c:356
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s': %s"
-msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
+#: src/hostlist/hostlist-server.c:134
+msgid "bytes in hostlist"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:468
-msgid "# failed connection attempts due to timeout"
+#: src/hostlist/hostlist-server.c:157
+msgid "expired addresses encountered"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:859
-msgid "# peers disconnected due to external request"
+#: src/hostlist/hostlist-server.c:184
+#: src/topology/gnunet-daemon-topology.c:875
+#, c-format
+msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:942
-#, fuzzy
-msgid "# fast reconnects failed"
+#: src/hostlist/hostlist-server.c:205
+msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
-"\n"
-"按任�键继续\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:998
-msgid "# peers disconnected due to timeout"
+#: src/hostlist/hostlist-server.c:221
+msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1023
-msgid "# keepalives sent"
+#: src/hostlist/hostlist-server.c:269
+#, c-format
+msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1065
-msgid "# peers disconnected due to global disconnect"
+#: src/hostlist/hostlist-server.c:272
+msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1781
-#: src/transport/gnunet-service-transport_neighbours.c:1802
-msgid "# messages not sent (no such peer or not connected)"
+#: src/hostlist/hostlist-server.c:280
+msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1818
-msgid "# bytes in message queue for other peers"
+#: src/hostlist/hostlist-server.c:287
+#, c-format
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1870
-msgid "# messages discarded due to lack of neighbour record"
+#: src/hostlist/hostlist-server.c:291
+msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
-msgid "# bandwidth quota violations by other peers"
+#: src/hostlist/hostlist-server.c:299
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1924
-msgid "# ms throttling suggested"
+#: src/hostlist/hostlist-server.c:302
+msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1953
-msgid "# KEEPALIVE messages discarded (not connected)"
+#: src/hostlist/hostlist-server.c:306
+msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2005
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+#: src/hostlist/hostlist-server.c:307
+msgid "hostlist requests processed"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2013
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+#: src/hostlist/hostlist-server.c:350
+msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2079
-msgid "# SET QUOTA messages ignored (no such peer)"
+#: src/hostlist/hostlist-server.c:397
+msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2097
-msgid "# disconnects due to quota of 0"
+#: src/hostlist/hostlist-server.c:565
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2215
-msgid "# disconnect messages ignored (old format)"
+#: src/hostlist/hostlist-server.c:574
+#, c-format
+msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2228
-msgid "# disconnect messages ignored (timestamp)"
+#: src/hostlist/hostlist-server.c:588
+#, c-format
+msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2305
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+#: src/hostlist/hostlist-server.c:626
+#, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2322
-msgid "# unexpected CONNECT_ACK messages"
+#: src/mesh/gnunet-service-mesh.c:4595
+msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2415
-msgid "# unexpected ACK messages"
+#: src/mesh/gnunet-service-mesh.c:4789
+#, fuzzy
+msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
+msgstr "立��存�置？"
+
+#: src/mesh/gnunet-service-mesh.c:4798
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "找�到接�“%s�的一个 IP 地�。\n"
+
+#: src/nat/gnunet-nat-server.c:289
+#, c-format
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: 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/nat/gnunet-nat-server.c:328
+msgid "GNUnet NAT traversal test helper daemon"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/nat/nat.c:803
 #, c-format
-msgid "Blacklist file `%s' is empty.\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/nat/nat.c:852
 #, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "解��置文件“%s�失败\n"
+msgid "Failed to start %s\n"
+msgstr "�行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/nat/nat.c:1121
 #, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "�置文件“%s�第 %d 行有语法错误。\n"
+msgid "Malformed %s `%s' given in configuration!\n"
+msgstr "�存�置失败。"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/nat/nat.c:1187 src/nat/nat.c:1197
 #, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgid ""
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\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/nat/nat.c:1329
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/nat/nat.c:1341
 #, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:756
-msgid "# disconnects due to blacklist"
+#: src/nat/nat_test.c:348
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: 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"
+#: src/nat/nat_test.c:418
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:215
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/nse/gnunet-nse-profiler.c:926
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "无法访问该�务"
+
+#: src/nse/gnunet-service-nse.c:936
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:172
-msgid "# refreshed my HELLO"
+#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
+#: src/nse/gnunet-service-nse.c:1431
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1567
-msgid "# IPv4 broadcast HELLO beacons received via udp"
+#: src/nse/gnunet-service-nse.c:1398
+msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1610
-msgid "# IPv6 multicast HELLO beacons received via udp"
+#: src/nse/gnunet-service-nse.c:1419
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "找�到接�“%s�的一个 IP 地�。\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:133
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:195
+msgid "# peers known"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2106
-#: src/transport/plugin_transport_udp_new.c:1220
+#: src/peerinfo/gnunet-service-peerinfo.c:239
 #, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2157
-#: src/transport/plugin_transport_udp_new.c:1270
+#: src/peerinfo/gnunet-service-peerinfo.c:305
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:279
 #, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "无效的进程优先级“%s�\n"
+msgid "Failed to transmit message to `%s' service.\n"
+msgstr "�始化“%s��务失败。\n"
 
-#: src/transport/plugin_transport_udp.c:2301
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+#: src/peerinfo/peerinfo_api.c:435
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
+msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2372
-#: src/transport/plugin_transport_udp_new.c:1398
+#: src/peerinfo/peerinfo_api.c:523
 #, fuzzy
-msgid "Failed to open UDP sockets\n"
-msgstr "打开日志文件“%s�失败：%s\n"
+msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgstr "�始化“%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 "%s failed at %s:%d: `%s'\n"
+#: src/peerinfo/peerinfo_api.c:557
+msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:620
+#: src/peerinfo/peerinfo_api_notify.c:258
+#, fuzzy, c-format
+msgid "Could not connect to `%s' service.\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: 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 "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:514
+#: src/peerinfo-tool/gnunet-peerinfo.c:235
 #, c-format
-msgid "Unexpected address length: %u bytes\n"
+msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:601
-#: src/transport/plugin_transport_tcp.c:690
-#: src/transport/plugin_transport_tcp.c:742
-#: src/transport/plugin_transport_tcp.c:831
-#: src/transport/plugin_transport_tcp.c:1173
-#: src/transport/plugin_transport_tcp.c:1254
-msgid "# bytes currently in TCP buffers"
+#: src/peerinfo-tool/gnunet-peerinfo.c:255
+msgid "output only the identity strings"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:607
-#: src/transport/plugin_transport_tcp.c:857
-#: src/transport/plugin_transport_tcp.c:1828
-msgid "# TCP sessions active"
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+msgid "output our own identity only"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:694
-msgid "# bytes discarded by TCP (timeout)"
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#, fuzzy
+msgid "Print information about peers."
+msgstr "无法获�有关用户“%s�的信�：%s\n"
+
+#: src/pt/gnunet-daemon-pt.c:264
+msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:745
-msgid "# bytes transmitted via TCP"
+#: src/pt/gnunet-daemon-pt.c:270
+msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:835
-msgid "# bytes discarded by TCP (disconnect)"
+#: src/pt/gnunet-daemon-pt.c:323
+msgid "# DNS records modified"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:956
-msgid "# bytes TCP was asked to transmit"
+#: src/pt/gnunet-daemon-pt.c:500
+msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1007
-msgid "# bytes discarded by TCP (no address and no connection)"
+#: src/pt/gnunet-daemon-pt.c:506
+msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1050
-#: src/transport/plugin_transport_tcp.c:1368
-#, c-format
-msgid "Address of unexpected length: %u\n"
+#: src/pt/gnunet-daemon-pt.c:602
+msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1067
-#: src/transport/plugin_transport_tcp.c:1404
-msgid "Found valid IPv4 NAT address (creating session)!\n"
+#: src/pt/gnunet-daemon-pt.c:632
+msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1118
-msgid "# bytes discarded by TCP (failed to connect)"
+#: src/pt/gnunet-daemon-pt.c:637
+msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1508
-msgid "# transport-service disconnect requests for TCP"
+#: src/pt/gnunet-daemon-pt.c:645
+msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1871
-msgid "# TCP WELCOME messages received"
+#: src/pt/gnunet-daemon-pt.c:716
+msgid "# DNS replies received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2021
-msgid "# bytes received via TCP"
+#: src/pt/gnunet-daemon-pt.c:730
+msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2089
-msgid "# network-level TCP disconnect events"
+#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
+msgid "# DNS requests aborted (tunnel down)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2242
-#, fuzzy
-msgid "Failed to start service.\n"
+#: src/pt/gnunet-daemon-pt.c:898 src/pt/gnunet-daemon-pt.c:907
+#: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
+#, fuzzy, c-format
+msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2307
+#: src/pt/gnunet-daemon-pt.c:973
+msgid "Daemon to run to perform IP protocol translation to GNUnet"
+msgstr ""
+
+#: src/statistics/gnunet-service-statistics.c:209
 #, c-format
-msgid "Failed to find option %s in section %s!\n"
+msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2330
+#: src/statistics/gnunet-service-statistics.c:267
 #, c-format
-msgid "TCP transport listening on port %llu\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2334
-msgid "TCP transport not listening on any port (client only)\n"
+#: src/statistics/gnunet-statistics.c:98
+#, fuzzy
+msgid "Failed to obtain statistics.\n"
+msgstr "�始化“%s��务失败。\n"
+
+#: src/statistics/gnunet-statistics.c:164
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2338
-#, c-format
-msgid "TCP transport advertises itself as being on port %llu\n"
+#: src/statistics/gnunet-statistics.c:167
+msgid "make the value being set persistent"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:984
-msgid "Disabling IPv6 since it is not supported on this system!\n"
+#: src/statistics/gnunet-statistics.c:170
+msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1032
+#: src/statistics/gnunet-statistics.c:173
+msgid "just print the statistics value"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:180
+msgid "Print statistics about GNUnet operations."
+msgstr ""
+
+#: src/statistics/statistics_api.c:390
 #, fuzzy
-msgid "Require valid port number for service in configuration!\n"
-msgstr "�存�置失败。"
+msgid "Failed to connect to statistics service!\n"
+msgstr "�始化“%s��务失败。\n"
 
-#: src/transport/plugin_transport_http.c:1179
-#, c-format
-msgid "Found %u addresses to report to NAT service\n"
+#: src/template/gnunet-template.c:68
+msgid "help text"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1192
+#: src/testing/gnunet-testing.c:157
+#, fuzzy
+msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+msgstr "找�到接�“%s�的一个 IP 地�。\n"
+
+#: src/testing/gnunet-testing.c:159
 #, c-format
-msgid "FREEING %s\n"
+msgid "Specified hostkey file `%s' not found!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1267
-msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+#: src/testing/gnunet-testing.c:273
+#, fuzzy
+msgid "create unique configuration files"
+msgstr "更改�置文件中的一个值"
+
+#: src/testing/gnunet-testing.c:275
+msgid "create hostkey files from pre-computed hostkey list"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1280
-#, fuzzy
-msgid "Port is required! Fix in configuration\n"
+#: src/testing/gnunet-testing.c:277
+msgid "host key file"
 msgstr ""
-"\n"
-"结��置。\n"
 
-#: src/transport/plugin_transport_http.c:1291
-msgid "Port 0, client only mode\n"
+#: src/testing/gnunet-testing.c:279
+#, fuzzy
+msgid "number of unique configuration files or hostkeys to create"
+msgstr "打��置文件中的一个值到标准输出"
+
+#: src/testing/gnunet-testing.c:281
+#, fuzzy
+msgid "configuration template"
+msgstr "�置已�存"
+
+#: src/testing/gnunet-testing.c:287
+msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1311
-#, c-format
-msgid ""
-"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
+#: src/testing/helper.c:56
+#, fuzzy
+msgid "Peer is lacking HOSTKEY configuration setting.\n"
+msgstr "立��存�置？"
+
+#: src/testing/helper.c:64
+#, fuzzy
+msgid "Could not access hostkey.\n"
+msgstr "找�到接�“%s�的一个 IP 地�。\n"
+
+#: src/testing/testing.c:214
+msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1341
-#, c-format
-msgid ""
-"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
-"Binding to all addresses!\n"
+#: src/testing/testing.c:228 src/testing/testing.c:849
+msgid "`scp' did not complete cleanly.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1096
+#: src/testing/testing.c:251
 #, fuzzy
-msgid "Failed to open UNIX sockets\n"
-msgstr "打开日志文件“%s�失败：%s\n"
+msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+msgstr "�始化“%s��务失败。\n"
 
-#: src/transport/plugin_transport_smtp.c:370
+#: src/testing/testing.c:252
+#, fuzzy
+msgid "Failed to create pipe for `ssh' process.\n"
+msgstr "�始化“%s��务失败。\n"
+
+#: src/testing/testing.c:308
+#, fuzzy, c-format
+msgid "Could not start `%s' process to create hostkey.\n"
+msgstr "�始化“%s��务失败。\n"
+
+#: src/testing/testing.c:315
+#, fuzzy
+msgid "Failed to start `gnunet-peerinfo' process.\n"
+msgstr "�始化“%s��务失败。\n"
+
+#: src/testing/testing.c:316 src/testing/testing.c:514
+#, fuzzy
+msgid "Failed to start `ssh' process.\n"
+msgstr "�始化“%s��务失败。\n"
+
+#: src/testing/testing.c:378
 #, c-format
-msgid "Received malformed message via %s. Ignored.\n"
+msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:457
-msgid "SMTP filter string to invalid, lacks ': '\n"
+#: src/testing/testing.c:382
+msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:466
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr ""
+#: src/testing/testing.c:392
+#, fuzzy
+msgid "Failed to get hostkey!\n"
+msgstr "��消�失败。\n"
 
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
-#, c-format
-msgid "SMTP: `%s' failed: %s.\n"
+#: src/testing/testing.c:426
+msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:801
-msgid "No email-address specified, can not start SMTP transport.\n"
+#: src/testing/testing.c:506
+#, fuzzy, c-format
+msgid "Could not start `%s' process to start GNUnet.\n"
+msgstr "�始化“%s��务失败。\n"
+
+#: src/testing/testing.c:513
+#, fuzzy
+msgid "Failed to start `gnunet-arm' process.\n"
+msgstr "�始化“%s��务失败。\n"
+
+#: src/testing/testing.c:537 src/testing/testing.c:647
+msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:813
-msgid "# bytes received via SMTP"
+#: src/testing/testing.c:538 src/testing/testing.c:648
+#: src/testing/testing.c:668
+msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:814
-msgid "# bytes sent via SMTP"
+#: src/testing/testing.c:617
+msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:816
-msgid "# bytes dropped by SMTP (outgoing)"
+#: src/testing/testing.c:667
+msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:111
-msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+#: src/testing/testing.c:690 src/testing/testing.c:724
+msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:118
-#, c-format
-msgid "Starting transport plugins `%s'\n"
+#: src/testing/testing.c:705 src/testing/testing.c:762
+msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:122
-#, c-format
-msgid "Loading `%s' transport plugin\n"
+#: src/testing/testing.c:837
+msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:150
+#: src/testing/testing.c:1015
 #, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "解��置文件“%s�失败\n"
+msgid "Starting service %s for peer `%4s'\n"
+msgstr "�载 GNUnet �务"
 
-#: src/transport/plugin_transport_wlan.c:880
-msgid "# wlan session timeouts"
+#: src/testing/testing.c:1299 src/testing/testing_group.c:6278
+#, fuzzy, c-format
+msgid "Could not start `%s' process to copy configuration directory.\n"
+msgstr "找�到主机“%s�的 IP：%s\n"
+
+#: src/testing/testing.c:1387 src/testing/testing.c:1470
+#: src/testing/testing.c:1608
+#, fuzzy, c-format
+msgid "Terminating peer `%4s'\n"
+msgstr "未知的用户“%s�\n"
+
+#: src/testing/testing.c:1560
+#, fuzzy, c-format
+msgid "Setting d->dead on peer `%4s'\n"
+msgstr "�载 GNUnet �务"
+
+#: src/testing/testing.c:1698
+msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:904
-msgid "# wlan session created"
+#: src/testing/testing.c:1706
+#, fuzzy
+msgid "Failed to write new configuration to disk."
+msgstr "�存�置失败。"
+
+#: src/testing/testing.c:1737
+#, fuzzy, c-format
+msgid "Could not start `%s' process to copy configuration file.\n"
+msgstr "找�到主机“%s�的 IP：%s\n"
+
+#: src/testing/testing.c:1740
+#, fuzzy
+msgid "Failed to copy new configuration to remote machine."
+msgstr "�存�置失败。"
+
+#: src/testing/testing.c:1895
+#, fuzzy
+msgid "Peers failed to connect"
 msgstr ""
+"\n"
+"按任�键继续\n"
 
-#: src/transport/plugin_transport_wlan.c:988
-#: src/transport/plugin_transport_wlan.c:1151
-#: src/transport/plugin_transport_wlan.c:1172
-#: src/transport/plugin_transport_wlan.c:1203
-#: src/transport/plugin_transport_wlan.c:2378
-#: src/transport/plugin_transport_wlan.c:3240
-msgid "# wlan pending sessions"
+#: src/testing/testing.c:2035
+#, fuzzy
+msgid "Failed to connect to core service of first peer!\n"
+msgstr "加载 sqstore �务失败。检查您的�置�\n"
+
+#: src/testing/testing.c:2274
+msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1246
-#: src/transport/plugin_transport_wlan.c:1933
-msgid "# wlan pending fragments"
+#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
+#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
+#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
+#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
+#, fuzzy, c-format
+msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+msgstr "�置�满足�置规范文件“%s�的约��\n"
+
+#: src/testing/testing_group.c:1932
+#, c-format
+msgid "Target is %d connections per peer."
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1407
+#: src/testing/testing_group.c:2179
 #, c-format
 msgid ""
-"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
+"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
+"greater than 0\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1774
-msgid "# wlan hello beacons send"
+#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
+#, c-format
+msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1807
-#: src/transport/plugin_transport_wlan.c:2022
-#: src/transport/plugin_transport_wlan.c:2117
+#: src/testing/testing_group.c:2246
 #, c-format
-msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
+msgid "natural log of %d is %d, will run %d iterations\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2008
-msgid "# wlan acks send"
+#: src/testing/testing_group.c:2249
+#, c-format
+msgid "Total connections added thus far: %u!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2079
-msgid "# wlan fragments send"
+#: src/testing/testing_group.c:2290
+#, c-format
+msgid "Total connections added for small world: %d!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2245
+#: src/testing/testing_group.c:2342
 #, c-format
-msgid "Wlan Address len %d is wrong\n"
+msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2250
-msgid "# wlan messages queued"
+#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#, c-format
+msgid ""
+"No `%s' specified in peer configuration in section `%s', cannot copy friends "
+"file!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2339
-#: src/transport/plugin_transport_wlan.c:2996
-#: src/transport/plugin_transport_wlan.c:3243
-msgid "# wlan mac endpoints"
+#: src/testing/testing_group.c:3020
+msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2567
-msgid "# wlan whole messages received"
-msgstr ""
+#: src/testing/testing_group.c:3133
+#, fuzzy, c-format
+msgid "Copying file with command cp %s %s\n"
+msgstr "“%s�以错误� %s 失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:2770
-msgid "# wlan hello messages received"
-msgstr ""
+#: src/testing/testing_group.c:3156
+#, fuzzy, c-format
+msgid "Copying file with command scp %s %s\n"
+msgstr "“%s�以错误� %s 失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:2807
-msgid "# wlan fragments received"
+#: src/testing/testing_group.c:3173
+#, c-format
+msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2859
-msgid "# wlan acks received"
+#: src/testing/testing_group.c:3191
+#, c-format
+msgid "File %d copied\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2956
-msgid "# wlan mac endpoints timeouts"
-msgstr ""
+#: src/testing/testing_group.c:3206
+#, fuzzy
+msgid "Finished copying all blacklist files!\n"
+msgstr "无法解�“%s�(%s)：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:2980
-msgid "# wlan mac endpoints created"
+#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
+#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
+msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3038
-msgid "# wlan WLAN_HELPER_DATA received"
+#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
+#: src/testing/testing_group.c:5035
+#, c-format
+msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3094
-msgid "# wlan messages for this client received"
+#: src/testing/testing_group.c:3608
+#, c-format
+msgid "Offering HELLO of peer %s to peer %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3105
-msgid "# wlan messages inside WLAN_HELPER_DATA received"
+#: src/testing/testing_group.c:3734
+#, c-format
+msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:251
-msgid "No transport plugins configured, peer will never communicate\n"
+#: src/testing/testing_group.c:3988
+msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:264
-#, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
+#: src/testing/testing_group.c:3993
+msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:314
-#, c-format
-msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+#: src/testing/testing_group.c:3998
+msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:321
-#, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
+#: src/testing/testing_group.c:4002
+msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:354
-#, c-format
-msgid "Transmitting %u bytes to %s\n"
+#: src/testing/testing_group.c:4006
+msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:374
-#, fuzzy, c-format
-msgid "Connected to %s\n"
-msgstr "“%s�已连接到“%s�。\n"
-
-#: src/transport/gnunet-transport.c:405
-#, fuzzy, c-format
-msgid "Disconnected from %s\n"
-msgstr "“%s�已连接到“%s�。\n"
+#: src/testing/testing_group.c:4010
+msgid "Creating Erdos-Renyi topology\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:434
-#, c-format
-msgid "Received %u bytes from %s\n"
+#: src/testing/testing_group.c:4014
+msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:448
-#, fuzzy, c-format
-msgid "Peer `%s': %s %s\n"
-msgstr "�行 %s失败：%s %d\n"
+#: src/testing/testing_group.c:4018
+msgid "Creating Scale Free topology\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:512
-#, fuzzy, c-format
-msgid "Failed to parse peer identity `%s'\n"
-msgstr "解��置文件“%s�失败\n"
+#: src/testing/testing_group.c:4023
+msgid "Creating straight line topology\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:549
-msgid "measure how fast we are receiving data (until CTRL-C)"
+#: src/testing/testing_group.c:4027
+msgid "Creating topology from file!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:552
-#, fuzzy
-msgid "try to connect to the given peer"
-msgstr "�始化“%s��务失败。\n"
+#: src/testing/testing_group.c:4043
+msgid "Creating no allowed topology (all peers can connect at core level)\n"
+msgstr ""
 
-#: src/transport/gnunet-transport.c:555
-msgid "provide information about all current connections (once)"
+#: src/testing/testing_group.c:4058
+msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:559
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
+#: src/testing/testing_group.c:4064
+msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:562
-msgid "test transport configuration (involves external server)"
+#: src/testing/testing_group.c:4081
+msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
-msgid "do not resolve hostnames"
+#: src/testing/testing_group.c:4087
+msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:573
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "�始化“%s��务失败。\n"
+#: src/testing/testing_group.c:4093
+msgid "Blacklisting all but small world (2d-torus) topology\n"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:410
-msgid "# address records discarded"
+#: src/testing/testing_group.c:4099
+msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:459
-#, c-format
-msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+#: src/testing/testing_group.c:4105
+msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:496
-msgid "# PING without HELLO messages sent"
+#: src/testing/testing_group.c:4111
+msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:554
-msgid "# address revalidations started"
+#: src/testing/testing_group.c:4117
+msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:775
-msgid "# PING message for different peer received"
+#: src/testing/testing_group.c:4152
+msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:810
-#, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+#: src/testing/testing_group.c:4158
+msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:878
-msgid "# PONGs unicast via reliable transport"
+#: src/testing/testing_group.c:4173
+#, fuzzy
+msgid "Failed during blacklist file copying!\n"
+msgstr "解��置文件“%s�失败\n"
+
+#: src/testing/testing_group.c:4179
+msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:887
-msgid "# PONGs multicast to all available addresses"
+#: src/testing/testing_group.c:5263
+msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1009
-msgid "# PONGs dropped, no matching pending validation"
+#: src/testing/testing_group.c:5270
+msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1034
-msgid "# PONGs dropped, signature expired"
+#: src/testing/testing_group.c:5277
+msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1093
-#, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
+#: src/testing/testing_group.c:5283
+msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:253
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+#: src/testing/testing_group.c:5290
+msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:258
-msgid "# messages dropped due to slow client"
+#: src/testing/testing_group.c:5297
+msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:405
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+#: src/testing/testing_group.c:5304
+msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:523
-msgid "# bytes payload received for other peers"
+#: src/testing/testing_group.c:5311
+msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:540
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/testing/testing_group.c:5318
+msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:591
-msgid "# REQUEST CONNECT messages received"
+#: src/testing/testing_group.c:5324
+msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/transport/transport_api.c:588
-#, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
+#: src/testing/testing_group.c:5330
+msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:158
-msgid "# bytes payload discarded due to not connected peer "
+#: src/testing/testing_group.c:5340
+#, c-format
+msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:555
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+#: src/testing/testing_group.c:5348
+#, c-format
+msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:564
-msgid "Transport service could not access hostkey.  Exiting.\n"
+#: src/testing/testing_group.c:5357
+#, c-format
+msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:159
+#: src/testing/testing_group.c:5367
 #, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
+msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/dv/dv_api.c:179
+#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:648
 #, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "�始化“%s��务失败。\n"
+msgid "Could not read hostkeys file!\n"
+msgstr "找�到接�“%s�的一个 IP 地�。\n"
+
+#: src/testing/testing_group.c:6131
+#, fuzzy, c-format
+msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgstr "解��置文件“%s�失败\n"
 
 #: src/topology/gnunet-daemon-topology.c:244
 msgid "# peers blacklisted"
@@ -3740,12 +3970,6 @@ msgstr ""
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:875
-#: src/hostlist/hostlist-server.c:184
-#, c-format
-msgid "Error in communication with PEERINFO service: %s\n"
-msgstr ""
-
 #: src/topology/gnunet-daemon-topology.c:950
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
@@ -3829,709 +4053,1527 @@ msgstr ""
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/chat/chat.c:175
-msgid "Could not transmit confirmation receipt\n"
-msgstr ""
+#: 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/chat/chat.c:283
-msgid "The current user must be the the first one joined\n"
+#: src/transport/gnunet-service-transport_blacklist.c:254
+#, c-format
+msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/chat/chat.c:412
+#: src/transport/gnunet-service-transport_blacklist.c:266
 #, fuzzy, c-format
-msgid "Unknown message type: '%u'\n"
-msgstr "未知�作“%s�。\n"
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "解��置文件“%s�失败\n"
 
-#: src/chat/chat.c:472
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
 #, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "�置文件“%s�已写入。\n"
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr "�置文件“%s�第 %d 行有语法错误。\n"
 
-#: src/chat/chat.c:480
-#, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "解��置文件“%s�失败\n"
+#: 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"
+msgstr ""
 
-#: src/chat/chat.c:498
+#: src/transport/gnunet-service-transport_blacklist.c:350
 #, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "打开日志文件“%s�失败：%s\n"
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr "�置文件“%s�第 %d 行有语法错误。\n"
 
-#: src/chat/chat.c:559
-msgid "Could not serialize metadata\n"
+#: src/transport/gnunet-service-transport_blacklist.c:364
+#, c-format
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/chat/chat.c:674
-#, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "�始化“%s��务失败。\n"
+#: src/transport/gnunet-service-transport_blacklist.c:523
+#: src/transport/gnunet-service-transport_blacklist.c:764
+msgid "# disconnects due to blacklist"
+msgstr ""
 
-#: src/chat/chat.c:680
-msgid "Undefined mandatory parameter: joinCallback\n"
+#: src/transport/gnunet-service-transport.c:158
+msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/chat/chat.c:686
-msgid "Undefined mandatory parameter: messageCallback\n"
+#: src/transport/gnunet-service-transport.c:572
+msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/chat/chat.c:692
-msgid "Undefined mandatory parameter: memberCallback\n"
+#: src/transport/gnunet-service-transport.c:581
+msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:267
-#, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "�存�置失败。"
+#: src/transport/gnunet-service-transport_clients.c:353
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:546
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "�存�置失败。"
+#: src/transport/gnunet-service-transport_clients.c:358
+msgid "# messages dropped due to slow client"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:729
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "�存�置失败。"
+#: src/transport/gnunet-service-transport_clients.c:510
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:907
+#: src/transport/gnunet-service-transport_clients.c:628
+msgid "# bytes payload received for other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:645
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:696
+msgid "# REQUEST CONNECT messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_hello.c:172
+msgid "# refreshed my HELLO"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:482
+msgid "# failed connection attempts due to timeout"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:883
+msgid "# peers disconnected due to external request"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:966
 #, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "�存�置失败。"
+msgid "# fast reconnects failed"
+msgstr ""
+"\n"
+"按任�键继续\n"
 
-#: src/chat/gnunet-chat.c:92
-msgid "Joined\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1022
+msgid "# peers disconnected due to timeout"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
-msgid "anonymous"
-msgstr "匿�"
+#: src/transport/gnunet-service-transport_neighbours.c:1047
+msgid "# keepalives sent"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:130
+#: src/transport/gnunet-service-transport_neighbours.c:1088
+msgid "# peers disconnected due to global disconnect"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1888
+#: src/transport/gnunet-service-transport_neighbours.c:1909
+msgid "# messages not sent (no such peer or not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1925
+msgid "# bytes in message queue for other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1977
+msgid "# messages discarded due to lack of neighbour record"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2013
+msgid "# bandwidth quota violations by other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2031
+msgid "# ms throttling suggested"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2060
+msgid "# KEEPALIVE messages discarded (not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2113
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2121
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2187
+msgid "# SET QUOTA messages ignored (no such peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2205
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2323
+msgid "# disconnect messages ignored (old format)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2336
+msgid "# disconnect messages ignored (timestamp)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2411
+msgid "# unexpected CONNECT_ACK messages (no peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2453
+msgid "# unexpected CONNECT_ACK messages"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2544
+msgid "# unexpected ACK messages"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:111
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:118
+#, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:122
+#, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:150
 #, fuzzy, c-format
-msgid "(%s) `%s' said: %s\n"
-msgstr "“%s�说：%s\n"
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "解��置文件“%s�失败\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/transport/gnunet-service-transport_validation.c:410
+msgid "# address records discarded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:459
+#, c-format
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:508
+msgid "# PING without HELLO messages sent"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:566
+msgid "# address revalidations started"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:798
+msgid "# PING message for different peer received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:833
+#, 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:919
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:928
+msgid "# PONGs multicast to all available addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1050
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1075
+msgid "# PONGs dropped, signature expired"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1134
+#, c-format
+msgid "Adding `%s' without addresses for peer `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:256
+msgid "No transport plugins configured, peer will never communicate\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:269
+#, c-format
+msgid "No port configured for plugin `%s', cannot test it\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:319
+#, c-format
+msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:326
+#, c-format
+msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:359
+#, c-format
+msgid "Transmitting %u bytes to %s\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:379
 #, fuzzy, c-format
-msgid "(%s) `%s' said to you: %s\n"
-msgstr "“%s�对您说：%s\n"
+msgid "Connected to %s\n"
+msgstr "“%s�已连接到“%s�。\n"
 
-#: src/chat/gnunet-chat.c:139
+#: src/transport/gnunet-transport.c:410
 #, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
-msgstr "“%s�对您说：%s\n"
+msgid "Disconnected from %s\n"
+msgstr "“%s�已连接到“%s�。\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/transport/gnunet-transport.c:439
+#, c-format
+msgid "Received %u bytes from %s\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:453
 #, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "“%s�对您说：%s\n"
+msgid "Peer `%s': %s %s\n"
+msgstr "�行 %s失败：%s %d\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/transport/gnunet-transport.c:483
+#, fuzzy, c-format
+msgid "Peer `%s' disconnected\n"
+msgstr ""
+"\n"
+"按任�键继续\n"
+
+#: src/transport/gnunet-transport.c:539
+#, fuzzy, c-format
+msgid "Failed to parse peer identity `%s'\n"
+msgstr "解��置文件“%s�失败\n"
+
+#: src/transport/gnunet-transport.c:587
+msgid "measure how fast we are receiving data (until CTRL-C)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:590
+#, fuzzy
+msgid "try to connect to the given peer"
+msgstr "�始化“%s��务失败。\n"
+
+#: src/transport/gnunet-transport.c:593
+msgid "provide information about all current connections (once)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:596
+msgid "provide information about all current connections (continuously)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:599
+msgid "do not resolve hostnames"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:603
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:606
+msgid "test transport configuration (involves external server)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:614
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "�始化“%s��务失败。\n"
+
+#: src/transport/plugin_transport_http.c:981
+msgid "Disabling IPv6 since it is not supported on this system!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:1029
+#, fuzzy
+msgid "Require valid port number for service in configuration!\n"
+msgstr "�存�置失败。"
+
+#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "打开日志文件“%s�失败：%s\n"
+
+#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "找�到接�“%s�的一个 IP 地�。\n"
+
+#: src/transport/plugin_transport_http.c:1176
 #, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
+msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:148
+#: src/transport/plugin_transport_http.c:1189
 #, c-format
-msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
+msgid "FREEING %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:151
+#: src/transport/plugin_transport_http.c:1264
+msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:1277
+#, fuzzy
+msgid "Port is required! Fix in configuration\n"
+msgstr ""
+"\n"
+"结��置。\n"
+
+#: src/transport/plugin_transport_http.c:1288
+msgid "Port 0, client only mode\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:1308
 #, c-format
-msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
+msgid ""
+"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:156
+#: src/transport/plugin_transport_http.c:1338
 #, c-format
 msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
+"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:159
-#, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "“%s�对您说：%s\n"
+#: src/transport/plugin_transport_http_client.c:621
+#, c-format
+msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:162
+#: src/transport/plugin_transport_http_server.c:189
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:213
+msgid "No usable TLS certificate found and creating one failed!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:370
 #, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
+msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:193
+#: src/transport/plugin_transport_smtp.c:457
+msgid "SMTP filter string to invalid, lacks ': '\n"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:466
 #, c-format
-msgid "'%s' acknowledged message #%d\n"
+msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/transport/plugin_transport_smtp.c:561
+#: src/transport/plugin_transport_smtp.c:571
+#: src/transport/plugin_transport_smtp.c:584
+#: src/transport/plugin_transport_smtp.c:603
+#: src/transport/plugin_transport_smtp.c:626
+#: src/transport/plugin_transport_smtp.c:634
+#: src/transport/plugin_transport_smtp.c:647
+#: src/transport/plugin_transport_smtp.c:658
 #, c-format
-msgid "`%s' entered the room\n"
-msgstr "“%s�进入了房间\n"
+msgid "SMTP: `%s' failed: %s.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/transport/plugin_transport_smtp.c:801
+msgid "No email-address specified, can not start SMTP transport.\n"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:813
+msgid "# bytes received via SMTP"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:814
+msgid "# bytes sent via SMTP"
+msgstr ""
+
+#: src/transport/plugin_transport_smtp.c:816
+msgid "# bytes dropped by SMTP (outgoing)"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:512
 #, c-format
-msgid "`%s' left the room\n"
-msgstr "“%s�离开了房间\n"
+msgid "Unexpected address length: %u bytes\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/transport/plugin_transport_tcp.c:616
+#: src/transport/plugin_transport_tcp.c:705
+#: src/transport/plugin_transport_tcp.c:757
+#: src/transport/plugin_transport_tcp.c:830
+#: src/transport/plugin_transport_tcp.c:909
+msgid "# bytes currently in TCP buffers"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:622
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:1561
+msgid "# TCP sessions active"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:709
+msgid "# bytes discarded by TCP (timeout)"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:760
+msgid "# bytes transmitted via TCP"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:834
+msgid "# bytes discarded by TCP (disconnect)"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1081
+#, c-format
+msgid "Address of unexpected length: %u\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1116
+msgid "Found valid IPv4 NAT address (creating session)!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1186
+msgid "# transport-service disconnect requests for TCP"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1603
+msgid "# TCP WELCOME messages received"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1756
+msgid "# bytes received via TCP"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1823
+msgid "# network-level TCP disconnect events"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1976
 #, fuzzy
-msgid "Could not change username\n"
-msgstr "已将用户�改为“%s�。\n"
+msgid "Failed to start service.\n"
+msgstr "�始化“%s��务失败。\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/transport/plugin_transport_tcp.c:2039
 #, c-format
-msgid "Joining room `%s' as user `%s'...\n"
+msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:320
-#, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "已将用户�改为“%s�。\n"
+#: src/transport/plugin_transport_tcp.c:2062
+#, c-format
+msgid "TCP transport listening on port %llu\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:333
+#: src/transport/plugin_transport_tcp.c:2066
+msgid "TCP transport not listening on any port (client only)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:2070
 #, c-format
-msgid "Users in room `%s': "
-msgstr "房间“%s�中的用户："
+msgid "TCP transport advertises itself as being on port %llu\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:371
-msgid "Syntax: /msg USERNAME MESSAGE"
-msgstr "语法：/msg 用户� 消�"
+#: src/transport/plugin_transport_udp_broadcasting.c:130
+msgid "# IPv6 multicast HELLO beacons received via udp"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:379
+#: src/transport/plugin_transport_udp_broadcasting.c:172
+msgid "# IPv4 broadcast HELLO beacons received via udp"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:393
 #, c-format
-msgid "Unknown user `%s'\n"
-msgstr "未知的用户“%s�\n"
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/transport/plugin_transport_udp.c:1971
+#, fuzzy
+msgid "Failed to open UDP sockets\n"
+msgstr "打开日志文件“%s�失败：%s\n"
+
+#: src/transport/plugin_transport_udp.c:2054
 #, c-format
-msgid "User `%s' is currently not in the room!\n"
-msgstr "用户“%s�当��在房间里�\n"
+msgid "Given `%s' option is out of range: %llu > %u\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:448
+#: src/transport/plugin_transport_udp.c:2098
 #, fuzzy, c-format
-msgid "Unknown command `%s'\n"
-msgstr "未知的命令“%s�。\n"
+msgid "Invalid IPv6 address: `%s'\n"
+msgstr "无效的进程优先级“%s�\n"
 
-#: src/chat/gnunet-chat.c:459
-msgid ""
-"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
-"leave the current room"
+#: src/transport/plugin_transport_unix.c:1051
+#, fuzzy
+msgid "Failed to open UNIX sockets\n"
+msgstr "打开日志文件“%s�失败：%s\n"
+
+#: src/transport/plugin_transport_wlan.c:880
+msgid "# wlan session timeouts"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
-msgid ""
-"Use `/nick nickname' to change your nickname.  This will cause you to leave "
-"the current room and immediately rejoin it with the new name."
+#: src/transport/plugin_transport_wlan.c:904
+msgid "# wlan session created"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/transport/plugin_transport_wlan.c:988
+#: src/transport/plugin_transport_wlan.c:1151
+#: src/transport/plugin_transport_wlan.c:1172
+#: src/transport/plugin_transport_wlan.c:1203
+#: src/transport/plugin_transport_wlan.c:2398
+#: src/transport/plugin_transport_wlan.c:3260
+msgid "# wlan pending sessions"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1246
+#: src/transport/plugin_transport_wlan.c:1933
+msgid "# wlan pending fragments"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1407
+#, c-format
 msgid ""
-"Use `/msg nickname message' to send a private message to the specified user"
+"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
-msgid "The `/notice' command is an alias for `/msg'"
+#: src/transport/plugin_transport_wlan.c:1774
+msgid "# wlan hello beacons send"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
-msgid "The `/query' command is an alias for `/msg'"
+#: src/transport/plugin_transport_wlan.c:1807
+#: src/transport/plugin_transport_wlan.c:2022
+#: src/transport/plugin_transport_wlan.c:2117
+#, c-format
+msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
-msgid "Use `/sig message' to send a signed public message"
+#: src/transport/plugin_transport_wlan.c:2008
+msgid "# wlan acks send"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
-msgid "Use `/ack message' to require signed acknowledgment of the message"
+#: src/transport/plugin_transport_wlan.c:2079
+msgid "# wlan fragments send"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
-msgid "Use `/anonymous message' to send a public anonymous message"
+#: src/transport/plugin_transport_wlan.c:2223
+#, c-format
+msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
-msgid "The `/anon' command is an alias for `/anonymous'"
+#: src/transport/plugin_transport_wlan.c:2359
+#: src/transport/plugin_transport_wlan.c:3016
+#: src/transport/plugin_transport_wlan.c:3263
+msgid "# wlan mac endpoints"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
-msgid "Use `/quit' to terminate gnunet-chat"
+#: src/transport/plugin_transport_wlan.c:2587
+msgid "# wlan whole messages received"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
-msgid "The `/leave' command is an alias for `/quit'"
+#: src/transport/plugin_transport_wlan.c:2790
+msgid "# wlan hello messages received"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
-msgid "Use `/names' to list all of the current members in the chat room"
+#: src/transport/plugin_transport_wlan.c:2827
+msgid "# wlan fragments received"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
-msgid "Use `/help command' to get help for a specific command"
+#: src/transport/plugin_transport_wlan.c:2879
+msgid "# wlan acks received"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
-msgid "You must specify a nickname\n"
-msgstr "您必须指定一个昵称\n"
+#: src/transport/plugin_transport_wlan.c:2976
+msgid "# wlan mac endpoints timeouts"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:622
-#, c-format
-msgid "Failed to join room `%s'\n"
+#: src/transport/plugin_transport_wlan.c:3000
+msgid "# wlan mac endpoints created"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:655
-msgid "set the nickname to use (required)"
-msgstr "设置�使用的昵称(必须)"
+#: src/transport/plugin_transport_wlan.c:3058
+msgid "# wlan WLAN_HELPER_DATA received"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:658
-msgid "set the chat room to join"
-msgstr "设置�加入的�天室"
+#: src/transport/plugin_transport_wlan.c:3114
+msgid "# wlan messages for this client received"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:670
-msgid "Join a chat on GNUnet."
+#: src/transport/plugin_transport_wlan.c:3125
+msgid "# wlan messages inside WLAN_HELPER_DATA received"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
+#: src/transport/transport_api.c:588
 #, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
+msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/util/bio.c:136 src/util/bio.c:142
+#, fuzzy, c-format
+msgid "Error reading `%s': %s"
+msgstr "创建用户出错"
+
+#: src/util/bio.c:143
+msgid "End of file"
 msgstr ""
 
-#: src/nat/nat.c:803
+#: src/util/bio.c:195
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/nat/nat.c:852
-#, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "�行 %s失败：%s %d\n"
+#: src/util/bio.c:205
+#, c-format
+msgid "String `%s' longer than allowed (%u > %u)"
+msgstr ""
 
-#: src/nat/nat.c:1121
-#, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "�存�置失败。"
+#: src/util/bio.c:250
+#, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+msgstr ""
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#: src/util/bio.c:264
+#, c-format
+msgid "Metadata `%s' failed to deserialize"
+msgstr ""
+
+#: src/util/client.c:304
 #, c-format
 msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/util/client.c:312
+#, c-format
+msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/util/client.c:657
+msgid "Failure to transmit TEST request.\n"
+msgstr ""
+
+#: src/util/client.c:717 src/util/service.c:919
 #, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/util/client.c:859
+#, c-format
+msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/nat/nat_test.c:418
+#: src/util/client.c:875
 #, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:124
+#: src/util/client.c:1143
+msgid "Could not submit request, not expecting to receive a response.\n"
+msgstr ""
+
+#: src/util/common_logging.c:239 src/util/common_logging.c:889
+msgid "DEBUG"
+msgstr "调试"
+
+#: src/util/common_logging.c:241 src/util/common_logging.c:887
+msgid "INFO"
+msgstr "信�"
+
+#: src/util/common_logging.c:243 src/util/common_logging.c:885
+msgid "WARNING"
+msgstr "警告"
+
+#: src/util/common_logging.c:245 src/util/common_logging.c:883
+msgid "ERROR"
+msgstr "错误"
+
+#: src/util/common_logging.c:247 src/util/common_logging.c:891
+msgid "NONE"
+msgstr ""
+
+#: src/util/common_logging.c:609
+#, fuzzy, c-format
+msgid "Failed to create or access directory for log file `%s'\n"
+msgstr "解��置文件“%s�失败\n"
+
+#: src/util/common_logging.c:724
+#, fuzzy, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgstr "消�“%.*s���了 %u 次，在最近 %llu 秒内\n"
+
+#: src/util/common_logging.c:892
+msgid "INVALID"
+msgstr ""
+
+#: src/util/common_logging.c:991
+msgid "unknown address"
+msgstr ""
+
+#: src/util/common_logging.c:1029
+msgid "invalid address"
+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/util/configuration.c:817
 #, c-format
-msgid "Block not of type %u\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:131
-msgid "Size mismatch for block\n"
+#: src/util/connection.c:461
+#, fuzzy, c-format
+msgid "Access denied to `%s'\n"
+msgstr "“%s�已连接到“%s�。\n"
+
+#: src/util/connection.c:476
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:140
+#: src/util/connection.c:642
 #, c-format
-msgid "Block of type %u is malformed\n"
+msgid ""
+"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/fs/plugin_block_fs.c:131
-msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+#: 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/util/connection.c:862
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' (%p)\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/util/connection.c:1015
+#, c-format
+msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/block/block.c:105
+#: src/util/connection.c:1528
+#, c-format
+msgid ""
+"Could not satisfy pending transmission request, socket closed or connect "
+"failed (%p).\n"
+msgstr ""
+
+#: src/util/connection.c:1564
 #, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
+msgid "Failed to send to `%s': %s\n"
 msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/mesh/gnunet-service-mesh.c:4214
-msgid "MESH: Wrong CORE service\n"
+#: src/util/container_bloomfilter.c:507
+#, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+
+#: src/util/crypto_random.c:280
+#, c-format
+msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4419
-#, fuzzy
-msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
-msgstr "立��存�置？"
+#: src/util/crypto_random.c:308
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt 的版本�符�预期(�求版本 %s)。\n"
+
+#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#, fuzzy, c-format
+msgid "Could not aquire lock on file `%s': %s...\n"
+msgstr "无法解�“%s�(%s)：%s\n"
 
-#: src/mesh/gnunet-service-mesh.c:4428
+#: src/util/crypto_rsa.c:623
 #, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
-msgstr "找�到接�“%s�的一个 IP 地�。\n"
+msgid "Creating a new private key.  This may take a while.\n"
+msgstr "正在�动数�仓库转�(�能需�一段时间)。\n"
 
-#: src/hostlist/hostlist-client.c:286
-msgid "# bytes downloaded from hostlist servers"
+#: src/util/crypto_rsa.c:641
+#, c-format
+msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
-msgid "# invalid HELLOs downloaded from hostlist servers"
+#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/util/crypto_rsa.c:700
 #, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgid ""
+"When trying to read hostkey file `%s' I found %u bytes but I need at least "
+"%u.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:330
-msgid "# valid HELLOs downloaded from hostlist servers"
+#: src/util/crypto_rsa.c:720
+#, c-format
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/util/crypto_rsa.c:738
 #, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
+msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
-msgid "# advertised hostlist URIs"
+#: src/util/crypto_rsa.c:959
+#, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/util/disk.c:479
+#, fuzzy, c-format
+msgid "`%s' failed for drive `%S': %u\n"
+msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
+
+#: src/util/disk.c:1087
 #, c-format
-msgid "# advertised URI `%s' downloaded"
+msgid "Expected `%s' to be a directory!\n"
+msgstr "“%s�应为目录�\n"
+
+#: src/util/disk.c:1441 src/util/service.c:1580
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "无法获�有关用户“%s�的信�：%s\n"
+
+#: src/util/disk.c:1759
+#, c-format
+msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/util/getopt.c:672
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s：选项“%s�有歧义\n"
+
+#: src/util/getopt.c:696
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s：选项“--%s���许有�数\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/util/getopt.c:718 src/util/getopt.c:886
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s：选项“%s��求有一个�数\n"
+
+#: src/util/getopt.c:747
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s：无法识别的选项“--%s�\n"
+
+#: src/util/getopt.c:751
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s：无法识别的选项“%c%s�\n"
+
+#: src/util/getopt.c:776
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s：�法选项 -- %c\n"
+
+#: src/util/getopt.c:778
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s：无效选项 -- %c\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/util/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s：选项“-W %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/util/getopt.c:1038
+#, fuzzy, c-format
+msgid "Use %s to get a list of options.\n"
+msgstr "请使用 --help 获�选项列表。\n"
+
+#: src/util/getopt_helpers.c:84
 #, c-format
 msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr "长选项的必选�数对短选项也是必选的。\n"
+
+#: 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/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:805
+#: src/util/gnunet-resolver.c:154
+msgid "Use build-in GNUnet stub resolver"
+msgstr ""
+
+#: src/util/gnunet-service-resolver.c:288
 #, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
+msgid "Could not resolve `%s' (%s): %s\n"
+msgstr "无法解�“%s�(%s)：%s\n"
+
+#: src/util/gnunet-service-resolver.c:358
+#: src/util/gnunet-service-resolver.c:399
+#, c-format
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "找�到主机“%s�的 IP：%s\n"
+
+#: src/util/gnunet-service-resolver.c:494
+#, c-format
+msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:822
+#: src/util/gnunet-service-resolver.c:529
 #, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
+msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/util/helper.c:239
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
+msgid "Error reading from `%s': %s\n"
+msgstr "创建用户出错"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/util/helper.c:254
 #, c-format
-msgid "Download of hostlist `%s' completed.\n"
+msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:856
+#: src/util/helper.c:264
 #, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
+msgid "Got %u bytes from helper `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/util/helper.c:273
+#, fuzzy, c-format
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "打开日志文件“%s�失败：%s\n"
+
+#: src/util/helper.c:431
+#, fuzzy, c-format
+msgid "Error writing to `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/util/network.c:1204
 #, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
-msgid "# hostlist downloads initiated"
-msgstr ""
+#: src/util/os_installation.c:299
+#, fuzzy, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr "无法确定安装路径。请�试设置“%s�\n"
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
-msgid "# milliseconds between hostlist downloads"
+#: src/util/os_installation.c:486
+#, fuzzy, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "找�到主机“%s�的 IP：%s\n"
+
+#: src/util/os_installation.c:492
+#, fuzzy, c-format
+msgid "access (%s, X_OK) failed: %s\n"
+msgstr "“%s�说：%s\n"
+
+#: src/util/os_installation.c:507
+#, fuzzy, c-format
+msgid "stat (%s) failed: %s\n"
+msgstr "“%s�说：%s\n"
+
+#: src/util/os_priority.c:117
+#, c-format
+msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/util/plugin.c:89
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "�件机构�始化失败：%s�\n"
+
+#: src/util/plugin.c:146
+#, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
-msgid "Scheduled saving of hostlists\n"
+#: src/util/plugin.c:219
+#, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/util/plugin.c:349
+#, fuzzy
+msgid "Could not determine plugin installation path.\n"
+msgstr "无法确定用户界�定义文件。"
+
+#: src/util/pseudonym.c:273
+#, fuzzy, c-format
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr "打开日志文件“%s�失败：%s\n"
+
+#: src/util/pseudonym.c:338
+msgid "no-name"
+msgstr "无�称"
+
+#: src/util/resolver_api.c:202
 #, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
+msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
-msgid "# active connections"
+#: 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/hostlist/hostlist-client.c:1253
+#: src/util/resolver_api.c:351
+#, fuzzy, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "GNUnet 现在使用 IP 地� %s。\n"
+
+#: src/util/resolver_api.c:355
 #, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
+msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
+#: src/util/resolver_api.c:426
 #, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/util/resolver_api.c:807
 #, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
+msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/util/resolver_api.c:901
 #, c-format
-msgid "Hostlist file `%s' is not existing\n"
+msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
+#: src/util/resolver_api.c:906
 #, fuzzy, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
-msgstr "无法解�“%s��确定已方的 IP 地�：%s\n"
+msgid "Could not resolve our FQDN : %s\n"
+msgstr "无法解�“%s�(%s)：%s\n"
 
-#: src/hostlist/hostlist-client.c:1338
+#: src/util/resolver_api.c:938
 #, c-format
-msgid "%u hostlist URIs loaded from file\n"
+msgid "Resolving our hostname `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
-msgid "# hostlist URIs read from file"
+#: src/util/scheduler.c:870
+msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/util/scheduler.c:1000
 #, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1387
+#: src/util/server.c:397
 #, fuzzy, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
-msgstr "无法解�“%s��确定已方的 IP 地�：%s\n"
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
 
-#: src/hostlist/hostlist-client.c:1392
+#: src/util/server.c:406
 #, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
+msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/util/server.c:411
+#, fuzzy, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
+
+#: src/util/server.c:640
 #, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
+msgid ""
+"Processing code for message of type %u did not call "
+"GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1428
-msgid "# hostlist URIs written to file"
-msgstr ""
+#: 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 "Invalid format for IP: `%s'\n"
+msgstr "IP 格�无效：“%s�\n"
 
-#: src/hostlist/hostlist-client.c:1480
-msgid "Learning is enabled on this peer\n"
+#: src/util/service.c:170
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "网络表示法无效(“/%d� 在 IPv4 CIDR 中是�法的)。"
+
+#: src/util/service.c:263
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "无效的网络表示法(没有以“;�结尾：“%s�)\n"
+
+#: src/util/service.c:296
+#, c-format
+msgid "Wrong format `%s' for netmask\n"
+msgstr "网络掩�的格�“%s�错误\n"
+
+#: src/util/service.c:326
+#, c-format
+msgid "Wrong format `%s' for network\n"
+msgstr "网络的格�“%s�错误\n"
+
+#: src/util/service.c:668
+#, c-format
+msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/util/service.c:673
 #, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
+msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
-msgid "Learning is not enabled on this peer\n"
+#: src/util/service.c:680
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
+#: src/util/service.c:724
 #, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1508
+#: src/util/service.c:752
 #, c-format
-msgid "Hostlist file `%s' could not be removed\n"
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:264
+#: src/util/service.c:869
+#, c-format
 msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:317
-msgid "advertise our hostlist to other peers"
+#: src/util/service.c:939
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:322
-msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+#: src/util/service.c:956
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
-msgid "enable learning about hostlist servers from other peers"
+#: src/util/service.c:1191
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
-msgid "provide a hostlist server"
+#: src/util/service.c:1242 src/util/service.c:1260
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:341
-msgid "GNUnet hostlist server and client"
+#: src/util/service.c:1287
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:134
-msgid "bytes in hostlist"
+#: src/util/service.c:1442
+#, fuzzy, c-format
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "�行 %s失败：%s %d\n"
+
+#: src/util/service.c:1475
+#, c-format
+msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:157
-msgid "expired addresses encountered"
+#: src/util/service.c:1521
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:205
-msgid "HELLOs without addresses encountered (ignored)"
+#: src/util/service.c:1525
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
-msgid "bytes not included in hostlist (size limit)"
+#: src/util/service.c:1529
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
+#: src/util/service.c:1581
+msgid "No such user"
+msgstr "无此用户"
+
+#: src/util/service.c:1594
 #, c-format
-msgid "Refusing `%s' request to hostlist server\n"
-msgstr ""
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "无法更改用户/组为“%s�：%s\n"
 
-#: src/hostlist/hostlist-server.c:272
-msgid "hostlist requests refused (not HTTP GET)"
+#: src/util/service.c:1657
+msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:280
-msgid "Sending 100 CONTINUE reply\n"
+#: src/util/signal.c:80
+#, c-format
+msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
+#: src/util/strings.c:143
+msgid "b"
+msgstr "b"
+
+#: src/util/strings.c:354
 #, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
-msgid "hostlist requests refused (upload data)"
+#: src/util/strings.c:462
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+msgstr "扩展“$HOME�失败：没有设置环境��“HOME�"
+
+#: src/util/strings.c:554
+msgid "ms"
+msgstr "毫秒"
+
+#: src/util/strings.c:559
+msgid "eternity"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
-msgid "Could not handle hostlist request since I do not have a response yet\n"
+#: src/util/strings.c:563
+msgid "s"
+msgstr "秒"
+
+#: src/util/strings.c:567
+msgid "m"
+msgstr "分"
+
+#: src/util/strings.c:571
+msgid "h"
+msgstr "æ—¶"
+
+#: src/util/strings.c:575
+msgid " days"
+msgstr " 天"
+
+#: src/util/strings.c:599
+msgid "end of time"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
-msgid "hostlist requests refused (not ready)"
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+msgid "# Active tunnels"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:306
-msgid "Received request for our hostlist\n"
+#: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
+#, fuzzy
+msgid "# Peers connected to mesh tunnels"
 msgstr ""
+"\n"
+"按任�键继续\n"
 
-#: src/hostlist/hostlist-server.c:307
-msgid "hostlist requests processed"
+#: src/vpn/gnunet-service-vpn.c:699
+msgid "# Bytes given to mesh for transmission"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:350
-msgid "# hostlist advertisements send"
+#: src/vpn/gnunet-service-vpn.c:737
+msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:397
-msgid "Advertisement message could not be queued by core\n"
+#: src/vpn/gnunet-service-vpn.c:772
+msgid "# Mesh tunnels created"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/vpn/gnunet-service-vpn.c:795
+#, fuzzy
+msgid "Failed to setup mesh tunnel!\n"
+msgstr "��消�失败。\n"
+
+#: src/vpn/gnunet-service-vpn.c:967
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:574
+#: src/vpn/gnunet-service-vpn.c:1285
+msgid "# ICMPv4 packets dropped (not allowed)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1306
+msgid "# ICMPv6 packets dropped (not allowed)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1511
+msgid "# Packets received from TUN interface"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
 #, c-format
-msgid "Hostlist service starts on %s:%llu\n"
+msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/vpn/gnunet-service-vpn.c:1600
+msgid "Received IPv4 packet with options (dropping it)\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:1614
 #, c-format
-msgid "Address to obtain hostlist: `%s'\n"
+msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:626
+#: src/vpn/gnunet-service-vpn.c:1697
+msgid "# ICMP packets received from mesh"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2038
+msgid "# UDP packets received from mesh"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2196
+msgid "# TCP packets received from mesh"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2347
+msgid "Failed to find unallocated IPv4 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2402
+msgid "Failed to find unallocated IPv6 address in VPN's range\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+msgid "# Active destinations"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2726
+msgid "Failed to allocate IP address for new destination\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3133
+msgid "IPv6 support disabled as this system does not support IPv6\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3165
+msgid "IPv4 support disabled as this system does not support IPv4\n"
+msgstr ""
+
+#: src/vpn/gnunet-vpn.c:151
+#, fuzzy
+msgid "Error creating tunnel\n"
+msgstr "创建用户出错"
+
+#: src/vpn/gnunet-vpn.c:195 src/vpn/gnunet-vpn.c:226
 #, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
+msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/vpn/gnunet-vpn.c:208
 #, fuzzy, c-format
-msgid "Could not find option `%s:%s' in configuration.\n"
-msgstr "找�到主机“%s�的 IP：%s\n"
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "%s：选项“%s�有歧义\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/vpn/gnunet-vpn.c:220
 #, c-format
-msgid "Loading hostkey from `%s' failed.\n"
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
-#, c-format
-msgid "I am peer `%s'.\n"
+#: src/vpn/gnunet-vpn.c:238
+#, fuzzy, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "“%s���用。\n"
+
+#: src/vpn/gnunet-vpn.c:260
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address.\n"
+msgstr "“%s���用。\n"
+
+#: src/vpn/gnunet-vpn.c:296
+msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
-msgid "output only the identity strings"
+#: src/vpn/gnunet-vpn.c:299
+msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
-msgid "output our own identity only"
+#: src/vpn/gnunet-vpn.c:302
+msgid "print IP address only after mesh tunnel has been created"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
-#, fuzzy
-msgid "Print information about peers."
-msgstr "无法获�有关用户“%s�的信�：%s\n"
+#: src/vpn/gnunet-vpn.c:305
+msgid "how long should the mapping be valid for new tunnels?"
+msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:144
-msgid "print this help"
+#: src/vpn/gnunet-vpn.c:308
+msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:154
-msgid "print the version number"
+#: src/vpn/gnunet-vpn.c:311
+msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:163
-msgid "configure logging to write logs to LOGFILE"
+#: src/vpn/gnunet-vpn.c:314
+msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:172
-msgid "configure logging to use LOGLEVEL"
+#: src/vpn/gnunet-vpn.c:317
+msgid "service is offered via TCP"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:181
-msgid "be verbose"
+#: src/vpn/gnunet-vpn.c:320
+msgid "service is offered via UDP"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:190
-msgid "use configuration file FILENAME"
+#: src/vpn/gnunet-vpn.c:329
+msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:430 src/include/gnunet_common.h:435
-#: src/include/gnunet_common.h:441
+#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
+#: src/include/gnunet_common.h:490
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:451
+#: src/include/gnunet_common.h:500
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:472 src/include/gnunet_common.h:479
+#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not access file: %s\n"
+#~ msgstr "错误：无法访问�务：%s\n"
+
+#, fuzzy
+#~ msgid "`%s' failed on file `%s': %s"
+#~ msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
+
+#, fuzzy
 #~ msgid "Failed to stop service `%s'!\n"
 #~ msgstr "打开日志文件“%s�失败：%s\n"
 
@@ -4564,46 +5606,10 @@ msgstr ""
 #~ 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"
 
@@ -4616,10 +5622,6 @@ msgstr ""
 #~ msgstr "无法为守护程�创建用户账户。"
 
 #, fuzzy
-#~ msgid "Found peer `%s'\n"
-#~ msgstr "未知的用户“%s�\n"
-
-#, fuzzy
 #~ msgid "Phase 3: sending messages\n"
 #~ msgstr "��消�失败。\n"
 
@@ -4916,9 +5918,6 @@ msgstr ""
 #~ msgid "Error: can't delete service: %s\n"
 #~ msgstr "错误：无法删除�务：%s\n"
 
-#~ msgid "Configuration saved."
-#~ msgstr "�置已�存"
-
 #~ msgid "Configuration changed. Save?"
 #~ msgstr "�置已更改。�存�？"
 
@@ -4962,15 +5961,9 @@ msgstr ""
 #~ msgid "generate configuration for gnunetd, the GNUnet daemon"
 #~ msgstr "为 GNUnet 守护程� gnunetd 生��置"
 
-#~ msgid "print a value from the configuration file to stdout"
-#~ msgstr "打��置文件中的一个值到标准输出"
-
 #~ msgid "Tool to setup GNUnet."
 #~ msgstr "设置 GNUnet 的工具。"
 
-#~ msgid "update a value in the configuration file"
-#~ msgstr "更改�置文件中的一个值"
-
 #~ msgid "Too many arguments.\n"
 #~ msgstr "�数过多。\n"
 
@@ -4983,9 +5976,6 @@ msgstr ""
 #~ msgid "Undefined option.\n"
 #~ msgstr "未定义的选项。\n"
 
-#~ msgid "`%s' is not available.\n"
-#~ msgstr "“%s���用。\n"
-
 #~ msgid "yes"
 #~ msgstr "是"