work on gnunet-set, isolated bug in stream

git-svn-id: https://gnunet.org/svn/gnunet@27001 140774ce-b5e7-0310-ab8b-a85725594a96

1 files changed, 916 insertions, 764 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6f6f5690c8..ac79c4616c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-03-06 00:28+0100\n"
+"POT-Creation-Date: 2013-04-27 12:39+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"
@@ -16,309 +16,418 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:162
-msgid "Failed to transmit shutdown request to client.\n"
+#: src/arm/arm_api.c:880
+msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:166
-#, fuzzy, c-format
-msgid "Service `%s' is unknown to ARM.\n"
-msgstr "服务已删除。\n"
+#: src/arm/arm_monitor_api.c:321
+msgid ""
+"Monitoring client was disconnected from arm service, trying to reconnect.\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:171
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "服务已删除。\n"
+msgid "Failed to remove configuration file %s\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:174
-#, fuzzy, c-format
-msgid "Service `%s' was already running.\n"
-msgstr "服务已删除。\n"
+#: src/arm/gnunet-arm.c:165
+#, c-format
+msgid "Failed to remove servicehome directory %s\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:179
-#, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "服务已删除。\n"
+#: src/arm/gnunet-arm.c:204 src/testbed/gnunet-service-testbed_peers.c:712
+msgid "Message was sent successfully"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:206 src/testbed/gnunet-service-testbed_peers.c:714
+#, fuzzy
+msgid "Misconfiguration (can't connect to the ARM service)"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/arm/gnunet-arm.c:208 src/testbed/gnunet-service-testbed_peers.c:716
+msgid "We disconnected from ARM before we could send a request"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:210 src/testbed/gnunet-service-testbed_peers.c:718
+msgid "ARM API is busy"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:212 src/testbed/gnunet-service-testbed_peers.c:720
+msgid "Request doesn't fit into a message"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:182
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:722
+msgid "Request timed out"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:724
+#, fuzzy
+msgid "Unknown request status"
+msgstr "未知的用户“%s”\n"
+
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:740
+#, c-format
+msgid "%s is stopped"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:742
+#, c-format
+msgid "%s is starting"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:236 src/testbed/gnunet-service-testbed_peers.c:744
+#, c-format
+msgid "%s is stopping"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:238 src/testbed/gnunet-service-testbed_peers.c:746
+#, c-format
+msgid "%s is starting already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:240 src/testbed/gnunet-service-testbed_peers.c:748
+#, c-format
+msgid "%s is stopping already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:750
+#, c-format
+msgid "%s is started already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:752
+#, c-format
+msgid "%s is stopped already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:754
 #, fuzzy, c-format
-msgid "Service `%s' was already being stopped.\n"
+msgid "%s service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:186
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:756
 #, fuzzy, c-format
-msgid "Service `%s' was already not running.\n"
-msgstr "服务已删除。\n"
+msgid "%s service failed to start"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/arm/gnunet-arm.c:190
-msgid "Request ignored as ARM is shutting down.\n"
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:758
+#, c-format
+msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:194
-msgid "Error communicating with ARM service.\n"
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:760
+#, c-format
+msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:198
-msgid "Timeout communicating with ARM service.\n"
+#: src/arm/gnunet-arm.c:271
+msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:202
-msgid "Operation failed.\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:291
+#, fuzzy, c-format
+msgid "Failed to send a request to kill the `%s' service: %%s\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:206
-msgid "Unknown response code from ARM.\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:307
+#, fuzzy, c-format
+msgid "Failed to kill the `%s' service: %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/arm/gnunet-arm.c:323
+#, fuzzy, c-format
+msgid "Failed to send a stop request to the ARM service: %s\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/arm/gnunet-arm.c:345
+#, fuzzy, c-format
+msgid "Failed to stop the ARM service: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/arm/gnunet-arm.c:361 src/arm/gnunet-arm.c:370
+#, fuzzy, c-format
+msgid "Failed to start the ARM service: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/arm/gnunet-arm.c:390
+#, fuzzy, c-format
+msgid "Failed to send a request to start the `%s' service: %%s\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:229
+#: src/arm/gnunet-arm.c:405
+#, fuzzy, c-format
+msgid "Failed to start the `%s' service: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/arm/gnunet-arm.c:423
+#, fuzzy, c-format
+msgid "Failed to request a list of services: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/arm/gnunet-arm.c:430
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/arm/gnunet-arm.c:232
+#: src/arm/gnunet-arm.c:433
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:253
-#, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/arm/gnunet-arm.c:534
+msgid "Began monitoring ARM for service status changes\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:259
+#: src/arm/gnunet-arm.c:537
 #, c-format
