-fix double free, linker issue

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

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b10093007db4ec90a3da51f6cfc034e31b0b6426..fc4cf6742cd8604960d69cb8fd4e4e970f57a33b 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"
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"

-"POT-Creation-Date: 2012-02-28 10:32+0100\n"
+"POT-Creation-Date: 2012-08-17 00:17+0200\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"
 "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,257 +16,295 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:165

 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 

-#: src/arm/arm_api.c:378
+#: src/arm/arm_api.c:354

 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 

-#: src/arm/arm_api.c:392
+#: src/arm/arm_api.c:368

 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 

-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:437

 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 

-#: src/arm/arm_api.c:523
+#: src/arm/arm_api.c:490

 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 

-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:491

 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 

-#: src/arm/arm_api.c:546
+#: src/arm/arm_api.c:512

 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 

-#: src/arm/arm_api.c:548
+#: src/arm/arm_api.c:513

 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 

-#: src/arm/arm_api.c:581
+#: src/arm/arm_api.c:547

 #, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr ""
 
 #, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr ""
 

-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:620

 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:166

 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "服务已删除。\n"
 
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "服务已删除。\n"
 

-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:171

 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "服务已删除。\n"
 
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "服务已删除。\n"
 

-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:174

 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "服务已删除。\n"
 
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "服务已删除。\n"
 

-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:179

 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "服务已删除。\n"
 
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "服务已删除。\n"
 

-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:182

 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "服务已删除。\n"
 
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "服务已删除。\n"
 

-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:186

 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "服务已删除。\n"
 
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "服务已删除。\n"
 

-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:190

 msgid "Request ignored as ARM is shutting down.\n"
 msgstr ""
 
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:194

 msgid "Error communicating with ARM service.\n"
 msgstr ""
 
 msgid "Error communicating with ARM service.\n"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:198

 msgid "Timeout communicating with ARM service.\n"
 msgstr ""
 
 msgid "Timeout communicating with ARM service.\n"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:202

 msgid "Operation failed.\n"
 msgstr ""
 
 msgid "Operation failed.\n"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:206

 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:229
+#, fuzzy
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
+
+#: src/arm/gnunet-arm.c:232
+msgid "Running services:\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:256

 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+#: src/arm/gnunet-arm.c:264 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:384

 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:247
+#: src/arm/gnunet-arm.c:287

 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:293

 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:355
+#: src/arm/gnunet-arm.c:418

 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 

-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:420

 msgid "start a particular service"
 msgstr ""
 
 msgid "start a particular service"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:422

 msgid "stop a particular service"
 msgstr ""
 
 msgid "stop a particular service"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:424

 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 

-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:427

 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 

-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:430

 msgid "delete config file and directory on exit"
 msgstr ""
 
 msgid "delete config file and directory on exit"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:432

 msgid "don't print status messages"
 msgstr ""
 
 msgid "don't print status messages"
 msgstr ""
 

-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:435

 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 

-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:437
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:439
+msgid "Don't let gnunet-service-arm inherit standard output"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:441
+msgid "Don't let gnunet-service-arm inherit standard error"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:455

 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:332

 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:335

 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:361

 msgid "Could not send status result to client\n"
 msgstr ""
 
 msgid "Could not send status result to client\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:393
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/arm/gnunet-service-arm.c:523

 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户："
 
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户："
 

-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:545

 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:559

 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:667

 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:878

 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:970

 msgid "exit"
 msgstr ""
 
 msgid "exit"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:975

 msgid "signal"
 msgstr ""
 
 msgid "signal"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:980

 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 

-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:986
+#, fuzzy, c-format
+msgid "Service `%s' took %llu ms to terminate\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-service-arm.c:1021

 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1067
+#: src/arm/gnunet-service-arm.c:1127

 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr "配置文件“%s”已写入。\n"
 
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr "配置文件“%s”已写入。\n"
 

-#: src/arm/gnunet-service-arm.c:1069
+#: src/arm/gnunet-service-arm.c:1129

 msgid "option missing"
 msgstr ""
 
 msgid "option missing"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1213

 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 

-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1224

 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 

-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1238

 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 

-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/mockup-service.c:69
+#: src/arm/mockup-service.c:44

 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 

+#: src/ats/gnunet-ats.c:93
+#, fuzzy
+msgid "list information for the given peer"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/ats/gnunet-ats.c:96
+#, fuzzy
+msgid "list information for all peers"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/ats/gnunet-ats.c:105
+#, fuzzy
+msgid "Print information about ATS state"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+

 #: src/block/block.c:105
 #, fuzzy, c-format
 msgid "Loading block plugin `%s'\n"
 #: src/block/block.c:105
 #, fuzzy, c-format
 msgid "Loading block plugin `%s'\n"


@@ -321,377 +359,401 @@ msgstr ""
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:92
+#: src/chat/gnunet-chat.c:93

 msgid "Joined\n"
 msgstr ""
 
 msgid "Joined\n"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:124
+#: src/chat/gnunet-chat.c:125 src/chat/gnunet-chat.c:133
+#: src/chat/gnunet-chat.c:213 src/chat/gnunet-chat.c:253
+#: src/chat/gnunet-chat.c:329 src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:400 src/chat/gnunet-chat.c:700

 msgid "anonymous"
 msgstr "匿名"
 
 msgid "anonymous"
 msgstr "匿名"
 

-#: src/chat/gnunet-chat.c:130
+#: src/chat/gnunet-chat.c:144

 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "“%s”说：%s\n"
 
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "“%s”说：%s\n"
 

-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/chat/gnunet-chat.c:147 src/chat/gnunet-chat.c:150

 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "“%s”对您说：%s\n"
 
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "“%s”对您说：%s\n"
 

-#: src/chat/gnunet-chat.c:139
+#: src/chat/gnunet-chat.c:153

 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "“%s”对您说：%s\n"
 
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "“%s”对您说：%s\n"
 

-#: src/chat/gnunet-chat.c:142
+#: src/chat/gnunet-chat.c:156

 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "“%s”对您说：%s\n"
 
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "“%s”对您说：%s\n"
 

-#: src/chat/gnunet-chat.c:145
+#: src/chat/gnunet-chat.c:159

 #, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 
 #, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:162

 #, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr ""
 
 #, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:165

 #, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 
 #, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:170

 #, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:173

 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "“%s”对您说：%s\n"
 
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "“%s”对您说：%s\n"
 

-#: src/chat/gnunet-chat.c:162
+#: src/chat/gnunet-chat.c:176

 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:217

 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260

 #, c-format
 msgid "`%s' entered the room\n"
 msgstr "“%s”进入了房间\n"
 
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr "“%s”进入了房间\n"
 

-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260

 #, c-format
 msgid "`%s' left the room\n"
 msgstr "“%s”离开了房间\n"
 
 #, c-format
 msgid "`%s' left the room\n"
 msgstr "“%s”离开了房间\n"
 

-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363

 #, fuzzy
 msgid "Could not change username\n"
 msgstr "已将用户名改为“%s”。\n"
 
 #, fuzzy
 msgid "Could not change username\n"
 msgstr "已将用户名改为“%s”。\n"
 

-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702

 #, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr ""
 
 #, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:373

 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "已将用户名改为“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "已将用户名改为“%s”。\n"
 

-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:388

 #, c-format
 msgid "Users in room `%s': "
 msgstr "房间“%s”中的用户："
 
 #, c-format
 msgid "Users in room `%s': "
 msgstr "房间“%s”中的用户："
 

-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:434

 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr "语法：/msg 用户名 消息"
 
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr "语法：/msg 用户名 消息"
 

-#: src/chat/gnunet-chat.c:379
+#: src/chat/gnunet-chat.c:443

 #, c-format
 #, c-format

-msgid "Unknown user `%s'\n"
-msgstr "未知的用户“%s”\n"
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgstr ""

 
 

-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:460

 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr "用户“%s”当前不在房间里！\n"
 
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr "用户“%s”当前不在房间里！\n"
 

-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:513

 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 

-#: src/chat/gnunet-chat.c:459
+#: src/chat/gnunet-chat.c:524

 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:463
+#: src/chat/gnunet-chat.c:528

 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 

-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:532

 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:535

 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:537

 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:539

 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:542

 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:545

 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:547

 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:549

 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:551

 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:554

 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:556

 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:672

 msgid "You must specify a nickname\n"
 msgstr "您必须指定一个昵称\n"
 
 msgid "You must specify a nickname\n"
 msgstr "您必须指定一个昵称\n"
 

-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:688

 #, c-format
 msgid "Failed to join room `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to join room `%s'\n"
 msgstr ""
 

-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:727

 msgid "set the nickname to use (required)"
 msgstr "设置要使用的昵称(必须)"
 
 msgid "set the nickname to use (required)"
 msgstr "设置要使用的昵称(必须)"
 

-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:730

 msgid "set the chat room to join"
 msgstr "设置要加入的聊天室"
 
 msgid "set the chat room to join"
 msgstr "设置要加入的聊天室"
 

-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:746

 msgid "Join a chat on GNUnet."
 msgstr ""
 
 msgid "Join a chat on GNUnet."
 msgstr ""
 

-#: src/chat/gnunet-service-chat.c:267
+#: src/chat/gnunet-service-chat.c:266

 #, fuzzy
 msgid "Failed to queue a message notification\n"
 msgstr "保存配置失败。"
 
 #, fuzzy
 msgid "Failed to queue a message notification\n"
 msgstr "保存配置失败。"
 

-#: src/chat/gnunet-service-chat.c:546
+#: src/chat/gnunet-service-chat.c:545

 #, fuzzy
 msgid "Failed to queue a join notification\n"
 msgstr "保存配置失败。"
 
 #, fuzzy
 msgid "Failed to queue a join notification\n"
 msgstr "保存配置失败。"
 

-#: src/chat/gnunet-service-chat.c:729
+#: src/chat/gnunet-service-chat.c:728

 #, fuzzy
 msgid "Failed to queue a confirmation receipt\n"
 msgstr "保存配置失败。"
 
 #, fuzzy
 msgid "Failed to queue a confirmation receipt\n"
 msgstr "保存配置失败。"
 

-#: src/chat/gnunet-service-chat.c:907
+#: src/chat/gnunet-service-chat.c:906

 #, fuzzy
 msgid "Failed to queue a leave notification\n"
 msgstr "保存配置失败。"
 
 #, fuzzy
 msgid "Failed to queue a leave notification\n"
 msgstr "保存配置失败。"
 

-#: src/core/core_api.c:798
+#: src/core/core_api.c:757

 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 

-#: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:286

 #, c-format
 msgid "Peer `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Peer `%s'\n"
 msgstr ""
 

-#: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/core/gnunet-core.c:118 src/core/gnunet-core.c:149
+#: src/transport/gnunet-transport.c:451 src/transport/gnunet-transport.c:477
+#, c-format
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
+msgstr ""
+
+#: src/core/gnunet-core.c:120 src/transport/gnunet-transport.c:453
+#, fuzzy
+msgid "Connected to"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/core/gnunet-core.c:151 src/transport/gnunet-transport.c:479
+#, fuzzy
+msgid "Disconnected from"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:817

 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 

-#: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
-msgid "don't resolve host names"
+#: src/core/gnunet-core.c:216 src/transport/gnunet-transport.c:725
+msgid "provide information about all current connections (continuously)"

 msgstr ""
 
 msgstr ""
 

-#: src/core/gnunet-core-list-connections.c:203
+#: src/core/gnunet-core.c:227

 msgid "Print information about connected peers."
 msgstr ""
 
 msgid "Print information about connected peers."
 msgstr ""
 

-#: src/core/gnunet-service-core.c:99
+#: src/core/gnunet-service-core.c:97

 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 

-#: src/core/gnunet-service-core_clients.c:360
+#: src/core/gnunet-service-core_clients.c:370

 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
 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 ""
 
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 

-#: src/core/gnunet-service-core_clients.c:801
+#: src/core/gnunet-service-core_clients.c:818

 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:493
+#: src/core/gnunet-service-core_kx.c:565

 msgid "# bytes encrypted"
 msgstr ""
 
 msgid "# bytes encrypted"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:543
+#: src/core/gnunet-service-core_kx.c:617

 msgid "# bytes decrypted"
 msgstr ""
 
 msgid "# bytes decrypted"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003

 msgid "Error in communication with PEERINFO service\n"
 msgstr ""
 
 msgid "Error in communication with PEERINFO service\n"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:700

 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:753

 msgid "# key exchanges initiated"
 msgstr ""
 
 msgid "# key exchanges initiated"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:775

 msgid "# key exchanges stopped"
 msgstr ""
 
 msgid "# key exchanges stopped"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:828

 msgid "# session keys received"
 msgstr ""
 
 msgid "# session keys received"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:845

 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:890

 msgid "# SET_KEY messages decrypted"
 msgstr ""
 
 msgid "# SET_KEY messages decrypted"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:883
-#: src/transport/gnunet-service-transport_validation.c:803
+#: src/core/gnunet-service-core_kx.c:977
+#: src/transport/gnunet-service-transport_validation.c:812

 msgid "# PING messages received"
 msgstr ""
 
 msgid "# PING messages received"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:917
+#: 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 ""
 
 #, 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:938
+#: src/core/gnunet-service-core_kx.c:1029

 msgid "# PONG messages created"
 msgstr ""
 
 msgid "# PONG messages created"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1125

 msgid "# sessions terminated by timeout"
 msgstr ""
 
 msgid "# sessions terminated by timeout"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1135

 msgid "# keepalive messages sent"
 msgstr ""
 
 msgid "# keepalive messages sent"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1095
-#: src/transport/gnunet-service-transport_validation.c:1026
+#: src/core/gnunet-service-core_kx.c:1236
+#: src/transport/gnunet-service-transport_validation.c:1108

 msgid "# PONG messages received"
 msgstr ""
 
 msgid "# PONG messages received"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1275

 msgid "# PONG messages decrypted"
 msgstr ""
 
 msgid "# PONG messages decrypted"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1303

 msgid "# session keys confirmed via PONG"
 msgstr ""
 
 msgid "# session keys confirmed via PONG"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1223
+#: 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 ""
 
 msgid "# SET_KEY and PING messages created"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1364
+#: 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 ""
 
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1579
+#: src/core/gnunet-service-core_kx.c:1604

 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1591

 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1628

 #, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr ""
 
 #, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1632

 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1640

 msgid "# bytes of payload decrypted"
 msgstr ""
 
 msgid "# bytes of payload decrypted"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1702

 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 

-#: src/core/gnunet-service-core_kx.c:1536
+#: src/core/gnunet-service-core_kx.c:1710

 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 

-#: src/core/gnunet-service-core_kx.c:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
-#: src/transport/gnunet-service-transport.c:595
+#: src/core/gnunet-service-core_kx.c:1720 src/hostlist/hostlist-server.c:551
+#: src/peerinfo-tool/gnunet-peerinfo.c:823
+#: src/transport/gnunet-service-transport.c:619

 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 


@@ -700,29 +762,39 @@ msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
 #: src/core/gnunet-service-core_neighbours.c:180
 msgstr ""
 
 #: src/core/gnunet-service-core_neighbours.c:180

-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:334

 msgid "# neighbour entries allocated"
 msgstr ""
 
 msgid "# neighbour entries allocated"
 msgstr ""
 

-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:247

 msgid "# encrypted bytes given to transport"
 msgstr ""
 
 msgid "# encrypted bytes given to transport"
 msgstr ""
 

-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:421

 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 

-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
+#: src/core/gnunet-service-core_sessions.c:206
+#: src/core/gnunet-service-core_sessions.c:269
+#: src/dht/gnunet-service-dht_neighbours.c:629
+#: src/dht/gnunet-service-dht_neighbours.c:687
+#: src/fs/gnunet-service-fs_cp.c:622 src/fs/gnunet-service-fs_cp.c:1530
+#: src/topology/gnunet-daemon-topology.c:709
+#: src/topology/gnunet-daemon-topology.c:810
+#: src/transport/gnunet-service-transport_neighbours.c:873
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:1098
+#: src/transport/gnunet-service-transport_neighbours.c:2620
+#: src/transport/gnunet-service-transport_neighbours.c:2882
+msgid "# peers connected"

 msgstr ""
 
 msgstr ""
 

-#: src/core/gnunet-service-core_sessions.c:238
+#: src/core/gnunet-service-core_sessions.c:236

 msgid "# type map refreshes sent"
 msgstr ""
 
 msgid "# type map refreshes sent"
 msgstr ""
 

-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:406

 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 


@@ -735,400 +807,379 @@ msgstr ""
 msgid "# updates to my type map"
 msgstr ""
 
 msgid "# updates to my type map"
 msgstr ""
 

-#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:854
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:834

 msgid "# bytes stored"
 msgstr ""
 
 msgid "# bytes stored"
 msgstr ""
 

-#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542
+#: src/datacache/datacache.c:141 src/datacache/datacache.c:148
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/gnunet-service-datastore.c:1494

 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 

-#: src/datacache/datacache.c:183
+#: src/datacache/datacache.c:180

 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 

-#: src/datacache/datacache.c:191
+#: src/datacache/datacache.c:188

 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 

-#: src/datacache/datacache.c:281
+#: src/datacache/datacache.c:276

 msgid "# requests received"
 msgstr ""
 
 msgid "# requests received"
 msgstr ""
 

-#: src/datacache/datacache.c:291
+#: src/datacache/datacache.c:284

 msgid "# requests filtered by bloom filter"
 msgstr ""
 
 msgid "# requests filtered by bloom filter"
 msgstr ""
 

-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614
-#: src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/datacache/plugin_datacache_mysql.c:97
+#: src/datacache/plugin_datacache_mysql.c:104
+#: 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_ksk.c:49
+#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:543
+#: src/include/gnunet_common.h:550

 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 

-#: src/datacache/plugin_datacache_mysql.c:224
-#: src/datastore/plugin_datastore_mysql.c:316
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_mysql.c:230
-#: src/datastore/plugin_datastore_mysql.c:322
-#, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/datacache/plugin_datacache_mysql.c:979
+#: src/datacache/plugin_datacache_mysql.c:450

 msgid "MySQL datacache running\n"
 msgstr ""
 
 msgid "MySQL datacache running\n"
 msgstr ""
 

-#: src/datacache/plugin_datacache_postgres.c:79
-#: src/datastore/plugin_datastore_postgres.c:93
-#, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
-
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "无法初始化 SQLite：%s。\n"
-
-#: src/datacache/plugin_datacache_postgres.c:499
+#: src/datacache/plugin_datacache_postgres.c:367

 msgid "Postgres datacache running\n"
 msgstr ""
 
 msgid "Postgres datacache running\n"
 msgstr ""
 

