-fixing 'make dist' issues

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

1 files changed, 1307 insertions, 1000 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 523ec2b5d5..bc6f963f97 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-11-05 02:07+0100\n"
+"POT-Creation-Date: 2013-12-12 22:41+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -35,7 +35,7 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
 msgid "Message was sent successfully"
 msgstr ""
 
@@ -44,11 +44,11 @@ msgstr ""
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1014
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1016
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
 msgid "ARM API is busy"
 msgstr ""
 
@@ -56,56 +56,56 @@ msgstr ""
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1020
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1022
+#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1038
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
 #, c-format
 msgid "%s is stopped"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1040
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1042
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1044
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1046
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1048
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1050
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1052
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1054
+#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "运行 %s失败：%s %d\n"
@@ -115,7 +115,7 @@ msgstr "运行 %s失败：%s %d\n"
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1058
+#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -139,204 +139,204 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:421
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:431
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:465
+#: src/arm/gnunet-arm.c:468
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:476
+#: src/arm/gnunet-arm.c:479
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/arm/gnunet-arm.c:512
+#: src/arm/gnunet-arm.c:517
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:525
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/arm/gnunet-arm.c:523
+#: src/arm/gnunet-arm.c:530
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:605
+#: src/arm/gnunet-arm.c:612
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:636
+#: src/arm/gnunet-arm.c:643
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:639
+#: src/arm/gnunet-arm.c:646
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/arm/gnunet-arm.c:642
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:653
+#: src/arm/gnunet-arm.c:660
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:717
+#: src/arm/gnunet-arm.c:724
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:719
+#: src/arm/gnunet-arm.c:726
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:721
+#: src/arm/gnunet-arm.c:728
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:723
+#: src/arm/gnunet-arm.c:730
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:733
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:729
+#: src/arm/gnunet-arm.c:736
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:732
+#: src/arm/gnunet-arm.c:739
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:734
+#: src/arm/gnunet-arm.c:741
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:737
+#: src/arm/gnunet-arm.c:744
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:746
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:748
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:743
+#: src/arm/gnunet-arm.c:750
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:754
+#: src/arm/gnunet-arm.c:761
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:268
+#: src/arm/gnunet-service-arm.c:266
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:304
+#: src/arm/gnunet-service-arm.c:302
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/arm/gnunet-service-arm.c:519
+#: src/arm/gnunet-service-arm.c:528
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:526
+#: src/arm/gnunet-service-arm.c:535
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:625
+#: src/arm/gnunet-service-arm.c:634
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户："
 
-#: src/arm/gnunet-service-arm.c:647
+#: src/arm/gnunet-service-arm.c:656
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:676
+#: src/arm/gnunet-service-arm.c:685
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:809
+#: src/arm/gnunet-service-arm.c:821
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1070
+#: src/arm/gnunet-service-arm.c:1085
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1178
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1168
+#: src/arm/gnunet-service-arm.c:1183
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1173
+#: src/arm/gnunet-service-arm.c:1188
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1179
+#: src/arm/gnunet-service-arm.c:1194
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1201
+#: src/arm/gnunet-service-arm.c:1216
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1216
+#: src/arm/gnunet-service-arm.c:1231
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1463
+#: src/arm/gnunet-service-arm.c:1484
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1474
+#: src/arm/gnunet-service-arm.c:1495
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1488
+#: src/arm/gnunet-service-arm.c:1509
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -355,99 +355,99 @@ msgstr ""
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1475
-#: src/ats/gnunet-service-ats_addresses.c:1519
+#: src/ats/gnunet-service-ats_addresses.c:1946
+#: src/ats/gnunet-service-ats_addresses.c:1990
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1482
+#: src/ats/gnunet-service-ats_addresses.c:1953
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1490
+#: src/ats/gnunet-service-ats_addresses.c:1961
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1526
+#: src/ats/gnunet-service-ats_addresses.c:1997
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1534
+#: src/ats/gnunet-service-ats_addresses.c:2005
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1700
+#: src/ats/gnunet-service-ats_addresses.c:2175
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1703
+#: src/ats/gnunet-service-ats_addresses.c:2178
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1726
+#: src/ats/gnunet-service-ats_addresses.c:2201
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:868
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:1239
+#: src/ats/plugin_ats_mlp.c:1281
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:1286
+#: src/ats/plugin_ats_mlp.c:1328
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2010
+#: src/ats/plugin_ats_mlp.c:2059
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2018
+#: src/ats/plugin_ats_mlp.c:2067
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2028
+#: src/ats/plugin_ats_mlp.c:2077
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2036
+#: src/ats/plugin_ats_mlp.c:2085
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_mlp.c:2047
+#: src/ats/plugin_ats_mlp.c:2096
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/libgnunet_plugin_ats_proportional.c:1438
+#: src/ats/plugin_ats_proportional.c:1514
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
@@ -474,13 +474,13 @@ msgstr ""
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:520
-#: src/transport/gnunet-transport.c:807
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:547
+#: src/transport/gnunet-transport.c:829
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:816
+#: src/ats-tool/gnunet-ats.c:359 src/transport/gnunet-transport.c:838
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -562,220 +562,274 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/consensus/gnunet-consensus-profiler.c:394
+#: src/consensus/gnunet-consensus-profiler.c:420
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus-profiler.c:397
+#: src/consensus/gnunet-consensus-profiler.c:423
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:400
+#: src/consensus/gnunet-consensus-profiler.c:426
 #: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
 #: src/set/gnunet-set-profiler.c:292
 #, fuzzy
 msgid "number of values"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus-profiler.c:403