-msgid "Failed to remove servicehome directory %s\n"
+msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:407 src/arm/gnunet-arm.c:424
-msgid "Fatal error initializing ARM API.\n"
+#: src/arm/gnunet-arm.c:540
+#, fuzzy, c-format
+msgid "Starting %s...\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/arm/gnunet-arm.c:543
+#, c-format
+msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:453
+#: src/arm/gnunet-arm.c:552
+#, fuzzy, c-format
+msgid "Unknown status %u for service %s.\n"
+msgstr "未知的用户“%s”\n"
+
+#: src/arm/gnunet-arm.c:622
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:455
+#: src/arm/gnunet-arm.c:624
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:457
+#: src/arm/gnunet-arm.c:626
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:459
+#: src/arm/gnunet-arm.c:628
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:462
+#: src/arm/gnunet-arm.c:631
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:465
+#: src/arm/gnunet-arm.c:634
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:636
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:470
+#: src/arm/gnunet-arm.c:639
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:472
+#: src/arm/gnunet-arm.c:641
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:474
+#: src/arm/gnunet-arm.c:643
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:476
+#: src/arm/gnunet-arm.c:645
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:487
+#: src/arm/gnunet-arm.c:656
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:345
+#: src/arm/gnunet-service-arm.c:257
+msgid "Could not send status result to client\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:291
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/arm/gnunet-service-arm.c:500
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:348
+#: src/arm/gnunet-service-arm.c:507
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:374
-msgid "Could not send status result to client\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:406
-#, fuzzy
-msgid "Could not send list result to client\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/arm/gnunet-service-arm.c:537
+#: src/arm/gnunet-service-arm.c:602
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户："
 
-#: src/arm/gnunet-service-arm.c:559
+#: src/arm/gnunet-service-arm.c:624
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:573
+#: src/arm/gnunet-service-arm.c:638
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:681
+#: src/arm/gnunet-service-arm.c:771
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:892
+#: src/arm/gnunet-service-arm.c:1023
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:985
+#: src/arm/gnunet-service-arm.c:1116
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:990
+#: src/arm/gnunet-service-arm.c:1121
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:995
+#: src/arm/gnunet-service-arm.c:1126
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1001
+#: src/arm/gnunet-service-arm.c:1132
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1036
+#: src/arm/gnunet-service-arm.c:1154
+#, c-format
+msgid "Service `%s' terminated normally, will restart at any time\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1169
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1228
+#: src/arm/gnunet-service-arm.c:1386
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1239
+#: src/arm/gnunet-service-arm.c:1397
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1253
+#: src/arm/gnunet-service-arm.c:1411
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:44
+#: src/arm/mockup-service.c:46
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:465
+#: src/ats/ats_api_performance.c:475
 #, c-format
 msgid "Received %s message\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:508
+#: src/ats/ats_api_performance.c:518
 #, c-format
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1176
-#: src/ats/gnunet-service-ats_addresses.c:1210
+#: src/ats/gnunet-service-ats_addresses.c:1372
+#: src/ats/gnunet-service-ats_addresses.c:1406
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1182
+#: src/ats/gnunet-service-ats_addresses.c:1378
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1189
+#: src/ats/gnunet-service-ats_addresses.c:1385
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1216
+#: src/ats/gnunet-service-ats_addresses.c:1412
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1223
+#: src/ats/gnunet-service-ats_addresses.c:1419
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:735
+#: src/ats/gnunet-service-ats_addresses_mlp.c:756
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1044
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1075
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1226
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1258
 #, c-format
 msgid "Update for ATS type `%s' not implemented!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1306
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1341
 #, c-format
 msgid "Updating address for peer `%s' not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1726
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1761
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1734
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1769
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1744
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1779
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1752
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1787
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1763
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1798
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
@@ -340,85 +449,85 @@ msgid ""
 "s, %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:326
+#: src/ats-tool/gnunet-ats.c:320
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:345 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:813
+#: src/ats-tool/gnunet-ats.c:339 src/namestore/gnunet-namestore.c:610
+#: src/transport/gnunet-transport.c:804
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:355 src/transport/gnunet-transport.c:819
+#: src/ats-tool/gnunet-ats.c:349 src/transport/gnunet-transport.c:810
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tool/gnunet-ats.c:363
+#: src/ats-tool/gnunet-ats.c:357
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:379 src/ats-tool/gnunet-ats.c:398
-#: src/ats-tool/gnunet-ats.c:415 src/ats-tool/gnunet-ats.c:440
+#: src/ats-tool/gnunet-ats.c:373 src/ats-tool/gnunet-ats.c:392
+#: src/ats-tool/gnunet-ats.c:409 src/ats-tool/gnunet-ats.c:434
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:405
+#: src/ats-tool/gnunet-ats.c:382 src/ats-tool/gnunet-ats.c:399
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:433
+#: src/ats-tool/gnunet-ats.c:427
 msgid "Type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:490