-#: src/datacache/plugin_datacache_sqlite.c:424
+#: src/datacache/plugin_datacache_sqlite.c:410

 msgid "Sqlite datacache running\n"
 msgstr ""
 
 msgid "Sqlite datacache running\n"
 msgstr ""
 

-#: src/datacache/plugin_datacache_sqlite.c:457
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:443
+#: src/datastore/plugin_datastore_sqlite.c:408
+#: src/namestore/plugin_namestore_sqlite.c:370

 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 

+#: src/datacache/plugin_datacache_sqlite.c:450
+#, fuzzy, c-format
+msgid "Failed to close statement %p: %d\n"
+msgstr "解析配置文件“%s”失败\n"
+

 #: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 

-#: src/datastore/datastore_api.c:289
+#: src/datastore/datastore_api.c:305

 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 

-#: src/datastore/datastore_api.c:372
+#: src/datastore/datastore_api.c:388

 msgid "# queue entry timeouts"
 msgstr ""
 
 msgid "# queue entry timeouts"
 msgstr ""
 

-#: src/datastore/datastore_api.c:418
+#: src/datastore/datastore_api.c:432

 msgid "# queue overflows"
 msgstr ""
 
 msgid "# queue overflows"
 msgstr ""
 

-#: src/datastore/datastore_api.c:445
+#: src/datastore/datastore_api.c:459

 msgid "# queue entries created"
 msgstr ""
 
 msgid "# queue entries created"
 msgstr ""
 

-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:477

 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 

-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:525

 msgid "# datastore connections (re)created"
 msgstr ""
 
 msgid "# datastore connections (re)created"
 msgstr ""
 

-#: src/datastore/datastore_api.c:540
+#: src/datastore/datastore_api.c:548

 msgid "# reconnected to DATASTORE"
 msgstr ""
 
 msgid "# reconnected to DATASTORE"
 msgstr ""
 

-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:612

 msgid "# transmission request failures"
 msgstr ""
 
 msgid "# transmission request failures"
 msgstr ""
 

-#: src/datastore/datastore_api.c:631
+#: src/datastore/datastore_api.c:633

 msgid "# bytes sent to datastore"
 msgstr ""
 
 msgid "# bytes sent to datastore"
 msgstr ""
 

-#: src/datastore/datastore_api.c:772
+#: src/datastore/datastore_api.c:764

 msgid "Failed to receive status response from database."
 msgstr ""
 
 msgid "Failed to receive status response from database."
 msgstr ""
 

-#: src/datastore/datastore_api.c:786
+#: src/datastore/datastore_api.c:778

 msgid "Error reading response from datastore service"
 msgstr ""
 
 msgid "Error reading response from datastore service"
 msgstr ""
 

-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796

 msgid "Invalid error message received from datastore service"
 msgstr ""
 
 msgid "Invalid error message received from datastore service"
 msgstr ""
 

-#: src/datastore/datastore_api.c:810
+#: src/datastore/datastore_api.c:800

 msgid "# status messages received"
 msgstr ""
 
 msgid "# status messages received"
 msgstr ""
 

-#: src/datastore/datastore_api.c:883
+#: src/datastore/datastore_api.c:869

 msgid "# PUT requests executed"
 msgstr ""
 
 msgid "# PUT requests executed"
 msgstr ""
 

-#: src/datastore/datastore_api.c:954
+#: src/datastore/datastore_api.c:936

 msgid "# RESERVE requests executed"
 msgstr ""
 
 msgid "# RESERVE requests executed"
 msgstr ""
 

-#: src/datastore/datastore_api.c:1019
+#: src/datastore/datastore_api.c:997

 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 

-#: src/datastore/datastore_api.c:1080
+#: src/datastore/datastore_api.c:1054

 msgid "# UPDATE requests executed"
 msgstr ""
 
 msgid "# UPDATE requests executed"
 msgstr ""
 

-#: src/datastore/datastore_api.c:1148
+#: src/datastore/datastore_api.c:1118

 msgid "# REMOVE requests executed"
 msgstr ""
 
 msgid "# REMOVE requests executed"
 msgstr ""
 

-#: src/datastore/datastore_api.c:1193
+#: src/datastore/datastore_api.c:1163

 msgid "Failed to receive response from database.\n"
 msgstr ""
 
 msgid "Failed to receive response from database.\n"
 msgstr ""
 

-#: src/datastore/datastore_api.c:1253
+#: src/datastore/datastore_api.c:1221

 msgid "# Results received"
 msgstr ""
 
 msgid "# Results received"
 msgstr ""
 

-#: src/datastore/datastore_api.c:1324
+#: src/datastore/datastore_api.c:1286

 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 

-#: src/datastore/datastore_api.c:1391
+#: src/datastore/datastore_api.c:1349

 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 

-#: src/datastore/datastore_api.c:1455
+#: src/datastore/datastore_api.c:1409

 msgid "# GET requests executed"
 msgstr ""
 
 msgid "# GET requests executed"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:349

 msgid "# bytes expired"
 msgstr ""
 
 msgid "# bytes expired"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:426
+#: src/datastore/gnunet-service-datastore.c:422

 msgid "# bytes purged (low-priority)"
 msgstr ""
 
 msgid "# bytes purged (low-priority)"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:486
+#: src/datastore/gnunet-service-datastore.c:480

 msgid "Transmission to client failed!\n"
 msgstr ""
 
 msgid "Transmission to client failed!\n"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:640
+#: src/datastore/gnunet-service-datastore.c:511
+msgid "Shutdown in progress, aborting transmission.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:626

 msgid "# results found"
 msgstr ""
 
 msgid "# results found"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:685
+#: src/datastore/gnunet-service-datastore.c:669

 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:680

 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:700
+#: src/datastore/gnunet-service-datastore.c:684

 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:706
+#: src/datastore/gnunet-service-datastore.c:690

 msgid "Insufficient space to satisfy request"
 msgstr ""
 
 msgid "Insufficient space to satisfy request"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
+#: 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 ""
 
 msgid "# reserved"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:780
+#: src/datastore/gnunet-service-datastore.c:760

 msgid "Could not find matching reservation"
 msgstr ""
 
 msgid "Could not find matching reservation"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:868
+#: src/datastore/gnunet-service-datastore.c:846

 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1034
+#: src/datastore/gnunet-service-datastore.c:1006

 msgid "# GET requests received"
 msgstr ""
 
 msgid "# GET requests received"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1018

 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1046

 msgid "# UPDATE requests received"
 msgstr ""
 
 msgid "# UPDATE requests received"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1110
+#: src/datastore/gnunet-service-datastore.c:1076

 msgid "# GET REPLICATION requests received"
 msgstr ""
 
 msgid "# GET REPLICATION requests received"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1145
+#: src/datastore/gnunet-service-datastore.c:1109

 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1172
+#: src/datastore/gnunet-service-datastore.c:1134

 msgid "Content not found"
 msgstr ""
 
 msgid "Content not found"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1182
+#: src/datastore/gnunet-service-datastore.c:1142

 msgid "# bytes removed (explicit request)"
 msgstr ""
 
 msgid "# bytes removed (explicit request)"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1174

 msgid "# REMOVE requests received"
 msgstr ""
 
 msgid "# REMOVE requests received"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/datastore/gnunet-service-datastore.c:1216

 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/datastore/gnunet-service-datastore.c:1277

 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/datastore/gnunet-service-datastore.c:1286

 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1488

 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1547
+#: src/datastore/gnunet-service-datastore.c:1499

 msgid "# quota"
 msgstr ""
 
 msgid "# quota"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1549
+#: src/datastore/gnunet-service-datastore.c:1501

 msgid "# cache size"
 msgstr ""
 
 msgid "# cache size"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1562
+#: src/datastore/gnunet-service-datastore.c:1514

 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
+#: 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"
 
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/datastore/gnunet-service-datastore.c:1626
+#: src/datastore/gnunet-service-datastore.c:1578

 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/datastore/gnunet-service-datastore.c:1655
+#: src/datastore/gnunet-service-datastore.c:1607

 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1660
+#: src/datastore/gnunet-service-datastore.c:1612

 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 

-#: src/datastore/gnunet-service-datastore.c:1663
+#: src/datastore/gnunet-service-datastore.c:1615

 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 

-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/datastore/plugin_datastore_mysql.c:780

 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: 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"
 
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 

-#: src/datastore/plugin_datastore_mysql.c:1581
+#: src/datastore/plugin_datastore_mysql.c:1019

 msgid "Mysql database running\n"
 msgstr ""
 
 msgid "Mysql database running\n"
 msgstr ""
 

-#: src/datastore/plugin_datastore_postgres.c:173
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "无法保存配置文件“%s”："
+#: src/datastore/plugin_datastore_postgres.c:824
+#, fuzzy
+msgid "Failed to drop table from database.\n"
+msgstr "发送消息失败。\n"

 
 

-#: src/datastore/plugin_datastore_postgres.c:1017
+#: src/datastore/plugin_datastore_postgres.c:860
+#: src/namestore/plugin_namestore_postgres.c:654

 msgid "Postgres database running\n"
 msgstr ""
 
 msgid "Postgres database running\n"
 msgstr ""
 

-#: src/datastore/plugin_datastore_sqlite.c:61
+#: 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"
 
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 

-#: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/datastore/plugin_datastore_sqlite.c:233
+#: src/namestore/plugin_namestore_sqlite.c:204

 #, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
 #, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 

-#: src/datastore/plugin_datastore_sqlite.c:266
-#: src/namestore/plugin_namestore_sqlite.c:248
+#: src/datastore/plugin_datastore_sqlite.c:260
+#: src/namestore/plugin_namestore_sqlite.c:229

 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
 

-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:655

 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 

-#: src/datastore/plugin_datastore_sqlite.c:1159
+#: src/datastore/plugin_datastore_sqlite.c:1139

 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 

-#: src/datastore/plugin_datastore_sqlite.c:1178
+#: src/datastore/plugin_datastore_sqlite.c:1158

 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 

-#: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:779
+#: src/datastore/plugin_datastore_sqlite.c:1198
+#: src/namestore/plugin_namestore_sqlite.c:834

 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"


@@ -1137,128 +1188,144 @@ msgstr "sqlite 数据仓库"
 msgid "Template database running\n"
 msgstr ""
 
 msgid "Template database running\n"
 msgstr ""
 

-#: src/dht/dht_api.c:280
+#: src/dht/dht_api.c:348

 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-#: src/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-put.c:192

 msgid "the query key"
 msgstr ""
 
 msgid "the query key"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:182
+#: src/dht/gnunet-dht-get.c:204

 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:185
+#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296

 msgid "the type of data to look for"
 msgstr ""
 
 msgid "the type of data to look for"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-#: src/gns/gnunet-gns-lookup.c:188
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201

 msgid "how long to execute this query before giving up?"
 msgstr ""
 
 msgid "how long to execute this query before giving up?"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-auto-share.c:750
+#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:732

 #: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
 #: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169

-#: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
+#: src/nse/gnunet-nse-profiler.c:897

 msgid "be verbose (print progress information)"
 msgstr ""
 
 msgid "be verbose (print progress information)"
 msgstr ""
 

-#: src/dht/gnunet-dht-get.c:232
+#: src/dht/gnunet-dht-get.c:236

 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 

-#: src/dht/gnunet-dht-put.c:100
+#: src/dht/gnunet-dht-monitor.c:299
+msgid "how long to execute? 0 = forever"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:324
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:108

 msgid "PUT request sent!\n"
 msgstr ""
 
 msgid "PUT request sent!\n"
 msgstr ""
 

-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:111
+msgid "Timeout sending PUT request!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:114
+msgid "PUT request not confirmed!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:144

 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 

-#: src/dht/gnunet-dht-put.c:132
+#: src/dht/gnunet-dht-put.c:152

 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "无法连接到 %s:%u：%s\n"
 

-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:157

 #, fuzzy, c-format
 msgid "Connected to %s service!\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Connected to %s service!\n"
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/gnunet-dht-put.c:172

 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 

-#: src/dht/gnunet-dht-put.c:166
+#: src/dht/gnunet-dht-put.c:186

 msgid "the data to insert under the key"
 msgstr ""
 
 msgid "the data to insert under the key"
 msgstr ""
 

-#: src/dht/gnunet-dht-put.c:169
+#: src/dht/gnunet-dht-put.c:189

 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 

-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:195

 msgid "how many replicas to create"
 msgstr ""
 
 msgid "how many replicas to create"
 msgstr ""
 

-#: src/dht/gnunet-dht-put.c:178
+#: src/dht/gnunet-dht-put.c:198

 msgid "the type to insert data as"
 msgstr ""
 
 msgid "the type to insert data as"
 msgstr ""
 

-#: src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-put.c:226

 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 

-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:556
-#: src/testing/testing.c:1979 src/testing/testing.c:2009
+#: src/dht/gnunet-service-dht.c:163 src/testing_old/testing.c:544
+#: src/testing_old/testing.c:1968 src/testing_old/testing.c:1998

 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/dht/gnunet-service-dht_clients.c:371
+#: src/dht/gnunet-service-dht_clients.c:407

 msgid "# GET requests from clients injected"
 msgstr ""
 
 msgid "# GET requests from clients injected"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:462
+#: src/dht/gnunet-service-dht_clients.c:500

 msgid "# PUT requests received from clients"
 msgstr ""
 
 msgid "# PUT requests received from clients"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:529
+#: src/dht/gnunet-service-dht_clients.c:584

 msgid "# GET requests received from clients"
 msgstr ""
 
 msgid "# GET requests received from clients"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:682

 msgid "# GET STOP requests received from clients"
 msgstr ""
 
 msgid "# GET STOP requests received from clients"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:854
+#: src/dht/gnunet-service-dht_clients.c:919

 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:869
+#: src/dht/gnunet-service-dht_clients.c:932

 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:906
+#: src/dht/gnunet-service-dht_clients.c:967

 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:928
+#: src/dht/gnunet-service-dht_clients.c:990

 msgid "# RESULTS queued for clients"
 msgstr ""
 
 msgid "# RESULTS queued for clients"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
+#: src/dht/gnunet-service-dht_clients.c:1039
+#: src/dht/gnunet-service-dht_clients.c:1082

 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:1049

 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 


@@ -1271,28 +1338,28 @@ msgstr ""
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 msgid "# ITEMS stored in datacache"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_datacache.c:209
+#: src/dht/gnunet-service-dht_datacache.c:207

 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_datacache.c:220
+#: src/dht/gnunet-service-dht_datacache.c:218

 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_datacache.c:226
+#: src/dht/gnunet-service-dht_datacache.c:224

 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:236

 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_datacache.c:241
+#: src/dht/gnunet-service-dht_datacache.c:239

 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_datacache.c:271
+#: src/dht/gnunet-service-dht_datacache.c:269

 msgid "# GET requests given to datacache"
 msgstr ""
 
 msgid "# GET requests given to datacache"
 msgstr ""
 


@@ -1300,57 +1367,55 @@ msgstr ""
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:481
+#: src/dht/gnunet-service-dht_neighbours.c:485

 msgid "# Preference updates given to core"
 msgstr ""
 
 msgid "# Preference updates given to core"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:573
+#: src/dht/gnunet-service-dht_neighbours.c:575

 msgid "# FIND PEER messages initiated"
 msgstr ""
 
 msgid "# FIND PEER messages initiated"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:629
-#: src/dht/gnunet-service-dht_neighbours.c:689
-#, fuzzy
-msgid "# Peers connected"
-msgstr ""
-"\n"
-"按任意键继续\n"
-
-#: src/dht/gnunet-service-dht_neighbours.c:723
+#: src/dht/gnunet-service-dht_neighbours.c:721

 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:778
+#: src/dht/gnunet-service-dht_neighbours.c:776

 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:816
+#: src/dht/gnunet-service-dht_neighbours.c:814

 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1040
-#: src/dht/gnunet-service-dht_neighbours.c:1068
+#: src/dht/gnunet-service-dht_neighbours.c:1036
+#: src/dht/gnunet-service-dht_neighbours.c:1064

 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1049
-#: src/dht/gnunet-service-dht_neighbours.c:1085
+#: src/dht/gnunet-service-dht_neighbours.c:1045
+#: src/dht/gnunet-service-dht_neighbours.c:1079

 msgid "# Peer selection failed"
 msgstr ""
 
 msgid "# Peer selection failed"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1221
+#: src/dht/gnunet-service-dht_neighbours.c:1211

 msgid "# PUT requests routed"
 msgstr ""
 
 msgid "# PUT requests routed"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1240

 msgid "# PUT messages queued for transmission"
 msgstr ""
 
 msgid "# PUT messages queued for transmission"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1333
+#: src/dht/gnunet-service-dht_neighbours.c:1247
+#: src/dht/gnunet-service-dht_neighbours.c:1360
+#: src/dht/gnunet-service-dht_neighbours.c:1460
+msgid "# P2P messages dropped due to full queue"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1325

 msgid "# GET requests routed"
 msgstr ""
 
 msgid "# GET requests routed"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1364
+#: src/dht/gnunet-service-dht_neighbours.c:1352

 msgid "# GET messages queued for transmission"
 msgstr ""
 
 msgid "# GET messages queued for transmission"
 msgstr ""
 


@@ -1362,27 +1427,27 @@ msgstr ""
 msgid "# P2P PUT requests received"
 msgstr ""
 
 msgid "# P2P PUT requests received"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1671

 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1676
+#: src/dht/gnunet-service-dht_neighbours.c:1679

 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1767
+#: src/dht/gnunet-service-dht_neighbours.c:1770

 msgid "# P2P GET requests received"
 msgstr ""
 
 msgid "# P2P GET requests received"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1812

 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1826

 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_neighbours.c:1895
+#: src/dht/gnunet-service-dht_neighbours.c:1900

 msgid "# P2P RESULTS received"
 msgstr ""
 
 msgid "# P2P RESULTS received"
 msgstr ""
 


@@ -1402,42 +1467,45 @@ msgstr ""
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_routing.c:236
+#: src/dht/gnunet-service-dht_routing.c:238

 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
+#: src/dht/gnunet-service-dht_routing.c:311

 msgid "# Entries removed from routing table"
 msgstr ""
 
 msgid "# Entries removed from routing table"
 msgstr ""
 

-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:394

 msgid "# Entries added to routing table"
 msgstr ""
 
 msgid "# Entries added to routing table"
 msgstr ""
 

-#: src/dht/plugin_block_dht.c:124
+#: src/dht/gnunet-service-dht_routing.c:411
+msgid "# DHT requests combined"
+msgstr ""
+
+#: src/dht/plugin_block_dht.c:136

 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 

