- exec arbitrary commands

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

diff --git a/po/zh_CN.po b/po/zh_CN.po
index dd312b989bf93f61282de40eedbb8d3be808de3c..fec9bf1975434104b7e453cd432b18b6022cf069 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2011-11-30 16:20+0100\n"
+"POT-Creation-Date: 2012-11-26 14:59+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,4578 +16,6613 @@ 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/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:90 src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614 src/include/gnunet_common.h:394
-#: src/include/gnunet_common.h:401
+#: src/arm/arm_api.c:162
+msgid "Failed to transmit shutdown request to client.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:166
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+msgid "Service `%s' is unknown to ARM.\n"
+msgstr "服务已删除。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/arm/gnunet-arm.c:171
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%u with error: %s"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+msgid "Service `%s' has been stopped.\n"
+msgstr "服务已删除。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:239
-#, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:174
+#, fuzzy, c-format
+msgid "Service `%s' was already running.\n"
+msgstr "服务已删除。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:266
-#, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "æ\97 æ³\95å\88\9då§\8bå\8c\96 SQLiteï¼\9a%s。\n"
+#: src/arm/gnunet-arm.c:179
+#, fuzzy, c-format
+msgid "Service `%s' has been started.\n"
+msgstr "æ\9c\8då\8a¡å·²å\88 é\99¤。\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"
+#: src/arm/gnunet-arm.c:182
+#, fuzzy, c-format
+msgid "Service `%s' was already being stopped.\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-arm.c:186
+#, fuzzy, c-format
+msgid "Service `%s' was already not running.\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-arm.c:190
+msgid "Request ignored as ARM is shutting down.\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/gnunet-arm.c:194
+msgid "Error communicating with ARM service.\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1124
-msgid "sqlite version to old to determine size, assuming zero\n"
+#: src/arm/gnunet-arm.c:198
+msgid "Timeout communicating with ARM service.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1143
-#, c-format
-msgid ""
-"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
-"bytes)\n"
+#: src/arm/gnunet-arm.c:202
+msgid "Operation failed.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:206
+msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1182
+#: src/arm/gnunet-arm.c:230
 #, fuzzy
-msgid "Sqlite database running\n"
-msgstr "sqlite 数据仓库"
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/datastore/plugin_datastore_mysql.c:316
-#: src/datacache/plugin_datacache_mysql.c:224
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
+#: src/arm/gnunet-arm.c:233
+msgid "Running services:\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:322
-#: src/datacache/plugin_datacache_mysql.c:230
-#, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+#: src/arm/gnunet-arm.c:263 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:385
+msgid "Fatal error initializing ARM API.\n"
+msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:529
+#: src/arm/gnunet-arm.c:287
 #, fuzzy, c-format
-msgid "Failed to prepare statement `%s'\n"
+msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#, fuzzy, c-format
-msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
-
-#: src/datastore/plugin_datastore_mysql.c:1500
-msgid "Mysql database running\n"
+#: src/arm/gnunet-arm.c:293
+#, c-format
+msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:93
-#: src/datacache/plugin_datacache_postgres.c:79
-#, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
-
-#: src/datastore/plugin_datastore_postgres.c:173
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "无法保存配置文件“%s”："
+#: src/arm/gnunet-arm.c:416
+#, fuzzy
+msgid "stop all GNUnet services"
+msgstr "卸载 GNUnet 服务"
 
-#: src/datastore/plugin_datastore_postgres.c:979
-msgid "Postgres database running\n"
+#: src/arm/gnunet-arm.c:418
+msgid "start a particular service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:289
-msgid "Failed to transmit request to drop database.\n"
+#: src/arm/gnunet-arm.c:420
+msgid "stop a particular service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:372
-msgid "# queue entry timeouts"
-msgstr ""
+#: src/arm/gnunet-arm.c:422
+#, fuzzy
+msgid "start all GNUnet default services"
+msgstr "卸载 GNUnet 服务"
 
-#: src/datastore/datastore_api.c:418
-msgid "# queue overflows"
-msgstr ""
+#: src/arm/gnunet-arm.c:425
+#, fuzzy
+msgid "stop and start all GNUnet default services"
+msgstr "卸载 GNUnet 服务"
 
-#: src/datastore/datastore_api.c:445
-msgid "# queue entries created"
+#: src/arm/gnunet-arm.c:428
+msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
-msgid "# Requests dropped from datastore queue"
+#: src/arm/gnunet-arm.c:430
+msgid "don't print status messages"
 msgstr ""
 
-#: src/datastore/datastore_api.c:513
-msgid "# datastore connections (re)created"
-msgstr ""
+#: src/arm/gnunet-arm.c:433
+#, fuzzy
+msgid "timeout in MSECS milliseconds for completing current operation"
+msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/datastore/datastore_api.c:540
-msgid "# reconnected to DATASTORE"
+#: src/arm/gnunet-arm.c:435
+msgid "list currently running services"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
-msgid "# transmission request failures"
+#: src/arm/gnunet-arm.c:437
+msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/datastore/datastore_api.c:631
-msgid "# bytes sent to datastore"
+#: src/arm/gnunet-arm.c:439
+msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/datastore/datastore_api.c:768
-msgid "Failed to receive status response from database."
+#: src/arm/gnunet-arm.c:450
+msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/datastore/datastore_api.c:781
-msgid "Error reading response from datastore service"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:345
+#, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
-msgid "Invalid error message received from datastore service"
+#: src/arm/gnunet-service-arm.c:348
+#, c-format
+msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:805
-msgid "# status messages received"
+#: src/arm/gnunet-service-arm.c:374
+msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:876
-msgid "# PUT requests executed"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:406
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/datastore/datastore_api.c:947
-msgid "# RESERVE requests executed"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:536
+#, fuzzy, c-format
+msgid "Unable to create socket for service `%s': %s\n"
+msgstr "无法创建用户账户："
 
-#: src/datastore/datastore_api.c:1012
-msgid "# RELEASE RESERVE requests executed"
+#: src/arm/gnunet-service-arm.c:558
+#, c-format
+msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1073
-msgid "# UPDATE requests executed"
+#: src/arm/gnunet-service-arm.c:572
+#, c-format
+msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1141
-msgid "# REMOVE requests executed"
+#: src/arm/gnunet-service-arm.c:680
+#, c-format
+msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1186
-msgid "Failed to receive response from database.\n"
+#: src/arm/gnunet-service-arm.c:891
+#, c-format
+msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1246
-msgid "# Results received"
+#: src/arm/gnunet-service-arm.c:984
+msgid "exit"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1317
-msgid "# GET REPLICATION requests executed"
+#: src/arm/gnunet-service-arm.c:989
+msgid "signal"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1384
-msgid "# GET ZERO ANONYMITY requests executed"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:994
+#, fuzzy
+msgid "unknown"
+msgstr "未知错误"
 
-#: src/datastore/datastore_api.c:1448
-msgid "# GET requests executed"
-msgstr ""
+#: src/arm/gnunet-service-arm.c:1000
+#, fuzzy, c-format
+msgid "Service `%s' took %s to terminate\n"
+msgstr "服务已删除。\n"
 
-#: src/datastore/plugin_datastore_template.c:241
-msgid "Template database running\n"
+#: src/arm/gnunet-service-arm.c:1035
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:52
-msgid "# bytes used in file-sharing datastore"
+#: src/arm/gnunet-service-arm.c:1227
+#, fuzzy, c-format
+msgid "Starting default services `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/arm/gnunet-service-arm.c:1238
+#, c-format
+msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:331
-msgid "# bytes expired"
+#: src/arm/gnunet-service-arm.c:1252
+msgid ""
+"No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:397
-msgid "# bytes purged (low-priority)"
+#: src/arm/mockup-service.c:44
+msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:457
-msgid "Transmission to client failed!\n"
+#: src/ats/ats_api_performance.c:465
+#, c-format
+msgid "Received %s message\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:610
-msgid "# results found"
+#: src/ats/ats_api_performance.c:508
+#, c-format
+msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:655
+#: src/ats-tool/gnunet-ats.c:134
 #, c-format
-msgid ""
-"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
-"%llu bytes\n"
+msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:666
+#: src/ats-tool/gnunet-ats.c:136
 #, c-format
-msgid ""
-"The requested amount (%llu bytes) is larger than the cache size (%llu "
-"bytes)\n"
+msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:670
+#: src/ats-tool/gnunet-ats.c:190
+#, c-format
 msgid ""
-"Insufficient space to satisfy request and requested amount is larger than "
-"cache size"
+"Peer `%s' plugin `%s', address `%s', bw out: %u Bytes/s, bw in %u Bytes/s, "
+"%s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:676
-msgid "Insufficient space to satisfy request"
-msgstr ""
+#: src/ats-tool/gnunet-ats.c:274 src/namestore/gnunet-namestore.c:610
+#: src/transport/gnunet-transport.c:744
+#, fuzzy, c-format
+msgid "Service `%s' is not running\n"
+msgstr "服务已删除。\n"
 
-#: src/datastore/gnunet-service-datastore.c:681
-#: src/datastore/gnunet-service-datastore.c:735
-#: src/datastore/gnunet-service-datastore.c:956
-#: src/datastore/gnunet-service-datastore.c:1441
-msgid "# reserved"
-msgstr ""
+#: src/ats-tool/gnunet-ats.c:284 src/transport/gnunet-transport.c:750
+#, fuzzy, c-format
+msgid "Failed to parse peer identity `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:750
-msgid "Could not find matching reservation"
+#: src/ats-tool/gnunet-ats.c:292
+#, c-format
+msgid "Please select one operation : %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:824 src/datacache/datacache.c:118
-#: src/datacache/datacache.c:248
-msgid "# bytes stored"
-msgstr ""
+#: src/ats-tool/gnunet-ats.c:305 src/ats-tool/gnunet-ats.c:324
+#: src/ats-tool/gnunet-ats.c:341 src/ats-tool/gnunet-ats.c:366
+#, fuzzy, c-format
+msgid "Cannot connect to ATS service, exiting...\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/datastore/gnunet-service-datastore.c:838
-#, c-format
-msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
-msgstr ""
+#: src/ats-tool/gnunet-ats.c:314 src/ats-tool/gnunet-ats.c:331
+#, fuzzy, c-format
+msgid "Cannot issue request to ATS service, exiting...\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/datastore/gnunet-service-datastore.c:1004
-msgid "# GET requests received"
+#: src/ats-tool/gnunet-ats.c:359
+msgid "Type required\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1018
-msgid "# requests filtered by bloomfilter"
+#: src/ats-tool/gnunet-ats.c:416
+msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
-msgid "# UPDATE requests received"
+#: src/ats-tool/gnunet-ats.c:419
+msgid "get list of all active addresses"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1080
-msgid "# GET REPLICATION requests received"
-msgstr ""
+#: src/ats-tool/gnunet-ats.c:422
+#, fuzzy
+msgid "do not resolve IP addresses to hostnames"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/datastore/gnunet-service-datastore.c:1115
-msgid "# GET ZERO ANONYMITY requests received"
+#: src/ats-tool/gnunet-ats.c:425
+msgid "monitor mode"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1142
-msgid "Content not found"
-msgstr ""
+#: src/ats-tool/gnunet-ats.c:428
+#, fuzzy
+msgid "set preference for the given peer"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1152
-msgid "# bytes removed (explicit request)"
+#: src/ats-tool/gnunet-ats.c:431
+msgid "peer id"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1186
-msgid "# REMOVE requests received"
+#: src/ats-tool/gnunet-ats.c:434
+msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1230
-#, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+#: src/ats-tool/gnunet-ats.c:437
+msgid "preference value"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1295
-#: src/datastore/gnunet-service-datastore.c:1486 src/datacache/datacache.c:144
-#: src/datacache/datacache.c:151
-#, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
+#: src/ats-tool/gnunet-ats.c:440
+msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1303
-#, c-format
-msgid "Loading `%s' datastore plugin\n"
-msgstr ""
+#: src/ats-tool/gnunet-ats.c:449
+#, fuzzy
+msgid "Print information about ATS state"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1312
+#: src/block/block.c:105
 #, fuzzy, c-format
-msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "Loading block plugin `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1491
-msgid "# quota"
+#: src/core/core_api.c:755
+msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1493
-msgid "# cache size"
+#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:214
+#, c-format
+msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
+#: src/transport/gnunet-transport.c:571 src/transport/gnunet-transport.c:595
 #, c-format
-msgid "Could not use specified filename `%s' for bloomfilter.\n"
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1516
+#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:573
 #, fuzzy
-msgid "Failed to initialize bloomfilter.\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Connected to"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
-msgstr ""
+#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:597
+#, fuzzy
+msgid "Disconnected from"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-service-core_sessions.c:238
-msgid "# type map refreshes sent"
-msgstr ""
+#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:131
+#: src/peerinfo-tool/gnunet-peerinfo.c:541
+#, fuzzy, c-format
+msgid "Invalid command line argument `%s'\n"
+msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-service-core_sessions.c:414
-msgid "# messages discarded (expired prior to transmission)"
+#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:933
+msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
-#, c-format
-msgid "Peer `%s'\n"
+#: src/core/gnunet-core.c:222
+msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/core/gnunet-service-core.c:109
 #, fuzzy, c-format
-msgid "Invalid command line argument `%s'\n"
-msgstr "“%s”的参数无效。\n"
+msgid "Failed to read hostkey: %s\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
-msgid "don't resolve host names"
+#: src/core/gnunet-service-core.c:123
+#, c-format
+msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-core-list-connections.c:203
-msgid "Print information about connected peers."
-msgstr ""
+#: src/core/gnunet-service-core.c:149
+#, fuzzy
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "立即保存配置？"
+
+#: src/core/gnunet-service-core.c:163
+#: src/transport/gnunet-service-transport.c:696
+#, fuzzy
+msgid "Transport service is unable to access hostkey. Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/core/gnunet-service-core_clients.c:360
+#: src/core/gnunet-service-core_clients.c:370
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:465
+#: src/core/gnunet-service-core_clients.c:475
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:801
+#: src/core/gnunet-service-core_clients.c:518
 #, c-format
 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"
+#: src/core/gnunet-service-core_kx.c:565
+msgid "# bytes encrypted"
 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:491
-msgid "# bytes encrypted"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:541
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:602 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
-#, c-format
+#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
 msgid "Error in communication with PEERINFO service\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:618
+#: src/core/gnunet-service-core_kx.c:700
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:668
+#: src/core/gnunet-service-core_kx.c:753
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:689
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:741
+#: src/core/gnunet-service-core_kx.c:828
 msgid "# session keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:760
+#: src/core/gnunet-service-core_kx.c:845
 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:798
+#: src/core/gnunet-service-core_kx.c:890
 msgid "# SET_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:878
-#: src/transport/gnunet-service-transport_validation.c:778
+#: src/core/gnunet-service-core_kx.c:977
+#: src/transport/gnunet-service-transport_validation.c:813
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:912
+#: src/core/gnunet-service-core_kx.c:1010
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:933
+#: src/core/gnunet-service-core_kx.c:1029
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1021
+#: src/core/gnunet-service-core_kx.c:1125
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1032
+#: src/core/gnunet-service-core_kx.c:1135
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1090
-#: src/transport/gnunet-service-transport_validation.c:983
+#: src/core/gnunet-service-core_kx.c:1236
+#: src/transport/gnunet-service-transport_validation.c:1109
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1120
+#: src/core/gnunet-service-core_kx.c:1275
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1152
+#: src/core/gnunet-service-core_kx.c:1303
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1216
+#: src/core/gnunet-service-core_kx.c:1329
+msgid "# rekey operations confirmed via PONG"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1383
+#: src/core/gnunet-service-core_kx.c:1400
 msgid "# SET_KEY and PING messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1357
+#: src/core/gnunet-service-core_kx.c:1404
+msgid "# REKEY operations performed"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1539
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1399
-#: src/core/gnunet-service-core_kx.c:1424
+#: src/core/gnunet-service-core_kx.c:1579
+#: src/core/gnunet-service-core_kx.c:1604
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1411
+#: src/core/gnunet-service-core_kx.c:1591
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1448
+#: src/core/gnunet-service-core_kx.c:1628
 #, c-format
-msgid "Message received far too old (%llu ms). Content ignored.\n"
+msgid "Message received far too old (%s). Content ignored.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1452
+#: src/core/gnunet-service-core_kx.c:1632
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1460
+#: src/core/gnunet-service-core_kx.c:1640
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
-#, fuzzy
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr "立即保存配置？"
+#: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
+#: src/peerinfo-tool/gnunet-peerinfo.c:547
+#: src/transport/gnunet-service-transport.c:632
+msgid "Could not access PEERINFO service.  Exiting.\n"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1529
-msgid "Core service could not access hostkey.  Exiting.\n"
+#: src/core/gnunet-service-core_neighbours.c:163
+msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1539
-#: src/transport/gnunet-service-transport.c:542
-#: src/hostlist/hostlist-server.c:555 src/peerinfo-tool/gnunet-peerinfo.c:202
+#: src/core/gnunet-service-core_neighbours.c:180
+#: src/core/gnunet-service-core_neighbours.c:334
+msgid "# neighbour entries allocated"
+msgstr ""
+
+#: src/core/gnunet-service-core_neighbours.c:247
+msgid "# encrypted bytes given to transport"
+msgstr ""
+
+#: src/core/gnunet-service-core_neighbours.c:421
 #, c-format
-msgid "Could not access PEERINFO service.  Exiting.\n"
+msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/core_api.c:798
-msgid "Client was disconnected from core service, trying to reconnect.\n"
+#: src/core/gnunet-service-core_sessions.c:206
+#: src/core/gnunet-service-core_sessions.c:269
+#: src/dht/gnunet-service-dht_neighbours.c:645
+#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
+#: src/topology/gnunet-daemon-topology.c:704
+#: src/topology/gnunet-daemon-topology.c:805
+#: src/transport/gnunet-service-transport_neighbours.c:874
+#: src/transport/gnunet-service-transport_neighbours.c:1091
+#: src/transport/gnunet-service-transport_neighbours.c:1100
+#: src/transport/gnunet-service-transport_neighbours.c:2637
+#: src/transport/gnunet-service-transport_neighbours.c:2899
+msgid "# peers connected"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-exit.c:1494
-msgid "Daemon to run to provide an IP exit node for the VPN"
+#: src/core/gnunet-service-core_sessions.c:236
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:1288
-msgid "help text"
+#: src/core/gnunet-service-core_sessions.c:406
+msgid "# messages discarded (expired prior to transmission)"
+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/datacache/datacache.c:115 src/datacache/datacache.c:266
+#: src/datastore/gnunet-service-datastore.c:834
+msgid "# bytes stored"
+msgstr ""
+
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:268
+msgid "# items stored"
 msgstr ""
 
-#: src/util/getopt_helpers.c:84
+#: src/datacache/datacache.c:143 src/datacache/datacache.c:150
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/gnunet-service-datastore.c:1494
 #, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr "长选项的必选参数对短选项也是必选的。\n"
+msgid "No `%s' specified for `%s' in configuration!\n"
+msgstr ""
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#: src/datacache/datacache.c:184
 #, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "您必须向“%s”选项传递一个数字。\n"
+msgid "Loading `%s' datacache plugin\n"
+msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:860
-msgid "DEBUG"
-msgstr "调试"
+#: src/datacache/datacache.c:192
+#, c-format
+msgid "Failed to load datacache plugin for `%s'\n"
+msgstr ""
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:858
-msgid "INFO"
-msgstr "信息"
+#: src/datacache/datacache.c:295
+msgid "# requests received"
+msgstr ""
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:856
-msgid "WARNING"
-msgstr "警告"
+#: src/datacache/datacache.c:304
+msgid "# requests filtered by bloom filter"
+msgstr ""
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:854
-msgid "ERROR"
-msgstr "错误"
+#: src/datacache/plugin_datacache_heap.c:406
+#, fuzzy
+msgid "Heap datacache running\n"
+msgstr "sqlite 数据仓库"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:862
-msgid "NONE"
+#: src/datacache/plugin_datacache_postgres.c:392
+msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/util/common_logging.c:578
+#: src/datacache/plugin_datacache_sqlite.c:69
+#: src/datacache/plugin_datacache_sqlite.c:72
+#: src/datastore/plugin_datastore_mysql.c:803
+#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namestore/plugin_namestore_postgres.c:52
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ecc.c:53
+#: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
+#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
 #, fuzzy, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+
+#: src/datacache/plugin_datacache_sqlite.c:450
+msgid "Sqlite datacache running\n"
+msgstr ""
+
+#: src/datacache/plugin_datacache_sqlite.c:484
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namestore/plugin_namestore_sqlite.c:362
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+msgstr ""
 
-#: src/util/common_logging.c:695
+#: src/datacache/plugin_datacache_sqlite.c:491
 #, fuzzy, c-format
-msgid "Message `%.*s' repeated %u times in the last %s\n"
-msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
+msgid "Failed to close statement %p: %d\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/common_logging.c:863
-msgid "INVALID"
+#: src/datacache/plugin_datacache_template.c:125
+msgid "Template datacache running\n"
 msgstr ""
 
-#: src/util/common_logging.c:945
-msgid "unknown address"
+#: src/datastore/datastore_api.c:310
+msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/util/common_logging.c:983
-msgid "invalid address"
+#: src/datastore/datastore_api.c:393
+msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/util/plugin.c:89
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "插件机构初始化失败：%s！\n"
+#: src/datastore/datastore_api.c:437
+msgid "# queue overflows"
+msgstr ""
 
-#: src/util/plugin.c:146
-#, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
+#: src/datastore/datastore_api.c:465
+msgid "# queue entries created"
 msgstr ""
 
-#: src/util/plugin.c:219
-#, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
+#: src/datastore/datastore_api.c:483
+msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/util/plugin.c:349
-#, fuzzy
-msgid "Could not determine plugin installation path.\n"
-msgstr "无法确定用户界面定义文件。"
+#: src/datastore/datastore_api.c:525
+msgid "# datastore connections (re)created"
+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/datastore/datastore_api.c:608
+msgid "# transmission request failures"
+msgstr ""
 
-#: 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/datastore/datastore_api.c:630
+msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/util/getopt.c:672
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s：选项“%s”有歧义\n"
+#: src/datastore/datastore_api.c:762
+msgid "Failed to receive status response from database."
+msgstr ""
 
-#: src/util/getopt.c:696
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s：选项“--%s”不允许有参数\n"
+#: src/datastore/datastore_api.c:776
+msgid "Error reading response from datastore service"
+msgstr ""
 
-#: src/util/getopt.c:701
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s：选项“%c%s”不允许有参数\n"
+#: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
+msgid "Invalid error message received from datastore service"
+msgstr ""
 
-#: src/util/getopt.c:718 src/util/getopt.c:886
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s：选项“%s”要求有一个参数\n"
+#: src/datastore/datastore_api.c:798
+msgid "# status messages received"
+msgstr ""
 
-#: src/util/getopt.c:747
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s：无法识别的选项“--%s”\n"
+#: src/datastore/datastore_api.c:867
+msgid "# PUT requests executed"
+msgstr ""
 
-#: src/util/getopt.c:751
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s：无法识别的选项“%c%s”\n"
+#: src/datastore/datastore_api.c:934
+msgid "# RESERVE requests executed"
+msgstr ""
 
-#: src/util/getopt.c:776
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s：非法选项 -- %c\n"
+#: src/datastore/datastore_api.c:995
+msgid "# RELEASE RESERVE requests executed"
+msgstr ""
 
-#: src/util/getopt.c:778
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s：无效选项 -- %c\n"
+#: src/datastore/datastore_api.c:1052
+msgid "# UPDATE requests executed"
+msgstr ""
 
-#: 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/datastore/datastore_api.c:1116
+msgid "# REMOVE requests executed"
+msgstr ""
 
-#: src/util/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s：选项“-W %s”有歧义\n"
+#: src/datastore/datastore_api.c:1161
+msgid "Failed to receive response from database.\n"
+msgstr ""
 
-#: src/util/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s：选项“-W %s” 不允许有参数\n"
+#: src/datastore/datastore_api.c:1220
+msgid "# Results received"
+msgstr ""
 
-#: src/util/getopt.c:1038
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "请使用 --help 获取选项列表。\n"
+#: src/datastore/datastore_api.c:1286
+msgid "# GET REPLICATION requests executed"
+msgstr ""
 
-#: src/util/scheduler.c:870
-msgid "Looks like we're busy waiting...\n"
+#: src/datastore/datastore_api.c:1349
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/util/scheduler.c:1000
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
+#: src/datastore/datastore_api.c:1410
+msgid "# GET requests executed"
 msgstr ""
 
-#: src/util/connection.c:461
-#, fuzzy, c-format
-msgid "Access denied to `%s'\n"
-msgstr "“%s”已连接到“%s”。\n"
+#: src/datastore/gnunet-service-datastore.c:349
+msgid "# bytes expired"
+msgstr ""
 
-#: src/util/connection.c:476
-#, c-format
-msgid "Accepting connection from `%s': %p\n"
+#: src/datastore/gnunet-service-datastore.c:422
+msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/util/connection.c:642
-#, c-format
-msgid ""
-"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
+#: src/datastore/gnunet-service-datastore.c:480
+#: src/gns/gnunet-gns-helper-service-w32.c:159
+msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/util/connection.c:852 src/util/connection.c:1025
-#, fuzzy, c-format
-msgid "Trying to connect to `%s' (%p)\n"
-msgstr "无法连接到 %s:%u：%s\n"
+#: src/datastore/gnunet-service-datastore.c:511
+#: src/gns/gnunet-gns-helper-service-w32.c:189
+msgid "Shutdown in progress, aborting transmission.\n"
+msgstr ""
 
-#: src/util/connection.c:862
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' (%p)\n"
-msgstr "无法连接到 %s:%u：%s\n"
+#: src/datastore/gnunet-service-datastore.c:626
+msgid "# results found"
+msgstr ""
 