+#: src/consensus/gnunet-consensus-profiler.c:429
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:406
+#: src/consensus/gnunet-consensus-profiler.c:432
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:333
-#: src/conversation/conversation_api.c:959
-#, fuzzy, c-format
-msgid "Internal error %d\n"
-msgstr "未知错误。\n"
+#: src/conversation/conversation_api.c:557
+#: src/conversation/conversation_api_call.c:468
+msgid "Connection to conversation service lost, trying to reconnect\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:252
+#, c-format
+msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
+msgstr ""
 
-#: src/conversation/gnunet-conversation.c:186
+#: src/conversation/gnunet-conversation.c:274
 #, c-format
-msgid ""
-"Incoming call from `%s'.\n"
-"Please /accept or /cancel the call.\n"
+msgid "Call from `%s' terminated\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:307
+#, c-format
+msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:206
-#: src/conversation/gnunet-conversation.c:315
+#: src/conversation/gnunet-conversation.c:312
 #, c-format
-msgid "Call terminated: %s\n"
+msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:226
+#: src/conversation/gnunet-conversation.c:330
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:239
+#: src/conversation/gnunet-conversation.c:344
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:252
+#: src/conversation/gnunet-conversation.c:357
 #, c-format
 msgid "Phone active on line %u\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:284
-msgid "Resolved address. Now ringing other party.\n"
+#: src/conversation/gnunet-conversation.c:379
+#, c-format
+msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:290
+#: src/conversation/gnunet-conversation.c:386
 #, fuzzy, c-format
-msgid "Connection established to `%s': %s\n"
+msgid "Connection established to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/conversation/gnunet-conversation.c:298
+#: src/conversation/gnunet-conversation.c:393
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/conversation/gnunet-conversation.c:307
-msgid "Line busy\n"
+#: src/conversation/gnunet-conversation.c:400
+msgid "Call terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:385
+#: src/conversation/gnunet-conversation.c:406
+#, c-format
+msgid "Connection to `%s' suspended (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:412
+#, c-format
+msgid "Connection to `%s' resumed (by other user)\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:479
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/conversation/gnunet-conversation.c:401
-#: src/conversation/gnunet-conversation.c:409
+#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:509
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:417
-#, c-format
-msgid "Hanging up on incoming phone call from `%s' to call `%s'.\n"
+#: src/conversation/gnunet-conversation.c:502
+#: src/conversation/gnunet-conversation.c:552
+msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:424
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:517
+#: src/conversation/gnunet-conversation.c:565
 #, c-format