-#: src/dht/plugin_block_dht.c:131
+#: src/dht/plugin_block_dht.c:143

 msgid "Size mismatch for block\n"
 msgstr ""
 
 msgid "Size mismatch for block\n"
 msgstr ""
 

-#: src/dht/plugin_block_dht.c:140
+#: src/dht/plugin_block_dht.c:152

 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 

-#: src/dns/gnunet-dns-monitor.c:337
+#: src/dns/gnunet-dns-monitor.c:355

 msgid "only monitor DNS queries"
 msgstr ""
 
 msgid "only monitor DNS queries"
 msgstr ""
 

-#: src/dns/gnunet-dns-monitor.c:340
+#: src/dns/gnunet-dns-monitor.c:358

 msgid "only monitor DNS replies"
 msgstr ""
 
 msgid "only monitor DNS replies"
 msgstr ""
 

-#: src/dns/gnunet-dns-monitor.c:348
+#: src/dns/gnunet-dns-monitor.c:370

 msgid "Monitor DNS queries."
 msgstr ""
 
 msgid "Monitor DNS queries."
 msgstr ""
 


@@ -1449,71 +1517,72 @@ msgstr ""
 msgid "set AAAA records"
 msgstr ""
 
 msgid "set AAAA records"
 msgstr ""
 

-#: src/dns/gnunet-dns-redirector.c:247
+#: src/dns/gnunet-dns-redirector.c:251

 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:480
+#: src/dns/gnunet-service-dns.c:485

 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 

-#: src/dns/gnunet-service-dns.c:634
+#: src/dns/gnunet-service-dns.c:639

 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:818
+#: src/dns/gnunet-service-dns.c:822

 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1001
+#: src/dns/gnunet-service-dns.c:1005

 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1046
+#: src/dns/gnunet-service-dns.c:1050

 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1165
+#: src/dns/gnunet-service-dns.c:1168

 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1198
-msgid "Changing DNS reply according to client specifications\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1279
+#: src/dns/gnunet-service-dns.c:1281

 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1294
+#: src/dns/gnunet-service-dns.c:1297

 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1303
+#: src/dns/gnunet-service-dns.c:1306

 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1312
+#: src/dns/gnunet-service-dns.c:1315

 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1377
+#: src/dns/gnunet-service-dns.c:1380

 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1461
+#: src/dns/gnunet-service-dns.c:1465

 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2673

 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 

-#: src/dns/gnunet-service-dns.c:1567
+#: src/dns/gnunet-service-dns.c:1561 src/exit/gnunet-daemon-exit.c:3032
+#, c-format
+msgid "`%s' must be installed SUID, refusing to run\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1581

 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 


@@ -1532,61 +1601,61 @@ msgstr ""
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:563
+#: src/exit/gnunet-daemon-exit.c:561

 msgid "# Bytes transmitted via mesh tunnels"
 msgstr ""
 
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2068
-#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1388
-#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:678 src/exit/gnunet-daemon-exit.c:2068
+#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1392
+#: src/vpn/gnunet-service-vpn.c:1793 src/vpn/gnunet-service-vpn.c:1956

 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2127
-#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+#: src/exit/gnunet-daemon-exit.c:715 src/exit/gnunet-daemon-exit.c:2127
+#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1448
+#: src/vpn/gnunet-service-vpn.c:1852 src/vpn/gnunet-service-vpn.c:1989

 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:756
+#: src/exit/gnunet-daemon-exit.c:755

 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:763
+#: src/exit/gnunet-daemon-exit.c:762

 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:840
+#: src/exit/gnunet-daemon-exit.c:839

 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:915
+#: src/exit/gnunet-daemon-exit.c:914

 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:968
+#: src/exit/gnunet-daemon-exit.c:967

 msgid "# Packets received from TUN"
 msgstr ""
 
 msgid "# Packets received from TUN"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:982
+#: src/exit/gnunet-daemon-exit.c:981

 msgid "# Bytes received from TUN"
 msgstr ""
 
 msgid "# Bytes received from TUN"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:1008
+#: src/exit/gnunet-daemon-exit.c:1007

 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:1035
+#: src/exit/gnunet-daemon-exit.c:1034

 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:1081
+#: src/exit/gnunet-daemon-exit.c:1080

 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:1089
+#: src/exit/gnunet-daemon-exit.c:1088

 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""


@@ -1639,13 +1708,13 @@ msgstr ""
 msgid "# ICMP service requests received via mesh"
 msgstr ""
 
 msgid "# ICMP service requests received via mesh"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1378
-#: src/vpn/gnunet-service-vpn.c:1945
+#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1382
+#: src/vpn/gnunet-service-vpn.c:1950

 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1414
-#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1418
+#: src/vpn/gnunet-service-vpn.c:1430 src/vpn/gnunet-service-vpn.c:1840

 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 


@@ -1665,50 +1734,50 @@ msgstr ""
 msgid "# UDP requests dropped (no such service)"
 msgstr ""
 
 msgid "# UDP requests dropped (no such service)"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:2881
+#: src/exit/gnunet-daemon-exit.c:2882

 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:2895 src/exit/gnunet-daemon-exit.c:2907
+#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908

 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:2918
+#: src/exit/gnunet-daemon-exit.c:2919

 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3047
+#: src/exit/gnunet-daemon-exit.c:3048

 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
 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:3055
+#: src/exit/gnunet-daemon-exit.c:3056

 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
 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:3062
+#: src/exit/gnunet-daemon-exit.c:3063

 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3068
+#: src/exit/gnunet-daemon-exit.c:3069

 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3074 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884

 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 

-#: src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3240

 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 


@@ -1716,116 +1785,120 @@ msgstr ""
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 

-#: src/fragmentation/defragmentation.c:454
+#: src/fragmentation/defragmentation.c:456

 msgid "# fragments received"
 msgstr ""
 
 msgid "# fragments received"
 msgstr ""
 

-#: src/fragmentation/defragmentation.c:513
+#: src/fragmentation/defragmentation.c:521

 msgid "# duplicate fragments received"
 msgstr ""
 
 msgid "# duplicate fragments received"
 msgstr ""
 

-#: src/fragmentation/defragmentation.c:526
+#: src/fragmentation/defragmentation.c:534

 msgid "# messages defragmented"
 msgstr ""
 
 msgid "# messages defragmented"
 msgstr ""
 

-#: src/fragmentation/fragmentation.c:188
+#: src/fragmentation/fragmentation.c:203

 msgid "# fragments transmitted"
 msgstr ""
 
 msgid "# fragments transmitted"
 msgstr ""
 

-#: src/fragmentation/fragmentation.c:191
+#: src/fragmentation/fragmentation.c:206

 msgid "# fragments retransmitted"
 msgstr ""
 
 msgid "# fragments retransmitted"
 msgstr ""
 

-#: src/fragmentation/fragmentation.c:255
+#: src/fragmentation/fragmentation.c:232
+msgid "# fragments wrap arounds"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:273

 msgid "# messages fragmented"
 msgstr ""
 
 msgid "# messages fragmented"
 msgstr ""
 

-#: src/fragmentation/fragmentation.c:258
+#: src/fragmentation/fragmentation.c:276

 msgid "# total size of fragmented messages"
 msgstr ""
 
 msgid "# total size of fragmented messages"
 msgstr ""
 

-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:363

 msgid "# fragment acknowledgements received"
 msgstr ""
 
 msgid "# fragment acknowledgements received"
 msgstr ""
 

-#: src/fragmentation/fragmentation.c:349
+#: src/fragmentation/fragmentation.c:369

 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 

-#: src/fragmentation/fragmentation.c:373
+#: src/fragmentation/fragmentation.c:393

 msgid "# fragmentation transmissions completed"
 msgstr ""
 
 msgid "# fragmentation transmissions completed"
 msgstr ""
 

-#: src/fs/fs_api.c:284
+#: src/fs/fs_api.c:491

 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_api.c:293
+#: src/fs/fs_api.c:500

 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s)：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s)：%s\n"
 

-#: src/fs/fs_api.c:299
+#: src/fs/fs_api.c:506

 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 

-#: src/fs/fs_api.c:877
+#: src/fs/fs_api.c:1087

 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_api.c:1334
+#: src/fs/fs_api.c:1546

 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 

-#: src/fs/fs_api.c:1376
+#: src/fs/fs_api.c:1588

 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 

-#: src/fs/fs_api.c:1392
+#: src/fs/fs_api.c:1604

 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/fs/fs_api.c:2004
+#: src/fs/fs_api.c:2254

 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 

-#: src/fs/fs_api.c:2014
+#: src/fs/fs_api.c:2264

 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#: src/fs/fs_api.c:2389 src/fs/fs_api.c:2629

 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_api.c:2156
+#: src/fs/fs_api.c:2406

 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#: src/fs/fs_api.c:2419 src/fs/fs_api.c:2438 src/fs/fs_api.c:2922

 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 

-#: src/fs/fs_api.c:2369
+#: src/fs/fs_api.c:2620

 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/fs/fs_api.c:2615
+#: src/fs/fs_api.c:2866

 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 

-#: src/fs/fs_api.c:2709
+#: src/fs/fs_api.c:2960

 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""


@@ -1834,53 +1907,58 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 

-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:321

 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 

-#: src/fs/fs_download.c:330
+#: src/fs/fs_download.c:341

 msgid "Directory too large for system address space\n"
 msgstr ""
 
 msgid "Directory too large for system address space\n"
 msgstr ""
 

-#: src/fs/fs_download.c:488 src/fs/fs_download.c:500
+#: 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"
 
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_download.c:870
+#: src/fs/fs_download.c:888

 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 

-#: src/fs/fs_download.c:951
+#: src/fs/fs_download.c:970

 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "

-"offset %llu/%llu, got %u bytes)\n"
+"offset %llu/%llu, got %u bytes)"

 msgstr ""
 
 msgstr ""
 

-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:996

 msgid "internal error decrypting content"
 msgstr ""
 
 msgid "internal error decrypting content"
 msgstr ""
 

-#: src/fs/fs_download.c:1000
+#: src/fs/fs_download.c:1019

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Download failed: could not open file `%s': %s\n"
+msgid "Download failed: could not open file `%s': %s"

 msgstr "打开日志文件“%s”失败：%s\n"
 
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_download.c:1010
+#: src/fs/fs_download.c:1029

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgid "Failed to seek to offset %llu in file `%s': %s"

 msgstr "打开日志文件“%s”失败：%s\n"
 
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1038

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"

 msgstr "解析配置文件“%s”失败\n"
 
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/fs/fs_download.c:1835
+#: src/fs/fs_download.c:1136
+#, fuzzy
+msgid "internal error decoding tree"
+msgstr "未知错误。\n"
+
+#: src/fs/fs_download.c:1920

 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"


@@ -1942,82 +2020,82 @@ msgstr "打开日志文件“%s”失败：%s\n"
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 

-#: src/fs/fs_namespace.c:256
+#: src/fs/fs_namespace.c:254

 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 

-#: src/fs/fs_namespace.c:371
+#: src/fs/fs_namespace.c:369

 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 

-#: src/fs/fs_namespace.c:588 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:586 src/fs/fs_publish_ksk.c:295

 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 

-#: src/fs/fs_namespace.c:631
+#: src/fs/fs_namespace.c:629

 msgid "Failed to connect to datastore."
 msgstr ""
 
 msgid "Failed to connect to datastore."
 msgstr ""
 

-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397

 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 

-#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
-#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
+#: 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 ""
 
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 

-#: src/fs/fs_publish.c:618
+#: src/fs/fs_publish.c:624

 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 

-#: src/fs/fs_publish.c:630
+#: src/fs/fs_publish.c:636

 #, fuzzy
 msgid "unknown error"
 msgstr "未知错误"
 
 #, fuzzy
 msgid "unknown error"
 msgstr "未知错误"
 

-#: src/fs/fs_publish.c:673
+#: src/fs/fs_publish.c:679

 msgid "failed to compute hash"
 msgstr ""
 
 msgid "failed to compute hash"
 msgstr ""
 

-#: src/fs/fs_publish.c:693
+#: src/fs/fs_publish.c:699

 msgid "filename too long"
 msgstr ""
 
 msgid "filename too long"
 msgstr ""
 

-#: src/fs/fs_publish.c:718
+#: src/fs/fs_publish.c:724

 msgid "could not connect to `fs' service"
 msgstr ""
 
 msgid "could not connect to `fs' service"
 msgstr ""
 

-#: src/fs/fs_publish.c:741
+#: src/fs/fs_publish.c:747

 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/fs/fs_publish.c:806
+#: src/fs/fs_publish.c:812

 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 

-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:818

 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 

-#: src/fs/fs_publish.c:858
+#: src/fs/fs_publish.c:864

 msgid "needs to be an actual file"
 msgstr ""
 
 msgid "needs to be an actual file"
 msgstr ""
 

-#: src/fs/fs_publish.c:1067
+#: src/fs/fs_publish.c:1090

 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 

-#: src/fs/fs_publish.c:1138
+#: src/fs/fs_publish.c:1161

 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""


@@ -2026,7 +2104,7 @@ msgstr ""
 msgid "Could not connect to datastore."
 msgstr ""
 
 msgid "Could not connect to datastore."
 msgstr ""
 

-#: src/fs/fs_search.c:810
+#: src/fs/fs_search.c:830

 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""


@@ -2036,43 +2114,63 @@ msgstr ""
 msgid "Failed to start daemon: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
 msgid "Failed to start daemon: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 

-#: src/fs/fs_unindex.c:57
+#: src/fs/fs_unindex.c:58

 msgid "Failed to find given position in file"
 msgstr ""
 
 msgid "Failed to find given position in file"
 msgstr ""
 

-#: src/fs/fs_unindex.c:62
+#: src/fs/fs_unindex.c:63

 #, fuzzy
 msgid "Failed to read file"
 msgstr "发送消息失败。\n"
 
 #, fuzzy
 msgid "Failed to read file"
 msgstr "发送消息失败。\n"
 

-#: src/fs/fs_unindex.c:231
+#: src/fs/fs_unindex.c:233

 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 

-#: src/fs/fs_unindex.c:239
+#: src/fs/fs_unindex.c:241

 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 

-#: src/fs/fs_unindex.c:247
+#: src/fs/fs_unindex.c:249

 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "“%s”的参数无效。\n"
 
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "“%s”的参数无效。\n"
 

-#: src/fs/fs_unindex.c:292
+#: src/fs/fs_unindex.c:293

 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 

-#: src/fs/fs_unindex.c:325
+#: src/fs/fs_unindex.c:344
+#, fuzzy
+msgid "Failed to get KSKs from directory scan."
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/fs_unindex.c:356
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "未知错误。\n"
+
+#: src/fs/fs_unindex.c:411
+#, fuzzy, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_unindex.c:501
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/fs/fs_unindex.c:553 src/fs/fs_unindex.c:618

 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/fs/fs_unindex.c:338
+#: src/fs/fs_unindex.c:631

 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:665

 msgid "Failed to compute hash of file."
 msgstr ""
 
 msgid "Failed to compute hash of file."
 msgstr ""
 


@@ -2148,6 +2246,64 @@ msgstr ""
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
 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:684
+#, c-format
+msgid ""
+"You must specify one and only one directory name for automatic publication.\n"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:734 src/fs/gnunet-pseudonym.c:279
+#: src/fs/gnunet-publish.c:679
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:683
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:686
+msgid "do not use libextractor to add keywords or metadata"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:710
+msgid "specify the priority of the content"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-pseudonym.c:304
+#: src/fs/gnunet-publish.c:717
+msgid "set the desired replication LEVEL"
+msgstr ""
+
+#: src/fs/gnunet-auto-share.c:767
+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"
 #: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"


@@ -2178,97 +2334,97 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "更改 GNUnet 目录的权限出错"
 
 msgid "`%s' is not a GNUnet directory\n"
 msgstr "更改 GNUnet 目录的权限出错"
 

-#: src/fs/gnunet-directory.c:179
+#: src/fs/gnunet-directory.c:183

 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "更改 GNUnet 目录的权限出错"
 
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "更改 GNUnet 目录的权限出错"
 

-#: src/fs/gnunet-download.c:100
+#: src/fs/gnunet-download.c:137

 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 

-#: src/fs/gnunet-download.c:109
+#: src/fs/gnunet-download.c:146

 #, fuzzy
 msgid "<unknown time>"
 msgstr "未知错误"
 
 #, fuzzy
 msgid "<unknown time>"
 msgstr "未知错误"
 

-#: src/fs/gnunet-download.c:118
+#: src/fs/gnunet-download.c:155

 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 

-#: src/fs/gnunet-download.c:128
+#: src/fs/gnunet-download.c:178

 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 

-#: src/fs/gnunet-download.c:136
+#: src/fs/gnunet-download.c:193

 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 

-#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:191

 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 

-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:233

 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 

-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:625

 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 

-#: src/fs/gnunet-download.c:189
+#: src/fs/gnunet-download.c:246

 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 

-#: src/fs/gnunet-download.c:196
+#: src/fs/gnunet-download.c:253

 msgid "Target filename must be specified.\n"
 msgstr ""
 
 msgid "Target filename must be specified.\n"
 msgstr ""
 

-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:603

 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:285

 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 

-#: src/fs/gnunet-download.c:250
+#: src/fs/gnunet-download.c:307

 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 

-#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:288

 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 

-#: src/fs/gnunet-download.c:256
+#: src/fs/gnunet-download.c:313

 msgid "write the file to FILENAME"
 msgstr ""
 
 msgid "write the file to FILENAME"
 msgstr ""
 

-#: src/fs/gnunet-download.c:260
+#: src/fs/gnunet-download.c:317

 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 

-#: src/fs/gnunet-download.c:264
+#: src/fs/gnunet-download.c:321

 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 

-#: src/fs/gnunet-download.c:267
+#: src/fs/gnunet-download.c:324

 msgid "download a GNUnet directory recursively"
 msgstr ""
 
 msgid "download a GNUnet directory recursively"
 msgstr ""
 

-#: src/fs/gnunet-download.c:277
+#: src/fs/gnunet-download.c:338

 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"


@@ -2278,73 +2434,60 @@ msgstr ""
 msgid "print a list of all indexed files"
 msgstr ""
 
 msgid "print a list of all indexed files"
 msgstr ""
 

-#: src/fs/gnunet-fs.c:124
+#: src/fs/gnunet-fs.c:128

 msgid "Special file-sharing operations"
 msgstr ""
 
 msgid "Special file-sharing operations"
 msgstr ""
 

-#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:161

 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 

