gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r21715 - in gnunet: po src/ats src/dv src/gns src/include s


From: gnunet
Subject: [GNUnet-SVN] r21715 - in gnunet: po src/ats src/dv src/gns src/include src/integration-tests
Date: Fri, 1 Jun 2012 20:55:31 +0200

Author: grothoff
Date: 2012-06-01 20:55:31 +0200 (Fri, 01 Jun 2012)
New Revision: 21715

Modified:
   gnunet/po/POTFILES.in
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/ats/Makefile.am
   gnunet/src/dv/gnunet-service-dv.c
   gnunet/src/gns/Makefile.am
   gnunet/src/include/Makefile.am
   gnunet/src/integration-tests/Makefile.am
Log:
-fixing build issues for disting

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2012-06-01 18:51:57 UTC (rev 21714)
+++ gnunet/po/POTFILES.in       2012-06-01 18:55:31 UTC (rev 21715)
@@ -100,16 +100,18 @@
 src/fs/gnunet-service-fs_put.c
 src/fs/gnunet-unindex.c
 src/fs/plugin_block_fs.c
+src/gns/gnocksy/gnocksy.c
+src/gns/gnocksy/gns_glue.c
 src/gns/gns_api.c
 src/gns/gnunet-gns.c
 src/gns/gnunet-gns-fcfsd.c
 src/gns/gnunet-gns-lookup.c
+src/gns/gnunet-gns-proxy.c
 src/gns/gnunet-service-gns.c
 src/gns/gnunet-service-gns_interceptor.c
 src/gns/gnunet-service-gns_resolver.c
 src/gns/nss/nss_gns.c
-src/gns/nss/query.c
-src/gns/nss/util.c
+src/gns/nss/nss_gns_query.c
 src/gns/plugin_block_gns.c
 src/hello/address.c
 src/hello/gnunet-hello.c
@@ -121,6 +123,7 @@
 src/lockmanager/gnunet-service-lockmanager.c
 src/lockmanager/lockmanager_api.c
 src/mesh/gnunet-service-mesh.c
+src/mesh/gnunet-service-mesh_new.c
 src/mesh/mesh_api.c
 src/mesh/mesh_tunnel_tree.c
 src/mysql/mysql.c
@@ -244,6 +247,7 @@
 src/util/server_tc.c
 src/util/service.c
 src/util/signal.c
+src/util/speedup.c
 src/util/strings.c
 src/util/time.c
 src/util/winproc.c
@@ -254,3 +258,4 @@
 src/dht/dht.h
 src/include/gnunet_common.h
 src/include/gnunet_postgres_lib.h
+src/include/gnunet_time_lib.h

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2012-06-01 18:51:57 UTC (rev 21714)
+++ gnunet/po/de.po     2012-06-01 18:55:31 UTC (rev 21715)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-05-13 03:22+0200\n"
+"POT-Creation-Date: 2012-06-01 20:46+0200\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -349,198 +349,198 @@
 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 schlug fehl: %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 schlug fehl: %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' fehlgeschlagen für Laufwerk %s: %u\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' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:158
+#: src/chat/gnunet-chat.c:159
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:161
+#: src/chat/gnunet-chat.c:162
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:164
+#: src/chat/gnunet-chat.c:165
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:169
+#: src/chat/gnunet-chat.c:170
 #, fuzzy, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: 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' schlug bei %s:%d mit dem Fehler %s fehl\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 ""
 
-#: src/chat/gnunet-chat.c:258
+#: src/chat/gnunet-chat.c:260
 #, fuzzy, c-format
 msgid "`%s' left the room\n"
 msgstr "Fehler beim Binden an UDP Port %d.\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 "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\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
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:373
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/chat/gnunet-chat.c:386
+#: src/chat/gnunet-chat.c:388
 #, c-format
 msgid "Users in room `%s': "
 msgstr ""
 
-#: src/chat/gnunet-chat.c:432
+#: src/chat/gnunet-chat.c:434
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: 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 ""
 
-#: src/chat/gnunet-chat.c:511
+#: src/chat/gnunet-chat.c:513
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Unbekannte Operation `%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
 #, fuzzy
 msgid "You must specify a nickname\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/chat/gnunet-chat.c:686
+#: src/chat/gnunet-chat.c:688
 #, fuzzy, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: 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 ""
 
@@ -598,7 +598,7 @@
 msgid "# messages discarded (session disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_clients.c:817
+#: src/core/gnunet-service-core_clients.c:818
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
@@ -611,7 +611,7 @@
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: 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
 #, fuzzy
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -732,16 +732,16 @@
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: 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 "GNUnet Konfiguration"
 
-#: 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
 #, fuzzy
@@ -769,8 +769,19 @@
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-msgid "# entries in session map"
-msgstr ""
+#: 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
+#, fuzzy
+msgid "# peers connected"
+msgstr "# verbundener Knoten"
 
 #: src/core/gnunet-service-core_sessions.c:236
 #, fuzzy
@@ -1225,7 +1236,7 @@
 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
@@ -1400,12 +1411,6 @@
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:625
-#: src/dht/gnunet-service-dht_neighbours.c:683
-#, fuzzy
-msgid "# Peers connected"
-msgstr "# verbundener Knoten"
-
 #: src/dht/gnunet-service-dht_neighbours.c:717
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
@@ -1605,21 +1610,21 @@
 msgid "# DNS requests received via TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: 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 ""
 
@@ -1643,15 +1648,15 @@
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: 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 ""
 
@@ -1700,138 +1705,138 @@
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1470
+#: src/exit/gnunet-daemon-exit.c:1471
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1571
 #, fuzzy
 msgid "# TCP service creation requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: 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
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# Bytes empfangen über HTTP"
 
-#: 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
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:1655
+#: src/exit/gnunet-daemon-exit.c:1656
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1766
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1779
+#: src/exit/gnunet-daemon-exit.c:1780
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:1829
+#: src/exit/gnunet-daemon-exit.c:1830
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1995
+#: src/exit/gnunet-daemon-exit.c:1996
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2237
+#: src/exit/gnunet-daemon-exit.c:2238
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: 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
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2518
+#: src/exit/gnunet-daemon-exit.c:2519
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2618
+#: src/exit/gnunet-daemon-exit.c:2619
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2641
+#: src/exit/gnunet-daemon-exit.c:2642
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: 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 ""
 
@@ -1839,48 +1844,53 @@
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:454
+#: src/fragmentation/defragmentation.c:456
 #, fuzzy
 msgid "# fragments received"
 msgstr "# verworfener Nachrichten"
 
-#: src/fragmentation/defragmentation.c:513
+#: src/fragmentation/defragmentation.c:521
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fragmentation/defragmentation.c:526
+#: src/fragmentation/defragmentation.c:534
 msgid "# messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:199
+#: src/fragmentation/fragmentation.c:203
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:202
+#: src/fragmentation/fragmentation.c:206
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:266
+#: src/fragmentation/fragmentation.c:232
+#, fuzzy
+msgid "# fragments wrap arounds"
+msgstr "# Selbstbekanntmachungen übertragen"
+
+#: src/fragmentation/fragmentation.c:273
 msgid "# messages fragmented"
 msgstr "# fragmentierter Nachrichten"
 
-#: 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
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: 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
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
@@ -1975,44 +1985,49 @@
 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 "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:880
+#: src/fs/fs_download.c:878
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: 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 "Datei wurde als `%s' gespeichert.\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 "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1030
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr ""
+#: src/fs/fs_download.c:1028
+#, fuzzy, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1886
+#: src/fs/fs_download.c:1125
 #, fuzzy
+msgid "internal error decoding tree"
+msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
+
+#: src/fs/fs_download.c:1888
+#, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
 
@@ -2169,7 +2184,7 @@
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_search.c:828
+#: src/fs/fs_search.c:829
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2349,92 +2364,92 @@
 msgid "Display contents of a GNUnet directory"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-download.c:100
+#: src/fs/gnunet-download.c:101
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-download.c:109
+#: src/fs/gnunet-download.c:110
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Unbekannter Fehler"
 
-#: 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
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-download.c:136
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Upload abgewiesen!"
 
-#: 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 "Sie müssen einen Empfänger angeben!\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 "Datei `%s' hat URI: %s\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' Dienst konnte nicht initialisiert werden.\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 "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
-#: 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 "Schreibe die Datei in DATEINAME"
 
-#: 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 "Das GNUnet Verzeichnis rekursiv herunterladen"
 
-#: 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/...)"
@@ -2449,30 +2464,30 @@
 msgid "Special file-sharing operations"
 msgstr "Alle Optionen anzeigen"
 
-#: 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 "Ungültiger Parameter: `%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: Option `%s' ist mehrdeutig\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 "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: 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
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2481,40 +2496,40 @@
 "Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
 "(diese Option kann mehrmals angegeben werden)"
 
-#: 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 ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/fs/gnunet-pseudonym.c:294
+#: src/fs/gnunet-pseudonym.c:295
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "das Rating eines Namespaces setzen"
 
-#: 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
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:309
+#: src/fs/gnunet-pseudonym.c:310
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:317
+#: src/fs/gnunet-pseudonym.c:318
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2763,23 +2778,12 @@
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
 #: 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' Dienst konnte nicht initialisiert werden.\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
-#, fuzzy
-msgid "# peers connected"
-msgstr "# verbundener Knoten"
-
 #: src/fs/gnunet-service-fs_cp.c:696
 #, fuzzy
 msgid "# migration stop messages received"
@@ -3133,33 +3137,33 @@
 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 "Es konnte keine Verbindung mit gnunetd hergestellt werden.\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
 #, fuzzy
 msgid "Specify the type of the record lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: 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 ""
 
@@ -3210,7 +3214,7 @@
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: 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 "Fehler beim Starten der Collection.\n"
@@ -3223,6 +3227,14 @@
 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 ""
@@ -3319,7 +3331,7 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: 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 ""
 
@@ -3347,8 +3359,10 @@
 
 #: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgstr ""
+"Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
+"beträgt %8.3f KB/s.\n"
 
 #: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
@@ -3371,7 +3385,7 @@
 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 ""
 
@@ -3394,86 +3408,86 @@
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: 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
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: 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 "Datei wurde als `%s' gespeichert.\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 "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1382
+#: src/hostlist/hostlist-client.c:1381
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: 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
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
@@ -3490,7 +3504,7 @@
 #: 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
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -3599,16 +3613,16 @@
 msgid "help text"
 msgstr "Hilfetext für -t"
 