-msgid "You are already in a conversation with `%s', refusing to call `%s'.\n"
+msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:431
-#, fuzzy, c-format
-msgid "Aborting call to `%s'\n"
-msgstr "创建用户出错"
-
-#: src/conversation/gnunet-conversation.c:478
-msgid "There is no incoming call to be accepted!\n"
+#: src/conversation/gnunet-conversation.c:576
+msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:485
-#: src/conversation/gnunet-conversation.c:496
-#, fuzzy, c-format
-msgid "You are already in a conversation with `%s'.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/conversation/gnunet-conversation.c:491
+#: src/conversation/gnunet-conversation.c:593
 #, c-format
-msgid "You are trying to call `%s', cannot accept incoming calls right now.\n"
+msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:521
+#: src/conversation/gnunet-conversation.c:621
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:644
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:547
+#: src/conversation/gnunet-conversation.c:649
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:553
+#: src/conversation/gnunet-conversation.c:655
+#: src/conversation/gnunet-conversation.c:679
 #, c-format
-msgid "The phone is rining. `%s' is trying to call us.\n"
+msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:559
-#, c-format
-msgid "You are having a conversation with `%s'.\n"
+#: src/conversation/gnunet-conversation.c:660
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:564
+#: src/conversation/gnunet-conversation.c:669
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/conversation/gnunet-conversation.c:569
+#: src/conversation/gnunet-conversation.c:674
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:574
-msgid ""
-"We had an internal error setting up our phone line. You can still make "
-"calls.\n"
+#: src/conversation/gnunet-conversation.c:693
+msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:595
+#: src/conversation/gnunet-conversation.c:699
+#, fuzzy, c-format
+msgid "#%u: `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/conversation/gnunet-conversation.c:727
+#: src/conversation/gnunet-conversation.c:742
+msgid "There is no call that could be suspended right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:775
+#: src/conversation/gnunet-conversation.c:791
+msgid "There is no call that could be resumed right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:798
+#, c-format
+msgid "Already talking with `%s', cannot resume a call right now.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:807
+msgid "There is no incoming call to resume here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:824
+#, c-format
+msgid "There is no incoming call `%s' to resume right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:859
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:626
+#: src/conversation/gnunet-conversation.c:867
+msgid "There is no incoming call to refuse here!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:884
+#, c-format
+msgid "There is no incoming call `%s' to refuse right now!\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:911
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:628
+#: src/conversation/gnunet-conversation.c:913
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:630
-msgid "Use `/accept MESSAGE' to accept an incoming call"
+#: src/conversation/gnunet-conversation.c:915
+msgid "Use `/accept #NUM' to accept incoming call #NUM"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:917
+msgid "Use `/suspend' to suspend the active call"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:919
+msgid ""
+"Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
+"calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:632
-msgid "Use `/cancel MESSAGE' to reject or terminate a call"
+#: src/conversation/gnunet-conversation.c:921
+msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:634
+#: src/conversation/gnunet-conversation.c:923
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:636
+#: src/conversation/gnunet-conversation.c:925
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:638
+#: src/conversation/gnunet-conversation.c:927
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:793
+#: src/conversation/gnunet-conversation.c:1082
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:806
+#: src/conversation/gnunet-conversation.c:1095
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:841
+#: src/conversation/gnunet-conversation.c:1130
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/conversation/gnunet-conversation.c:867
+#: src/conversation/gnunet-conversation.c:1156
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:870
+#: src/conversation/gnunet-conversation.c:1159
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:1174
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -803,7 +857,7 @@ msgstr ""
 
 #: src/conversation/gnunet-conversation-test.c:248
 #: src/integration-tests/connection_watchdog.c:1114
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:510
+#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:517
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
@@ -818,12 +872,12 @@ msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:211
-#: src/conversation/gnunet-helper-audio-record.c:363
+#: src/conversation/gnunet-helper-audio-record.c:362
 msgid "Connection established.\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:216
-#: src/conversation/gnunet-helper-audio-record.c:368
+#: src/conversation/gnunet-helper-audio-record.c:367
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "“%s”说：%s\n"
@@ -834,34 +888,34 @@ msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:243
-#: src/conversation/gnunet-helper-audio-record.c:394
+#: src/conversation/gnunet-helper-audio-record.c:393
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
 #: src/conversation/gnunet-helper-audio-playback.c:264