-#: src/fs/gnunet-pseudonym.c:165
-#, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: 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"
 
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s：选项“%s”有歧义\n"
 

-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:272
+#: src/fs/gnunet-pseudonym.c:282

 msgid "create or advertise namespace NAME"
 msgstr ""
 
 msgid "create or advertise namespace NAME"
 msgstr ""
 

-#: src/fs/gnunet-pseudonym.c:275
+#: src/fs/gnunet-pseudonym.c:285

 msgid "delete namespace NAME "
 msgstr ""
 
 msgid "delete namespace NAME "
 msgstr ""
 

-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/gnunet-pseudonym.c:288

 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 

-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:698

 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 

-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:295

 msgid "print names of local namespaces"
 msgstr ""
 
 msgid "print names of local namespaces"
 msgstr ""
 

-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:298

 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 

-#: src/fs/gnunet-pseudonym.c:291
+#: src/fs/gnunet-pseudonym.c:301

 msgid "do not print names of remote namespaces"
 msgstr ""
 
 msgid "do not print names of remote namespaces"
 msgstr ""
 

-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
-msgid "set the desired replication LEVEL"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:307

 msgid "specify ID of the root of the namespace"
 msgstr ""
 
 msgid "specify ID of the root of the namespace"
 msgstr ""
 

-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:310

 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 

-#: src/fs/gnunet-pseudonym.c:308
+#: src/fs/gnunet-pseudonym.c:322

 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 


@@ -2368,167 +2511,150 @@ msgstr ""
 msgid "URI is `%s'.\n"
 msgstr ""
 
 msgid "URI is `%s'.\n"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:187
+#: src/fs/gnunet-publish.c:188

 msgid "Cleanup after abort complete.\n"
 msgstr ""
 
 msgid "Cleanup after abort complete.\n"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:306

 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:308

 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 

-#: src/fs/gnunet-publish.c:352
+#: src/fs/gnunet-publish.c:359 src/fs/gnunet-publish.c:613

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Failed to create namespace `%s'\n"
+msgid "Failed to create namespace `%s' (illegal filename?)\n"

 msgstr "发送消息失败。\n"
 
 msgstr "发送消息失败。\n"
 

-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:434

 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 

-#: src/fs/gnunet-publish.c:454
+#: src/fs/gnunet-publish.c:461

 msgid "Could not start publishing.\n"
 msgstr ""
 
 msgid "Could not start publishing.\n"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:485
+#: src/fs/gnunet-publish.c:492

 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/fs/gnunet-publish.c:487
+#: src/fs/gnunet-publish.c:494

 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 

-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:499

 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-publish.c:504

 msgid "Preprocessing complete.\n"
 msgstr ""
 
 msgid "Preprocessing complete.\n"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:501
+#: src/fs/gnunet-publish.c:508

 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:512

 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:519

 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "未知错误。\n"
 
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "未知错误。\n"
 

-#: src/fs/gnunet-publish.c:546
+#: src/fs/gnunet-publish.c:553

 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:560

 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:566

 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:574 src/vpn/gnunet-vpn.c:214

 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
-#: src/transport/gnunet-transport.c:530
+#: src/fs/gnunet-publish.c:584 src/fs/gnunet-publish.c:591
+#: src/transport/gnunet-transport.c:624

 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:606
-#, fuzzy, c-format
-msgid "Could not create namespace `%s'\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/fs/gnunet-publish.c:639
+#: src/fs/gnunet-publish.c:646

 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/fs/gnunet-publish.c:651
+#: src/fs/gnunet-publish.c:658

 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:676
-msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:679
-msgid "do not use libextractor to add keywords or metadata"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-publish.c:690

 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-publish.c:694

 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:701

 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-publish.c:706

 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:703
-msgid "specify the priority of the content"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:714

 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:720

 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:724

 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:728

 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 

-#: src/fs/gnunet-publish.c:736
+#: src/fs/gnunet-publish.c:747

 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 


@@ -2562,7 +2688,7 @@ msgstr ""
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 

-#: src/fs/gnunet-search.c:308
+#: src/fs/gnunet-search.c:312

 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 


@@ -2575,101 +2701,90 @@ msgid "# Loopback routes suppressed"
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297

-#: src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
+#: src/topology/gnunet-daemon-topology.c:1330
+#: src/topology/gnunet-daemon-topology.c:1337

 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
-#: src/topology/gnunet-daemon-topology.c:654
-#: src/topology/gnunet-daemon-topology.c:756
-#: src/transport/gnunet-service-transport_neighbours.c:960
-#: src/transport/gnunet-service-transport_neighbours.c:1289
-#: src/transport/gnunet-service-transport_neighbours.c:1841
-#: src/transport/gnunet-service-transport_neighbours.c:2499
-#: src/transport/gnunet-service-transport_neighbours.c:2566
-msgid "# peers connected"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_cp.c:696
+#: src/fs/gnunet-service-fs_cp.c:703

 msgid "# migration stop messages received"
 msgstr ""
 
 msgid "# migration stop messages received"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:700
+#: src/fs/gnunet-service-fs_cp.c:707

 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:735
+#: src/fs/gnunet-service-fs_cp.c:742

 msgid "# replies transmitted to other peers"
 msgstr ""
 
 msgid "# replies transmitted to other peers"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:741
+#: src/fs/gnunet-service-fs_cp.c:748

 msgid "# replies dropped"
 msgstr ""
 
 msgid "# replies dropped"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:766 src/fs/gnunet-service-fs_cp.c:1324
+#: src/fs/gnunet-service-fs_cp.c:773 src/fs/gnunet-service-fs_cp.c:1331

 msgid "# P2P searches active"
 msgstr ""
 
 msgid "# P2P searches active"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:858
+#: src/fs/gnunet-service-fs_cp.c:865

 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:911
+#: src/fs/gnunet-service-fs_cp.c:918

 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:919
+#: src/fs/gnunet-service-fs_cp.c:926

 msgid "# replies received for other peers"
 msgstr ""
 
 msgid "# replies received for other peers"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:933
+#: src/fs/gnunet-service-fs_cp.c:940

 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:971
+#: src/fs/gnunet-service-fs_cp.c:978

 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1038
+#: src/fs/gnunet-service-fs_cp.c:1045

 msgid "# requests done for free (low load)"
 msgstr ""
 
 msgid "# requests done for free (low load)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1062
+#: src/fs/gnunet-service-fs_cp.c:1069

 msgid "# request dropped, priority insufficient"
 msgstr ""
 
 msgid "# request dropped, priority insufficient"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1072
+#: src/fs/gnunet-service-fs_cp.c:1079

 msgid "# requests done for a price (normal load)"
 msgstr ""
 
 msgid "# requests done for a price (normal load)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1151
+#: src/fs/gnunet-service-fs_cp.c:1158

 msgid "# GET requests received (from other peers)"
 msgstr ""
 
 msgid "# GET requests received (from other peers)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1185
+#: src/fs/gnunet-service-fs_cp.c:1192

 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1207
+#: src/fs/gnunet-service-fs_cp.c:1214

 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1267
+#: src/fs/gnunet-service-fs_cp.c:1274

 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1293
+#: src/fs/gnunet-service-fs_cp.c:1300

 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1322
+#: src/fs/gnunet-service-fs_cp.c:1329

 msgid "# P2P query messages received and processed"
 msgstr ""
 
 msgid "# P2P query messages received and processed"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_cp.c:1687
+#: src/fs/gnunet-service-fs_cp.c:1685

 msgid "# migration stop messages sent"
 msgstr ""
 
 msgid "# migration stop messages sent"
 msgstr ""
 


@@ -2725,8 +2840,8 @@ msgstr ""
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:362
-#: src/fs/gnunet-service-fs_lc.c:488
+#: 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 ""
 
 msgid "# client searches active"
 msgstr ""
 


@@ -2734,11 +2849,11 @@ msgstr ""
 msgid "# replies received for local clients"
 msgstr ""
 
 msgid "# replies received for local clients"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_lc.c:321
+#: src/fs/gnunet-service-fs_lc.c:323

 msgid "# client searches received"
 msgstr ""
 
 msgid "# client searches received"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_lc.c:356
+#: src/fs/gnunet-service-fs_lc.c:358

 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 


@@ -2770,8 +2885,8 @@ msgstr ""
 msgid "# requests refreshed"
 msgstr ""
 
 msgid "# requests refreshed"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:681
-#: src/fs/gnunet-service-fs_pe.c:748
+#: src/fs/gnunet-service-fs_pe.c:597 src/fs/gnunet-service-fs_pe.c:684
+#: src/fs/gnunet-service-fs_pe.c:751

 msgid "# query plan entries"
 msgstr ""
 
 msgid "# query plan entries"
 msgstr ""
 


@@ -2779,99 +2894,99 @@ msgstr ""
 msgid "# Pending requests created"
 msgstr ""
 
 msgid "# Pending requests created"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:616
+#: src/fs/gnunet-service-fs_pr.c:367 src/fs/gnunet-service-fs_pr.c:618

 msgid "# Pending requests active"
 msgstr ""
 
 msgid "# Pending requests active"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:779
+#: src/fs/gnunet-service-fs_pr.c:781

 msgid "# replies received and matched"
 msgstr ""
 
 msgid "# replies received and matched"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:808
+#: src/fs/gnunet-service-fs_pr.c:810

 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:822
+#: src/fs/gnunet-service-fs_pr.c:824

 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:835
+#: src/fs/gnunet-service-fs_pr.c:837

 msgid "# results found locally"
 msgstr ""
 
 msgid "# results found locally"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:953
+#: src/fs/gnunet-service-fs_pr.c:955

 msgid "# Datastore `PUT' failures"
 msgstr ""
 
 msgid "# Datastore `PUT' failures"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:980
+#: src/fs/gnunet-service-fs_pr.c:982

 msgid "# storage requests dropped due to high load"
 msgstr ""
 
 msgid "# storage requests dropped due to high load"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1015
+#: src/fs/gnunet-service-fs_pr.c:1017

 msgid "# Replies received from DHT"
 msgstr ""
 
 msgid "# Replies received from DHT"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1106
+#: src/fs/gnunet-service-fs_pr.c:1108

 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1127
+#: src/fs/gnunet-service-fs_pr.c:1129

 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1174
+#: src/fs/gnunet-service-fs_pr.c:1176

 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1188
+#: src/fs/gnunet-service-fs_pr.c:1190

 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1197
+#: src/fs/gnunet-service-fs_pr.c:1199

 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1213

 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1224
+#: src/fs/gnunet-service-fs_pr.c:1226

 msgid "# on-demand blocks matched requests"
 msgstr ""
 
 msgid "# on-demand blocks matched requests"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1237
+#: src/fs/gnunet-service-fs_pr.c:1239

 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1242
+#: src/fs/gnunet-service-fs_pr.c:1244

 msgid "# on-demand lookups failed"
 msgstr ""
 
 msgid "# on-demand lookups failed"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1269 src/fs/gnunet-service-fs_pr.c:1309
-#: src/fs/gnunet-service-fs_pr.c:1447
+#: src/fs/gnunet-service-fs_pr.c:1271 src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1449

 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1327
+#: src/fs/gnunet-service-fs_pr.c:1329

 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1338
+#: src/fs/gnunet-service-fs_pr.c:1340

 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1424
+#: src/fs/gnunet-service-fs_pr.c:1426

 msgid "# Datastore lookups initiated"
 msgstr ""
 
 msgid "# Datastore lookups initiated"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1510

 msgid "# GAP PUT messages received"
 msgstr ""
 
 msgid "# GAP PUT messages received"
 msgstr ""
 

-#: src/fs/gnunet-service-fs_pr.c:1601 src/fs/gnunet-service-fs_pr.c:1610
+#: src/fs/gnunet-service-fs_pr.c:1603 src/fs/gnunet-service-fs_pr.c:1612

 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "配置文件“%s”已写入。\n"
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "配置文件“%s”已写入。\n"


@@ -2906,235 +3021,379 @@ msgstr ""
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
 msgid "Could not start unindex operation.\n"
 msgstr ""
 

-#: src/fs/gnunet-unindex.c:176
+#: src/fs/gnunet-unindex.c:180

 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 

-#: src/fs/plugin_block_fs.c:131
+#: src/fs/plugin_block_fs.c:130

 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 

-#: src/gns/gns_api.c:221
+#: src/gns/gnunet-gns.c:267
+#, c-format
+msgid "Key file `%s' for private zone does not exist!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:289

 #, fuzzy
 #, fuzzy

-msgid "Failed to connect to the GNS service!\n"
+msgid "Failed to connect to GNS\n"

 msgstr "初始化“%s”服务失败。\n"
 
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/gns/gnunet-gns-lookup.c:210
-msgid "Issue a request to the GNUnet Naming System, prints results."
-msgstr ""
+#: src/gns/gnunet-gns.c:358
+#, fuzzy
+msgid "try to shorten a given name"
+msgstr "初始化“%s”服务失败。\n"

 
 

-#: 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"
+#: src/gns/gnunet-gns.c:361
+msgid "Lookup a record for the given name"

 msgstr ""
 
 msgstr ""
 

-#: src/hostlist/gnunet-daemon-hostlist.c:317
-msgid "advertise our hostlist to other peers"
+#: src/gns/gnunet-gns.c:364
+msgid "Get the authority of a particular name"

 msgstr ""
 
 msgstr ""
 

-#: src/hostlist/gnunet-daemon-hostlist.c:322
-msgid ""
-"bootstrap using hostlists (it is highly recommended that you always use this "
-"option)"
+#: src/gns/gnunet-gns.c:367
+msgid "Specify the type of the record to lookup"

 msgstr ""
 
 msgstr ""
 

-#: src/hostlist/gnunet-daemon-hostlist.c:325
-msgid "enable learning about hostlist servers from other peers"
+#: src/gns/gnunet-gns.c:370
+msgid "No unneeded output"

 msgstr ""
 
 msgstr ""
 

-#: src/hostlist/gnunet-daemon-hostlist.c:329
-msgid "provide a hostlist server"
+#: src/gns/gnunet-gns.c:384
+msgid "GNUnet GNS access tool"

 msgstr ""
 
 msgstr ""
 

-#: src/hostlist/gnunet-daemon-hostlist.c:341
-msgid "GNUnet hostlist server and client"
-msgstr ""
+#: src/gns/gnunet-gns-fcfsd.c:280
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "未知的命令“%s”。\n"

 
 

-#: src/hostlist/hostlist-client.c:286
-msgid "# bytes downloaded from hostlist servers"
-msgstr ""
+#: src/gns/gnunet-gns-fcfsd.c:333
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"

 
 

-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
-msgid "# invalid HELLOs downloaded from hostlist servers"
+#: src/gns/gnunet-gns-fcfsd.c:377
+#, c-format
+msgid "Found existing name `%s' for the given key\n"

 msgstr ""
 
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/gns/gnunet-gns-fcfsd.c:439

 #, c-format
 #, c-format

-msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgid "Found %u existing records for domain `%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:330
-msgid "# valid HELLOs downloaded from hostlist servers"
-msgstr ""
+#: src/gns/gnunet-gns-fcfsd.c:498
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "发送消息失败。\n"

 
 

-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
-#, c-format
-msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
-msgstr ""
+#: src/gns/gnunet-gns-fcfsd.c:514
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"

 
 

-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
-#: src/transport/plugin_transport_http_client.c:108
-#: src/transport/plugin_transport_http_client.c:123
-#, c-format
-msgid "%s failed at %s:%d: `%s'\n"
+#: src/gns/gnunet-gns-fcfsd.c:550
+msgid "Domain name must not contain `.'\n"

 msgstr ""
 
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
-msgid "# advertised hostlist URIs"
+#: src/gns/gnunet-gns-fcfsd.c:558
+msgid "Domain name must not contain `+'\n"

 msgstr ""
 
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:622
-#, c-format
-msgid "# advertised URI `%s' downloaded"
-msgstr ""
+#: src/gns/gnunet-gns-fcfsd.c:741 src/gns/gnunet-gns-fcfsd.c:753
+#, fuzzy, c-format
+msgid "Option `%s' not specified in configuration section `%s'\n"
+msgstr "配置文件“%s”已写入。\n"

 
 

-#: src/hostlist/hostlist-client.c:663
-#, c-format
+#: src/gns/gnunet-gns-fcfsd.c:763 src/namestore/gnunet-namestore.c:365
+#, fuzzy
+msgid "Failed to read or create private zone key\n"
+msgstr "无法为守护程序创建用户账户。"
+
+#: src/gns/gnunet-gns-fcfsd.c:773 src/namestore/gnunet-namestore.c:376
+#, fuzzy
+msgid "Failed to connect to namestore\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:789 src/gns/gnunet-gns-proxy.c:2901
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:823
+msgid "GNUnet GNS first come first serve registration service"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:2532
+#, fuzzy, c-format
+msgid "Unable to import private key from file `%s'\n"
+msgstr "无法创建用户账户："
+
+#: src/gns/gnunet-gns-proxy.c:2561
+#, fuzzy, c-format
+msgid "Unable to import certificate %s\n"
+msgstr "无法保存配置文件“%s”："
+
+#: src/gns/gnunet-gns-proxy.c:3578
+msgid "listen on specified port"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3581
+msgid "pem file to use as CA"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3596
+msgid "GNUnet GNS proxy"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:122
+msgid "Call with name of HELLO file to modify.\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:128
+#, fuzzy, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/hello/gnunet-hello.c:136
+#, c-format
+msgid "File `%s' is too big to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:143
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:153 src/hello/gnunet-hello.c:181
+#, fuzzy, c-format
+msgid "Error opening file `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/hello/gnunet-hello.c:169
+#, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:193
+#, fuzzy, c-format
+msgid "Error writing HELLO to file `%s': %s\n"
+msgstr "创建用户出错"
+
+#: 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/hostlist/gnunet-daemon-hostlist.c:317
+msgid "advertise our hostlist to other peers"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:322
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:325
+msgid "enable learning about hostlist servers from other peers"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:329
+msgid "provide a hostlist server"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist.c:344
+msgid "GNUnet hostlist server and client"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:289
+msgid "# bytes downloaded from hostlist servers"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
+msgid "# invalid HELLOs downloaded from hostlist servers"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
+#, c-format
+msgid "Invalid `%s' message received from hostlist at `%s'\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:331
+msgid "# valid HELLOs downloaded from hostlist servers"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
+#, c-format
+msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:473 src/hostlist/hostlist-client.c:683
+#: src/hostlist/hostlist-client.c:689 src/hostlist/hostlist-client.c:741
+#: src/hostlist/hostlist-client.c:750 src/hostlist/hostlist-client.c:871
+#: src/hostlist/hostlist-client.c:961 src/hostlist/hostlist-client.c:966
+#: src/transport/plugin_transport_http_client.c:110
+#: src/transport/plugin_transport_http_client.c:125
+#, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
+msgid "# advertised hostlist URIs"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:623
+#, c-format
+msgid "# advertised URI `%s' downloaded"
+msgstr ""
+
+#: src/hostlist/hostlist-client.c:664
+#, c-format

 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:805