-#: src/util/connection.c:1015
+#: src/datastore/gnunet-service-datastore.c:669
 #, c-format
-msgid "Attempt to connect to `%s' failed\n"
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/util/connection.c:1528
+#: src/datastore/gnunet-service-datastore.c:680
 #, c-format
 msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/util/connection.c:1564
-#, fuzzy, c-format
-msgid "Failed to send to `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/datastore/gnunet-service-datastore.c:684
+msgid ""
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
+msgstr ""
 
-#: src/util/signal.c:80
-#, c-format
-msgid "signal (%d, %p) returned %d.\n"
+#: src/datastore/gnunet-service-datastore.c:690
+msgid "Insufficient space to satisfy request"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:695
+#: src/datastore/gnunet-service-datastore.c:747
+#: src/datastore/gnunet-service-datastore.c:960
+#: src/datastore/gnunet-service-datastore.c:1417
+msgid "# reserved"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:760
+msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/util/network.c:1197
+#: src/datastore/gnunet-service-datastore.c:846
 #, c-format
-msgid ""
-"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/util/os_installation.c:295
-#, fuzzy, c-format
+#: src/datastore/gnunet-service-datastore.c:1006
+msgid "# GET requests received"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1018
+msgid "# requests filtered by bloomfilter"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1046
+msgid "# UPDATE requests received"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1076
+msgid "# GET REPLICATION requests received"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1109
+msgid "# GET ZERO ANONYMITY requests received"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1134
+msgid "Content not found"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1142
+msgid "# bytes removed (explicit request)"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1174
+msgid "# REMOVE requests received"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1216
+#, c-format
+msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1277
+#, c-format
+msgid "Loading `%s' datastore plugin\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1286
+#, fuzzy, c-format
+msgid "Failed to load datastore plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/datastore/gnunet-service-datastore.c:1488
+#, c-format
+msgid "# bytes used in file-sharing datastore `%s'"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1499
+msgid "# quota"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1501
+msgid "# cache size"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1514
+#, c-format
+msgid "Could not use specified filename `%s' for bloomfilter.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1532
+#: src/datastore/gnunet-service-datastore.c:1548
+#, fuzzy, c-format
+msgid "Failed to remove bogus bloomfilter file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/datastore/gnunet-service-datastore.c:1578
+#, fuzzy
+msgid "Failed to initialize bloomfilter.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/datastore/gnunet-service-datastore.c:1607
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1612
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1615
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
+#: src/datastore/plugin_datastore_mysql.c:780
+#, fuzzy, c-format
+msgid "Failed to prepare statement `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/datastore/plugin_datastore_mysql.c:788
+#, fuzzy, c-format
+msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+
+#: src/datastore/plugin_datastore_mysql.c:1019
+msgid "Mysql database running\n"
+msgstr ""
+
+#: src/datastore/plugin_datastore_postgres.c:824
+#, fuzzy
+msgid "Failed to drop table from database.\n"
+msgstr "发送消息失败。\n"
+
+#: src/datastore/plugin_datastore_postgres.c:860
+#: src/namestore/plugin_namestore_postgres.c:652
+msgid "Postgres database running\n"
+msgstr ""
+
+#: src/datastore/plugin_datastore_sqlite.c:57
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%u with error: %s"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+
+#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/namestore/plugin_namestore_sqlite.c:223
+#, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/datastore/plugin_datastore_sqlite.c:648
+#, fuzzy
+msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
+
+#: src/datastore/plugin_datastore_sqlite.c:1134
+msgid "sqlite version to old to determine size, assuming zero\n"
+msgstr ""
+
+#: src/datastore/plugin_datastore_sqlite.c:1153
+#, c-format
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
+msgstr ""
+
+#: src/datastore/plugin_datastore_sqlite.c:1193
+#: src/namestore/plugin_namestore_sqlite.c:827
+#, fuzzy
+msgid "Sqlite database running\n"
+msgstr "sqlite 数据仓库"
+
+#: src/datastore/plugin_datastore_template.c:241
+msgid "Template database running\n"
+msgstr ""
+
+#: src/dht/dht_api.c:375
+#, fuzzy
+msgid "Failed to connect to the DHT service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/dht/gnunet-dht-get.c:132
+#, c-format
+msgid ""
+"Result %d, type %d:\n"
+"%.*s\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:156
+msgid "Must provide key for DHT GET!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#, fuzzy
+msgid "Failed to connect to DHT service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/dht/gnunet-dht-get.c:170
+msgid "Issueing DHT GET with key"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-put.c:198
+msgid "the query key"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:189
+msgid "how many parallel requests (replicas) to create"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
+msgid "the type of data to look for"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
+msgid "how long to execute this query before giving up?"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
+msgid "use DHT's demultiplex everywhere option"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:733
+#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
+#: src/nse/gnunet-nse-profiler.c:1033
+msgid "be verbose (print progress information)"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:222
+msgid "Issue a GET request to the GNUnet DHT, prints results."
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:268
+msgid "how long should the monitor command run"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:293
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:118
+msgid "PUT request sent with key"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:121
+msgid "Timeout sending PUT request!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:124
+msgid "PUT request not confirmed!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:153
+msgid "Must provide KEY and DATA for DHT put!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:160
+#, fuzzy, c-format
+msgid "Could not connect to %s service!\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/dht/gnunet-dht-put.c:176
+#, c-format
+msgid "Issuing put request for `%s' with data `%s'!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:192
+msgid "the data to insert under the key"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:195
+msgid "how long to store this entry in the dht (in seconds)"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:204
+msgid "how many replicas to create"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:207
+msgid "the type to insert data as"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:235
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+msgstr ""
+
+#: src/dht/gnunet-service-dht.c:172
+#, fuzzy
+msgid "Failed to connect to transport service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/dht/gnunet-service-dht_clients.c:413
+msgid "# GET requests from clients injected"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_clients.c:503
+msgid "# PUT requests received from clients"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_clients.c:585
+msgid "# GET requests received from clients"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_clients.c:791
+msgid "# GET STOP requests received from clients"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_clients.c:1035
+msgid "# Key match, type mismatches in REPLY to CLIENT"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_clients.c:1048
+msgid "# Duplicate REPLIES to CLIENT request dropped"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_clients.c:1085
+#, c-format
+msgid "Unsupported block type (%u) in request!\n"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_clients.c:1108
+msgid "# RESULTS queued for clients"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_clients.c:1157
+#: src/dht/gnunet-service-dht_clients.c:1199
+msgid "# REPLIES ignored for CLIENTS (no match)"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_clients.c:1167
+msgid "Could not pass reply to client, message too big!\n"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:64
+#, c-format
+msgid "%s request received, but have no datacache!\n"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:74
+msgid "# ITEMS stored in datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:159
+msgid "# Good RESULTS found in datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:170
+msgid "# Duplicate RESULTS found in datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:176
+msgid "# Invalid RESULTS found in datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:182
+msgid "# Irrelevant RESULTS found in datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:194
+msgid "# Unsupported RESULTS found in datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:197
+#, c-format
+msgid "Unsupported block type (%u) in local response!\n"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_datacache.c:227
+msgid "# GET requests given to datacache"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_hello.c:82
+msgid "# HELLOs obtained from peerinfo"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:501
+msgid "# Preference updates given to core"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:591
+msgid "# FIND PEER messages initiated"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:737
+msgid "# Queued messages discarded (peer disconnected)"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:792
+msgid "# Bytes transmitted to other peers"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:830
+msgid "# Bytes of bandwidth requested from core"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1080
+msgid "# Peers excluded from routing due to Bloomfilter"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1061
+#: src/dht/gnunet-service-dht_neighbours.c:1095
+msgid "# Peer selection failed"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1229
+msgid "# PUT requests routed"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1258
+msgid "# PUT messages queued for transmission"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1265
+#: src/dht/gnunet-service-dht_neighbours.c:1378
+#: src/dht/gnunet-service-dht_neighbours.c:1478
+msgid "# P2P messages dropped due to full queue"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1343
+msgid "# GET requests routed"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1370
+msgid "# GET messages queued for transmission"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1485
+msgid "# RESULT messages queued for transmission"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1573
+msgid "# P2P PUT requests received"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1702
+msgid "# FIND PEER requests ignored due to Bloomfilter"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1710
+msgid "# FIND PEER requests ignored due to lack of HELLO"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1801
+msgid "# P2P GET requests received"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1843
+msgid "# P2P FIND PEER requests processed"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1857
+msgid "# P2P GET requests ONLY routed"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1944
+msgid "# P2P RESULTS received"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_nse.c:59
+msgid "# Network size estimates received"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_routing.c:211
+msgid "# Good REPLIES matched against routing table"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_routing.c:220
+msgid "# Duplicate REPLIES matched against routing table"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_routing.c:226
+msgid "# Invalid REPLIES matched against routing table"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_routing.c:232
+msgid "# Irrelevant REPLIES matched against routing table"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_routing.c:244
+msgid "# Unsupported REPLIES matched against routing table"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_routing.c:317
+msgid "# Entries removed from routing table"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_routing.c:400
+msgid "# Entries added to routing table"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_routing.c:418
+msgid "# DHT requests combined"
+msgstr ""
+
+#: src/dht/plugin_block_dht.c:136
+#, c-format
+msgid "Block not of type %u\n"
+msgstr ""
+
+#: src/dht/plugin_block_dht.c:143
+msgid "Size mismatch for block\n"
+msgstr ""
+
+#: src/dht/plugin_block_dht.c:152
+#, c-format
+msgid "Block of type %u is malformed\n"
+msgstr ""
+
+#: src/dns/dnsparser.c:110
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/dns/dnsparser.c:584
+#, fuzzy, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/dns/dnsstub.c:175
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
+
+#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
+#: src/gns/gnunet-service-gns_resolver.c:1620
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/dns/dnsstub.c:299
+#, fuzzy, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/dns/dnsstub.c:368
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
+msgstr ""
+
+#: src/dns/dnsstub.c:440
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/dns/gnunet-dns-monitor.c:355
+msgid "only monitor DNS queries"
+msgstr ""
+
+#: src/dns/gnunet-dns-monitor.c:358
+msgid "only monitor DNS replies"
+msgstr ""
+
+#: src/dns/gnunet-dns-monitor.c:369
+msgid "Monitor DNS queries."
+msgstr ""
+
+#: src/dns/gnunet-dns-redirector.c:236
+msgid "set A records"
+msgstr ""
+
+#: src/dns/gnunet-dns-redirector.c:239
+msgid "set AAAA records"
+msgstr ""
+
+#: src/dns/gnunet-dns-redirector.c:251
+msgid "Change DNS replies to point elsewhere."
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:512
+msgid "# DNS requests answered via TUN interface"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:659
+msgid "# DNS exit failed (failed to open socket)"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:845
+msgid "# External DNS response discarded (no matching request)"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:924
+msgid "# Client response discarded (no matching request)"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1039
+msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1055
+msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1064
+#, c-format
+msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1073
+msgid "# Non-DNS UDP packet received via TUN interface"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1140
+msgid "# DNS requests received via TUN interface"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1216 src/exit/gnunet-daemon-exit.c:2687
+msgid "# Inbound MESH tunnels created"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1281 src/exit/gnunet-daemon-exit.c:3025
+#, c-format
+msgid "`%s' must be installed SUID, refusing to run\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1302
+#, fuzzy
+msgid "need a valid IPv4 or IPv6 address\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/dv/dv_api.c:189
+#, fuzzy
+msgid "Failed to connect to the dv service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/dv/plugin_transport_dv.c:159
+#, c-format
+msgid "%s Received message from %s of type %d, distance %u!\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:522
+#, c-format
+msgid "Got duplicate service records for `%s:%u'\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:575
+msgid "# Bytes transmitted via mesh tunnels"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:692 src/exit/gnunet-daemon-exit.c:2082
+#: src/exit/gnunet-daemon-exit.c:2332 src/vpn/gnunet-service-vpn.c:1411
+#: src/vpn/gnunet-service-vpn.c:1812 src/vpn/gnunet-service-vpn.c:1975
+msgid "# ICMPv4 packets dropped (type not allowed)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:729 src/exit/gnunet-daemon-exit.c:2141
+#: src/exit/gnunet-daemon-exit.c:2391 src/vpn/gnunet-service-vpn.c:1467
+#: src/vpn/gnunet-service-vpn.c:1871 src/vpn/gnunet-service-vpn.c:2008
+msgid "# ICMPv6 packets dropped (type not allowed)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:769
+msgid "# ICMP packets dropped (not allowed)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:776
+msgid "ICMP Packet dropped, have no matching connection information\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:853
+msgid "UDP Packet dropped, have no matching connection information\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:928
+msgid "TCP Packet dropped, have no matching connection information\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:981
+msgid "# Packets received from TUN"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:995
+msgid "# Bytes received from TUN"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1021
+msgid "IPv4 packet options received.  Ignored.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1048
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1094
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1102
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1484
+msgid "# TCP packets sent via TUN"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1584
+msgid "# TCP service creation requests received via mesh"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1587 src/exit/gnunet-daemon-exit.c:1666
+#: src/exit/gnunet-daemon-exit.c:1776 src/exit/gnunet-daemon-exit.c:2006
+#: src/exit/gnunet-daemon-exit.c:2248 src/exit/gnunet-daemon-exit.c:2529
+#: src/exit/gnunet-daemon-exit.c:2629
+msgid "# Bytes received from MESH"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:2651
+#, c-format
+msgid "No service found for %s on port %d!\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1624
+msgid "# TCP requests dropped (no such service)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1669
+msgid "# TCP IP-exit creation requests received via mesh"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1779
+msgid "# TCP data requests received via mesh"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1793
+msgid "# TCP DATA requests dropped (no session)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:1843
+msgid "# ICMP packets sent via TUN"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2009
+msgid "# ICMP IP-exit requests received via mesh"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2251
+msgid "# ICMP service requests received via mesh"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2317 src/vpn/gnunet-service-vpn.c:1401
+#: src/vpn/gnunet-service-vpn.c:1969
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2376 src/vpn/gnunet-service-vpn.c:1437
+#: src/vpn/gnunet-service-vpn.c:1449 src/vpn/gnunet-service-vpn.c:1859
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2426
+msgid "# UDP packets sent via TUN"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2532
+msgid "# UDP IP-exit requests received via mesh"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2632
+msgid "# UDP service requests received via mesh"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2655
+msgid "# UDP requests dropped (no such service)"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2896
+#, c-format
+msgid "No addresses found for hostname `%s' of service `%s'!\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2910 src/exit/gnunet-daemon-exit.c:2922
+#, c-format
+msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:2933
+#, c-format
+msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3042
+msgid ""
+"This system does not support IPv4, will disable IPv4 functions despite them "
+"being enabled in the configuration\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3050
+msgid ""
+"This system does not support IPv6, will disable IPv6 functions despite them "
+"being enabled in the configuration\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3057
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3063
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3069 src/pt/gnunet-daemon-pt.c:884
+msgid "No useful service enabled.  Exiting.\n"
+msgstr ""
+
+#: src/exit/gnunet-daemon-exit.c:3255
+msgid "Daemon to run to provide an IP exit node for the VPN"
+msgstr ""
+
+#: src/fragmentation/defragmentation.c:270
+msgid "# acknowledgements sent for fragment"
+msgstr ""
+
+#: src/fragmentation/defragmentation.c:456
+msgid "# fragments received"
+msgstr ""
+
+#: src/fragmentation/defragmentation.c:521
+msgid "# duplicate fragments received"
+msgstr ""
+
+#: src/fragmentation/defragmentation.c:534
+msgid "# messages defragmented"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:208
+msgid "# fragments transmitted"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:211
+msgid "# fragments retransmitted"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:237
+msgid "# fragments wrap arounds"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:281
+msgid "# messages fragmented"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:284
+msgid "# total size of fragmented messages"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:405
+msgid "# fragment acknowledgements received"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:411
+msgid "# bits removed from fragmentation ACKs"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:435
+msgid "# fragmentation transmissions completed"
+msgstr ""
+
+#: src/fs/fs_api.c:450
+#, fuzzy, c-format
+msgid "Could not open file `%s': %s"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_api.c:459
+#, fuzzy, c-format
+msgid "Could not read file `%s': %s"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/fs/fs_api.c:465
+#, c-format
+msgid "Short read reading from file `%s'!"
+msgstr ""
+
+#: src/fs/fs_api.c:1046
+#, fuzzy, c-format
+msgid "Failed to resume publishing information `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_api.c:1505
+#, c-format
+msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+msgstr ""
+
+#: src/fs/fs_api.c:1547
+#, c-format
+msgid "Failure while resuming publishing operation `%s': %s\n"
+msgstr ""
+
+#: src/fs/fs_api.c:1563
+#, fuzzy, c-format
+msgid "Failed to resume publishing operation `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/fs_api.c:2213
+#, c-format
+msgid "Failure while resuming unindexing operation `%s': %s\n"
+msgstr ""
+
+#: src/fs/fs_api.c:2223
+#, fuzzy, c-format
+msgid "Failed to resume unindexing operation `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/fs_api.c:2348 src/fs/fs_api.c:2588
+#, fuzzy, c-format
+msgid "Failed to resume sub-download `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_api.c:2365
+#, fuzzy, c-format
+msgid "Failed to resume sub-search `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2397 src/fs/fs_api.c:2881
+#, c-format
+msgid "Failure while resuming search operation `%s': %s\n"
+msgstr ""
+
+#: src/fs/fs_api.c:2579
+#, fuzzy, c-format
+msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/fs_api.c:2825
+msgid "Could not resume running search, will resume as paused search\n"
+msgstr ""
+
+#: src/fs/fs_api.c:2919
+#, c-format
+msgid "Failure while resuming download operation `%s': %s\n"
+msgstr ""
+
+#: src/fs/fs_directory.c:210
+msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+msgstr ""
+
+#: src/fs/fs_download.c:321
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
+msgstr ""
+
+#: src/fs/fs_download.c:341
+msgid "Directory too large for system address space\n"
+msgstr ""
+
+#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
+#, fuzzy, c-format
+msgid "Failed to open file `%s' for writing"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_download.c:888
+#, c-format
+msgid "Failed to create directory for recursive download of `%s'\n"
+msgstr ""
+
+#: src/fs/fs_download.c:970
+#, c-format
+msgid ""
+"Internal error or bogus download URI (expected %u bytes at depth %u and "
+"offset %llu/%llu, got %u bytes)"
+msgstr ""
+
+#: src/fs/fs_download.c:996
+msgid "internal error decrypting content"
+msgstr ""
+
+#: src/fs/fs_download.c:1019
+#, fuzzy, c-format
+msgid "Download failed: could not open file `%s': %s"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_download.c:1029
+#, fuzzy, c-format
+msgid "Failed to seek to offset %llu in file `%s': %s"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_download.c:1038
+#, fuzzy, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/fs_download.c:1136
+#, fuzzy
+msgid "internal error decoding tree"
+msgstr "未知错误。\n"
+
+#: src/fs/fs_download.c:1927
+#, fuzzy
+msgid "Invalid URI"
+msgstr "无效条目。\n"
+
+#: src/fs/fs_getopt.c:192
+#, c-format
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
+msgstr ""
+
+#: src/fs/fs_list_indexed.c:90
+#, c-format
+msgid "Failed to receive response for `%s' request from `%s' service.\n"
+msgstr ""
+
+#: 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/fs_list_indexed.c:151
+#, fuzzy, c-format
+msgid "Failed to not connect to `%s' service.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/fs/fs_misc.c:126
+#, c-format
+msgid "Did not find mime type `%s' in extension list.\n"
+msgstr ""
+
+#: src/fs/fs_namespace_advertise.c:150
+#, fuzzy
+msgid "Unknown error"
+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/fs_namespace_advertise.c:278
+#, fuzzy
+msgid "Failed to connect to datastore service"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/fs/fs_namespace.c:110
+#, fuzzy, c-format
+msgid "Failed to open `%s' for writing: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_namespace.c:132 src/fs/fs_namespace.c:220
+#, fuzzy, c-format
+msgid "Failed to write `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/fs/fs_namespace.c:252
+#, c-format
+msgid "Failed to create or read private key for namespace `%s'\n"
+msgstr ""
+
+#: src/fs/fs_namespace.c:367
+#, c-format
+msgid "Failed to read namespace private key file `%s', deleting it!\n"
+msgstr ""
+
+#: src/fs/fs_namespace.c:584 src/fs/fs_publish_ksk.c:295
+#, fuzzy
+msgid "Internal error."
+msgstr "未知错误。\n"
+
+#: src/fs/fs_namespace.c:627
+msgid "Failed to connect to datastore."
+msgstr ""
+
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
+#, c-format
+msgid "Publishing failed: %s"
+msgstr ""
+
+#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
+#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
+#, c-format
+msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:624
+msgid "timeout on index-start request to `fs' service"
+msgstr ""
+
+#: src/fs/fs_publish.c:636
+#, fuzzy
+msgid "unknown error"
+msgstr "未知错误"
+
+#: src/fs/fs_publish.c:679
+msgid "failed to compute hash"
+msgstr ""
+
+#: src/fs/fs_publish.c:699
+msgid "filename too long"
+msgstr ""
+
+#: src/fs/fs_publish.c:724
+msgid "could not connect to `fs' service"
+msgstr ""
+
+#: src/fs/fs_publish.c:747
+#, fuzzy, c-format
+msgid "Failed to get file identifiers for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/fs_publish.c:812
+#, c-format
+msgid "Recursive upload failed at `%s': %s"
+msgstr ""
+
+#: src/fs/fs_publish.c:818
+#, c-format
+msgid "Recursive upload failed: %s"
+msgstr ""
+
+#: src/fs/fs_publish.c:864
+msgid "needs to be an actual file"
+msgstr ""
+
+#: src/fs/fs_publish.c:1090
+#, c-format
+msgid "Insufficient space for publishing: %s"
+msgstr ""
+
+#: src/fs/fs_publish.c:1161
+#, c-format
+msgid "Reserving space for %u entries and %llu bytes for publication\n"
+msgstr ""
+
+#: src/fs/fs_publish_ksk.c:258
+msgid "Could not connect to datastore."
+msgstr ""
+
+#: src/fs/fs_search.c:830
+#, c-format
+msgid "Got result with unknown block type `%d', ignoring"
+msgstr ""
+
+#: 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:233
+msgid "Unexpected time for a response from `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:241
+msgid "Timeout waiting for `fs' service."
+msgstr ""
+
+#: src/fs/fs_unindex.c:249
+#, fuzzy
+msgid "Invalid response from `fs' service."
+msgstr "“%s”的参数无效。\n"
+
+#: src/fs/fs_unindex.c:293
+msgid "Failed to connect to FS service for unindexing."
+msgstr ""
+
+#: src/fs/fs_unindex.c:349 src/fs/fs_unindex.c:361
+#, fuzzy
+msgid "Failed to get KSKs from directory scan."
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/fs_unindex.c:357
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "未知错误。\n"
+
+#: src/fs/fs_unindex.c:416
+#, fuzzy, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_unindex.c:506
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/fs/fs_unindex.c:558 src/fs/fs_unindex.c:623
+#, fuzzy
+msgid "Failed to connect to `datastore' service."
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/fs/fs_unindex.c:636
+#, fuzzy
+msgid "Failed to open file for unindexing."
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_unindex.c:670
+msgid "Failed to compute hash of file."
+msgstr ""
+
+#: src/fs/fs_uri.c:220
+#, c-format
+msgid "`%' must be followed by HEX number"
+msgstr ""
+
+#: src/fs/fs_uri.c:279
+msgid "Malformed KSK URI (must not begin or end with `+')"
+msgstr ""
+
+#: src/fs/fs_uri.c:297
+msgid "`++' not allowed in KSK URI"
+msgstr ""
+
+#: src/fs/fs_uri.c:304
+msgid "Quotes not balanced in KSK URI"
+msgstr ""
+
+#: src/fs/fs_uri.c:372 src/fs/fs_uri.c:379
+msgid "Malformed SKS URI"
+msgstr ""
+
+#: src/fs/fs_uri.c:423 src/fs/fs_uri.c:438
+msgid "Malformed CHK URI"
+msgstr ""
+
+#: src/fs/fs_uri.c:568 src/fs/fs_uri.c:583 src/fs/fs_uri.c:593
+#: src/fs/fs_uri.c:621
+msgid "SKS URI malformed"
+msgstr ""
+
+#: src/fs/fs_uri.c:603
+msgid "SKS URI malformed (could not decode public key)"
+msgstr ""
+
+#: src/fs/fs_uri.c:609
+msgid "SKS URI malformed (could not find signature)"
+msgstr ""
+
+#: src/fs/fs_uri.c:615
+msgid "SKS URI malformed (could not decode signature)"
+msgstr ""
+
+#: src/fs/fs_uri.c:628
+msgid "SKS URI malformed (could not parse expiration time)"
+msgstr ""
+
+#: src/fs/fs_uri.c:640
+msgid "SKS URI malformed (signature failed validation)"
+msgstr ""
+
+#: src/fs/fs_uri.c:678
+msgid "Unrecognized URI type"
+msgstr ""
+
+#: src/fs/fs_uri.c:903
+#, fuzzy
+msgid "Lacking key configuration settings.\n"
+msgstr "立即保存配置？"
+
+#: src/fs/fs_uri.c:909
+#, fuzzy, c-format
+msgid "Could not access hostkey file `%s'.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/fs/fs_uri.c:1114 src/fs/fs_uri.c:1141
+msgid "No keywords specified!\n"
+msgstr ""
+
+#: src/fs/fs_uri.c:1147
+msgid "Number of double-quotes not balanced!\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:236
+#, fuzzy, c-format
+msgid "Failed to load state: %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
+#: src/fs/gnunet-auto-share.c:309
+#, fuzzy, c-format
+msgid "Failed to save state to file %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/gnunet-auto-share.c:401
+#, c-format
+msgid "Publication of `%s' done\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:488
+#, c-format
+msgid "Publishing `%s'\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:497
+#, fuzzy, c-format
+msgid "Failed to run `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/fs/gnunet-auto-share.c:686
+#, c-format
 msgid ""