-#: 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 "GNUnet Konfiguration"
 
-#: 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 "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -3758,12 +3772,12 @@
 msgid "Stored zonekey for zone `%s' in file `%s'\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1911
+#: src/namestore/gnunet-service-namestore.c:1909
 #, fuzzy
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: 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 ""
@@ -3848,12 +3862,12 @@
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_test.c:336
+#: src/nat/nat_test.c:341
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: 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 ""
@@ -3868,17 +3882,17 @@
 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
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: 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 "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -4130,52 +4144,52 @@
 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
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-service-statistics.c:329
+#: src/statistics/gnunet-service-statistics.c:330
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-statistics.c:104
+#: src/statistics/gnunet-statistics.c:122
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\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 "SQLite Datenbank konnte nicht initialisiert werden.\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 "Statistiken der GNUnet Aktivitäten ausgeben."
 
@@ -4343,7 +4357,7 @@
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: 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 ""
@@ -4395,24 +4409,24 @@
 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 ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\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
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
@@ -4421,118 +4435,184 @@
 "Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
 "gesetzt, sie wird auf %dm gesetzt.\n"
 
-#: 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
 #, fuzzy
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: 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 "Fehler beim Lesen der Freunde-Liste von `%s'\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 "Auf die Namespace Informationen konnte nicht zugegriffen werden.\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 "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/testing/testing_new.c:380
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
+msgstr ""
+
+#: src/testing/testing_new.c:437
+#, fuzzy, c-format
+msgid "Key number %u does not exist\n"
+msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
+
+#: src/testing/testing_new.c:446
+#, fuzzy, c-format
+msgid "Error while decoding key %u\n"
+msgstr "Fehler beim Download: %s\n"
+
+#: src/testing/testing_new.c:680
+#, fuzzy
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\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 "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#: src/testing/testing_new.c:734
+#, fuzzy, c-format
+msgid "Failed to write hostkey file for peer %u: %s\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/testing/testing_new.c:751
+#, fuzzy, c-format
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/testing/testing_new.c:791
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/testing/testing_new.c:959
+#, fuzzy, c-format
+msgid "Failed to load configuration from %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: 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
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: 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
 #, fuzzy
 msgid "# friends connected"
 msgstr "# verbundener Knoten"
 
-#: 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
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: 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
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: 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 "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1019
+#: src/topology/gnunet-daemon-topology.c:1082
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1032
+#: src/topology/gnunet-daemon-topology.c:1095
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: 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 " gconfig\tGTK Konfiguration\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 " gconfig\tGTK Konfiguration\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
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1161
+#: src/topology/gnunet-daemon-topology.c:1224
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: 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 ""
 
@@ -4629,117 +4709,117 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:953
+#: src/transport/gnunet-service-transport_neighbours.c:1032
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: 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
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1073
+#: src/transport/gnunet-service-transport_neighbours.c:1153
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1078
+#: src/transport/gnunet-service-transport_neighbours.c:1158
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: 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
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1198
+#: src/transport/gnunet-service-transport_neighbours.c:1278
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1206
+#: src/transport/gnunet-service-transport_neighbours.c:1286
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1243
+#: src/transport/gnunet-service-transport_neighbours.c:1323
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1252
+#: src/transport/gnunet-service-transport_neighbours.c:1332
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1308
+#: src/transport/gnunet-service-transport_neighbours.c:1388
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1342
+#: src/transport/gnunet-service-transport_neighbours.c:1422
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: 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
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: 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
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2461
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2490
+#: src/transport/gnunet-service-transport_neighbours.c:2627
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2668
+#: src/transport/gnunet-service-transport_neighbours.c:2807
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: 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
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -4796,7 +4876,7 @@
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1135
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
@@ -4897,75 +4977,75 @@
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\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 "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: 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 "Datei wurde als `%s' gespeichert.\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 "Fehler beim Binden an UDP Port %d.\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
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
-#: src/transport/plugin_transport_http.c:1383
+#: src/transport/plugin_transport_http.c:1399
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\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 ""
 
@@ -4997,117 +5077,113 @@
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:801
+#: src/transport/plugin_transport_smtp.c:799
 #, fuzzy
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 "Kein Filter für E-Mail angegeben, es kann keine Bekanntmachung erstellt "
 "werden.\n"
 
-#: src/transport/plugin_transport_smtp.c:813
+#: src/transport/plugin_transport_smtp.c:811
 #, fuzzy
 msgid "# bytes received via SMTP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_smtp.c:814
+#: src/transport/plugin_transport_smtp.c:812
 #, fuzzy
 msgid "# bytes sent via SMTP"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_smtp.c:816
+#: src/transport/plugin_transport_smtp.c:814
 #, fuzzy
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: 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
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: 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
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:825
+#: src/transport/plugin_transport_tcp.c:851
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:874
+#: src/transport/plugin_transport_tcp.c:900
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:960
+#: src/transport/plugin_transport_tcp.c:987
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: 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
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:1961
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: 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 "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2236
+#: src/transport/plugin_transport_tcp.c:2343
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2259
+#: src/transport/plugin_transport_tcp.c:2366
 #, fuzzy, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: 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 ""
@@ -5117,32 +5193,39 @@
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: 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 "Fehler beim Binden an UDP6 Port %d.\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 "Ungültiger Parameter: `%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 "Datei wurde als `%s' gespeichert.\n"
@@ -5158,7 +5241,7 @@
 
 #: 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
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
@@ -5173,62 +5256,62 @@
 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
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1112
+#: src/transport/plugin_transport_wlan.c:1119
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1133
+#: src/transport/plugin_transport_wlan.c:1140
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1143
+#: src/transport/plugin_transport_wlan.c:1150
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1200
+#: src/transport/plugin_transport_wlan.c:1207
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1298
+#: src/transport/plugin_transport_wlan.c:1306
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1333
+#: src/transport/plugin_transport_wlan.c:1341
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1393
+#: src/transport/plugin_transport_wlan.c:1402
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# Bytes gesendet über UDP"
 
-#: 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 "Konfigurationsdatei `%s' wurde erzeugt.\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 "Konfigurationsdatei `%s' wurde erzeugt.\n"
@@ -5284,7 +5367,7 @@
 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 ""
@@ -5303,46 +5386,46 @@
 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 "DEBUG"
 
-#: 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 "INFO"
 
-#: 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 "WARNUNG"
 
-#: 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 "FEHLER"
 
-#: 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 "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/common_logging.c:724
+#: src/util/common_logging.c:725
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "unknown address"
 msgstr "Unbekannter Fehler"
 
-#: src/util/common_logging.c:1029
+#: src/util/common_logging.c:1030
 #, fuzzy
 msgid "invalid address"
 msgstr "Ungültige Parameter: "
@@ -5449,82 +5532,82 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/disk.c:497
+#: src/util/disk.c:498
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk.c:1061
+#: src/util/disk.c:1062
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1415 src/util/service.c:1643
+#: src/util/disk.c:1416 src/util/service.c:1650
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/util/disk.c:1733
+#: src/util/disk.c:1734
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/util/getopt.c:672
+#: src/util/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Option `%s' ist mehrdeutig\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: Option '--%s' erlaubt keinen Parameter\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: Option '%c%s' erlaubt keinen Parameter\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: Option `%s' benötigt einen Parameter\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option '--%s'\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option '%c%s'\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:773
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: unerlaubte Option -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %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: Option benötigt einen Parameter -- %c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:851
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: Option '-W %s' ist mehrdeutig\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: Option '-W %s' erlaubt keinen Parameter\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 "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
@@ -5612,7 +5695,7 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: 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"
@@ -5640,12 +5723,12 @@
 msgid "stat (%s) failed: %s\n"
 msgstr "`%s' schlug fehl: %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 "Datei wurde als `%s' gespeichert.\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 "Datei wurde als `%s' gespeichert.\n"
@@ -5718,143 +5801,143 @@
 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 "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/server.c:457