+#: src/hostlist/hostlist-client.c:802

 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:822
+#: src/hostlist/hostlist-client.c:816

 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:836

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"

 
 

-#: src/hostlist/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842

 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:856
+#: src/hostlist/hostlist-client.c:850

 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:909
+#: src/hostlist/hostlist-client.c:903

 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:911

 msgid "# hostlist downloads initiated"
 msgstr ""
 
 msgid "# hostlist downloads initiated"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505

 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1054
+#: src/hostlist/hostlist-client.c:1046

 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1092
+#: src/hostlist/hostlist-client.c:1084

 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1096
+#: src/hostlist/hostlist-client.c:1088

 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
+#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127

 msgid "# active connections"
 msgstr ""
 
 msgid "# active connections"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1253
+#: src/hostlist/hostlist-client.c:1242

 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1284
+#: src/hostlist/hostlist-client.c:1273

 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1290
+#: src/hostlist/hostlist-client.c:1279

 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1283

 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1305
+#: src/hostlist/hostlist-client.c:1294

 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 

-#: src/hostlist/hostlist-client.c:1338
+#: src/hostlist/hostlist-client.c:1327

 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1340
+#: src/hostlist/hostlist-client.c:1329

 msgid "# hostlist URIs read from file"
 msgstr ""
 
 msgid "# hostlist URIs read from file"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1362

 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1387
+#: src/hostlist/hostlist-client.c:1376

 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 

-#: src/hostlist/hostlist-client.c:1392
+#: src/hostlist/hostlist-client.c:1381

 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422

 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1428
+#: src/hostlist/hostlist-client.c:1417

 msgid "# hostlist URIs written to file"
 msgstr ""
 
 msgid "# hostlist URIs written to file"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1470

 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/hostlist-client.c:1473

 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1482

 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1504
+#: src/hostlist/hostlist-client.c:1494

 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 

-#: src/hostlist/hostlist-client.c:1508
+#: src/hostlist/hostlist-client.c:1498

 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""


@@ -3147,8 +3406,10 @@ msgstr ""
 msgid "expired addresses encountered"
 msgstr ""
 
 msgid "expired addresses encountered"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:184
-#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
+#: src/peerinfo-tool/gnunet-peerinfo.c:403
+#: src/peerinfo-tool/gnunet-peerinfo.c:519
+#: src/topology/gnunet-daemon-topology.c:927

 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""


@@ -3157,246 +3418,599 @@ msgstr ""
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:221
+#: src/hostlist/hostlist-server.c:219

 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:269
+#: src/hostlist/hostlist-server.c:263

 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:266

 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:280
+#: src/hostlist/hostlist-server.c:273

 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:287
+#: src/hostlist/hostlist-server.c:279

 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:291
+#: src/hostlist/hostlist-server.c:283

 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/hostlist-server.c:291

 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:294

 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:306
+#: src/hostlist/hostlist-server.c:298

 msgid "Received request for our hostlist\n"
 msgstr ""
 
 msgid "Received request for our hostlist\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:307
+#: src/hostlist/hostlist-server.c:299

 msgid "hostlist requests processed"
 msgstr ""
 
 msgid "hostlist requests processed"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:350
+#: src/hostlist/hostlist-server.c:341

 msgid "# hostlist advertisements send"
 msgstr ""
 
 msgid "# hostlist advertisements send"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:397
+#: src/hostlist/hostlist-server.c:388

 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:565
+#: src/hostlist/hostlist-server.c:561

 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:574
+#: src/hostlist/hostlist-server.c:570

 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:588
+#: src/hostlist/hostlist-server.c:584

 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 

-#: src/hostlist/hostlist-server.c:626
+#: src/hostlist/hostlist-server.c:624
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/hostlist-server.c:666

 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 

-#: src/mesh/gnunet-service-mesh.c:4595
+#: src/integration-tests/connection_watchdog.c:1001
+#, c-format
+msgid "Transport plugin: `%s' port %llu\n"
+msgstr ""
+
+#: src/integration-tests/connection_watchdog.c:1034
+#, fuzzy, c-format
+msgid "Found %u transport plugins: `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/integration-tests/connection_watchdog.c:1093
+msgid "Send ping messages to test connectivity (default == NO)"
+msgstr ""
+
+#: src/integration-tests/connection_watchdog.c:1103
+#: src/template/gnunet-template.c:71
+msgid "help text"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:7110

 msgid "Wrong CORE service\n"
 msgstr ""
 
 msgid "Wrong CORE service\n"
 msgstr ""
 

-#: src/mesh/gnunet-service-mesh.c:4789
-#, fuzzy
-msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
+#: src/mesh/gnunet-service-mesh.c:7328 src/mesh/gnunet-service-mesh.c:7340
+#: src/mesh/gnunet-service-mesh.c:7352 src/mesh/gnunet-service-mesh.c:7364
+#: src/mesh/gnunet-service-mesh.c:7376 src/mesh/gnunet-service-mesh.c:7388
+#: src/mesh/gnunet-service-mesh.c:7400 src/mesh/gnunet-service-mesh.c:7412
+#, fuzzy, c-format
+msgid "Mesh service is lacking key configuration settings (%s).  Exiting.\n"

 msgstr "立即保存配置？"
 
 msgstr "立即保存配置？"
 

-#: src/mesh/gnunet-service-mesh.c:4798
+#: src/mesh/gnunet-service-mesh.c:7424 src/mesh/gnunet-service-mesh.c:7435
+#, fuzzy, c-format
+msgid ""
+"Mesh service is lacking key configuration settings (%s). Using default "
+"(%u).\n"
+msgstr "立即保存配置？"
+
+#: src/mesh/gnunet-service-mesh.c:7446

 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/namestore/namestore_api.c:272 src/namestore/namestore_api.c:313
-msgid "Namestore added record successfully"
+#: src/mysql/mysql.c:174
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr ""
+
+#: src/mysql/mysql.c:181
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/namestore/gnunet-namestore.c:212
+#, c-format
+msgid "Adding record failed: %s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:243
+#, c-format
+msgid "Deleting record failed: %s\n"

 msgstr ""
 
 msgstr ""
 

-#: src/namestore/namestore_api.c:281 src/namestore/namestore_api.c:322
+#: src/namestore/gnunet-namestore.c:304
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:320
+msgid "for at least"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:321
+msgid "until"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:357
+#, c-format
+msgid "No options given\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:387
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
+#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
+#: src/namestore/gnunet-namestore.c:519
+#, fuzzy, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/namestore/gnunet-namestore.c:396 src/namestore/gnunet-namestore.c:420
+msgid "add/del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:409
+#, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:447
+#, fuzzy, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/namestore/gnunet-namestore.c:456
+#, c-format
+msgid ""
+"Deletion requires either absolute time, or no time at all. Got relative time "
+"`%s' instead.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:467 src/namestore/gnunet-namestore.c:479
+#: src/namestore/gnunet-namestore.c:498
+msgid "add"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:497
+#, fuzzy, c-format
+msgid "No valid expiration time for operation `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/namestore/gnunet-namestore.c:520
+msgid "del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:570
+#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/namestore/gnunet-namestore.c:611 src/transport/gnunet-transport.c:618
+#, fuzzy, c-format
+msgid "Service `%s' is not running\n"
+msgstr "服务已删除。\n"
+
+#: src/namestore/gnunet-namestore.c:622
+#, c-format
+msgid "Option `%s' not given, but I need a zone key file!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:627
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/namestore/gnunet-namestore.c:679
+msgid "add record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:682
+msgid "delete record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:685
+msgid "display records"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:688
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:691
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:694
+msgid "type of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:697
+msgid "URI to import into our zone"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:700
+msgid "value of the record to add/delete"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:703
+msgid "create or list public record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:706
+msgid "create or list non-authority record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:709
+msgid "filename with the zone key"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:720
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet 配置"
+
+#: src/namestore/gnunet-service-namestore.c:242
+#: src/namestore/gnunet-service-namestore.c:258
+#, fuzzy, c-format
+msgid "Failed to write zone key to file `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/namestore/gnunet-service-namestore.c:244
+msgid "file exists but reading key failed"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:260
+msgid "file exists with different key"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1519
+#, fuzzy
+msgid "Failed to find record to remove\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/namestore/gnunet-service-namestore.c:2133
+#, fuzzy, c-format
+msgid "Could not parse zone key file `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/namestore/gnunet-service-namestore.c:2223
+msgid "No directory to load zonefiles specified in configuration\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:2233
+#, c-format
+msgid "Creating directory `%s' for zone files failed!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:345

 msgid "Namestore failed to add record"
 msgstr ""
 
 msgid "Namestore failed to add record"
 msgstr ""
 

-#: src/nat/gnunet-nat-server.c:289
+#: src/namestore/namestore_api.c:371
+msgid "Namestore failed to add record\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:415
+#, fuzzy
+msgid "Failed to create new signature"
+msgstr "发送消息失败。\n"
+
+#: src/namestore/namestore_api.c:419
+msgid "Failed to put new set of records in database"
+msgstr ""
+
+#: src/namestore/namestore_api.c:423
+#, fuzzy
+msgid "Failed to remove records from database"
+msgstr "发送消息失败。\n"
+
+#: src/namestore/namestore_api.c:427
+#, fuzzy
+msgid "Failed to access database"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/namestore/namestore_api.c:431
+#, fuzzy
+msgid "unknown internal error in namestore"
+msgstr "未知错误。\n"
+
+#: src/namestore/namestore_api.c:436
+msgid "Protocol error"
+msgstr ""
+
+#: src/namestore/plugin_namestore_postgres.c:95
+#, fuzzy
+msgid "Failed to create indices\n"
+msgstr "发送消息失败。\n"
+
+#: src/nat/gnunet-nat-server.c:279

 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 

-#: src/nat/gnunet-nat-server.c:328
+#: src/nat/gnunet-nat-server.c:321

 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 

-#: src/nat/nat.c:803
+#: src/nat/nat.c:799

 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 

-#: src/nat/nat.c:852
+#: src/nat/nat.c:844

 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败：%s %d\n"
 

-#: src/nat/nat.c:1121
+#: src/nat/nat.c:1111

 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "保存配置失败。"
 
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "保存配置失败。"
 

-#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#: src/nat/nat.c:1177 src/nat/nat.c:1187

 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
 #, 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
+#: src/nat/nat.c:1321

 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 

-#: src/nat/nat.c:1341
+#: src/nat/nat.c:1332

 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 

-#: src/nat/nat_test.c:348
+#: src/nat/nat_test.c:341

 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 

-#: src/nat/nat_test.c:418
+#: src/nat/nat_test.c:411

 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 

-#: src/nse/gnunet-nse-profiler.c:926
+#: src/nse/gnunet-nse-profiler.c:915

 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 

-#: src/nse/gnunet-service-nse.c:936
+#: src/nse/gnunet-service-nse.c:925

 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 

-#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
-#: src/nse/gnunet-service-nse.c:1431
+#: src/nse/gnunet-service-nse.c:1381 src/nse/gnunet-service-nse.c:1400
+#: src/nse/gnunet-service-nse.c:1421

 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 

-#: src/nse/gnunet-service-nse.c:1398
+#: src/nse/gnunet-service-nse.c:1388

 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 

-#: src/nse/gnunet-service-nse.c:1419
+#: src/nse/gnunet-service-nse.c:1409

 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/peerinfo/gnunet-service-peerinfo.c:133
+#: src/peerinfo/gnunet-service-peerinfo.c:134

 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 

-#: src/peerinfo/gnunet-service-peerinfo.c:195
+#: src/peerinfo/gnunet-service-peerinfo.c:228
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:267

 msgid "# peers known"
 msgstr ""
 
 msgid "# peers known"
 msgstr ""
 

-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/peerinfo/gnunet-service-peerinfo.c:292

 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 

-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/peerinfo/gnunet-service-peerinfo.c:414

 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 

-#: src/peerinfo/peerinfo_api.c:279
-#, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/peerinfo/peerinfo_api.c:435
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/peerinfo/gnunet-service-peerinfo.c:800
+#, c-format
+msgid "Importing HELLOs from `%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
-msgid "Received invalid message from `PEERINFO' service.\n"
+#: src/peerinfo/peerinfo_api.c:239
+msgid "aborted due to explicit disconnect request"

 msgstr ""
 
 msgstr ""
 

-#: src/peerinfo/peerinfo_api.c:523
+#: src/peerinfo/peerinfo_api.c:359

 #, fuzzy
 #, fuzzy

-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgid "failed to transmit request (service down?)"

 msgstr "初始化“%s”服务失败。\n"
 
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+#: src/peerinfo/peerinfo_api.c:509
+msgid "Failed to receive response from `PEERINFO' service."

 msgstr ""
 
 msgstr ""
 

-#: src/peerinfo/peerinfo_api_notify.c:258
+#: 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/peerinfo/peerinfo_api.c:681
+#, fuzzy
+msgid "Timeout transmitting iteration request to `PEERINFO' service."
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/peerinfo/peerinfo_api_notify.c:256

 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/peerinfo-tool/gnunet-peerinfo.c:581
+#, fuzzy
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "保存配置失败。"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:589
+#, fuzzy
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "保存配置失败。"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:608
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:625
+#, c-format
+msgid "Plugin `%s' not found\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:634
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#, fuzzy, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:685
+#, c-format
+msgid "Failure adding HELLO: %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:833

 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/peerinfo-tool/gnunet-peerinfo.c:840

 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#: src/peerinfo-tool/gnunet-peerinfo.c:899

 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:255
+#: src/peerinfo-tool/gnunet-peerinfo.c:936
+msgid "don't resolve host names"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:939

 msgid "output only the identity strings"
 msgstr ""
 
 msgid "output only the identity strings"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:942

 msgid "output our own identity only"
 msgstr ""
 
 msgid "output our own identity only"
 msgstr ""
 

-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:945
+#, fuzzy
+msgid "list all known peers"
+msgstr "列出所有网络适配器"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:948
+msgid "also output HELLO uri(s)"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:951
+msgid "add given HELLO uri to the database"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:961

 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 

+#: 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/peerinfo-tool/gnunet-peerinfo_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:122
+#, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr ""
+
+#: 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/pt/gnunet-daemon-pt.c:264
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""


@@ -3451,692 +4065,549 @@ msgstr ""
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/pt/gnunet-daemon-pt.c:973
+#: src/pt/gnunet-daemon-pt.c:976

 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 

-#: src/statistics/gnunet-service-statistics.c:209
+#: src/statistics/gnunet-service-statistics.c:271

 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 

-#: src/statistics/gnunet-service-statistics.c:267
+#: src/statistics/gnunet-service-statistics.c:330

 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 

-#: src/statistics/gnunet-statistics.c:98
+#: src/statistics/gnunet-statistics.c:120

 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/statistics/gnunet-statistics.c:164
+#: src/statistics/gnunet-statistics.c:193
+#, c-format
+msgid "No subsystem or name given\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:201
+#, fuzzy, c-format
+msgid "Failed to initialize watch routine\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/statistics/gnunet-statistics.c:221

 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 

-#: src/statistics/gnunet-statistics.c:167
+#: src/statistics/gnunet-statistics.c:224

 msgid "make the value being set persistent"
 msgstr ""
 
 msgid "make the value being set persistent"
 msgstr ""
 

-#: src/statistics/gnunet-statistics.c:170
+#: src/statistics/gnunet-statistics.c:227

 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 

-#: src/statistics/gnunet-statistics.c:173
+#: src/statistics/gnunet-statistics.c:230

 msgid "just print the statistics value"
 msgstr ""
 
 msgid "just print the statistics value"
 msgstr ""
 

-#: src/statistics/gnunet-statistics.c:180
+#: src/statistics/gnunet-statistics.c:233
+msgid "watch value continuously"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:244

 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 

-#: src/statistics/statistics_api.c:390
+#: src/statistics/statistics_api.c:456

 #, fuzzy
 #, fuzzy

-msgid "Failed to connect to statistics service!\n"
+msgid "Could not save some persistent statistics\n"

 msgstr "初始化“%s”服务失败。\n"
 
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/template/gnunet-template.c:68
-msgid "help text"
+#: src/statistics/statistics_api.c:999
+msgid ""
+"Failed to receive acknowledgement from statistics service, some statistics "
+"might have been lost!\n"

 msgstr ""
 
 msgstr ""
 

-#: src/testing/gnunet-testing.c:157
-#, fuzzy
-msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/testbed/testbed_api.c:246
+#, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "“%s”以错误码 %d 失败：%s\n"

 
 

-#: src/testing/gnunet-testing.c:159
-#, c-format
-msgid "Specified hostkey file `%s' not found!\n"
-msgstr ""
+#: 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:273
+#: src/testing/gnunet-testing.c:202

 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
 
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
 

-#: src/testing/gnunet-testing.c:275
-msgid "create hostkey files from pre-computed hostkey list"
+#: src/testing/gnunet-testing.c:204
+msgid "extract hostkey file from pre-computed hostkey list"

 msgstr ""
 
 msgstr ""
 

-#: src/testing/gnunet-testing.c:277
-msgid "host key file"
-msgstr ""
-
-#: src/testing/gnunet-testing.c:279
+#: src/testing/gnunet-testing.c:206

 #, fuzzy
 #, fuzzy

-msgid "number of unique configuration files or hostkeys to create"
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"

 msgstr "打印配置文件中的一个值到标准输出"
 
 msgstr "打印配置文件中的一个值到标准输出"
 

-#: src/testing/gnunet-testing.c:281
+#: src/testing/gnunet-testing.c:208

 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
 
 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
 

-#: src/testing/gnunet-testing.c:287
+#: src/testing/gnunet-testing.c:218

 msgid "Command line tool to access the testing library"
 msgstr ""
 
 msgid "Command line tool to access the testing library"
 msgstr ""
 

-#: src/testing/helper.c:56
+#: src/testing/gnunet-testing-run-service.c:129
+#, c-format
+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/testing_old/helper.c:56

 #, fuzzy
 msgid "Peer is lacking HOSTKEY configuration setting.\n"
 msgstr "立即保存配置？"
 
 #, fuzzy
 msgid "Peer is lacking HOSTKEY configuration setting.\n"
 msgstr "立即保存配置？"
 