-"Could not determine installation path for %s.  Set `%s' environment "
-"variable.\n"
-msgstr "无法确定安装路径。请尝试设置“%s”\n"
+"You must specify one and only one directory name for automatic publication.\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
+#: src/fs/gnunet-publish.c:680
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:684
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:687
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:711
+msgid "specify the priority of the content"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:304
+#: src/fs/gnunet-publish.c:718
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:770
+msgid "Automatically publish files from a directory on GNUnet"
+msgstr ""
+
+#: src/fs/gnunet-directory.c:49
+#, c-format
+msgid "\t<original file embedded in %u bytes of meta data>\n"
+msgstr ""
+
+#: src/fs/gnunet-directory.c:94
+#, c-format
+msgid "Directory `%s' meta data:\n"
+msgstr ""
+
+#: src/fs/gnunet-directory.c:97
+#, c-format
+msgid "Directory `%s' contents:\n"
+msgstr ""
+
+#: src/fs/gnunet-directory.c:132
+#, fuzzy
+msgid "You must specify a filename to inspect.\n"
+msgstr "您必须指定一个昵称\n"
 
-#: src/util/os_installation.c:477
+#: src/fs/gnunet-directory.c:145
 #, fuzzy, c-format
-msgid "Could not find binary `%s' in PATH!\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
+msgid "Failed to read directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/os_installation.c:483
+#: src/fs/gnunet-directory.c:154
 #, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "“%s”说：%s\n"
+msgid "`%s' is not a GNUnet directory\n"
+msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/util/strings.c:143
-msgid "b"
-msgstr "b"
+#: src/fs/gnunet-directory.c:183
+#, fuzzy
+msgid "Display contents of a GNUnet directory"
+msgstr "更改 GNUnet 目录的权限出错"
+
+#: src/fs/gnunet-download.c:137
+#, fuzzy, c-format
+msgid "Starting download `%s'.\n"
+msgstr "未知的命令“%s”。\n"
 
-#: src/util/strings.c:355
+#: src/fs/gnunet-download.c:147
+#, fuzzy
+msgid "<unknown time>"
+msgstr "未知错误"
+
+#: src/fs/gnunet-download.c:157
 #, c-format
-msgid "Character set requested was `%s'\n"
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
 msgstr ""
 
-#: src/util/strings.c:433
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
-
-#: src/util/strings.c:525
-msgid "ms"
-msgstr "毫秒"
+#: src/fs/gnunet-download.c:179
+#, c-format
+msgid "Error downloading: %s.\n"
+msgstr ""
 
-#: src/util/strings.c:530
-msgid "eternity"
+#: src/fs/gnunet-download.c:194
+#, c-format
+msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/util/strings.c:534
-msgid "s"
-msgstr "秒"
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
+#, c-format
+msgid "Unexpected status: %d\n"
+msgstr ""
 
-#: src/util/strings.c:538
-msgid "m"
-msgstr "分"
+#: src/fs/gnunet-download.c:234
+#, fuzzy
+msgid "You need to specify a URI argument.\n"
+msgstr "您必须指定一个昵称\n"
 
-#: src/util/strings.c:542
-msgid "h"
-msgstr "时"
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:626
+#, fuzzy, c-format
+msgid "Failed to parse URI: %s\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/strings.c:546
-msgid " days"
-msgstr " 天"
+#: src/fs/gnunet-download.c:247
+msgid "Only CHK or LOC URIs supported.\n"
+msgstr ""
 
-#: src/util/strings.c:570
-msgid "end of time"
+#: src/fs/gnunet-download.c:254
+msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/util/server.c:388
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:604
+#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr "对驱å\8a¨å\99¨â\80\9c%2$sâ\80\9dç\9a\84â\80\9c%1$sâ\80\9dæ\93\8dä½\9c失败ï¼\9a%3$u\n"
+msgid "Could not initialize `%s' subsystem.\n"
+msgstr "å\88\9då§\8bå\8c\96â\80\9c%sâ\80\9dæ\9c\8då\8a¡å¤±è´¥ã\80\82\n"
 
-#: src/util/server.c:397
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
+msgid "set the desired LEVEL of receiver-anonymity"
 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/fs/gnunet-download.c:308
+msgid "delete incomplete downloads (when aborted with CTRL-C)"
+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/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
+msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/util/crypto_random.c:280
-#, c-format
-msgid "Starting `%s' process to generate entropy\n"
+#: src/fs/gnunet-download.c:314
+msgid "write the file to FILENAME"
 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/fs/gnunet-download.c:318
+msgid "set the maximum number of parallel downloads that is allowed"
+msgstr ""
 
-#: src/util/disk.c:434
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%s': %u\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+#: src/fs/gnunet-download.c:322
+msgid "set the maximum number of parallel requests for blocks that is allowed"
+msgstr ""
 
-#: src/util/disk.c:834
-#, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "“%s”应为目录！\n"
+#: src/fs/gnunet-download.c:325
+msgid "download a GNUnet directory recursively"
+msgstr ""
 
-#: src/util/disk.c:1186 src/util/service.c:1452
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
+#: src/fs/gnunet-download.c:339
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
+msgstr ""
 
-#: src/util/disk.c:1491
-#, c-format
-msgid "No `%s' specified for service `%s' in configuration.\n"
+#: src/fs/gnunet-fs.c:117
+msgid "print a list of all indexed files"
 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/fs/gnunet-fs.c:127
+msgid "Special file-sharing operations"
+msgstr ""
 
-#: src/util/service.c:170
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:283
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "“%s”的参数无效。\n"
 
-#: src/util/service.c:263
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
+#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
+#: src/fs/gnunet-pseudonym.c:259
+#, fuzzy, c-format
+msgid "Option `%s' ignored\n"
+msgstr "%s：选项“%s”有歧义\n"
 
-#: src/util/service.c:296
-#, c-format
-msgid "Wrong format `%s' for netmask\n"
-msgstr "网络掩码的格式“%s”错误\n"
+#: src/fs/gnunet-pseudonym.c:282
+msgid "create or advertise namespace NAME"
+msgstr ""
 
-#: src/util/service.c:326
-#, c-format
-msgid "Wrong format `%s' for network\n"
-msgstr "网络的格式“%s”错误\n"
+#: src/fs/gnunet-pseudonym.c:285
+msgid "delete namespace NAME "
+msgstr ""
 
-#: src/util/service.c:629
-#, c-format
-msgid "Access denied to UID %d / GID %d\n"
+#: src/fs/gnunet-pseudonym.c:288
+msgid ""
+"add an additional keyword for the advertisment (this option can be specified "
+"multiple times)"
 msgstr ""
 
-#: src/util/service.c:634
-#, c-format
-msgid "Unknown address family %d\n"
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:699
+msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/util/service.c:641
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
+#: src/fs/gnunet-pseudonym.c:295
+msgid "print names of local namespaces"
 msgstr ""
 
-#: src/util/service.c:685
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
+#: src/fs/gnunet-pseudonym.c:298
+msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/util/service.c:713
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
+#: src/fs/gnunet-pseudonym.c:301
+msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/util/service.c:830
-#, c-format
-msgid ""
-"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+#: src/fs/gnunet-pseudonym.c:307
+msgid "specify ID of the root of the namespace"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:310
+msgid "change rating of namespace ID by VALUE"
+msgstr ""
+
+#: src/fs/gnunet-pseudonym.c:322
+msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1935
+#: src/fs/gnunet-publish.c:149
 #, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/util/service.c:880 src/util/client.c:707
+#: src/fs/gnunet-publish.c:156
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/util/service.c:900
+#: src/fs/gnunet-publish.c:166
 #, c-format
-msgid ""
-"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
-"domain socket: %s\n"
+msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/util/service.c:917
+#: src/fs/gnunet-publish.c:170
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/util/service.c:947 src/transport/plugin_transport_http.c:996
+#: src/fs/gnunet-publish.c:189
+msgid "Cleanup after abort complete.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:307
 #, fuzzy, c-format
-msgid "Failed to resolve `%s': %s\n"
+msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/service.c:964 src/transport/plugin_transport_http.c:1013
+#: src/fs/gnunet-publish.c:309
 #, fuzzy, c-format
-msgid "Failed to find %saddress for `%s'.\n"
-msgstr "æ\89¾ä¸\8då\88°æ\8e¥å\8f£â\80\9c%sâ\80\9dç\9a\84ä¸\80个 IP å\9c°å\9d\80ã\80\82\n"
+msgid "Keywords for file `%s' (%s)\n"
+msgstr "æ\97 æ³\95解æ\9e\90â\80\9c%sâ\80\9d(%s)ï¼\9a%s\n"
 
-#: src/util/service.c:1120 src/util/service.c:1138
-#, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
-msgstr ""
+#: src/fs/gnunet-publish.c:360 src/fs/gnunet-publish.c:614
+#, fuzzy, c-format
+msgid "Failed to create namespace `%s' (illegal filename?)\n"
+msgstr "发送消息失败。\n"
 
-#: src/util/service.c:1165
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+#: src/fs/gnunet-publish.c:435
+#, fuzzy
+msgid "Could not publish\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/fs/gnunet-publish.c:462
+msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/util/service.c:1314
+#: src/fs/gnunet-publish.c:493
 #, fuzzy, c-format
-msgid "Failed to start `%s' at `%s'\n"
-msgstr "运行 %s失败：%s %d\n"
+msgid "Scanning directory `%s'.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/gnunet-publish.c:495
+#, fuzzy, c-format
+msgid "Scanning file `%s'.\n"
+msgstr "未知的命令“%s”。\n"
 
-#: src/util/service.c:1347
+#: src/fs/gnunet-publish.c:500
 #, c-format
-msgid "Service `%s' runs at %s\n"
+msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/util/service.c:1393
-msgid "Service process failed to initialize\n"
+#: src/fs/gnunet-publish.c:505
+msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/util/service.c:1397
-msgid "Service process could not initialize server function\n"
-msgstr ""
+#: src/fs/gnunet-publish.c:509
+#, fuzzy, c-format
+msgid "Extracting meta data from file `%s' complete.\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/service.c:1401
-msgid "Service process failed to report status\n"
+#: src/fs/gnunet-publish.c:513
+msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/util/service.c:1453
-msgid "No such user"
-msgstr "无此用户"
+#: src/fs/gnunet-publish.c:520
+#, fuzzy
+msgid "Internal error scanning directory.\n"
+msgstr "未知错误。\n"
 
-#: src/util/service.c:1466
+#: src/fs/gnunet-publish.c:554
 #, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "无法更改用户/组为“%s”：%s\n"
-
-#: src/util/service.c:1529
-msgid "do daemonize (detach from terminal)"
+msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:76
-msgid "Test GNUnet DNS resolver code."
+#: src/fs/gnunet-publish.c:561
+#, c-format
+msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/util/os_priority.c:114
+#: src/fs/gnunet-publish.c:567
 #, c-format
-msgid "Not installing a handler because $%s=%s\n"
+msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:202
+#: src/fs/gnunet-publish.c:575 src/vpn/gnunet-vpn.c:214
 #, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
+msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:221
+#: src/fs/gnunet-publish.c:585 src/fs/gnunet-publish.c:592
+#: src/transport/gnunet-transport.c:774 src/transport/gnunet-transport.c:804
 #, c-format
-msgid ""
-"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:358
+#: src/fs/gnunet-publish.c:647
 #, fuzzy, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
-msgstr "GNUnet 现在使用 IP 地址 %s。\n"
+msgid "Failed to access `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/resolver_api.c:362
-#, c-format
-msgid "Timeout trying to resolve hostname `%s'.\n"
+#: src/fs/gnunet-publish.c:659
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
 msgstr ""
 
-#: src/util/resolver_api.c:430
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
+#: src/fs/gnunet-publish.c:691
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
 
-#: src/util/resolver_api.c:791
-#, c-format
-msgid "Resolver returns `%s'.\n"
+#: src/fs/gnunet-publish.c:695
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
 msgstr ""
 
-#: src/util/resolver_api.c:875
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
+#: src/fs/gnunet-publish.c:702
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
 
-#: src/util/resolver_api.c:880
-#, fuzzy, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/util/resolver_api.c:912
-#, c-format
-msgid "Resolving our hostname `%s'\n"
+#: src/fs/gnunet-publish.c:707
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
 msgstr ""
 
-#: src/util/pseudonym.c:266
-#, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/fs/gnunet-publish.c:715
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
+msgstr ""
 
-#: src/util/pseudonym.c:330
-msgid "no-name"
-msgstr "无名称"
+#: src/fs/gnunet-publish.c:721
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
+msgstr ""
 
-#: src/util/gnunet-service-resolver.c:261
-#, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+#: src/fs/gnunet-publish.c:725
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
+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/fs/gnunet-publish.c:729
+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/util/gnunet-service-resolver.c:460
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
+#: src/fs/gnunet-publish.c:745
+msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:508
+#: src/fs/gnunet-search.c:114
 #, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
+msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/util/bio.c:136 src/util/bio.c:142
+#: src/fs/gnunet-search.c:184
 #, fuzzy, c-format
-msgid "Error reading `%s': %s"
+msgid "Error searching: %s.\n"
 msgstr "创建用户出错"
 
-#: src/util/bio.c:143
-msgid "End of file"
+#: src/fs/gnunet-search.c:233
+msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/util/bio.c:195
-#, c-format
-msgid "Error reading length of string `%s'"
+#: src/fs/gnunet-search.c:257
+msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/util/bio.c:205
-#, c-format
-msgid "String `%s' longer than allowed (%u > %u)"
+#: src/fs/gnunet-search.c:288
+msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/util/bio.c:250
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+#: src/fs/gnunet-search.c:291
+msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/util/bio.c:264
-#, c-format
-msgid "Metadata `%s' failed to deserialize"
+#: src/fs/gnunet-search.c:298
+msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/util/client.c:301
-#, c-format
-msgid ""
-"Could not determine valid hostname and port for service `%s' from "
-"configuration.\n"
+#: src/fs/gnunet-search.c:309
+msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/util/client.c:309
-#, c-format
-msgid "Need a non-empty hostname for service `%s'.\n"
+#: src/fs/gnunet-service-fs.c:248
+msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/util/client.c:647
-msgid "Failure to transmit TEST request.\n"
+#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:523
+msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/util/client.c:849
-#, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
+#: src/fs/gnunet-service-fs.c:628 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/topology/gnunet-daemon-topology.c:1321
+#: src/topology/gnunet-daemon-topology.c:1328
+#, fuzzy, c-format
+msgid "Failed to connect to `%s' service.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/fs/gnunet-service-fs_cp.c:711
+msgid "# migration stop messages received"
 msgstr ""
 
-#: src/util/client.c:865
+#: src/fs/gnunet-service-fs_cp.c:715
 #, c-format
-msgid "Failure to transmit request to service `%s'\n"
+msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/util/client.c:1133
-msgid "Could not submit request, not expecting to receive a response.\n"
+#: src/fs/gnunet-service-fs_cp.c:751
+msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/util/crypto_rsa.c:616 src/util/crypto_rsa.c:663
-#, fuzzy, c-format
-msgid "Could not aquire lock on file `%s': %s...\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/util/crypto_rsa.c:621
-#, fuzzy
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
+#: src/fs/gnunet-service-fs_cp.c:757
+msgid "# replies dropped"
+msgstr ""
 
-#: src/util/crypto_rsa.c:639
-#, c-format
-msgid "I am host `%s'.  Stored new private key in `%s'.\n"
+#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1345
+msgid "# P2P searches active"
 msgstr ""
 
-#: src/util/crypto_rsa.c:667 src/util/crypto_rsa.c:703
-msgid "This may be ok if someone is currently generating a hostkey.\n"
+#: src/fs/gnunet-service-fs_cp.c:875
+msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/util/crypto_rsa.c:698
-#, c-format
-msgid ""
-"When trying to read hostkey file `%s' I found %u bytes but I need at least "
-"%u.\n"
+#: src/fs/gnunet-service-fs_cp.c:928
+msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/util/crypto_rsa.c:718
-#, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+#: src/fs/gnunet-service-fs_cp.c:936
+msgid "# replies received for other peers"
 msgstr ""
 
-#: src/util/crypto_rsa.c:736
-#, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
+#: src/fs/gnunet-service-fs_cp.c:950
+msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/util/crypto_rsa.c:957
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
+#: src/fs/gnunet-service-fs_cp.c:988
+msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:634 src/dht/gnunet-dht-get.c:213
-#: src/dht/gnunet-dht-put.c:184 src/fs/gnunet-unindex.c:169
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:591
-#: src/fs/gnunet-download.c:263
-msgid "be verbose (print progress information)"
+#: src/fs/gnunet-service-fs_cp.c:1056
+msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:652
-#, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "无法访问该服务"
+#: src/fs/gnunet-service-fs_cp.c:1081
+msgid "# request dropped, priority insufficient"
+msgstr ""
 
-#: src/nse/gnunet-service-nse.c:903
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
+#: src/fs/gnunet-service-fs_cp.c:1091
+msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1328 src/nse/gnunet-service-nse.c:1347
-#: src/nse/gnunet-service-nse.c:1368
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+#: src/fs/gnunet-service-fs_cp.c:1170
+msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1335
-msgid "Invalid work requirement for NSE service. Exiting.\n"
+#: src/fs/gnunet-service-fs_cp.c:1204
+msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1356
-#, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/fs/gnunet-service-fs_cp.c:1227
+msgid "# requests dropped due to missing reverse route"
+msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
+#: src/fs/gnunet-service-fs_cp.c:1288
+msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
-msgid "# peers known"
+#: src/fs/gnunet-service-fs_cp.c:1314
+msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+#: src/fs/gnunet-service-fs_cp.c:1343
+msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:304
-#, c-format
-msgid "Still no peers found in `%s'!\n"
+#: src/fs/gnunet-service-fs_cp.c:1713
+msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:258
+#: src/fs/gnunet-service-fs_indexing.c:130
+#: src/fs/gnunet-service-fs_indexing.c:181
 #, fuzzy, c-format
-msgid "Could not connect to `%s' service.\n"
-msgstr "æ\97 æ³\95è¿\9eæ\8e¥å\88° %s:%u：%s\n"
+msgid "Could not open `%s'.\n"
+msgstr "æ\97 æ³\95解æ\9e\90â\80\9c%sâ\80\9d(%s)：%s\n"
 
-#: src/peerinfo/peerinfo_api.c:279
+#: src/fs/gnunet-service-fs_indexing.c:142
 #, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "å\88\9då§\8bå\8c\96â\80\9c%sâ\80\9dæ\9c\8då\8a¡å¤±è´¥ã\80\82\n"
+msgid "Error writing `%s'.\n"
+msgstr "å\88\9b建ç\94¨æ\88·å\87ºé\94\99"
 
-#: src/peerinfo/peerinfo_api.c:435
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/fs/gnunet-service-fs_indexing.c:237
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
-msgid "Received invalid message from `PEERINFO' service.\n"
+#: src/fs/gnunet-service-fs_indexing.c:275
+#, c-format
+msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:523
-#, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/fs/gnunet-service-fs_indexing.c:477
+#, fuzzy, c-format
+msgid "Failed to delete bogus block: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+#: src/fs/gnunet-service-fs_indexing.c:542
+msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:424
-msgid "Sqlite datacache running\n"
-msgstr ""
+#: src/fs/gnunet-service-fs_indexing.c:557
+#, fuzzy, c-format
+msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/datacache/datacache.c:176
-#, c-format
-msgid "Loading `%s' datacache plugin\n"
+#: src/fs/gnunet-service-fs_indexing.c:559
+msgid "not indexed"
 msgstr ""
 
-#: src/datacache/datacache.c:184
+#: src/fs/gnunet-service-fs_indexing.c:574
 #, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
+msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/datacache/datacache.c:274
-msgid "# requests received"
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
+#: src/fs/gnunet-service-fs_lc.c:490
+msgid "# client searches active"
 msgstr ""
 
-#: src/datacache/datacache.c:284
-msgid "# requests filtered by bloom filter"
+#: src/fs/gnunet-service-fs_lc.c:256
+msgid "# replies received for local clients"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "无法初始化 SQLite：%s。\n"
+#: src/fs/gnunet-service-fs_lc.c:323
+msgid "# client searches received"
+msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:500
-msgid "Postgres datacache running\n"
+#: src/fs/gnunet-service-fs_lc.c:358
+msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:121
-msgid "Template datacache running\n"
+#: src/fs/gnunet-service-fs_pe.c:269
+msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:979
-msgid "MySQL datacache running\n"
+#: src/fs/gnunet-service-fs_pe.c:397
+msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:479
-msgid "# Preference updates given to core"
+#: src/fs/gnunet-service-fs_pe.c:426
+msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:571
-msgid "# FIND PEER messages initiated"
+#: src/fs/gnunet-service-fs_pe.c:475
+msgid "# delay heap timeout"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:627
-#: src/dht/gnunet-service-dht_neighbours.c:687
-#, fuzzy
-msgid "# Peers connected"
+#: src/fs/gnunet-service-fs_pe.c:483
+msgid "# query plans executed"
 msgstr ""
-"\n"
-"按任意键继续\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:721
-msgid "# Queued messages discarded (peer disconnected)"
+#: src/fs/gnunet-service-fs_pe.c:543
+msgid "# requests merged"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:776
-msgid "# Bytes transmitted to other peers"
+#: src/fs/gnunet-service-fs_pe.c:551
+msgid "# requests refreshed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:814
-msgid "# Bytes of bandwdith requested from core"
+#: src/fs/gnunet-service-fs_pe.c:605 src/fs/gnunet-service-fs_pe.c:689
+#: src/fs/gnunet-service-fs_pe.c:760
+msgid "# query plan entries"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1038
-#: src/dht/gnunet-service-dht_neighbours.c:1066
-msgid "# Peers excluded from routing due to Bloomfilter"
+#: src/fs/gnunet-service-fs_pr.c:299
+msgid "# Pending requests created"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1047
-#: src/dht/gnunet-service-dht_neighbours.c:1083
-msgid "# Peer selection failed"
+#: src/fs/gnunet-service-fs_pr.c:391 src/fs/gnunet-service-fs_pr.c:654
+msgid "# Pending requests active"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1219
-msgid "# PUT requests routed"
+#: src/fs/gnunet-service-fs_pr.c:822
+msgid "# replies received and matched"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1250
-msgid "# PUT messages queued for transmission"
+#: src/fs/gnunet-service-fs_pr.c:855
+msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1331
-msgid "# GET requests routed"
+#: src/fs/gnunet-service-fs_pr.c:864
+msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1362
-msgid "# GET messages queued for transmission"
+#: src/fs/gnunet-service-fs_pr.c:878
+#, c-format
+msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1465
-msgid "# RESULT messages queued for transmission"
+#: src/fs/gnunet-service-fs_pr.c:891
+msgid "# results found locally"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1553
-msgid "# P2P PUT requests received"
+#: src/fs/gnunet-service-fs_pr.c:1012
+msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1662
-msgid "# FIND PEER requests ignored due to Bloomfilter"
+#: src/fs/gnunet-service-fs_pr.c:1039
+msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1670
-msgid "# FIND PEER requests ignored due to lack of HELLO"
+#: src/fs/gnunet-service-fs_pr.c:1074
+msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1761
-msgid "# P2P GET requests received"
+#: src/fs/gnunet-service-fs_pr.c:1203
+msgid "# Replies received from STREAM"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1805
-msgid "# P2P FIND PEER requests processed"
+#: src/fs/gnunet-service-fs_pr.c:1255
+#, c-format
+msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1819
-msgid "# P2P GET requests ONLY routed"
+#: src/fs/gnunet-service-fs_pr.c:1275
+#, c-format
+msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1885
-msgid "# P2P RESULTS received"
+#: src/fs/gnunet-service-fs_pr.c:1322
+msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/dht/dht_api.c:229
-#, fuzzy
-msgid "Failed to connect to the DHT service!\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/fs/gnunet-service-fs_pr.c:1337
+msgid "# Datastore lookups concluded (seen all)"
+msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/fs/gnunet-service-fs_pr.c:1346
+msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
+msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-msgid "the query key"
+#: src/fs/gnunet-service-fs_pr.c:1361
+msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204
-msgid "how many parallel requests (replicas) to create"
+#: src/fs/gnunet-service-fs_pr.c:1375
+msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207
-msgid "the type of data to look for"
+#: src/fs/gnunet-service-fs_pr.c:1388
+msgid "# on-demand lookups performed successfully"
 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/fs/gnunet-service-fs_pr.c:1393
+msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:232
-msgid "Issue a GET request to the GNUnet DHT, prints results."
+#: src/fs/gnunet-service-fs_pr.c:1420 src/fs/gnunet-service-fs_pr.c:1460
+#: src/fs/gnunet-service-fs_pr.c:1601
+msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:311
-msgid "# GET requests from clients injected"
+#: src/fs/gnunet-service-fs_pr.c:1478
+msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:402
-msgid "# PUT requests received from clients"
+#: src/fs/gnunet-service-fs_pr.c:1489
+msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:469
-msgid "# GET requests received from clients"
+#: src/fs/gnunet-service-fs_pr.c:1577
+msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:564
-msgid "# GET STOP requests received from clients"
+#: src/fs/gnunet-service-fs_pr.c:1662
+msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:757
-msgid "# Key match, type mismatches in REPLY to CLIENT"
+#: src/fs/gnunet-service-fs_push.c:629
+msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:772
-msgid "# Duplicate REPLIES to CLIENT request dropped"
+#: src/fs/gnunet-unindex.c:89
+#, c-format
+msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:809
+#: src/fs/gnunet-unindex.c:95
 #, c-format