-#: src/conversation/gnunet-helper-audio-record.c:417
+#: src/conversation/gnunet-helper-audio-record.c:416
 msgid "Wrong Spec\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:270
-#: src/conversation/gnunet-helper-audio-record.c:423
+#: src/conversation/gnunet-helper-audio-record.c:422
 msgid "pa_mainloop_new() failed.\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:284
-#: src/conversation/gnunet-helper-audio-record.c:438
+#: src/conversation/gnunet-helper-audio-record.c:437
 msgid "pa_context_new() failed.\n"
 msgstr ""
 
 #: src/conversation/gnunet-helper-audio-playback.c:291
-#: src/conversation/gnunet-helper-audio-record.c:444
+#: src/conversation/gnunet-helper-audio-record.c:443
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
 #: src/conversation/gnunet-helper-audio-playback.c:297
-#: src/conversation/gnunet-helper-audio-record.c:450
+#: src/conversation/gnunet-helper-audio-record.c:449
 msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 
@@ -879,54 +933,55 @@ msgstr "“%s”说：%s\n"
 msgid "Got signal, exiting.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:301
+#: src/conversation/gnunet-helper-audio-record.c:300
 #, fuzzy
 msgid "Stream successfully created.\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:306
+#: src/conversation/gnunet-helper-audio-record.c:305
 #, fuzzy, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:314
+#: src/conversation/gnunet-helper-audio-record.c:313
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:318
+#: src/conversation/gnunet-helper-audio-record.c:317
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:325
+#: src/conversation/gnunet-helper-audio-record.c:324
 #, fuzzy, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:334
+#: src/conversation/gnunet-helper-audio-record.c:333
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:381
+#: src/conversation/gnunet-helper-audio-record.c:380
 #, fuzzy, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-service-conversation.c:612
+#: src/conversation/gnunet-service-conversation.c:825
 msgid "Mesh audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:700
+#: src/conversation/gnunet-service-conversation.c:915
 #, c-format
-msgid "No available phone for incoming call on line %u, sending BUSY signal\n"
+msgid ""
+"No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1054
-#, c-format
-msgid "Received incoming tunnel on port %u\n"
-msgstr ""
+#: src/conversation/gnunet-service-conversation.c:1302
+#, fuzzy, c-format
+msgid "Received incoming channel on port %u\n"
+msgstr "“%s”已连接到“%s”。\n"
 
 #: src/conversation/microphone.c:121
 #, fuzzy
@@ -942,7 +997,7 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:761
+#: src/core/core_api.c:765
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -952,28 +1007,27 @@ msgid "Peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:601 src/transport/gnunet-transport.c:625
+#: src/transport/gnunet-transport.c:609 src/transport/gnunet-transport.c:634
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:603
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:611
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:627
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:636
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:164 src/mesh/gnunet-mesh.c:174
-#: src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:645
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:999
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1028
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -1016,118 +1070,118 @@ msgstr ""
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:701
+#: src/core/gnunet-service-core_kx.c:708
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:764
+#: src/core/gnunet-service-core_kx.c:771
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:770
+#: src/core/gnunet-service-core_kx.c:777
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:804
+#: src/core/gnunet-service-core_kx.c:811
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:820
+#: src/core/gnunet-service-core_kx.c:827
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:923
-#: src/transport/gnunet-service-transport_validation.c:938
+#: src/core/gnunet-service-core_kx.c:930
+#: src/transport/gnunet-service-transport_validation.c:974
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:931
+#: src/core/gnunet-service-core_kx.c:938
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:958
+#: src/core/gnunet-service-core_kx.c:965
 #, 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:975
+#: src/core/gnunet-service-core_kx.c:982
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1001
+#: src/core/gnunet-service-core_kx.c:1008
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1011
+#: src/core/gnunet-service-core_kx.c:1018
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1068
-#: src/transport/gnunet-service-transport_validation.c:1233
+#: src/core/gnunet-service-core_kx.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1285
 msgid "# PONG messages received"
 msgstr ""