-#: src/testing/helper.c:64
+#: src/testing_old/helper.c:64

 #, fuzzy
 msgid "Could not access hostkey.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy
 msgid "Could not access hostkey.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/testing/testing.c:204
+#: src/testing_old/testing.c:200

 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 

-#: src/testing/testing.c:218 src/testing/testing.c:808
+#: src/testing_old/testing.c:214 src/testing_old/testing.c:798

 msgid "`scp' did not complete cleanly.\n"
 msgstr ""
 
 msgid "`scp' did not complete cleanly.\n"
 msgstr ""
 

-#: src/testing/testing.c:239
+#: src/testing_old/testing.c:237

 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/testing/testing.c:240
+#: src/testing_old/testing.c:238

 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/testing/testing.c:292
+#: src/testing_old/testing.c:286

 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/testing/testing.c:299
+#: src/testing_old/testing.c:293

 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/testing/testing.c:300 src/testing/testing.c:488
+#: src/testing_old/testing.c:294 src/testing_old/testing.c:471

 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/testing/testing.c:360
+#: src/testing_old/testing.c:354

 #, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 

-#: src/testing/testing.c:364
+#: src/testing_old/testing.c:358

 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 

-#: src/testing/testing.c:374
+#: src/testing_old/testing.c:368

 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "发送消息失败。\n"
 
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "发送消息失败。\n"
 

-#: src/testing/testing.c:406
+#: src/testing_old/testing.c:400

 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 

-#: src/testing/testing.c:480
+#: src/testing_old/testing.c:463

 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/testing/testing.c:487
+#: src/testing_old/testing.c:470

 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/testing/testing.c:509 src/testing/testing.c:612
+#: src/testing_old/testing.c:493 src/testing_old/testing.c:600

 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 

-#: src/testing/testing.c:510 src/testing/testing.c:613
-#: src/testing/testing.c:633
+#: src/testing_old/testing.c:494 src/testing_old/testing.c:601
+#: src/testing_old/testing.c:621

 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 

-#: src/testing/testing.c:582
+#: src/testing_old/testing.c:570

 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 

-#: src/testing/testing.c:632
+#: src/testing_old/testing.c:620

 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 

-#: src/testing/testing.c:653 src/testing/testing.c:685
+#: src/testing_old/testing.c:643 src/testing_old/testing.c:675

 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 

-#: src/testing/testing.c:668 src/testing/testing.c:723
+#: src/testing_old/testing.c:658 src/testing_old/testing.c:713

 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 

-#: src/testing/testing.c:796
+#: src/testing_old/testing.c:786

 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 

-#: src/testing/testing.c:966
+#: src/testing_old/testing.c:948

 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "卸载 GNUnet 服务"
 
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "卸载 GNUnet 服务"
 

-#: src/testing/testing.c:1237 src/testing/testing_group.c:6278
+#: src/testing_old/testing.c:1207 src/testing_old/testing_group.c:6172

 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 

-#: src/testing/testing.c:1322 src/testing/testing.c:1397
+#: src/testing_old/testing.c:1292 src/testing_old/testing.c:1359

 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "未知的用户“%s”\n"
 
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "未知的用户“%s”\n"
 

-#: src/testing/testing.c:1480
+#: src/testing_old/testing.c:1448

 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "卸载 GNUnet 服务"
 
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "卸载 GNUnet 服务"
 

-#: src/testing/testing.c:1610
+#: src/testing_old/testing.c:1601

 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 

-#: src/testing/testing.c:1618
+#: src/testing_old/testing.c:1609

 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "保存配置失败。"
 
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "保存配置失败。"
 

-#: src/testing/testing.c:1647
+#: src/testing_old/testing.c:1636

 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 

-#: src/testing/testing.c:1650
+#: src/testing_old/testing.c:1639

 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "保存配置失败。"
 
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "保存配置失败。"
 

-#: src/testing/testing.c:1805
+#: src/testing_old/testing.c:1794

 #, fuzzy
 msgid "Peers failed to connect"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr ""
 "\n"
 "按任意键继续\n"
 

-#: src/testing/testing.c:1933
+#: src/testing_old/testing.c:1922

 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "加载 sqstore 服务失败。检查您的配置！\n"
 
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "加载 sqstore 服务失败。检查您的配置！\n"
 

-#: src/testing/testing.c:2156
+#: src/testing_old/testing.c:2145

 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 

-#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
-#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
-#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
-#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
+#: src/testing_old/testing_group.c:1895 src/testing_old/testing_group.c:1907
+#: src/testing_old/testing_group.c:2009 src/testing_old/testing_group.c:2066
+#: src/testing_old/testing_group.c:2153 src/testing_old/testing_group.c:2173
+#: src/testing_old/testing_group.c:2303
+#: src/testing_old/testing_peergroup.c:950

 #, fuzzy, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
 #, fuzzy, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 

-#: src/testing/testing_group.c:1932
-#, c-format
-msgid "Target is %d connections per peer."
-msgstr ""
-
-#: src/testing/testing_group.c:2179
+#: src/testing_old/testing_group.c:2161

 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 

-#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
-#, c-format
-msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2246
-#, c-format
-msgid "natural log of %d is %d, will run %d iterations\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2249
-#, c-format
-msgid "Total connections added thus far: %u!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2290
-#, c-format
-msgid "Total connections added for small world: %d!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2342
-#, c-format
-msgid "rand is %f probability is %f\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#: src/testing_old/testing_group.c:2878 src/testing_old/testing_group.c:3064

 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 

-#: src/testing/testing_group.c:3020
-msgid "Finished copying all friend files!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3133
-#, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
-msgstr "“%s”以错误码 %s 失败：%s\n"
-
-#: src/testing/testing_group.c:3156
-#, fuzzy, c-format
-msgid "Copying file with command scp %s %s\n"
-msgstr "“%s”以错误码 %s 失败：%s\n"
-
-#: src/testing/testing_group.c:3173
-#, c-format
-msgid "Checking copy status of file %d\n"
+#: src/testing_old/testing_group.c:3958
+msgid "Creating no allowed topology (all peers can connect at core level)\n"

 msgstr ""
 
 msgstr ""
 

-#: src/testing/testing_group.c:3191
-#, c-format
-msgid "File %d copied\n"
+#: src/testing_old/testing_group.c:5227
+msgid "Unknown topology specification, can't connect peers!\n"

 msgstr ""
 
 msgstr ""
 

-#: src/testing/testing_group.c:3206
-#, fuzzy
-msgid "Finished copying all blacklist files!\n"
-msgstr "æ\97 æ³\95解æ\9e\90â\80\9c%sâ\80\9d(%s)ï¼\9a%s\n"
+#: src/testing_old/testing_group.c:5962
+#, fuzzy, c-format
+msgid "Could not read hostkeys file `%s'!\n"
+msgstr "æ\89¾ä¸\8då\88°æ\8e¥å\8f£â\80\9c%sâ\80\9dç\9a\84ä¸\80个 IP å\9c°å\9d\80ã\80\82\n"

 
 

-#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
-#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
-msgid "Delaying connect, we have too many outstanding connections!\n"
-msgstr ""
+#: src/testing_old/testing_group.c:6029
+#, fuzzy, c-format
+msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgstr "解析配置文件“%s”失败\n"

 
 

-#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
-#: src/testing/testing_group.c:5035
+#: src/testing/testing.c:188

 #, c-format
 #, c-format

-msgid "Creating connection, outstanding_connections is %d\n"
+msgid "Hostkeys file not found: %s\n"

 msgstr ""
 
 msgstr ""
 

-#: src/testing/testing_group.c:3608
+#: src/testing/testing.c:204

 #, c-format
 #, c-format

-msgid "Offering HELLO of peer %s to peer %s\n"
+msgid "Incorrect hostkey file format: %s\n"

 msgstr ""
 
 msgstr ""
 

-#: src/testing/testing_group.c:3734
+#: src/testing/testing.c:468

 #, c-format
 #, c-format

-msgid "Creating connection, outstanding_connections is %d (max %d)\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3988
-msgid "Creating clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3993
-msgid "Creating small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3998
-msgid "Creating small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4002
-msgid "Creating ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4006
-msgid "Creating 2d torus topology\n"
+msgid "Key number %u does not exist\n"

 msgstr ""
 
 msgstr ""
 

-#: src/testing/testing_group.c:4010
-msgid "Creating Erdos-Renyi topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4014
-msgid "Creating InterNAT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4018
-msgid "Creating Scale Free topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4023
-msgid "Creating straight line topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4027
-msgid "Creating topology from file!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4043
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4058
-msgid "Failed during friend file copying!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4064
-msgid "Friend files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4081
-msgid "Blacklisting all but clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4087
-msgid "Blacklisting all but small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4093
-msgid "Blacklisting all but small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4099
-msgid "Blacklisting all but ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4105
-msgid "Blacklisting all but 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4111
-msgid "Blacklisting all but Erdos-Renyi topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4117
-msgid "Blacklisting all but InterNAT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4152
-msgid "Blacklisting all but Scale Free topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4158
-msgid "Blacklisting all but straight line topology\n"
-msgstr ""
+#: src/testing/testing.c:477
+#, fuzzy, c-format
+msgid "Error while decoding key %u\n"
+msgstr "解析 dscl 输出时出错。\n"

 
 

-#: src/testing/testing_group.c:4173
+#: src/testing/testing.c:788

 #, fuzzy
 #, fuzzy

-msgid "Failed during blacklist file copying!\n"
+msgid "Failed to create configuration for peer (not enough free ports?)\n"

 msgstr "解析配置文件“%s”失败\n"
 
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/testing/testing_group.c:4179
-msgid "Blacklist files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5263
-msgid "Creating clique CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5270
-msgid "Creating small world (ring) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5277
-msgid "Creating small world (2d-torus) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5283
-msgid "Creating ring CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5290
-msgid "Creating 2d torus CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5297
-msgid "Creating Erdos-Renyi CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5304
-msgid "Creating InterNAT CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5311
-msgid "Creating Scale Free CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5318
-msgid "Creating straight line CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5324
-msgid "Creating no CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5330
-msgid "Unknown topology specification, can't connect peers!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5340
+#: src/testing/testing.c:799

 #, c-format
 #, c-format

-msgid "Connecting random subset (%'.2f percent) of possible peers\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5348
-#, c-format
-msgid "Connecting a minimum of %u peers each (if possible)\n"
+msgid ""
+"You attempted to create a testbed with more than %u hosts.  Please "
+"precompute more hostkeys first.\n"

 msgstr ""
 
 msgstr ""
 

-#: src/testing/testing_group.c:5357
-#, c-format
-msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing.c:813
+#, fuzzy, c-format
+msgid "Failed to initialize hostkey for peer %u\n"
+msgstr "初始化“%s”服务失败。\n"

 
 

-#: src/testing/testing_group.c:5367
-#, c-format
-msgid "Finding additional %u closest peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing.c:846
+#, fuzzy, c-format
+msgid "Failed to write hostkey file for peer %u: %s\n"
+msgstr "发送消息失败。\n"

 
 

-#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:650
-#, fuzzy
-msgid "Could not read hostkeys file!\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/testing/testing.c:864
+#, fuzzy, c-format
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgstr "解析配置文件“%s”失败\n"

 
 

-#: src/testing/testing_group.c:6131
+#: src/testing/testing.c:925

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgid "Failed to start `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/testing/testing.c:1088
+#, fuzzy, c-format
+msgid "Failed to load configuration from %s\n"

 msgstr "解析配置文件“%s”失败\n"
 
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/topology/gnunet-daemon-topology.c:244
+#: src/topology/gnunet-daemon-topology.c:259

 msgid "# peers blacklisted"
 msgstr ""
 
 msgid "# peers blacklisted"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:380
+#: src/topology/gnunet-daemon-topology.c:392

 msgid "# connect requests issued to transport"
 msgstr ""
 
 msgid "# connect requests issued to transport"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:675
-#: src/topology/gnunet-daemon-topology.c:761
+#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:815

 msgid "# friends connected"
 msgstr ""
 
 msgid "# friends connected"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:950
+#: src/topology/gnunet-daemon-topology.c:996

 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:982
+#: src/topology/gnunet-daemon-topology.c:1026

 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:994
+#: src/topology/gnunet-daemon-topology.c:1039

 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1000
+#: src/topology/gnunet-daemon-topology.c:1045

 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/topology/gnunet-daemon-topology.c:1054

 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1017
+#: src/topology/gnunet-daemon-topology.c:1062

 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1037
+#: src/topology/gnunet-daemon-topology.c:1082

 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:1095

 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1060
+#: src/topology/gnunet-daemon-topology.c:1105

 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 

-#: src/topology/gnunet-daemon-topology.c:1066
+#: src/topology/gnunet-daemon-topology.c:1111

 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1076
+#: src/topology/gnunet-daemon-topology.c:1121

 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 

-#: src/topology/gnunet-daemon-topology.c:1082
+#: src/topology/gnunet-daemon-topology.c:1127

 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1089
+#: src/topology/gnunet-daemon-topology.c:1134

 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1169

 msgid "# HELLO messages received"
 msgstr ""
 
 msgid "# HELLO messages received"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1183
+#: src/topology/gnunet-daemon-topology.c:1224

 msgid "# HELLO messages gossipped"
 msgstr ""
 
 msgid "# HELLO messages gossipped"
 msgstr ""
 

-#: src/topology/gnunet-daemon-topology.c:1323
+#: src/topology/gnunet-daemon-topology.c:1366

 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/transport/gnunet-service-transport_blacklist.c:246

 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 

-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/transport/gnunet-service-transport_blacklist.c:252

 #, c-format
 msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
 #, c-format
 msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/transport/gnunet-service-transport_blacklist.c:263

 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/transport/gnunet-service-transport_blacklist.c:284
+#: src/transport/gnunet-service-transport_blacklist.c:308

 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 

-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:331

 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_blacklist.c:350
+#: src/transport/gnunet-service-transport_blacklist.c:345

 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
 #, 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_blacklist.c:364
+#: src/transport/gnunet-service-transport_blacklist.c:359

 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_blacklist.c:523
-#: src/transport/gnunet-service-transport_blacklist.c:764
+#: src/transport/gnunet-service-transport_blacklist.c:514
+#: src/transport/gnunet-service-transport_blacklist.c:751

 msgid "# disconnects due to blacklist"
 msgstr ""
 
 msgid "# disconnects due to blacklist"
 msgstr ""
 

-#: src/transport/gnunet-service-transport.c:158
+#: src/transport/gnunet-service-transport.c:167

 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 

-#: src/transport/gnunet-service-transport.c:572
+#: src/transport/gnunet-service-transport.c:242
+msgid "# bytes total received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:289
+msgid "# bytes payload received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:590

 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport.c:581
+#: src/transport/gnunet-service-transport.c:599

 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_clients.c:353
+#: src/transport/gnunet-service-transport_clients.c:352

 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_clients.c:358
+#: src/transport/gnunet-service-transport_clients.c:357

 msgid "# messages dropped due to slow client"
 msgstr ""
 
 msgid "# messages dropped due to slow client"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_clients.c:510
+#: src/transport/gnunet-service-transport_clients.c:509

 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_clients.c:628
-msgid "# bytes payload received for other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:645
+#: src/transport/gnunet-service-transport_clients.c:637

 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_clients.c:696
+#: src/transport/gnunet-service-transport_clients.c:688

 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 


@@ -4144,306 +4615,295 @@ msgstr ""
 msgid "# refreshed my HELLO"
 msgstr ""
 
 msgid "# refreshed my HELLO"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:482
-msgid "# failed connection attempts due to timeout"
+#: src/transport/gnunet-service-transport_neighbours.c:1040
+msgid "# DISCONNECT messages sent"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:883
-msgid "# peers disconnected due to external request"
+#: src/transport/gnunet-service-transport_neighbours.c:1157
+#: src/transport/gnunet-service-transport_neighbours.c:1494
+msgid "# bytes in message queue for other peers"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:966
-#, fuzzy
-msgid "# fast reconnects failed"
+#: src/transport/gnunet-service-transport_neighbours.c:1162
+msgid "# messages transmitted to other peers"

 msgstr ""
 msgstr ""

-"\n"
-"按任意键继续\n"

 
 

-#: src/transport/gnunet-service-transport_neighbours.c:1022
-msgid "# peers disconnected due to timeout"
+#: src/transport/gnunet-service-transport_neighbours.c:1167
+msgid "# transmission failures for messages to other peers"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1224
+msgid "# messages timed out while in transport queue"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1266

 msgid "# keepalives sent"
 msgstr ""
 
 msgid "# keepalives sent"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1088
-msgid "# peers disconnected due to global disconnect"
+#: src/transport/gnunet-service-transport_neighbours.c:1290
+msgid "# KEEPALIVE messages discarded (peer unknown)"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1888
-#: src/transport/gnunet-service-transport_neighbours.c:1909
-msgid "# messages not sent (no such peer or not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1298
+msgid "# KEEPALIVE messages discarded (no session)"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1925
-msgid "# bytes in message queue for other peers"
+#: src/transport/gnunet-service-transport_neighbours.c:1335
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:1977
+#: src/transport/gnunet-service-transport_neighbours.c:1344
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1400

 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2013
+#: src/transport/gnunet-service-transport_neighbours.c:1434

 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2031
+#: src/transport/gnunet-service-transport_neighbours.c:1450

 msgid "# ms throttling suggested"
 msgstr ""
 
 msgid "# ms throttling suggested"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2060
-msgid "# KEEPALIVE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:2596
+msgid "# unexpected CONNECT_ACK messages (no peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2611
+#: src/transport/gnunet-service-transport_neighbours.c:2645
+msgid "# unexpected CONNECT_ACK messages (not ready)"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2113
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:2658
+msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2121
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+#: src/transport/gnunet-service-transport_neighbours.c:2691
+msgid "# unexpected CONNECT_ACK messages (disconnecting)"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2187
+#: src/transport/gnunet-service-transport_neighbours.c:2875
+msgid "# unexpected SESSION ACK messages"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2930

 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2205
+#: src/transport/gnunet-service-transport_neighbours.c:2944

 msgid "# disconnects due to quota of 0"
 msgstr ""
 
 msgid "# disconnects due to quota of 0"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2323
+#: src/transport/gnunet-service-transport_neighbours.c:2975

 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2336
+#: src/transport/gnunet-service-transport_neighbours.c:2986

 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2411