-msgid "Unsupported block type (%u) in request!\n"
+msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:831
-msgid "# RESULTS queued for clients"
+#: src/fs/gnunet-unindex.c:100
+msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:882
-#: src/dht/gnunet-service-dht_clients.c:925
-msgid "# REPLIES ignored for CLIENTS (no match)"
+#: src/fs/gnunet-unindex.c:130
+#, c-format
+msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:892
-msgid "Could not pass reply to client, message too big!\n"
+#: src/fs/gnunet-unindex.c:147
+msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59
-msgid "# Network size estimates received"
+#: src/fs/gnunet-unindex.c:179
+msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:100
+#: src/gns/gns_api.c:598
+#, fuzzy
+msgid "Failed to serialize lookup reply from GNS service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-dns2gns.c:186
+#, fuzzy
+msgid "Failed to pack DNS response into UDP packet!\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/gns/gnunet-dns2gns.c:361
 #, c-format
-msgid "PUT request sent!\n"
+msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/gns/gnunet-dns2gns.c:377
 #, c-format
-msgid "Must provide KEY and DATA for DHT put!\n"
+msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:132
-#, 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
+#: src/gns/gnunet-dns2gns.c:385
 #, c-format
-msgid "Issuing put request for `%s' with data `%s'!\n"
+msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:166
-msgid "the data to insert under the key"
+#: src/gns/gnunet-dns2gns.c:673
+msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
-msgid "how long to store this entry in the dht (in seconds)"
+#: src/gns/gnunet-dns2gns.c:676
+msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
-msgid "how many replicas to create"
+#: src/gns/gnunet-dns2gns.c:679
+msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:178
-msgid "the type to insert data as"
+#: src/gns/gnunet-dns2gns.c:692
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:221
+#, fuzzy, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns.c:335
+#, c-format
+msgid "Please specify lookup, shorten or authority operation!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr ""
+#: src/gns/gnunet-gns.c:356
+#, fuzzy
+msgid "try to shorten a given name"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-service-dht_routing.c:211
-msgid "# Good REPLIES matched against routing table"
+#: src/gns/gnunet-gns.c:359
+msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
-msgid "# Duplicate REPLIES matched against routing table"
+#: src/gns/gnunet-gns.c:362
+msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
-msgid "# Invalid REPLIES matched against routing table"
+#: src/gns/gnunet-gns.c:365
+msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
-msgid "# Unsupported REPLIES matched against routing table"
+#: src/gns/gnunet-gns.c:368
+msgid "No unneeded output"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
-msgid "# Entries removed from routing table"
+#: src/gns/gnunet-gns.c:381
+msgid "GNUnet GNS access tool"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
-msgid "# Entries added to routing table"
-msgstr ""
+#: src/gns/gnunet-gns-fcfsd.c:449
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "未知的命令“%s”。\n"
 
-#: src/dht/gnunet-service-dht_datacache.c:93
+#: src/gns/gnunet-gns-fcfsd.c:478
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:522
 #, c-format
-msgid "%s request received, but have no datacache!\n"
+msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:103
-msgid "# ITEMS stored in datacache"
+#: src/gns/gnunet-gns-fcfsd.c:584
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
-msgid "# Good RESULTS found in datacache"
-msgstr ""
+#: src/gns/gnunet-gns-fcfsd.c:646
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "发送消息失败。\n"
 
-#: src/dht/gnunet-service-dht_datacache.c:220
-msgid "# Duplicate RESULTS found in datacache"
-msgstr ""
+#: src/gns/gnunet-gns-fcfsd.c:662
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/dht/gnunet-service-dht_datacache.c:226
-msgid "# Invalid RESULTS found in datacache"
+#: src/gns/gnunet-gns-fcfsd.c:698
+msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
-msgid "# Unsupported RESULTS found in datacache"
+#: src/gns/gnunet-gns-fcfsd.c:706
+msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
-#, c-format
-msgid "Unsupported block type (%u) in local response!\n"
-msgstr ""
+#: src/gns/gnunet-gns-fcfsd.c:910 src/namestore/gnunet-namestore.c:364
+#, fuzzy
+msgid "Failed to read or create private zone key\n"
+msgstr "无法为守护程序创建用户账户。"
 
-#: src/dht/gnunet-service-dht_datacache.c:271
-msgid "# GET requests given to datacache"
-msgstr ""
+#: src/gns/gnunet-gns-fcfsd.c:920 src/namestore/gnunet-namestore.c:375
+#, fuzzy
+msgid "Failed to connect to namestore\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-service-dht_hello.c:82
-msgid "# HELLOs obtained from peerinfo"
+#: src/gns/gnunet-gns-fcfsd.c:936 src/gns/gnunet-gns-proxy.c:2857
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:970
+msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:161
+#: src/gns/gnunet-gns-proxy.c:2494
 #, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "æ\9c\8då\8a¡å·²å\88 é\99¤ã\80\82\n"
+msgid "Unable to import private key from file `%s'\n"
+msgstr "æ\97 æ³\95å\88\9b建ç\94¨æ\88·è´¦æ\88·ï¼\9a"
 
-#: src/arm/gnunet-arm.c:165
+#: src/gns/gnunet-gns-proxy.c:2522
 #, fuzzy, c-format
-msgid "Failed to stop service `%s'!\n"
-msgstr "æ\89\93å¼\80æ\97¥å¿\97æ\96\87件â\80\9c%sâ\80\9d失败ï¼\9a%s\n"
+msgid "Unable to import certificate %s\n"
+msgstr "æ\97 æ³\95ä¿\9då­\98é\85\8dç½®æ\96\87件â\80\9c%sâ\80\9dï¼\9a"
 
-#: src/arm/gnunet-arm.c:171
-#, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "服务已删除。\n"
+#: src/gns/gnunet-gns-proxy.c:3510
+msgid "listen on specified port (default: 7777)"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:175
-#, fuzzy, c-format
-msgid "Failed to start service `%s'!\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/gns/gnunet-gns-proxy.c:3513
+msgid "pem file to use as CA"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:181
-#, c-format
-msgid "Some error communicating with service `%s'.\n"
+#: src/gns/gnunet-gns-proxy.c:3525
+msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:207
+#: src/gns/gnunet-service-gns.c:486
 #, c-format
-msgid "Service `%s' is running.\n"
+msgid "Records for name `%s' in zone %s too large to fit into DHT"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:212
-#, c-format
-msgid "Service `%s' is not running.\n"
+#: src/gns/gnunet-service-gns.c:1216
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-service-gns.c:1277
+#, fuzzy
+msgid "Could not connect to DHT!\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/gns/gnunet-service-gns.c:1288
+#, fuzzy
+msgid "Unable to initialize resolver!\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/hello/gnunet-hello.c:118
+msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:238
+#: src/hello/gnunet-hello.c:124
+#, fuzzy, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/hello/gnunet-hello.c:132
 #, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
+msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
-msgid "Fatal error initializing ARM API.\n"
+#: src/hello/gnunet-hello.c:139
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:269
+#: src/hello/gnunet-hello.c:149 src/hello/gnunet-hello.c:177
 #, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "Error opening file `%s': %s\n"
+msgstr "创建用户出错"
 
-#: src/arm/gnunet-arm.c:275
+#: src/hello/gnunet-hello.c:165
 #, c-format
-msgid "Failed to remove servicehome directory %s\n"
+msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:387
+#: src/hello/gnunet-hello.c:189
+#, fuzzy, c-format
+msgid "Error writing HELLO to file `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/hello/hello.c:905
 #, fuzzy
-msgid "stop all GNUnet services"
-msgstr "卸载 GNUnet 服务"
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "保存配置失败。"
 
-#: src/arm/gnunet-arm.c:389
-msgid "start a particular service"
+#: src/hello/hello.c:914
+#, fuzzy
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "保存配置失败。"
+
+#: src/hello/hello.c:924
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/hello/hello.c:934
+msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
-msgid "stop a particular service"
+#: src/hello/hello.c:951
+#, c-format
+msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:393
-#, fuzzy
-msgid "start all GNUnet default services"
-msgstr "卸载 GNUnet 服务"
+#: src/hello/hello.c:960
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:396
-#, fuzzy
-msgid "stop and start all GNUnet default services"
-msgstr "卸载 GNUnet 服务"
+#: src/hello/hello.c:979
+#, fuzzy, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/arm/gnunet-arm.c:399
-msgid "test if a particular service is running"
+#: 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/arm/gnunet-arm.c:402
-msgid "delete config file and directory on exit"
+#: src/hostlist/gnunet-daemon-hostlist.c:317
+msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:404
-msgid "don't print status messages"
+#: src/hostlist/gnunet-daemon-hostlist.c:322
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:407
-#, fuzzy
-msgid "timeout for completing current operation"
-msgstr "等待一次迭代完成的时间(毫秒)"
+#: src/hostlist/gnunet-daemon-hostlist.c:325
+msgid "enable learning about hostlist servers from other peers"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:418
-msgid "Control services and the Automated Restart Manager (ARM)"
+#: src/hostlist/gnunet-daemon-hostlist.c:329
+msgid "provide a hostlist server"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:865
-msgid "Failed to transmit shutdown ACK.\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:344
+msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:870
-msgid "Transmitting shutdown ACK.\n"
+#: src/hostlist/hostlist-client.c:289
+msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:898
-msgid "Initiating shutdown as requested by client.\n"
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
+msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:206
+#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
 #, c-format
-msgid "Restarting service `%s' due to configuration file change.\n"
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:234
-msgid "Could not send status result to client\n"
+#: src/hostlist/hostlist-client.c:331
+msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:268
-msgid "Not sending status result to client: no client known\n"
+#: src/hostlist/hostlist-client.c:469 src/hostlist/hostlist-client.c:680
+#: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
+#: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
+#: src/hostlist/hostlist-client.c:958 src/hostlist/hostlist-client.c:963
+#: src/transport/plugin_transport_http_client.c:1052
+#: src/transport/plugin_transport_http_client.c:1067
+#, c-format
+msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:406
-#, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1325
+msgid "# advertised hostlist URIs"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:409
+#: src/hostlist/hostlist-client.c:619
 #, c-format
-msgid "Starting service `%s'\n"
+msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:435
+#: src/hostlist/hostlist-client.c:661
 #, c-format
-msgid "ARM is shutting down, service `%s' not started.\n"
+msgid ""
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:443
+#: src/hostlist/hostlist-client.c:799
 #, c-format
-msgid "Service `%s' already running.\n"
+msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:453
+#: src/hostlist/hostlist-client.c:813
 #, c-format
-msgid "Binary implementing service `%s' not known!\n"
+msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:464
+#: src/hostlist/hostlist-client.c:833
 #, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not known!\n"
-msgstr "配置文件“%s”已写入。\n"
+msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/arm/gnunet-service-arm.c:498
+#: src/hostlist/hostlist-client.c:839
 #, c-format
-msgid "Preparing to stop `%s'\n"
+msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:666
-msgid "Stopping all services\n"
+#: src/hostlist/hostlist-client.c:847
+#, c-format
+msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:723
+#: src/hostlist/hostlist-client.c:900
 #, c-format
-msgid "Restarting service `%s'.\n"
+msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:796
-msgid "exit"
+#: src/hostlist/hostlist-client.c:908
+msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:801
-msgid "signal"
+#: src/hostlist/hostlist-client.c:1035 src/hostlist/hostlist-client.c:1498
+msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:806
-#, fuzzy
-msgid "unknown"
-msgstr "未知错误"
+#: src/hostlist/hostlist-client.c:1043
+#, c-format
+msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:813
-#, fuzzy, c-format
-msgid "Service `%s' stopped\n"
-msgstr "服务已删除。\n"
+#: src/hostlist/hostlist-client.c:1107 src/hostlist/hostlist-client.c:1123
+msgid "# active connections"
+msgstr ""
 
-#: src/arm/gnunet-service-arm.c:827
+#: src/hostlist/hostlist-client.c:1273
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
+msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/arm/arm_api.c:201
-msgid "Failed to transmit shutdown request to client.\n"
+#: src/hostlist/hostlist-client.c:1277
+#, c-format
+msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/arm/arm_api.c:389
+#: src/hostlist/hostlist-client.c:1288
 #, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
-msgstr "配置不满足配置规范文件“%s”的约束！\n"
+msgid "Could not open file `%s' for reading to load hostlists: %s\n"
+msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/arm/arm_api.c:403
+#: src/hostlist/hostlist-client.c:1321
+#, c-format
+msgid "%u hostlist URIs loaded from file\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1323
+msgid "# hostlist URIs read from file"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:1368
 #, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "配置不满足配置规范文件“%s”的约束！\n"
+msgid "Could not open file `%s' for writing to save hostlists: %s\n"
+msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/arm/arm_api.c:467
+#: src/hostlist/hostlist-client.c:1373
 #, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
+msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:536
+#: src/hostlist/hostlist-client.c:1397 src/hostlist/hostlist-client.c:1414
 #, c-format
-msgid "Requesting start of service `%s'.\n"
+msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:537
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
+#: src/hostlist/hostlist-client.c:1409
+msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/arm/arm_api.c:559
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
+#: src/hostlist/hostlist-client.c:1463
+msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/arm/arm_api.c:560
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
+#: src/hostlist/hostlist-client.c:1475
+msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/arm/arm_api.c:592
+#: src/hostlist/hostlist-client.c:1487
 #, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
+msgid ""
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/arm/arm_api.c:664
+#: src/hostlist/hostlist-client.c:1491
 #, c-format
-msgid "Stopping service `%s' within %llu ms\n"
+msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:803
-#, c-format
-msgid "Unable to forward to service `%s': shutdown\n"
+#: src/hostlist/hostlist-server.c:134
+msgid "bytes in hostlist"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:157
+msgid "expired addresses encountered"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:812
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
+#: src/peerinfo-tool/gnunet-peerinfo.c:331
+#: src/peerinfo-tool/gnunet-peerinfo.c:386
+#: src/topology/gnunet-daemon-topology.c:922
 #, c-format
-msgid "Unable to forward to service `%s': timeout before connect\n"
+msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:868
-#, fuzzy, c-format
-msgid "Unable to start service `%s': %s\n"
-msgstr "无法保存配置文件“%s”："
+#: src/hostlist/hostlist-server.c:205
+msgid "HELLOs without addresses encountered (ignored)"
+msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:936
-#, fuzzy, c-format
-msgid "Unable to accept connection for service `%s': %s\n"
-msgstr "无法保存配置文件“%s”："
+#: src/hostlist/hostlist-server.c:219
+msgid "bytes not included in hostlist (size limit)"
+msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:952
-#, fuzzy, c-format
-msgid "Service `%s' started\n"
-msgstr "服务已删除。\n"
+#: src/hostlist/hostlist-server.c:263
+#, c-format
+msgid "Refusing `%s' request to hostlist server\n"
+msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1080
-#, fuzzy, c-format
-msgid "Unable to create socket for service `%s': %s\n"
-msgstr "无法创建用户账户："
+#: src/hostlist/hostlist-server.c:266
+msgid "hostlist requests refused (not HTTP GET)"
+msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1102
+#: src/hostlist/hostlist-server.c:279
 #, c-format
-msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
+msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1116
-#, c-format
-msgid "ARM now monitors connections to service `%s' at `%s'\n"
+#: src/hostlist/hostlist-server.c:283
+msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:270
-msgid "# acknowledgements sent for fragment"
+#: src/hostlist/hostlist-server.c:291
+msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:454
-msgid "# fragments received"
+#: src/hostlist/hostlist-server.c:294
+msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:513
-msgid "# duplicate fragments received"
+#: src/hostlist/hostlist-server.c:298
+msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:526
-msgid "# messages defragmented"
+#: src/hostlist/hostlist-server.c:299
+msgid "hostlist requests processed"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:188
-msgid "# fragments transmitted"
+#: src/hostlist/hostlist-server.c:341
+msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:191
-msgid "# fragments retransmitted"
+#: src/hostlist/hostlist-server.c:388
+msgid "Advertisement message could not be queued by core\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:562
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:571
+#, c-format
+msgid "Hostlist service starts on %s:%llu\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:585
+#, c-format
+msgid "Address to obtain hostlist: `%s'\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:625
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/hostlist-server.c:667
+#, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:255
-msgid "# messages fragmented"
+#: src/integration-tests/connection_watchdog.c:1001
+#, c-format
+msgid "Transport plugin: `%s' port %llu\n"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:258
-msgid "# total size of fragmented messages"
-msgstr ""
+#: src/integration-tests/connection_watchdog.c:1034
+#, fuzzy, c-format
+msgid "Found %u transport plugins: `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fragmentation/fragmentation.c:343
-msgid "# fragment acknowledgements received"
+#: src/integration-tests/connection_watchdog.c:1093
+msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:349
-msgid "# bits removed from fragmentation ACKs"
+#: src/integration-tests/connection_watchdog.c:1102
+#: src/template/gnunet-template.c:70
+msgid "help text"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:373
-msgid "# fragmentation transmissions completed"
-msgstr ""
+#: src/mesh/gnunet-daemon-regexprofiler.c:209
+#: src/mesh/gnunet-daemon-regexprofiler.c:222
+#: src/mesh/gnunet-daemon-regexprofiler.c:235
+#: src/mesh/gnunet-service-mesh.c:8692 src/mesh/gnunet-service-mesh.c:8704
+#: src/mesh/gnunet-service-mesh.c:8716 src/mesh/gnunet-service-mesh.c:8730
+#: src/mesh/gnunet-service-mesh.c:8742 src/mesh/gnunet-service-mesh.c:8754
+#: src/mesh/gnunet-service-mesh.c:8766 src/mesh/gnunet-service-mesh-new.c:8292
+#: src/mesh/gnunet-service-mesh-new.c:8304
+#: src/mesh/gnunet-service-mesh-new.c:8316
+#: src/mesh/gnunet-service-mesh-new.c:8329
+#: src/mesh/gnunet-service-mesh-new.c:8344
+#: src/mesh/gnunet-service-mesh-new.c:8356
+#: src/mesh/gnunet-service-mesh-new.c:8368
+#: src/regex/gnunet-regex-simulation-profiler.c:659
+#, fuzzy, c-format
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+msgstr "立即保存配置？"
 
-#: src/statistics/gnunet-service-statistics.c:208
-#, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+#: src/mesh/gnunet-daemon-regexprofiler.c:298
+msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:266
-#, c-format
-msgid "Wrote %llu bytes of statistics to `%s'\n"
+#: src/mesh/gnunet-mesh.c:162
+msgid ""
+"provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation about all "
+"tunnels (continuously)"
 msgstr ""
 
-#: src/statistics/statistics_api.c:327
+#: src/mesh/gnunet-mesh.c:173
 #, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "初始化“%s”服务失败。\n"
+msgid "Print information about mesh tunnels and peers."
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/statistics/gnunet-statistics.c:89
-#, fuzzy, c-format
-msgid "Failed to obtain statistics.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/mesh/gnunet-regex-profiler.c:1147
+#: src/testbed/gnunet-testbed-profiler.c:320
+msgid "An operation has failed while starting peers\n"
+msgstr ""
 
-#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
+#: src/mesh/gnunet-regex-profiler.c:1193
+#: src/testbed/gnunet-testbed-profiler.c:389
 #, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "“%s”的参数无效。\n"
+msgid "Creating a peer failed. Error: %s\n"
+msgstr "“%s”以错误码 %d 失败：%s\n"
 
-#: src/statistics/gnunet-statistics.c:155
-msgid "limit output to statistcs for the given NAME"
+#: src/mesh/gnunet-regex-profiler.c:1320
+#: src/testbed/gnunet-testbed-profiler.c:494
+msgid "An operation has failed while starting slaves\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:158
-msgid "make the value being set persistent"
+#: src/mesh/gnunet-regex-profiler.c:1342
+#, fuzzy, c-format
+msgid "No files found in `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/mesh/gnunet-regex-profiler.c:1397
+msgid "An operation has failed while linking\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:161
-msgid "limit output to the given SUBSYSTEM"
+#: src/mesh/gnunet-regex-profiler.c:1508
+#: src/testbed/gnunet-testbed-profiler.c:598
+#, c-format
+msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
-msgid "Print statistics about GNUnet operations."
+#: src/mesh/gnunet-regex-profiler.c:1588
+#: src/testbed/gnunet-testbed-profiler.c:677
+msgid "Unable to connect to master controller -- Check config\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:89
+#: src/mesh/gnunet-regex-profiler.c:1687
 #, c-format
-msgid "Unindexing at %llu/%llu (%s remaining)\n"
+msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:96
+#: src/mesh/gnunet-regex-profiler.c:1692
+#: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
-msgid "Error unindexing: %s.\n"
+msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:101
+#: src/mesh/gnunet-regex-profiler.c:1698
+#: src/testbed/gnunet-testbed-profiler.c:717
 #, c-format
-msgid "Unindexing done.\n"
+msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:109 src/fs/gnunet-search.c:190
-#: src/fs/gnunet-publish.c:158 src/fs/gnunet-download.c:144
+#: src/mesh/gnunet-regex-profiler.c:1705
+#: src/testbed/gnunet-testbed-profiler.c:724
+#: src/testbed/testbed_api_testbed.c:759
 #, c-format
-msgid "Unexpected status: %d\n"
+msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:131
+#: src/mesh/gnunet-regex-profiler.c:1712
+#: src/testbed/gnunet-testbed-profiler.c:731
+#, fuzzy, c-format
+msgid "Exiting\n"
+msgstr "退出"
+
+#: src/mesh/gnunet-regex-profiler.c:1718
 #, c-format
-msgid "You must specify one and only one filename for unindexing.\n"
+msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:141 src/fs/gnunet-search.c:241
-#: src/fs/gnunet-publish.c:412 src/fs/gnunet-download.c:203
+#: src/mesh/gnunet-regex-profiler.c:1727
 #, fuzzy, c-format
-msgid "Could not initialize `%s' subsystem.\n"
-msgstr "å\88\9då§\8bå\8c\96â\80\9c%sâ\80\9dæ\9c\8då\8a¡å¤±è´¥ã\80\82\n"
+msgid "Configuration option (regex_prefix) missing. Exiting\n"
+msgstr "é\85\8dç½®æ\96\87件â\80\9c%sâ\80\9då·²å\86\99å\85¥ã\80\82\n"
 
-#: src/fs/gnunet-unindex.c:148
+#: src/mesh/gnunet-regex-profiler.c:1745
+#: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
-msgid "Could not start unindex operation.\n"
+msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:176
-msgid "Unindex a file that was previously indexed with gnunet-publish."
+#: src/mesh/gnunet-regex-profiler.c:1752
+#, c-format
+msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:165
+#: src/mesh/gnunet-regex-profiler.c:1760
 #, c-format
-msgid "Namespace `%s' unknown.\n"
+msgid ""
+"Error loading search strings. Given file does not contain enough strings. "
+"Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/mesh/gnunet-regex-profiler.c:1766
 #, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s：选项“%s”有歧义\n"
-
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:538
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:272
-msgid "create or advertise namespace NAME"
-msgstr ""
+msgid "Error loading search strings. Exiting.\n"
+msgstr "创建用户出错"
 
-#: src/fs/gnunet-pseudonym.c:275
-msgid "delete namespace NAME "
-msgstr ""
+#: src/mesh/gnunet-regex-profiler.c:1800
+#, fuzzy
+msgid "name of the file for writing statistics"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-pseudonym.c:278
-msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
+#: src/mesh/gnunet-regex-profiler.c:1803
+msgid "create COUNT number of random links between peers"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:557
-msgid "set the meta-data for the given TYPE to the given VALUE"
+#: src/mesh/gnunet-regex-profiler.c:1806
+msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
-msgid "print names of local namespaces"
+#: src/mesh/gnunet-regex-profiler.c:1809
+msgid "wait DELAY before starting string search"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
-msgid "use the given PRIORITY for the advertisments"
+#: src/mesh/gnunet-regex-profiler.c:1812
+msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
-msgid "do not print names of remote namespaces"
+#: src/mesh/gnunet-regex-profiler.c:1815
+#: src/regex/gnunet-regex-simulation-profiler.c:692
+msgid "maximum path compression length"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:576
-msgid "set the desired replication LEVEL"
+#: src/mesh/gnunet-regex-profiler.c:1818
+msgid ""
+"if this option is set, only one peer is responsible for searching all strings"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
-msgid "specify ID of the root of the namespace"
+#: src/mesh/gnunet-regex-profiler.c:1830
+msgid "Profiler for regex/mesh"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:300
-msgid "change rating of namespace ID by VALUE"
+#: src/mesh/gnunet-service-mesh.c:8398 src/mesh/gnunet-service-mesh-new.c:7998
+msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "Manage GNUnet pseudonyms."
-msgstr ""
+#: src/mesh/gnunet-service-mesh.c:8603 src/mesh/gnunet-service-mesh-new.c:8203
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_namespace.c:64 src/fs/fs_namespace.c:90
+#: src/mesh/gnunet-service-mesh.c:8778 src/mesh/gnunet-service-mesh.c:8789
+#: src/mesh/gnunet-service-mesh-new.c:8380
+#: src/mesh/gnunet-service-mesh-new.c:8391
 #, fuzzy, c-format
-msgid "Configuration fails to specify `%s' in section `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
+msgid ""
+"%s service is lacking key configuration settings (%s). Using default (%u).\n"
+msgstr "立即保存配置？"
 
-#: src/fs/fs_namespace.c:119
-#, fuzzy, c-format
-msgid "Failed to open `%s' for writing: %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/mysql/mysql.c:174
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr ""
 
-#: src/fs/fs_namespace.c:141 src/fs/fs_namespace.c:229
+#: src/mysql/mysql.c:181
 #, fuzzy, c-format
-msgid "Failed to write `%s': %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/fs/fs_namespace.c:335
-#, fuzzy
-msgid "Unknown error"
-msgstr "未知错误"
-
-#: src/fs/fs_namespace.c:424 src/fs/fs_namespace.c:445
-#, fuzzy
-msgid "Failed to serialize meta data"
-msgstr "发送消息失败。\n"
+msgid "Could not access file `%s': %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/fs_namespace.c:464
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "初始化“%s”服务失败。\n"
+#: src/namestore/gnunet-namestore.c:212
+#, c-format
+msgid "Adding record failed: %s\n"
+msgstr ""
 