+#: src/ats-tool/gnunet-ats.c:484
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:493
+#: src/ats-tool/gnunet-ats.c:487
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:496
+#: src/ats-tool/gnunet-ats.c:490
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:499
+#: src/ats-tool/gnunet-ats.c:493
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:502
+#: src/ats-tool/gnunet-ats.c:496
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:505
+#: src/ats-tool/gnunet-ats.c:499
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:502
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:505
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:514
+#: src/ats-tool/gnunet-ats.c:508
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:517
+#: src/ats-tool/gnunet-ats.c:511
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:526
+#: src/ats-tool/gnunet-ats.c:520
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
@@ -428,21 +537,21 @@ msgstr "无法获取有关用户“%s”的信息：%s\n"
 msgid "Loading block plugin `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/consensus/gnunet-consensus.c:317
+#: src/consensus/gnunet-consensus.c:350
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus.c:320
+#: src/consensus/gnunet-consensus.c:353
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:323
+#: src/consensus/gnunet-consensus.c:356
 #, fuzzy
 msgid "number of values"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus.c:326
+#: src/consensus/gnunet-consensus.c:359
 msgid "consensus timeout"
 msgstr ""
 
@@ -468,51 +577,51 @@ msgstr ""
 msgid "ibf size"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-start-peers.c:158
+#: src/consensus/gnunet-consensus-start-peers.c:172
 msgid "start peers with the given template configuration"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-start-peers.c:161
+#: src/consensus/gnunet-consensus-start-peers.c:175
 #, fuzzy
 msgid "number of peers to start"
 msgstr "迭代次数"
 
-#: src/core/core_api.c:755
+#: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:214
+#: src/core/gnunet-core.c:82
 #, c-format
 msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
-#: src/transport/gnunet-transport.c:612 src/transport/gnunet-transport.c:636
+#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
+#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:614
+#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:638
+#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:176
-#: src/peerinfo-tool/gnunet-peerinfo.c:541
+#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:176
+#: src/peerinfo-tool/gnunet-peerinfo.c:643
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:1005
+#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:996
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:222
+#: src/core/gnunet-core.c:215
 msgid "Print information about connected peers."
 msgstr ""
 
@@ -532,7 +641,7 @@ msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
 #: src/core/gnunet-service-core.c:164
-#: src/transport/gnunet-service-transport.c:725
+#: src/transport/gnunet-service-transport.c:758
 #, fuzzy
 msgid "Transport service is unable to access hostkey. Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -642,38 +751,38 @@ msgstr ""
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1298
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1319
+#: src/core/gnunet-service-core_kx.c:1305
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1322
+#: src/core/gnunet-service-core_kx.c:1308
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1365
-#: src/core/gnunet-service-core_kx.c:1390
+#: src/core/gnunet-service-core_kx.c:1351
+#: src/core/gnunet-service-core_kx.c:1376
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1377
+#: src/core/gnunet-service-core_kx.c:1363
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1404
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1426
+#: src/core/gnunet-service-core_kx.c:1412
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1443
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -682,7 +791,7 @@ msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
 #: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:333
+#: src/core/gnunet-service-core_neighbours.c:328
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -690,23 +799,23 @@ msgstr ""
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:420
+#: src/core/gnunet-service-core_neighbours.c:411
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:280
-#: src/dht/gnunet-service-dht_neighbours.c:645
-#: src/dht/gnunet-service-dht_neighbours.c:704
-#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1530
-#: src/topology/gnunet-daemon-topology.c:704
-#: src/topology/gnunet-daemon-topology.c:805
-#: src/transport/gnunet-service-transport_neighbours.c:1052
-#: src/transport/gnunet-service-transport_neighbours.c:1276
-#: src/transport/gnunet-service-transport_neighbours.c:1285
-#: src/transport/gnunet-service-transport_neighbours.c:2826
-#: src/transport/gnunet-service-transport_neighbours.c:3089
+#: src/dht/gnunet-service-dht_neighbours.c:644
+#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
+#: src/topology/gnunet-daemon-topology.c:700
+#: src/topology/gnunet-daemon-topology.c:801
+#: src/transport/gnunet-service-transport_neighbours.c:1041
+#: src/transport/gnunet-service-transport_neighbours.c:1265
+#: src/transport/gnunet-service-transport_neighbours.c:1274
+#: src/transport/gnunet-service-transport_neighbours.c:2794
+#: src/transport/gnunet-service-transport_neighbours.c:3053
 msgid "# peers connected"
 msgstr ""
 
@@ -774,14 +883,14 @@ msgstr ""
 #: 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/datastore/plugin_datastore_sqlite.c:57 src/fs/fs_pseudonym.c:46