-msgid "# unexpected CONNECT_ACK messages (no peer)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:2453
-msgid "# unexpected CONNECT_ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3017
+msgid "# other peer asked to disconnect from us"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-service-transport_neighbours.c:2544
-msgid "# unexpected ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3112
+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 ""
 
 msgstr ""
 
 #: src/transport/gnunet-service-transport_plugins.c:111
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_plugins.c:118
-#, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_plugins.c:122
-#, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_plugins.c:150
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/transport/gnunet-service-transport_validation.c:410
+#: src/transport/gnunet-service-transport_validation.c:415

 msgid "# address records discarded"
 msgstr ""
 
 msgid "# address records discarded"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:459
+#: src/transport/gnunet-service-transport_validation.c:464

 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:508
+#: src/transport/gnunet-service-transport_validation.c:513

 msgid "# PING without HELLO messages sent"
 msgstr ""
 
 msgid "# PING without HELLO messages sent"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:566
+#: src/transport/gnunet-service-transport_validation.c:571

 msgid "# address revalidations started"
 msgstr ""
 
 msgid "# address revalidations started"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:798
+#: src/transport/gnunet-service-transport_validation.c:807

 msgid "# PING message for different peer received"
 msgstr ""
 
 msgid "# PING message for different peer received"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:833
+#: src/transport/gnunet-service-transport_validation.c:872

 #, c-format
 #, c-format

-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
+msgid "Received a PING message with validation bug from `%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:919
+#: src/transport/gnunet-service-transport_validation.c:1001

 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:1010

 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1135

 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1164

 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 

-#: src/transport/gnunet-service-transport_validation.c:1134
+#: src/transport/gnunet-service-transport_validation.c:1218

 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:256
+#: src/transport/gnunet-transport.c:265

 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:269
+#: src/transport/gnunet-transport.c:278

 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:319
+#: src/transport/gnunet-transport.c:328

 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:326
+#: src/transport/gnunet-transport.c:335

 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:359
+#: src/transport/gnunet-transport.c:374

 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:379
+#: src/transport/gnunet-transport.c:394

 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/transport/gnunet-transport.c:410
+#: src/transport/gnunet-transport.c:426

 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/transport/gnunet-transport.c:439
+#: src/transport/gnunet-transport.c:506

 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:453
+#: src/transport/gnunet-transport.c:529

 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 

-#: src/transport/gnunet-transport.c:483
+#: src/transport/gnunet-transport.c:536
+#, c-format
+msgid "Peer `%s': %s <unable to resolve address>\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:564

 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr ""
 "\n"
 "按任意键继续\n"
 

-#: src/transport/gnunet-transport.c:539
+#: src/transport/gnunet-transport.c:633

 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/transport/gnunet-transport.c:587
+#: src/transport/gnunet-transport.c:716

 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:590
+#: src/transport/gnunet-transport.c:719

 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:722

 msgid "provide information about all current connections (once)"
 msgstr ""
 
 msgid "provide information about all current connections (once)"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:596
-msgid "provide information about all current connections (continuously)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:599
+#: src/transport/gnunet-transport.c:728

 msgid "do not resolve hostnames"
 msgstr ""
 
 msgid "do not resolve hostnames"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:603
+#: src/transport/gnunet-transport.c:732

 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:606
+#: src/transport/gnunet-transport.c:735

 msgid "test transport configuration (involves external server)"
 msgstr ""
 
 msgid "test transport configuration (involves external server)"
 msgstr ""
 

-#: src/transport/gnunet-transport.c:614
+#: src/transport/gnunet-transport.c:746

 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/transport/plugin_transport_http.c:981
+#: src/transport/plugin_transport_http.c:1119

 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http.c:1029
+#: src/transport/plugin_transport_http.c:1168

 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 

-#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#: src/transport/plugin_transport_http.c:1200 src/util/service.c:1051

 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#: src/transport/plugin_transport_http.c:1217 src/util/service.c:1068

 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

-#: src/transport/plugin_transport_http.c:1176
+#: src/transport/plugin_transport_http.c:1322

 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http.c:1189
-#, c-format
-msgid "FREEING %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http.c:1264
+#: src/transport/plugin_transport_http.c:1407

 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http.c:1277
+#: src/transport/plugin_transport_http.c:1420

 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 

-#: src/transport/plugin_transport_http.c:1288
+#: src/transport/plugin_transport_http.c:1431

 msgid "Port 0, client only mode\n"
 msgstr ""
 
 msgid "Port 0, client only mode\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http.c:1308
+#: src/transport/plugin_transport_http.c:1451

 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
 #, 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:1338
+#: src/transport/plugin_transport_http.c:1481

 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "


@@ -4455,13 +4915,13 @@ msgstr ""
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:189
+#: src/transport/plugin_transport_http_server.c:178

 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 

-#: src/transport/plugin_transport_http_server.c:213
+#: src/transport/plugin_transport_http_server.c:202

 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 


@@ -4491,239 +4951,239 @@ msgstr ""
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr ""
 
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr ""
 

-#: src/transport/plugin_transport_smtp.c:801
+#: src/transport/plugin_transport_smtp.c:799

 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 

-#: src/transport/plugin_transport_smtp.c:813
+#: src/transport/plugin_transport_smtp.c:811

 msgid "# bytes received via SMTP"
 msgstr ""
 
 msgid "# bytes received via SMTP"
 msgstr ""
 

-#: src/transport/plugin_transport_smtp.c:814
+#: src/transport/plugin_transport_smtp.c:812

 msgid "# bytes sent via SMTP"
 msgstr ""
 
 msgid "# bytes sent via SMTP"
 msgstr ""
 

-#: src/transport/plugin_transport_smtp.c:816
+#: src/transport/plugin_transport_smtp.c:814

 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:512
+#: src/transport/plugin_transport_tcp.c:591

 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:616
-#: src/transport/plugin_transport_tcp.c:705
-#: src/transport/plugin_transport_tcp.c:757
-#: src/transport/plugin_transport_tcp.c:830
-#: src/transport/plugin_transport_tcp.c:909
+#: 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:1130
+#: src/transport/plugin_transport_tcp.c:1147

 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:622
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:1561
+#: src/transport/plugin_transport_tcp.c:774
+#: src/transport/plugin_transport_tcp.c:963
+#: src/transport/plugin_transport_tcp.c:1807
+#: src/transport/plugin_transport_tcp.c:2424

 msgid "# TCP sessions active"
 msgstr ""
 
 msgid "# TCP sessions active"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:709
+#: src/transport/plugin_transport_tcp.c:860

 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:909

 msgid "# bytes transmitted via TCP"
 msgstr ""
 
 msgid "# bytes transmitted via TCP"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:996

 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:1336

 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:1116
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1186
+#: src/transport/plugin_transport_tcp.c:1447

 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:1603
+#: src/transport/plugin_transport_tcp.c:1848

 msgid "# TCP WELCOME messages received"
 msgstr ""
 
 msgid "# TCP WELCOME messages received"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:1756
+#: src/transport/plugin_transport_tcp.c:2019

 msgid "# bytes received via TCP"
 msgstr ""
 
 msgid "# bytes received via TCP"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:1823
+#: src/transport/plugin_transport_tcp.c:2089

 msgid "# network-level TCP disconnect events"
 msgstr ""
 
 msgid "# network-level TCP disconnect events"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:946
+#: src/util/service.c:952

 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:1976
+#: src/transport/plugin_transport_tcp.c:2327

 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 

-#: src/transport/plugin_transport_tcp.c:2039
+#: src/transport/plugin_transport_tcp.c:2389

 #, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:2062
+#: src/transport/plugin_transport_tcp.c:2412

 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:2066
+#: src/transport/plugin_transport_tcp.c:2416

 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 

-#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2420

 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 

-#: src/transport/plugin_transport_udp_broadcasting.c:130
+#: src/transport/plugin_transport_udp_broadcasting.c:128

 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 

-#: src/transport/plugin_transport_udp_broadcasting.c:172
+#: src/transport/plugin_transport_udp_broadcasting.c:169

 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 

-#: src/transport/plugin_transport_udp_broadcasting.c:393
+#: src/transport/plugin_transport_udp_broadcasting.c:392

 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 

-#: src/transport/plugin_transport_udp.c:1985
+#: src/transport/plugin_transport_udp.c:1903
+#, c-format
+msgid ""
+"UDP could not transmit message to `%s': Network seems down, please check "
+"your network configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:1917
+#, 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/plugin_transport_udp.c:2162

 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/transport/plugin_transport_udp.c:2068
+#: src/transport/plugin_transport_udp.c:2328

 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 

-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2371

 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 

-#: src/transport/plugin_transport_unix.c:1051
+#: src/transport/plugin_transport_unix.c:1346

 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/transport/plugin_transport_wlan.c:880
-msgid "# wlan session timeouts"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:904
-msgid "# wlan session created"
+#: src/transport/plugin_transport_wlan.c:560
+msgid "# WLAN ACKs sent"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:988
-#: src/transport/plugin_transport_wlan.c:1151
-#: src/transport/plugin_transport_wlan.c:1172
-#: src/transport/plugin_transport_wlan.c:1203
-#: src/transport/plugin_transport_wlan.c:2398
-#: src/transport/plugin_transport_wlan.c:3260
-msgid "# wlan pending sessions"
+#: src/transport/plugin_transport_wlan.c:579
+msgid "# WLAN messages defragmented"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:1246
-#: src/transport/plugin_transport_wlan.c:1933
-msgid "# wlan pending fragments"
+#: src/transport/plugin_transport_wlan.c:625
+#: src/transport/plugin_transport_wlan.c:675
+#: src/transport/plugin_transport_wlan.c:1695
+msgid "# WLAN sessions allocated"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:1407
-#, c-format
-msgid ""
-"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1774
-msgid "# wlan hello beacons send"
+#: src/transport/plugin_transport_wlan.c:748
+msgid "# WLAN message fragments sent"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:1807
-#: src/transport/plugin_transport_wlan.c:2022
-#: src/transport/plugin_transport_wlan.c:2117
-#, c-format
-msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:2008
-msgid "# wlan acks send"
+#: src/transport/plugin_transport_wlan.c:766
+msgid "# WLAN messages pending (with fragmentation)"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:2079
-msgid "# wlan fragments send"
+#: src/transport/plugin_transport_wlan.c:866
+#: src/transport/plugin_transport_wlan.c:947
+#: src/transport/plugin_transport_wlan.c:1697
+msgid "# WLAN MAC endpoints allocated"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:2223
-#, c-format
-msgid "Wlan Address len %d is wrong\n"
+#: src/transport/plugin_transport_wlan.c:1118
+msgid "# HELLO messages received via WLAN"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:2359
-#: src/transport/plugin_transport_wlan.c:3016
-#: src/transport/plugin_transport_wlan.c:3263
-msgid "# wlan mac endpoints"
+#: src/transport/plugin_transport_wlan.c:1139
+msgid "# fragments received via WLAN"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:2587
-msgid "# wlan whole messages received"
+#: src/transport/plugin_transport_wlan.c:1149
+msgid "# ACKs received via WLAN"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:2790
-msgid "# wlan hello messages received"
+#: src/transport/plugin_transport_wlan.c:1206
+msgid "# WLAN DATA messages discarded due to CRC32 error"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:2827
-msgid "# wlan fragments received"
+#: src/transport/plugin_transport_wlan.c:1305
+msgid "# DATA messages received via WLAN"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:2879
-msgid "# wlan acks received"
+#: src/transport/plugin_transport_wlan.c:1340
+msgid "# WLAN DATA messages processed"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:2976
-msgid "# wlan mac endpoints timeouts"
+#: src/transport/plugin_transport_wlan.c:1401
+msgid "# HELLO beacons sent via WLAN"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:3000
-msgid "# wlan mac endpoints created"
+#: src/transport/plugin_transport_wlan.c:1510
+msgid "WLAN address with invalid size encountered\n"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:3058
-msgid "# wlan WLAN_HELPER_DATA received"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1667
+#, fuzzy, c-format
+msgid "Invalid configuration option `%s' in section `%s'\n"
+msgstr "配置文件“%s”已写入。\n"

 
 

-#: src/transport/plugin_transport_wlan.c:3114
-msgid "# wlan messages for this client received"
+#: src/transport/plugin_transport_wlan.c:1676
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"

 msgstr ""
 
 msgstr ""
 

-#: src/transport/plugin_transport_wlan.c:3125
-msgid "# wlan messages inside WLAN_HELPER_DATA received"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1686
+#, fuzzy, c-format
+msgid "Missing configuration option `%s' in section `%s'\n"
+msgstr "配置文件“%s”已写入。\n"

 
 

-#: src/transport/transport_api.c:588
+#: src/transport/transport_api.c:575

 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 

+#: src/transport/transport-testing.c:589
+#, fuzzy
+msgid "Failed to initialize testing library!\n"
+msgstr "初始化“%s”服务失败。\n"
+

 #: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 #: src/util/bio.c:136 src/util/bio.c:142
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"


@@ -4753,278 +5213,290 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 

-#: src/util/client.c:304
+#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:982
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:986
+#, fuzzy, c-format
+msgid "Using `%s' instead\n"
+msgstr "%s：选项“%s”有歧义\n"
+
+#: src/util/client.c:369

 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 

-#: src/util/client.c:312
+#: src/util/client.c:377

 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 

-#: src/util/client.c:657
+#: src/util/client.c:695

 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 

-#: src/util/client.c:717 src/util/service.c:919
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:859
+#: src/util/client.c:895

 #, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
 #, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 

-#: src/util/client.c:875
+#: src/util/client.c:909

 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 

-#: src/util/client.c:1143
+#: src/util/client.c:1162

 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 

-#: src/util/common_logging.c:239 src/util/common_logging.c:889
+#: src/util/common_logging.c:258 src/util/common_logging.c:1008

 msgid "DEBUG"
 msgstr "调试"
 
 msgid "DEBUG"
 msgstr "调试"
 

-#: src/util/common_logging.c:241 src/util/common_logging.c:887
+#: src/util/common_logging.c:260 src/util/common_logging.c:1006

 msgid "INFO"
 msgstr "信息"
 
 msgid "INFO"
 msgstr "信息"
 

-#: src/util/common_logging.c:243 src/util/common_logging.c:885
+#: src/util/common_logging.c:262 src/util/common_logging.c:1004

 msgid "WARNING"
 msgstr "警告"
 
 msgid "WARNING"
 msgstr "警告"
 

-#: src/util/common_logging.c:245 src/util/common_logging.c:883
+#: src/util/common_logging.c:264 src/util/common_logging.c:1002

 msgid "ERROR"
 msgstr "错误"
 
 msgid "ERROR"
 msgstr "错误"
 

-#: src/util/common_logging.c:247 src/util/common_logging.c:891
+#: src/util/common_logging.c:266 src/util/common_logging.c:1010

 msgid "NONE"
 msgstr ""
 
 msgid "NONE"
 msgstr ""
 

-#: src/util/common_logging.c:609
+#: src/util/common_logging.c:395

 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 

-#: src/util/common_logging.c:724
+#: 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"
 
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
 

-#: src/util/common_logging.c:892
+#: src/util/common_logging.c:1011

 msgid "INVALID"
 msgstr ""
 
 msgid "INVALID"
 msgstr ""
 

-#: src/util/common_logging.c:991
+#: src/util/common_logging.c:1113

 msgid "unknown address"
 msgstr ""
 
 msgid "unknown address"
 msgstr ""
 

-#: src/util/common_logging.c:1029
+#: src/util/common_logging.c:1151

 msgid "invalid address"
 msgstr ""
 
 msgid "invalid address"
 msgstr ""
 

-#: src/util/configuration.c:245
+#: src/util/configuration.c:259

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Syntax error in configuration file `%s' at line %u.\n"
+msgid "Syntax error while deserializing operation at line %u\n"

 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 

-#: src/util/configuration.c:817
+#: src/util/configuration.c:938

 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 

-#: src/util/connection.c:460
+#: src/util/connection.c:420

 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 

-#: src/util/connection.c:475
+#: src/util/connection.c:435

 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 

-#: src/util/connection.c:629
+#: src/util/connection.c:550

 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 

-#: src/util/connection.c:821 src/util/connection.c:992
+#: src/util/connection.c:739 src/util/connection.c:909

 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u：%s\n"
 

-#: src/util/connection.c:830
+#: src/util/connection.c:748

 #, fuzzy, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u：%s\n"
 

-#: src/util/connection.c:983
+#: src/util/connection.c:900

 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 

-#: src/util/connection.c:1465
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
-msgstr ""
-
-#: src/util/container_bloomfilter.c:507
+#: 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 ""
 
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 

-#: src/util/crypto_random.c:280
+#: src/util/crypto_random.c:284

 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 

-#: src/util/crypto_random.c:309
+#: src/util/crypto_random.c:313

 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 

-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/util/crypto_rsa.c:635 src/util/crypto_rsa.c:651
+#: src/util/crypto_rsa.c:833
+#, c-format
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgstr ""
+
+#: src/util/crypto_rsa.c:731 src/util/crypto_rsa.c:778

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Could not aquire lock on file `%s': %s...\n"
+msgid "Could not acquire lock on file `%s': %s...\n"

 msgstr "无法解析“%s”(%s)：%s\n"
 
 msgstr "无法解析“%s”(%s)：%s\n"
 

-#: src/util/crypto_rsa.c:623
+#: src/util/crypto_rsa.c:736

 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 

-#: src/util/crypto_rsa.c:641
+#: src/util/crypto_rsa.c:754

 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 

-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+#: src/util/crypto_rsa.c:782 src/util/crypto_rsa.c:818

 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 

-#: src/util/crypto_rsa.c:700
+#: src/util/crypto_rsa.c:813

 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 

-#: src/util/crypto_rsa.c:720
+#: src/util/crypto_rsa.c:851

 #, c-format
 #, c-format

-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgid "I am host `%s'.  Read private key from `%s'.\n"

 msgstr ""
 
 msgstr ""
 

-#: src/util/crypto_rsa.c:738
-#, c-format
-msgid "I am host `%s'.  Read private key from `%s'.\n"
+#: src/util/crypto_rsa.c:926
+msgid "interrupted by shutdown"
+msgstr ""
+
+#: src/util/crypto_rsa.c:935
+#, fuzzy
+msgid "internal error"
+msgstr "未知错误。\n"
+
+#: src/util/crypto_rsa.c:944 src/util/crypto_rsa.c:951
+msgid "gnunet-rsa failed"

 msgstr ""
 
 msgstr ""
 

-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_rsa.c:1332

 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 

-#: src/util/disk.c:479
+#: src/util/disk.c:571

 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 

-#: src/util/disk.c:1087
+#: src/util/disk.c:1140

 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 

-#: src/util/disk.c:1441 src/util/service.c:1580
+#: src/util/disk.c:1494 src/util/service.c:1665

 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 