-#: src/fs/fs_namespace.c:507
+#: src/namestore/gnunet-namestore.c:243
 #, c-format
-msgid "Failed to create or read private key for namespace `%s'\n"
+msgid "Deleting record failed: %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:609
+#: src/namestore/gnunet-namestore.c:304
 #, c-format
-msgid "Failed to read namespace private key file `%s', deleting it!\n"
+msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:834 src/fs/fs_publish.c:1523
-#, fuzzy
-msgid "Internal error."
-msgstr "未知错误。\n"
+#: src/namestore/gnunet-namestore.c:320
+msgid "for at least"
+msgstr ""
 
-#: src/fs/fs_namespace.c:878
-msgid "Failed to connect to datastore."
+#: src/namestore/gnunet-namestore.c:321
+msgid "until"
 msgstr ""
 
-#: src/fs/gnunet-search.c:111
+#: src/namestore/gnunet-namestore.c:356
 #, c-format
-msgid "Failed to write directory with search results to `%s'\n"
+msgid "No options given\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:181
+#: src/namestore/gnunet-namestore.c:386
 #, fuzzy, c-format
-msgid "Error searching: %s.\n"
-msgstr "创建用户出错"
+msgid "Unsupported type `%s'\n"
+msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-search.c:231
-#, c-format
-msgid "Could not create keyword URI from arguments.\n"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:394 src/namestore/gnunet-namestore.c:418
+#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:477
+#: src/namestore/gnunet-namestore.c:518
+#, fuzzy, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
 
-#: src/fs/gnunet-search.c:255
-#, c-format
-msgid "Could not start searching.\n"
+#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
+msgid "add/del"
 msgstr ""
 
-#: src/fs/gnunet-search.c:285 src/fs/gnunet-download.c:240
-msgid "set the desired LEVEL of receiver-anonymity"
+#: src/namestore/gnunet-namestore.c:408
+#, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:288 src/fs/gnunet-download.c:246
-msgid "only search the local peer (no P2P network search)"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:446
+#, fuzzy, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
 
-#: src/fs/gnunet-search.c:291
-msgid "write search results to file starting with PREFIX"
+#: src/namestore/gnunet-namestore.c:455
+#, c-format
+msgid ""
+"Deletion requires either absolute time, or no time at all. Got relative time "
+"`%s' instead.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
+#: src/namestore/gnunet-namestore.c:497
+msgid "add"
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
-msgid "automatically terminate search after VALUE results are found"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:496
+#, fuzzy, c-format
+msgid "No valid expiration time for operation `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
 
-#: src/fs/gnunet-search.c:308
-msgid "Search GNUnet for files that were published on GNUnet"
+#: src/namestore/gnunet-namestore.c:519
+msgid "del"
 msgstr ""
 
-#: src/fs/fs_uri.c:214
-#, c-format
-msgid "`%' must be followed by HEX number"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:569
+#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "无效条目。\n"
 
-#: src/fs/fs_uri.c:273
-msgid "Malformed KSK URI (must not begin or end with `+')"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:625
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "卸载 GNUnet 服务"
 
-#: src/fs/fs_uri.c:291
-msgid "`++' not allowed in KSK URI"
+#: src/namestore/gnunet-namestore.c:677
+msgid "add record"
 msgstr ""
 
-#: src/fs/fs_uri.c:298
-msgid "Quotes not balanced in KSK URI"
+#: src/namestore/gnunet-namestore.c:680
+msgid "delete record"
 msgstr ""
 
-#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
-msgid "Malformed SKS URI"
+#: src/namestore/gnunet-namestore.c:683
+msgid "display records"
 msgstr ""
 
-#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
-msgid "Malformed CHK URI"
+#: src/namestore/gnunet-namestore.c:686
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
-#: src/fs/fs_uri.c:615
-msgid "SKS URI malformed"
+#: src/namestore/gnunet-namestore.c:689
+msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/fs/fs_uri.c:597
-msgid "SKS URI malformed (could not decode public key)"
+#: src/namestore/gnunet-namestore.c:692
+msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/fs/fs_uri.c:603
-msgid "SKS URI malformed (could not find signature)"
+#: src/namestore/gnunet-namestore.c:695
+msgid "URI to import into our zone"
 msgstr ""
 
-#: src/fs/fs_uri.c:609
-msgid "SKS URI malformed (could not decode signature)"
+#: src/namestore/gnunet-namestore.c:698
+msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/fs/fs_uri.c:622
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/namestore/gnunet-namestore.c:701
+msgid "create or list public record"
 msgstr ""
 
-#: src/fs/fs_uri.c:634
-msgid "SKS URI malformed (signature failed validation)"
+#: src/namestore/gnunet-namestore.c:704
+msgid "create or list non-authority record"
 msgstr ""
 
-#: src/fs/fs_uri.c:672
-msgid "Unrecognized URI type"
+#: src/namestore/gnunet-namestore.c:707
+msgid "filename with the zone key"
 msgstr ""
 
-#: src/fs/fs_uri.c:897
+#: src/namestore/gnunet-namestore.c:718
 #, fuzzy
-msgid "Lacking key configuration settings.\n"
-msgstr "立即保存配置？"
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet 配置"
 
-#: src/fs/fs_uri.c:904
+#: src/namestore/gnunet-service-namestore.c:241
+#: src/namestore/gnunet-service-namestore.c:257
 #, fuzzy, c-format
-msgid "Could not access hostkey file `%s'.\n"
-msgstr "æ\89¾ä¸\8då\88°æ\8e¥å\8f£â\80\9c%sâ\80\9dç\9a\84ä¸\80个 IP å\9c°å\9d\80ã\80\82\n"
+msgid "Failed to write zone key to file `%s': %s\n"
+msgstr "æ\89\93å¼\80æ\97¥å¿\97æ\96\87件â\80\9c%sâ\80\9d失败ï¼\9a%s\n"
 
-#: src/fs/fs_uri.c:1232 src/fs/fs_uri.c:1259
-msgid "No keywords specified!\n"
+#: src/namestore/gnunet-service-namestore.c:243
+msgid "file exists but reading key failed"
 msgstr ""
 
-#: src/fs/fs_uri.c:1265
-msgid "Number of double-quotes not balanced!\n"
+#: src/namestore/gnunet-service-namestore.c:259
+msgid "file exists with different key"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:118
-#, c-format
-msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
-msgstr ""
+#: src/namestore/gnunet-service-namestore.c:1557
+#, fuzzy
+msgid "Failed to find record to remove\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/fs/gnunet-publish.c:126
-#, c-format
-msgid "Error publishing: %s.\n"
-msgstr ""
+#: src/namestore/gnunet-service-namestore.c:2172
+#, fuzzy, c-format
+msgid "Could not parse zone key file `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/gnunet-publish.c:137
-#, c-format
-msgid "Publishing `%s' done.\n"
+#: src/namestore/gnunet-service-namestore.c:2262
+msgid "No directory to load zonefiles specified in configuration\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:141
+#: src/namestore/gnunet-service-namestore.c:2272
 #, c-format
-msgid "URI is `%s'.\n"
+msgid "Creating directory `%s' for zone files failed!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:267
-#, fuzzy, c-format
-msgid "Meta data for file `%s' (%s)\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/namestore/namestore_api.c:345
+msgid "Namestore failed to add record"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:269
-#, fuzzy, c-format
-msgid "Keywords for file `%s' (%s)\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+#: src/namestore/namestore_api.c:371
+msgid "Namestore failed to add record\n"
+msgstr ""
 
-#: src/fs/gnunet-publish.c:320
-#, fuzzy, c-format
-msgid "Failed to create namespace `%s'\n"
+#: src/namestore/namestore_api.c:415
+#, fuzzy
+msgid "Failed to create new signature"
 msgstr "发送消息失败。\n"
 
-#: src/fs/gnunet-publish.c:362
-#, c-format
-msgid "Cannot extract metadata from a URI!\n"
+#: src/namestore/namestore_api.c:419
+msgid "Failed to put new set of records in database"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:369
-#, c-format
-msgid "You must specify one and only one filename for insertion.\n"
-msgstr ""
+#: src/namestore/namestore_api.c:423
+#, fuzzy
+msgid "Failed to remove records from database"
+msgstr "发送消息失败。\n"
 
-#: src/fs/gnunet-publish.c:375
-#, c-format
-msgid "You must NOT specify an URI and a filename.\n"
-msgstr ""
+#: src/namestore/namestore_api.c:427
+#, fuzzy
+msgid "Failed to access database"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:383
-#, c-format
-msgid "Option `%s' is required when using option `%s'.\n"
-msgstr ""
+#: src/namestore/namestore_api.c:431
+#, fuzzy
+msgid "unknown internal error in namestore"
+msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:393 src/fs/gnunet-publish.c:400
-#: src/transport/gnunet-transport.c:506
-#, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
+#: src/namestore/namestore_api.c:436
+msgid "Protocol error"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:422
+#: src/namestore/namestore_common.c:509 src/namestore/namestore_common.c:649
 #, fuzzy, c-format
-msgid "Could not create namespace `%s'\n"
-msgstr "æ\97 æ³\95解æ\9e\90â\80\9c%sâ\80\9d(%s)ï¼\9a%s\n"
+msgid "Unsupported record type %d\n"
+msgstr "æ\9cªç\9f¥ç\9a\84å\91½ä»¤â\80\9c%sâ\80\9dã\80\82\n"
 
-#: src/fs/gnunet-publish.c:434 src/fs/gnunet-download.c:175
+#: src/namestore/namestore_common.c:516
 #, fuzzy, c-format
-msgid "Failed to parse URI: %s\n"
-msgstr "运行 %s失败：%s %d\n"
+msgid "Unable to parse IPv4 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
 
-#: src/fs/gnunet-publish.c:467
+#: src/namestore/namestore_common.c:539
 #, fuzzy, c-format
-msgid "Could not access file: %s\n"
-msgstr "错误：无法访问服务：%s\n"
+msgid "Unable to parse SOA record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/namestore/namestore_common.c:562
 #, fuzzy, c-format
-msgid "Could not publish `%s': %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/fs/gnunet-publish.c:515
-#, c-format
-msgid "Could not start publishing.\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:542
-msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:545
-msgid "do not use libextractor to add keywords or metadata"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:549
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
-msgstr ""
+msgid "Unable to parse MX record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:553
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
-msgstr ""
+#: src/namestore/namestore_common.c:580
+#, fuzzy, c-format
+msgid "Unable to parse IPv6 address `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
 
-#: src/fs/gnunet-publish.c:560
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
-msgstr ""
+#: src/namestore/namestore_common.c:593
+#, fuzzy, c-format
+msgid "Unable to parse PKEY record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:565
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
-msgstr ""
+#: src/namestore/namestore_common.c:614
+#, fuzzy, c-format
+msgid "Unable to parse VPN record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:569
-msgid "specify the priority of the content"
-msgstr ""
+#: src/namestore/namestore_common.c:640
+#, fuzzy, c-format
+msgid "Unable to parse TLSA record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:573
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
-msgstr ""
+#: src/namestore/plugin_namestore_postgres.c:95
+#, fuzzy
+msgid "Failed to create indices\n"
+msgstr "发送消息失败。\n"
 
-#: src/fs/gnunet-publish.c:579
-msgid ""
-"only simulate the process but do not do any actual publishing (useful to "
-"compute URIs)"
+#: src/nat/gnunet-nat-server.c:279
+#, c-format
+msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:583
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
+#: src/nat/gnunet-nat-server.c:321
+msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:587
-msgid ""
-"URI to be published (can be used instead of passing a file to add keywords "
-"to the file with the respective URI)"
+#: src/nat/nat.c:795
+#, c-format
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:600
-msgid "Publish a file or directory on GNUnet"
+#: src/nat/nat.c:844
+#, fuzzy, c-format
+msgid "Failed to start %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/nat/nat.c:1113
+msgid "malformed"
 msgstr ""
 
-#: src/fs/fs_search.c:803
+#: src/nat/nat.c:1179 src/nat/nat.c:1191
 #, c-format
-msgid "Got result with unknown block type `%d', ignoring"
+msgid ""
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
 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/nat/nat.c:1326
+msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:254
-msgid "# replies received for local clients"
+#: src/nat/nat.c:1337
+#, c-format
+msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:319
-msgid "# client searches received"
+#: src/nat/nat_mini.c:170
+msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:358
-msgid "# client searches updated (merged content seen list)"
+#: src/nat/nat_mini.c:505
+msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
-msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
+#: src/nat/nat_test.c:341
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/fs/fs_misc.c:126
+#: src/nat/nat_test.c:411
 #, c-format
-msgid "Did not find mime type `%s' in extension list.\n"
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:49
-#, c-format
-msgid "\t<original file embedded in %u bytes of meta data>\n"
+#: src/nse/gnunet-nse-profiler.c:1009
+msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
-#, c-format
-msgid "Directory `%s' meta data:\n"
+#: src/nse/gnunet-nse-profiler.c:1012
+msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:97
-#, c-format
-msgid "Directory `%s' contents:\n"
+#: src/nse/gnunet-nse-profiler.c:1015
+msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:132
-#, fuzzy, c-format
-msgid "You must specify a filename to inspect."
-msgstr "您必须指定一个昵称\n"
-
-#: src/fs/gnunet-directory.c:145
-#, fuzzy, c-format
-msgid "Failed to read directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/fs/gnunet-directory.c:176
-#, fuzzy
-msgid "Display contents of a GNUnet directory"
-msgstr "更改 GNUnet 目录的权限出错"
-
-#: src/fs/gnunet-service-fs_pr.c:287
-msgid "# Pending requests created"
+#: src/nse/gnunet-nse-profiler.c:1018
+msgid "IP address of this system as seen by the rest of the testbed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:368 src/fs/gnunet-service-fs_pr.c:622
-msgid "# Pending requests active"
+#: src/nse/gnunet-nse-profiler.c:1021
+msgid "delay between queries to statistics during a round"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:786
-msgid "# replies received and matched"
+#: src/nse/gnunet-nse-profiler.c:1024
+msgid "prefix of the filenames we use for writing the topology for each round"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:813
-msgid "# duplicate replies discarded (bloomfilter)"
+#: src/nse/gnunet-nse-profiler.c:1027
+msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:829
-#, c-format
-msgid "Unsupported block type %u\n"
+#: src/nse/gnunet-nse-profiler.c:1030
+msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:844
-msgid "# results found locally"
+#: src/nse/gnunet-nse-profiler.c:1036
+msgid "delay between rounds"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:936
-msgid "# Datastore `PUT' failures"
-msgstr ""
+#: src/nse/gnunet-nse-profiler.c:1046
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "无法访问该服务"
 
-#: src/fs/gnunet-service-fs_pr.c:963
-msgid "# storage requests dropped due to high load"
+#: src/nse/gnunet-service-nse.c:938
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:998
-msgid "# Replies received from DHT"
+#: src/nse/gnunet-service-nse.c:1389
+#, fuzzy, c-format
+msgid "NSE service could not access hostkey: %s\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/nse/gnunet-service-nse.c:1403 src/nse/gnunet-service-nse.c:1478
+#: src/nse/gnunet-service-nse.c:1495
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1088
-#, c-format
-msgid "Datastore lookup already took %llu ms!\n"
+#: src/nse/gnunet-service-nse.c:1485
+msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1109
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, c-format
-msgid "On-demand lookup already took %llu ms!\n"
+msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1156
-msgid "# Datastore lookups concluded (no results)"
-msgstr ""
+#: src/peerinfo/gnunet-service-peerinfo.c:228
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1170
-msgid "# Datastore lookups concluded (seen all)"
+#: src/peerinfo/gnunet-service-peerinfo.c:267
+msgid "# peers known"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1179
-msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
+#: src/peerinfo/gnunet-service-peerinfo.c:292
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1195
-msgid "# requested DBLOCK or IBLOCK not found"
+#: src/peerinfo/gnunet-service-peerinfo.c:414
+#, c-format
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1212
-msgid "# on-demand blocks matched requests"
+#: src/peerinfo/gnunet-service-peerinfo.c:800
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1225
-msgid "# on-demand lookups performed successfully"
+#: src/peerinfo/peerinfo_api.c:239
+msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1230
-msgid "# on-demand lookups failed"
-msgstr ""
+#: src/peerinfo/peerinfo_api.c:359
+#, fuzzy
+msgid "failed to transmit request (service down?)"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1257 src/fs/gnunet-service-fs_pr.c:1297
-#: src/fs/gnunet-service-fs_pr.c:1437
-msgid "# Datastore lookups concluded (error queueing)"
+#: src/peerinfo/peerinfo_api.c:509
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1315
-msgid "# Datastore lookups concluded (found last result)"
-msgstr ""
+#: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
+#: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
+#: src/peerinfo/peerinfo_api.c:606
+#, fuzzy
+msgid "Received invalid message from `PEERINFO' service."
+msgstr "“%s”的参数无效。\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1328
-msgid "# Datastore lookups concluded (load too high)"
-msgstr ""
+#: src/peerinfo/peerinfo_api.c:681
+#, fuzzy
+msgid "Timeout transmitting iteration request to `PEERINFO' service."
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1414
-msgid "# Datastore lookups initiated"
-msgstr ""
+#: src/peerinfo/peerinfo_api_notify.c:256
+#, fuzzy, c-format
+msgid "Could not connect to `%s' service.\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1495
-msgid "# GAP PUT messages received"
+#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#, c-format
+msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1586 src/fs/gnunet-service-fs_pr.c:1595
+#: src/peerinfo-tool/gnunet-peerinfo.c:557
 #, fuzzy, c-format
-msgid "Configuration fails to specify `%s', assuming default value."
-msgstr "配置文件“%s”已写入。\n"
+msgid "Could not find option `%s:%s' in configuration.\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/fs/gnunet-service-fs_pe.c:265
-msgid "# average retransmission delay (ms)"
+#: src/peerinfo-tool/gnunet-peerinfo.c:563
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:394
-msgid "# transmission failed (core has no bandwidth)"
+#: src/peerinfo-tool/gnunet-peerinfo.c:622
+#, c-format
+msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:425
-msgid "# query messages sent to other peers"
+#: src/peerinfo-tool/gnunet-peerinfo.c:648
+msgid "don't resolve host names"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:478
-msgid "# delay heap timeout"
+#: src/peerinfo-tool/gnunet-peerinfo.c:651
+msgid "output only the identity strings"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:485
-msgid "# query plans executed"
+#: src/peerinfo-tool/gnunet-peerinfo.c:654
+msgid "output our own identity only"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:549
-msgid "# requests merged"
-msgstr ""
+#: src/peerinfo-tool/gnunet-peerinfo.c:657
+#, fuzzy
+msgid "list all known peers"
+msgstr "列出所有网络适配器"
 
-#: src/fs/gnunet-service-fs_pe.c:555
-msgid "# requests refreshed"
+#: src/peerinfo-tool/gnunet-peerinfo.c:660
+msgid "also output HELLO uri(s)"
 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/peerinfo-tool/gnunet-peerinfo.c:663
+msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1543
-#: src/transport/gnunet-service-transport_neighbours.c:934
-#: src/transport/gnunet-service-transport_neighbours.c:939
-#: src/transport/gnunet-service-transport_neighbours.c:1263
-#: src/transport/gnunet-service-transport_neighbours.c:2364
-#: src/transport/gnunet-service-transport_neighbours.c:2430
-#: src/topology/gnunet-daemon-topology.c:654
-#: src/topology/gnunet-daemon-topology.c:756
-msgid "# peers connected"
-msgstr ""
+#: src/peerinfo-tool/gnunet-peerinfo.c:674
+#, fuzzy
+msgid "Print information about peers."
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:696
-msgid "# migration stop messages received"
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
+#: src/transport/gnunet-service-transport_plugins.c:118
+#, c-format
+msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:700
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:122
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:735
-msgid "# replies transmitted to other peers"
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:150
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/postgres/postgres.c:59
+#, fuzzy, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+
+#: src/postgres/postgres.c:148
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres: %s"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/pt/gnunet-daemon-pt.c:264
+msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:741
-msgid "# replies dropped"
+#: src/pt/gnunet-daemon-pt.c:270
+msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:770 src/fs/gnunet-service-fs_cp.c:886
-#: src/fs/gnunet-service-fs_cp.c:1296 src/fs/gnunet-service-fs_cp.c:1333
-msgid "# P2P searches active"
+#: src/pt/gnunet-daemon-pt.c:323
+msgid "# DNS records modified"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:843
-msgid "# artificial delays introduced (ms)"
+#: src/pt/gnunet-daemon-pt.c:500
+msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:906
-msgid "# replies received for other peers"
+#: src/pt/gnunet-daemon-pt.c:506
+msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:920
-msgid "# replies dropped due to insufficient cover traffic"
+#: src/pt/gnunet-daemon-pt.c:602
+msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
-msgid "# P2P searches destroyed due to ultimate reply"
+#: src/pt/gnunet-daemon-pt.c:632
+msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1025
-msgid "# requests done for free (low load)"
+#: src/pt/gnunet-daemon-pt.c:637
+msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1049
-msgid "# request dropped, priority insufficient"
+#: src/pt/gnunet-daemon-pt.c:645
+msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1059
-msgid "# requests done for a price (normal load)"
+#: src/pt/gnunet-daemon-pt.c:716
+msgid "# DNS replies received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1138
-msgid "# GET requests received (from other peers)"
+#: src/pt/gnunet-daemon-pt.c:730
+msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1172
-msgid "# requests dropped due to initiator not being connected"
+#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
+msgid "# DNS requests aborted (tunnel down)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1196
-msgid "# requests dropped due to missing reverse route"
+#: 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/pt/gnunet-daemon-pt.c:976
+msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1262
-msgid "# requests dropped due TTL underflow"
+#: src/regex/gnunet-regex-simulation-profiler.c:689
+msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1290
-msgid "# requests dropped due to higher-TTL request"
+#: src/regex/gnunet-regex-simulation-profiler.c:705
+msgid "Profiler for regex library"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1331
-msgid "# P2P query messages received and processed"
+#: src/statistics/gnunet-service-statistics.c:271
+#, c-format
+msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:653
+#: src/statistics/gnunet-service-statistics.c:330
 #, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
+#: src/statistics/gnunet-statistics.c:141
+#, fuzzy
+msgid "Failed to obtain statistics.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/statistics/gnunet-statistics.c:143
 #, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr "é\85\8dç½®æ\96\87件â\80\9c%sâ\80\9då·²å\86\99å\85¥ã\80\82\n"
+msgid "Failed to obtain statistics from host `%s:%llu'\n"
+msgstr "å\88\9då§\8bå\8c\96â\80\9c%sâ\80\9dæ\9c\8då\8a¡å¤±è´¥ã\80\82\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:121
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/statistics/gnunet-statistics.c:181
 #, fuzzy, c-format
-msgid "Could not open `%s'.\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+msgid "Trying to connect to remote host, but service `%s' is not running\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:137
+#: src/statistics/gnunet-statistics.c:190
 #, fuzzy, c-format
-msgid "Error writing `%s'.\n"
-msgstr "创建用户出错"
+msgid "A port is required to connect to host `%s'\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:228
+#: src/statistics/gnunet-statistics.c:196
 #, c-format
-msgid ""
-"Index request received for file `%s' is already indexed as `%s'.  Permitting "
-"anyway.\n"
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:210
+msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:266
+#: src/statistics/gnunet-statistics.c:216
+msgid "Missing argument: name\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:247
 #, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
+msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:487
+#: src/statistics/gnunet-statistics.c:255
 #, fuzzy, c-format
-msgid "Failed to delete bogus block: %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+msgid "Failed to initialize watch routine\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:545
-msgid "# index blocks removed: original file inaccessible"
+#: src/statistics/gnunet-statistics.c:310
+msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:560
-#, fuzzy, c-format
-msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
+#: src/statistics/gnunet-statistics.c:313
+msgid "make the value being set persistent"
+msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:562
-msgid "not indexed"
+#: src/statistics/gnunet-statistics.c:316
+msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:577
-#, c-format
-msgid "Indexed file `%s' changed at offset %llu\n"
+#: src/statistics/gnunet-statistics.c:319
+msgid "just print the statistics value"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:90
-#, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
+#: src/statistics/gnunet-statistics.c:322
+msgid "watch value continuously"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:117
-#, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+#: src/statistics/gnunet-statistics.c:325
+msgid "connect to remote host"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:164
-#, fuzzy, c-format
-msgid "Failed to not connect to `%s' service.\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/statistics/gnunet-statistics.c:328
+msgid "port for remote host"
+msgstr ""
 
-#: src/fs/fs_unindex.c:58
-msgid "Failed to find given position in file"
+#: src/statistics/gnunet-statistics.c:340
+msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/statistics/statistics_api.c:511
 #, fuzzy
-msgid "Failed to read file"
-msgstr "å\8f\91é\80\81æ¶\88æ\81¯失败。\n"
+msgid "Could not save some persistent statistics\n"
+msgstr "å\88\9då§\8bå\8c\96â\80\9c%sâ\80\9dæ\9c\8då\8a¡失败。\n"
 
-#: src/fs/fs_unindex.c:235
-msgid "Unexpected time for a response from `fs' service."
+#: src/statistics/statistics_api.c:1056
+msgid ""
+"Failed to receive acknowledgement from statistics service, some statistics "
+"might have been lost!\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:243
-msgid "Timeout waiting for `fs' service."
+#: src/testbed/gnunet-testbed-profiler.c:706
+#, c-format
+msgid "No hosts-file specified on command line\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:251
-#, fuzzy
-msgid "Invalid response from `fs' service."
-msgstr "“%s”的参数无效。\n"
+#: src/testbed/gnunet-testbed-profiler.c:780
+msgid "Only `CLIQUE' and `RANDOM' are permitted.\n"
+msgstr ""
 
