summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po923
1 files changed, 504 insertions, 419 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fe942d9dd..4ce79a287 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnunet-0.8.1\n"
"Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-05-13 03:22+0200\n"
+"POT-Creation-Date: 2012-06-01 20:46+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"
@@ -336,197 +336,197 @@ msgstr ""
msgid "Undefined mandatory parameter: memberCallback\n"
msgstr ""
-#: src/chat/gnunet-chat.c:92
+#: src/chat/gnunet-chat.c:93
msgid "Joined\n"
msgstr ""
-#: src/chat/gnunet-chat.c:124 src/chat/gnunet-chat.c:132
-#: src/chat/gnunet-chat.c:212 src/chat/gnunet-chat.c:251
-#: src/chat/gnunet-chat.c:327 src/chat/gnunet-chat.c:369
-#: src/chat/gnunet-chat.c:398 src/chat/gnunet-chat.c:698
+#: 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 "匿名"
-#: src/chat/gnunet-chat.c:143
+#: src/chat/gnunet-chat.c:144
#, fuzzy, c-format
msgid "(%s) `%s' said: %s\n"
msgstr "“%s”说:%s\n"
-#: src/chat/gnunet-chat.c:146 src/chat/gnunet-chat.c:149
+#: 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"
-#: src/chat/gnunet-chat.c:152
+#: src/chat/gnunet-chat.c:153
#, fuzzy, c-format
msgid "(%s) `%s' said for sure: %s\n"
msgstr "“%s”对您说:%s\n"
-#: src/chat/gnunet-chat.c:155
+#: src/chat/gnunet-chat.c:156
#, fuzzy, c-format
msgid "(%s) `%s' said to you for sure: %s\n"
msgstr "“%s”对您说:%s\n"
-#: src/chat/gnunet-chat.c:158
+#: src/chat/gnunet-chat.c:159
#, c-format
msgid "(%s) `%s' was confirmed that you received: %s\n"
msgstr ""
-#: src/chat/gnunet-chat.c:161
+#: src/chat/gnunet-chat.c:162
#, c-format
msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
msgstr ""
-#: src/chat/gnunet-chat.c:164
+#: src/chat/gnunet-chat.c:165
#, c-format
msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
msgstr ""
-#: src/chat/gnunet-chat.c:169
+#: 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 ""
-#: src/chat/gnunet-chat.c:172
+#: src/chat/gnunet-chat.c:173
#, fuzzy, c-format
msgid "(%s) `%s' said off the record: %s\n"
msgstr "“%s”对您说:%s\n"
-#: src/chat/gnunet-chat.c:175
+#: src/chat/gnunet-chat.c:176
#, c-format
msgid "(%s) <%s> said using an unknown message type: %s\n"
msgstr ""
-#: src/chat/gnunet-chat.c:216
+#: src/chat/gnunet-chat.c:217
#, c-format
msgid "'%s' acknowledged message #%d\n"
msgstr ""
-#: src/chat/gnunet-chat.c:258
+#: src/chat/gnunet-chat.c:260
#, c-format
msgid "`%s' entered the room\n"
msgstr "“%s”进入了房间\n"
-#: src/chat/gnunet-chat.c:258
+#: src/chat/gnunet-chat.c:260
#, c-format
msgid "`%s' left the room\n"
msgstr "“%s”离开了房间\n"
-#: src/chat/gnunet-chat.c:319 src/chat/gnunet-chat.c:361
+#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
#, fuzzy
msgid "Could not change username\n"
msgstr "已将用户名改为“%s”。\n"
-#: src/chat/gnunet-chat.c:332 src/chat/gnunet-chat.c:700
+#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
#, c-format
msgid "Joining room `%s' as user `%s'...\n"
msgstr ""
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:373
#, fuzzy, c-format
msgid "Changed username to `%s'\n"
msgstr "已将用户名改为“%s”。\n"
-#: src/chat/gnunet-chat.c:386
+#: src/chat/gnunet-chat.c:388
#, c-format
msgid "Users in room `%s': "
msgstr "房间“%s”中的用户:"
-#: src/chat/gnunet-chat.c:432
+#: src/chat/gnunet-chat.c:434
msgid "Syntax: /msg USERNAME MESSAGE"
msgstr "语法:/msg 用户名 消息"
-#: src/chat/gnunet-chat.c:441
+#: src/chat/gnunet-chat.c:443
#, c-format
msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
msgstr ""
-#: src/chat/gnunet-chat.c:458
+#: src/chat/gnunet-chat.c:460
#, c-format
msgid "User `%s' is currently not in the room!\n"
msgstr "用户“%s”当前不在房间里!\n"
-#: src/chat/gnunet-chat.c:511
+#: src/chat/gnunet-chat.c:513
#, fuzzy, c-format
msgid "Unknown command `%s'\n"
msgstr "未知的命令“%s”。\n"
-#: src/chat/gnunet-chat.c:522
+#: 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 ""
-#: src/chat/gnunet-chat.c:526
+#: 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 ""
-#: src/chat/gnunet-chat.c:530
+#: src/chat/gnunet-chat.c:532
msgid ""
"Use `/msg nickname message' to send a private message to the specified user"
msgstr ""
-#: src/chat/gnunet-chat.c:533
+#: src/chat/gnunet-chat.c:535
msgid "The `/notice' command is an alias for `/msg'"
msgstr ""
-#: src/chat/gnunet-chat.c:535
+#: src/chat/gnunet-chat.c:537
msgid "The `/query' command is an alias for `/msg'"
msgstr ""
-#: src/chat/gnunet-chat.c:537
+#: src/chat/gnunet-chat.c:539
msgid "Use `/sig message' to send a signed public message"
msgstr ""
-#: src/chat/gnunet-chat.c:540
+#: src/chat/gnunet-chat.c:542
msgid "Use `/ack message' to require signed acknowledgment of the message"
msgstr ""
-#: src/chat/gnunet-chat.c:543
+#: src/chat/gnunet-chat.c:545
msgid "Use `/anonymous message' to send a public anonymous message"
msgstr ""
-#: src/chat/gnunet-chat.c:545
+#: src/chat/gnunet-chat.c:547
msgid "The `/anon' command is an alias for `/anonymous'"
msgstr ""
-#: src/chat/gnunet-chat.c:547
+#: src/chat/gnunet-chat.c:549
msgid "Use `/quit' to terminate gnunet-chat"
msgstr ""
-#: src/chat/gnunet-chat.c:549
+#: src/chat/gnunet-chat.c:551
msgid "The `/leave' command is an alias for `/quit'"
msgstr ""
-#: src/chat/gnunet-chat.c:552
+#: src/chat/gnunet-chat.c:554
msgid "Use `/names' to list all of the current members in the chat room"
msgstr ""
-#: src/chat/gnunet-chat.c:554
+#: src/chat/gnunet-chat.c:556
msgid "Use `/help command' to get help for a specific command"
msgstr ""
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:672
msgid "You must specify a nickname\n"
msgstr "您必须指定一个昵称\n"
-#: src/chat/gnunet-chat.c:686
+#: src/chat/gnunet-chat.c:688
#, c-format
msgid "Failed to join room `%s'\n"
msgstr ""
-#: src/chat/gnunet-chat.c:725
+#: src/chat/gnunet-chat.c:727
msgid "set the nickname to use (required)"
msgstr "设置要使用的昵称(必须)"
-#: src/chat/gnunet-chat.c:728
+#: src/chat/gnunet-chat.c:730
msgid "set the chat room to join"
msgstr "设置要加入的聊天室"
-#: src/chat/gnunet-chat.c:740
+#: src/chat/gnunet-chat.c:742
msgid "Join a chat on GNUnet."
msgstr ""
@@ -581,7 +581,7 @@ msgstr ""
msgid "# messages discarded (session disconnected)"
msgstr ""
-#: src/core/gnunet-service-core_clients.c:817
+#: src/core/gnunet-service-core_clients.c:818
#, c-format
msgid "# bytes of messages of type %u received"
msgstr ""
@@ -594,7 +594,7 @@ msgstr ""
msgid "# bytes decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3002
+#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
msgid "Error in communication with PEERINFO service\n"
msgstr ""
@@ -699,16 +699,16 @@ msgstr ""
msgid "# bytes of payload decrypted"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1699
+#: src/core/gnunet-service-core_kx.c:1700
#, fuzzy
msgid "Core service is lacking HOSTKEY configuration setting. Exiting.\n"
msgstr "立即保存配置?"
-#: src/core/gnunet-service-core_kx.c:1707
+#: src/core/gnunet-service-core_kx.c:1708
msgid "Core service could not access hostkey. Exiting.\n"
msgstr ""
-#: src/core/gnunet-service-core_kx.c:1717 src/hostlist/hostlist-server.c:551
+#: src/core/gnunet-service-core_kx.c:1718 src/hostlist/hostlist-server.c:551
#: src/peerinfo-tool/gnunet-peerinfo.c:823
#: src/transport/gnunet-service-transport.c:611
msgid "Could not access PEERINFO service. Exiting.\n"
@@ -734,7 +734,17 @@ msgstr ""
#: src/core/gnunet-service-core_sessions.c:206
#: src/core/gnunet-service-core_sessions.c:269
-msgid "# entries in session map"
+#: src/dht/gnunet-service-dht_neighbours.c:625
+#: src/dht/gnunet-service-dht_neighbours.c:683
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
+#: src/topology/gnunet-daemon-topology.c:709
+#: src/topology/gnunet-daemon-topology.c:810
+#: src/transport/gnunet-service-transport_neighbours.c:874
+#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:2568
+#: src/transport/gnunet-service-transport_neighbours.c:2814
+msgid "# peers connected"
msgstr ""
#: src/core/gnunet-service-core_sessions.c:236
@@ -1158,7 +1168,7 @@ msgid "how long to execute this query before giving up?"
msgstr ""
#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-download.c:270
+#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-download.c:271
#: src/fs/gnunet-publish.c:731 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:910
@@ -1322,14 +1332,6 @@ msgstr ""
msgid "# FIND PEER messages initiated"
msgstr ""
-#: src/dht/gnunet-service-dht_neighbours.c:625
-#: src/dht/gnunet-service-dht_neighbours.c:683
-#, fuzzy
-msgid "# Peers connected"
-msgstr ""
-"\n"
-"按任意键继续\n"
-
#: src/dht/gnunet-service-dht_neighbours.c:717
msgid "# Queued messages discarded (peer disconnected)"
msgstr ""
@@ -1513,21 +1515,21 @@ msgstr ""
msgid "# DNS requests received via TUN interface"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1464
+#: src/dns/gnunet-service-dns.c:1465
#, c-format
msgid "Configured DNS exit `%s' is not working / valid.\n"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1496 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2674
msgid "# Inbound MESH tunnels created"
msgstr ""
-#: src/dns/gnunet-service-dns.c:1560 src/exit/gnunet-daemon-exit.c:3031
+#: 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:1580
+#: src/dns/gnunet-service-dns.c:1581
msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
msgstr ""
@@ -1550,15 +1552,15 @@ 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:1394
-#: src/vpn/gnunet-service-vpn.c:1794 src/vpn/gnunet-service-vpn.c:1957
+#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2069
+#: src/exit/gnunet-daemon-exit.c:2319 src/vpn/gnunet-service-vpn.c:1394
+#: src/vpn/gnunet-service-vpn.c:1795 src/vpn/gnunet-service-vpn.c:1958
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:1450
-#: src/vpn/gnunet-service-vpn.c:1853 src/vpn/gnunet-service-vpn.c:1990
+#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2128
+#: src/exit/gnunet-daemon-exit.c:2378 src/vpn/gnunet-service-vpn.c:1450
+#: src/vpn/gnunet-service-vpn.c:1854 src/vpn/gnunet-service-vpn.c:1991
msgid "# ICMPv6 packets dropped (type not allowed)"
msgstr ""
@@ -1605,124 +1607,124 @@ msgstr ""
msgid "Packet from unknown protocol %u received. Ignored.\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1470
+#: src/exit/gnunet-daemon-exit.c:1471
msgid "# TCP packets sent via TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1571
msgid "# TCP service creation requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1573 src/exit/gnunet-daemon-exit.c:1652
-#: src/exit/gnunet-daemon-exit.c:1762 src/exit/gnunet-daemon-exit.c:1992
-#: src/exit/gnunet-daemon-exit.c:2234 src/exit/gnunet-daemon-exit.c:2515
-#: src/exit/gnunet-daemon-exit.c:2615
+#: src/exit/gnunet-daemon-exit.c:1574 src/exit/gnunet-daemon-exit.c:1653
+#: src/exit/gnunet-daemon-exit.c:1763 src/exit/gnunet-daemon-exit.c:1993
+#: src/exit/gnunet-daemon-exit.c:2235 src/exit/gnunet-daemon-exit.c:2516
+#: src/exit/gnunet-daemon-exit.c:2616
msgid "# Bytes received from MESH"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1606 src/exit/gnunet-daemon-exit.c:2637
+#: src/exit/gnunet-daemon-exit.c:1607 src/exit/gnunet-daemon-exit.c:2638
#, c-format
msgid "No service found for %s on port %d!\n"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1610
+#: src/exit/gnunet-daemon-exit.c:1611
msgid "# TCP requests dropped (no such service)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1655
+#: src/exit/gnunet-daemon-exit.c:1656
msgid "# TCP IP-exit creation requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1766
msgid "# TCP data requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1779
+#: src/exit/gnunet-daemon-exit.c:1780
msgid "# TCP DATA requests dropped (no session)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1829
+#: src/exit/gnunet-daemon-exit.c:1830
msgid "# ICMP packets sent via TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:1995
+#: src/exit/gnunet-daemon-exit.c:1996
msgid "# ICMP IP-exit requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2237
+#: src/exit/gnunet-daemon-exit.c:2238
msgid "# ICMP service requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1384
-#: src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:2304 src/vpn/gnunet-service-vpn.c:1384
+#: src/vpn/gnunet-service-vpn.c:1952
msgid "# ICMPv4 packets dropped (impossible PT to v6)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1420
-#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1841
+#: src/exit/gnunet-daemon-exit.c:2363 src/vpn/gnunet-service-vpn.c:1420
+#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1842
msgid "# ICMPv6 packets dropped (impossible PT to v4)"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2412
+#: src/exit/gnunet-daemon-exit.c:2413
msgid "# UDP packets sent via TUN"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2518
+#: src/exit/gnunet-daemon-exit.c:2519
msgid "# UDP IP-exit requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2618
+#: src/exit/gnunet-daemon-exit.c:2619
msgid "# UDP service requests received via mesh"
msgstr ""
-#: src/exit/gnunet-daemon-exit.c:2641
+#: src/exit/gnunet-daemon-exit.c:2642
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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3236
msgid "Daemon to run to provide an IP exit node for the VPN"
msgstr ""
@@ -1730,43 +1732,47 @@ msgstr ""
msgid "# acknowledgements sent for fragment"
msgstr ""
-#: src/fragmentation/defragmentation.c:454
+#: src/fragmentation/defragmentation.c:456
msgid "# fragments received"
msgstr ""
-#: src/fragmentation/defragmentation.c:513
+#: src/fragmentation/defragmentation.c:521
msgid "# duplicate fragments received"
msgstr ""
-#: src/fragmentation/defragmentation.c:526
+#: src/fragmentation/defragmentation.c:534
msgid "# messages defragmented"
msgstr ""
-#: src/fragmentation/fragmentation.c:199
+#: src/fragmentation/fragmentation.c:203
msgid "# fragments transmitted"
msgstr ""
-#: src/fragmentation/fragmentation.c:202
+#: src/fragmentation/fragmentation.c:206
msgid "# fragments retransmitted"
msgstr ""
-#: src/fragmentation/fragmentation.c:266
+#: src/fragmentation/fragmentation.c:232
+msgid "# fragments wrap arounds"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:273
msgid "# messages fragmented"
msgstr ""
-#: src/fragmentation/fragmentation.c:269
+#: src/fragmentation/fragmentation.c:276
msgid "# total size of fragmented messages"
msgstr ""
-#: src/fragmentation/fragmentation.c:354
+#: src/fragmentation/fragmentation.c:363
msgid "# fragment acknowledgements received"
msgstr ""
-#: src/fragmentation/fragmentation.c:360
+#: src/fragmentation/fragmentation.c:369
msgid "# bits removed from fragmentation ACKs"
msgstr ""
-#: src/fragmentation/fragmentation.c:384
+#: src/fragmentation/fragmentation.c:393
msgid "# fragmentation transmissions completed"
msgstr ""
@@ -1858,43 +1864,48 @@ msgstr ""
msgid "Directory too large for system address space\n"
msgstr ""
-#: src/fs/fs_download.c:499 src/fs/fs_download.c:511
+#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
#, fuzzy, c-format
msgid "Failed to open file `%s' for writing"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/fs/fs_download.c:880
+#: src/fs/fs_download.c:878
#, c-format
msgid "Failed to create directory for recursive download of `%s'\n"
msgstr ""
-#: src/fs/fs_download.c:962
+#: src/fs/fs_download.c:960
#, 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 ""
-#: src/fs/fs_download.c:988
+#: src/fs/fs_download.c:986
msgid "internal error decrypting content"
msgstr ""
-#: src/fs/fs_download.c:1011
+#: src/fs/fs_download.c:1009
#, 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"
-#: src/fs/fs_download.c:1021
+#: src/fs/fs_download.c:1019
#, 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"
-#: src/fs/fs_download.c:1030
+#: src/fs/fs_download.c:1028
#, 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"
-#: src/fs/fs_download.c:1886
+#: src/fs/fs_download.c:1125
+#, fuzzy
+msgid "internal error decoding tree"
+msgstr "未知错误。\n"
+
+#: src/fs/fs_download.c:1888
#, fuzzy
msgid "Invalid URI"
msgstr "无效条目。\n"
@@ -2040,7 +2051,7 @@ msgstr ""
msgid "Could not connect to datastore."
msgstr ""
-#: src/fs/fs_search.c:828
+#: src/fs/fs_search.c:829
#, c-format
msgid "Got result with unknown block type `%d', ignoring"
msgstr ""
@@ -2217,92 +2228,92 @@ msgstr "更改 GNUnet 目录的权限出错"
msgid "Display contents of a GNUnet directory"
msgstr "更改 GNUnet 目录的权限出错"
-#: src/fs/gnunet-download.c:100
+#: src/fs/gnunet-download.c:101
#, fuzzy, c-format
msgid "Starting download `%s'.\n"
msgstr "未知的命令“%s”。\n"
-#: src/fs/gnunet-download.c:109
+#: src/fs/gnunet-download.c:110
#, fuzzy
msgid "<unknown time>"
msgstr "未知错误"
-#: src/fs/gnunet-download.c:118
+#: src/fs/gnunet-download.c:119
#, 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:129
#, c-format
msgid "Error downloading: %s.\n"
msgstr ""
-#: src/fs/gnunet-download.c:136
+#: src/fs/gnunet-download.c:137
#, 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:152 src/fs/gnunet-publish.c:190
#: 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:177
#, fuzzy
msgid "You need to specify a URI argument.\n"
msgstr "您必须指定一个昵称\n"
-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:624
+#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
#, 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:190
msgid "Only CHK or LOC URIs supported.\n"
msgstr ""
-#: src/fs/gnunet-download.c:196
+#: src/fs/gnunet-download.c:197
msgid "Target filename must be specified.\n"
msgstr ""
-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:602
+#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
#: 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:248 src/fs/gnunet-search.c:285
msgid "set the desired LEVEL of receiver-anonymity"
msgstr ""
-#: src/fs/gnunet-download.c:250
+#: src/fs/gnunet-download.c:251
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:254 src/fs/gnunet-search.c:288
msgid "only search the local peer (no P2P network search)"
msgstr ""
-#: src/fs/gnunet-download.c:256
+#: src/fs/gnunet-download.c:257
msgid "write the file to FILENAME"
msgstr ""
-#: src/fs/gnunet-download.c:260
+#: src/fs/gnunet-download.c:261
msgid "set the maximum number of parallel downloads that is allowed"
msgstr ""
-#: src/fs/gnunet-download.c:264
+#: src/fs/gnunet-download.c:265
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:268
msgid "download a GNUnet directory recursively"
msgstr ""
-#: src/fs/gnunet-download.c:277
+#: src/fs/gnunet-download.c:278
msgid ""
"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
"chk/...)"
@@ -2316,64 +2327,64 @@ msgstr ""
msgid "Special file-sharing operations"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:159 src/statistics/gnunet-statistics.c:149
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:167
#, fuzzy, c-format
msgid "Invalid argument `%s'\n"
msgstr "“%s”的参数无效。\n"
-#: src/fs/gnunet-pseudonym.c:249 src/fs/gnunet-pseudonym.c:256
-#: src/fs/gnunet-pseudonym.c:258
+#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
+#: src/fs/gnunet-pseudonym.c:259
#, fuzzy, c-format
msgid "Option `%s' ignored\n"
msgstr "%s:选项“%s”有歧义\n"
-#: src/fs/gnunet-pseudonym.c:278 src/fs/gnunet-publish.c:678
+#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
msgid "set the desired LEVEL of sender-anonymity"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:281
+#: src/fs/gnunet-pseudonym.c:282
msgid "create or advertise namespace NAME"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:284
+#: src/fs/gnunet-pseudonym.c:285
msgid "delete namespace NAME "
msgstr ""
-#: src/fs/gnunet-pseudonym.c:287
+#: src/fs/gnunet-pseudonym.c:288
msgid ""
"add an additional keyword for the advertisment (this option can be specified "
"multiple times)"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:291 src/fs/gnunet-publish.c:697
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:697
msgid "set the meta-data for the given TYPE to the given VALUE"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:294
+#: src/fs/gnunet-pseudonym.c:295
msgid "print names of local namespaces"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:298
msgid "use the given PRIORITY for the advertisments"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:301
msgid "do not print names of remote namespaces"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:303 src/fs/gnunet-publish.c:716
+#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
msgid "set the desired replication LEVEL"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:306
+#: src/fs/gnunet-pseudonym.c:307
msgid "specify ID of the root of the namespace"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:309
+#: src/fs/gnunet-pseudonym.c:310
msgid "change rating of namespace ID by VALUE"
msgstr ""
-#: src/fs/gnunet-pseudonym.c:317
+#: src/fs/gnunet-pseudonym.c:318
msgid "Manage GNUnet pseudonyms."
msgstr ""
@@ -2604,22 +2615,12 @@ msgid "# Loopback routes suppressed"
msgstr ""
#: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1267
-#: src/topology/gnunet-daemon-topology.c:1274
+#: 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"
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
-#: src/topology/gnunet-daemon-topology.c:647
-#: src/topology/gnunet-daemon-topology.c:747
-#: src/transport/gnunet-service-transport_neighbours.c:816
-#: src/transport/gnunet-service-transport_neighbours.c:1015
-#: src/transport/gnunet-service-transport_neighbours.c:2431
-#: src/transport/gnunet-service-transport_neighbours.c:2675
-msgid "# peers connected"
-msgstr ""
-
#: src/fs/gnunet-service-fs_cp.c:696
msgid "# migration stop messages received"
msgstr ""
@@ -2942,32 +2943,32 @@ msgstr ""
msgid "Reply mismatched in terms of namespace. Discarded.\n"
msgstr ""
-#: src/gns/gnunet-gns.c:188
+#: src/gns/gnunet-gns.c:191
#, fuzzy
msgid "Failed to connect to GNS\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-gns.c:229
+#: src/gns/gnunet-gns.c:232
msgid "try to shorten a given GNS name"
msgstr ""
-#: src/gns/gnunet-gns.c:232
+#: src/gns/gnunet-gns.c:235
msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
msgstr ""
-#: src/gns/gnunet-gns.c:235
+#: src/gns/gnunet-gns.c:238
msgid "Get the authority of a particular name"
msgstr ""
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:241
msgid "Specify the type of the record lookup"
msgstr ""
-#: src/gns/gnunet-gns.c:241
+#: src/gns/gnunet-gns.c:244
msgid "No unneeded output"
msgstr ""
-#: src/gns/gnunet-gns.c:252
+#: src/gns/gnunet-gns.c:255
msgid "GNUnet GNS access tool"
msgstr ""
@@ -3016,7 +3017,7 @@ msgstr "无法为守护程序创建用户账户。"
msgid "Failed to connect to namestore\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/gns/gnunet-gns-fcfsd.c:773
+#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
#, fuzzy
msgid "Failed to start HTTP server\n"
msgstr "初始化“%s”服务失败。\n"
@@ -3029,6 +3030,14 @@ msgstr ""
msgid "Issue a request to the GNUnet Naming System, prints results."
msgstr ""
+#: src/gns/gnunet-gns-proxy.c:800
+msgid "listen on specified port"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:811
+msgid "GNUnet GNS proxy"
+msgstr ""
+
#: src/hello/gnunet-hello.c:122
msgid "Call with name of HELLO file to modify.\n"
msgstr ""
@@ -3123,7 +3132,7 @@ msgstr ""
msgid "%s failed at %s:%d: `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1332
+#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
msgid "# advertised hostlist URIs"
msgstr ""
@@ -3151,8 +3160,8 @@ msgstr ""
#: src/hostlist/hostlist-client.c:836
#, 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:842
#, c-format
@@ -3173,7 +3182,7 @@ msgstr ""
msgid "# hostlist downloads initiated"
msgstr ""
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1506
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
msgid "# milliseconds between hostlist downloads"
msgstr ""
@@ -3195,86 +3204,86 @@ msgstr ""
msgid "# active connections"
msgstr ""
-#: src/hostlist/hostlist-client.c:1243
+#: src/hostlist/hostlist-client.c:1242
#, c-format
msgid "Initial time between hostlist downloads is %llums\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1274
+#: src/hostlist/hostlist-client.c:1273
#, c-format
msgid ""
"No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/hostlist-client.c:1279
#, c-format
msgid "Loading saved hostlist entries from file `%s' \n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1284
+#: src/hostlist/hostlist-client.c:1283
#, c-format
msgid "Hostlist file `%s' is not existing\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1295
+#: 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"
-#: src/hostlist/hostlist-client.c:1328
+#: src/hostlist/hostlist-client.c:1327
#, c-format
msgid "%u hostlist URIs loaded from file\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1330
+#: src/hostlist/hostlist-client.c:1329
msgid "# hostlist URIs read from file"
msgstr ""
-#: src/hostlist/hostlist-client.c:1363
+#: src/hostlist/hostlist-client.c:1362
#, c-format
msgid ""
"No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1377
+#: 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"
-#: src/hostlist/hostlist-client.c:1382
+#: src/hostlist/hostlist-client.c:1381
#, c-format
msgid "Writing %u hostlist URIs to `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1406 src/hostlist/hostlist-client.c:1423
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
#, c-format
msgid "Error writing hostlist URIs to file `%s'\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1418
+#: src/hostlist/hostlist-client.c:1417
msgid "# hostlist URIs written to file"
msgstr ""
-#: src/hostlist/hostlist-client.c:1471
+#: src/hostlist/hostlist-client.c:1470
msgid "Learning is enabled on this peer\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1474
+#: src/hostlist/hostlist-client.c:1473
#, c-format
msgid "Hostlists will be saved to file again in %llums\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/hostlist-client.c:1482
msgid "Learning is not enabled on this peer\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1495
+#: src/hostlist/hostlist-client.c:1494
#, c-format
msgid ""
"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
msgstr ""
-#: src/hostlist/hostlist-client.c:1499
+#: src/hostlist/hostlist-client.c:1498
#, c-format
msgid "Hostlist file `%s' could not be removed\n"
msgstr ""
@@ -3290,7 +3299,7 @@ msgstr ""
#: 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:864
+#: src/topology/gnunet-daemon-topology.c:927
#, c-format
msgid "Error in communication with PEERINFO service: %s\n"
msgstr ""
@@ -3393,16 +3402,16 @@ msgstr ""
msgid "help text"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:4596
+#: src/mesh/gnunet-service-mesh.c:4590 src/mesh/gnunet-service-mesh_new.c:4618
msgid "Wrong CORE service\n"
msgstr ""
-#: src/mesh/gnunet-service-mesh.c:4790
+#: src/mesh/gnunet-service-mesh.c:4784 src/mesh/gnunet-service-mesh_new.c:4812
#, fuzzy
msgid "Mesh service is lacking key configuration settings. Exiting.\n"
msgstr "立即保存配置?"
-#: src/mesh/gnunet-service-mesh.c:4799
+#: src/mesh/gnunet-service-mesh.c:4793 src/mesh/gnunet-service-mesh_new.c:4821
#, fuzzy
msgid "Mesh service could not access hostkey. Exiting.\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -3548,11 +3557,11 @@ msgstr ""
msgid "Stored zonekey for zone `%s' in file `%s'\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/namestore/gnunet-service-namestore.c:1911
+#: src/namestore/gnunet-service-namestore.c:1909
msgid "No directory to load zonefiles specified in configuration\n"
msgstr ""
-#: src/namestore/gnunet-service-namestore.c:1920
+#: src/namestore/gnunet-service-namestore.c:1918
#, c-format
msgid "Creating directory `%s' for zone files failed!\n"
msgstr ""
@@ -3636,11 +3645,11 @@ msgstr ""
msgid "Running gnunet-helper-nat-client %s %s %u\n"
msgstr ""
-#: src/nat/nat_test.c:336
+#: src/nat/nat_test.c:341
msgid "Failed to connect to `gnunet-nat-server'\n"
msgstr ""
-#: src/nat/nat_test.c:406
+#: src/nat/nat_test.c:411
#, c-format
msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
msgstr ""
@@ -3655,16 +3664,16 @@ msgstr "无法访问该服务"
msgid "Proof of work invalid: %llu!\n"
msgstr ""
-#: src/nse/gnunet-service-nse.c:1388 src/nse/gnunet-service-nse.c:1407
-#: src/nse/gnunet-service-nse.c:1428
+#: 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 ""
-#: src/nse/gnunet-service-nse.c:1395
+#: src/nse/gnunet-service-nse.c:1388
msgid "Invalid work requirement for NSE service. Exiting.\n"
msgstr ""
-#: src/nse/gnunet-service-nse.c:1416
+#: src/nse/gnunet-service-nse.c:1409
#, fuzzy
msgid "NSE service could not access hostkey. Exiting.\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -3904,52 +3913,52 @@ msgstr "初始化“%s”服务失败。\n"
msgid "Daemon to run to perform IP protocol translation to GNUnet"
msgstr ""
-#: src/statistics/gnunet-service-statistics.c:270
+#: src/statistics/gnunet-service-statistics.c:271
#, c-format
msgid "Loading %llu bytes of statistics from `%s'\n"
msgstr ""
-#: src/statistics/gnunet-service-statistics.c:329
+#: src/statistics/gnunet-service-statistics.c:330
#, c-format
msgid "Wrote %llu bytes of statistics to `%s'\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:104
+#: src/statistics/gnunet-statistics.c:122
#, fuzzy
msgid "Failed to obtain statistics.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/statistics/gnunet-statistics.c:181
+#: src/statistics/gnunet-statistics.c:199
#, c-format
msgid "No subsystem or name given\n"
msgstr ""
-#: src/statistics/gnunet-statistics.c:189
+#: src/statistics/gnunet-statistics.c:207
#, fuzzy, c-format
msgid "Failed to initialize watch routine\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/statistics/gnunet-statistics.c:209
+#: src/statistics/gnunet-statistics.c:227
msgid "limit output to statistics for the given NAME"
msgstr ""
-#: src/statistics/gnunet-statistics.c:212
+#: src/statistics/gnunet-statistics.c:230
msgid "make the value being set persistent"
msgstr ""
-#: src/statistics/gnunet-statistics.c:215
+#: src/statistics/gnunet-statistics.c:233
msgid "limit output to the given SUBSYSTEM"
msgstr ""
-#: src/statistics/gnunet-statistics.c:218
+#: src/statistics/gnunet-statistics.c:236
msgid "just print the statistics value"
msgstr ""
-#: src/statistics/gnunet-statistics.c:221
+#: src/statistics/gnunet-statistics.c:239
msgid "watch value continously"
msgstr ""
-#: src/statistics/gnunet-statistics.c:228
+#: src/statistics/gnunet-statistics.c:246
msgid "Print statistics about GNUnet operations."
msgstr ""
@@ -4106,7 +4115,7 @@ msgstr ""
msgid "Starting service %s for peer `%4s'\n"
msgstr "卸载 GNUnet 服务"
-#: src/testing/testing.c:1207 src/testing/testing_group.c:6159
+#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
#, fuzzy, c-format
msgid "Could not start `%s' process to copy configuration directory.\n"
msgstr "找不到主机“%s”的 IP:%s\n"
@@ -4156,139 +4165,205 @@ msgstr "加载 sqstore 服务失败。检查您的配置!\n"
msgid "Peers are not fully running yet, can not connect!\n"
msgstr ""
-#: src/testing/testing_group.c:1900 src/testing/testing_group.c:1912
-#: src/testing/testing_group.c:2013 src/testing/testing_group.c:2070
-#: src/testing/testing_group.c:2157 src/testing/testing_group.c:2177
-#: src/testing/testing_group.c:2307 src/testing/testing_peergroup.c:950
+#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
+#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
+#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
+#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
#, fuzzy, c-format
msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
msgstr "配置不满足配置规范文件“%s”的约束!\n"
-#: src/testing/testing_group.c:2165
+#: src/testing/testing_group.c:2160
#, 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:2882 src/testing/testing_group.c:3068
+#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
#, c-format
msgid ""
"No `%s' specified in peer configuration in section `%s', cannot copy friends "
"file!\n"
msgstr ""
-#: src/testing/testing_group.c:3962
+#: src/testing/testing_group.c:3957
msgid "Creating no allowed topology (all peers can connect at core level)\n"
msgstr ""
-#: src/testing/testing_group.c:5231
+#: src/testing/testing_group.c:5226
msgid "Unknown topology specification, can't connect peers!\n"
msgstr ""
-#: src/testing/testing_group.c:5949 src/transport/transport-testing.c:636
+#: src/testing/testing_group.c:5944 src/transport/transport-testing.c:636
#, fuzzy
msgid "Could not read hostkeys file!\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/testing/testing_group.c:6016
+#: src/testing/testing_group.c:6011
#, fuzzy, c-format
msgid "Could not create configuration for peer number %u on `%s'!\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/topology/gnunet-daemon-topology.c:244
+#: src/testing/testing_new.c:169
+msgid "tmppath cannot be NULL\n"
+msgstr ""
+
+#: src/testing/testing_new.c:356
+#, c-format
+msgid "Hostkeys file not found: %s\n"
+msgstr ""
+
+#: src/testing/testing_new.c:365
+#, fuzzy, c-format
+msgid "Could not open hostkeys file: %s\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/testing/testing_new.c:380
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
+msgstr ""
+
+#: src/testing/testing_new.c:437
+#, c-format
+msgid "Key number %u does not exist\n"
+msgstr ""
+
+#: src/testing/testing_new.c:446
+#, fuzzy, c-format
+msgid "Error while decoding key %u\n"
+msgstr "解析 dscl 输出时出错。\n"
+
+#: src/testing/testing_new.c:680
+#, fuzzy
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/testing/testing_new.c:691
+#, c-format
+msgid ""
+"You attempted to create a testbed with more than %u hosts. Please "
+"precompute more hostkeys first.\n"
+msgstr ""
+
+#: src/testing/testing_new.c:704
+#, fuzzy, c-format
+msgid "Failed to initialize hostkey for peer %u\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/testing/testing_new.c:734
+#, fuzzy, c-format
+msgid "Failed to write hostkey file for peer %u: %s\n"
+msgstr "发送消息失败。\n"
+
+#: src/testing/testing_new.c:751
+#, fuzzy, c-format
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/testing/testing_new.c:791
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/testing/testing_new.c:959
+#, fuzzy, c-format
+msgid "Failed to load configuration from %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/topology/gnunet-daemon-topology.c:259
msgid "# peers blacklisted"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:375
+#: src/topology/gnunet-daemon-topology.c:392
msgid "# connect requests issued to transport"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:668
-#: src/topology/gnunet-daemon-topology.c:752
+#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:815
msgid "# friends connected"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:933
+#: src/topology/gnunet-daemon-topology.c:996
msgid "Failed to connect to core service, can not manage topology!\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:963
+#: src/topology/gnunet-daemon-topology.c:1026
#, c-format
msgid "Option `%s' in section `%s' not specified!\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:976
+#: src/topology/gnunet-daemon-topology.c:1039
#, c-format
msgid "Could not read friends list `%s'\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:982
+#: src/topology/gnunet-daemon-topology.c:1045
#, c-format
msgid "Friends file `%s' is empty.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:991
+#: src/topology/gnunet-daemon-topology.c:1054
#, c-format
msgid "Failed to read friends list from `%s': out of memory\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:999
+#: src/topology/gnunet-daemon-topology.c:1062
#, c-format
msgid "Failed to read friends list from `%s'\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1019
+#: src/topology/gnunet-daemon-topology.c:1082
#, c-format
msgid ""
"Syntax error in topology specification at offset %llu, skipping bytes.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1032
+#: src/topology/gnunet-daemon-topology.c:1095
#, c-format
msgid ""
"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1042
+#: src/topology/gnunet-daemon-topology.c:1105
#, fuzzy, c-format
msgid "Found friend `%s' in configuration\n"
msgstr ""
"\n"
"结束配置。\n"
-#: src/topology/gnunet-daemon-topology.c:1048
+#: src/topology/gnunet-daemon-topology.c:1111
#, c-format
msgid "Found myself `%s' in friend list (useless, ignored)\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1058
+#: src/topology/gnunet-daemon-topology.c:1121
#, fuzzy
msgid "# friends in configuration"
msgstr ""
"\n"
"结束配置。\n"
-#: src/topology/gnunet-daemon-topology.c:1064
+#: src/topology/gnunet-daemon-topology.c:1127
msgid ""
"Fewer friends specified than required by minimum friend count. Will only "
"connect to friends.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1071
+#: src/topology/gnunet-daemon-topology.c:1134
msgid ""
"More friendly connections required than target total number of connections.\n"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1106
+#: src/topology/gnunet-daemon-topology.c:1169
msgid "# HELLO messages received"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1161
+#: src/topology/gnunet-daemon-topology.c:1224
msgid "# HELLO messages gossipped"
msgstr ""
-#: src/topology/gnunet-daemon-topology.c:1300
+#: src/topology/gnunet-daemon-topology.c:1363
msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
msgstr ""
@@ -4380,101 +4455,101 @@ msgstr ""
msgid "# refreshed my HELLO"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:953
+#: src/transport/gnunet-service-transport_neighbours.c:1032
msgid "# DISCONNECT messages sent"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1068
-#: src/transport/gnunet-service-transport_neighbours.c:1410
+#: src/transport/gnunet-service-transport_neighbours.c:1148
+#: src/transport/gnunet-service-transport_neighbours.c:1482
msgid "# bytes in message queue for other peers"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1073
+#: src/transport/gnunet-service-transport_neighbours.c:1153
msgid "# messages transmitted to other peers"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1078
+#: src/transport/gnunet-service-transport_neighbours.c:1158
msgid "# transmission failures for messages to other peers"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1135
+#: src/transport/gnunet-service-transport_neighbours.c:1215
msgid "# messages timed out while in transport queue"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1174
+#: src/transport/gnunet-service-transport_neighbours.c:1254
msgid "# keepalives sent"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1198
+#: src/transport/gnunet-service-transport_neighbours.c:1278
msgid "# KEEPALIVE messages discarded (peer unknown)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1206
+#: src/transport/gnunet-service-transport_neighbours.c:1286
msgid "# KEEPALIVE messages discarded (no session)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1243
+#: src/transport/gnunet-service-transport_neighbours.c:1323
msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1252
+#: src/transport/gnunet-service-transport_neighbours.c:1332
msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1308
+#: src/transport/gnunet-service-transport_neighbours.c:1388
msgid "# messages discarded due to lack of neighbour record"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1342
+#: src/transport/gnunet-service-transport_neighbours.c:1422
msgid "# bandwidth quota violations by other peers"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:1358
+#: src/transport/gnunet-service-transport_neighbours.c:1438
msgid "# ms throttling suggested"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2409
+#: src/transport/gnunet-service-transport_neighbours.c:2544
msgid "# unexpected CONNECT_ACK messages (no peer)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2424
-#: src/transport/gnunet-service-transport_neighbours.c:2448
+#: src/transport/gnunet-service-transport_neighbours.c:2559
+#: src/transport/gnunet-service-transport_neighbours.c:2585
msgid "# unexpected CONNECT_ACK messages (not ready)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2461
+#: src/transport/gnunet-service-transport_neighbours.c:2598
msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2490
+#: src/transport/gnunet-service-transport_neighbours.c:2627
msgid "# unexpected CONNECT_ACK messages (disconnecting)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2668
+#: src/transport/gnunet-service-transport_neighbours.c:2807
msgid "# unexpected SESSION ACK messages"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2717
+#: src/transport/gnunet-service-transport_neighbours.c:2856
msgid "# SET QUOTA messages ignored (no such peer)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2731
+#: src/transport/gnunet-service-transport_neighbours.c:2870
msgid "# disconnects due to quota of 0"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2762
+#: src/transport/gnunet-service-transport_neighbours.c:2901
msgid "# disconnect messages ignored (old format)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2773
+#: src/transport/gnunet-service-transport_neighbours.c:2912
msgid "# disconnect messages ignored (timestamp)"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2804
+#: src/transport/gnunet-service-transport_neighbours.c:2943
msgid "# other peer asked to disconnect from us"
msgstr ""
-#: src/transport/gnunet-service-transport_neighbours.c:2881
+#: src/transport/gnunet-service-transport_neighbours.c:3020
msgid "# disconnected from peer upon explicit request"
msgstr ""
@@ -4528,7 +4603,7 @@ msgstr ""
msgid "# PONGs dropped, signature expired"
msgstr ""
-#: src/transport/gnunet-service-transport_validation.c:1135
+#: src/transport/gnunet-service-transport_validation.c:1136
#, c-format
msgid "Adding `%s' without addresses for peer `%s'\n"
msgstr ""
@@ -4628,76 +4703,76 @@ msgstr ""
msgid "Direct access to transport service."
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/plugin_transport_http.c:1087
+#: src/transport/plugin_transport_http.c:1100
msgid "Disabling IPv6 since it is not supported on this system!\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:1135
+#: src/transport/plugin_transport_http.c:1149
#, fuzzy
msgid "Require valid port number for service in configuration!\n"
msgstr "保存配置失败。"
-#: src/transport/plugin_transport_http.c:1160 src/util/service.c:1029
+#: src/transport/plugin_transport_http.c:1174 src/util/service.c:1036
#, fuzzy, c-format
msgid "Failed to resolve `%s': %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/transport/plugin_transport_http.c:1177 src/util/service.c:1046
+#: src/transport/plugin_transport_http.c:1191 src/util/service.c:1053
#, fuzzy, c-format
msgid "Failed to find %saddress for `%s'.\n"
msgstr "找不到接口“%s”的一个 IP 地址。\n"
-#: src/transport/plugin_transport_http.c:1282
+#: src/transport/plugin_transport_http.c:1296
#, c-format
msgid "Found %u addresses to report to NAT service\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:1295
+#: src/transport/plugin_transport_http.c:1309
#, c-format
msgid "FREEING %s\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:1370
+#: src/transport/plugin_transport_http.c:1386
msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:1383
+#: src/transport/plugin_transport_http.c:1399
#, fuzzy
msgid "Port is required! Fix in configuration\n"
msgstr ""
"\n"
"结束配置。\n"
-#: src/transport/plugin_transport_http.c:1394
+#: src/transport/plugin_transport_http.c:1410
msgid "Port 0, client only mode\n"
msgstr ""
-#: src/transport/plugin_transport_http.c:1414
+#: src/transport/plugin_transport_http.c:1430
#, 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:1444
+#: src/transport/plugin_transport_http.c:1460
#, c-format
msgid ""
"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
"Binding to all addresses!\n"
msgstr ""
-#: src/transport/plugin_transport_http_client.c:646
+#: src/transport/plugin_transport_http_client.c:624
#, c-format
msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
msgstr ""
-#: src/transport/plugin_transport_http_server.c:192
+#: 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 ""
-#: src/transport/plugin_transport_http_server.c:216
+#: src/transport/plugin_transport_http_server.c:202
msgid "No usable TLS certificate found and creating one failed!\n"
msgstr ""
@@ -4727,105 +4802,101 @@ 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 ""
-#: src/transport/plugin_transport_smtp.c:813
+#: src/transport/plugin_transport_smtp.c:811
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 ""
-#: src/transport/plugin_transport_smtp.c:816
+#: src/transport/plugin_transport_smtp.c:814
msgid "# bytes dropped by SMTP (outgoing)"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:559
+#: src/transport/plugin_transport_tcp.c:582
#, c-format
msgid "Unexpected address length: %u bytes\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:734
-#: src/transport/plugin_transport_tcp.c:821
-#: src/transport/plugin_transport_tcp.c:871
-#: src/transport/plugin_transport_tcp.c:956
-#: src/transport/plugin_transport_tcp.c:1050
-#: src/transport/plugin_transport_tcp.c:1067
+#: src/transport/plugin_transport_tcp.c:758
+#: src/transport/plugin_transport_tcp.c:847
+#: src/transport/plugin_transport_tcp.c:897
+#: src/transport/plugin_transport_tcp.c:983
+#: src/transport/plugin_transport_tcp.c:1077
+#: src/transport/plugin_transport_tcp.c:1094
msgid "# bytes currently in TCP buffers"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:741
-#: src/transport/plugin_transport_tcp.c:927
-#: src/transport/plugin_transport_tcp.c:1734
-#: src/transport/plugin_transport_tcp.c:2271
+#: src/transport/plugin_transport_tcp.c:765
+#: src/transport/plugin_transport_tcp.c:954
+#: src/transport/plugin_transport_tcp.c:1749
+#: src/transport/plugin_transport_tcp.c:2378
msgid "# TCP sessions active"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:825
+#: src/transport/plugin_transport_tcp.c:851
msgid "# bytes discarded by TCP (timeout)"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:874
+#: src/transport/plugin_transport_tcp.c:900
msgid "# bytes transmitted via TCP"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:960
+#: src/transport/plugin_transport_tcp.c:987
msgid "# bytes discarded by TCP (disconnect)"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:1250
+#: src/transport/plugin_transport_tcp.c:1279
#, c-format
msgid "Address of unexpected length: %u\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:1284
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1364
+#: src/transport/plugin_transport_tcp.c:1390
msgid "# transport-service disconnect requests for TCP"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:1776
+#: src/transport/plugin_transport_tcp.c:1790
msgid "# TCP WELCOME messages received"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:1961
msgid "# bytes received via TCP"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2009
+#: src/transport/plugin_transport_tcp.c:2031
msgid "# network-level TCP disconnect events"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2160 src/util/service.c:933
+#: src/transport/plugin_transport_tcp.c:2267 src/util/service.c:940
#, c-format
msgid "Require valid port number for service `%s' in configuration!\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2174
+#: src/transport/plugin_transport_tcp.c:2281
#, fuzzy
msgid "Failed to start service.\n"
msgstr "初始化“%s”服务失败。\n"
-#: src/transport/plugin_transport_tcp.c:2236
+#: src/transport/plugin_transport_tcp.c:2343
#, c-format
msgid "Failed to find option %s in section %s!\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2259
+#: src/transport/plugin_transport_tcp.c:2366
#, c-format
msgid "TCP transport listening on port %llu\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2263
+#: src/transport/plugin_transport_tcp.c:2370
msgid "TCP transport not listening on any port (client only)\n"
msgstr ""
-#: src/transport/plugin_transport_tcp.c:2267
+#: src/transport/plugin_transport_tcp.c:2374
#, c-format
msgid "TCP transport advertises itself as being on port %llu\n"
msgstr ""
@@ -4834,31 +4905,38 @@ msgstr ""
msgid "# IPv6 multicast HELLO beacons received via udp"
msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:168
+#: src/transport/plugin_transport_udp_broadcasting.c:169
msgid "# IPv4 broadcast HELLO beacons received via udp"
msgstr ""
-#: src/transport/plugin_transport_udp_broadcasting.c:365
+#: src/transport/plugin_transport_udp_broadcasting.c:367
#, c-format
msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
msgstr ""
-#: src/transport/plugin_transport_udp.c:2084
+#: src/transport/plugin_transport_udp.c:1894
+#, c-format
+msgid ""
+"UDP could not message to `%s': `%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:2138
#, fuzzy
msgid "Failed to open UDP sockets\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/transport/plugin_transport_udp.c:2179
+#: src/transport/plugin_transport_udp.c:2306
#, c-format
msgid "Given `%s' option is out of range: %llu > %u\n"
msgstr ""
-#: src/transport/plugin_transport_udp.c:2223
+#: src/transport/plugin_transport_udp.c:2349
#, fuzzy, c-format
msgid "Invalid IPv6 address: `%s'\n"
msgstr "无效的进程优先级“%s”\n"
-#: src/transport/plugin_transport_unix.c:1183
+#: src/transport/plugin_transport_unix.c:1356
#, fuzzy
msgid "Failed to open UNIX sockets\n"
msgstr "打开日志文件“%s”失败:%s\n"
@@ -4873,7 +4951,7 @@ msgstr ""
#: src/transport/plugin_transport_wlan.c:626
#: src/transport/plugin_transport_wlan.c:676
-#: src/transport/plugin_transport_wlan.c:1687
+#: src/transport/plugin_transport_wlan.c:1696
msgid "# WLAN sessions allocated"
msgstr ""
@@ -4886,54 +4964,54 @@ msgid "# WLAN messages pending (with fragmentation)"
msgstr ""
#: src/transport/plugin_transport_wlan.c:867
-#: src/transport/plugin_transport_wlan.c:941
-#: src/transport/plugin_transport_wlan.c:1689
+#: src/transport/plugin_transport_wlan.c:948
+#: src/transport/plugin_transport_wlan.c:1698
msgid "# WLAN MAC endpoints allocated"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1112
+#: src/transport/plugin_transport_wlan.c:1119
msgid "# HELLO messages received via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1133
+#: src/transport/plugin_transport_wlan.c:1140
msgid "# fragments received via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1143
+#: src/transport/plugin_transport_wlan.c:1150
msgid "# ACKs received via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1200
+#: src/transport/plugin_transport_wlan.c:1207
msgid "# WLAN DATA messages discarded due to CRC32 error"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1298
+#: src/transport/plugin_transport_wlan.c:1306
msgid "# DATA messages received via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1333
+#: src/transport/plugin_transport_wlan.c:1341
msgid "# WLAN DATA messages processed"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1393
+#: src/transport/plugin_transport_wlan.c:1402
msgid "# HELLO beacons sent via WLAN"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1502
+#: src/transport/plugin_transport_wlan.c:1511
msgid "WLAN address with invalid size encountered\n"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1659
+#: src/transport/plugin_transport_wlan.c:1668
#, fuzzy, c-format
msgid "Invalid configuration option `%s' in section `%s'\n"
msgstr "配置文件“%s”已写入。\n"
-#: src/transport/plugin_transport_wlan.c:1668
+#: src/transport/plugin_transport_wlan.c:1677
#, c-format
msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
msgstr ""
-#: src/transport/plugin_transport_wlan.c:1678
+#: src/transport/plugin_transport_wlan.c:1687
#, fuzzy, c-format
msgid "Missing configuration option `%s' in section `%s'\n"
msgstr "配置文件“%s”已写入。\n"
@@ -4988,7 +5066,7 @@ msgstr ""
msgid "Failure to transmit TEST request.\n"
msgstr ""
-#: src/util/client.c:740 src/util/service.c:963
+#: src/util/client.c:740 src/util/service.c:970
#, c-format
msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
msgstr ""
@@ -5007,45 +5085,45 @@ 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:239 src/util/common_logging.c:890
msgid "DEBUG"
msgstr "调试"
-#: src/util/common_logging.c:241 src/util/common_logging.c:887
+#: src/util/common_logging.c:241 src/util/common_logging.c:888
msgid "INFO"
msgstr "信息"
-#: src/util/common_logging.c:243 src/util/common_logging.c:885
+#: src/util/common_logging.c:243 src/util/common_logging.c:886
msgid "WARNING"
msgstr "警告"
-#: src/util/common_logging.c:245 src/util/common_logging.c:883
+#: src/util/common_logging.c:245 src/util/common_logging.c:884
msgid "ERROR"
msgstr "错误"
-#: src/util/common_logging.c:247 src/util/common_logging.c:891
+#: src/util/common_logging.c:247 src/util/common_logging.c:892
msgid "NONE"
msgstr ""
-#: src/util/common_logging.c:609
+#: src/util/common_logging.c:610
#, fuzzy, c-format
msgid "Failed to create or access directory for log file `%s'\n"
msgstr "解析配置文件“%s”失败\n"
-#: src/util/common_logging.c:724
+#: src/util/common_logging.c:725
#, fuzzy, c-format
msgid "Message `%.*s' repeated %u times in the last %s\n"
msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
-#: src/util/common_logging.c:892
+#: src/util/common_logging.c:893
msgid "INVALID"
msgstr ""
-#: src/util/common_logging.c:991
+#: src/util/common_logging.c:992
msgid "unknown address"
msgstr ""
-#: src/util/common_logging.c:1029
+#: src/util/common_logging.c:1030
msgid "invalid address"
msgstr ""
@@ -5150,82 +5228,82 @@ msgstr ""
msgid "RSA signature verification failed at %s:%d: %s\n"
msgstr ""
-#: src/util/disk.c:497
+#: src/util/disk.c:498
#, fuzzy, c-format
msgid "`%s' failed for drive `%S': %u\n"
msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
-#: src/util/disk.c:1061
+#: src/util/disk.c:1062
#, c-format
msgid "Expected `%s' to be a directory!\n"
msgstr "“%s”应为目录!\n"
-#: src/util/disk.c:1415 src/util/service.c:1643
+#: src/util/disk.c:1416 src/util/service.c:1650
#, c-format
msgid "Cannot obtain information about user `%s': %s\n"
msgstr "无法获取有关用户“%s”的信息:%s\n"
-#: src/util/disk.c:1733
+#: src/util/disk.c:1734
#, 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"
-#: 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"
-#: 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"
-#: 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"
-#: src/util/getopt.c:747
+#: src/util/getopt.c:744
#, 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"
-#: src/util/getopt.c:776
+#: src/util/getopt.c:773
#, 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"
-#: 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"
-#: 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"
-#: 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"
-#: 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"
@@ -5311,7 +5389,7 @@ msgstr "卸载 GNUnet 服务"
msgid "Error writing to `%s': %s\n"
msgstr "创建用户出错"
-#: src/util/network.c:1170
+#: src/util/network.c:1200
#, c-format
msgid ""
"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -5339,12 +5417,12 @@ msgstr "“%s”说:%s\n"
msgid "stat (%s) failed: %s\n"
msgstr "“%s”说:%s\n"
-#: src/util/os_priority.c:304
+#: src/util/os_priority.c:305
#, fuzzy, c-format
msgid "Failed to open named pipe `%s' for reading: %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
-#: src/util/os_priority.c:305
+#: src/util/os_priority.c:306
#, fuzzy, c-format
msgid "Failed to open named pipe `%s' for writing: %s\n"
msgstr "打开日志文件“%s”失败:%s\n"
@@ -5413,143 +5491,143 @@ msgstr ""
msgid "Attempt to cancel dead task %llu!\n"
msgstr ""
-#: src/util/server.c:448
+#: src/util/server.c:483
#, fuzzy, c-format
msgid "`%s' failed for port %d (%s).\n"
msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
-#: src/util/server.c:457
+#: src/util/server.c:492
#, c-format
msgid "`%s' failed for port %d (%s): address already in use\n"
msgstr ""
-#: src/util/server.c:462
+#: src/util/server.c:497
#, fuzzy, c-format
msgid "`%s' failed for `%s': address already in use\n"
msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
-#: src/util/server.c:803
+#: src/util/server.c:827
#, 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:128 src/util/service.c:154 src/util/service.c:197
-#: src/util/service.c:218 src/util/service.c:225
+#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
+#: src/util/service.c:225 src/util/service.c:232
#, c-format
msgid "Invalid format for IP: `%s'\n"
msgstr "IP 格式无效:“%s”\n"
-#: src/util/service.c:181
+#: src/util/service.c:188
#, c-format
msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
-#: src/util/service.c:274
+#: src/util/service.c:281
#, c-format
msgid "Invalid network notation (does not end with ';': `%s')\n"
msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
-#: src/util/service.c:306
+#: src/util/service.c:313
#, c-format
msgid "Wrong format `%s' for netmask\n"
msgstr "网络掩码的格式“%s”错误\n"
-#: src/util/service.c:336
+#: src/util/service.c:343
#, c-format
msgid "Wrong format `%s' for network\n"
msgstr "网络的格式“%s”错误\n"
-#: src/util/service.c:691
+#: src/util/service.c:698
#, c-format
msgid "Access denied to UID %d / GID %d\n"
msgstr ""
-#: src/util/service.c:696
+#: src/util/service.c:703
#, c-format
msgid "Unknown address family %d\n"
msgstr ""
-#: src/util/service.c:703
+#: src/util/service.c:710
#, c-format
msgid "Access from `%s' denied to service `%s'\n"
msgstr ""
-#: src/util/service.c:758
+#: src/util/service.c:765
#, c-format
msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
msgstr ""
-#: src/util/service.c:795
+#: src/util/service.c:802
#, c-format
msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
msgstr ""
-#: src/util/service.c:913
+#: src/util/service.c:920
#, c-format
msgid ""
"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
msgstr ""
-#: src/util/service.c:983
+#: src/util/service.c:990
#, c-format
msgid ""
"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
"domain socket: %s\n"
msgstr ""
-#: src/util/service.c:1000
+#: src/util/service.c:1007
#, c-format
msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
msgstr ""
-#: src/util/service.c:1234
+#: src/util/service.c:1241
msgid "Could not access a pre-bound socket, will try to bind myself\n"
msgstr ""
-#: src/util/service.c:1285 src/util/service.c:1303
+#: src/util/service.c:1292 src/util/service.c:1310
#, c-format
msgid "Specified value for `%s' of service `%s' is invalid\n"
msgstr ""
-#: src/util/service.c:1330
+#: src/util/service.c:1337
#, c-format
msgid "Could not access pre-bound socket %u, will try to bind myself\n"
msgstr ""
-#: src/util/service.c:1499
+#: src/util/service.c:1506
#, fuzzy, c-format
msgid "Failed to start `%s' at `%s'\n"
msgstr "运行 %s失败:%s %d\n"
-#: src/util/service.c:1532
+#: src/util/service.c:1539
#, c-format
msgid "Service `%s' runs at %s\n"
msgstr ""
-#: src/util/service.c:1581
+#: src/util/service.c:1588
msgid "Service process failed to initialize\n"
msgstr ""
-#: src/util/service.c:1585
+#: src/util/service.c:1592
msgid "Service process could not initialize server function\n"
msgstr ""
-#: src/util/service.c:1589
+#: src/util/service.c:1596
msgid "Service process failed to report status\n"
msgstr ""
-#: src/util/service.c:1644
+#: src/util/service.c:1651
msgid "No such user"
msgstr "无此用户"
-#: src/util/service.c:1657
+#: src/util/service.c:1664
#, c-format
msgid "Cannot change user/group to `%s': %s\n"
msgstr "无法更改用户/组为“%s”:%s\n"
-#: src/util/service.c:1722
+#: src/util/service.c:1729
msgid "do daemonize (detach from terminal)"
msgstr ""
@@ -5626,7 +5704,7 @@ 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"
@@ -5679,39 +5757,39 @@ msgstr ""
msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:1703
+#: src/vpn/gnunet-service-vpn.c:1704
msgid "# ICMP packets received from mesh"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2044
+#: src/vpn/gnunet-service-vpn.c:2045
msgid "# UDP packets received from mesh"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2202
+#: src/vpn/gnunet-service-vpn.c:2203
msgid "# TCP packets received from mesh"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2353
+#: src/vpn/gnunet-service-vpn.c:2354
msgid "Failed to find unallocated IPv4 address in VPN's range\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2408
+#: src/vpn/gnunet-service-vpn.c:2409
msgid "Failed to find unallocated IPv6 address in VPN's range\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2660
+#: src/vpn/gnunet-service-vpn.c:2448 src/vpn/gnunet-service-vpn.c:2661
msgid "# Active destinations"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:2733
+#: src/vpn/gnunet-service-vpn.c:2734
msgid "Failed to allocate IP address for new destination\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3140
+#: src/vpn/gnunet-service-vpn.c:3141
msgid "IPv6 support disabled as this system does not support IPv6\n"
msgstr ""
-#: src/vpn/gnunet-service-vpn.c:3172
+#: src/vpn/gnunet-service-vpn.c:3173
msgid "IPv4 support disabled as this system does not support IPv4\n"
msgstr ""
@@ -5802,6 +5880,16 @@ msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
msgstr ""
#, 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”:"
@@ -6532,9 +6620,6 @@ msgstr ""
#~ 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"