-#: src/util/disk.c:1759
+#: src/util/disk.c:1866

 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 

-#: src/util/getopt.c:672
+#: src/util/getopt.c:669

 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s：选项“%s”有歧义\n"
 
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s：选项“%s”有歧义\n"
 

-#: src/util/getopt.c:696
+#: src/util/getopt.c:693

 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s：选项“--%s”不允许有参数\n"
 
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s：选项“--%s”不允许有参数\n"
 

-#: src/util/getopt.c:701
+#: src/util/getopt.c:698

 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 

-#: src/util/getopt.c:718 src/util/getopt.c:886
+#: src/util/getopt.c:715 src/util/getopt.c:883

 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s：选项“%s”要求有一个参数\n"
 
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s：选项“%s”要求有一个参数\n"
 

-#: src/util/getopt.c:747
+#: src/util/getopt.c:744

 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s：无法识别的选项“--%s”\n"
 
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s：无法识别的选项“--%s”\n"
 

-#: src/util/getopt.c:751
+#: src/util/getopt.c:748

 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s：无法识别的选项“%c%s”\n"
 
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s：无法识别的选项“%c%s”\n"
 

-#: src/util/getopt.c:776
+#: src/util/getopt.c:773

 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s：非法选项 -- %c\n"
 
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s：非法选项 -- %c\n"
 

-#: src/util/getopt.c:778
+#: src/util/getopt.c:775

 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s：无效选项 -- %c\n"
 
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s：无效选项 -- %c\n"
 

-#: src/util/getopt.c:806 src/util/getopt.c:934
+#: src/util/getopt.c:803 src/util/getopt.c:931

 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s：选项要求有一个参数 -- %c\n"
 
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s：选项要求有一个参数 -- %c\n"
 

-#: src/util/getopt.c:854
+#: src/util/getopt.c:851

 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s：选项“-W %s”有歧义\n"
 
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s：选项“-W %s”有歧义\n"
 

-#: src/util/getopt.c:872
+#: src/util/getopt.c:869

 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s：选项“-W %s” 不允许有参数\n"
 
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s：选项“-W %s” 不允许有参数\n"
 

-#: src/util/getopt.c:1038
+#: src/util/getopt.c:1035

 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "请使用 --help 获取选项列表。\n"
 
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "请使用 --help 获取选项列表。\n"
 

-#: src/util/getopt_helpers.c:84
+#: src/util/getopt_helpers.c:86

 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 

-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:286

 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"


@@ -5033,10 +5505,31 @@ msgstr "您必须向“%s”选项传递一个数字。\n"
 msgid "perform a reverse lookup"
 msgstr ""
 
 msgid "perform a reverse lookup"
 msgstr ""
 

-#: src/util/gnunet-resolver.c:154
+#: src/util/gnunet-resolver.c:158

 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 

+#: src/util/gnunet-rsa.c:104
+#, c-format
+msgid "No hostkey file specified on command line\n"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:154
+msgid "print the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:157
+msgid "print the hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:160
+msgid "print the short hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:170
+msgid "Manipulate GNUnet private RSA key files"
+msgstr ""
+

 #: src/util/gnunet-service-resolver.c:288
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 #: src/util/gnunet-service-resolver.c:288
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"


@@ -5048,75 +5541,65 @@ msgstr "无法解析“%s”(%s)：%s\n"
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 

-#: src/util/gnunet-service-resolver.c:494
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
-msgstr ""
-
-#: src/util/gnunet-service-resolver.c:529
-#, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
-msgstr ""
-
-#: src/util/helper.c:239
+#: src/util/helper.c:254

 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 

-#: src/util/helper.c:254
+#: src/util/helper.c:274

 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 

-#: src/util/helper.c:264
+#: src/util/helper.c:290

 #, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr ""
 

-#: src/util/helper.c:273
+#: src/util/helper.c:299

 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/util/helper.c:432
+#: src/util/helper.c:337
+#, fuzzy, c-format
+msgid "Starting HELPER process `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/util/helper.c:476

 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 

-#: src/util/network.c:1196
+#: src/util/network.c:99
+#, c-format
+msgid "Unable to shorten unix path `%s' while keeping name unique\n"
+msgstr ""
+
+#: src/util/network.c:1278

 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 

-#: src/util/os_installation.c:299
+#: src/util/os_installation.c:325

 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 

-#: src/util/os_installation.c:486
+#: src/util/os_installation.c:522

 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 

-#: src/util/os_installation.c:492
-#, fuzzy, c-format
-msgid "access (%s, X_OK) failed: %s\n"
-msgstr "“%s”说：%s\n"
-
-#: src/util/os_installation.c:507
-#, fuzzy, c-format
-msgid "stat (%s) failed: %s\n"
-msgstr "“%s”说：%s\n"
-
-#: src/util/os_priority.c:303
+#: src/util/os_priority.c:302

 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/util/os_priority.c:304
+#: src/util/os_priority.c:303

 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"


@@ -5141,12 +5624,12 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 

-#: src/util/pseudonym.c:273
+#: src/util/pseudonym.c:276

 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 

-#: src/util/pseudonym.c:338
+#: src/util/pseudonym.c:407 src/util/pseudonym.c:433

 msgid "no-name"
 msgstr "无名称"
 
 msgid "no-name"
 msgstr "无名称"
 


@@ -5161,187 +5644,167 @@ msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 

-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:347

 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 

-#: src/util/resolver_api.c:355
+#: src/util/resolver_api.c:351

 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 

-#: src/util/resolver_api.c:426
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:807
-#, c-format
-msgid "Resolver returns `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
-msgstr ""
-
-#: src/util/resolver_api.c:906
+#: src/util/resolver_api.c:890

 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 

-#: src/util/resolver_api.c:938
-#, c-format
-msgid "Resolving our hostname `%s'\n"
-msgstr ""
-
-#: src/util/scheduler.c:866
+#: src/util/scheduler.c:786

 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 

-#: src/util/scheduler.c:996
+#: src/util/scheduler.c:916

 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 

-#: src/util/server.c:397
+#: src/util/server.c:468

 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 

-#: src/util/server.c:406
+#: src/util/server.c:477

 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 

-#: src/util/server.c:411
+#: src/util/server.c:488

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "`%s' failed for `%s': address already in use\n"
+msgid "`%s' failed for `%.*s': address already in use\n"

 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 

-#: src/util/server.c:640
+#: src/util/server.c:819

 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 

-#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
-#: src/util/service.c:207 src/util/service.c:214
+#: 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 "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 

-#: src/util/service.c:170
+#: src/util/service.c:195

 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 

-#: src/util/service.c:263
+#: src/util/service.c:288

 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 

-#: src/util/service.c:296
+#: src/util/service.c:320

 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 

-#: src/util/service.c:326
+#: src/util/service.c:350

 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 

-#: src/util/service.c:668
+#: src/util/service.c:705

 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 

-#: src/util/service.c:673
+#: src/util/service.c:710

 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 

-#: src/util/service.c:680
+#: src/util/service.c:717

 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 

-#: src/util/service.c:724
+#: src/util/service.c:772

 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 

-#: src/util/service.c:752
+#: src/util/service.c:809

 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 

-#: src/util/service.c:869
+#: src/util/service.c:927

 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 

-#: src/util/service.c:939
+#: src/util/service.c:1005

 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 

-#: src/util/service.c:956
+#: src/util/service.c:1022

 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 

-#: src/util/service.c:1191
+#: src/util/service.c:1256

 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 

-#: src/util/service.c:1242 src/util/service.c:1260
+#: src/util/service.c:1307 src/util/service.c:1325

 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 

-#: src/util/service.c:1287
+#: src/util/service.c:1352

 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 

-#: src/util/service.c:1442
+#: src/util/service.c:1521

 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 

-#: src/util/service.c:1475
+#: src/util/service.c:1554

 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 

-#: src/util/service.c:1521
+#: src/util/service.c:1603

 msgid "Service process failed to initialize\n"
 msgstr ""
 
 msgid "Service process failed to initialize\n"
 msgstr ""
 

-#: src/util/service.c:1525
+#: src/util/service.c:1607

 msgid "Service process could not initialize server function\n"
 msgstr ""
 
 msgid "Service process could not initialize server function\n"
 msgstr ""
 

-#: src/util/service.c:1529
+#: src/util/service.c:1611

 msgid "Service process failed to report status\n"
 msgstr ""
 
 msgid "Service process failed to report status\n"
 msgstr ""
 

-#: src/util/service.c:1581
+#: src/util/service.c:1666

 msgid "No such user"
 msgstr "无此用户"
 
 msgid "No such user"
 msgstr "无此用户"
 

-#: src/util/service.c:1594
+#: src/util/service.c:1679

 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”：%s\n"
 
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”：%s\n"
 

-#: src/util/service.c:1657
+#: src/util/service.c:1744

 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 


@@ -5350,139 +5813,166 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 

-#: src/util/strings.c:143
+#: src/util/strings.c:145

 msgid "b"
 msgstr "b"
 
 msgid "b"
 msgstr "b"
 

-#: src/util/strings.c:354
+#: src/util/strings.c:385

 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 

-#: src/util/strings.c:462
+#: src/util/strings.c:534

 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 

-#: src/util/strings.c:554
+#: src/util/strings.c:626

 msgid "ms"
 msgstr "毫秒"
 
 msgid "ms"
 msgstr "毫秒"
 

-#: src/util/strings.c:559
-msgid "eternity"
+#: src/util/strings.c:631
+msgid "forever"

 msgstr ""
 
 msgstr ""
 

-#: src/util/strings.c:563
+#: src/util/strings.c:635

 msgid "s"
 msgstr "秒"
 
 msgid "s"
 msgstr "秒"
 

-#: src/util/strings.c:567
+#: src/util/strings.c:639

 msgid "m"
 msgstr "分"
 
 msgid "m"
 msgstr "分"
 

-#: src/util/strings.c:571
+#: src/util/strings.c:643

 msgid "h"
 msgstr "时"
 
 msgid "h"
 msgstr "时"
 

-#: src/util/strings.c:575
-msgid " days"
+#: src/util/strings.c:648
+#, fuzzy
+msgid "day"
+msgstr " 天"
+
+#: src/util/strings.c:650
+#, fuzzy
+msgid "days"

 msgstr " 天"
 
 msgstr " 天"
 

-#: src/util/strings.c:599
+#: src/util/strings.c:674

 msgid "end of time"
 msgstr ""
 
 msgid "end of time"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#: src/util/strings.c:1063
+msgid "IPv6 address did not start with `['\n"
+msgstr ""
+
+#: src/util/strings.c:1071
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1077
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1084
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/util/strings.c:1093
+#, fuzzy, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1069

 msgid "# Active tunnels"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
 #, fuzzy
 msgid "# Active tunnels"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
 #, fuzzy

-msgid "# Peers connected to mesh tunnels"
+msgid "# peers connected to mesh tunnels"

 msgstr ""
 "\n"
 "按任意键继续\n"
 
 msgstr ""
 "\n"
 "按任意键继续\n"
 

-#: src/vpn/gnunet-service-vpn.c:699
+#: src/vpn/gnunet-service-vpn.c:698

 msgid "# Bytes given to mesh for transmission"
 msgstr ""
 
 msgid "# Bytes given to mesh for transmission"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:737
+#: src/vpn/gnunet-service-vpn.c:736

 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr ""
 
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:772
+#: src/vpn/gnunet-service-vpn.c:770

 msgid "# Mesh tunnels created"
 msgstr ""
 
 msgid "# Mesh tunnels created"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:795
+#: src/vpn/gnunet-service-vpn.c:793

 #, fuzzy
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "发送消息失败。\n"
 
 #, fuzzy
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "发送消息失败。\n"
 

-#: src/vpn/gnunet-service-vpn.c:967
+#: src/vpn/gnunet-service-vpn.c:971

 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:1285
+#: src/vpn/gnunet-service-vpn.c:1289

 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:1306
+#: src/vpn/gnunet-service-vpn.c:1310

 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1515

 msgid "# Packets received from TUN interface"
 msgstr ""
 
 msgid "# Packets received from TUN interface"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#: src/vpn/gnunet-service-vpn.c:1553 src/vpn/gnunet-service-vpn.c:1594

 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1604

 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:1614
+#: src/vpn/gnunet-service-vpn.c:1618

 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:1697
+#: src/vpn/gnunet-service-vpn.c:1702

 msgid "# ICMP packets received from mesh"
 msgstr ""
 
 msgid "# ICMP packets received from mesh"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:2038
+#: src/vpn/gnunet-service-vpn.c:2043

 msgid "# UDP packets received from mesh"
 msgstr ""
 
 msgid "# UDP packets received from mesh"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:2196
+#: src/vpn/gnunet-service-vpn.c:2201

 msgid "# TCP packets received from mesh"
 msgstr ""
 
 msgid "# TCP packets received from mesh"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:2347
+#: src/vpn/gnunet-service-vpn.c:2352

 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:2402
+#: src/vpn/gnunet-service-vpn.c:2407

 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+#: src/vpn/gnunet-service-vpn.c:2446 src/vpn/gnunet-service-vpn.c:2659

 msgid "# Active destinations"
 msgstr ""
 
 msgid "# Active destinations"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:2726
+#: src/vpn/gnunet-service-vpn.c:2732

 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3139

 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 

-#: src/vpn/gnunet-service-vpn.c:3165
+#: src/vpn/gnunet-service-vpn.c:3171

 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 


@@ -5552,26 +6042,97 @@ msgstr ""
 msgid "service is offered via UDP"
 msgstr ""
 
 msgid "service is offered via UDP"
 msgstr ""
 

-#: src/vpn/gnunet-vpn.c:329
+#: src/vpn/gnunet-vpn.c:333

 msgid "Setup tunnels via VPN."
 msgstr ""
 
 msgid "Setup tunnels via VPN."
 msgstr ""
 

-#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
-#: src/include/gnunet_common.h:490
+#: src/include/gnunet_common.h:515 src/include/gnunet_common.h:520
+#: src/include/gnunet_common.h:526

 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 

-#: src/include/gnunet_common.h:500
+#: src/include/gnunet_common.h:536

 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 

-#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#: src/include/gnunet_common.h:557 src/include/gnunet_common.h:564

 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 

+#, fuzzy
+#~ msgid "Could not create namespace `%s'\n"
+#~ msgstr "无法解析“%s”(%s)：%s\n"
+
+#, fuzzy
+#~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
+
+#, fuzzy
+#~ 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 "%s failed for `%s' at %s:%d: `%s'\n"
+#~ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\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 "# 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 "Failed to send to `%s': %s\n"
 #~ msgstr "打开日志文件“%s”失败：%s\n"
 #, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "打开日志文件“%s”失败：%s\n"


@@ -5596,10 +6157,6 @@ msgstr ""
 #~ msgid "Service `%s' stopped\n"
 #~ msgstr "服务已删除。\n"
 
 #~ msgid "Service `%s' stopped\n"
 #~ msgstr "服务已删除。\n"
 

-#, fuzzy
-#~ msgid "Unable to start service `%s': %s\n"
-#~ msgstr "无法保存配置文件“%s”："
-

 #, fuzzy
 #~ msgid "Unable to accept connection for service `%s': %s\n"
 #~ msgstr "无法保存配置文件“%s”："
 #, fuzzy
 #~ msgid "Unable to accept connection for service `%s': %s\n"
 #~ msgstr "无法保存配置文件“%s”："


@@ -5624,14 +6181,6 @@ msgstr ""
 #~ msgid "Failed to load dhtlog plugin for `%s'\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
 #~ msgid "Failed to load dhtlog plugin for `%s'\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 

-#, fuzzy
-#~ msgid "Failed to get full path for `%s'\n"
-#~ msgstr "解析配置文件“%s”失败\n"
-
-#, fuzzy
-#~ msgid "Failed to create file for dhtlog.\n"
-#~ msgstr "无法为守护程序创建用户账户。"
-

 #, fuzzy
 #~ msgid "Phase 3: sending messages\n"
 #~ msgstr "发送消息失败。\n"
 #, fuzzy
 #~ msgid "Phase 3: sending messages\n"
 #~ msgstr "发送消息失败。\n"


@@ -5640,10 +6189,6 @@ msgstr ""
 #~ msgid "Fail! Could not connect peers\n"
 #~ msgstr "无法连接到 %s:%u：%s\n"
 
 #~ 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 "错误"
 
 #~ msgid "Error"
 #~ msgstr "错误"
 


@@ -5668,9 +6213,6 @@ msgstr ""
 #~ msgid "Ok"
 #~ msgstr "确定"
 
 #~ msgid "Ok"
 #~ msgstr "确定"
 

-#~ msgid "GNUnet configuration"
-#~ msgstr "GNUnet 配置"
-

 #~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"
 #~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"


@@ -5902,9 +6444,6 @@ msgstr ""
 #~ "\n"
 #~ "您的配置更改没有保存。\n"
 
 #~ "\n"
 #~ "您的配置更改没有保存。\n"
 

-#~ msgid "list all network adapters"
-#~ msgstr "列出所有网络适配器"
-

 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "以 Windows 服务方式安装 GNUnet"
 
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "以 Windows 服务方式安装 GNUnet"
 


@@ -5914,9 +6453,6 @@ msgstr ""
 #~ msgid "display a file's hash value"
 #~ msgstr "显示一个文件的散列值"
 
 #~ 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"
 
 #~ msgid "This version of Windows doesn't support services.\n"
 #~ msgstr "此版本的 Windows 不支持服务。\n"
 


@@ -6127,9 +6663,6 @@ msgstr ""
 #~ msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'\n"
 #~ msgstr "在 NETWORK 节的配置条目 HOST 中有语法错误：“%s”\n"
 
 #~ 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"
 
 #~ msgid "Reading result from gnunetd failed, reply invalid!\n"
 #~ msgstr "从 gnunetd 读取结果失败，应答无效！\n"
 


@@ -6185,9 +6718,6 @@ msgstr ""
 #~ msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 #~ msgstr "实时延迟冲突(%llu 毫秒)，于 %s:%u\n"
 
 #~ 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"
 
 #~ msgid "Deadlock due to `%s'.\n"
 #~ msgstr "“%s”造成了死锁。\n"
 


@@ -6288,19 +6818,12 @@ msgstr ""
 #~ msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 #~ msgstr "%s：选项“%s”要求有一个参数\n"
 
 #~ 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 ""
 #~ "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"
 #~ msgid ""
 #~ "Couldn't find a group (`%s') for the new user and none was specified.\n"
 #~ msgstr "找不到新用户的组(“%s”)且没有指定用户组。\n"