-#: src/fs/fs_unindex.c:296
-msgid "Failed to connect to FS service for unindexing."
+#: src/testbed/gnunet-testbed-profiler.c:795
+msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/fs/fs_unindex.c:331
-#, fuzzy
-msgid "Failed to connect to `datastore' service."
-msgstr "初始化“%s”服务失败。\n"
+#: src/testbed/gnunet-testbed-profiler.c:798
+msgid "create COUNT number of random links"
+msgstr ""
 
-#: src/fs/fs_unindex.c:344
-#, fuzzy
-msgid "Failed to open file for unindexing."
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/testbed/gnunet-testbed-profiler.c:801
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:804
+msgid ""
+"Try to acheive TOPOLOGY. This options takes either CLIQUE or RANDOM. For "
+"CLIQUE the parameter -n is ignored. The default is to acheive a random graph "
+"topology."
+msgstr ""
 
-#: src/fs/fs_unindex.c:378
-msgid "Failed to compute hash of file."
+#: src/testbed/gnunet-testbed-profiler.c:819
+msgid "Profiler for testbed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:100
+#: src/testbed/testbed_api.c:320
 #, fuzzy, c-format
-msgid "Starting download `%s'.\n"
-msgstr "未知的命令“%s”。\n"
+msgid "Adding host %u failed with error: %s\n"
+msgstr "“%s”以错误码 %d 失败：%s\n"
 
-#: src/fs/gnunet-download.c:112
+#: src/testbed/testbed_api_hosts.c:326
 #, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
+msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:121
+#: src/testbed/testbed_api_hosts.c:334
 #, c-format
-msgid "Error downloading: %s.\n"
+msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:129
+#: src/testbed/testbed_api_hosts.c:341
 #, c-format
-msgid "Downloading `%s' done (%s/s).\n"
+msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:169
-#, fuzzy, c-format
-msgid "You need to specify a URI argument.\n"
-msgstr "您必须指定一个昵称\n"
+#: src/testbed/testbed_api_testbed.c:320
+msgid "Some operations are still pending. Cancelling them\n"
+msgstr ""
 
-#: src/fs/gnunet-download.c:182
+#: src/testbed/testbed_api_topology.c:580
 #, c-format
-msgid "Only CHK or LOC URIs supported.\n"
+msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
+#: src/testbed/testbed_api_topology.c:586
 #, c-format
-msgid "Target filename must be specified.\n"
+msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:243
-msgid "delete incomplete downloads (when aborted with CTRL-C)"
+#: src/testbed/testbed_api_topology.c:592
+#, c-format
+msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:249
-msgid "write the file to FILENAME"
-msgstr ""
+#: src/testbed/testbed_api_topology.c:614
+#, fuzzy, c-format
+msgid "Failed to read peer index from toology file: %s"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-download.c:253
-msgid "set the maximum number of parallel downloads that is allowed"
+#: src/testbed/testbed_api_topology.c:623
+#: src/testbed/testbed_api_topology.c:648
+#, c-format
+msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:257
-msgid "set the maximum number of parallel requests for blocks that is allowed"
+#: src/testbed/testbed_api_topology.c:629
+#: src/testbed/testbed_api_topology.c:654
+#, fuzzy, c-format
+msgid "Failed to read peer index from topology file: %s"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/testbed/testbed_api_topology.c:635
+#: src/testbed/testbed_api_topology.c:660
+msgid "Topology file need more peers than the given ones\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:260
-msgid "download a GNUnet directory recursively"
+#: src/testing/gnunet-testing.c:131
+#, fuzzy, c-format
+msgid "Could not extract hostkey %u (offset too large?)\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/testing/gnunet-testing.c:202
+#, fuzzy
+msgid "create unique configuration files"
+msgstr "更改配置文件中的一个值"
+
+#: src/testing/gnunet-testing.c:204
+msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/fs/gnunet-download.c:270
+#: src/testing/gnunet-testing.c:206
+#, fuzzy
 msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
+msgstr "打印配置文件中的一个值到标准输出"
+
+#: src/testing/gnunet-testing.c:208
+#, fuzzy
+msgid "configuration template"
+msgstr "配置已保存"
+
+#: src/testing/gnunet-testing.c:217
+msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/fs/fs_getopt.c:191
+#: src/testing/gnunet-testing-run-service.c:129
 #, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr ""
+
+#: src/testing/gnunet-testing-run-service.c:186
+#, fuzzy
+msgid "name of the template configuration file to use (optional)"
+msgstr "打印配置文件中的一个值到标准输出"
+
+#: src/testing/gnunet-testing-run-service.c:189
+msgid "name of the service to run"
 msgstr ""
 
-#: src/fs/fs_publish.c:147 src/fs/fs_publish.c:415
+#: src/testing/testing.c:199
 #, c-format
-msgid "Publishing failed: %s"
+msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:652 src/fs/fs_publish.c:669 src/fs/fs_publish.c:708
-#: src/fs/fs_publish.c:728 src/fs/fs_publish.c:755 src/fs/fs_publish.c:903
+#: src/testing/testing.c:215
 #, c-format
-msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
+msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:654
-msgid "timeout on index-start request to `fs' service"
+#: src/testing/testing.c:526
+#, c-format
+msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:666
+#: src/testing/testing.c:536
+#, fuzzy, c-format
+msgid "Error while decoding key %u\n"
+msgstr "解析 dscl 输出时出错。\n"
+
+#: src/testing/testing.c:850
 #, fuzzy
-msgid "unknown error"
-msgstr "未知错误"
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:709
-msgid "failed to compute hash"
+#: src/testing/testing.c:861
+#, c-format
+msgid ""
+"You attempted to create a testbed with more than %u hosts.  Please "
+"precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:729
-msgid "filename too long"
-msgstr ""
+#: src/testing/testing.c:875
+#, fuzzy, c-format
+msgid "Failed to initialize hostkey for peer %u\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_publish.c:756
-msgid "could not connect to `fs' service"
-msgstr ""
+#: src/testing/testing.c:908
+#, fuzzy, c-format
+msgid "Failed to write hostkey file for peer %u: %s\n"
+msgstr "发送消息失败。\n"
 
-#: src/fs/fs_publish.c:780
+#: src/testing/testing.c:926
 #, fuzzy, c-format
-msgid "Failed to get file identifiers for `%s'\n"
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:850
-#, c-format
-msgid "Recursive upload failed at `%s': %s"
+#: src/testing/testing.c:997
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/testing/testing.c:1202
+#, fuzzy, c-format
+msgid "Failed to load configuration from %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/topology/gnunet-daemon-topology.c:254
+msgid "# peers blacklisted"
 msgstr ""
 
-#: src/fs/fs_publish.c:856
-#, c-format
-msgid "Recursive upload failed: %s"
+#: src/topology/gnunet-daemon-topology.c:387
+msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/fs/fs_publish.c:904
-msgid "needs to be an actual file"
+#: src/topology/gnunet-daemon-topology.c:725
+#: src/topology/gnunet-daemon-topology.c:810
+msgid "# friends connected"
+msgstr ""
+
+#: src/topology/gnunet-daemon-topology.c:991
+msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1083
+#: src/topology/gnunet-daemon-topology.c:1033
 #, c-format
-msgid "Insufficient space for publishing: %s"
+msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1154
+#: src/topology/gnunet-daemon-topology.c:1039
 #, c-format
-msgid "Reserving space for %u entries and %llu bytes for publication\n"
+msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1487
-msgid "Could not connect to datastore."
+#: src/topology/gnunet-daemon-topology.c:1048
+#, c-format
+msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
-#: src/fs/fs_api.c:284
-#, fuzzy, c-format
-msgid "Could not open file `%s': %s"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/topology/gnunet-daemon-topology.c:1056
+#, c-format
+msgid "Failed to read friends list from `%s'\n"
+msgstr ""
 
-#: src/fs/fs_api.c:293
-#, fuzzy, c-format
-msgid "Could not read file `%s': %s"
-msgstr "无法解析“%s”(%s)：%s\n"
+#: src/topology/gnunet-daemon-topology.c:1076
+#, c-format
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes.\n"
+msgstr ""
 
-#: src/fs/fs_api.c:299
+#: src/topology/gnunet-daemon-topology.c:1089
 #, c-format
-msgid "Short read reading from file `%s'!"
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/topology/gnunet-daemon-topology.c:1099
 #, fuzzy, c-format
-msgid "Failed to resume publishing information `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+msgid "Found friend `%s' in configuration\n"
+msgstr ""
+"\n"
+"结束配置。\n"
 
-#: src/fs/fs_api.c:1323
+#: src/topology/gnunet-daemon-topology.c:1105
 #, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1364
-#, c-format
-msgid "Failure while resuming publishing operation `%s': %s\n"
+#: src/topology/gnunet-daemon-topology.c:1115
+#, fuzzy
+msgid "# friends in configuration"
 msgstr ""
+"\n"
+"结束配置。\n"
 
-#: src/fs/fs_api.c:1380
-#, fuzzy, c-format
-msgid "Failed to resume publishing operation `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/topology/gnunet-daemon-topology.c:1121
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
+msgstr ""
 
-#: src/fs/fs_api.c:1984
-#, c-format
-msgid "Failure while resuming unindexing operation `%s': %s\n"
+#: src/topology/gnunet-daemon-topology.c:1128
+msgid ""
+"More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1994
-#, fuzzy, c-format
-msgid "Failed to resume unindexing operation `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/topology/gnunet-daemon-topology.c:1163
+msgid "# HELLO messages received"
+msgstr ""
 
-#: src/fs/fs_api.c:2107 src/fs/fs_api.c:2346
-#, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/topology/gnunet-daemon-topology.c:1218
+msgid "# HELLO messages gossipped"
+msgstr ""
 
-#: src/fs/fs_api.c:2124
+#: src/topology/gnunet-daemon-topology.c:1357
+msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:245
 #, fuzzy, c-format
-msgid "Failed to resume sub-search `%s': %s\n"
-msgstr "æ\89\93å¼\80æ\97¥å¿\97æ\96\87件â\80\9c%sâ\80\9d失败：%s\n"
+msgid "Could not read blacklist file `%s'\n"
+msgstr "æ\97 æ³\95解æ\9e\90â\80\9c%sâ\80\9d(%s)：%s\n"
 
-#: src/fs/fs_api.c:2136 src/fs/fs_api.c:2155 src/fs/fs_api.c:2631
+#: src/transport/gnunet-service-transport_blacklist.c:251
 #, c-format
-msgid "Failure while resuming search operation `%s': %s\n"
+msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2337
+#: src/transport/gnunet-service-transport_blacklist.c:262
 #, fuzzy, c-format
-msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
+msgid "Failed to read blacklist from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2583
-msgid "Could not resume running search, will resume as paused search\n"
-msgstr ""
+#: src/transport/gnunet-service-transport_blacklist.c:283
+#: src/transport/gnunet-service-transport_blacklist.c:307
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/fs/fs_api.c:2669
+#: src/transport/gnunet-service-transport_blacklist.c:294
+#: src/transport/gnunet-service-transport_blacklist.c:330
 #, c-format
-msgid "Failure while resuming download operation `%s': %s\n"
-msgstr ""
-
-#: src/fs/fs_download.c:309
-msgid ""
-"Recursive downloads of directories larger than 4 GB are not supported on 32-"
-"bit systems\n"
-msgstr ""
-
-#: src/fs/fs_download.c:329
-msgid "Directory too large for system address space\n"
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
+#: src/transport/gnunet-service-transport_blacklist.c:344
 #, fuzzy, c-format
-msgid "Failed to open file `%s' for writing"
-msgstr "打开日志文件“%s”失败：%s\n"
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/fs/fs_download.c:873
+#: src/transport/gnunet-service-transport_blacklist.c:358
 #, c-format
-msgid "Failed to create directory for recursive download of `%s'\n"
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:959
-#, c-format
-msgid ""
-"Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+#: src/transport/gnunet-service-transport_blacklist.c:513
+#: src/transport/gnunet-service-transport_blacklist.c:751
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/fs/fs_download.c:986
-msgid "internal error decrypting content"
+#: src/transport/gnunet-service-transport.c:182
+msgid "# bytes payload discarded due to not connected peer "
 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/transport/gnunet-service-transport.c:257
+msgid "# bytes total received"
+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/transport/gnunet-service-transport.c:304
+msgid "# bytes payload received"
+msgstr ""
 
-#: src/fs/fs_download.c:1030
+#: src/transport/gnunet-service-transport.c:609
 #, fuzzy, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/fs/fs_download.c:1829
-#, fuzzy
-msgid "Invalid URI"
-msgstr "无效条目。\n"
+msgid "Transport service could not access hostkey: %s. Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/gnunet-service-fs.c:240
-msgid "# running average P2P latency (ms)"
+#: src/transport/gnunet-service-transport.c:679
+msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:300 src/fs/gnunet-service-fs.c:489
-msgid "# Loopback routes suppressed"
+#: src/transport/gnunet-service-transport_clients.c:388
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:581 src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
-#: src/hostlist/gnunet-daemon-hostlist.c:295
-#, fuzzy, c-format
-msgid "Failed to connect to `%s' service.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/fs/fs_file_information.c:350
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s': %s"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+#: src/transport/gnunet-service-transport_clients.c:393
+msgid "# messages dropped due to slow client"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:466
-msgid "# failed connection attempts due to timeout"
+#: src/transport/gnunet-service-transport_clients.c:545
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:855
-msgid "# peers disconnected due to external request"
+#: src/transport/gnunet-service-transport_clients.c:686
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:942
-#, fuzzy
-msgid "# fast reconnects failed"
+#: src/transport/gnunet-service-transport_clients.c:737
+msgid "# REQUEST CONNECT messages received"
 msgstr ""
-"\n"
-"按任意键继续\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:997
-msgid "# peers disconnected due to timeout"
+#: src/transport/gnunet-service-transport_hello.c:175
+msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1022
-msgid "# keepalives sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1042
+msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1064
-msgid "# peers disconnected due to global disconnect"
+#: src/transport/gnunet-service-transport_neighbours.c:1172
+#: src/transport/gnunet-service-transport_neighbours.c:1509
+msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1778
-#: src/transport/gnunet-service-transport_neighbours.c:1799
-msgid "# messages not sent (no such peer or not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1177
+msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1815
-msgid "# bytes in message queue for other peers"
+#: src/transport/gnunet-service-transport_neighbours.c:1182
+msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1867
-msgid "# messages discarded due to lack of neighbour record"
+#: src/transport/gnunet-service-transport_neighbours.c:1239
+msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1903
-msgid "# bandwidth quota violations by other peers"
+#: src/transport/gnunet-service-transport_neighbours.c:1281
+msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1921
-msgid "# ms throttling suggested"
+#: src/transport/gnunet-service-transport_neighbours.c:1305
+msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1950
-msgid "# KEEPALIVE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1313
+msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2002
+#: src/transport/gnunet-service-transport_neighbours.c:1350
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2010
+#: src/transport/gnunet-service-transport_neighbours.c:1359
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2076
-msgid "# SET QUOTA messages ignored (no such peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:1415
+msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2094
-msgid "# disconnects due to quota of 0"
+#: src/transport/gnunet-service-transport_neighbours.c:1449
+msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2212
-msgid "# disconnect messages ignored (old format)"
+#: src/transport/gnunet-service-transport_neighbours.c:1465
+msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2225
-msgid "# disconnect messages ignored (timestamp)"
+#: src/transport/gnunet-service-transport_neighbours.c:2613
+msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2302
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:2628
+#: src/transport/gnunet-service-transport_neighbours.c:2662
+msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2319
-msgid "# unexpected CONNECT_ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:2675
+msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2410
-msgid "# unexpected ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:2708
+msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 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/transport/gnunet-service-transport_neighbours.c:2892
+msgid "# unexpected SESSION ACK messages"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
-#, c-format
-msgid "Blacklist file `%s' is empty.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:2947
+msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
-#, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/transport/gnunet-service-transport_neighbours.c:2961
+msgid "# disconnects due to quota of 0"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+#: src/transport/gnunet-service-transport_neighbours.c:2992
+msgid "# disconnect messages ignored (old format)"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
-#, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+#: src/transport/gnunet-service-transport_neighbours.c:3003
+msgid "# disconnect messages ignored (timestamp)"
 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/transport/gnunet-service-transport_neighbours.c:3034
+msgid "# other peer asked to disconnect from us"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
-#, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+#: src/transport/gnunet-service-transport_neighbours.c:3129
+msgid "# disconnected from peer upon explicit request"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:111
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:522
-#: src/transport/gnunet-service-transport_blacklist.c:756
-msgid "# disconnects due to blacklist"
+#: src/transport/gnunet-service-transport_validation.c:415
+msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:191
+#: src/transport/gnunet-service-transport_validation.c:464
+#, c-format
 msgid ""
-"Could not create a new TLS certificate, program `gnunet-transport-"
-"certificate-creation' could not be started!\n"
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:215
-msgid "No usable TLS certificate found and creating one failed!\n"
+#: src/transport/gnunet-service-transport_validation.c:513
+msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:172
-msgid "# refreshed my HELLO"
+#: src/transport/gnunet-service-transport_validation.c:571
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1529
-msgid "# IPv4 broadcast HELLO beacons received via udp"
+#: src/transport/gnunet-service-transport_validation.c:808
+msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1567
-msgid "# IPv6 multicast HELLO beacons received via udp"
+#: src/transport/gnunet-service-transport_validation.c:873
+#, c-format
+msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2063
-#: src/transport/plugin_transport_udp_new.c:1218
-#, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+#: src/transport/gnunet-service-transport_validation.c:1002
+msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2114
-#: src/transport/plugin_transport_udp_new.c:1268
-#, fuzzy, c-format
-msgid "Invalid IPv6 address: `%s'\n"
-msgstr "无效的进程优先级“%s”\n"
+#: src/transport/gnunet-service-transport_validation.c:1011
+msgid "# PONGs multicast to all available addresses"
+msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2258
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+#: src/transport/gnunet-service-transport_validation.c:1136
+msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2325
-#: src/transport/plugin_transport_udp_new.c:1396
-#, fuzzy
-msgid "Failed to open UDP sockets\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+#: src/transport/gnunet-service-transport_validation.c:1166
+msgid "# PONGs dropped, signature expired"
+msgstr ""
 
-#: 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
+#: src/transport/gnunet-service-transport_validation.c:1220
 #, c-format
-msgid "%s failed at %s:%d: `%s'\n"
+msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:620
+#: src/transport/gnunet-transport.c:262
 #, c-format
-msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
+msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:504
+#: src/transport/gnunet-transport.c:269
 #, c-format
-msgid "Unexpected address length: %u bytes\n"
+msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:590
-#: src/transport/plugin_transport_tcp.c:679
-#: src/transport/plugin_transport_tcp.c:731
-#: src/transport/plugin_transport_tcp.c:820
-#: src/transport/plugin_transport_tcp.c:1156
-msgid "# bytes currently in TCP buffers"
-msgstr ""
+#: src/transport/gnunet-transport.c:285
+#, fuzzy, c-format
+msgid "Failed to connect to `%s'\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:596
-#: src/transport/plugin_transport_tcp.c:846
-#: src/transport/plugin_transport_tcp.c:1544
-msgid "# TCP sessions active"
+#: src/transport/gnunet-transport.c:388
+msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:683
-msgid "# bytes discarded by TCP (timeout)"
+#: src/transport/gnunet-transport.c:401
+#, c-format
+msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:734
-msgid "# bytes transmitted via TCP"
+#: src/transport/gnunet-transport.c:465
+#, c-format
+msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:824
-msgid "# bytes discarded by TCP (disconnect)"
-msgstr ""
+#: src/transport/gnunet-transport.c:490
+#, fuzzy, c-format
+msgid "Successfully connected to `%s'\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/plugin_transport_tcp.c:945
-msgid "# bytes TCP was asked to transmit"
+#: src/transport/gnunet-transport.c:512
+#, c-format
+msgid ""
+"Successfully connected to `%s', starting to send benchmark data in %u Kb "
+"blocks\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:996
-msgid "# bytes discarded by TCP (no address and no connection)"
-msgstr ""
+#: src/transport/gnunet-transport.c:547
+#, fuzzy, c-format
+msgid "Disconnected from peer `%s' while benchmarking\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/plugin_transport_tcp.c:1039
+#: src/transport/gnunet-transport.c:623
 #, c-format
-msgid "Address of unexpected length: %u\n"
+msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1056
-msgid "Found valid IPv4 NAT address (creating session)!\n"
+#: src/transport/gnunet-transport.c:649
+#, fuzzy, c-format
+msgid "Peer `%s': %s %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/transport/gnunet-transport.c:658
+#, c-format
+msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1107
-msgid "# bytes discarded by TCP (failed to connect)"
+#: src/transport/gnunet-transport.c:694
+#, fuzzy, c-format
+msgid "Peer `%s' disconnected\n"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:1224
-msgid "# transport-service disconnect requests for TCP"
+#: src/transport/gnunet-transport.c:724
+#, fuzzy
+msgid "Failed to send connect request to transport service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:759
+#, c-format
+msgid ""
+"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
+"%s, %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1587
-msgid "# TCP WELCOME messages received"
+#: src/transport/gnunet-transport.c:765
+#, c-format
+msgid ""
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1732
-msgid "# bytes received via TCP"
+#: src/transport/gnunet-transport.c:785 src/transport/gnunet-transport.c:815
+#: src/transport/gnunet-transport.c:837 src/transport/gnunet-transport.c:874
+#, fuzzy
+msgid "Failed to connect to transport service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:792 src/transport/gnunet-transport.c:822
+#, fuzzy
+msgid "Failed to send request to transport service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:842
+msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1796
-msgid "# network-level TCP disconnect events"
+#: src/transport/gnunet-transport.c:924
+msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1949
+#: src/transport/gnunet-transport.c:927
 #, fuzzy
-msgid "Failed to start service.\n"
+msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2009
-#, c-format
-msgid "Failed to find option %s in section %s!\n"
+#: src/transport/gnunet-transport.c:930
+msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2032
-#, c-format
-msgid "TCP transport listening on port %llu\n"
+#: src/transport/gnunet-transport.c:936
+msgid ""
+"provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2036
-msgid "TCP transport not listening on any port (client only)\n"
+#: src/transport/gnunet-transport.c:939
+msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2040
-#, c-format
-msgid "TCP transport advertises itself as being on port %llu\n"
+#: src/transport/gnunet-transport.c:942
+msgid "peer identity"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:946
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:949
+msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:923
+#: src/transport/gnunet-transport.c:960
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/plugin_transport_http.c:817
+#: src/transport/plugin_transport_http_server.c:2550
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:971
+#: src/transport/plugin_transport_http.c:866
+#: src/transport/plugin_transport_http_server.c:2318
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http.c:1118
-#, c-format
-msgid "Found %u addresses to report to NAT service\n"
-msgstr ""
+#: src/transport/plugin_transport_http.c:898
+#: src/transport/plugin_transport_http_server.c:2350 src/util/service.c:1053
+#, fuzzy, c-format
+msgid "Failed to resolve `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/plugin_transport_http.c:915
+#: src/transport/plugin_transport_http_server.c:2367 src/util/service.c:1070
+#, fuzzy, c-format
+msgid "Failed to find %saddress for `%s'.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/plugin_transport_http.c:1131
+#: src/transport/plugin_transport_http.c:1020
+#: src/transport/plugin_transport_http_server.c:2478
 #, c-format
-msgid "FREEING %s\n"
+msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1206
+#: src/transport/plugin_transport_http.c:1133
+#: src/transport/plugin_transport_http_server.c:2646
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1219
+#: src/transport/plugin_transport_http.c:1146
+#: src/transport/plugin_transport_http_server.c:2657
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http.c:1230
+#: src/transport/plugin_transport_http.c:1157
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1250
+#: src/transport/plugin_transport_http.c:1177
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1280
+#: src/transport/plugin_transport_http.c:1206
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1087
-#, fuzzy
-msgid "Failed to open UNIX sockets\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/transport/plugin_transport_smtp.c:367
-#, c-format
-msgid "Received malformed message via %s. Ignored.\n"
-msgstr ""
+#: src/transport/plugin_transport_http.c:1223
+#: src/transport/plugin_transport_http_server.c:2739
+#, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "卸载 GNUnet 服务"
 
-#: src/transport/plugin_transport_smtp.c:454
-msgid "SMTP filter string to invalid, lacks ': '\n"
+#: src/transport/plugin_transport_http.c:1228
+msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:463
+#: src/transport/plugin_transport_http_client.c:1509
 #, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
+msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:558
-#: src/transport/plugin_transport_smtp.c:568
-#: src/transport/plugin_transport_smtp.c:581
-#: src/transport/plugin_transport_smtp.c:600
-#: src/transport/plugin_transport_smtp.c:623
-#: src/transport/plugin_transport_smtp.c:631
-#: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:655
+#: src/transport/plugin_transport_http_client.c:1640
+#: src/transport/plugin_transport_http_server.c:2863
+#, fuzzy, c-format
+msgid "Shutting down plugin `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/transport/plugin_transport_http_client.c:1665
+#: src/transport/plugin_transport_http_server.c:2922
 #, c-format
-msgid "SMTP: `%s' failed: %s.\n"
+msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:798
-msgid "No email-address specified, can not start SMTP transport.\n"
-msgstr ""
+#: src/transport/plugin_transport_http_client.c:1693
+#: src/transport/plugin_transport_http_server.c:2769
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_smtp.c:810
-msgid "# bytes received via SMTP"
+#: src/transport/plugin_transport_http_server.c:1339
+#, c-format
+msgid ""
+"Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
+"size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:811
-msgid "# bytes sent via SMTP"
+#: src/transport/plugin_transport_http_server.c:1597
+#, c-format
+msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:813
-msgid "# bytes dropped by SMTP (outgoing)"
+#: src/transport/plugin_transport_http_server.c:1605
+#, c-format
+msgid ""
+"Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:109
-msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+#: src/transport/plugin_transport_http_server.c:1906
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:116
-#, c-format
-msgid "Starting transport plugins `%s'\n"
+#: src/transport/plugin_transport_http_server.c:1930
+msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/plugin_transport_http_server.c:2625
 #, c-format