+#: src/util/server.c:492
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:462
+#: src/util/server.c:497
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\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 "Ungültiges Format für 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 "Ungültige Netzwerk Notation ('/%d ist nicht gültig in 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 "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
 
-#: src/util/service.c:306
+#: src/util/service.c:313
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/service.c:336
+#: src/util/service.c:343
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %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
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: 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 "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/service.c:1532
+#: src/util/service.c:1539
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: 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 "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/util/service.c:1722
+#: src/util/service.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5932,7 +6015,7 @@
 
 #: 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 "# verbundener Knoten"
 
 #: src/vpn/gnunet-service-vpn.c:699
@@ -5987,44 +6070,44 @@
 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
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2044
+#: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2202
+#: src/vpn/gnunet-service-vpn.c:2203
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: 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
 #, fuzzy
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
 
-#: 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
 #, fuzzy
 msgid "# Active destinations"
 msgstr "GNUnet Konfiguration"
 
-#: 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 ""
 
@@ -6117,6 +6200,14 @@
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "# Peers connected"
+#~ msgstr "# verbundener Knoten"
+
+#, fuzzy
+#~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
+#~ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#, fuzzy
 #~ msgid "Failed to transmit shutdown ACK.\n"
 #~ msgstr "Fehler beim Starten der Collection.\n"
 
@@ -6319,10 +6410,6 @@
 #~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
 #, fuzzy
-#~ msgid "Failed to create file for dhtlog.\n"
-#~ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#, fuzzy
 #~ msgid "Found peer `%s'\n"
 #~ msgstr "Ich bin Peer `%s'.\n"
 
@@ -7678,10 +7765,6 @@
 #~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #, fuzzy
-#~ msgid "set number of daemons to start"
-#~ msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
-
-#, fuzzy
 #~ msgid "Waiting for peers to connect"
 #~ msgstr ""
 #~ "Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2012-06-01 18:51:57 UTC (rev 21714)
+++ gnunet/po/es.po     2012-06-01 18:55:31 UTC (rev 21715)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-05-13 03:22+0200\n"
+"POT-Creation-Date: 2012-06-01 20:46+0200\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -345,198 +345,198 @@
 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 falló: %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 falló: %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 falló: %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' falló con el código de error %s: %s"
 
-#: src/chat/gnunet-chat.c:158
+#: src/chat/gnunet-chat.c:159
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:161
+#: src/chat/gnunet-chat.c:162
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:164
+#: src/chat/gnunet-chat.c:165
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:169
+#: src/chat/gnunet-chat.c:170
 #, fuzzy, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: 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' falló con el código de error %s: %s"
 
-#: 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 ""
 
-#: src/chat/gnunet-chat.c:258
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' left the room\n"
 msgstr ""
 
-#: 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 "Imposible crear el espacio '%s' (¿existe?).\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
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Respuesta inválida a '%s' del par '%s'.\n"
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:373
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/chat/gnunet-chat.c:386
+#: src/chat/gnunet-chat.c:388
 #, fuzzy, c-format
 msgid "Users in room `%s': "
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/chat/gnunet-chat.c:432
+#: src/chat/gnunet-chat.c:434
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: 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 ""
 
-#: src/chat/gnunet-chat.c:511
+#: src/chat/gnunet-chat.c:513
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Operación desconocida '%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
 #, fuzzy
 msgid "You must specify a nickname\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/chat/gnunet-chat.c:686
+#: src/chat/gnunet-chat.c:688
 #, fuzzy, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: 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 ""
 
@@ -594,7 +594,7 @@
 msgid "# messages discarded (session disconnected)"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core_clients.c:817
+#: src/core/gnunet-service-core_clients.c:818
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de ruido recibidos"
@@ -607,7 +607,7 @@
 msgid "# bytes decrypted"
 msgstr "# bytes desencriptados"
 
-#: 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
 #, fuzzy
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Imprime información de los pares de GNUnet."
@@ -728,16 +728,16 @@
 msgid "# bytes of payload decrypted"
 msgstr "# bytes desencriptados"
 
-#: 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 "Configuración de GNUnet"
 
-#: 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
 #, fuzzy
@@ -765,8 +765,19 @@
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-msgid "# entries in session map"
-msgstr ""
+#: 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
+#, fuzzy
+msgid "# peers connected"
+msgstr "# de pares conectados"
 
 #: src/core/gnunet-service-core_sessions.c:236
 msgid "# type map refreshes sent"
@@ -1218,7 +1229,7 @@
 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
@@ -1392,12 +1403,6 @@
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes fragmentados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:625
-#: src/dht/gnunet-service-dht_neighbours.c:683
-#, fuzzy
-msgid "# Peers connected"
-msgstr "# de pares conectados"
-
 #: src/dht/gnunet-service-dht_neighbours.c:717
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
@@ -1596,21 +1601,21 @@
 msgid "# DNS requests received via TUN interface"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: 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 ""
 
@@ -1634,15 +1639,15 @@
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# bytes desencriptados"
 
-#: 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 ""
 
@@ -1691,138 +1696,138 @@
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1470
+#: src/exit/gnunet-daemon-exit.c:1471
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# bytes enviados vía UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1571
 #, fuzzy
 msgid "# TCP service creation requests received via mesh"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: 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
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# bytes recibidos vía HTTP"
 
-#: 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
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:1655
+#: src/exit/gnunet-daemon-exit.c:1656
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1766
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:1779
+#: src/exit/gnunet-daemon-exit.c:1780
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:1829
+#: src/exit/gnunet-daemon-exit.c:1830
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# bytes enviados vía UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1995
+#: src/exit/gnunet-daemon-exit.c:1996
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:2237
+#: src/exit/gnunet-daemon-exit.c:2238
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: 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
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# bytes enviados vía UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2518
+#: src/exit/gnunet-daemon-exit.c:2519
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:2618
+#: src/exit/gnunet-daemon-exit.c:2619
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:2641
+#: src/exit/gnunet-daemon-exit.c:2642
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: 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 ""
 
@@ -1830,48 +1835,53 @@
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:454
+#: src/fragmentation/defragmentation.c:456
 #, fuzzy
 msgid "# fragments received"
 msgstr "# fragmentos descartados"
 
-#: src/fragmentation/defragmentation.c:513
+#: src/fragmentation/defragmentation.c:521
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/fragmentation/defragmentation.c:526
+#: src/fragmentation/defragmentation.c:534
 msgid "# messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/fragmentation/fragmentation.c:199
+#: src/fragmentation/fragmentation.c:203
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/fragmentation/fragmentation.c:202
+#: src/fragmentation/fragmentation.c:206
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/fragmentation/fragmentation.c:266
+#: src/fragmentation/fragmentation.c:232
+#, fuzzy
+msgid "# fragments wrap arounds"
+msgstr "# Auto-anuncios transmitidos"
+
+#: src/fragmentation/fragmentation.c:273
 msgid "# messages fragmented"
 msgstr "# mensajes fragmentados"
 
-#: 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
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Anuncios de los pares recibidos"
 
-#: 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
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# mensajes de texto mandados por PING"
@@ -1965,44 +1975,49 @@
 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 "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:880
+#: src/fs/fs_download.c:878
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: 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 "Fichero almacenado en '%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 "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:1030
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr ""
+#: src/fs/fs_download.c:1028
+#, fuzzy, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:1886
+#: src/fs/fs_download.c:1125
 #, fuzzy
+msgid "internal error decoding tree"
+msgstr "=\tError leyendo el directorio.\n"
+
+#: src/fs/fs_download.c:1888
+#, fuzzy
 msgid "Invalid URI"
 msgstr "Argumento no válido: '%s'\n"
 
@@ -2159,7 +2174,7 @@
 msgid "Could not connect to datastore."
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/fs_search.c:828
+#: src/fs/fs_search.c:829
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2339,92 +2354,92 @@
 msgid "Display contents of a GNUnet directory"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-download.c:100
+#: src/fs/gnunet-download.c:101
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/gnunet-download.c:109
+#: src/fs/gnunet-download.c:110
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Error desconocido"
 
-#: 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
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Error descargando: %s\n"
 
-#: src/fs/gnunet-download.c:136
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "¡Subida rechazada!"
 
-#: 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
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Estado de descarga inesperado."
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "¡Debes especificar un receptor!\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 "El fichero '%s' tiene la URI: '%s'\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 "Falló al inicializar el servicio '%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 "seleccione el NIVEL deseado de anonimidad-del-receptor"
 
-#: 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 "escribe el fichero al FICHERO"
 
-#: 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 "descarga un directorio de GNUnet recursivamente"
 
-#: 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/...)"
@@ -2438,30 +2453,30 @@
 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 "Argumento no válido: '%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: la opción '%s' es ambigua\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 "seleccione el NIVEL deseado de anonimato al enviar"
 
-#: 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
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2470,38 +2485,38 @@
 "añade una clave adicional para todos los ficheros y directorios (esta opción "
 "puede ser especificada varias veces)"
 
-#: 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 "cambia el meta-dato para el TIPO dado al VALOR dado"
 
-#: src/fs/gnunet-pseudonym.c:294
+#: src/fs/gnunet-pseudonym.c:295
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "cambia la valoración de un espacio"
 
-#: 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
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "cambia la valoración de un espacio"
 
-#: src/fs/gnunet-pseudonym.c:309
+#: src/fs/gnunet-pseudonym.c:310
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "cambia la valoración de un espacio"
 
-#: src/fs/gnunet-pseudonym.c:317
+#: src/fs/gnunet-pseudonym.c:318
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2749,23 +2764,12 @@
 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 "Fallo al conectar a gnunetd.\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
-#, fuzzy
-msgid "# peers connected"
-msgstr "# de pares conectados"
-
 #: src/fs/gnunet-service-fs_cp.c:696
 #, fuzzy
 msgid "# migration stop messages received"
@@ -3116,33 +3120,33 @@
 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 "Fallo al conectar a gnunetd.\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
 #, fuzzy
 msgid "Specify the type of the record lookup"
 msgstr "especifica la prioridad del contenido"
 
-#: 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 ""
 
@@ -3191,7 +3195,7 @@
 msgid "Failed to connect to namestore\n"
 msgstr "Fallo al conectarse a gnunetd"
 
-#: 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 "Falló al comenzar la recolección.\n"
@@ -3204,6 +3208,14 @@
 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 ""
@@ -3300,7 +3312,7 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: 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 ""
 
@@ -3328,8 +3340,10 @@
 
 #: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgstr ""
+"Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
+"kbps.\n"
 
 #: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
@@ -3352,7 +3366,7 @@
 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 ""
 
@@ -3375,86 +3389,86 @@
 msgid "# active connections"
 msgstr "Configuración de GNUnet"
 
-#: 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 "Fichero almacenado en '%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 "Fichero almacenado en '%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
 #, fuzzy, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error creando usuario"
 
-#: 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
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
@@ -3471,7 +3485,7 @@
 #: 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
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Imprime información de los pares de GNUnet."
@@ -3580,17 +3594,17 @@
 msgid "help text"
 msgstr "texto de ayuda para -t"
 
-#: src/mesh/gnunet-service-mesh.c:4596
+#: src/mesh/gnunet-service-mesh.c:4590 src/mesh/gnunet-service-mesh_new.c:4618
 #, fuzzy
 msgid "Wrong CORE service\n"
 msgstr "Deteniendo cron\n"
 
-#: 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 "Configuración de GNUnet"
 
-#: 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 "Imposible acceder a la información del espacio.\n"
@@ -3740,12 +3754,12 @@
 msgid "Stored zonekey for zone `%s' in file `%s'\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1911
+#: src/namestore/gnunet-service-namestore.c:1909
 #, fuzzy
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: 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 ""
@@ -3830,12 +3844,12 @@
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_test.c:336
+#: src/nat/nat_test.c:341
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: 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 ""
@@ -3850,17 +3864,17 @@
 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
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: 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 "Imposible acceder a la información del espacio.\n"
@@ -4112,52 +4126,52 @@
 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
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/statistics/gnunet-service-statistics.c:329
+#: src/statistics/gnunet-service-statistics.c:330
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/statistics/gnunet-statistics.c:104
+#: src/statistics/gnunet-statistics.c:122
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Fallo en las estadísticas del tráfico.\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 "Imposible inicializar SQLite.\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 "Imprime estadísticas acerca de las operaciones de GNUnet."
 
@@ -4317,7 +4331,7 @@
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: 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 "Imposible acceder a la información del espacio.\n"
@@ -4365,141 +4379,207 @@
 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 ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%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 "Imposible inicializar la aplicación '%s'\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 "Imposible acceder a la información del espacio.\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 "Imposible inicializar la aplicación '%s'\n"
+
+#: src/testing/testing_new.c:380
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
+msgstr ""
+
+#: src/testing/testing_new.c:437
+#, fuzzy, c-format
+msgid "Key number %u does not exist\n"
+msgstr "número de mensajes a usar por iteración"
+
+#: src/testing/testing_new.c:446
+#, fuzzy, c-format
+msgid "Error while decoding key %u\n"
+msgstr "Error descargando: %s\n"
+
+#: src/testing/testing_new.c:680
+#, fuzzy
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "Imposible acceder a la información del espacio.\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 "Imposible inicializar SQLite.\n"
+
+#: src/testing/testing_new.c:734
+#, fuzzy, c-format
+msgid "Failed to write hostkey file for peer %u: %s\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/testing/testing_new.c:751
+#, fuzzy, c-format
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgstr "Imposible guardar el fichero de configuración '%s':"
+
+#: src/testing/testing_new.c:791
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/testing/testing_new.c:959
+#, fuzzy, c-format
+msgid "Failed to load configuration from %s\n"
+msgstr "Imposible guardar el fichero de configuración '%s':"
+
+#: 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
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: 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
 #, fuzzy
 msgid "# friends connected"
 msgstr "# de pares conectados"
 
-#: 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
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:982
+#: src/topology/gnunet-daemon-topology.c:1045
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
 
-#: src/topology/gnunet-daemon-topology.c:991
+#: src/topology/gnunet-daemon-topology.c:1054
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: 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 " gconfig\tConfiguración GTK\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 " gconfig\tConfiguración GTK\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
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/topology/gnunet-daemon-topology.c:1161
+#: src/topology/gnunet-daemon-topology.c:1224
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# mensajes salientes omitidos"
 
-#: 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 ""
 
@@ -4598,116 +4678,116 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:953
+#: src/transport/gnunet-service-transport_neighbours.c:1032
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: 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
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1073
+#: src/transport/gnunet-service-transport_neighbours.c:1153
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1078
+#: src/transport/gnunet-service-transport_neighbours.c:1158
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: 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
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1198
+#: src/transport/gnunet-service-transport_neighbours.c:1278
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1206
+#: src/transport/gnunet-service-transport_neighbours.c:1286
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1243
+#: src/transport/gnunet-service-transport_neighbours.c:1323
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1252
+#: src/transport/gnunet-service-transport_neighbours.c:1332
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1308
+#: src/transport/gnunet-service-transport_neighbours.c:1388
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes defragmentados"
 
-#: 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
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "envia COUNT mensajes"
 
-#: 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
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2461
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2490
+#: src/transport/gnunet-service-transport_neighbours.c:2627
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2668
+#: src/transport/gnunet-service-transport_neighbours.c:2807
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# de pares conectados"
 
-#: 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
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# Anuncios de los pares recibidos"
@@ -4764,7 +4844,7 @@
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1135
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Imposible obtener la dirección del par '%s'.\n"
@@ -4864,75 +4944,75 @@
 msgid "Direct access to transport service."
 msgstr "Fallo al conectar a gnunetd.\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 "¡Ninguna aplicación definida en la configuración!\n"
 
-#: 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 "Fichero almacenado en '%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 "Fallo al conectar a gnunetd.\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
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "¡Advertencias de la red desconectadas por configuración!\n"
 
-#: src/transport/plugin_transport_http.c:1383
+#: src/transport/plugin_transport_http.c:1399
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tConfiguración GTK\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 ""
 
@@ -4962,114 +5042,110 @@
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: 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
 #, fuzzy
 msgid "# bytes received via SMTP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_smtp.c:814
+#: src/transport/plugin_transport_smtp.c:812
 #, fuzzy
 msgid "# bytes sent via SMTP"
 msgstr "# bytes enviados por TCP"
 
-#: src/transport/plugin_transport_smtp.c:816
+#: src/transport/plugin_transport_smtp.c:814
 #, fuzzy
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: 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
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes enviados por TCP"
 
-#: 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
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_tcp.c:825
+#: src/transport/plugin_transport_tcp.c:851
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:874
+#: src/transport/plugin_transport_tcp.c:900
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes desencriptados"
 
-#: src/transport/plugin_transport_tcp.c:960
+#: src/transport/plugin_transport_tcp.c:987
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: 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
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:1961
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: 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 "Falló al comenzar la recolección.\n"
 
-#: src/transport/plugin_transport_tcp.c:2236
+#: src/transport/plugin_transport_tcp.c:2343
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: 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 ""
@@ -5079,32 +5155,39 @@
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: 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 "Fichero almacenado en '%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 "Argumento no válido: '%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 "Fichero almacenado en '%s'.\n"
@@ -5120,7 +5203,7 @@
 
 #: 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
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# claves de la sesión aceptadas"
@@ -5135,62 +5218,62 @@
 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
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1112
+#: src/transport/plugin_transport_wlan.c:1119
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1133
+#: src/transport/plugin_transport_wlan.c:1140
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:1143
+#: src/transport/plugin_transport_wlan.c:1150
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_wlan.c:1200
+#: src/transport/plugin_transport_wlan.c:1207
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:1298
+#: src/transport/plugin_transport_wlan.c:1306
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1333
+#: src/transport/plugin_transport_wlan.c:1341
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1393
+#: src/transport/plugin_transport_wlan.c:1402
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# bytes enviados vía UDP"
 
-#: 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 "Fichero de configuración '%s' creado.\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 "Fichero de configuración '%s' creado.\n"
@@ -5246,7 +5329,7 @@
 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 ""
@@ -5265,46 +5348,46 @@
 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 "DEPURACIÓN"
 
-#: 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 "INFORMACIÓN"
 
-#: 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 "PELIGRO"
 
-#: 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 "ERROR"
 
-#: 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 "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/util/common_logging.c:724
+#: src/util/common_logging.c:725
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "unknown address"
 msgstr "desconocido"
 
-#: src/util/common_logging.c:1029
+#: src/util/common_logging.c:1030
 #, fuzzy
 msgid "invalid address"
 msgstr "Argumentos inválidos: "
@@ -5412,82 +5495,82 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/util/disk.c:497
+#: src/util/disk.c:498
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/disk.c:1061
+#: src/util/disk.c:1062
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/util/disk.c:1415 src/util/service.c:1643
+#: src/util/disk.c:1416 src/util/service.c:1650
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
 
-#: src/util/disk.c:1733
+#: src/util/disk.c:1734
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/util/getopt.c:672
+#: src/util/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción '%s' es ambigua\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: la opción '--%s' no permite un argumento\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: la opción '%c%s' no permite un argumento\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: la opción '%s' requiere un argumento\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción no reconocida '--%s'\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción no reconocida '%c%s'\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:773
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción ilegal -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción no válida -- %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: la opción requiere un argumento --%c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:851
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción '-W %s' es ambigua\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: la opción '-W %s' no permite un argumento\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 "Usar --help para obtener una lista de opciones.\n"
@@ -5573,7 +5656,7 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "Error creando usuario"
 
-#: 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"
@@ -5601,12 +5684,12 @@
 msgid "stat (%s) failed: %s\n"
 msgstr "'%s' %s falló: %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 "Fichero almacenado en '%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 "Fichero almacenado en '%s'.\n"
@@ -5678,145 +5761,145 @@
 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 "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/server.c:457
+#: src/util/server.c:492
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:462
+#: src/util/server.c:497
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\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 "Formato no válido para la 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 "Notación de red no válida ('/%d' no es válido en 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 "Notación de red no válida (no termina con ';': '%s')\n"
 
-#: src/util/service.c:306
+#: src/util/service.c:313
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato '%s' erróneo para la máscara de red: %s\n"
 
-#: src/util/service.c:336
+#: src/util/service.c:343
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato '%s' erróneo para la red: %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
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: 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 "Fallo al conectar a gnunetd.\n"
 
-#: src/util/service.c:1532
+#: src/util/service.c:1539
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: 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 "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/util/service.c:1722
+#: src/util/service.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5894,7 +5977,7 @@
 
 #: 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 "# de pares conectados"
 
 #: src/vpn/gnunet-service-vpn.c:699
@@ -5949,44 +6032,44 @@
 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
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/vpn/gnunet-service-vpn.c:2044
+#: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/vpn/gnunet-service-vpn.c:2202
+#: src/vpn/gnunet-service-vpn.c:2203
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: 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
 #, fuzzy
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "¡Falló al obtener mi dirección IPv6 (externa)!\n"
 
-#: 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
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Configuración de GNUnet"
 
-#: 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 ""
 
@@ -6079,6 +6162,14 @@
 msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 
 #, fuzzy
+#~ msgid "# Peers connected"
+#~ msgstr "# de pares conectados"
+
+#, fuzzy
+#~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
+#~ msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+
+#, fuzzy
 #~ msgid "Failed to transmit shutdown ACK.\n"
 #~ msgstr "Falló al comenzar la recolección.\n"
 
@@ -6285,10 +6376,6 @@
 #~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
 #, fuzzy
-#~ msgid "Failed to create file for dhtlog.\n"
-#~ msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
-
-#, fuzzy
 #~ msgid "Found peer `%s'\n"
 #~ msgstr "Yo soy el par '%s'.\n"
 
@@ -7501,10 +7588,6 @@
 #~ msgstr "Fallo al conectar a gnunetd.\n"
 
 #, fuzzy
-#~ msgid "set number of daemons to start"
-#~ msgstr "número de mensajes a usar por iteración"
-
-#, fuzzy
 #~ msgid "Waiting for peers to connect"
 #~ msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
 

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2012-06-01 18:51:57 UTC (rev 21714)
+++ gnunet/po/sv.po     2012-06-01 18:55:31 UTC (rev 21715)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-05-13 03:22+0200\n"
+"POT-Creation-Date: 2012-06-01 20:46+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -339,200 +339,200 @@
 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 misslyckades: %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 misslyckades: %s\n"
 
 # drive = hard drive ?
-#: 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\" misslyckades för enhet %s: %u\n"
 
 # drive = hard drive ?
-#: 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\" misslyckades för enhet %s: %u\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\" misslyckades vid %s:%d med fel: %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 ""
 
-#: src/chat/gnunet-chat.c:258
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' left the room\n"
 msgstr ""
 
-#: 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 "Kunde inte skapa namnrymd \"%s\" (existerar?).\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
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:373
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/chat/gnunet-chat.c:386
+#: src/chat/gnunet-chat.c:388
 #, c-format
 msgid "Users in room `%s': "
 msgstr ""
 
-#: src/chat/gnunet-chat.c:432
+#: src/chat/gnunet-chat.c:434
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: 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 ""
 
-#: src/chat/gnunet-chat.c:511
+#: src/chat/gnunet-chat.c:513
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Okänd operation \"%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
 #, fuzzy
 msgid "You must specify a nickname\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/chat/gnunet-chat.c:686
+#: src/chat/gnunet-chat.c:688
 #, fuzzy, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: 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 ""
 
@@ -589,7 +589,7 @@
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_clients.c:817
+#: src/core/gnunet-service-core_clients.c:818
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -602,7 +602,7 @@
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: 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
 #, fuzzy
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -723,16 +723,16 @@
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: 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 "GNUnet-konfiguration"
 
-#: 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
 #, fuzzy
@@ -760,8 +760,19 @@
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-msgid "# entries in session map"
-msgstr ""
+#: 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
+#, fuzzy
+msgid "# peers connected"
+msgstr "# av anslutna parter"
 
 #: src/core/gnunet-service-core_sessions.c:236
 msgid "# type map refreshes sent"
@@ -1200,7 +1211,7 @@
 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
@@ -1374,12 +1385,6 @@
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:625
-#: src/dht/gnunet-service-dht_neighbours.c:683
-#, fuzzy
-msgid "# Peers connected"
-msgstr "# av anslutna parter"
-
 #: src/dht/gnunet-service-dht_neighbours.c:717
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
@@ -1577,21 +1582,21 @@
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: 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 ""
 
@@ -1615,15 +1620,15 @@
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# byte skickade av typen %d"
 
-#: 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 ""
 
@@ -1672,137 +1677,137 @@
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1470
+#: src/exit/gnunet-daemon-exit.c:1471
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: 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
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# byte mottagna via HTTP"
 
-#: 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
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1655
+#: src/exit/gnunet-daemon-exit.c:1656
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1766
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1779
+#: src/exit/gnunet-daemon-exit.c:1780
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1829
+#: src/exit/gnunet-daemon-exit.c:1830
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1995
+#: src/exit/gnunet-daemon-exit.c:1996
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2237
+#: src/exit/gnunet-daemon-exit.c:2238
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: 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
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2518
+#: src/exit/gnunet-daemon-exit.c:2519
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2618
+#: src/exit/gnunet-daemon-exit.c:2619
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2641
+#: src/exit/gnunet-daemon-exit.c:2642
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# byte mottogs via TCP"
 
-#: 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 ""
 
@@ -1810,47 +1815,52 @@
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:454
+#: src/fragmentation/defragmentation.c:456
 #, fuzzy
 msgid "# fragments received"
 msgstr "# byte mottogs via TCP"
 
-#: src/fragmentation/defragmentation.c:513
+#: src/fragmentation/defragmentation.c:521
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# byte mottogs via TCP"
 
-#: src/fragmentation/defragmentation.c:526
+#: src/fragmentation/defragmentation.c:534
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:199
+#: src/fragmentation/fragmentation.c:203
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:202
+#: src/fragmentation/fragmentation.c:206
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:266
+#: src/fragmentation/fragmentation.c:232
+#, fuzzy
+msgid "# fragments wrap arounds"
+msgstr "# byte skickade av typen %d"
+
+#: 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
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
@@ -1944,44 +1954,49 @@
 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 "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:880
+#: src/fs/fs_download.c:878
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: 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 "Kunde inte slå upp \"%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 "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1030
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr ""
+#: src/fs/fs_download.c:1028
+#, fuzzy, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1886
+#: src/fs/fs_download.c:1125
 #, fuzzy
+msgid "internal error decoding tree"
+msgstr "=\tFel vid läsning av katalog.\n"
+
+#: src/fs/fs_download.c:1888
+#, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
 
@@ -2133,7 +2148,7 @@
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_search.c:828
+#: src/fs/fs_search.c:829
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2313,92 +2328,92 @@
 msgid "Display contents of a GNUnet directory"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/gnunet-download.c:100
+#: src/fs/gnunet-download.c:101
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-download.c:109
+#: src/fs/gnunet-download.c:110
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Okänt fel"
 
-#: 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
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-download.c:136
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
-#: 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 "Du måste ange en och endast en fil att avindexera.\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 "Fil \"%s\" har URI: %s\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 "Misslyckades att initiera tjänsten \"%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 "skriv filen till FILNAMN"
 
-#: 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 "hämta en GNUnet-katalog rekursivt"
 
-#: 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/...)"
@@ -2413,65 +2428,65 @@
 msgid "Special file-sharing operations"
 msgstr "Visa alla alternativ"
 
-#: 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 "Ogiltigt argument: \"%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: flagga \"%s\" är tvetydig\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
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "ange prioritet för innehållet"
 
-#: 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 ""
 
@@ -2707,23 +2722,12 @@
 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 "Misslyckades att initiera tjänsten \"%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
-#, fuzzy
-msgid "# peers connected"
-msgstr "# av anslutna parter"
-
 #: src/fs/gnunet-service-fs_cp.c:696
 #, fuzzy
 msgid "# migration stop messages received"
@@ -3069,33 +3073,33 @@
 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 "Misslyckades att ansluta till gnunetd.\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
 #, fuzzy
 msgid "Specify the type of the record lookup"
 msgstr "ange prioritet för innehållet"
 
-#: 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 ""
 
@@ -3144,7 +3148,7 @@
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\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 "Misslyckades att starta samling.\n"
@@ -3157,6 +3161,14 @@
 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 ""
@@ -3251,7 +3263,7 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: 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 ""
 
@@ -3279,8 +3291,9 @@
 
 #: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgstr ""
+"Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
 #: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
@@ -3302,7 +3315,7 @@
 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 ""
 
@@ -3325,86 +3338,86 @@
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: 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
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: 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 "Kunde inte slå upp \"%s\": %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 "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1382
+#: src/hostlist/hostlist-client.c:1381
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: 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 ""
@@ -3421,7 +3434,7 @@
 #: 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
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -3525,16 +3538,16 @@
 msgid "help text"
 msgstr "hjälptext för -t"
 
-#: 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 "GNUnet-konfiguration"
 
-#: 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 "Kunde inte komma åt namnrymdsinformation.\n"
@@ -3684,12 +3697,12 @@
 msgid "Stored zonekey for zone `%s' in file `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/namestore/gnunet-service-namestore.c:1911
+#: src/namestore/gnunet-service-namestore.c:1909
 #, fuzzy
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: 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 ""
@@ -3773,12 +3786,12 @@
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_test.c:336
+#: src/nat/nat_test.c:341
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: 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 ""
@@ -3793,17 +3806,17 @@
 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
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: 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 "Kunde inte komma åt namnrymdsinformation.\n"
@@ -4052,52 +4065,52 @@
 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
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-service-statistics.c:329
+#: src/statistics/gnunet-service-statistics.c:330
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-statistics.c:104
+#: src/statistics/gnunet-statistics.c:122
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\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 "Misslyckades att initiera tjänsten \"%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 "Skriv ut statistik om GNUnet-operationer."
 
@@ -4257,7 +4270,7 @@
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: 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 "Kunde inte skapa värdnyckel!\n"
@@ -4305,138 +4318,204 @@
 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 "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\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 "Kunde inte skapa värdnyckel!\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 "Kunde inte komma åt namnrymdsinformation.\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 "Kunde inte skapa värdnyckel!\n"
+
+#: src/testing/testing_new.c:380
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
+msgstr ""
+
+#: src/testing/testing_new.c:437
+#, fuzzy, c-format
+msgid "Key number %u does not exist\n"
+msgstr "antal meddelanden att använda per iteration"
+
+#: src/testing/testing_new.c:446
+#, fuzzy, c-format
+msgid "Error while decoding key %u\n"
+msgstr "Fel vid nedladdning: %s\n"
+
+#: src/testing/testing_new.c:680
+#, fuzzy
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\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 "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/testing/testing_new.c:734
+#, fuzzy, c-format
+msgid "Failed to write hostkey file for peer %u: %s\n"
+msgstr "Kunde inte skapa användarkonto:"
+
+#: src/testing/testing_new.c:751
+#, fuzzy, c-format
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/testing/testing_new.c:791
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "Fel vid %s:%d.\n"
+
+#: src/testing/testing_new.c:959
+#, fuzzy, c-format
+msgid "Failed to load configuration from %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: 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
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# byte mottogs via TCP"
 
-#: 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
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: 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
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: 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
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: 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 "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: 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 " gconfig\tGTK-konfiguration\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 " gconfig\tGTK-konfiguration\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
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: 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 ""
 
@@ -4532,115 +4611,115 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:953
+#: src/transport/gnunet-service-transport_neighbours.c:1032
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: 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
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1078
+#: src/transport/gnunet-service-transport_neighbours.c:1158
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: 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
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1198
+#: src/transport/gnunet-service-transport_neighbours.c:1278
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1206
+#: src/transport/gnunet-service-transport_neighbours.c:1286
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1243
+#: src/transport/gnunet-service-transport_neighbours.c:1323
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1252
+#: src/transport/gnunet-service-transport_neighbours.c:1332
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1308
+#: src/transport/gnunet-service-transport_neighbours.c:1388
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: 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
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: 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
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2461
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2490
+#: src/transport/gnunet-service-transport_neighbours.c:2627
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2668
+#: src/transport/gnunet-service-transport_neighbours.c:2807
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: 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
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -4697,7 +4776,7 @@
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1135
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
@@ -4798,74 +4877,74 @@
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\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 "Inga applikationer definierade i konfiguration!\n"
 
-#: 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 "Misslyckades att leverera \"%s\" meddelande.\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 "Misslyckades att binda till UDP-port %d.\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 " gconfig\tGTK-konfiguration\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 ""
 
@@ -4898,114 +4977,110 @@
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: 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
 #, fuzzy
 msgid "# bytes received via SMTP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_smtp.c:814
+#: src/transport/plugin_transport_smtp.c:812
 #, fuzzy
 msgid "# bytes sent via SMTP"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_smtp.c:816
+#: src/transport/plugin_transport_smtp.c:814
 #, fuzzy
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: 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
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: 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
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:825
+#: src/transport/plugin_transport_tcp.c:851
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:874
+#: src/transport/plugin_transport_tcp.c:900
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:960
+#: src/transport/plugin_transport_tcp.c:987
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: 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
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:1961
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: 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 "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2236
+#: src/transport/plugin_transport_tcp.c:2343
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: 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 ""
@@ -5015,32 +5090,39 @@
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: 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 "Misslyckades att binda till UDP6-port %d.\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 "Ogiltigt svar på \"%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 "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -5056,7 +5138,7 @@
 
 #: 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
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# sessionsnycklar accepterade"
@@ -5071,62 +5153,62 @@
 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
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1112
+#: src/transport/plugin_transport_wlan.c:1119
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1133
+#: src/transport/plugin_transport_wlan.c:1140
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1143
+#: src/transport/plugin_transport_wlan.c:1150
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1200
+#: src/transport/plugin_transport_wlan.c:1207
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1298
+#: src/transport/plugin_transport_wlan.c:1306
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1333
+#: src/transport/plugin_transport_wlan.c:1341
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1393
+#: src/transport/plugin_transport_wlan.c:1402
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# byte skickade via UDP"
 
-#: 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 "Konfigurationsfil \"%s\" skapad.\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 "Konfigurationsfil \"%s\" skapad.\n"
@@ -5182,7 +5264,7 @@
 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 ""
@@ -5201,45 +5283,45 @@
 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 "FELSÖKNING"
 
-#: 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 "INFO"
 
-#: 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 "VARNING"
 
-#: 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 "FEL"
 
-#: 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 "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/common_logging.c:724
+#: src/util/common_logging.c:725
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: 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 ""
 
@@ -5345,82 +5427,82 @@
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/disk.c:497
+#: src/util/disk.c:498
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk.c:1061
+#: src/util/disk.c:1062
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk.c:1415 src/util/service.c:1643
+#: src/util/disk.c:1416 src/util/service.c:1650
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:1733
+#: src/util/disk.c:1734
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/util/getopt.c:672
+#: src/util/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flagga \"%s\" är tvetydig\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: flagga \"--%s\" tillåter inte ett argument\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: flagga \"%c%s\" tillåter inte ett argument\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: flagga \"%s\" kräver ett argument\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:773
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: otillåten flagga -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %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: flagga kräver ett argument -- %c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:851
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flagga \"-W %s\" är tvetydig\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: flagga \"-W %s\" tillåter inte ett argument\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 "Använd --help för att få en lista på flaggor.\n"
@@ -5508,7 +5590,7 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: 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"
@@ -5536,12 +5618,12 @@
 msgid "stat (%s) failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %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 "Misslyckades att leverera \"%s\" meddelande.\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 "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -5614,143 +5696,143 @@
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/server.c:448
+#: src/util/server.c:483
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/server.c:457
+#: src/util/server.c:492
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:462
+#: src/util/server.c:497
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\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 "Ogiltigt format för 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 "Ogiltig nätverksnotation (\"/%d\" är inte giltig i 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 "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/service.c:306
+#: src/util/service.c:313
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/service.c:336
+#: src/util/service.c:343
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %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
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: 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 "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1532
+#: src/util/service.c:1539
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: 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 "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/service.c:1722
+#: src/util/service.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5828,7 +5910,7 @@
 
 #: 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 "# av anslutna parter"
 
 #: src/vpn/gnunet-service-vpn.c:699
@@ -5883,43 +5965,43 @@
 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
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2044
+#: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2202
+#: src/vpn/gnunet-service-vpn.c:2203
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: 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
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Nätverksanslutning"
 
-#: 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 ""
 
@@ -6012,6 +6094,14 @@
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "# Peers connected"
+#~ msgstr "# av anslutna parter"
+
+#, fuzzy
+#~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
+#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#, fuzzy
 #~ msgid "Failed to transmit shutdown ACK.\n"
 #~ msgstr "Misslyckades att starta samling.\n"
 
@@ -6189,10 +6279,6 @@
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #, fuzzy
-#~ msgid "Failed to create file for dhtlog.\n"
-#~ msgstr "Kunde inte skapa användarkonto:"
-
-#, fuzzy
 #~ msgid "Found peer `%s'\n"
 #~ msgstr "Jag är ändpunkt \"%s\".\n"
 
@@ -6904,10 +6990,6 @@
 #~ msgstr "Fel vid %s:%d.\n"
 
 #, fuzzy
-#~ msgid "set number of daemons to start"
-#~ msgstr "antal meddelanden att använda per iteration"
-
-#, fuzzy
 #~ msgid "Waiting for peers to connect"
 #~ msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2012-06-01 18:51:57 UTC (rev 21714)
+++ gnunet/po/vi.po     2012-06-01 18:55:31 UTC (rev 21715)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-05-13 03:22+0200\n"
+"POT-Creation-Date: 2012-06-01 20:46+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -348,123 +348,123 @@
 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 "nặc danh"
 
-#: src/chat/gnunet-chat.c:143
+#: src/chat/gnunet-chat.c:144
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "« %s » nói: %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 » nói cho bạn: %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 » nói thật: %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 » nói thật cho bạn: %s\n"
 
-#: src/chat/gnunet-chat.c:158
+#: src/chat/gnunet-chat.c:159
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr "« %s » xác nhận bạn đã nhận được: %s\n"
 
-#: src/chat/gnunet-chat.c:161
+#: src/chat/gnunet-chat.c:162
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr "« %s » xác nhận mà chỉ bạn đã nhận được: %s\n"
 
-#: src/chat/gnunet-chat.c:164
+#: src/chat/gnunet-chat.c:165
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr "« %s » xác nhận mà bạn đã nhận được từ họ : %s\n"
 
-#: src/chat/gnunet-chat.c:169
+#: src/chat/gnunet-chat.c:170
 #, fuzzy, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr "« %s » xác nhận mà chỉ bạn đa nhận được từ họ : %s\n"
 
-#: 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 » nói không chính thức: %s\n"
 
-#: src/chat/gnunet-chat.c:175
+#: src/chat/gnunet-chat.c:176
 #, fuzzy, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr "<%s> đã nói bằng một kiểu tin nhẳn không rõ : %s\n"
 
-#: 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 » vào phòng\n"
 
-#: src/chat/gnunet-chat.c:258
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' left the room\n"
 msgstr "« %s » rời phòng\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 "Không thể tạo miền tên.\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
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Đã vào phòng « %s » là người dùng « %s ».\n"
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:373
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Đã thay đổi tên người dùng thành « %s ».\n"
 
-#: src/chat/gnunet-chat.c:386
+#: src/chat/gnunet-chat.c:388
 #, c-format
 msgid "Users in room `%s': "
 msgstr "Người dùng trong phòng « %s »:"
 
-#: src/chat/gnunet-chat.c:432
+#: src/chat/gnunet-chat.c:434
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr "Cú pháp: /msg TÊN_NGƯỜI_DÙNG TIN_NHẲN"
 
-#: 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 "Người dùng « %s » hiện thời không có trong phòng này.\n"
 
-#: src/chat/gnunet-chat.c:511
+#: src/chat/gnunet-chat.c:513
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Không rõ câu lệnh « %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"
@@ -472,7 +472,7 @@
 "Gõ chuỗi « /join #tên_phòng » để vào một phòng trò chuyện nào đó (việc này "
 "cũng gây ra bạn ra khỏi phòng hiện tại)"
 
-#: 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."
@@ -480,77 +480,77 @@
 "Gõ chuỗi « /nick tên_hiệu » để thay đổi tên hiệu của mình (việc này cũng gây "
 "ra bạn ra khỏi phòng hiện tại, sau đó vào lại ngay với tên mới)"
 
-#: 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 ""
 "Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
 "có tên đó"
 
-#: src/chat/gnunet-chat.c:533
+#: src/chat/gnunet-chat.c:535
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
 
-#: src/chat/gnunet-chat.c:535
+#: src/chat/gnunet-chat.c:537
 msgid "The `/query' command is an alias for `/msg'"
 msgstr "Lệnh « /query » là một biệt hiệu cho « /msg »"
 
-#: src/chat/gnunet-chat.c:537
+#: src/chat/gnunet-chat.c:539
 #, fuzzy
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 "Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
 "có tên đó"
 
-#: 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
 #, fuzzy
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
 
-#: src/chat/gnunet-chat.c:547
+#: src/chat/gnunet-chat.c:549
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
 
-#: src/chat/gnunet-chat.c:549
+#: src/chat/gnunet-chat.c:551
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr "Lệnh « /leave » là một biệt hiệu cho « /quit »"
 
-#: 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 ""
 "Gõ chuỗi « /names » để liệt kê tất cả các thành viên hiện thời trong phòng "
 "trò chuyện đó"
 
-#: src/chat/gnunet-chat.c:554
+#: src/chat/gnunet-chat.c:556
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
 
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:672
 msgid "You must specify a nickname\n"
 msgstr "Phải ghi rõ tên hiệu\n"
 
-#: src/chat/gnunet-chat.c:686
+#: src/chat/gnunet-chat.c:688
 #, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Lỗi vào phòng « %s »\n"
 
-#: src/chat/gnunet-chat.c:725
+#: src/chat/gnunet-chat.c:727
 msgid "set the nickname to use (required)"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/chat/gnunet-chat.c:728
+#: src/chat/gnunet-chat.c:730
 msgid "set the chat room to join"
 msgstr "đặt phòng trò chuyện cần vào"
 
-#: src/chat/gnunet-chat.c:740
+#: src/chat/gnunet-chat.c:742
 msgid "Join a chat on GNUnet."
 msgstr "Vào phòng trò chuyện trên GNUnet."
 
@@ -608,7 +608,7 @@
 msgid "# messages discarded (session disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_clients.c:817
+#: src/core/gnunet-service-core_clients.c:818
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
@@ -621,7 +621,7 @@
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: 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
 #, fuzzy
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
@@ -742,16 +742,16 @@
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: 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 "Lưu cấu hình ngay bây giờ không?"
 
-#: 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
 #, fuzzy
@@ -779,8 +779,19 @@
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-msgid "# entries in session map"
-msgstr ""
+#: 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
+#, fuzzy
+msgid "# peers connected"
+msgstr "# của các đồng đẳng đã kết nối"
 
 #: src/core/gnunet-service-core_sessions.c:236
 #, fuzzy
@@ -1235,7 +1246,7 @@
 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
@@ -1408,12 +1419,6 @@
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:625
-#: src/dht/gnunet-service-dht_neighbours.c:683
-#, fuzzy
-msgid "# Peers connected"
-msgstr "# của các đồng đẳng đã kết nối"
-
 #: src/dht/gnunet-service-dht_neighbours.c:717
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
@@ -1614,21 +1619,21 @@
 msgid "# DNS requests received via TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: 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 ""
 
@@ -1652,15 +1657,15 @@
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# các byte được gửi"
 
-#: 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 ""
 
@@ -1709,138 +1714,138 @@
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1470
+#: src/exit/gnunet-daemon-exit.c:1471
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1571
 #, fuzzy
 msgid "# TCP service creation requests received via mesh"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: 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
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: 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
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:1655
+#: src/exit/gnunet-daemon-exit.c:1656
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1766
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1779
+#: src/exit/gnunet-daemon-exit.c:1780
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:1829
+#: src/exit/gnunet-daemon-exit.c:1830
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1995
+#: src/exit/gnunet-daemon-exit.c:1996
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2237
+#: src/exit/gnunet-daemon-exit.c:2238
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: 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
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2518
+#: src/exit/gnunet-daemon-exit.c:2519
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2618
+#: src/exit/gnunet-daemon-exit.c:2619
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2641
+#: src/exit/gnunet-daemon-exit.c:2642
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: 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 ""
 
@@ -1848,48 +1853,53 @@
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:454
+#: src/fragmentation/defragmentation.c:456
 #, fuzzy
 msgid "# fragments received"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/fragmentation/defragmentation.c:513
+#: src/fragmentation/defragmentation.c:521
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# các kết quả dht được nhận"
 
-#: src/fragmentation/defragmentation.c:526
+#: src/fragmentation/defragmentation.c:534
 msgid "# messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/fragmentation/fragmentation.c:199
+#: src/fragmentation/fragmentation.c:203
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:202
+#: src/fragmentation/fragmentation.c:206
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:266
+#: src/fragmentation/fragmentation.c:232
+#, fuzzy
+msgid "# fragments wrap arounds"
+msgstr "# Các tự quảng cáo được truyền"
+
+#: src/fragmentation/fragmentation.c:273
 msgid "# messages fragmented"
 msgstr "# các thông báo bị tế phân"
 
-#: 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
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Các quảng cáo đồng đẳng được nhận"
 
-#: 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
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
@@ -1983,44 +1993,49 @@
 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 "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:880
+#: src/fs/fs_download.c:878
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: 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 "Lỗi mở tập tin theo dõi « %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 "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1030
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr ""
+#: src/fs/fs_download.c:1028
+#, fuzzy, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1886
+#: src/fs/fs_download.c:1125
 #, fuzzy
+msgid "internal error decoding tree"
+msgstr "=\tLỗi đọc thư mục.\n"
+
+#: src/fs/fs_download.c:1888
+#, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
@@ -2170,7 +2185,7 @@
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs_search.c:828
+#: src/fs/fs_search.c:829
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2349,95 +2364,95 @@
 msgid "Display contents of a GNUnet directory"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/gnunet-download.c:100
+#: src/fs/gnunet-download.c:101
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-download.c:109
+#: src/fs/gnunet-download.c:110
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Lỗi không rõ"
 
-#: 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
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-download.c:136
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
-#: 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
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\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 "Tập tin « %s » có URI: %s\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 "Lỗi sơ khởi dịch vụ « %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
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-download.c:250
+#: src/fs/gnunet-download.c:251
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
 
-#: 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 "ghi tập tin vào TÊN_TẬP_TIN"
 
-#: src/fs/gnunet-download.c:260
+#: src/fs/gnunet-download.c:261
 #, fuzzy
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:264
+#: src/fs/gnunet-download.c:265
 #, fuzzy
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:267
+#: src/fs/gnunet-download.c:268
 msgid "download a GNUnet directory recursively"
 msgstr "tải xuống đệ quy một thư mục GNUnet"
 
-#: 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/...)"
@@ -2452,30 +2467,30 @@
 msgid "Special file-sharing operations"
 msgstr "Tùy chọn chia sẻ tập tin"
 
-#: 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 "Đối số không hợp lệ cho « %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: tùy chọn « %s » là mơ hồ\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 "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: 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
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2484,38 +2499,38 @@
 "thêm một từ khóa bổ sung cho tất cả tập tin và thư mục (có thể chỉ ra tùy "
 "chọn này nhiều lần)"
 
-#: 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 "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
 
-#: src/fs/gnunet-pseudonym.c:294
+#: src/fs/gnunet-pseudonym.c:295
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: 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
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:309
+#: src/fs/gnunet-pseudonym.c:310
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:317
+#: src/fs/gnunet-pseudonym.c:318
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2766,23 +2781,12 @@
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
 #: 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 "Lỗi sơ khởi dịch vụ « %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
-#, fuzzy
-msgid "# peers connected"
-msgstr "# của các đồng đẳng đã kết nối"
-
 #: src/fs/gnunet-service-fs_cp.c:696
 #, fuzzy
 msgid "# migration stop messages received"
@@ -3138,33 +3142,33 @@
 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 "Lỗi kết nối đến gnunetd.\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
 #, fuzzy
 msgid "Specify the type of the record lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: 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 ""
 
@@ -3214,7 +3218,7 @@
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: 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 "Lỗi bắt đầu thu thập.\n"
@@ -3227,6 +3231,14 @@
 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 ""
@@ -3328,7 +3340,7 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: 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 ""
 
@@ -3356,8 +3368,8 @@
 
 #: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
 #: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
@@ -3378,7 +3390,7 @@
 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 ""
 
@@ -3401,90 +3413,90 @@
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: 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
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 "Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/hostlist-client.c:1279
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: 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 "Lỗi mở tập tin theo dõi « %s »: %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
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1363
+#: src/hostlist/hostlist-client.c:1362
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 "Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
 
-#: 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 "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1382
+#: src/hostlist/hostlist-client.c:1381
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: 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
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: 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
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
@@ -3501,7 +3513,7 @@
 #: 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
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
@@ -3610,16 +3622,16 @@
 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 "Lưu cấu hình ngay bây giờ không?"
 
-#: 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 "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -3766,11 +3778,11 @@
 msgid "Stored zonekey for zone `%s' in file `%s'\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %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 ""
@@ -3857,12 +3869,12 @@
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_test.c:336
+#: src/nat/nat_test.c:341
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: 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 ""
@@ -3877,16 +3889,16 @@
 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 "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -4142,52 +4154,52 @@
 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
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-service-statistics.c:329
+#: src/statistics/gnunet-service-statistics.c:330
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:104
+#: src/statistics/gnunet-statistics.c:122
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:181
+#: src/statistics/gnunet-statistics.c:199
 #, fuzzy, c-format
 msgid "No subsystem or name given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/statistics/gnunet-statistics.c:189
+#: src/statistics/gnunet-statistics.c:207
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Lỗi sơ khởi dịch vụ « %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 "In ra thống kê về các thao tác GNUnet."
 
@@ -4347,7 +4359,7 @@
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: 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 "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -4395,22 +4407,22 @@
 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 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/testing/testing_group.c:2165
+#: src/testing/testing_group.c:2160
 #, fuzzy, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/testing/testing_group.c:2882 src/testing/testing_group.c:3068
+#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
@@ -4418,124 +4430,190 @@
 msgstr ""
 "Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
 
-#: 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
 #, fuzzy
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: 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 "Không thể đọc danh sách bạn bè « %s »\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 "Không thể truy cập đến thông tin về không gian tên.\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 "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/testing/testing_new.c:380
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
+msgstr ""
+
+#: src/testing/testing_new.c:437
+#, fuzzy, c-format
+msgid "Key number %u does not exist\n"
+msgstr "đặt số trình nền cần khởi chạy"
+
+#: src/testing/testing_new.c:446
+#, fuzzy, c-format
+msgid "Error while decoding key %u\n"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/testing/testing_new.c:680
+#, fuzzy
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\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 "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/testing/testing_new.c:734
+#, fuzzy, c-format
+msgid "Failed to write hostkey file for peer %u: %s\n"
+msgstr "Lỗi tạo thư mục tạm thời."
+
+#: src/testing/testing_new.c:751
+#, fuzzy, c-format
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/testing/testing_new.c:791
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "Lỗi chạy %s: %s %d\n"
+
+#: src/testing/testing_new.c:959
+#, fuzzy, c-format
+msgid "Failed to load configuration from %s\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: 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
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: 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
 #, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: 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
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: 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 "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:982
+#: src/topology/gnunet-daemon-topology.c:1045
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/topology/gnunet-daemon-topology.c:991
+#: src/topology/gnunet-daemon-topology.c:1054
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: 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 "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1019
+#: src/topology/gnunet-daemon-topology.c:1082
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1032
+#: src/topology/gnunet-daemon-topology.c:1095
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: 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"
 "Kết thúc cấu hình.\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"
 "Kết thúc cấu hình.\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 ""
 "Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
 
-#: 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 "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1106
+#: src/topology/gnunet-daemon-topology.c:1169
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/topology/gnunet-daemon-topology.c:1161
+#: src/topology/gnunet-daemon-topology.c:1224
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại bỏ"
 
-#: 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 ""
 
@@ -4633,117 +4711,117 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:953
+#: src/transport/gnunet-service-transport_neighbours.c:1032
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: 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
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1073
+#: src/transport/gnunet-service-transport_neighbours.c:1153
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1078
+#: src/transport/gnunet-service-transport_neighbours.c:1158
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: 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
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1198
+#: src/transport/gnunet-service-transport_neighbours.c:1278
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1206
+#: src/transport/gnunet-service-transport_neighbours.c:1286
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1243
+#: src/transport/gnunet-service-transport_neighbours.c:1323
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1252
+#: src/transport/gnunet-service-transport_neighbours.c:1332
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1308
+#: src/transport/gnunet-service-transport_neighbours.c:1388
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1342
+#: src/transport/gnunet-service-transport_neighbours.c:1422
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "theo dõi gnunetd sử dụng dải thông"
 
-#: 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
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: 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
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2461
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2490
+#: src/transport/gnunet-service-transport_neighbours.c:2627
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2668
+#: src/transport/gnunet-service-transport_neighbours.c:2807
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: 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
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
@@ -4800,7 +4878,7 @@
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1135
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
@@ -4901,76 +4979,76 @@
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\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 "Lỗi lưu cấu hình."
 
-#: 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 "Lỗi mở tập tin ghi sự kiện « %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 "Lỗi đóng kết đến cổng %s %d.\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"
 "Kết thúc cấu hình.\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 ""
 
@@ -5000,111 +5078,107 @@
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: 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 "Chưa ghi rõ địa chỉ thư điện tử nên không tạo được truyền tải SMTP.\n"
 
-#: src/transport/plugin_transport_smtp.c:813
+#: src/transport/plugin_transport_smtp.c:811
 msgid "# bytes received via SMTP"
 msgstr "# các byte đã nhận qua SMTP"
 
-#: src/transport/plugin_transport_smtp.c:814
+#: src/transport/plugin_transport_smtp.c:812
 msgid "# bytes sent via SMTP"
 msgstr "# các byte đã gửi qua SMTP"
 
-#: src/transport/plugin_transport_smtp.c:816
+#: src/transport/plugin_transport_smtp.c:814
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:559
+#: src/transport/plugin_transport_tcp.c:582
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: 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
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: 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
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:825
+#: src/transport/plugin_transport_tcp.c:851
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:874
+#: src/transport/plugin_transport_tcp.c:900
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:960
+#: src/transport/plugin_transport_tcp.c:987
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1250
+#: src/transport/plugin_transport_tcp.c:1279
 #, fuzzy, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: 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
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_tcp.c:1946
+#: src/transport/plugin_transport_tcp.c:1961
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: 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 "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2236
+#: src/transport/plugin_transport_tcp.c:2343
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: 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 ""
@@ -5114,32 +5188,39 @@
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: 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 "Lỗi mở tập tin ghi sự kiện « %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 "Mức ưu tiên tiến trình không hợp lê « %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 "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -5155,7 +5236,7 @@
 
 #: 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
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -5170,62 +5251,62 @@
 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
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1112
+#: src/transport/plugin_transport_wlan.c:1119
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1133
+#: src/transport/plugin_transport_wlan.c:1140
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:1143
+#: src/transport/plugin_transport_wlan.c:1150
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1200
+#: src/transport/plugin_transport_wlan.c:1207
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:1298
+#: src/transport/plugin_transport_wlan.c:1306
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1333
+#: src/transport/plugin_transport_wlan.c:1341
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1393
+#: src/transport/plugin_transport_wlan.c:1402
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: 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 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con 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 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
@@ -5280,7 +5361,7 @@
 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 ""
@@ -5299,45 +5380,45 @@
 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 "GỠ LỖI"
 
-#: 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 "TIN"
 
-#: 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 "CẢNH BÁO"
 
-#: 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 "LỖI"
 
-#: 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 "Không thể truy cập đến tập tin gnunet-directory « %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 "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\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 ""
 
@@ -5444,82 +5525,82 @@
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/disk.c:497
+#: src/util/disk.c:498
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/disk.c:1061
+#: src/util/disk.c:1062
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\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 "Không thể lấy thông tin về người dùng « %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: tùy chọn « %s » là mơ hồ\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: tùy chọn « --%s » không cho phép đối 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: tùy chọn « %c%s » không cho phép đối 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: tùy chọn « %s » cần thiết đối số\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: không nhận ra tùy chọn « --%s »\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:773
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: tùy chọn không được phép -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: tùy chọn không hợp lệ -- %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: tùy chọn cần thiết đối 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: tùy chọn « -W %s » là mơ hồ\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: tùy chọn « -W %s » không cho phép đối 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 ""
@@ -5608,7 +5689,7 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: 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"
@@ -5636,12 +5717,12 @@
 msgid "stat (%s) failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %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 "Lỗi mở tập tin ghi sự kiện « %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 "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -5710,143 +5791,143 @@
 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 "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/server.c:457
+#: src/util/server.c:492
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:462
+#: src/util/server.c:497
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\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 "Địa chỉ IP định dạng sai: %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 "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/util/service.c:274
+#: src/util/service.c:281
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/service.c:306
+#: src/util/service.c:313
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/service.c:336
+#: src/util/service.c:343
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %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
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
 
-#: 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 "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1532
+#: src/util/service.c:1539
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
 
-#: 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 "Không có người dùng như vậy"
 
-#: src/util/service.c:1657
+#: src/util/service.c:1664
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
 
-#: src/util/service.c:1722
+#: src/util/service.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5925,7 +6006,7 @@
 
 #: 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 "# của các đồng đẳng đã kết nối"
 
 #: src/vpn/gnunet-service-vpn.c:699
@@ -5980,43 +6061,43 @@
 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
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2044
+#: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2202
+#: src/vpn/gnunet-service-vpn.c:2203
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: 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
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
 
-#: 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 ""
 
@@ -6109,6 +6190,14 @@
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "# Peers connected"
+#~ msgstr "# của các đồng đẳng đã kết nối"
+
+#, fuzzy
+#~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
+#~ msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+
+#, fuzzy
 #~ msgid "Failed to transmit shutdown ACK.\n"
 #~ msgstr "Lỗi bắt đầu thu thập.\n"
 
@@ -6324,10 +6413,6 @@
 #~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
 #, fuzzy
-#~ msgid "Failed to create file for dhtlog.\n"
-#~ msgstr "Lỗi tạo thư mục tạm thời."
-
-#, fuzzy
 #~ msgid "Found peer `%s'\n"
 #~ msgstr "Tôi là đồng đẳng « %s ».\n"
 
@@ -7809,9 +7894,6 @@
 #~ msgid "Set up multiple gnunetd daemons across multiple hosts."
 #~ msgstr "Thiết lập nhiều trình nền gnunetd qua nhiều máy khác nhau."
 
-#~ msgid "set number of daemons to start"
-#~ msgstr "đặt số trình nền cần khởi chạy"
-
 #~ msgid "Waiting for peers to connect"
 #~ msgstr "Đang đợi các đồng đẳng kết nối"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2012-06-01 18:51:57 UTC (rev 21714)
+++ gnunet/po/zh_CN.po  2012-06-01 18:55:31 UTC (rev 21715)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"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 <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -336,197 +336,197 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,44 +1864,49 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 #: 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
 #: 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 @@
 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 @@
 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 ""
 #~ "操作系统通知,在 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"

Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am  2012-06-01 18:51:57 UTC (rev 21714)
+++ gnunet/src/ats/Makefile.am  2012-06-01 18:55:31 UTC (rev 21715)
@@ -124,5 +124,5 @@
 
 EXTRA_DIST = \
   ats.h \
-  test_ats_api.conf 
+  test_ats_api.conf
 

Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c   2012-06-01 18:51:57 UTC (rev 21714)
+++ gnunet/src/dv/gnunet-service-dv.c   2012-06-01 18:55:31 UTC (rev 21715)
@@ -582,7 +582,7 @@
 /**
  * Transmit handle to the plugin.
  */
-static struct GNUNET_CONNECTION_TransmitHandle *plugin_transmit_handle;
+static struct GNUNET_SERVER_TransmitHandle *plugin_transmit_handle;
 
 /**
  * Head of DLL for client messages

Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2012-06-01 18:51:57 UTC (rev 21714)
+++ gnunet/src/gns/Makefile.am  2012-06-01 18:55:31 UTC (rev 21715)
@@ -205,7 +205,7 @@
   libgnunetgns.la
 
 gnunet_gns_proxy_SOURCES = \
- gnunet-gns-proxy.c
+ gnunet-gns-proxy.c gns_proxy_proto.h 
 gnunet_gns_proxy_LDADD = -lmicrohttpd \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -215,8 +215,8 @@
 
 gnunet_service_gns_SOURCES = \
  gnunet-service-gns.c \
- gnunet-service-gns_resolver.c \
- gnunet-service-gns_interceptor.c
+ gnunet-service-gns_resolver.c gnunet-service-gns_resolver.h \
+ gnunet-service-gns_interceptor.c gnunet-service-gns_interceptor.h 
 gnunet_service_gns_LDADD = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -286,4 +286,7 @@
 endif
 
 EXTRA_DIST = \
-  test_gns_simple_lookup.conf
+  test_gns_defaults.conf \
+  test_gns_simple_lookup.conf \
+  test_gns_dht_default.conf
+

Modified: gnunet/src/include/Makefile.am
===================================================================
--- gnunet/src/include/Makefile.am      2012-06-01 18:51:57 UTC (rev 21714)
+++ gnunet/src/include/Makefile.am      2012-06-01 18:55:31 UTC (rev 21715)
@@ -51,6 +51,7 @@
   gnunet_hello_lib.h \
   gnunet_helper_lib.h \
   gnunet_load_lib.h \
+  gnunet_lockmanager_service.h \
   gnunet_mesh_service.h \
   gnunet_mysql_lib.h \
   gnunet_namestore_plugin.h \
@@ -67,6 +68,7 @@
   gnunet_protocols.h \
   gnunet_pseudonym_lib.h \
   gnunet_resolver_service.h \
+  gnunet_regex_lib.h \
   gnunet_scheduler_lib.h \
   gnunet_server_lib.h \
   gnunet_service_lib.h \

Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am    2012-06-01 18:51:57 UTC (rev 
21714)
+++ gnunet/src/integration-tests/Makefile.am    2012-06-01 18:55:31 UTC (rev 
21715)
@@ -125,6 +125,7 @@
    gnunet_pyexpect.py.in \
    test_integration_connection_values_tcp.py.in \
    test_integration_connection_values_tcp_udp.py.in \
+   test_integration_connection_values_tcp_udp_http.py.in \
    test_integration_bootstrap_and_connect.py.in \
    test_integration_bootstrap_and_connect_and_disconnect.py.in \
    test_integration_bootstrap_and_connect_and_disconnect_nat.py.in \
@@ -144,6 +145,8 @@
    confs/c_no_nat_client_http_2.conf\
    confs/c_no_nat_client_http.conf \
    confs/c_no_nat_client_http_2.conf \
+   confs/c_no_nat_client_unix.conf \
+   confs/c_no_nat_client_unix_2.conf \
    test_connection_stability.conf \
    hostkeys/0000-hostkey \
    hostkeys/0001-hostkey \




reply via email to

[Prev in Thread] Current Thread [Next in Thread]