+#: 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/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:46
 #: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
-#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
+#: src/include/gnunet_common.h:608 src/include/gnunet_common.h:615
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
@@ -1159,7 +1268,7 @@ msgstr ""
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:1037
+#: src/nse/gnunet-nse-profiler.c:900
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1226,83 +1335,83 @@ msgstr ""
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-service-dht_clients.c:413
+#: src/dht/gnunet-service-dht_clients.c:414
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:508
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:585
+#: src/dht/gnunet-service-dht_clients.c:590
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:791
+#: src/dht/gnunet-service-dht_clients.c:796
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1035
+#: src/dht/gnunet-service-dht_clients.c:1041
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1048
+#: src/dht/gnunet-service-dht_clients.c:1054
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1085
+#: src/dht/gnunet-service-dht_clients.c:1091
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1108
+#: src/dht/gnunet-service-dht_clients.c:1114
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1157
-#: src/dht/gnunet-service-dht_clients.c:1199
+#: src/dht/gnunet-service-dht_clients.c:1165
+#: src/dht/gnunet-service-dht_clients.c:1207
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1175
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:64
+#: src/dht/gnunet-service-dht_datacache.c:68
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:74
+#: src/dht/gnunet-service-dht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:159
+#: src/dht/gnunet-service-dht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:170
+#: src/dht/gnunet-service-dht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-dht_datacache.c:182
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-dht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:194
+#: src/dht/gnunet-service-dht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:197
+#: src/dht/gnunet-service-dht_datacache.c:203
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:227
+#: src/dht/gnunet-service-dht_datacache.c:234
 msgid "# GET requests given to datacache"
 msgstr ""
 
@@ -1310,87 +1419,87 @@ msgstr ""
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:501
+#: src/dht/gnunet-service-dht_neighbours.c:504
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:591
+#: src/dht/gnunet-service-dht_neighbours.c:594
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:738
+#: src/dht/gnunet-service-dht_neighbours.c:737
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-dht_neighbours.c:792
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:831
+#: src/dht/gnunet-service-dht_neighbours.c:830
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1053
-#: src/dht/gnunet-service-dht_neighbours.c:1081
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1086
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1062
-#: src/dht/gnunet-service-dht_neighbours.c:1096
+#: src/dht/gnunet-service-dht_neighbours.c:1067
+#: src/dht/gnunet-service-dht_neighbours.c:1101
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1230
+#: src/dht/gnunet-service-dht_neighbours.c:1235
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1259
+#: src/dht/gnunet-service-dht_neighbours.c:1264
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1266
-#: src/dht/gnunet-service-dht_neighbours.c:1379
-#: src/dht/gnunet-service-dht_neighbours.c:1479
+#: src/dht/gnunet-service-dht_neighbours.c:1271
+#: src/dht/gnunet-service-dht_neighbours.c:1384
+#: src/dht/gnunet-service-dht_neighbours.c:1484
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1344
+#: src/dht/gnunet-service-dht_neighbours.c:1349
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1371
+#: src/dht/gnunet-service-dht_neighbours.c:1376
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1486
+#: src/dht/gnunet-service-dht_neighbours.c:1491
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1574
+#: src/dht/gnunet-service-dht_neighbours.c:1575
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1704
+#: src/dht/gnunet-service-dht_neighbours.c:1730
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1712
+#: src/dht/gnunet-service-dht_neighbours.c:1738
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1829
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1845
+#: src/dht/gnunet-service-dht_neighbours.c:1882
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1859
+#: src/dht/gnunet-service-dht_neighbours.c:1896
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1943
+#: src/dht/gnunet-service-dht_neighbours.c:1973
 msgid "# P2P RESULTS received"
 msgstr ""
 
@@ -1551,19 +1660,14 @@ msgstr ""
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/dv/dv_api.c:189
-#, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/dv/gnunet-service-dv.c:3003
-msgid "Error in communication with PEERINFO service\n"
+#: src/dv/gnunet-dv.c:165
+msgid "verbose output"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:159
-#, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
-msgstr ""
+#: src/dv/gnunet-dv.c:174
+#, fuzzy
+msgid "Print information about DV state"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #: src/exit/gnunet-daemon-exit.c:741
 #, c-format
@@ -1997,7 +2101,7 @@ msgstr ""
 msgid "Identifiers or URI too long to create UBlock"
 msgstr ""
 
-#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:307
+#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:311
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
@@ -2006,6 +2110,26 @@ msgstr "未知错误。\n"
 msgid "Failed to connect to datastore."
 msgstr ""
 
+#: src/fs/fs_pseudonym.c:342 src/fs/fs_pseudonym.c:645
+#, fuzzy, c-format
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\