-msgid "Loading `%s' transport plugin\n"
+msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:147
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/transport/plugin_transport_wlan.c:884
-msgid "# wlan session timeouts"
+#: src/transport/plugin_transport_http_server.c:2639
+#, c-format
+msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:908
-msgid "# wlan session created"
+#: src/transport/plugin_transport_http_server.c:2664
+#, c-format
+msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:992
-#: src/transport/plugin_transport_wlan.c:1155
-#: src/transport/plugin_transport_wlan.c:1176
-#: src/transport/plugin_transport_wlan.c:1207
-#: src/transport/plugin_transport_wlan.c:2412
-#: src/transport/plugin_transport_wlan.c:3273
-msgid "# wlan pending sessions"
+#: src/transport/plugin_transport_http_server.c:2679
+#, c-format
+msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1250
-#: src/transport/plugin_transport_wlan.c:1967
-msgid "# wlan pending fragments"
-msgstr ""
+#: src/transport/plugin_transport_http_server.c:2689
+#, fuzzy, c-format
+msgid "Binding to IPv4 address %s\n"
+msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_wlan.c:1441
+#: src/transport/plugin_transport_http_server.c:2710
 #, c-format
-msgid "Finished reading from wlan-helper stdout with code: %d\n"
+msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1808
-msgid "# wlan hello beacons send"
-msgstr ""
+#: src/transport/plugin_transport_http_server.c:2720
+#, fuzzy, c-format
+msgid "Binding to IPv6 address %s\n"
+msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_wlan.c:1841
-#: src/transport/plugin_transport_wlan.c:2056
-#: src/transport/plugin_transport_wlan.c:2151
+#: src/transport/plugin_transport_http_server.c:2755
 #, c-format
-msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
+msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2042
-msgid "# wlan acks send"
+#: src/transport/plugin_transport_smtp.c:370
+#, c-format
+msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2113
-msgid "# wlan fragments send"
+#: src/transport/plugin_transport_smtp.c:457
+msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2279
+#: src/transport/plugin_transport_smtp.c:466
 #, c-format
-msgid "Wlan Address len %d is wrong\n"
+msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2284
-msgid "# wlan messages queued"
+#: 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"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2373
-#: src/transport/plugin_transport_wlan.c:3029
-#: src/transport/plugin_transport_wlan.c:3276
-msgid "# wlan mac endpoints"
+#: src/transport/plugin_transport_smtp.c:799
+msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2601
-msgid "# wlan whole messages received"
+#: src/transport/plugin_transport_smtp.c:811
+msgid "# bytes received via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2803
-msgid "# wlan hello messages received"
+#: src/transport/plugin_transport_smtp.c:812
+msgid "# bytes sent via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2840
-msgid "# wlan fragments received"
+#: src/transport/plugin_transport_smtp.c:814
+msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2892
-msgid "# wlan acks received"
+#: src/transport/plugin_transport_tcp.c:591
+#, c-format
+msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2989
-msgid "# wlan mac endpoints timeouts"
+#: src/transport/plugin_transport_tcp.c:767
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:906
+#: src/transport/plugin_transport_tcp.c:992
+#: src/transport/plugin_transport_tcp.c:1132
+#: src/transport/plugin_transport_tcp.c:1149
+msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3013
-msgid "# wlan mac endpoints created"
+#: src/transport/plugin_transport_tcp.c:774
+#: src/transport/plugin_transport_tcp.c:963
+#: src/transport/plugin_transport_tcp.c:1817
+#: src/transport/plugin_transport_tcp.c:2436
+msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3071
-msgid "# wlan WLAN_HELPER_DATA received"
+#: src/transport/plugin_transport_tcp.c:860
+msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3127
-msgid "# wlan messages for this client received"
+#: src/transport/plugin_transport_tcp.c:909
+msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3138
-msgid "# wlan messages inside WLAN_HELPER_DATA received"
+#: src/transport/plugin_transport_tcp.c:996
+msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:250
+#: src/transport/plugin_transport_tcp.c:1342
 #, c-format
-msgid "No transport plugins configured, peer will never communicate\n"
+msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:263
-#, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
+#: src/transport/plugin_transport_tcp.c:1457
+msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:313
-#, c-format
-msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+#: src/transport/plugin_transport_tcp.c:1858
+msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:320
-#, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
+#: src/transport/plugin_transport_tcp.c:2032
+msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:353
-#, c-format
-msgid "Transmitting %u bytes to %s\n"
+#: src/transport/plugin_transport_tcp.c:2102
+msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:373
-#, fuzzy, c-format
-msgid "Connected to %s\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/transport/gnunet-transport.c:404
-#, fuzzy, c-format
-msgid "Disconnected from %s\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/transport/gnunet-transport.c:433
+#: src/transport/plugin_transport_tcp.c:2326 src/util/service.c:948
+#: src/util/service.c:954
 #, c-format
-msgid "Received %u bytes from %s\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:447
-#, fuzzy, c-format
-msgid "Peer `%s': %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/transport/gnunet-transport.c:515
-#, fuzzy, c-format
-msgid "Failed to parse peer identity `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/transport/gnunet-transport.c:552
-msgid "measure how fast we are receiving data (until CTRL-C)"
+msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:555
+#: src/transport/plugin_transport_tcp.c:2340
 #, fuzzy
-msgid "try to connect to the given peer"
+msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:558
-msgid "provide information about all current connections (once)"
+#: src/transport/plugin_transport_tcp.c:2424
+#, c-format
+msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:562
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
+#: src/transport/plugin_transport_tcp.c:2428
+msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
-msgid "test transport configuration (involves external server)"
+#: src/transport/plugin_transport_tcp.c:2432
+#, c-format
+msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:568
-msgid "do not resolve hostnames"
+#: src/transport/plugin_transport_udp_broadcasting.c:128
+msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:576
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/transport/gnunet-service-transport_validation.c:408
-msgid "# address records discarded"
+#: src/transport/plugin_transport_udp_broadcasting.c:169
+msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:457
+#: src/transport/plugin_transport_udp_broadcasting.c:394
 #, c-format
-msgid ""
-"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
-"not happen.\n"
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:494
-msgid "# PING without HELLO messages sent"
+#: src/transport/plugin_transport_udp.c:2345
+#, c-format
+msgid ""
+"UDP could not transmit message to `%s': Network seems down, please check "
+"your network configuration\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:552
-msgid "# address revalidations started"
+#: src/transport/plugin_transport_udp.c:2359
+#, c-format
+msgid ""
+"UDP could not transmit message to `%s': Please check your network "
+"configuration and disable IPv6 if your connection does not have a global "
+"IPv6 address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:773
-msgid "# PING message for different peer received"
-msgstr ""
+#: src/transport/plugin_transport_udp.c:2600
+#, fuzzy
+msgid "Failed to open UDP sockets\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/gnunet-service-transport_validation.c:808
+#: src/transport/plugin_transport_udp.c:2676
 #, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:876
-msgid "# PONGs unicast via reliable transport"
+#: src/transport/plugin_transport_udp.c:2719
+#, fuzzy, c-format
+msgid "Invalid IPv6 address: `%s'\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/transport/plugin_transport_unix.c:1357
+#, fuzzy
+msgid "Failed to open UNIX sockets\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/plugin_transport_wlan.c:580
+msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:885
-msgid "# PONGs multicast to all available addresses"
+#: src/transport/plugin_transport_wlan.c:599
+msgid "# WLAN messages defragmented"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1007
-msgid "# PONGs dropped, no matching pending validation"
+#: src/transport/plugin_transport_wlan.c:645
+#: src/transport/plugin_transport_wlan.c:695
+#: src/transport/plugin_transport_wlan.c:1758
+msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1032
-msgid "# PONGs dropped, signature expired"
+#: src/transport/plugin_transport_wlan.c:770
+msgid "# WLAN message fragments sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1091
-#, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
+#: src/transport/plugin_transport_wlan.c:794
+msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:254
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+#: src/transport/plugin_transport_wlan.c:902
+#: src/transport/plugin_transport_wlan.c:987
+#: src/transport/plugin_transport_wlan.c:1760
+msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:259
-msgid "# messages dropped due to slow client"
+#: src/transport/plugin_transport_wlan.c:1169
+msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:406
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+#: src/transport/plugin_transport_wlan.c:1190
+msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:523
-msgid "# bytes payload received for other peers"
+#: src/transport/plugin_transport_wlan.c:1200
+msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:540
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/transport/plugin_transport_wlan.c:1257
+msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:591
-msgid "# REQUEST CONNECT messages received"
+#: src/transport/plugin_transport_wlan.c:1358
+msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/transport_api.c:588
-#, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
+#: src/transport/plugin_transport_wlan.c:1393
+msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:158
-msgid "# bytes payload discarded due to not connected peer "
+#: src/transport/plugin_transport_wlan.c:1454
+msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:519
-msgid "Transport service is lacking key configuration settings.  Exiting.\n"
+#: src/transport/plugin_transport_wlan.c:1563
+msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:528
-msgid "Transport service could not access hostkey.  Exiting.\n"
+#: src/transport/plugin_transport_wlan.c:1739
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:159
+#: src/transport/transport_api.c:654
 #, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
+msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/dv/dv_api.c:179
+#: src/transport/transport-testing.c:586
 #, fuzzy
-msgid "Failed to connect to the dv service!\n"
+msgid "Failed to initialize testing library!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/topology/gnunet-daemon-topology.c:244
-msgid "# peers blacklisted"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:380
-msgid "# connect requests issued to transport"
-msgstr ""
+#: src/util/bio.c:136 src/util/bio.c:142
+#, fuzzy, c-format
+msgid "Error reading `%s': %s"
+msgstr "创建用户出错"
 
-#: src/topology/gnunet-daemon-topology.c:675
-#: src/topology/gnunet-daemon-topology.c:761
-msgid "# friends connected"
+#: src/util/bio.c:143
+msgid "End of file"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:875
-#: src/hostlist/hostlist-server.c:184
+#: src/util/bio.c:195
 #, 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"
+msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:982
+#: src/util/bio.c:205
 #, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
+msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:994
+#: src/util/bio.c:250
 #, c-format
-msgid "Could not read friends list `%s'\n"
+msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1000
+#: src/util/bio.c:264
 #, c-format
-msgid "Friends file `%s' is empty.\n"
+msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
 #, c-format
-msgid "Failed to read friends list from `%s': out of memory\n"
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1017
-#, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr ""
+#: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
+#, fuzzy, c-format
+msgid "Using `%s' instead\n"
+msgstr "%s：选项“%s”有歧义\n"
 
-#: src/topology/gnunet-daemon-topology.c:1037
+#: src/util/client.c:371
 #, c-format
 msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes.\n"
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/util/client.c:379
 #, c-format
-msgid ""
-"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1060
-#, fuzzy, c-format
-msgid "Found friend `%s' in configuration\n"
+#: src/util/client.c:698
+msgid "Failure to transmit TEST request.\n"
 msgstr ""
-"\n"
-"结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1066
+#: src/util/client.c:898
 #, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
+msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1076
-#, fuzzy
-msgid "# friends in configuration"
+#: src/util/client.c:912
+#, c-format
+msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
-"\n"
-"结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1082
-msgid ""
-"Fewer friends specified than required by minimum friend count. Will only "
-"connect to friends.\n"
+#: src/util/client.c:1168
+msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1089
-msgid ""
-"More friendly connections required than target total number of connections.\n"
-msgstr ""
+#: src/util/common_logging.c:258 src/util/common_logging.c:1007
+msgid "DEBUG"
+msgstr "调试"
 
-#: src/topology/gnunet-daemon-topology.c:1126
-msgid "# HELLO messages received"
-msgstr ""
+#: src/util/common_logging.c:260 src/util/common_logging.c:1005
+msgid "INFO"
+msgstr "信息"
 
-#: src/topology/gnunet-daemon-topology.c:1183
-msgid "# HELLO messages gossipped"
+#: src/util/common_logging.c:262 src/util/common_logging.c:1003
+msgid "WARNING"
+msgstr "警告"
+
+#: src/util/common_logging.c:264 src/util/common_logging.c:1001
+msgid "ERROR"
+msgstr "错误"
+
+#: src/util/common_logging.c:266 src/util/common_logging.c:1009
+msgid "NONE"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1323
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/util/common_logging.c:395
+#, fuzzy, c-format
+msgid "Failed to create or access directory for log file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/util/common_logging.c:819
+#, fuzzy, c-format
+msgid "Message `%.*s' repeated %u times in the last %s\n"
+msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
+
+#: src/util/common_logging.c:1010
+msgid "INVALID"
 msgstr ""
 
-#: src/chat/chat.c:175
-msgid "Could not transmit confirmation receipt\n"
+#: src/util/common_logging.c:1149
+msgid "unknown address"
 msgstr ""
 
-#: src/chat/chat.c:283
-msgid "The current user must be the the first one joined\n"
+#: src/util/common_logging.c:1187
+msgid "invalid address"
 msgstr ""
 
-#: src/chat/chat.c:412
+#: src/util/common_logging.c:1205
 #, fuzzy, c-format
-msgid "Unknown message type: '%u'\n"
-msgstr "未知操作“%s”。\n"
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/chat/chat.c:472
+#: src/util/common_logging.c:1226
 #, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "配置文件“%s”已写入。\n"
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/chat/chat.c:480
+#: src/util/configuration.c:263
 #, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "Syntax error while deserializing operation at line %u\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+
+#: src/util/configuration.c:949
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
+msgstr ""
 
-#: src/chat/chat.c:498
+#: src/util/connection.c:427
 #, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "打开日志文件“%s”失败：%s\n"
+msgid "Access denied to `%s'\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/chat/chat.c:559
-msgid "Could not serialize metadata\n"
+#: src/util/connection.c:442
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/chat/chat.c:674
-#, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/util/connection.c:557
+#, c-format
+msgid ""
+"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
+msgstr ""
 
-#: src/chat/chat.c:680
-msgid "Undefined mandatory parameter: joinCallback\n"
+#: src/util/connection.c:755 src/util/connection.c:921
+#, fuzzy, c-format
+msgid "Trying to connect to `%s' (%p)\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/util/connection.c:912
+#, c-format
+msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/chat/chat.c:686
-msgid "Undefined mandatory parameter: messageCallback\n"
+#: src/util/container_bloomfilter.c:518
+#, c-format
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/chat/chat.c:692
-msgid "Undefined mandatory parameter: memberCallback\n"
+#: src/util/crypto_ecc.c:448 src/util/crypto_rsa.c:644
+#, c-format
+msgid ""
+"File `%s' does not contain a valid private key (too long, %llu bytes).  "
+"Deleting it.\n"
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:267
-#, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "保存配置失败。"
+#: src/util/crypto_ecc.c:463 src/util/crypto_rsa.c:661
+#, c-format
+msgid ""
+"File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
+"Deleting it.\n"
+msgstr ""
 
-#: src/chat/gnunet-service-chat.c:546
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "保存配置失败。"
+#: src/util/crypto_ecc.c:559 src/util/crypto_ecc.c:603
+#: src/util/crypto_rsa.c:759 src/util/crypto_rsa.c:803
+#, fuzzy, c-format
+msgid "Could not acquire lock on file `%s': %s...\n"
+msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/chat/gnunet-service-chat.c:729
+#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:764
 #, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "保存配置失败。"
+msgid "Creating a new private key.  This may take a while.\n"
+msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/chat/gnunet-service-chat.c:907
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "保存配置失败。"
+#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:807
+#: src/util/crypto_rsa.c:843
+msgid "This may be ok if someone is currently generating a private key.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:92
+#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:838
 #, c-format
-msgid "Joined\n"
+msgid ""
+"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
-msgid "anonymous"
-msgstr "匿名"
+#: src/util/crypto_ecc.c:643
+msgid "This may be ok if someone is currently generating a key.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:130
-#, fuzzy, c-format
-msgid "(%s) `%s' said: %s\n"
-msgstr "“%s”说：%s\n"
+#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:858
+#, c-format
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgstr ""
 
-#: 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/util/crypto_ecc.c:780 src/util/crypto_rsa.c:946
+msgid "interrupted by shutdown"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:139
-#, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
-msgstr "“%s”对您说：%s\n"
+#: src/util/crypto_ecc.c:791
+msgid "gnunet-ecc failed"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:142
+#: src/util/crypto_ecc.c:986
 #, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "“%s”对您说：%s\n"
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/util/crypto_ecc.c:1054
 #, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
+msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:148
+#: src/util/crypto_random.c:313
 #, c-format
-msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
+msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:151
+#: src/util/crypto_random.c:342
 #, c-format
-msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
+
+#: src/util/crypto_rsa.c:957
+msgid "gnunet-rsa failed"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:156
+#: src/util/crypto_rsa.c:1348
 #, c-format
-msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:159
+#: src/util/disk.c:567
 #, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "“%s”对您说：%s\n"
+msgid "`%s' failed for drive `%S': %u\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/chat/gnunet-chat.c:162
+#: src/util/disk.c:1171
 #, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
-msgstr ""
+msgid "Expected `%s' to be a directory!\n"
+msgstr "“%s”应为目录！\n"
+
+#: src/util/disk.c:1525 src/util/service.c:1667
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/chat/gnunet-chat.c:193
+#: src/util/disk.c:1897
 #, c-format
-msgid "'%s' acknowledged message #%d\n"
+msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/util/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s：选项“%s”有歧义\n"
+
+#: src/util/getopt.c:594
 #, c-format
-msgid "`%s' entered the room\n"
-msgstr "“%s”进入了房间\n"
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s：选项“--%s”不允许有参数\n"
 
-#: src/chat/gnunet-chat.c:224
+#: src/util/getopt.c:599
 #, c-format
-msgid "`%s' left the room\n"
-msgstr "“%s”离开了房间\n"
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
-#, fuzzy, c-format
-msgid "Could not change username\n"
-msgstr "已将用户名改为“%s”。\n"
+#: src/util/getopt.c:616 src/util/getopt.c:783
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s：选项“%s”要求有一个参数\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:629
+#: src/util/getopt.c:645
 #, c-format
-msgid "Joining room `%s' as user `%s'...\n"
-msgstr ""
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s：无法识别的选项“--%s”\n"
 
-#: src/chat/gnunet-chat.c:320
-#, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "已将用户名改为“%s”。\n"
+#: src/util/getopt.c:649
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s：无法识别的选项“%c%s”\n"
+
+#: src/util/getopt.c:674
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s：非法选项 -- %c\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/util/getopt.c:676
 #, c-format
-msgid "Users in room `%s': "
-msgstr "房间“%s”中的用户："
+msgid "%s: invalid option -- %c\n"
+msgstr "%s：无效选项 -- %c\n"
 
-#: src/chat/gnunet-chat.c:371
+#: src/util/getopt.c:704 src/util/getopt.c:831
 #, c-format
-msgid "Syntax: /msg USERNAME MESSAGE"
-msgstr "语法：/msg 用户名 消息"
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s：选项要求有一个参数 -- %c\n"
 
-#: src/chat/gnunet-chat.c:379
+#: src/util/getopt.c:752
 #, c-format
-msgid "Unknown user `%s'\n"
-msgstr "未知的用户“%s”\n"
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s：选项“-W %s”有歧义\n"
 
-#: src/chat/gnunet-chat.c:395
+#: src/util/getopt.c:770
 #, c-format
-msgid "User `%s' is currently not in the room!\n"
-msgstr "用户“%s”当前不在房间里！\n"
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s：选项“-W %s” 不允许有参数\n"
 
-#: src/chat/gnunet-chat.c:448
+#: src/util/getopt.c:935
 #, fuzzy, c-format
-msgid "Unknown command `%s'\n"
-msgstr "未知的命令“%s”。\n"
+msgid "Use %s to get a list of options.\n"
+msgstr "请使用 --help 获取选项列表。\n"
 
-#: src/chat/gnunet-chat.c:459
+#: src/util/getopt_helpers.c:86
+#, c-format
 msgid ""
-"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
-"leave the current room"
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr "长选项的必选参数对短选项也是必选的。\n"
+
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:316
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/util/getopt_helpers.c:288
+#, fuzzy, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/util/gnunet-config.c:90
+#, fuzzy, c-format
+msgid "--section argument is required\n"
+msgstr "设置要使用的昵称(必须)"
+
+#: src/util/gnunet-config.c:133
+#, c-format
+msgid "--option argument required to set value\n"
 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/util/gnunet-config.c:160
+msgid "obtain option of value as a filename (with $-expansion)"
+msgstr ""
+
+#: src/util/gnunet-config.c:163
+msgid "name of the section to access"
+msgstr ""
+
+#: src/util/gnunet-config.c:166
+msgid "name of the option to access"
+msgstr ""
+
+#: src/util/gnunet-config.c:169
+msgid "value to set"
+msgstr ""
+
+#: src/util/gnunet-config.c:178
+#, fuzzy
+msgid "Manipulate GNUnet configuration files"
+msgstr "更改配置文件中的一个值"
+
+#: src/util/gnunet-ecc.c:107 src/util/gnunet-rsa.c:107
+#, fuzzy, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/util/gnunet-ecc.c:113 src/util/gnunet-rsa.c:113
+#, c-format
+msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/util/gnunet-ecc.c:128 src/util/gnunet-rsa.c:137
+#, fuzzy, c-format
 msgid ""
-"Use `/msg nickname message' to send a private message to the specified user"
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/util/gnunet-ecc.c:140 src/util/gnunet-rsa.c:149
+#, c-format
+msgid "Finished!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
-msgid "The `/notice' command is an alias for `/msg'"
+#: src/util/gnunet-ecc.c:163 src/util/gnunet-rsa.c:172
+#, c-format
+msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
-msgid "The `/query' command is an alias for `/msg'"
+#: src/util/gnunet-ecc.c:220 src/util/gnunet-rsa.c:229
+msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
-msgid "Use `/sig message' to send a signed public message"
+#: src/util/gnunet-ecc.c:223 src/util/gnunet-rsa.c:232
+msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
-msgid "Use `/ack message' to require signed acknowledgment of the message"
+#: src/util/gnunet-ecc.c:226 src/util/gnunet-rsa.c:235
+msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
-msgid "Use `/anonymous message' to send a public anonymous message"
+#: src/util/gnunet-ecc.c:229 src/util/gnunet-rsa.c:238
+msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
-msgid "The `/anon' command is an alias for `/anonymous'"
+#: src/util/gnunet-ecc.c:232 src/util/gnunet-rsa.c:241
+msgid ""
+"use insecure, weak random number generator for key generation (for testing "
+"only)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
-msgid "Use `/quit' to terminate gnunet-chat"
-msgstr ""
+#: src/util/gnunet-ecc.c:243
+#, fuzzy
+msgid "Manipulate GNUnet private ECC key files"
+msgstr "更改配置文件中的一个值"
 
-#: src/chat/gnunet-chat.c:486
-msgid "The `/leave' command is an alias for `/quit'"
+#: src/util/gnunet-resolver.c:148
+msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
-msgid "Use `/names' to list all of the current members in the chat room"
+#: src/util/gnunet-resolver.c:159
+msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
-msgid "Use `/help command' to get help for a specific command"
+#: src/util/gnunet-rsa.c:252
+msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:605
+#: src/util/gnunet-service-resolver.c:288
 #, c-format
-msgid "You must specify a nickname\n"
-msgstr "æ\82¨å¿\85é¡»æ\8c\87å®\9aä¸\80个æ\98µç§°\n"
+msgid "Could not resolve `%s' (%s): %s\n"
+msgstr "æ\97 æ³\95解æ\9e\90â\80\9c%sâ\80\9d(%s)ï¼\9a%s\n"
 
-#: src/chat/gnunet-chat.c:621
+#: src/util/gnunet-service-resolver.c:358
+#: src/util/gnunet-service-resolver.c:399
 #, c-format
-msgid "Failed to join room `%s'\n"
-msgstr ""
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/chat/gnunet-chat.c:654
-msgid "set the nickname to use (required)"
-msgstr "设置要使用的昵称(必须)"
+#: src/util/gnunet-uri.c:90
+#, c-format
+msgid "No URI specified on command line\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:657
-msgid "set the chat room to join"
-msgstr "设置要加入的聊天室"
+#: src/util/gnunet-uri.c:95
+#, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/chat/gnunet-chat.c:669
-msgid "Join a chat on GNUnet."
+#: src/util/gnunet-uri.c:102
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
+#: src/util/gnunet-uri.c:112
 #, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
+msgid "No handler known for subsystem `%s'\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/util/gnunet-uri.c:174
+msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/nat/nat.c:803
-#, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
-msgstr ""
+#: src/util/helper.c:260
+#, fuzzy, c-format
+msgid "Error reading from `%s': %s\n"
+msgstr "创建用户出错"
 
-#: src/nat/nat.c:852
+#: src/util/helper.c:305
 #, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "运行 %s失败：%s %d\n"
+msgid "Failed to parse inbound message from helper `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/nat/nat.c:1121
+#: src/util/helper.c:499
 #, fuzzy, c-format
-msgid "Malformed %s `%s' given in configuration!\n"
-msgstr "保存配置失败。"
+msgid "Error writing to `%s': %s\n"
+msgstr "创建用户出错"
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#: src/util/network.c:127
 #, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
-msgstr ""
-
-#: src/nat/nat.c:1329
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/util/network.c:1330
 #, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr ""
+#: src/util/os_installation.c:417
+#, fuzzy, c-format
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/nat/nat_test.c:418
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
-msgstr ""
+#: src/util/os_installation.c:699
+#, fuzzy, c-format
+msgid "Could not find binary `%s' in PATH!\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/dht/plugin_block_dht.c:124
-#, c-format
-msgid "Block not of type %u\n"
-msgstr ""
+#: src/util/os_priority.c:302
+#, fuzzy, c-format
+msgid "Failed to open named pipe `%s' for reading: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dht/plugin_block_dht.c:131
-msgid "Size mismatch for block\n"
-msgstr ""
+#: src/util/os_priority.c:303
+#, fuzzy, c-format
+msgid "Failed to open named pipe `%s' for writing: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dht/plugin_block_dht.c:140
+#: src/util/plugin.c:89
 #, c-format
-msgid "Block of type %u is malformed\n"
-msgstr ""
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "插件机构初始化失败：%s！\n"
 
-#: src/fs/plugin_block_fs.c:131
-msgid "Reply mismatched in terms of namespace.  Discarded.\n"
+#: src/util/plugin.c:146
+#, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/block/block.c:105
-#, fuzzy, c-format
-msgid "Loading block plugin `%s'\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/mesh/gnunet-service-mesh.c:4212
-msgid "MESH: Wrong CORE service\n"
+#: src/util/plugin.c:219
+#, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4417
+#: src/util/plugin.c:349
 #, fuzzy
-msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
-msgstr "立即保存配置？"
+msgid "Could not determine plugin installation path.\n"
+msgstr "无法确定用户界面定义文件。"
 
-#: src/mesh/gnunet-service-mesh.c:4426
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
+#: src/util/program.c:251 src/util/service.c:1789
+#, fuzzy, c-format
+msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/hostlist/hostlist-client.c:286
-msgid "# bytes downloaded from hostlist servers"
+#: src/util/pseudonym.c:276
+#, fuzzy, c-format
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
+msgid "no-name"
+msgstr "无名称"
+
+#: src/util/resolver_api.c:202
+#, c-format
+msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
-msgid "# invalid HELLOs downloaded from hostlist servers"
+#: 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:310 src/hostlist/hostlist-client.c:342
+#: src/util/resolver_api.c:347
+#, fuzzy, c-format
+msgid "Timeout trying to resolve IP address `%s'.\n"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
+
+#: src/util/resolver_api.c:351
 #, c-format
-msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:330
-msgid "# valid HELLOs downloaded from hostlist servers"
+#: src/util/resolver_api.c:890
+#, fuzzy, c-format
+msgid "Could not resolve our FQDN : %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/util/scheduler.c:781
+msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/util/scheduler.c:911
 #, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
+msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
-msgid "# advertised hostlist URIs"
-msgstr ""
+#: src/util/server.c:426
+#, fuzzy, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/hostlist/hostlist-client.c:622
+#: src/util/server.c:435
 #, c-format
-msgid "# advertised URI `%s' downloaded"
+msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/util/server.c:446
+#, 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:830
 #, c-format
 msgid ""
-"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
-"gets dismissed.\n"
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:805
+#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
+#: src/util/service.c:232 src/util/service.c:239
 #, c-format
-msgid "Timeout trying to download hostlist from `%s'\n"
-msgstr ""
+msgid "Invalid format for IP: `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
 
-#: src/hostlist/hostlist-client.c:822
+#: src/util/service.c:195
 #, c-format
-msgid "Download limit of %u bytes exceeded, stopping download\n"
-msgstr ""
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/hostlist/hostlist-client.c:842
-#, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+#: src/util/service.c:288
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/util/service.c:320
 #, c-format
-msgid "Download of hostlist `%s' completed.\n"
-msgstr ""
+msgid "Wrong format `%s' for netmask\n"
+msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/hostlist/hostlist-client.c:856
+#: src/util/service.c:350
 #, c-format
-msgid "Adding successfully tested hostlist `%s' datastore.\n"
-msgstr ""
+msgid "Wrong format `%s' for network\n"
+msgstr "网络的格式“%s”错误\n"
 
-#: src/hostlist/hostlist-client.c:909
+#: src/util/service.c:707
 #, c-format
-msgid "Bootstrapping using hostlist at `%s'.\n"
+msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
-msgid "# hostlist downloads initiated"
+#: src/util/service.c:712
+#, c-format
+msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
-msgid "# milliseconds between hostlist downloads"
+#: src/util/service.c:719
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/util/service.c:774
 #, c-format
-msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
-msgid "Scheduled saving of hostlists\n"
+#: src/util/service.c:811
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/util/service.c:929
 #, c-format
-msgid "Hostlists will be saved to file again in %llums\n"
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
-msgid "# active connections"
+#: src/util/service.c:1007
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1253
+#: src/util/service.c:1024
 #, c-format
-msgid "Initial time between hostlist downloads is %llums\n"
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
-#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
+#: src/util/service.c:1258
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/util/service.c:1309 src/util/service.c:1327
 #, c-format
-msgid "Loading saved hostlist entries from file `%s' \n"
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/util/service.c:1354
 #, c-format
-msgid "Hostlist file `%s' is not existing\n"
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
+#: src/util/service.c:1523
 #, fuzzy, c-format
-msgid "Could not open file `%s' for reading to load hostlists: %s\n"
-msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
+msgid "Failed to start `%s' at `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/hostlist/hostlist-client.c:1338
+#: src/util/service.c:1556
 #, c-format
-msgid "%u hostlist URIs loaded from file\n"
+msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
-msgid "# hostlist URIs read from file"
+#: src/util/service.c:1605
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
-#, c-format
-msgid ""
-"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+#: src/util/service.c:1609
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1387
-#, fuzzy, c-format
-msgid "Could not open file `%s' for writing to save hostlists: %s\n"
-msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
+#: src/util/service.c:1613
+msgid "Service process failed to report status\n"
+msgstr ""
+
+#: src/util/service.c:1668
+msgid "No such user"
+msgstr "无此用户"
 
-#: src/hostlist/hostlist-client.c:1392
+#: src/util/service.c:1681
 #, c-format
-msgid "Writing %u hostlist URIs to `%s'\n"
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "无法更改用户/组为“%s”：%s\n"
+
+#: src/util/service.c:1747
+msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/util/signal.c:80
 #, c-format
-msgid "Error writing hostlist URIs to file `%s'\n"
+msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1428
-msgid "# hostlist URIs written to file"
+#: src/util/strings.c:146
+msgid "b"
+msgstr "b"
+
+#: src/util/strings.c:413
+#, c-format
+msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1480
-msgid "Learning is enabled on this peer\n"
+#: src/util/strings.c:528
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
+
+#: src/util/strings.c:625
+msgid "ms"
+msgstr "毫秒"
+
+#: src/util/strings.c:629
+msgid "forever"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
-#, c-format
-msgid "Hostlists will be saved to file again in  %llums\n"
+#: src/util/strings.c:631
+msgid "0 ms"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
-msgid "Learning is not enabled on this peer\n"
+#: src/util/strings.c:637
+msgid "s"
+msgstr "秒"
+
+#: src/util/strings.c:643
+msgid "m"
+msgstr "分"
+
+#: src/util/strings.c:649
+msgid "h"
+msgstr "时"
+
+#: src/util/strings.c:656
+#, fuzzy
+msgid "day"
+msgstr " 天"
+
+#: src/util/strings.c:658
+#, fuzzy
+msgid "days"
+msgstr " 天"
+
+#: src/util/strings.c:685
+msgid "end of time"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
-#, c-format
-msgid ""
-"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+#: src/util/strings.c:1073
+msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1508
-#, c-format
-msgid "Hostlist file `%s' could not be removed\n"
+#: src/util/strings.c:1081
+msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:262
-msgid ""
-"None of the functions for the hostlist daemon were enabled.  I have no "
-"reason to run!\n"
+#: src/util/strings.c:1087
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:315
-msgid "advertise our hostlist to other peers"
+#: src/util/strings.c:1094
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
-msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+#: src/util/strings.c:1103
+#, fuzzy, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/vpn/gnunet-service-vpn.c:512 src/vpn/gnunet-service-vpn.c:1088
+msgid "# Active tunnels"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
-msgid "enable learning about hostlist servers from other peers"
+#: src/vpn/gnunet-service-vpn.c:609 src/vpn/gnunet-service-vpn.c:646
+#, fuzzy
+msgid "# peers connected to mesh tunnels"
 msgstr ""
+"\n"
+"按任意键继续\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:327
-msgid "provide a hostlist server"
+#: src/vpn/gnunet-service-vpn.c:699
+msgid "# Bytes given to mesh for transmission"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:737
+msgid "# Bytes dropped in mesh queue (overflow)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:771
+msgid "# Mesh tunnels created"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:794
+#, fuzzy
+msgid "Failed to setup mesh tunnel!\n"
+msgstr "发送消息失败。\n"
+
+#: src/vpn/gnunet-service-vpn.c:990
+#, c-format
+msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:339
-msgid "GNUnet hostlist server and client"
+#: src/vpn/gnunet-service-vpn.c:1308
+msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:134
-msgid "bytes in hostlist"
+#: src/vpn/gnunet-service-vpn.c:1329
+msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:157
-msgid "expired addresses encountered"
+#: src/vpn/gnunet-service-vpn.c:1534
+msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:205
-msgid "HELLOs without addresses encountered (ignored)"
+#: src/vpn/gnunet-service-vpn.c:1572 src/vpn/gnunet-service-vpn.c:1613
+#, c-format
+msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
-msgid "bytes not included in hostlist (size limit)"
+#: src/vpn/gnunet-service-vpn.c:1623
+msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
+#: src/vpn/gnunet-service-vpn.c:1637
 #, c-format
-msgid "Refusing `%s' request to hostlist server\n"
+msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
-msgid "hostlist requests refused (not HTTP GET)"
+#: src/vpn/gnunet-service-vpn.c:1721
+msgid "# ICMP packets received from mesh"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:280
-msgid "Sending 100 CONTINUE reply\n"
+#: src/vpn/gnunet-service-vpn.c:2062
+msgid "# UDP packets received from mesh"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
-#, c-format
-msgid "Refusing `%s' request with %llu bytes of upload data\n"
+#: src/vpn/gnunet-service-vpn.c:2220
+msgid "# TCP packets received from mesh"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
-msgid "hostlist requests refused (upload data)"
+#: src/vpn/gnunet-service-vpn.c:2371
+msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
-msgid "Could not handle hostlist request since I do not have a response yet\n"
+#: src/vpn/gnunet-service-vpn.c:2426
+msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
-msgid "hostlist requests refused (not ready)"
+#: src/vpn/gnunet-service-vpn.c:2465 src/vpn/gnunet-service-vpn.c:2678
+msgid "# Active destinations"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:306
-msgid "Received request for our hostlist\n"
+#: src/vpn/gnunet-service-vpn.c:2751
+msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:307
-msgid "hostlist requests processed"
+#: src/vpn/gnunet-service-vpn.c:3138
+msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:350
-msgid "# hostlist advertisements send"
+#: src/vpn/gnunet-service-vpn.c:3170
+msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:397
-msgid "Advertisement message could not be queued by core\n"
-msgstr ""
+#: src/vpn/gnunet-vpn.c:151
+#, fuzzy
+msgid "Error creating tunnel\n"
+msgstr "创建用户出错"
 
-#: src/hostlist/hostlist-server.c:565
+#: src/vpn/gnunet-vpn.c:195 src/vpn/gnunet-vpn.c:226
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:574
-#, c-format
-msgid "Hostlist service starts on %s:%llu\n"
-msgstr ""
+#: src/vpn/gnunet-vpn.c:208
+#, fuzzy, c-format
+msgid "Option `%s' or `%s' is required.\n"
+msgstr "%s：选项“%s”有歧义\n"
 
-#: src/hostlist/hostlist-server.c:588
+#: src/vpn/gnunet-vpn.c:220
 #, c-format
-msgid "Address to obtain hostlist: `%s'\n"
+msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:626
-#, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
-msgstr ""
+#: src/vpn/gnunet-vpn.c:238
+#, fuzzy, c-format
+msgid "`%s' is not a valid peer identifier.\n"
+msgstr "“%s”不可用。\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/vpn/gnunet-vpn.c:260
 #, fuzzy, c-format
-msgid "Could not find option `%s:%s' in configuration.\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
+msgid "`%s' is not a valid IP address.\n"
+msgstr "“%s”不可用。\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
+#: src/vpn/gnunet-vpn.c:296
+msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
-#, c-format
-msgid "I am peer `%s'.\n"
+#: src/vpn/gnunet-vpn.c:299
+msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
-msgid "output only the identity strings"
+#: src/vpn/gnunet-vpn.c:302
+msgid "print IP address only after mesh tunnel has been created"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
-msgid "output our own identity only"
+#: src/vpn/gnunet-vpn.c:305
+msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
-#, fuzzy
-msgid "Print information about peers."
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/include/gnunet_getopt_lib.h:144
-msgid "print this help"
+#: 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:332
+msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:366 src/include/gnunet_common.h:371
-#: src/include/gnunet_common.h:377
+#: src/include/gnunet_common.h:579 src/include/gnunet_common.h:584
+#: src/include/gnunet_common.h:590
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:387
+#: src/include/gnunet_common.h:600
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:408 src/include/gnunet_common.h:415
+#: src/include/gnunet_common.h:621 src/include/gnunet_common.h:628
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
-#~ msgid "KiB"
-#~ msgstr "KiB"
+#, fuzzy
+#~ msgid "Connected to %s\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
 
-#~ msgid "MiB"
-#~ msgstr "MiB"
+#, fuzzy
+#~ msgid "list information for all peers"
+#~ msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#~ msgid "GiB"
-#~ msgstr "GiB"
+#, fuzzy
+#~ msgid "Malformed %s `%s' given in configuration!\n"
+#~ msgstr "保存配置失败。"
 
-#~ msgid "TiB"
-#~ msgstr "TiB"
+#, fuzzy
+#~ msgid "Starting HELPER process `%s'\n"
+#~ msgstr "卸载 GNUnet 服务"
 
 #, fuzzy
-#~ msgid "Copying file with command cp %s %s\n"
-#~ msgstr "“%s”以错误码 %s 失败：%s\n"
+#~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+#~ msgstr "配置文件“%s”已写入。\n"
 
 #, fuzzy
-#~ msgid "Could not create configuration for peer number %u on `%s'!\n"
+#~ msgid "Unknown message type: '%u'\n"
+#~ msgstr "未知操作“%s”。\n"
+
+#, fuzzy
+#~ msgid "Configuration option `%s' in section `%s' missing\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Failed to access chat home directory `%s'\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
+#, fuzzy
+#~ msgid "Failed to create/open key in file `%s'\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the chat service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#~ msgid "anonymous"
+#~ msgstr "匿名"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said: %s\n"
+#~ msgstr "“%s”说：%s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you: %s\n"
+#~ msgstr "“%s”对您说：%s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said for sure: %s\n"
+#~ msgstr "“%s”对您说：%s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you for sure: %s\n"
+#~ msgstr "“%s”对您说：%s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said off the record: %s\n"
+#~ msgstr "“%s”对您说：%s\n"
+
+#~ msgid "`%s' entered the room\n"
+#~ msgstr "“%s”进入了房间\n"
+
+#~ msgid "`%s' left the room\n"
+#~ msgstr "“%s”离开了房间\n"
+
+#, fuzzy
+#~ msgid "Could not change username\n"
+#~ msgstr "已将用户名改为“%s”。\n"
+
+#, fuzzy
+#~ msgid "Changed username to `%s'\n"
+#~ msgstr "已将用户名改为“%s”。\n"
+
+#~ msgid "Users in room `%s': "
+#~ msgstr "房间“%s”中的用户："
+
+#~ msgid "Syntax: /msg USERNAME MESSAGE"
+#~ msgstr "语法：/msg 用户名 消息"
+
+#~ msgid "User `%s' is currently not in the room!\n"
+#~ msgstr "用户“%s”当前不在房间里！\n"
+
+#, fuzzy
+#~ msgid "Unknown command `%s'\n"
+#~ msgstr "未知的命令“%s”。\n"
+
+#~ msgid "You must specify a nickname\n"
+#~ msgstr "您必须指定一个昵称\n"
+
+#~ msgid "set the chat room to join"
+#~ msgstr "设置要加入的聊天室"
+
+#, fuzzy
+#~ msgid "Failed to queue a message notification\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Failed to queue a join notification\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Failed to queue a confirmation receipt\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Failed to queue a leave notification\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Connected to %s service!\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Failed to start daemon: %s\n"
+#~ msgstr "运行 %s失败：%s %d\n"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s', assuming default value."
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Option `%s' not specified in configuration section `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Peer is lacking HOSTKEY configuration setting.\n"
+#~ msgstr "立即保存配置？"
+
+#, fuzzy
+#~ msgid "Could not access hostkey.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
 #, fuzzy
 #~ msgid "Failed to create pipe for `ssh' process.\n"
 #~ msgstr "初始化“%s”服务失败。\n"
 
+#, fuzzy
+#~ msgid "Could not start `%s' process to create hostkey.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
 #, fuzzy
 #~ msgid "Failed to start `ssh' process.\n"
 #~ msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
-#~ msgid "`Failed to get hostkey!\n"
+#~ msgid "Failed to get hostkey!\n"
 #~ msgstr "发送消息失败。\n"
 
+#, fuzzy
+#~ msgid "Could not start `%s' process to start GNUnet.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-arm' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Starting service %s for peer `%4s'\n"
+#~ msgstr "卸载 GNUnet 服务"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration directory.\n"
+#~ msgstr "找不到主机“%s”的 IP：%s\n"
+
+#, fuzzy
+#~ msgid "Terminating peer `%4s'\n"
+#~ msgstr "未知的用户“%s”\n"
+
+#, fuzzy
+#~ msgid "Setting d->dead on peer `%4s'\n"
+#~ msgstr "卸载 GNUnet 服务"
+
 #, fuzzy
 #~ msgid "Failed to write new configuration to disk."
 #~ msgstr "保存配置失败。"
 
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration file.\n"
+#~ msgstr "找不到主机“%s”的 IP：%s\n"
+
 #, fuzzy
 #~ msgid "Failed to copy new configuration to remote machine."
 #~ msgstr "保存配置失败。"
 
+#, fuzzy
+#~ msgid "Peers failed to connect"
+#~ msgstr ""
+#~ "\n"
+#~ "按任意键继续\n"
+
 #, 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"
+#~ msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+#~ msgstr "配置不满足配置规范文件“%s”的约束！\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file `%s'!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Could not create configuration for peer number %u on `%s'!\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Invalid configuration option `%s' in section `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Missing configuration option `%s' in section `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "internal error"
+#~ msgstr "未知错误。\n"
+
+#, fuzzy
+#~ msgid "Could not create namespace `%s'\n"
 #~ msgstr "无法解析“%s”(%s)：%s\n"
 
 #, fuzzy
-#~ msgid "Failed to start daemon: %s\n"
-#~ msgstr "运行 %s失败：%s %d\n"
+#~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy
-#~ msgid "Failed to load dhtlog plugin for `%s'\n"
+#~ msgid "Namestore removed record successfully"
+#~ msgstr "GNUnet 服务安装成功。\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Could not open hostkeys file: %s\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "access (%s, X_OK) failed: %s\n"
+#~ msgstr "“%s”说：%s\n"
+
+#, fuzzy
+#~ msgid "stat (%s) failed: %s\n"
+#~ msgstr "“%s”说：%s\n"
+
+#, fuzzy
+#~ msgid "# Peers connected"
+#~ msgstr ""
+#~ "\n"
+#~ "按任意键继续\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Postgres with configuration `%s': %s"
+#~ msgstr "无法保存配置文件“%s”："
+
+#, fuzzy
+#~ msgid "Copying file with RENAME (%s,%s)\n"
+#~ msgstr "“%s”以错误码 %s 失败：%s\n"
+
+#, fuzzy
+#~ msgid "Copying file with command scp %s %s\n"
+#~ msgstr "“%s”以错误码 %s 失败：%s\n"
+
+#, fuzzy
+#~ msgid "Finished copying all blacklist files!\n"
+#~ msgstr "无法解析“%s”(%s)：%s\n"
+
+#, fuzzy
+#~ msgid "Failed during blacklist file copying!\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy
-#~ msgid "Failed to get full path for `%s'\n"
+#~ msgid "# fast reconnects failed"
+#~ msgstr ""
+#~ "\n"
+#~ "按任意键继续\n"
+
+#~ msgid "Unknown user `%s'\n"
+#~ msgstr "未知的用户“%s”\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to statistics service!\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, 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"
+
+#, fuzzy
+#~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy
-#~ msgid "Failed to create file for dhtlog.\n"
-#~ msgstr "æ\97 æ³\95为å®\88æ\8a¤ç¨\8båº\8få\88\9b建ç\94¨æ\88·è´¦æ\88·ã\80\82"
+#~ msgid "Service `%s' stopped\n"
+#~ msgstr "æ\9c\8då\8a¡å·²å\88 é\99¤ã\80\82\n"
 
 #, fuzzy
-#~ msgid "Found peer `%s'\n"
-#~ msgstr "未知的用户“%s”\n"
+#~ msgid "Unable to accept connection for service `%s': %s\n"
+#~ msgstr "无法保存配置文件“%s”："
+
+#~ msgid "KiB"
+#~ msgstr "KiB"
+
+#~ msgid "MiB"
+#~ msgstr "MiB"
+
+#~ msgid "GiB"
+#~ msgstr "GiB"
+
+#~ msgid "TiB"
+#~ msgstr "TiB"
+
+#, fuzzy
+#~ msgid "Could not resolve our FQDN : %s %u\n"
+#~ msgstr "无法解析“%s”(%s)：%s\n"
+
+#, fuzzy
+#~ msgid "Failed to load dhtlog plugin for `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy
 #~ msgid "Phase 3: sending messages\n"
@@ -4597,10 +6632,6 @@ msgstr ""
 #~ msgid "Fail! Could not connect peers\n"
 #~ msgstr "无法连接到 %s:%u：%s\n"
 
-#, fuzzy
-#~ msgid "Failed to connect to core service\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
 #~ msgid "Error"
 #~ msgstr "错误"
 
@@ -4625,9 +6656,6 @@ msgstr ""
 #~ msgid "Ok"
 #~ msgstr "确定"
 
-#~ msgid "GNUnet configuration"
-#~ msgstr "GNUnet 配置"
-
 #~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"
@@ -4825,9 +6853,6 @@ msgstr ""
 #~ msgid "Back"
 #~ msgstr "后退"
 
-#~ msgid "Exit"
-#~ msgstr "退出"
-
 #~ msgid "Up"
 #~ msgstr "向上"
 
@@ -4859,21 +6884,12 @@ msgstr ""
 #~ "\n"
 #~ "您的配置更改没有保存。\n"
 
-#~ msgid "list all network adapters"
-#~ msgstr "列出所有网络适配器"
-
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "以 Windows 服务方式安装 GNUnet"
 
-#~ msgid "increase the maximum number of TCP/IP connections"
-#~ msgstr "增加 TCP/IP 的最大连接数"
-
 #~ msgid "display a file's hash value"
 #~ msgstr "显示一个文件的散列值"
 
-#~ msgid "GNUnet service installed successfully.\n"
-#~ msgstr "GNUnet 服务安装成功。\n"
-
 #~ msgid "This version of Windows doesn't support services.\n"
 #~ msgstr "此版本的 Windows 不支持服务。\n"
 
@@ -4886,9 +6902,6 @@ msgstr ""
 #~ msgid "Error: can't delete service: %s\n"
 #~ msgstr "错误：无法删除服务：%s\n"
 
-#~ msgid "Configuration saved."
-#~ msgstr "配置已保存"
-
 #~ msgid "Configuration changed. Save?"
 #~ msgstr "配置已更改。保存吗？"
 
@@ -4932,15 +6945,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"
 
@@ -4953,9 +6960,6 @@ msgstr ""
 #~ msgid "Undefined option.\n"
 #~ msgstr "未定义的选项。\n"
 
-#~ msgid "`%s' is not available.\n"
-#~ msgstr "“%s”不可用。\n"
-
 #~ msgid "yes"
 #~ msgstr "是"
 
@@ -5096,9 +7100,6 @@ msgstr ""
 #~ msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'\n"
 #~ msgstr "在 NETWORK 节的配置条目 HOST 中有语法错误：“%s”\n"
 
-#~ msgid "Error connecting to %s:%u. Is the daemon running?\n"
-#~ msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
-
 #~ msgid "Reading result from gnunetd failed, reply invalid!\n"
 #~ msgstr "从 gnunetd 读取结果失败，应答无效！\n"
 
@@ -5154,9 +7155,6 @@ msgstr ""
 #~ msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 #~ msgstr "实时延迟冲突(%llu 毫秒)，于 %s:%u\n"
 
-#~ msgid "`%s' failed with error code %d: %s\n"
-#~ msgstr "“%s”以错误码 %d 失败：%s\n"
-
 #~ msgid "Deadlock due to `%s'.\n"
 #~ msgstr "“%s”造成了死锁。\n"
 
@@ -5257,19 +7255,12 @@ msgstr ""
 #~ msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 #~ msgstr "%s：选项“%s”要求有一个参数\n"
 
-#, fuzzy
-#~ msgid "Unsupported command `%s'.  Aborting.\n"
-#~ msgstr "未知的命令“%s”。\n"
-
 #~ msgid ""
 #~ "OS tells us about very large message (%u bytes) pending on UDP socket, "
 #~ "truncating at 64k\n"
 #~ msgstr ""
 #~ "操作系统通知，在 UPnP 套接字上有大量消息待处理(%u 字节)，将截短为64k\n"
 
-#~ msgid "Error while parsing dscl output.\n"
-#~ msgstr "解析 dscl 输出时出错。\n"
-
 #~ msgid ""
 #~ "Couldn't find a group (`%s') for the new user and none was specified.\n"
 #~ msgstr "找不到新用户的组(“%s”)且没有指定用户组。\n"