gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r4987 - in GNUnet: . contrib po src/applications/transport


From: gnunet
Subject: [GNUnet-SVN] r4987 - in GNUnet: . contrib po src/applications/transport
Date: Sat, 9 Jun 2007 02:20:07 -0600 (MDT)

Author: grothoff
Date: 2007-06-09 02:20:05 -0600 (Sat, 09 Jun 2007)
New Revision: 4987

Modified:
   GNUnet/configure.ac
   GNUnet/contrib/doxygen
   GNUnet/po/GNUnet.pot
   GNUnet/po/POTFILES.in
   GNUnet/po/de.po
   GNUnet/po/es.po
   GNUnet/po/rw.po
   GNUnet/po/sv.po
   GNUnet/po/vi.po
   GNUnet/src/applications/transport/transport.c
   GNUnet/todo
Log:
resolved

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2007-06-09 08:10:48 UTC (rev 4986)
+++ GNUnet/configure.ac 2007-06-09 08:20:05 UTC (rev 4987)
@@ -21,8 +21,8 @@
 #
 #
 AC_PREREQ(2.57)
-AC_INIT([GNUnet], [0.7.1c],address@hidden)
-AM_INIT_AUTOMAKE([GNUnet], [0.7.1c])
+AC_INIT([GNUnet], [0.7.2],address@hidden)
+AM_INIT_AUTOMAKE([GNUnet], [0.7.2])
 AM_CONFIG_HEADER([config.h])
 
 AH_TOP([#define _GNU_SOURCE  1])

Modified: GNUnet/contrib/doxygen
===================================================================
--- GNUnet/contrib/doxygen      2007-06-09 08:10:48 UTC (rev 4986)
+++ GNUnet/contrib/doxygen      2007-06-09 08:20:05 UTC (rev 4987)
@@ -23,7 +23,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.7.1c
+PROJECT_NUMBER         = 0.7.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2007-06-09 08:10:48 UTC (rev 4986)
+++ GNUnet/po/GNUnet.pot        2007-06-09 08:20:05 UTC (rev 4987)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-27 22:50-0600\n"
+"POT-Creation-Date: 2007-06-09 01:06-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -217,12 +217,23 @@
 "Windows, this setting affects the creation of a new system service only."
 msgstr ""
 
-#: contrib/config-daemon.scm:320
-msgid "Which transport mechanisms should GNUnet use?"
+#: contrib/config-daemon.scm:321
+msgid "Should gnunetd be automatically started when the system boots?"
 msgstr ""
 
 #: contrib/config-daemon.scm:322
 msgid ""
+"Set to YES if gnunetd should be automatically started on boot.  If this "
+"option is set, gnunet-setup will install a script to start the daemon upon "
+"completion.  This option may not work on all systems."
+msgstr ""
+
+#: contrib/config-daemon.scm:334
+msgid "Which transport mechanisms should GNUnet use?"
+msgstr ""
+
+#: contrib/config-daemon.scm:336
+msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
 "available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
 "\t\t\n"
@@ -235,11 +246,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:350
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:338
+#: contrib/config-daemon.scm:352
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -276,15 +287,15 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:367
+#: contrib/config-daemon.scm:381
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:379
+#: contrib/config-daemon.scm:393
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:380
+#: contrib/config-daemon.scm:394
 msgid ""
 "The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
 "peer to peers of which the hostkey has been copied by hand to data/hosts;  "
@@ -296,15 +307,15 @@
 "lines above would need some minor editing :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:391
+#: contrib/config-daemon.scm:405
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:403
+#: contrib/config-daemon.scm:417
 msgid "Disable automatic establishment of connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:404
+#: contrib/config-daemon.scm:418
 msgid ""
 "If this option is enabled, GNUnet will not automatically establish "
 "connections to other peers, but instead wait for applications to "
@@ -312,15 +323,21 @@
 "connect to us)."
 msgstr ""
 
-#: contrib/config-daemon.scm:415
+#: contrib/config-daemon.scm:429
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:427
+#: contrib/config-daemon.scm:430
+msgid ""
+"This option maybe useful during testing, but turning it off is dangerous! If "
+"in any doubt, set it to YES (which is the default)."
+msgstr ""
+
+#: contrib/config-daemon.scm:441
 msgid "Client/Server Port"
 msgstr ""
 
-#: contrib/config-daemon.scm:428
+#: contrib/config-daemon.scm:442
 msgid ""
 "Which is the client-server port that is used between gnunetd and the clients "
 "(TCP only).  You may firewall this port for non-local machines (but you do "
@@ -328,11 +345,11 @@
 "connections from machines that are listed under TRUSTED)."
 msgstr ""
 
-#: contrib/config-daemon.scm:439
+#: contrib/config-daemon.scm:453
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:440
+#: contrib/config-daemon.scm:454
 msgid ""
 "This option specifies which hosts are trusted enough to connect as clients "
 "(to the TCP port).  This is useful if you run gnunetd on one host of your "
@@ -343,71 +360,71 @@
 "separated by a semicolon, spaces are not allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:452
+#: contrib/config-daemon.scm:466
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:453
+#: contrib/config-daemon.scm:467
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If it is set, "
 "only the specified peers are allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:464
+#: contrib/config-daemon.scm:478
 msgid "Run gnunetd as this user."
 msgstr ""
 
-#: contrib/config-daemon.scm:465
+#: contrib/config-daemon.scm:479
 msgid ""
 "When started as root, gnunetd will change permissions to the given user."
 msgstr ""
 
-#: contrib/config-daemon.scm:476
+#: contrib/config-daemon.scm:490
 msgid "Run gnunetd as this group."
 msgstr ""
 
-#: contrib/config-daemon.scm:477
+#: contrib/config-daemon.scm:491
 msgid ""
 "When started as root, gnunetd will change permissions to the given group."
 msgstr ""
 
-#: contrib/config-daemon.scm:488
+#: contrib/config-daemon.scm:502
 msgid "Run gnunetd during system startup?"
 msgstr ""
 
-#: contrib/config-daemon.scm:501
+#: contrib/config-daemon.scm:515
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:502
+#: contrib/config-daemon.scm:516
 msgid "If this option is not set, any peer is allowed to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:513
+#: contrib/config-daemon.scm:527
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:533
+#: contrib/config-daemon.scm:547
 msgid "General settings"
 msgstr ""
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:548
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:561
+#: contrib/config-daemon.scm:576
 msgid "Path settings"
 msgstr ""
 
-#: contrib/config-daemon.scm:562
+#: contrib/config-daemon.scm:577
 msgid "Prefixes for paths used by GNUnet"
 msgstr ""
 
-#: contrib/config-daemon.scm:578
+#: contrib/config-daemon.scm:593
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:580
+#: contrib/config-daemon.scm:595
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -416,11 +433,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:593
+#: contrib/config-daemon.scm:608
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:595
+#: contrib/config-daemon.scm:610
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -433,42 +450,42 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:610
+#: contrib/config-daemon.scm:625
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:626
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:628
+#: contrib/config-daemon.scm:643
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:629
+#: contrib/config-daemon.scm:644
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:643
+#: contrib/config-daemon.scm:658
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:655
+#: contrib/config-daemon.scm:670
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:667
+#: contrib/config-daemon.scm:682
 msgid "Configuration of the MySQL database"
 msgstr ""
 
-#: contrib/config-daemon.scm:686
+#: contrib/config-daemon.scm:701
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:688
+#: contrib/config-daemon.scm:703
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -479,19 +496,19 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:702
+#: contrib/config-daemon.scm:717
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:714
+#: contrib/config-daemon.scm:729
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:727
+#: contrib/config-daemon.scm:742
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:729
+#: contrib/config-daemon.scm:744
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -503,13 +520,13 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:743
+#: contrib/config-daemon.scm:758
 msgid ""
 "MB of diskspace GNUnet can use for caching DHT index data (the data will be "
 "stored in /tmp)"
 msgstr ""
 
-#: contrib/config-daemon.scm:744
+#: contrib/config-daemon.scm:759
 msgid ""
 "DHT index data is inherently small and expires comparatively quickly.  It is "
 "deleted whenever gnunetd is shut down.\n"
@@ -517,19 +534,19 @@
 "The size of the DSTORE QUOTA is specified in MB."
 msgstr ""
 
-#: contrib/config-daemon.scm:758
+#: contrib/config-daemon.scm:773
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:777
+#: contrib/config-daemon.scm:792
 msgid "Applications"
 msgstr ""
 
-#: contrib/config-daemon.scm:793
+#: contrib/config-daemon.scm:808
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:794
+#: contrib/config-daemon.scm:809
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port and that cannot be traversed using UPnP.  Note "
@@ -542,15 +559,15 @@
 "connections.  Use YES only if you get no connections otherwise."
 msgstr ""
 
-#: contrib/config-daemon.scm:805
+#: contrib/config-daemon.scm:820
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:817 contrib/config-daemon.scm:910
+#: contrib/config-daemon.scm:832 contrib/config-daemon.scm:925
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:818
+#: contrib/config-daemon.scm:833
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP.  You should disable this option if you are sure that you are "
@@ -558,34 +575,34 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:829 contrib/config-daemon.scm:934
-#: contrib/config-daemon.scm:989 contrib/config-daemon.scm:1054
+#: contrib/config-daemon.scm:844 contrib/config-daemon.scm:949
+#: contrib/config-daemon.scm:1004 contrib/config-daemon.scm:1069
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:841 contrib/config-daemon.scm:946
+#: contrib/config-daemon.scm:856
 msgid ""
-"Which IPs are allowed to connect? Leave empty to allow connections from any "
-"IP."
+"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
+"network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:853
+#: contrib/config-daemon.scm:868
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:871
+#: contrib/config-daemon.scm:886
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:883
+#: contrib/config-daemon.scm:898
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:898
+#: contrib/config-daemon.scm:913
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:926
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP. You should disable this option if you are sure that you are "
@@ -593,68 +610,74 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:922
+#: contrib/config-daemon.scm:937
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:958
+#: contrib/config-daemon.scm:961
+msgid ""
+"Which IPs are allowed to connect? Leave empty to allow connections from any "
+"IP."
+msgstr ""
+
+#: contrib/config-daemon.scm:973
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:977
+#: contrib/config-daemon.scm:992
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1001 contrib/config-daemon.scm:1066
+#: contrib/config-daemon.scm:1016 contrib/config-daemon.scm:1081
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow any IP to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:1013
+#: contrib/config-daemon.scm:1028
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1030
+#: contrib/config-daemon.scm:1045
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1042
+#: contrib/config-daemon.scm:1057
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1078
+#: contrib/config-daemon.scm:1093
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1096
+#: contrib/config-daemon.scm:1111
 msgid "Network interface"
 msgstr ""
 
-#: contrib/config-daemon.scm:1108
+#: contrib/config-daemon.scm:1123
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1120
+#: contrib/config-daemon.scm:1135
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1132
+#: contrib/config-daemon.scm:1147
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1155
+#: contrib/config-daemon.scm:1170
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1167
+#: contrib/config-daemon.scm:1182
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1179
+#: contrib/config-daemon.scm:1194
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1181
+#: contrib/config-daemon.scm:1196
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -664,11 +687,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1192
+#: contrib/config-daemon.scm:1207
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1194
+#: contrib/config-daemon.scm:1209
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -678,36 +701,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1205
+#: contrib/config-daemon.scm:1220
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1206
+#: contrib/config-daemon.scm:1221
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1217
+#: contrib/config-daemon.scm:1232
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1218
+#: contrib/config-daemon.scm:1233
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1229
+#: contrib/config-daemon.scm:1244
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1241
+#: contrib/config-daemon.scm:1256
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1243
+#: contrib/config-daemon.scm:1258
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -752,11 +775,11 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1260
+#: contrib/config-daemon.scm:1275
 msgid "Network interface to monitor"
 msgstr ""
 
-#: contrib/config-daemon.scm:1261
+#: contrib/config-daemon.scm:1276
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -767,11 +790,11 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1272
+#: contrib/config-daemon.scm:1287
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1297 contrib/config-client.scm:365
+#: contrib/config-daemon.scm:1312 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -873,18 +896,31 @@
 msgstr ""
 
 #: contrib/config-client.scm:322
+msgid "Do not show search results for files that were uploaded by us"
+msgstr ""
+
+#: contrib/config-client.scm:323
+msgid ""
+"This option is useful to eliminate files that the user already has from the "
+"search.  Naturally, enabling this option maybe confusing because some "
+"obviously expected search results would no longer show up.  This option only "
+"works if the URI_DB_SIZE option under FS is not zero (since the URI DB is "
+"used to determine which files the user is sharing)"
+msgstr ""
+
+#: contrib/config-client.scm:335
 msgid "To which directory should gnunet-gtk save downloads to?"
 msgstr ""
 
-#: contrib/config-client.scm:334
+#: contrib/config-client.scm:347
 msgid "Options related to gnunet-gtk"
 msgstr ""
 
-#: contrib/config-client.scm:353
+#: contrib/config-client.scm:367
 msgid "Full pathname of GNUnet client HOME directory"
 msgstr ""
 
-#: contrib/config-client.scm:354
+#: contrib/config-client.scm:368
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
@@ -1535,7 +1571,7 @@
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/udp6.c:521 src/transports/udp.c:535
+#: src/transports/udp6.c:544 src/transports/udp.c:575
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
@@ -1544,36 +1580,36 @@
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/http.c:753 src/transports/http.c:826
-#: src/transports/http.c:950 src/transports/http.c:1035
+#: src/transports/http.c:754 src/transports/http.c:827
+#: src/transports/http.c:951 src/transports/http.c:1036
 #: src/transports/upnp/upnp.c:335 src/transports/upnp/upnp.c:560
-#: src/applications/bootstrap_http/http.c:121
-#: src/applications/bootstrap_http/http.c:261
-#: src/applications/bootstrap_http/http.c:282
-#: src/applications/bootstrap_http/http.c:316
-#: src/applications/bootstrap_http/http.c:334
-#: src/applications/bootstrap_http/http.c:348
-#: src/applications/bootstrap_http/http.c:360
-#: src/applications/bootstrap_http/http.c:372
+#: src/applications/bootstrap_http/http.c:124
+#: src/applications/bootstrap_http/http.c:269
+#: src/applications/bootstrap_http/http.c:290
+#: src/applications/bootstrap_http/http.c:324
+#: src/applications/bootstrap_http/http.c:342
+#: src/applications/bootstrap_http/http.c:356
+#: src/applications/bootstrap_http/http.c:368
+#: src/applications/bootstrap_http/http.c:380
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/transports/http.c:1225
+#: src/transports/http.c:1248
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:1233
+#: src/transports/http.c:1256
 msgid "# bytes received via HTTP"
 msgstr ""
 
-#: src/transports/http.c:1235
+#: src/transports/http.c:1258
 msgid "# bytes sent via HTTP"
 msgstr ""
 
-#: src/transports/http.c:1237
+#: src/transports/http.c:1260
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
@@ -1597,97 +1633,97 @@
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transports/smtp.c:546
+#: src/transports/smtp.c:547
 #, c-format
 msgid "Failed to initialize libesmtp: %s.\n"
 msgstr ""
 
-#: src/transports/smtp.c:610
+#: src/transports/smtp.c:611
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr ""
 
-#: src/transports/smtp.c:678
+#: src/transports/smtp.c:679
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
 
-#: src/transports/smtp.c:706
+#: src/transports/smtp.c:707
 #, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 
-#: src/transports/tcp.c:271
+#: src/transports/tcp.c:274
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/tcp.c:357
+#: src/transports/tcp.c:358
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/transports/tcp.c:424 src/transports/tcp6.c:379
+#: src/transports/tcp.c:425 src/transports/tcp6.c:382
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:569
+#: src/transports/tcp.c:592
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:577
+#: src/transports/tcp.c:600
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:579
+#: src/transports/tcp.c:602
 msgid "# bytes sent via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:581
+#: src/transports/tcp.c:604
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:276
+#: src/transports/udp.c:293
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/udp.c:367
+#: src/transports/udp.c:382
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/transports/udp.c:553
+#: src/transports/udp.c:593
 msgid "# bytes received via UDP"
 msgstr ""
 
-#: src/transports/udp.c:555
+#: src/transports/udp.c:595
 msgid "# bytes sent via UDP"
 msgstr ""
 
-#: src/transports/udp.c:557
+#: src/transports/udp.c:597
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
-#: src/transports/tcp6.c:223
+#: src/transports/tcp6.c:226
 msgid "Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/tcp6.c:265
+#: src/transports/tcp6.c:268
 #, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr ""
 
-#: src/transports/tcp6.c:519
+#: src/transports/tcp6.c:547
 msgid "# bytes received via TCP6"
 msgstr ""
 
-#: src/transports/tcp6.c:521
+#: src/transports/tcp6.c:549
 msgid "# bytes sent via TCP6"
 msgstr ""
 
-#: src/transports/tcp6.c:523
+#: src/transports/tcp6.c:551
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr ""
 
@@ -1701,23 +1737,11 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/tcp_old.c:1299
-msgid "# bytes received via TCP-OLD"
-msgstr ""
-
-#: src/transports/tcp_old.c:1301
-msgid "# bytes sent via TCP-OLD"
-msgstr ""
-
-#: src/transports/tcp_old.c:1303
-msgid "# bytes dropped by TCP-OLD (outgoing)"
-msgstr ""
-
 #: src/transports/tcp_helper.c:193
 msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr ""
 
-#: src/transports/tcp_helper.c:204
+#: src/transports/tcp_helper.c:205
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr ""
 
@@ -1784,12 +1808,12 @@
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:230
+#: src/applications/dht/module/cs.c:240
 #, c-format
 msgid "`%s' registering client handlers: %d %d\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:249
+#: src/applications/dht/module/cs.c:259
 msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
@@ -1867,7 +1891,7 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:126
 #: src/applications/testbed/gnunet-testbed.c:547 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:286
+#: src/setup/gnunet-setup.c:287
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr ""
@@ -1889,134 +1913,159 @@
 msgid "Could not send message to gnunetd\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:168
+#: src/applications/advertising/advertising.c:188
 #, c-format
-msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:175
-msgid ""
-"hello message received invalid (expiration time over limit). Dropping.\n"
+#: src/applications/advertising/advertising.c:196
+msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:182
-#, c-format
-msgid "hello transport verification failed (%u).\n"
+#: src/applications/advertising/advertising.c:367
+msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:192
+#: src/applications/advertising/advertising.c:385
+msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:549
 #, c-format
-msgid "hello advertisement for protocol %d received.\n"
+msgid "Advertising my transport %d to selected peers.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:327
-msgid "Could not send hellos+PING, ping buffer full.\n"
+#: src/applications/advertising/advertising.c:557
+msgid ""
+"Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:341
-#, c-format
-msgid "`%s' failed (%d, %u). Will not send PING.\n"
+#: src/applications/advertising/advertising.c:832
+msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:504
-#, c-format
-msgid "Advertising my transport %d to selected peers.\n"
+#: src/applications/advertising/advertising.c:833
+msgid "# Peer advertisements of type NAT received"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:511
-msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
+#: src/applications/advertising/advertising.c:834
+msgid "# Peer advertisements confirmed via PONG"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:613
-#, c-format
-msgid "Removing hello from peer `%s' (expired %ds ago).\n"
+#: src/applications/advertising/advertising.c:835
+msgid "# Peer advertisements updating earlier HELLOs"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:794
-msgid "# Peer advertisements received"
+#: src/applications/advertising/advertising.c:836
+msgid "# Peer advertisements discarded due to load"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:795
+#: src/applications/advertising/advertising.c:837
+msgid "# Peer advertisements for unsupported transport"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:838
+msgid "# Peer advertisements not confirmed due to ping busy"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:839
+msgid "# Peer advertisements not confirmed due to lack of self ad"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:840
+msgid "# Peer advertisements not confirmed due to send error"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:841
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:796
+#: src/applications/advertising/advertising.c:842
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:798
-#: src/applications/pingpong/pingpong.c:493
+#: src/applications/advertising/advertising.c:844
+#: src/applications/pingpong/pingpong.c:516
 msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:802
-#: src/applications/session/connect.c:877
+#: src/applications/advertising/advertising.c:849
+#: src/applications/session/connect.c:936
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:820
+#: src/applications/advertising/advertising.c:867
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:447
+#: src/applications/topology_default/topology.c:448
 msgid "maintains GNUnet default mesh topology"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:123
-#: src/applications/pingpong/pingpong.c:191
-#: src/applications/pingpong/pingpong.c:244
-#: src/applications/pingpong/pingpong.c:314
+#: src/applications/pingpong/pingpong.c:128
+#: src/applications/pingpong/pingpong.c:199
+#: src/applications/pingpong/pingpong.c:264
+#: src/applications/pingpong/pingpong.c:335
 #, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:135
+#: src/applications/pingpong/pingpong.c:140
 msgid "Received ping for another peer. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:201
+#: src/applications/pingpong/pingpong.c:210
 msgid "Received PING not destined for us!\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:287
-#: src/applications/pingpong/pingpong.c:350
+#: src/applications/pingpong/pingpong.c:308
+#: src/applications/pingpong/pingpong.c:371
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:393
+#: src/applications/pingpong/pingpong.c:414
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:483
+#: src/applications/pingpong/pingpong.c:506
 msgid "# encrypted PONG messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:485
+#: src/applications/pingpong/pingpong.c:508
 msgid "# plaintext PONG messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:487
+#: src/applications/pingpong/pingpong.c:510
 msgid "# encrypted PING messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:489
+#: src/applications/pingpong/pingpong.c:512
 msgid "# PING messages created"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:491
+#: src/applications/pingpong/pingpong.c:514
+#: src/applications/session/connect.c:931
 msgid "# encrypted PONG messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:495
+#: src/applications/pingpong/pingpong.c:518
+#: src/applications/session/connect.c:929
 msgid "# encrypted PING messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:505
+#: src/applications/pingpong/pingpong.c:520
+msgid "# plaintext PONG messages sent"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:522
+msgid "# plaintext PONG transmissions failed"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:532
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
@@ -2074,7 +2123,7 @@
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1369
+#: src/applications/sqstore_sqlite/sqlite.c:1370
 #: src/applications/sqstore_mysql/mysql.c:1352
 msgid "# bytes in datastore"
 msgstr ""
@@ -2084,62 +2133,66 @@
 msgid "# of connected peers"
 msgstr ""
 
-#: src/applications/session/connect.c:257
-#: src/applications/session/connect.c:274
+#: src/applications/session/connect.c:261
+#: src/applications/session/connect.c:278
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:315
+#: src/applications/session/connect.c:321
 #, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:572
+#: src/applications/session/connect.c:520
+msgid "Could not create any HELLO for myself!\n"
+msgstr ""
+
+#: src/applications/session/connect.c:621
 #, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:590
+#: src/applications/session/connect.c:639
 #, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:622
+#: src/applications/session/connect.c:673
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:632
+#: src/applications/session/connect.c:683
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:701
+#: src/applications/session/connect.c:752
 #, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
 "invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:713
+#: src/applications/session/connect.c:764
 #, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:866
+#: src/applications/session/connect.c:921
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:868
+#: src/applications/session/connect.c:923
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:870
+#: src/applications/session/connect.c:925
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:872
+#: src/applications/session/connect.c:927
 msgid "# sessions established"
 msgstr ""
 
@@ -2285,21 +2338,25 @@
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:687
-#: src/applications/identity/identity.c:707
+#: src/applications/identity/identity.c:730
+#: src/applications/identity/identity.c:758
 #, c-format
-msgid "Removed file `%s' containing invalid hello data.\n"
+msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:760
+#: src/applications/identity/identity.c:812
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:769
+#: src/applications/identity/identity.c:822
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
+#: src/applications/identity/identity.c:1278
+msgid "invalid"
+msgstr ""
+
 #: src/applications/testbed/commands.c:1130
 #: src/applications/stats/gnunet-stats.c:65
 #, c-format
@@ -2502,46 +2559,52 @@
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:190
+#: src/applications/transport/transport.c:188
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:283
+#: src/applications/transport/transport.c:240
 #, c-format
+msgid ""
+"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:301
+#, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:372
+#: src/applications/transport/transport.c:389
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:429
+#: src/applications/transport/transport.c:446
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:630
+#: src/applications/transport/transport.c:647
 #, c-format
 msgid "Loading transports `%s'\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:650
+#: src/applications/transport/transport.c:667
 #, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:660
+#: src/applications/transport/transport.c:677
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:687
+#: src/applications/transport/transport.c:704
 #, c-format
 msgid "Loaded transport `%s'\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:700
+#: src/applications/transport/transport.c:717
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
@@ -2614,12 +2677,12 @@
 msgid "# bytes of noise received"
 msgstr ""
 
-#: src/applications/stats/statistics.c:384
+#: src/applications/stats/statistics.c:398
 #, c-format
 msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:405
+#: src/applications/stats/statistics.c:419
 msgid "keeps statistics about gnunetd's operation"
 msgstr ""
 
@@ -2809,25 +2872,21 @@
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:53
-#: src/applications/tbench/tbenchtest_udp.c:55
 #, c-format
 msgid "Using %u messages of size %u for %u times.\n"
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:80
-#: src/applications/tbench/tbenchtest_udp.c:82
 #, c-format
 msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:85
-#: src/applications/tbench/tbenchtest_udp.c:87
 #, c-format
 msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:91
-#: src/applications/tbench/tbenchtest_udp.c:93
 #, c-format
 msgid ""
 "\n"
@@ -2835,7 +2894,6 @@
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:148
-#: src/applications/tbench/tbenchtest_udp.c:152
 #, c-format
 msgid "Running benchmark...\n"
 msgstr ""
@@ -2911,26 +2969,26 @@
 msgid "allows mapping of the network topology"
 msgstr ""
 
-#: src/applications/gap/gap.c:1707
+#: src/applications/gap/gap.c:1705
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1708
+#: src/applications/gap/gap.c:1706
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1884
+#: src/applications/gap/gap.c:1882
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1896 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1894 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1903 src/applications/gap/gap.c:1909
-#: src/applications/gap/gap.c:1916
+#: src/applications/gap/gap.c:1901 src/applications/gap/gap.c:1907
+#: src/applications/gap/gap.c:1914
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
@@ -2987,7 +3045,7 @@
 msgstr ""
 
 #: src/applications/gap/gap.c:2215
-msgid "# gap spurious replies"
+msgid "# gap spurious replies (dropped)"
 msgstr ""
 
 #: src/applications/gap/gap.c:2216
@@ -3509,6 +3567,14 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr ""
 
+#: src/applications/fs/module/querymanager.c:227
+msgid "# FS currently tracked queries from clients"
+msgstr ""
+
+#: src/applications/fs/module/querymanager.c:229
+msgid "# FS replies passed to clients"
+msgstr ""
+
 #: src/applications/fs/module/ondemand.c:336
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
@@ -3539,19 +3605,27 @@
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1146
+#: src/applications/fs/module/fs.c:1167
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
 "s'.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1188
+#: src/applications/fs/module/fs.c:1180
+msgid "# FS expired replies dropped"
+msgstr ""
+
+#: src/applications/fs/module/fs.c:1182
+msgid "# FS valid replies received"
+msgstr ""
+
+#: src/applications/fs/module/fs.c:1219
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1228
+#: src/applications/fs/module/fs.c:1259
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -3608,18 +3682,18 @@
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:269
+#: src/applications/fs/ecrs/download.c:270
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:1042
+#: src/applications/fs/ecrs/download.c:1043
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:1228
+#: src/applications/fs/ecrs/download.c:1229
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -3679,21 +3753,21 @@
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:339
-#: src/applications/fs/ecrs/namespace.c:421
-#: src/applications/fs/ecrs/namespace.c:578
+#: src/applications/fs/ecrs/namespace.c:342
+#: src/applications/fs/ecrs/namespace.c:425
+#: src/applications/fs/ecrs/namespace.c:584
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:351
-#: src/applications/fs/ecrs/namespace.c:432
+#: src/applications/fs/ecrs/namespace.c:354
+#: src/applications/fs/ecrs/namespace.c:436
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:592
-#: src/applications/fs/ecrs/namespace.c:603
+#: src/applications/fs/ecrs/namespace.c:598
+#: src/applications/fs/ecrs/namespace.c:609
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr ""
@@ -3713,16 +3787,16 @@
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:373
+#: src/applications/fs/uritrack/file_info.c:374
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:656
+#: src/applications/fs/namespace/namespace_info.c:730
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:677
+#: src/applications/fs/namespace/namespace_info.c:751
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -3755,35 +3829,45 @@
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:100
+#: src/applications/bootstrap_http/http.c:105
 #, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:173
+#: src/applications/bootstrap_http/http.c:176
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:229
+#: src/applications/bootstrap_http/http.c:211
 #, c-format
+msgid "Bootstrapping using `%s'.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:237
+#, c-format
 msgid "Trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:408
-msgid "# hellos downloaded via http"
+#: src/applications/bootstrap_http/http.c:388
+#, c-format
+msgid "Downloaded %llu bytes from `%s'.\n"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:445
+#: src/applications/bootstrap_http/http.c:421
+msgid "# HELLOs downloaded via http"
+msgstr ""
+
+#: src/applications/traffic/traffic.c:450
 #, c-format
 msgid "# bytes transmitted of type %d"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:465
+#: src/applications/traffic/traffic.c:470
 #, c-format
 msgid "# bytes received of type %d"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:610
+#: src/applications/traffic/traffic.c:624
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -4060,7 +4144,7 @@
 msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:382
+#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:389
 msgid "run as user LOGIN"
 msgstr ""
 
@@ -4068,83 +4152,83 @@
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
-#: src/server/connection.c:1142
+#: src/server/connection.c:1133
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/server/connection.c:1151
+#: src/server/connection.c:1142
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr ""
 
-#: src/server/connection.c:2631
+#: src/server/connection.c:2675
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr ""
 
-#: src/server/connection.c:2709
+#: src/server/connection.c:2755
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2726
+#: src/server/connection.c:2772
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:3167
+#: src/server/connection.c:3219
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3171
+#: src/server/connection.c:3223
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3173
+#: src/server/connection.c:3225
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3176
+#: src/server/connection.c:3228
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/server/connection.c:3180
+#: src/server/connection.c:3232
 msgid "# bytes transmitted"
 msgstr ""
 
-#: src/server/connection.c:3184
+#: src/server/connection.c:3236
 msgid "# bytes received"
 msgstr ""
 
-#: src/server/connection.c:3187
+#: src/server/connection.c:3239
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/server/connection.c:3189
+#: src/server/connection.c:3241
 msgid "# bytes noise sent"
 msgstr ""
 
-#: src/server/connection.c:3191
+#: src/server/connection.c:3243
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3193
+#: src/server/connection.c:3245
 msgid "# total bytes per second receive limit"
 msgstr ""
 
-#: src/server/connection.c:3195
+#: src/server/connection.c:3247
 msgid "# total number of messages in send buffers"
 msgstr ""
 
-#: src/server/connection.c:3197
+#: src/server/connection.c:3249
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3199
+#: src/server/connection.c:3251
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3201
+#: src/server/connection.c:3253
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
@@ -4205,7 +4289,7 @@
 msgid "specify username as which gnunetd should run"
 msgstr ""
 
-#: src/server/gnunetd.c:270
+#: src/server/gnunetd.c:288
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -4287,69 +4371,75 @@
 msgid " Transport %d is not being tested\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:250
+#: src/server/gnunet-transport-check.c:253
 #, c-format
 msgid ""
 "\n"
 "Contacting `%s'."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:276
+#: src/server/gnunet-transport-check.c:279
 #, c-format
 msgid " Connection failed\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:282
+#: src/server/gnunet-transport-check.c:285
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:335
+#: src/server/gnunet-transport-check.c:338
 #, c-format
-msgid "No reply received within %llums.\n"
+msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:342
+#, c-format
+msgid "OK!\n"
+msgstr ""
+
+#: src/server/gnunet-transport-check.c:370
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:367
+#: src/server/gnunet-transport-check.c:374
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:370
+#: src/server/gnunet-transport-check.c:377
 msgid "send COUNT messages"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:373
+#: src/server/gnunet-transport-check.c:380
 msgid "send messages with SIZE bytes payload"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:376
+#: src/server/gnunet-transport-check.c:383
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:379
+#: src/server/gnunet-transport-check.c:386
 msgid "specifies after how many MS to time-out"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:387
+#: src/server/gnunet-transport-check.c:394
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:451
+#: src/server/gnunet-transport-check.c:459
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:454
+#: src/server/gnunet-transport-check.c:462
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:514
+#: src/server/gnunet-transport-check.c:527
 #, c-format
 msgid ""
+"\n"
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
@@ -4363,19 +4453,19 @@
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr ""
 
-#: src/server/tcpserver.c:396
+#: src/server/tcpserver.c:397
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:448
+#: src/server/tcpserver.c:449
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr ""
 
-#: src/server/handler.c:379
+#: src/server/handler.c:380
 #, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr ""
@@ -4407,6 +4497,11 @@
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr ""
 
+#: src/util/boot/startup.c:212
+#, c-format
+msgid "Failed to run %s: %s %d\n"
+msgstr ""
+
 #: src/util/network_client/tcpio.c:94 src/util/network_client/tcpio.c:135
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
@@ -4436,12 +4531,12 @@
 msgid "`%s' failed, reply invalid!\n"
 msgstr ""
 
-#: src/util/crypto/hostkey_gcrypt.c:1031
+#: src/util/crypto/hostkey_gcrypt.c:1036
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto/locking_gcrypt.c:67
+#: src/util/crypto/locking_gcrypt.c:74
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
@@ -4509,11 +4604,11 @@
 msgid "Invalid process priority `%s'\n"
 msgstr ""
 
-#: src/util/network/select.c:296
+#: src/util/network/select.c:306
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 
-#: src/util/network/select.c:454
+#: src/util/network/select.c:472
 msgid "select listen socket not valid!\n"
 msgstr ""
 
@@ -4832,21 +4927,21 @@
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:187
+#: src/setup/gnunet-setup.c:188
 #, c-format
 msgid "Too many arguments.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:192
+#: src/setup/gnunet-setup.c:193
 msgid "No interface specified, using default\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:267
+#: src/setup/gnunet-setup.c:268
 #, c-format
 msgid "`%s' is not available."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:283
+#: src/setup/gnunet-setup.c:284
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr ""

Modified: GNUnet/po/POTFILES.in
===================================================================
--- GNUnet/po/POTFILES.in       2007-06-09 08:10:48 UTC (rev 4986)
+++ GNUnet/po/POTFILES.in       2007-06-09 08:20:05 UTC (rev 4987)
@@ -1,114 +1,4 @@
-contrib/config-daemon.scm
-contrib/config-client.scm
-src/setup/gtk/gnunet-setup.glade
-src/transports/ip6.h
-src/transports/ip.h
-src/transports/upnp/upnp.h
-src/transports/upnp/xmlnode.h
-src/transports/upnp/error.h
-src/transports/upnp/util.h
-src/transports/upnp/ip.h
-src/include/gnunet_core.h
-src/include/gnunet_util.h
-src/include/gnunet_fragmentation_service.h
-src/include/gnunet_getoption_lib.h
-src/include/gnunet_stats_lib.h
-src/include/gnunet_protocols.h
-src/include/gnunet_gap_service.h
-src/include/ecrs_core.h
-src/include/core.h
-src/include/gnunet_topology_service.h
-src/include/gnunet_bootstrap_service.h
-src/include/gnunet_pingpong_service.h
-src/include/winproc.h
-src/include/gnunet_session_service.h
-src/include/gnunet_traffic_lib.h
-src/include/platform.h
-src/include/gnunet_dht_lib.h
-src/include/plibc.h
-src/include/gnunet_fs_lib.h
-src/include/gnunet_identity_service.h
-src/include/fs.h
-src/include/gnunet_transport.h
-src/include/gnunet_transport_service.h
-src/include/gnunet_stats_service.h
-src/include/gnunet_sqstore_service.h
-src/include/gnunet_ecrs_lib.h
-src/include/gnunet_traffic_service.h
-src/include/gnunet_fsui_lib.h
-src/include/gnunet_dht_service.h
-src/include/gnunet_rpc_service.h
-src/include/gnunet_blockstore.h
-src/include/gnunet_datastore_service.h
-src/include/dht.h
-src/include/gnunet_util_config_impl.h
-src/include/gnunet_util_config.h
-src/include/gnunet_util_getopt.h
-src/include/gnunet_kvstore_service.h
-src/include/gnunet_util_network_client.h
-src/include/gnunet_setup_lib.h
-src/include/gnunet_util_os.h
-src/include/gnunet_util_crypto.h
-src/include/gnunet_util_error.h
-src/include/gnunet_util_boot.h
-src/include/gnunet_util_network.h
-src/include/gnunet_util_cron.h
-src/include/gnunet_util_threads.h
-src/include/gnunet_util_string.h
-src/include/gnunet_dstore_service.h
-src/include/gnunet_state_service.h
-src/include/gnunet_util_containers.h
-src/include/gnunet_util_disk.h
-src/include/gnunet_directories.h
-src/include/gnunet_util_error_loggers.h
-src/include/gnunet_util_common.h
-src/include/gnunet_collection_lib.h
-src/include/gnunet_uritrack_lib.h
-src/include/gnunet_namespace_lib.h
-src/include/gnunet_peerinfo_lib.h
-src/include/gnunet_upnp_service.h
-src/applications/dht/module/routing.h
-src/applications/dht/module/dstore.h
-src/applications/dht/module/table.h
-src/applications/chat/chat.h
-src/applications/advertising/bootstrap.h
-src/applications/datastore/prefetch.h
-src/applications/datastore/filter.h
-src/applications/identity/hostkey.h
-src/applications/testbed/testbed.h
-src/applications/testbed/commands.h
-src/applications/testbed/socket.h
-src/applications/stats/statistics.h
-src/applications/tbench/tbench.h
-src/applications/tracekit/tracekit.h
-src/applications/gap/gap.h
-src/applications/gap/pid_table.h
-src/applications/getoption/getoption.h
-src/applications/fs/module/migration.h
-src/applications/fs/module/querymanager.h
-src/applications/fs/module/ondemand.h
-src/applications/fs/module/anonymity.h
-src/applications/fs/fsui/fsui.h
-src/applications/fs/ecrs/ecrs.h
-src/applications/fs/ecrs/tree.h
-src/applications/fs/ecrs/uri.h
-src/applications/fs/uritrack/callbacks.h
-src/applications/traffic/traffic.h
-src/server/connection.h
-src/server/startup.h
-src/server/tcpserver.h
-src/server/handler.h
-src/server/version.h
-src/util/crypto/locking_gcrypt.h
-src/util/network/network.h
-src/setup/gtk/glade_support.h
-src/setup/gtk/gconf.h
-src/setup/gtk/wizard_gtk.h
-src/setup/text/conf.h
-src/setup/ncurses/mconf.h
-src/setup/ncurses/wizard_curs.h
-src/setup/lib/tree.h
-src/setup/lib/wizard_util.h
+libltdl/ltdl.c
 src/transports/ip6.c
 src/transports/udp6.c
 src/transports/http.c
@@ -118,24 +8,21 @@
 src/transports/udp.c
 src/transports/ip.c
 src/transports/tcp6.c
+src/transports/tcp_helper.c
 src/transports/upnp/xmlnode.c
 src/transports/upnp/upnp.c
 src/transports/upnp/ip.c
 src/transports/upnp/error.c
 src/transports/upnp/util.c
 src/transports/upnp/init.c
-src/transports/upnp/upnptest.c
-src/transports/tcp_old.c
-src/transports/tcp_helper.c
 src/transports/udp_helper.c
-src/applications/dht/tools/dhttest2.c
 src/applications/dht/tools/dht-query.c
 src/applications/dht/tools/dht_api.c
-src/applications/dht/module/cs.c
 src/applications/dht/module/table.c
+src/applications/dht/module/cs.c
 src/applications/dht/module/dstore.c
-src/applications/dht/module/routing.c
 src/applications/dht/module/service.c
+src/applications/dht/module/routing.c
 src/applications/chat/chat.c
 src/applications/chat/gnunet-chat.c
 src/applications/advertising/advertising.c
@@ -143,41 +30,27 @@
 src/applications/topology_default/topology.c
 src/applications/pingpong/pingpong.c
 src/applications/sqstore_sqlite/sqlite.c
-src/applications/sqstore_sqlite/sqlitetest.c
-src/applications/sqstore_sqlite/sqlitetest2.c
-src/applications/session/sessiontest.c
 src/applications/session/connect.c
-src/applications/rpc/parameterstest.c
 src/applications/rpc/parameters.c
 src/applications/rpc/rpc.c
 src/applications/sqstore_mysql/mysql.c
-src/applications/sqstore_mysql/mysqltest.c
-src/applications/sqstore_mysql/mysqltest2.c
 src/applications/datastore/prefetch.c
 src/applications/datastore/filter.c
 src/applications/datastore/datastore.c
-src/applications/identity/identitytest.c
 src/applications/identity/hostkey.c
 src/applications/identity/identity.c
-src/applications/testbed/commands.c
-src/applications/testbed/gnunet-testbed.c
-src/applications/testbed/socket.c
-src/applications/testbed/testbed.c
+src/applications/identity/clientapi.c
 src/applications/transport/transport.c
-src/applications/fragmentation/fragmentationtest.c
 src/applications/fragmentation/fragmentation.c
 src/applications/stats/gnunet-stats.c
 src/applications/stats/clientapi.c
 src/applications/stats/statistics.c
 src/applications/stats/sqstats.c
 src/applications/tbench/gnunet-tbench.c
-src/applications/tbench/tbenchtest.c
 src/applications/tbench/tbench.c
-src/applications/tbench/tbenchtest_udp.c
 src/applications/tracekit/gnunet-tracekit.c
 src/applications/tracekit/tracekit.c
 src/applications/gap/gap.c
-src/applications/gap/gaptest.c
 src/applications/gap/pid_table.c
 src/applications/getoption/clientapi.c
 src/applications/getoption/getoption.c
@@ -192,71 +65,47 @@
 src/applications/fs/module/anonymity.c
 src/applications/fs/module/fs.c
 src/applications/fs/module/migration.c
-src/applications/fs/fsui/searchtest.c
+src/applications/fs/module/dht_push.c
 src/applications/fs/fsui/search.c
-src/applications/fs/fsui/fsuitest.c
 src/applications/fs/fsui/fsui.c
-src/applications/fs/fsui/downloadtest.c
 src/applications/fs/fsui/download.c
 src/applications/fs/fsui/unindex.c
 src/applications/fs/fsui/upload.c
-src/applications/fs/fsui/fsuitest2.c
 src/applications/fs/fsui/serialize.c
-src/applications/fs/fsui/serializetest3.c
 src/applications/fs/fsui/fsui-loader.c
 src/applications/fs/fsui/deserialize.c
-src/applications/fs/fsui/serializetest.c
-src/applications/fs/fsui/serializetest2.c
-src/applications/fs/fsui/serializetest4.c
-src/applications/fs/lib/fslibtest.c
 src/applications/fs/lib/fslib.c
-src/applications/fs/ecrs/uritest.c
 src/applications/fs/ecrs/tree.c
 src/applications/fs/ecrs/uri.c
 src/applications/fs/ecrs/keyspace.c
-src/applications/fs/ecrs/directorytest.c
 src/applications/fs/ecrs/directory.c
 src/applications/fs/ecrs/search.c
-src/applications/fs/ecrs/searchtest.c
 src/applications/fs/ecrs/download.c
-src/applications/fs/ecrs/metatest2.c
 src/applications/fs/ecrs/unindex.c
 src/applications/fs/ecrs/indexinfo.c
 src/applications/fs/ecrs/upload.c
-src/applications/fs/ecrs/metatest.c
 src/applications/fs/ecrs/meta.c
-src/applications/fs/ecrs/namespacetest.c
 src/applications/fs/ecrs/namespace.c
-src/applications/fs/ecrs/ecrstest.c
 src/applications/fs/ecrs/ecrs.c
 src/applications/fs/ecrs/helper.c
 src/applications/fs/ecrs/parser.c
 src/applications/fs/ecrs/bincoder.c
-src/applications/fs/ecrs/bincodertest.c
 src/applications/fs/ecrs_core.c
 src/applications/fs/uritrack/file_info.c
 src/applications/fs/uritrack/uri_info.c
 src/applications/fs/uritrack/callbacks.c
-src/applications/fs/uritrack/tracktest.c
-src/applications/fs/ecrs_core_test.c
-src/applications/fs/namespace/namespace_infotest.c
 src/applications/fs/namespace/namespace_info.c
 src/applications/fs/collection/collection.c
-src/applications/fs/collection/collectiontest.c
 src/applications/topology_f2f/topology.c
 src/applications/template/template.c
 src/applications/template/gnunet-template.c
 src/applications/bootstrap_http/http.c
-src/applications/bootstrap_http/httptest.c
 src/applications/traffic/traffic.c
 src/applications/traffic/clientapi.c
-src/applications/kvstore_sqlite/kv_sqlitetest.c
 src/applications/kvstore_sqlite/kv_sqlite.c
 src/applications/vpn/gnunet-vpn.c
 src/applications/vpn/vpn.c
-src/applications/state/statetest.c
 src/applications/state/state.c
-src/applications/dstore/dstore_test.c
 src/applications/dstore/dstore.c
 src/server/gnunet-update.c
 src/server/connection.c
@@ -269,11 +118,8 @@
 src/server/version.c
 src/server/gnunet-peer-info.c
 src/util/win/winproc.c
-src/util/cron/crontest.c
 src/util/cron/cron.c
-src/util/cron/timertest.c
 src/util/boot/startup.c
-src/util/network_client/tcpiotest.c
 src/util/network_client/tcpio.c
 src/util/network_client/daemon.c
 src/util/libgnunetutil.c
@@ -282,20 +128,11 @@
 src/util/crypto/kblockkey.c
 src/util/crypto/locking_gcrypt.c
 src/util/crypto/random.c
-src/util/crypto/weakkeytest.c
 src/util/crypto/hashing.c
-src/util/crypto/hashingtest.c
-src/util/crypto/symciphertest.c
-src/util/crypto/hostkeytest.c
-src/util/crypto/crctest.c
 src/util/crypto/crc32.c
-src/util/crypto/kblockkey_test.c
 src/util/crypto/hashperf.c
-src/util/os/statuscallstest.c
 src/util/os/statuscalls.c
-src/util/os/daemontest.c
 src/util/os/daemon.c
-src/util/os/semaphoretest.c
 src/util/os/semaphore.c
 src/util/os/osconfig.c
 src/util/os/dso.c
@@ -311,21 +148,15 @@
 src/util/network/io.c
 src/util/network/ipcheck.c
 src/util/network/ip.c
-src/util/disk/storagetest.c
 src/util/disk/storage.c
-src/util/config_impl/configtest.c
 src/util/config_impl/impl.c
 src/util/error/error.c
-src/util/threads/semaphoretest.c
-src/util/threads/timertest.c
 src/util/threads/mutex.c
 src/util/threads/semaphore.c
-src/util/threads/shutdowntest.c
 src/util/threads/pthread.c
 src/util/threads/shutdown.c
 src/util/threads/time.c
 src/util/threads/signal.c
-src/util/threads/shutdowntest2.c
 src/util/loggers/file.c
 src/util/loggers/smtp.c
 src/util/loggers/memory.c
@@ -335,13 +166,8 @@
 src/util/getopt/printhelp.c
 src/util/containers/bloomfilter.c
 src/util/containers/vector.c
-src/util/containers/vectortest.c
-src/util/containers/hashtest.c
-src/util/containers/bloomtest.c
 src/util/containers/hashtable.c
-src/util/containers/hashtabletest.c
 src/util/config/config.c
-src/util/string/xmalloctest.c
 src/util/string/xmalloc.c
 src/util/string/string.c
 src/setup/gnunet-setup.c
@@ -356,3 +182,123 @@
 src/setup/lib/gns.c
 src/setup/lib/tree.c
 src/setup/lib/wizard_util.c
+config.h
+libltdl/ltdl.h
+libltdl/config.h
+src/transports/ip6.h
+src/transports/ip.h
+src/transports/upnp/upnp.h
+src/transports/upnp/xmlnode.h
+src/transports/upnp/error.h
+src/transports/upnp/util.h
+src/transports/upnp/ip.h
+src/include/gnunet_core.h
+src/include/gnunet_util.h
+src/include/gnunet_fragmentation_service.h
+src/include/gnunet_getoption_lib.h
+src/include/gnunet_stats_lib.h
+src/include/gnunet_protocols.h
+src/include/gnunet_gap_service.h
+src/include/ecrs_core.h
+src/include/core.h
+src/include/gnunet_topology_service.h
+src/include/gnunet_bootstrap_service.h
+src/include/gnunet_pingpong_service.h
+src/include/winproc.h
+src/include/gnunet_session_service.h
+src/include/gnunet_traffic_lib.h
+src/include/platform.h
+src/include/gnunet_dht_lib.h
+src/include/plibc.h
+src/include/gnunet_fs_lib.h
+src/include/gnunet_identity_service.h
+src/include/fs.h
+src/include/gnunet_transport.h
+src/include/gnunet_transport_service.h
+src/include/gnunet_stats_service.h
+src/include/gnunet_sqstore_service.h
+src/include/gnunet_ecrs_lib.h
+src/include/gnunet_traffic_service.h
+src/include/gnunet_fsui_lib.h
+src/include/gnunet_util_boot.h
+src/include/gnunet_dht_service.h
+src/include/gnunet_rpc_service.h
+src/include/gettext.h
+src/include/gnunet_blockstore.h
+src/include/gnunet_datastore_service.h
+src/include/dht.h
+src/include/gnunet_util_config_impl.h
+src/include/gnunet_util_config.h
+src/include/gnunet_util_getopt.h
+src/include/gnunet_kvstore_service.h
+src/include/gnunet_testing_lib.h
+src/include/gnunet_util_network_client.h
+src/include/gnunet_setup_lib.h
+src/include/gnunet_util_os.h
+src/include/gnunet_util_crypto.h
+src/include/gnunet_util_error.h
+src/include/gnunet_util_network.h
+src/include/gnunet_util_cron.h
+src/include/gnunet_util_threads.h
+src/include/gnunet_util_string.h
+src/include/gnunet_dstore_service.h
+src/include/gnunet_state_service.h
+src/include/gnunet_util_containers.h
+src/include/gnunet_identity_lib.h
+src/include/gnunet_util_disk.h
+src/include/gnunet_directories.h
+src/include/gnunet_util_error_loggers.h
+src/include/gnunet_util_common.h
+src/include/gnunet_collection_lib.h
+src/include/gnunet_uritrack_lib.h
+src/include/gnunet_namespace_lib.h
+src/include/gnunet_util_core.h
+src/include/gnunet_peerinfo_lib.h
+src/include/gnunet_upnp_service.h
+src/applications/dht/module/routing.h
+src/applications/dht/module/dstore.h
+src/applications/dht/module/table.h
+src/applications/chat/chat.h
+src/applications/advertising/bootstrap.h
+src/applications/datastore/prefetch.h
+src/applications/datastore/filter.h
+src/applications/identity/hostkey.h
+src/applications/identity/identity.h
+src/applications/testbed/testbed.h
+src/applications/testbed/commands.h
+src/applications/testbed/socket.h
+src/applications/stats/statistics.h
+src/applications/tbench/tbench.h
+src/applications/tracekit/tracekit.h
+src/applications/gap/gap.h
+src/applications/gap/pid_table.h
+src/applications/getoption/getoption.h
+src/applications/fs/module/migration.h
+src/applications/fs/module/querymanager.h
+src/applications/fs/module/ondemand.h
+src/applications/fs/module/anonymity.h
+src/applications/fs/module/dht_push.h
+src/applications/fs/fsui/fsui.h
+src/applications/fs/ecrs/ecrs.h
+src/applications/fs/ecrs/tree.h
+src/applications/fs/ecrs/uri.h
+src/applications/fs/uritrack/callbacks.h
+src/applications/traffic/traffic.h
+src/server/connection.h
+src/server/startup.h
+src/server/tcpserver.h
+src/server/handler.h
+src/server/version.h
+src/util/crypto/locking_gcrypt.h
+src/util/network/network.h
+src/setup/gtk/glade_support.h
+src/setup/gtk/gconf.h
+src/setup/gtk/wizard_gtk.h
+src/setup/text/conf.h
+src/setup/ncurses/mconf.h
+src/setup/ncurses/wizard_curs.h
+src/setup/lib/tree.h
+src/setup/lib/wizard_util.h
+contrib/config-daemon.scm
+contrib/gnunet-download-manager.scm
+contrib/config-client.scm

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2007-06-09 08:10:48 UTC (rev 4986)
+++ GNUnet/po/de.po     2007-06-09 08:20:05 UTC (rev 4987)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-27 22:50-0600\n"
+"POT-Creation-Date: 2007-06-09 01:06-0600\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -227,12 +227,23 @@
 "Windows, this setting affects the creation of a new system service only."
 msgstr ""
 
-#: contrib/config-daemon.scm:320
-msgid "Which transport mechanisms should GNUnet use?"
+#: contrib/config-daemon.scm:321
+msgid "Should gnunetd be automatically started when the system boots?"
 msgstr ""
 
 #: contrib/config-daemon.scm:322
 msgid ""
+"Set to YES if gnunetd should be automatically started on boot.  If this "
+"option is set, gnunet-setup will install a script to start the daemon upon "
+"completion.  This option may not work on all systems."
+msgstr ""
+
+#: contrib/config-daemon.scm:334
+msgid "Which transport mechanisms should GNUnet use?"
+msgstr ""
+
+#: contrib/config-daemon.scm:336
+msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
 "available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
 "\t\t\n"
@@ -245,11 +256,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:350
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:338
+#: contrib/config-daemon.scm:352
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -286,15 +297,15 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:367
+#: contrib/config-daemon.scm:381
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:379
+#: contrib/config-daemon.scm:393
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:380
+#: contrib/config-daemon.scm:394
 msgid ""
 "The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
 "peer to peers of which the hostkey has been copied by hand to data/hosts;  "
@@ -306,15 +317,15 @@
 "lines above would need some minor editing :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:391
+#: contrib/config-daemon.scm:405
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:403
+#: contrib/config-daemon.scm:417
 msgid "Disable automatic establishment of connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:404
+#: contrib/config-daemon.scm:418
 msgid ""
 "If this option is enabled, GNUnet will not automatically establish "
 "connections to other peers, but instead wait for applications to "
@@ -322,15 +333,21 @@
 "connect to us)."
 msgstr ""
 
-#: contrib/config-daemon.scm:415
+#: contrib/config-daemon.scm:429
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:427
+#: contrib/config-daemon.scm:430
+msgid ""
+"This option maybe useful during testing, but turning it off is dangerous! If "
+"in any doubt, set it to YES (which is the default)."
+msgstr ""
+
+#: contrib/config-daemon.scm:441
 msgid "Client/Server Port"
 msgstr ""
 
-#: contrib/config-daemon.scm:428
+#: contrib/config-daemon.scm:442
 msgid ""
 "Which is the client-server port that is used between gnunetd and the clients "
 "(TCP only).  You may firewall this port for non-local machines (but you do "
@@ -338,11 +355,11 @@
 "connections from machines that are listed under TRUSTED)."
 msgstr ""
 
-#: contrib/config-daemon.scm:439
+#: contrib/config-daemon.scm:453
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:440
+#: contrib/config-daemon.scm:454
 msgid ""
 "This option specifies which hosts are trusted enough to connect as clients "
 "(to the TCP port).  This is useful if you run gnunetd on one host of your "
@@ -353,76 +370,76 @@
 "separated by a semicolon, spaces are not allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:452
+#: contrib/config-daemon.scm:466
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:453
+#: contrib/config-daemon.scm:467
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If it is set, "
 "only the specified peers are allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:464
+#: contrib/config-daemon.scm:478
 #, fuzzy
 msgid "Run gnunetd as this user."
 msgstr "gnunet-update ausführen"
 
-#: contrib/config-daemon.scm:465
+#: contrib/config-daemon.scm:479
 msgid ""
 "When started as root, gnunetd will change permissions to the given user."
 msgstr ""
 
-#: contrib/config-daemon.scm:476
+#: contrib/config-daemon.scm:490
 #, fuzzy
 msgid "Run gnunetd as this group."
 msgstr "gnunet-update ausführen"
 
-#: contrib/config-daemon.scm:477
+#: contrib/config-daemon.scm:491
 msgid ""
 "When started as root, gnunetd will change permissions to the given group."
 msgstr ""
 
-#: contrib/config-daemon.scm:488
+#: contrib/config-daemon.scm:502
 #, fuzzy
 msgid "Run gnunetd during system startup?"
 msgstr "gnunet-update ausführen"
 
-#: contrib/config-daemon.scm:501
+#: contrib/config-daemon.scm:515
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:502
+#: contrib/config-daemon.scm:516
 msgid "If this option is not set, any peer is allowed to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:513
+#: contrib/config-daemon.scm:527
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:533
+#: contrib/config-daemon.scm:547
 #, fuzzy
 msgid "General settings"
 msgstr "Weitere Einstellungen"
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:548
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:561
+#: contrib/config-daemon.scm:576
 #, fuzzy
 msgid "Path settings"
 msgstr "Weitere Einstellungen"
 
-#: contrib/config-daemon.scm:562
+#: contrib/config-daemon.scm:577
 msgid "Prefixes for paths used by GNUnet"
 msgstr ""
 
-#: contrib/config-daemon.scm:578
+#: contrib/config-daemon.scm:593
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:580
+#: contrib/config-daemon.scm:595
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -431,11 +448,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:593
+#: contrib/config-daemon.scm:608
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:595
+#: contrib/config-daemon.scm:610
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -448,49 +465,49 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:610
+#: contrib/config-daemon.scm:625
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:626
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:628
+#: contrib/config-daemon.scm:643
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:629
+#: contrib/config-daemon.scm:644
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:643
+#: contrib/config-daemon.scm:658
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:655
+#: contrib/config-daemon.scm:670
 #, fuzzy
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: contrib/config-daemon.scm:667
+#: contrib/config-daemon.scm:682
 #, fuzzy
 msgid "Configuration of the MySQL database"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: contrib/config-daemon.scm:686
+#: contrib/config-daemon.scm:701
 #, fuzzy
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
-#: contrib/config-daemon.scm:688
+#: contrib/config-daemon.scm:703
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -501,19 +518,19 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:702
+#: contrib/config-daemon.scm:717
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:714
+#: contrib/config-daemon.scm:729
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:727
+#: contrib/config-daemon.scm:742
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:729
+#: contrib/config-daemon.scm:744
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -525,13 +542,13 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:743
+#: contrib/config-daemon.scm:758
 msgid ""
 "MB of diskspace GNUnet can use for caching DHT index data (the data will be "
 "stored in /tmp)"
 msgstr ""
 
-#: contrib/config-daemon.scm:744
+#: contrib/config-daemon.scm:759
 msgid ""
 "DHT index data is inherently small and expires comparatively quickly.  It is "
 "deleted whenever gnunetd is shut down.\n"
@@ -539,21 +556,21 @@
 "The size of the DSTORE QUOTA is specified in MB."
 msgstr ""
 
-#: contrib/config-daemon.scm:758
+#: contrib/config-daemon.scm:773
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
-#: contrib/config-daemon.scm:777
+#: contrib/config-daemon.scm:792
 #, fuzzy
 msgid "Applications"
 msgstr "_Optionen"
 
-#: contrib/config-daemon.scm:793
+#: contrib/config-daemon.scm:808
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:794
+#: contrib/config-daemon.scm:809
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port and that cannot be traversed using UPnP.  Note "
@@ -566,15 +583,15 @@
 "connections.  Use YES only if you get no connections otherwise."
 msgstr ""
 
-#: contrib/config-daemon.scm:805
+#: contrib/config-daemon.scm:820
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:817 contrib/config-daemon.scm:910
+#: contrib/config-daemon.scm:832 contrib/config-daemon.scm:925
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:818
+#: contrib/config-daemon.scm:833
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP.  You should disable this option if you are sure that you are "
@@ -582,34 +599,34 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:829 contrib/config-daemon.scm:934
-#: contrib/config-daemon.scm:989 contrib/config-daemon.scm:1054
+#: contrib/config-daemon.scm:844 contrib/config-daemon.scm:949
+#: contrib/config-daemon.scm:1004 contrib/config-daemon.scm:1069
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:841 contrib/config-daemon.scm:946
+#: contrib/config-daemon.scm:856
 msgid ""
-"Which IPs are allowed to connect? Leave empty to allow connections from any "
-"IP."
+"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
+"network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:853
+#: contrib/config-daemon.scm:868
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:871
+#: contrib/config-daemon.scm:886
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:883
+#: contrib/config-daemon.scm:898
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:898
+#: contrib/config-daemon.scm:913
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:926
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP. You should disable this option if you are sure that you are "
@@ -617,69 +634,75 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:922
+#: contrib/config-daemon.scm:937
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:958
+#: contrib/config-daemon.scm:961
+msgid ""
+"Which IPs are allowed to connect? Leave empty to allow connections from any "
+"IP."
+msgstr ""
+
+#: contrib/config-daemon.scm:973
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:977
+#: contrib/config-daemon.scm:992
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1001 contrib/config-daemon.scm:1066
+#: contrib/config-daemon.scm:1016 contrib/config-daemon.scm:1081
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow any IP to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:1013
+#: contrib/config-daemon.scm:1028
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1030
+#: contrib/config-daemon.scm:1045
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1042
+#: contrib/config-daemon.scm:1057
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1078
+#: contrib/config-daemon.scm:1093
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1096
+#: contrib/config-daemon.scm:1111
 #, fuzzy
 msgid "Network interface"
 msgstr "Netzwerkgerät:"
 
-#: contrib/config-daemon.scm:1108
+#: contrib/config-daemon.scm:1123
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1120
+#: contrib/config-daemon.scm:1135
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1132
+#: contrib/config-daemon.scm:1147
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1155
+#: contrib/config-daemon.scm:1170
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1167
+#: contrib/config-daemon.scm:1182
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1179
+#: contrib/config-daemon.scm:1194
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1181
+#: contrib/config-daemon.scm:1196
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -689,11 +712,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1192
+#: contrib/config-daemon.scm:1207
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1194
+#: contrib/config-daemon.scm:1209
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -703,36 +726,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1205
+#: contrib/config-daemon.scm:1220
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1206
+#: contrib/config-daemon.scm:1221
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1217
+#: contrib/config-daemon.scm:1232
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1218
+#: contrib/config-daemon.scm:1233
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1229
+#: contrib/config-daemon.scm:1244
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1241
+#: contrib/config-daemon.scm:1256
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1243
+#: contrib/config-daemon.scm:1258
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -777,12 +800,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1260
+#: contrib/config-daemon.scm:1275
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Netzwerkgerät:"
 
-#: contrib/config-daemon.scm:1261
+#: contrib/config-daemon.scm:1276
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -793,12 +816,12 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1272
+#: contrib/config-daemon.scm:1287
 #, fuzzy
 msgid "Load management"
 msgstr "Ungültige Kommandozeilen Parameter.\n"
 
-#: contrib/config-daemon.scm:1297 contrib/config-client.scm:365
+#: contrib/config-daemon.scm:1312 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -905,20 +928,33 @@
 msgstr ""
 
 #: contrib/config-client.scm:322
+msgid "Do not show search results for files that were uploaded by us"
+msgstr ""
+
+#: contrib/config-client.scm:323
+msgid ""
+"This option is useful to eliminate files that the user already has from the "
+"search.  Naturally, enabling this option maybe confusing because some "
+"obviously expected search results would no longer show up.  This option only "
+"works if the URI_DB_SIZE option under FS is not zero (since the URI DB is "
+"used to determine which files the user is sharing)"
+msgstr ""
+
+#: contrib/config-client.scm:335
 msgid "To which directory should gnunet-gtk save downloads to?"
 msgstr ""
 
-#: contrib/config-client.scm:334
+#: contrib/config-client.scm:347
 #, fuzzy
 msgid "Options related to gnunet-gtk"
 msgstr "Nicht verbunden zu gnunetd."
 
-#: contrib/config-client.scm:353
+#: contrib/config-client.scm:367
 #, fuzzy
 msgid "Full pathname of GNUnet client HOME directory"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: contrib/config-client.scm:354
+#: contrib/config-client.scm:368
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
@@ -1658,7 +1694,7 @@
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "UDP6: Öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/udp6.c:521 src/transports/udp.c:535
+#: src/transports/udp6.c:544 src/transports/udp.c:575
 #, fuzzy, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
@@ -1669,36 +1705,36 @@
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/http.c:753 src/transports/http.c:826
-#: src/transports/http.c:950 src/transports/http.c:1035
+#: src/transports/http.c:754 src/transports/http.c:827
+#: src/transports/http.c:951 src/transports/http.c:1036
 #: src/transports/upnp/upnp.c:335 src/transports/upnp/upnp.c:560
-#: src/applications/bootstrap_http/http.c:121
-#: src/applications/bootstrap_http/http.c:261
-#: src/applications/bootstrap_http/http.c:282
-#: src/applications/bootstrap_http/http.c:316
-#: src/applications/bootstrap_http/http.c:334
-#: src/applications/bootstrap_http/http.c:348
-#: src/applications/bootstrap_http/http.c:360
-#: src/applications/bootstrap_http/http.c:372
+#: src/applications/bootstrap_http/http.c:124
+#: src/applications/bootstrap_http/http.c:269
+#: src/applications/bootstrap_http/http.c:290
+#: src/applications/bootstrap_http/http.c:324
+#: src/applications/bootstrap_http/http.c:342
+#: src/applications/bootstrap_http/http.c:356
+#: src/applications/bootstrap_http/http.c:368
+#: src/applications/bootstrap_http/http.c:380
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/transports/http.c:1225
+#: src/transports/http.c:1248
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:1233
+#: src/transports/http.c:1256
 msgid "# bytes received via HTTP"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/transports/http.c:1235
+#: src/transports/http.c:1258
 msgid "# bytes sent via HTTP"
 msgstr "# Bytes gesendet über HTTP"
 
-#: src/transports/http.c:1237
+#: src/transports/http.c:1260
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# Bytes verworfen von HTTP"
 
@@ -1727,104 +1763,104 @@
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
 
-#: src/transports/smtp.c:546
+#: src/transports/smtp.c:547
 #, fuzzy, c-format
 msgid "Failed to initialize libesmtp: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/transports/smtp.c:610
+#: src/transports/smtp.c:611
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Das Senden einer E-Mail an `%s' schlug fehl.\n"
 
-#: src/transports/smtp.c:678
+#: src/transports/smtp.c:679
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s filter %s (SMTP)"
 
-#: src/transports/smtp.c:706
+#: src/transports/smtp.c:707
 #, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 "MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
 "implementiert!)\n"
 
-#: src/transports/tcp.c:271
+#: src/transports/tcp.c:274
 #, fuzzy
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/tcp.c:357
+#: src/transports/tcp.c:358
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/transports/tcp.c:424 src/transports/tcp6.c:379
+#: src/transports/tcp.c:425 src/transports/tcp6.c:382
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transports/tcp.c:569
+#: src/transports/tcp.c:592
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:577
+#: src/transports/tcp.c:600
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/tcp.c:579
+#: src/transports/tcp.c:602
 msgid "# bytes sent via TCP"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transports/tcp.c:581
+#: src/transports/tcp.c:604
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transports/udp.c:276
+#: src/transports/udp.c:293
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "UDP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/udp.c:367
+#: src/transports/udp.c:382
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 "Eine Nachricht der Größe %d konnte nicht per UDP an %u.%u.%u.%u:%u versendet "
 "werden: %s\n"
 
-#: src/transports/udp.c:553
+#: src/transports/udp.c:593
 msgid "# bytes received via UDP"
 msgstr "# Bytes empfangen über UDP"
 
-#: src/transports/udp.c:555
+#: src/transports/udp.c:595
 msgid "# bytes sent via UDP"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transports/udp.c:557
+#: src/transports/udp.c:597
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/transports/tcp6.c:223
+#: src/transports/tcp6.c:226
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/tcp6.c:265
+#: src/transports/tcp6.c:268
 #, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/transports/tcp6.c:519
+#: src/transports/tcp6.c:547
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/tcp6.c:521
+#: src/transports/tcp6.c:549
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transports/tcp6.c:523
+#: src/transports/tcp6.c:551
 #, fuzzy
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
@@ -1839,21 +1875,6 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/tcp_old.c:1299
-#, fuzzy
-msgid "# bytes received via TCP-OLD"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/transports/tcp_old.c:1301
-#, fuzzy
-msgid "# bytes sent via TCP-OLD"
-msgstr "# Bytes gesendet über TCP"
-
-#: src/transports/tcp_old.c:1303
-#, fuzzy
-msgid "# bytes dropped by TCP-OLD (outgoing)"
-msgstr "# Bytes verworfen von TCP (ausgehend)"
-
 #: src/transports/tcp_helper.c:193
 #, fuzzy
 msgid "Received malformed message instead of welcome message. Closing.\n"
@@ -1861,7 +1882,7 @@
 "Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
 "u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/transports/tcp_helper.c:204
+#: src/transports/tcp_helper.c:205
 #, fuzzy
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr ""
@@ -1936,12 +1957,12 @@
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "`%s' fehlgeschlagen. Beende Verbindung zu Client.\n"
 
-#: src/applications/dht/module/cs.c:230
+#: src/applications/dht/module/cs.c:240
 #, fuzzy, c-format
 msgid "`%s' registering client handlers: %d %d\n"
 msgstr "`%s' registriert Client-Handler %d\n"
 
-#: src/applications/dht/module/cs.c:249
+#: src/applications/dht/module/cs.c:259
 msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
@@ -2024,7 +2045,7 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:126
 #: src/applications/testbed/gnunet-testbed.c:547 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:286
+#: src/setup/gnunet-setup.c:287
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
@@ -2046,108 +2067,133 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/applications/advertising/advertising.c:168
-#, c-format
-msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+#: src/applications/advertising/advertising.c:188
+#, fuzzy, c-format
+msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 msgstr ""
 "Hello Nachricht von `%s' ist ungültig (Signatur ist ungültig). Nachricht "
 "wurde verworfen.\n"
 
-#: src/applications/advertising/advertising.c:175
-msgid ""
-"hello message received invalid (expiration time over limit). Dropping.\n"
+#: src/applications/advertising/advertising.c:196
+#, fuzzy
+msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr ""
 "Empfangene Hello Nachricht ist ungültig (Ablaufzeit über Limit). Nachricht "
 "wurde verworfen.\n"
 
-#: src/applications/advertising/advertising.c:182
-#, c-format
-msgid "hello transport verification failed (%u).\n"
-msgstr ""
-
-#: src/applications/advertising/advertising.c:192
-#, c-format
-msgid "hello advertisement for protocol %d received.\n"
-msgstr "Hello Ankündigung für Protokoll %d empfangen.\n"
-
-#: src/applications/advertising/advertising.c:327
-msgid "Could not send hellos+PING, ping buffer full.\n"
+#: src/applications/advertising/advertising.c:367
+#, fuzzy
+msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr "Hellos+PING konnten nicht gesendet werden, Ping Puffer ist voll.\n"
 
-#: src/applications/advertising/advertising.c:341
-#, c-format
-msgid "`%s' failed (%d, %u). Will not send PING.\n"
-msgstr "`%s' fehlgeschlagen (%d, %u). PING wird nicht gesendet.\n"
+#: src/applications/advertising/advertising.c:385
+msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:504
+#: src/applications/advertising/advertising.c:549
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Transport %d wird ausgewählten anderen Knoten bekannt gegeben.\n"
 
-#: src/applications/advertising/advertising.c:511
+#: src/applications/advertising/advertising.c:557
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 "Bekanntmachung von uns zwecklos: bis jetzt sind uns keine anderen Knoten "
 "bekannt.\n"
 
-#: src/applications/advertising/advertising.c:613
-#, c-format
-msgid "Removing hello from peer `%s' (expired %ds ago).\n"
-msgstr "Hello von Knoten `%s' wird entfernt (lief vor %ds ab).\n"
-
-#: src/applications/advertising/advertising.c:794
+#: src/applications/advertising/advertising.c:832
 msgid "# Peer advertisements received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/applications/advertising/advertising.c:795
+#: src/applications/advertising/advertising.c:833
+#, fuzzy
+msgid "# Peer advertisements of type NAT received"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:834
+#, fuzzy
+msgid "# Peer advertisements confirmed via PONG"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:835
+#, fuzzy
+msgid "# Peer advertisements updating earlier HELLOs"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:836
+#, fuzzy
+msgid "# Peer advertisements discarded due to load"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:837
+#, fuzzy
+msgid "# Peer advertisements for unsupported transport"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:838
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to ping busy"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:839
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to lack of self ad"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:840
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to send error"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:841
 msgid "# Self advertisments transmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/applications/advertising/advertising.c:796
+#: src/applications/advertising/advertising.c:842
 msgid "# Foreign advertisements forwarded"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/applications/advertising/advertising.c:798
-#: src/applications/pingpong/pingpong.c:493
+#: src/applications/advertising/advertising.c:844
+#: src/applications/pingpong/pingpong.c:516
 msgid "# plaintext PING messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/applications/advertising/advertising.c:802
-#: src/applications/session/connect.c:877
+#: src/applications/advertising/advertising.c:849
+#: src/applications/session/connect.c:936
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "`%s' registriert Handler %d (Plaintext und Ciphertext)\n"
 
-#: src/applications/advertising/advertising.c:820
+#: src/applications/advertising/advertising.c:867
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 "Stellt sicher, dass dieser Knoten anderen Knoten bekannt ist und entdeckt "
 "andere Knoten"
 
-#: src/applications/topology_default/topology.c:447
+#: src/applications/topology_default/topology.c:448
 msgid "maintains GNUnet default mesh topology"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:123
-#: src/applications/pingpong/pingpong.c:191
-#: src/applications/pingpong/pingpong.c:244
-#: src/applications/pingpong/pingpong.c:314
+#: src/applications/pingpong/pingpong.c:128
+#: src/applications/pingpong/pingpong.c:199
+#: src/applications/pingpong/pingpong.c:264
+#: src/applications/pingpong/pingpong.c:335
 #, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr "Beschädigte `%s' Nachricht empfangen. Nachricht wird verworfen.\n"
 
-#: src/applications/pingpong/pingpong.c:135
+#: src/applications/pingpong/pingpong.c:140
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "Ping für einen anderen Knoten empfangen. Ping wird verworfen.\n"
 
-#: src/applications/pingpong/pingpong.c:201
+#: src/applications/pingpong/pingpong.c:210
 msgid "Received PING not destined for us!\n"
 msgstr "Empfangener PING ist nicht an uns gerichtet!\n"
 
-#: src/applications/pingpong/pingpong.c:287
-#: src/applications/pingpong/pingpong.c:350
+#: src/applications/pingpong/pingpong.c:308
+#: src/applications/pingpong/pingpong.c:371
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
@@ -2155,37 +2201,49 @@
 "PONG konnte keinem PING zugeordnet werden. Versuchen Sie die Konstante "
 "MAX_PING_PONG hochzusetzen.\n"
 
-#: src/applications/pingpong/pingpong.c:393
+#: src/applications/pingpong/pingpong.c:414
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 "PING konnte nicht erstellt werden, da die Tabelle voll ist. Versuchen Sie, "
 "die Konstante MAX_PING_PONG hochzusetzen.\n"
 
-#: src/applications/pingpong/pingpong.c:483
+#: src/applications/pingpong/pingpong.c:506
 msgid "# encrypted PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:485
+#: src/applications/pingpong/pingpong.c:508
 msgid "# plaintext PONG messages received"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:487
+#: src/applications/pingpong/pingpong.c:510
 msgid "# encrypted PING messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:489
+#: src/applications/pingpong/pingpong.c:512
 msgid "# PING messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/applications/pingpong/pingpong.c:491
+#: src/applications/pingpong/pingpong.c:514
+#: src/applications/session/connect.c:931
 msgid "# encrypted PONG messages sent"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/applications/pingpong/pingpong.c:495
+#: src/applications/pingpong/pingpong.c:518
+#: src/applications/session/connect.c:929
 msgid "# encrypted PING messages sent"
 msgstr "# verschlüsselter PING Nachrichten gesendet"
 
-#: src/applications/pingpong/pingpong.c:505
+#: src/applications/pingpong/pingpong.c:520
+#, fuzzy
+msgid "# plaintext PONG messages sent"
+msgstr "# Klartext PING Nachrichten gesendet"
+
+#: src/applications/pingpong/pingpong.c:522
+#, fuzzy
+msgid "# plaintext PONG transmissions failed"
+msgstr "# Klartext PONG Nachrichten empfangen"
+
+#: src/applications/pingpong/pingpong.c:532
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "`%s' registriert Handler %d %d (Plaintext und Ciphertext)\n"
@@ -2243,7 +2301,7 @@
 msgid "sqlite datastore"
 msgstr "sqlite Datenspeicher"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1369
+#: src/applications/sqstore_sqlite/sqlite.c:1370
 #: src/applications/sqstore_mysql/mysql.c:1352
 msgid "# bytes in datastore"
 msgstr "# bytes in der Datenbank"
@@ -2253,42 +2311,47 @@
 msgid "# of connected peers"
 msgstr "# verbundener Knoten"
 
-#: src/applications/session/connect.c:257
-#: src/applications/session/connect.c:274
+#: src/applications/session/connect.c:261
+#: src/applications/session/connect.c:278
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/applications/session/connect.c:315
+#: src/applications/session/connect.c:321
 #, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr ""
 "Sitzungsschlüssel kann nicht verschlüsselt werden, Knoten `%s' ist uns nicht "
 "bekannt!\n"
 
-#: src/applications/session/connect.c:572
+#: src/applications/session/connect.c:520
+#, fuzzy
+msgid "Could not create any HELLO for myself!\n"
+msgstr "Hostkey konnte nicht erzeugt werden!\n"
+
+#: src/applications/session/connect.c:621
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "Empfangene Nachricht ist ungültig.\n"
 
-#: src/applications/session/connect.c:590
+#: src/applications/session/connect.c:639
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr "Empfangene Nachricht ist ungültig.\n"
 
-#: src/applications/session/connect.c:622
+#: src/applications/session/connect.c:673
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/applications/session/connect.c:632
+#: src/applications/session/connect.c:683
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 "setkey `%s' von `%s' hat eine ungültige CRC Prüfsumme (tatsächlich: %u, "
 "erwartet: %u).\n"
 
-#: src/applications/session/connect.c:701
+#: src/applications/session/connect.c:752
 #, fuzzy, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
@@ -2297,24 +2360,24 @@
 "Fehler beim Parsen des Verschlüsselten Sitzungsschlüssels, gegebene "
 "Nachrichtenteilgröße ist ungültig.\n"
 
-#: src/applications/session/connect.c:713
+#: src/applications/session/connect.c:764
 #, fuzzy, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr "Unbekannter Typ in engebetteter Nachricht: %u (%u bytes)\n"
 
-#: src/applications/session/connect.c:866
+#: src/applications/session/connect.c:921
 msgid "# session keys sent"
 msgstr "# Sitzungsschlüssel gesendet"
 
-#: src/applications/session/connect.c:868
+#: src/applications/session/connect.c:923
 msgid "# session keys rejected"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/applications/session/connect.c:870
+#: src/applications/session/connect.c:925
 msgid "# session keys accepted"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/applications/session/connect.c:872
+#: src/applications/session/connect.c:927
 msgid "# sessions established"
 msgstr "# Sitzungen aufgebaut"
 
@@ -2474,23 +2537,27 @@
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/applications/identity/identity.c:687
-#: src/applications/identity/identity.c:707
-#, c-format
-msgid "Removed file `%s' containing invalid hello data.\n"
+#: src/applications/identity/identity.c:730
+#: src/applications/identity/identity.c:758
+#, fuzzy, c-format
+msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr "Datei `%s' enthielt ungültige Hello Daten und wurde entfernt.\n"
 
-#: src/applications/identity/identity.c:760
+#: src/applications/identity/identity.c:812
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 "Signatur kann nicht verifiziert werden, der Knoten `%s' ist uns nicht "
 "bekannt!\n"
 
-#: src/applications/identity/identity.c:769
+#: src/applications/identity/identity.c:822
 msgid "Signature failed verification: signature invalid.\n"
 msgstr "Verifikation einer Signatur fehlgeschlagen: Signatur ist ungültig.\n"
 
+#: src/applications/identity/identity.c:1278
+msgid "invalid"
+msgstr ""
+
 #: src/applications/testbed/commands.c:1130
 #: src/applications/stats/gnunet-stats.c:65
 #, c-format
@@ -2705,48 +2772,54 @@
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:190
+#: src/applications/transport/transport.c:188
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:283
+#: src/applications/transport/transport.c:240
+#, c-format
+msgid ""
+"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:301
 #, fuzzy, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/applications/transport/transport.c:372
+#: src/applications/transport/transport.c:389
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/applications/transport/transport.c:429
+#: src/applications/transport/transport.c:446
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:630
+#: src/applications/transport/transport.c:647
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/applications/transport/transport.c:650
+#: src/applications/transport/transport.c:667
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/applications/transport/transport.c:660
+#: src/applications/transport/transport.c:677
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 "Transport Bibliothek `%s' stellt nicht die benötigte Funktion '%s%s' zur "
 "Verfügung.\n"
 
-#: src/applications/transport/transport.c:687
+#: src/applications/transport/transport.c:704
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/applications/transport/transport.c:700
+#: src/applications/transport/transport.c:717
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
@@ -2819,12 +2892,12 @@
 msgid "# bytes of noise received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/applications/stats/statistics.c:384
+#: src/applications/stats/statistics.c:398
 #, fuzzy, c-format
 msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr "`%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/stats/statistics.c:405
+#: src/applications/stats/statistics.c:419
 msgid "keeps statistics about gnunetd's operation"
 msgstr "Hält Statistiken über Betrieb von gnunetd"
 
@@ -3017,25 +3090,21 @@
 "Es wurde keine Nachricht von gnunetd empfangen. Läuft gnunetd?\n"
 
 #: src/applications/tbench/tbenchtest.c:53
-#: src/applications/tbench/tbenchtest_udp.c:55
 #, c-format
 msgid "Using %u messages of size %u for %u times.\n"
 msgstr "Verwende %u Nachrichten der Größe %u %umal.\n"
 
 #: src/applications/tbench/tbenchtest.c:80
-#: src/applications/tbench/tbenchtest_udp.c:82
 #, c-format
 msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 msgstr "Zeiten:   Max %16llu  Min %16llu  Mittel %12.3f  Varianz %12.3f\n"
 
 #: src/applications/tbench/tbenchtest.c:85
-#: src/applications/tbench/tbenchtest_udp.c:87
 #, c-format
 msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
 msgstr "Verloren:  Max %16u  Min %16u  Mittel %12.3f  Varianz %12.3f\n"
 
 #: src/applications/tbench/tbenchtest.c:91
-#: src/applications/tbench/tbenchtest_udp.c:93
 #, c-format
 msgid ""
 "\n"
@@ -3045,7 +3114,6 @@
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
 #: src/applications/tbench/tbenchtest.c:148
-#: src/applications/tbench/tbenchtest_udp.c:152
 #, c-format
 msgid "Running benchmark...\n"
 msgstr "Benchmark läuft...\n"
@@ -3124,28 +3192,28 @@
 msgid "allows mapping of the network topology"
 msgstr "Erlaubt die Kartographierung der Netzwerktopologie"
 
-#: src/applications/gap/gap.c:1707
+#: src/applications/gap/gap.c:1705
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/applications/gap/gap.c:1708
+#: src/applications/gap/gap.c:1706
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1884
+#: src/applications/gap/gap.c:1882
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 "Verdeckender Netzwerkverkehr angefordert, aber der Verkehrsdienst wurde "
 "nicht geladen. Anfrage wird abgelehnt.\n"
 
-#: src/applications/gap/gap.c:1896 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1894 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/applications/gap/gap.c:1903 src/applications/gap/gap.c:1909
-#: src/applications/gap/gap.c:1916
+#: src/applications/gap/gap.c:1901 src/applications/gap/gap.c:1907
+#: src/applications/gap/gap.c:1914
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 "Gewünschter Grad an Anonymität kann nicht erreicht werden, Anfrage wird "
@@ -3204,7 +3272,8 @@
 msgstr "#gap doppelte Antworten"
 
 #: src/applications/gap/gap.c:2215
-msgid "# gap spurious replies"
+#, fuzzy
+msgid "# gap spurious replies (dropped)"
 msgstr "# gap falsche Antworten"
 
 #: src/applications/gap/gap.c:2216
@@ -3791,6 +3860,15 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "`%s' schlug fehl. Ist `%s' eine Datei?\n"
 
+#: src/applications/fs/module/querymanager.c:227
+#, fuzzy
+msgid "# FS currently tracked queries from clients"
+msgstr "# Client Trace-Antworten gesendet"
+
+#: src/applications/fs/module/querymanager.c:229
+msgid "# FS replies passed to clients"
+msgstr ""
+
 #: src/applications/fs/module/ondemand.c:336
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
@@ -3829,7 +3907,7 @@
 "Deindizierter ODB Block `%s' vom Offset %llu fehlt bereits im "
 "Datenspeicher.\n"
 
-#: src/applications/fs/module/fs.c:1146
+#: src/applications/fs/module/fs.c:1167
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -3838,12 +3916,21 @@
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/applications/fs/module/fs.c:1188
+#: src/applications/fs/module/fs.c:1180
+msgid "# FS expired replies dropped"
+msgstr ""
+
+#: src/applications/fs/module/fs.c:1182
+#, fuzzy
+msgid "# FS valid replies received"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/applications/fs/module/fs.c:1219
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr "`%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/module/fs.c:1228
+#: src/applications/fs/module/fs.c:1259
 msgid "enables (anonymous) file-sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
@@ -3901,12 +3988,12 @@
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "Temporäre Datei `%s' konnte nicht gelöscht werden: %s\n"
 
-#: src/applications/fs/ecrs/download.c:269
+#: src/applications/fs/ecrs/download.c:270
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Write(%d, %p, %d) schlug fehl: %s\n"
 
-#: src/applications/fs/ecrs/download.c:1042
+#: src/applications/fs/ecrs/download.c:1043
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -3915,7 +4002,7 @@
 "Bug oder eine mit bösen Absichten eingefügte Datei. Download wurde "
 "abgebrochen.\n"
 
-#: src/applications/fs/ecrs/download.c:1228
+#: src/applications/fs/ecrs/download.c:1229
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -3979,21 +4066,21 @@
 "Pseudonym `%s' kann nicht erstellt werden, da die Datei `%s' bereits "
 "existiert.\n"
 
-#: src/applications/fs/ecrs/namespace.c:339
-#: src/applications/fs/ecrs/namespace.c:421
-#: src/applications/fs/ecrs/namespace.c:578
+#: src/applications/fs/ecrs/namespace.c:342
+#: src/applications/fs/ecrs/namespace.c:425
+#: src/applications/fs/ecrs/namespace.c:584
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/applications/fs/ecrs/namespace.c:351
-#: src/applications/fs/ecrs/namespace.c:432
+#: src/applications/fs/ecrs/namespace.c:354
+#: src/applications/fs/ecrs/namespace.c:436
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:592
-#: src/applications/fs/ecrs/namespace.c:603
+#: src/applications/fs/ecrs/namespace.c:598
+#: src/applications/fs/ecrs/namespace.c:609
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Format der Datei `%s' ist ungültig.\n"
@@ -4013,17 +4100,17 @@
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Einsammeln von Dateibezeichnern deaktiviert.\n"
 
-#: src/applications/fs/uritrack/file_info.c:373
+#: src/applications/fs/uritrack/file_info.c:374
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:656
+#: src/applications/fs/namespace/namespace_info.c:730
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 "Veröffentlichungsintervall für periodische Veröffentlichung wurde geändert."
 
-#: src/applications/fs/namespace/namespace_info.c:677
+#: src/applications/fs/namespace/namespace_info.c:751
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -4058,35 +4145,46 @@
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:100
+#: src/applications/bootstrap_http/http.c:105
 #, fuzzy, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
-#: src/applications/bootstrap_http/http.c:173
+#: src/applications/bootstrap_http/http.c:176
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:229
+#: src/applications/bootstrap_http/http.c:211
+#, c-format
+msgid "Bootstrapping using `%s'.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:237
 #, fuzzy, c-format
 msgid "Trying to download hostlist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/applications/bootstrap_http/http.c:408
-msgid "# hellos downloaded via http"
+#: src/applications/bootstrap_http/http.c:388
+#, fuzzy, c-format
+msgid "Downloaded %llu bytes from `%s'.\n"
+msgstr "Dateien aus dem GNUnet herunterladen."
+
+#: src/applications/bootstrap_http/http.c:421
+#, fuzzy
+msgid "# HELLOs downloaded via http"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/applications/traffic/traffic.c:445
+#: src/applications/traffic/traffic.c:450
 #, c-format
 msgid "# bytes transmitted of type %d"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/applications/traffic/traffic.c:465
+#: src/applications/traffic/traffic.c:470
 #, c-format
 msgid "# bytes received of type %d"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/applications/traffic/traffic.c:610
+#: src/applications/traffic/traffic.c:624
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
@@ -4367,7 +4465,7 @@
 msgid "Updates GNUnet datastructures after version change."
 msgstr "GNUnet Datenstrukturen nach einer Versionsänderung aktualisieren."
 
-#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:382
+#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:389
 msgid "run as user LOGIN"
 msgstr "als Benutzer LOGIN ausführen"
 
@@ -4377,89 +4475,89 @@
 "Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
 "zu holen"
 
-#: src/server/connection.c:1142
+#: src/server/connection.c:1133
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "`%s' wählte %d von %d Nachrichten aus (MTU: %d).\n"
 
-#: src/server/connection.c:1151
+#: src/server/connection.c:1142
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Nachrichten Details: %u: Länge %d, Priorität: %d\n"
 
-#: src/server/connection.c:2631
+#: src/server/connection.c:2675
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Nachricht von `%s' verworfen: ungültiges Format.\n"
 
-#: src/server/connection.c:2709
+#: src/server/connection.c:2755
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Ungültige Sequenznummer %u <= %u, Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:2726
+#: src/server/connection.c:2772
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 "Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:3167
+#: src/server/connection.c:3219
 msgid "# outgoing messages dropped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:3171
+#: src/server/connection.c:3223
 msgid "# bytes of outgoing messages dropped"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:3173
+#: src/server/connection.c:3225
 msgid "# connections closed (HANGUP sent)"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/server/connection.c:3176
+#: src/server/connection.c:3228
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/server/connection.c:3180
+#: src/server/connection.c:3232
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/server/connection.c:3184
+#: src/server/connection.c:3236
 #, fuzzy
 msgid "# bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/server/connection.c:3187
+#: src/server/connection.c:3239
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/server/connection.c:3189
+#: src/server/connection.c:3241
 msgid "# bytes noise sent"
 msgstr "# Bytes Rauschen gesendet"
 
-#: src/server/connection.c:3191
+#: src/server/connection.c:3243
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3193
+#: src/server/connection.c:3245
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/server/connection.c:3195
+#: src/server/connection.c:3247
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
 
-#: src/server/connection.c:3197
+#: src/server/connection.c:3249
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3199
+#: src/server/connection.c:3251
 #, fuzzy
 msgid "# total number of bytes we were allowed to sent"
 msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
 
-#: src/server/connection.c:3201
+#: src/server/connection.c:3253
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
@@ -4524,7 +4622,7 @@
 msgid "specify username as which gnunetd should run"
 msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
-#: src/server/gnunetd.c:270
+#: src/server/gnunetd.c:288
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -4612,7 +4710,7 @@
 msgid " Transport %d is not being tested\n"
 msgstr " Transport %d ist nicht verfügbar\n"
 
-#: src/server/gnunet-transport-check.c:250
+#: src/server/gnunet-transport-check.c:253
 #, c-format
 msgid ""
 "\n"
@@ -4621,64 +4719,70 @@
 "\n"
 "Kontaktiere `%s'."
 
-#: src/server/gnunet-transport-check.c:276
+#: src/server/gnunet-transport-check.c:279
 #, c-format
 msgid " Connection failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/server/gnunet-transport-check.c:282
+#: src/server/gnunet-transport-check.c:285
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
-#: src/server/gnunet-transport-check.c:335
+#: src/server/gnunet-transport-check.c:338
 #, c-format
-msgid "No reply received within %llums.\n"
-msgstr "Keine Antwort innerhalb %llums erhalten.\n"
+msgid "Timeout after %llums.\n"
+msgstr ""
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:342
+#, fuzzy, c-format
+msgid "OK!\n"
+msgstr "OK"
+
+#: src/server/gnunet-transport-check.c:370
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 "Werkzeug, mit dem getestet werden kann, ob die GNUnet Transport Dienste "
 "funktionsfähig sind."
 
-#: src/server/gnunet-transport-check.c:367
+#: src/server/gnunet-transport-check.c:374
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr "Knoten aus HOSTLISTURL anpingen, deren Transports passen"
 
-#: src/server/gnunet-transport-check.c:370
+#: src/server/gnunet-transport-check.c:377
 msgid "send COUNT messages"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/server/gnunet-transport-check.c:373
+#: src/server/gnunet-transport-check.c:380
 msgid "send messages with SIZE bytes payload"
 msgstr "Nachrichten mit SIZE Bytes Nutzlast versenden"
 
-#: src/server/gnunet-transport-check.c:376
+#: src/server/gnunet-transport-check.c:383
 msgid "specifies which TRANSPORT should be tested"
 msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
 
-#: src/server/gnunet-transport-check.c:379
+#: src/server/gnunet-transport-check.c:386
 msgid "specifies after how many MS to time-out"
 msgstr "Gibt an, nach wievielen MS die Zeit abgelaufen sein soll"
 
-#: src/server/gnunet-transport-check.c:387
+#: src/server/gnunet-transport-check.c:394
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:451
+#: src/server/gnunet-transport-check.c:459
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/server/gnunet-transport-check.c:454
+#: src/server/gnunet-transport-check.c:462
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/server/gnunet-transport-check.c:514
-#, c-format
+#: src/server/gnunet-transport-check.c:527
+#, fuzzy, c-format
 msgid ""
+"\n"
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 "%d von %d Knoten erfolgreich kontaktiert (%d mal war der Transport nicht "
@@ -4694,7 +4798,7 @@
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/server/tcpserver.c:396
+#: src/server/tcpserver.c:397
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
@@ -4703,12 +4807,12 @@
 "Beschädigte Netzwerkangabe in der Konfigurationsdatei in Sektion `%s' für "
 "Eintrag `%s': %s\n"
 
-#: src/server/tcpserver.c:448
+#: src/server/tcpserver.c:449
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
 
-#: src/server/handler.c:379
+#: src/server/handler.c:380
 #, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"
@@ -4740,6 +4844,11 @@
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
+#: src/util/boot/startup.c:212
+#, fuzzy, c-format
+msgid "Failed to run %s: %s %d\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
 #: src/util/network_client/tcpio.c:94 src/util/network_client/tcpio.c:135
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
@@ -4769,12 +4878,12 @@
 msgid "`%s' failed, reply invalid!\n"
 msgstr "`%s' fehlgeschlagen, Antwort ist ungültig!\n"
 
-#: src/util/crypto/hostkey_gcrypt.c:1031
+#: src/util/crypto/hostkey_gcrypt.c:1036
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto/locking_gcrypt.c:67
+#: src/util/crypto/locking_gcrypt.c:74
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
@@ -4846,14 +4955,14 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/util/network/select.c:296
+#: src/util/network/select.c:306
 #, fuzzy
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 "Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
 "u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/util/network/select.c:454
+#: src/util/network/select.c:472
 msgid "select listen socket not valid!\n"
 msgstr ""
 
@@ -5180,21 +5289,21 @@
 msgid "Tool to setup GNUnet."
 msgstr "Werkzeug für die Einrichtung von GNUnet."
 
-#: src/setup/gnunet-setup.c:187
+#: src/setup/gnunet-setup.c:188
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Ungültige Kommandozeilen Parameter.\n"
 
-#: src/setup/gnunet-setup.c:192
+#: src/setup/gnunet-setup.c:193
 msgid "No interface specified, using default\n"
 msgstr "Keine Oberfläche angegeben, verwende Standard\n"
 
-#: src/setup/gnunet-setup.c:267
+#: src/setup/gnunet-setup.c:268
 #, c-format
 msgid "`%s' is not available."
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/setup/gnunet-setup.c:283
+#: src/setup/gnunet-setup.c:284
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
@@ -5914,6 +6023,30 @@
 msgid "Unknown error while creating a new user"
 msgstr "Unbekannter Fehler beim Anlegen des neuen Benutzers"
 
+#, fuzzy
+#~ msgid "# bytes received via TCP-OLD"
+#~ msgstr "# Bytes empfangen über TCP"
+
+#, fuzzy
+#~ msgid "# bytes sent via TCP-OLD"
+#~ msgstr "# Bytes gesendet über TCP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by TCP-OLD (outgoing)"
+#~ msgstr "# Bytes verworfen von TCP (ausgehend)"
+
+#~ msgid "hello advertisement for protocol %d received.\n"
+#~ msgstr "Hello Ankündigung für Protokoll %d empfangen.\n"
+
+#~ msgid "`%s' failed (%d, %u). Will not send PING.\n"
+#~ msgstr "`%s' fehlgeschlagen (%d, %u). PING wird nicht gesendet.\n"
+
+#~ msgid "Removing hello from peer `%s' (expired %ds ago).\n"
+#~ msgstr "Hello von Knoten `%s' wird entfernt (lief vor %ds ab).\n"
+
+#~ msgid "No reply received within %llums.\n"
+#~ msgstr "Keine Antwort innerhalb %llums erhalten.\n"
+
 #~ msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 #~ msgstr "Warte auf den Start von gnunetd (%u Iterationen verbleiben)...\n"
 
@@ -6289,9 +6422,6 @@
 #~ "Die Konfigurationsdatei muss unter %s%s ein Verzeichnis angeben, in dem "
 #~ "GNUnet knotenspezifische Daten speichern kann.\n"
 
-#~ msgid "Could not create hostkey!\n"
-#~ msgstr "Hostkey konnte nicht erzeugt werden!\n"
-
 #~ msgid "%s `%s' returned no known hosts!\n"
 #~ msgstr "%s `%s' ergab keine bekannten Knoten!\n"
 
@@ -6553,9 +6683,6 @@
 #~ msgid "%s: symbol value `%s' invalid for %s\n"
 #~ msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
 
-#~ msgid "OK"
-#~ msgstr "OK"
-
 #~ msgid "Gtk GNUnet Configurator"
 #~ msgstr "Gtk GNUnet Konfigurator"
 
@@ -6852,9 +6979,6 @@
 #~ "Bitte geben Sie den Pfad an, wohin die Konfigurationsdateien gespeichert "
 #~ "werden."
 
-#~ msgid "# client trace replies sent"
-#~ msgstr "# Client Trace-Antworten gesendet"
-
 #~ msgid "# p2p trace replies sent"
 #~ msgstr "# p2p Trace-Antworten gesendet"
 

Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po     2007-06-09 08:10:48 UTC (rev 4986)
+++ GNUnet/po/es.po     2007-06-09 08:20:05 UTC (rev 4987)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-27 22:50-0600\n"
+"POT-Creation-Date: 2007-06-09 01:06-0600\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -228,12 +228,23 @@
 "Windows, this setting affects the creation of a new system service only."
 msgstr ""
 
-#: contrib/config-daemon.scm:320
-msgid "Which transport mechanisms should GNUnet use?"
+#: contrib/config-daemon.scm:321
+msgid "Should gnunetd be automatically started when the system boots?"
 msgstr ""
 
 #: contrib/config-daemon.scm:322
 msgid ""
+"Set to YES if gnunetd should be automatically started on boot.  If this "
+"option is set, gnunet-setup will install a script to start the daemon upon "
+"completion.  This option may not work on all systems."
+msgstr ""
+
+#: contrib/config-daemon.scm:334
+msgid "Which transport mechanisms should GNUnet use?"
+msgstr ""
+
+#: contrib/config-daemon.scm:336
+msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
 "available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
 "\t\t\n"
@@ -246,11 +257,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:350
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:338
+#: contrib/config-daemon.scm:352
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -287,15 +298,15 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:367
+#: contrib/config-daemon.scm:381
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:379
+#: contrib/config-daemon.scm:393
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:380
+#: contrib/config-daemon.scm:394
 msgid ""
 "The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
 "peer to peers of which the hostkey has been copied by hand to data/hosts;  "
@@ -307,15 +318,15 @@
 "lines above would need some minor editing :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:391
+#: contrib/config-daemon.scm:405
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:403
+#: contrib/config-daemon.scm:417
 msgid "Disable automatic establishment of connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:404
+#: contrib/config-daemon.scm:418
 msgid ""
 "If this option is enabled, GNUnet will not automatically establish "
 "connections to other peers, but instead wait for applications to "
@@ -323,15 +334,21 @@
 "connect to us)."
 msgstr ""
 
-#: contrib/config-daemon.scm:415
+#: contrib/config-daemon.scm:429
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:427
+#: contrib/config-daemon.scm:430
+msgid ""
+"This option maybe useful during testing, but turning it off is dangerous! If "
+"in any doubt, set it to YES (which is the default)."
+msgstr ""
+
+#: contrib/config-daemon.scm:441
 msgid "Client/Server Port"
 msgstr ""
 
-#: contrib/config-daemon.scm:428
+#: contrib/config-daemon.scm:442
 msgid ""
 "Which is the client-server port that is used between gnunetd and the clients "
 "(TCP only).  You may firewall this port for non-local machines (but you do "
@@ -339,11 +356,11 @@
 "connections from machines that are listed under TRUSTED)."
 msgstr ""
 
-#: contrib/config-daemon.scm:439
+#: contrib/config-daemon.scm:453
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:440
+#: contrib/config-daemon.scm:454
 msgid ""
 "This option specifies which hosts are trusted enough to connect as clients "
 "(to the TCP port).  This is useful if you run gnunetd on one host of your "
@@ -354,76 +371,76 @@
 "separated by a semicolon, spaces are not allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:452
+#: contrib/config-daemon.scm:466
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:453
+#: contrib/config-daemon.scm:467
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If it is set, "
 "only the specified peers are allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:464
+#: contrib/config-daemon.scm:478
 #, fuzzy
 msgid "Run gnunetd as this user."
 msgstr "Ejecutar gnunet-update"
 
-#: contrib/config-daemon.scm:465
+#: contrib/config-daemon.scm:479
 msgid ""
 "When started as root, gnunetd will change permissions to the given user."
 msgstr ""
 
-#: contrib/config-daemon.scm:476
+#: contrib/config-daemon.scm:490
 #, fuzzy
 msgid "Run gnunetd as this group."
 msgstr "Ejecutar gnunet-update"
 
-#: contrib/config-daemon.scm:477
+#: contrib/config-daemon.scm:491
 msgid ""
 "When started as root, gnunetd will change permissions to the given group."
 msgstr ""
 
-#: contrib/config-daemon.scm:488
+#: contrib/config-daemon.scm:502
 #, fuzzy
 msgid "Run gnunetd during system startup?"
 msgstr "Ejecutar gnunet-update"
 
-#: contrib/config-daemon.scm:501
+#: contrib/config-daemon.scm:515
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:502
+#: contrib/config-daemon.scm:516
 msgid "If this option is not set, any peer is allowed to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:513
+#: contrib/config-daemon.scm:527
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:533
+#: contrib/config-daemon.scm:547
 #, fuzzy
 msgid "General settings"
 msgstr "Otras configuraciones"
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:548
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:561
+#: contrib/config-daemon.scm:576
 #, fuzzy
 msgid "Path settings"
 msgstr "Otras configuraciones"
 
-#: contrib/config-daemon.scm:562
+#: contrib/config-daemon.scm:577
 msgid "Prefixes for paths used by GNUnet"
 msgstr ""
 
-#: contrib/config-daemon.scm:578
+#: contrib/config-daemon.scm:593
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:580
+#: contrib/config-daemon.scm:595
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -432,11 +449,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:593
+#: contrib/config-daemon.scm:608
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:595
+#: contrib/config-daemon.scm:610
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -449,47 +466,47 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:610
+#: contrib/config-daemon.scm:625
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:626
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:628
+#: contrib/config-daemon.scm:643
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:629
+#: contrib/config-daemon.scm:644
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:643
+#: contrib/config-daemon.scm:658
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:655
+#: contrib/config-daemon.scm:670
 #, fuzzy
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: contrib/config-daemon.scm:667
+#: contrib/config-daemon.scm:682
 #, fuzzy
 msgid "Configuration of the MySQL database"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: contrib/config-daemon.scm:686
+#: contrib/config-daemon.scm:701
 #, fuzzy
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr "activa la compartición de ficheros anónima"
 
-#: contrib/config-daemon.scm:688
+#: contrib/config-daemon.scm:703
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -500,19 +517,19 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:702
+#: contrib/config-daemon.scm:717
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:714
+#: contrib/config-daemon.scm:729
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:727
+#: contrib/config-daemon.scm:742
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:729
+#: contrib/config-daemon.scm:744
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -524,13 +541,13 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:743
+#: contrib/config-daemon.scm:758
 msgid ""
 "MB of diskspace GNUnet can use for caching DHT index data (the data will be "
 "stored in /tmp)"
 msgstr ""
 
-#: contrib/config-daemon.scm:744
+#: contrib/config-daemon.scm:759
 msgid ""
 "DHT index data is inherently small and expires comparatively quickly.  It is "
 "deleted whenever gnunetd is shut down.\n"
@@ -538,21 +555,21 @@
 "The size of the DSTORE QUOTA is specified in MB."
 msgstr ""
 
-#: contrib/config-daemon.scm:758
+#: contrib/config-daemon.scm:773
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "activa la compartición de ficheros anónima"
 
-#: contrib/config-daemon.scm:777
+#: contrib/config-daemon.scm:792
 #, fuzzy
 msgid "Applications"
 msgstr "_Opciones"
 
-#: contrib/config-daemon.scm:793
+#: contrib/config-daemon.scm:808
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:794
+#: contrib/config-daemon.scm:809
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port and that cannot be traversed using UPnP.  Note "
@@ -565,15 +582,15 @@
 "connections.  Use YES only if you get no connections otherwise."
 msgstr ""
 
-#: contrib/config-daemon.scm:805
+#: contrib/config-daemon.scm:820
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:817 contrib/config-daemon.scm:910
+#: contrib/config-daemon.scm:832 contrib/config-daemon.scm:925
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:818
+#: contrib/config-daemon.scm:833
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP.  You should disable this option if you are sure that you are "
@@ -581,34 +598,34 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:829 contrib/config-daemon.scm:934
-#: contrib/config-daemon.scm:989 contrib/config-daemon.scm:1054
+#: contrib/config-daemon.scm:844 contrib/config-daemon.scm:949
+#: contrib/config-daemon.scm:1004 contrib/config-daemon.scm:1069
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:841 contrib/config-daemon.scm:946
+#: contrib/config-daemon.scm:856
 msgid ""
-"Which IPs are allowed to connect? Leave empty to allow connections from any "
-"IP."
+"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
+"network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:853
+#: contrib/config-daemon.scm:868
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:871
+#: contrib/config-daemon.scm:886
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:883
+#: contrib/config-daemon.scm:898
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:898
+#: contrib/config-daemon.scm:913
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:926
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP. You should disable this option if you are sure that you are "
@@ -616,69 +633,75 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:922
+#: contrib/config-daemon.scm:937
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:958
+#: contrib/config-daemon.scm:961
+msgid ""
+"Which IPs are allowed to connect? Leave empty to allow connections from any "
+"IP."
+msgstr ""
+
+#: contrib/config-daemon.scm:973
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:977
+#: contrib/config-daemon.scm:992
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1001 contrib/config-daemon.scm:1066
+#: contrib/config-daemon.scm:1016 contrib/config-daemon.scm:1081
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow any IP to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:1013
+#: contrib/config-daemon.scm:1028
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1030
+#: contrib/config-daemon.scm:1045
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1042
+#: contrib/config-daemon.scm:1057
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1078
+#: contrib/config-daemon.scm:1093
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1096
+#: contrib/config-daemon.scm:1111
 #, fuzzy
 msgid "Network interface"
 msgstr "Interfaz de red:"
 
-#: contrib/config-daemon.scm:1108
+#: contrib/config-daemon.scm:1123
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1120
+#: contrib/config-daemon.scm:1135
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1132
+#: contrib/config-daemon.scm:1147
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1155
+#: contrib/config-daemon.scm:1170
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1167
+#: contrib/config-daemon.scm:1182
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1179
+#: contrib/config-daemon.scm:1194
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1181
+#: contrib/config-daemon.scm:1196
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -688,11 +711,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1192
+#: contrib/config-daemon.scm:1207
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1194
+#: contrib/config-daemon.scm:1209
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -702,36 +725,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1205
+#: contrib/config-daemon.scm:1220
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1206
+#: contrib/config-daemon.scm:1221
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1217
+#: contrib/config-daemon.scm:1232
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1218
+#: contrib/config-daemon.scm:1233
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1229
+#: contrib/config-daemon.scm:1244
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1241
+#: contrib/config-daemon.scm:1256
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1243
+#: contrib/config-daemon.scm:1258
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -776,12 +799,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1260
+#: contrib/config-daemon.scm:1275
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Interfaz de red:"
 
-#: contrib/config-daemon.scm:1261
+#: contrib/config-daemon.scm:1276
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -792,12 +815,12 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1272
+#: contrib/config-daemon.scm:1287
 #, fuzzy
 msgid "Load management"
 msgstr "Argumentos en la linea de comandos inválidos.\n"
 
-#: contrib/config-daemon.scm:1297 contrib/config-client.scm:365
+#: contrib/config-daemon.scm:1312 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -902,19 +925,32 @@
 msgstr ""
 
 #: contrib/config-client.scm:322
+msgid "Do not show search results for files that were uploaded by us"
+msgstr ""
+
+#: contrib/config-client.scm:323
+msgid ""
+"This option is useful to eliminate files that the user already has from the "
+"search.  Naturally, enabling this option maybe confusing because some "
+"obviously expected search results would no longer show up.  This option only "
+"works if the URI_DB_SIZE option under FS is not zero (since the URI DB is "
+"used to determine which files the user is sharing)"
+msgstr ""
+
+#: contrib/config-client.scm:335
 msgid "To which directory should gnunet-gtk save downloads to?"
 msgstr ""
 
-#: contrib/config-client.scm:334
+#: contrib/config-client.scm:347
 msgid "Options related to gnunet-gtk"
 msgstr ""
 
-#: contrib/config-client.scm:353
+#: contrib/config-client.scm:367
 #, fuzzy
 msgid "Full pathname of GNUnet client HOME directory"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: contrib/config-client.scm:354
+#: contrib/config-client.scm:368
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
@@ -1642,7 +1678,7 @@
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "UDP6: Imposible determinar mi dirección IPv6 pública.\n"
 
-#: src/transports/udp6.c:521 src/transports/udp.c:535
+#: src/transports/udp6.c:544 src/transports/udp.c:575
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
@@ -1651,36 +1687,36 @@
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
 
-#: src/transports/http.c:753 src/transports/http.c:826
-#: src/transports/http.c:950 src/transports/http.c:1035
+#: src/transports/http.c:754 src/transports/http.c:827
+#: src/transports/http.c:951 src/transports/http.c:1036
 #: src/transports/upnp/upnp.c:335 src/transports/upnp/upnp.c:560
-#: src/applications/bootstrap_http/http.c:121
-#: src/applications/bootstrap_http/http.c:261
-#: src/applications/bootstrap_http/http.c:282
-#: src/applications/bootstrap_http/http.c:316
-#: src/applications/bootstrap_http/http.c:334
-#: src/applications/bootstrap_http/http.c:348
-#: src/applications/bootstrap_http/http.c:360
-#: src/applications/bootstrap_http/http.c:372
+#: src/applications/bootstrap_http/http.c:124
+#: src/applications/bootstrap_http/http.c:269
+#: src/applications/bootstrap_http/http.c:290
+#: src/applications/bootstrap_http/http.c:324
+#: src/applications/bootstrap_http/http.c:342
+#: src/applications/bootstrap_http/http.c:356
+#: src/applications/bootstrap_http/http.c:368
+#: src/applications/bootstrap_http/http.c:380
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/transports/http.c:1225
+#: src/transports/http.c:1248
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:1233
+#: src/transports/http.c:1256
 msgid "# bytes received via HTTP"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/transports/http.c:1235
+#: src/transports/http.c:1258
 msgid "# bytes sent via HTTP"
 msgstr "# bytes mandados vía HTTP"
 
-#: src/transports/http.c:1237
+#: src/transports/http.c:1260
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "#bytes omitidos vía HTTP (salientes)"
 
@@ -1704,102 +1740,102 @@
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transports/smtp.c:546
+#: src/transports/smtp.c:547
 #, fuzzy, c-format
 msgid "Failed to initialize libesmtp: %s.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/transports/smtp.c:610
+#: src/transports/smtp.c:611
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Enviando un correo electrónico a '%s' se produjo un fallo.\n"
 
-#: src/transports/smtp.c:678
+#: src/transports/smtp.c:679
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
 
-#: src/transports/smtp.c:706
+#: src/transports/smtp.c:707
 #, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 
-#: src/transports/tcp.c:271
+#: src/transports/tcp.c:274
 #, fuzzy
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
 
-#: src/transports/tcp.c:357
+#: src/transports/tcp.c:358
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/transports/tcp.c:424 src/transports/tcp6.c:379
+#: src/transports/tcp.c:425 src/transports/tcp6.c:382
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:569
+#: src/transports/tcp.c:592
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:577
+#: src/transports/tcp.c:600
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/tcp.c:579
+#: src/transports/tcp.c:602
 msgid "# bytes sent via TCP"
 msgstr "# bytes enviados por TCP"
 
-#: src/transports/tcp.c:581
+#: src/transports/tcp.c:604
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transports/udp.c:276
+#: src/transports/udp.c:293
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "UDP: Imposible determinar mi dirección IP pública.\n"
 
-#: src/transports/udp.c:367
+#: src/transports/udp.c:382
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 "Falló al mandar el mensaje de tamaño %d a través de UDP a %u.%u.%u.%u:%u: %"
 "s\n"
 
-#: src/transports/udp.c:553
+#: src/transports/udp.c:593
 msgid "# bytes received via UDP"
 msgstr "# bytes recibidos vía UDP"
 
-#: src/transports/udp.c:555
+#: src/transports/udp.c:595
 msgid "# bytes sent via UDP"
 msgstr "# bytes enviados vía UDP"
 
-#: src/transports/udp.c:557
+#: src/transports/udp.c:597
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/transports/tcp6.c:223
+#: src/transports/tcp6.c:226
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Imposible determinar mi dirección IPv6 pública.\n"
 
-#: src/transports/tcp6.c:265
+#: src/transports/tcp6.c:268
 #, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/transports/tcp6.c:519
+#: src/transports/tcp6.c:547
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/tcp6.c:521
+#: src/transports/tcp6.c:549
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "# bytes enviados por TCP"
 
-#: src/transports/tcp6.c:523
+#: src/transports/tcp6.c:551
 #, fuzzy
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
@@ -1814,27 +1850,12 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/tcp_old.c:1299
-#, fuzzy
-msgid "# bytes received via TCP-OLD"
-msgstr "# bytes recibidos por TCP"
-
-#: src/transports/tcp_old.c:1301
-#, fuzzy
-msgid "# bytes sent via TCP-OLD"
-msgstr "# bytes enviados por TCP"
-
-#: src/transports/tcp_old.c:1303
-#, fuzzy
-msgid "# bytes dropped by TCP-OLD (outgoing)"
-msgstr "# bytes omitidos por TCP (salientes)"
-
 #: src/transports/tcp_helper.c:193
 #, fuzzy
 msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/transports/tcp_helper.c:204
+#: src/transports/tcp_helper.c:205
 #, fuzzy
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
@@ -1905,12 +1926,12 @@
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "'%s' falló. Finalizando conexión con el cleinte.\n"
 
-#: src/applications/dht/module/cs.c:230
+#: src/applications/dht/module/cs.c:240
 #, fuzzy, c-format
 msgid "`%s' registering client handlers: %d %d\n"
 msgstr "'%s' registrando un manejador de clientes %d\n"
 
-#: src/applications/dht/module/cs.c:249
+#: src/applications/dht/module/cs.c:259
 msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
@@ -1993,7 +2014,7 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:126
 #: src/applications/testbed/gnunet-testbed.c:547 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:286
+#: src/setup/gnunet-setup.c:287
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Usar --help para obtener una lista de opciones.\n"
@@ -2015,136 +2036,173 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/applications/advertising/advertising.c:168
-#, c-format
-msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+#: src/applications/advertising/advertising.c:188
+#, fuzzy, c-format
+msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 msgstr "mensaje de saludo de '%s' inválido (firma inválida). Omitiendo.\n"
 
-#: src/applications/advertising/advertising.c:175
-msgid ""
-"hello message received invalid (expiration time over limit). Dropping.\n"
+#: src/applications/advertising/advertising.c:196
+#, fuzzy
+msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr ""
 "mensaje de saludo recibido inválido (tiempo superior al límite). Omitiendo.\n"
 
-#: src/applications/advertising/advertising.c:182
-#, c-format
-msgid "hello transport verification failed (%u).\n"
-msgstr ""
-
-#: src/applications/advertising/advertising.c:192
-#, c-format
-msgid "hello advertisement for protocol %d received.\n"
-msgstr "Inicio de comunicación del protocolo %d recibido.\n"
-
-#: src/applications/advertising/advertising.c:327
-msgid "Could not send hellos+PING, ping buffer full.\n"
+#: src/applications/advertising/advertising.c:367
+#, fuzzy
+msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr "Imposible mandar ahora saludos+PING, buffer del ping lleno.\n"
 
-#: src/applications/advertising/advertising.c:341
-#, c-format
-msgid "`%s' failed (%d, %u). Will not send PING.\n"
-msgstr "'%s' falló (%d, %u). No se mandará el PING.\n"
+#: src/applications/advertising/advertising.c:385
+msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:504
+#: src/applications/advertising/advertising.c:549
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Anunciando mi transporte %d a los pares seleccionados.\n"
 
-#: src/applications/advertising/advertising.c:511
+#: src/applications/advertising/advertising.c:557
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr "Es inútil anunciarnos: no hay más pares que nos conozcan más allá.\n"
 
-#: src/applications/advertising/advertising.c:613
-#, c-format
-msgid "Removing hello from peer `%s' (expired %ds ago).\n"
-msgstr "Eliminando saludo del par '%s' (expiró hace %ds).\n"
-
-#: src/applications/advertising/advertising.c:794
+#: src/applications/advertising/advertising.c:832
 msgid "# Peer advertisements received"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/applications/advertising/advertising.c:795
+#: src/applications/advertising/advertising.c:833
+#, fuzzy
+msgid "# Peer advertisements of type NAT received"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:834
+#, fuzzy
+msgid "# Peer advertisements confirmed via PONG"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:835
+#, fuzzy
+msgid "# Peer advertisements updating earlier HELLOs"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:836
+#, fuzzy
+msgid "# Peer advertisements discarded due to load"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:837
+#, fuzzy
+msgid "# Peer advertisements for unsupported transport"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:838
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to ping busy"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:839
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to lack of self ad"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:840
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to send error"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:841
 msgid "# Self advertisments transmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/applications/advertising/advertising.c:796
+#: src/applications/advertising/advertising.c:842
 msgid "# Foreign advertisements forwarded"
 msgstr "# Anuncios a extraños mandados"
 
-#: src/applications/advertising/advertising.c:798
-#: src/applications/pingpong/pingpong.c:493
+#: src/applications/advertising/advertising.c:844
+#: src/applications/pingpong/pingpong.c:516
 msgid "# plaintext PING messages sent"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/applications/advertising/advertising.c:802
-#: src/applications/session/connect.c:877
+#: src/applications/advertising/advertising.c:849
+#: src/applications/session/connect.c:936
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "'%s' registrando manejador %d (texto plano e hipertexto)\n"
 
-#: src/applications/advertising/advertising.c:820
+#: src/applications/advertising/advertising.c:867
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 "Asegura que este par es conocido por otros pares y descubre otros pares"
 
-#: src/applications/topology_default/topology.c:447
+#: src/applications/topology_default/topology.c:448
 msgid "maintains GNUnet default mesh topology"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:123
-#: src/applications/pingpong/pingpong.c:191
-#: src/applications/pingpong/pingpong.c:244
-#: src/applications/pingpong/pingpong.c:314
+#: src/applications/pingpong/pingpong.c:128
+#: src/applications/pingpong/pingpong.c:199
+#: src/applications/pingpong/pingpong.c:264
+#: src/applications/pingpong/pingpong.c:335
 #, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/applications/pingpong/pingpong.c:135
+#: src/applications/pingpong/pingpong.c:140
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "Recibido ping de otro par. Omitiendo.\n"
 
-#: src/applications/pingpong/pingpong.c:201
+#: src/applications/pingpong/pingpong.c:210
 msgid "Received PING not destined for us!\n"
 msgstr "¡Recibido PING no destinado a nosotros!\n"
 
-#: src/applications/pingpong/pingpong.c:287
-#: src/applications/pingpong/pingpong.c:350
+#: src/applications/pingpong/pingpong.c:308
+#: src/applications/pingpong/pingpong.c:371
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:393
+#: src/applications/pingpong/pingpong.c:414
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:483
+#: src/applications/pingpong/pingpong.c:506
 msgid "# encrypted PONG messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/applications/pingpong/pingpong.c:485
+#: src/applications/pingpong/pingpong.c:508
 msgid "# plaintext PONG messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:487
+#: src/applications/pingpong/pingpong.c:510
 msgid "# encrypted PING messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:489
+#: src/applications/pingpong/pingpong.c:512
 msgid "# PING messages created"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:491
+#: src/applications/pingpong/pingpong.c:514
+#: src/applications/session/connect.c:931
 msgid "# encrypted PONG messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:495
+#: src/applications/pingpong/pingpong.c:518
+#: src/applications/session/connect.c:929
 msgid "# encrypted PING messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:505
+#: src/applications/pingpong/pingpong.c:520
+#, fuzzy
+msgid "# plaintext PONG messages sent"
+msgstr "# mensajes de texto mandados por PING"
+
+#: src/applications/pingpong/pingpong.c:522
+#, fuzzy
+msgid "# plaintext PONG transmissions failed"
+msgstr "# mensajes de texto mandados por PING"
+
+#: src/applications/pingpong/pingpong.c:532
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "'%s' registrando manejadores %d %d (texto plano e hipertexto)\n"
@@ -2202,7 +2260,7 @@
 msgid "sqlite datastore"
 msgstr "base de datos sqlite"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1369
+#: src/applications/sqstore_sqlite/sqlite.c:1370
 #: src/applications/sqstore_mysql/mysql.c:1352
 msgid "# bytes in datastore"
 msgstr "# bytes en la base de datos"
@@ -2212,40 +2270,45 @@
 msgid "# of connected peers"
 msgstr "# de pares conectados"
 
-#: src/applications/session/connect.c:257
-#: src/applications/session/connect.c:274
+#: src/applications/session/connect.c:261
+#: src/applications/session/connect.c:278
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
 
-#: src/applications/session/connect.c:315
+#: src/applications/session/connect.c:321
 #, fuzzy, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr "¡Imposible encriptar la clave de sesión, otro par desconocido!\n"
 
-#: src/applications/session/connect.c:572
+#: src/applications/session/connect.c:520
+#, fuzzy
+msgid "Could not create any HELLO for myself!\n"
+msgstr "¡Imposible crear la clave local!\n"
+
+#: src/applications/session/connect.c:621
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "El mensaje recibido del par es inválido.\n"
 
-#: src/applications/session/connect.c:590
+#: src/applications/session/connect.c:639
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr "El mensaje recibido del par es inválido.\n"
 
-#: src/applications/session/connect.c:622
+#: src/applications/session/connect.c:673
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/applications/session/connect.c:632
+#: src/applications/session/connect.c:683
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 "el cambio de clave '%s' de '%s' falló al comprobar el CRC (dio: %u, esperado "
 "%u).\n"
 
-#: src/applications/session/connect.c:701
+#: src/applications/session/connect.c:752
 #, fuzzy, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
@@ -2254,24 +2317,24 @@
 "Error pasando la clave de sesión encriptada, el mensaje dado del tamaño de "
 "las partes es inválido.\n"
 
-#: src/applications/session/connect.c:713
+#: src/applications/session/connect.c:764
 #, fuzzy, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr "Tipo desconocido en el mensaje embebido: %u (tamaño: %u)\n"
 
-#: src/applications/session/connect.c:866
+#: src/applications/session/connect.c:921
 msgid "# session keys sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/applications/session/connect.c:868
+#: src/applications/session/connect.c:923
 msgid "# session keys rejected"
 msgstr "# claves de la sesión rechazadas"
 
-#: src/applications/session/connect.c:870
+#: src/applications/session/connect.c:925
 msgid "# session keys accepted"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/applications/session/connect.c:872
+#: src/applications/session/connect.c:927
 msgid "# sessions established"
 msgstr "# sesiones establecidas"
 
@@ -2430,21 +2493,25 @@
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/applications/identity/identity.c:687
-#: src/applications/identity/identity.c:707
-#, c-format
-msgid "Removed file `%s' containing invalid hello data.\n"
+#: src/applications/identity/identity.c:730
+#: src/applications/identity/identity.c:758
+#, fuzzy, c-format
+msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr "Borrando el fichero '%s' que contiene datos de saludo no válidos.\n"
 
-#: src/applications/identity/identity.c:760
+#: src/applications/identity/identity.c:812
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr "La verificación de la firma falló: el par '%s' no es conocido.\n"
 
-#: src/applications/identity/identity.c:769
+#: src/applications/identity/identity.c:822
 msgid "Signature failed verification: signature invalid.\n"
 msgstr "Falló la verificación de la firma: firma no válida.\n"
 
+#: src/applications/identity/identity.c:1278
+msgid "invalid"
+msgstr ""
+
 #: src/applications/testbed/commands.c:1130
 #: src/applications/stats/gnunet-stats.c:65
 #, c-format
@@ -2652,47 +2719,53 @@
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:190
+#: src/applications/transport/transport.c:188
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:283
+#: src/applications/transport/transport.c:240
 #, c-format
+msgid ""
+"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:301
+#, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:372
+#: src/applications/transport/transport.c:389
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:429
+#: src/applications/transport/transport.c:446
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:630
+#: src/applications/transport/transport.c:647
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/applications/transport/transport.c:650
+#: src/applications/transport/transport.c:667
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/applications/transport/transport.c:660
+#: src/applications/transport/transport.c:677
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 "La biblioteca de transporte '%s' no provee la función '%s%s' requerida.\n"
 
-#: src/applications/transport/transport.c:687
+#: src/applications/transport/transport.c:704
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/applications/transport/transport.c:700
+#: src/applications/transport/transport.c:717
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
@@ -2765,12 +2838,12 @@
 msgid "# bytes of noise received"
 msgstr "# bytes de ruido recibidos"
 
-#: src/applications/stats/statistics.c:384
+#: src/applications/stats/statistics.c:398
 #, fuzzy, c-format
 msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/stats/statistics.c:405
+#: src/applications/stats/statistics.c:419
 msgid "keeps statistics about gnunetd's operation"
 msgstr ""
 
@@ -2963,25 +3036,21 @@
 "No se recibió el mensaje de gnunetd. ¿Está gnunetd ejecutandose?\n"
 
 #: src/applications/tbench/tbenchtest.c:53
-#: src/applications/tbench/tbenchtest_udp.c:55
 #, c-format
 msgid "Using %u messages of size %u for %u times.\n"
 msgstr "Usando %u mensajes de un tamaño de %u durante %u veces.\n"
 
 #: src/applications/tbench/tbenchtest.c:80
-#: src/applications/tbench/tbenchtest_udp.c:82
 #, c-format
 msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:85
-#: src/applications/tbench/tbenchtest_udp.c:87
 #, c-format
 msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:91
-#: src/applications/tbench/tbenchtest_udp.c:93
 #, c-format
 msgid ""
 "\n"
@@ -2991,7 +3060,6 @@
 "Fallo al recibir la respuesta de gnunetd.\n"
 
 #: src/applications/tbench/tbenchtest.c:148
-#: src/applications/tbench/tbenchtest_udp.c:152
 #, c-format
 msgid "Running benchmark...\n"
 msgstr ""
@@ -3067,28 +3135,28 @@
 msgid "allows mapping of the network topology"
 msgstr ""
 
-#: src/applications/gap/gap.c:1707
+#: src/applications/gap/gap.c:1705
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/applications/gap/gap.c:1708
+#: src/applications/gap/gap.c:1706
 msgid "myself"
 msgstr "yo"
 
-#: src/applications/gap/gap.c:1884
+#: src/applications/gap/gap.c:1882
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 "Solicitada la cobertura de tráfico pero el servicio de tráfico no ha sido "
 "cargado. Rechazando la petición.\n"
 
-#: src/applications/gap/gap.c:1896 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1894 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/applications/gap/gap.c:1903 src/applications/gap/gap.c:1909
-#: src/applications/gap/gap.c:1916
+#: src/applications/gap/gap.c:1901 src/applications/gap/gap.c:1907
+#: src/applications/gap/gap.c:1914
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 "Imposible satisfacer el nivel deseado de anonimato, ignorando la petición.\n"
@@ -3146,7 +3214,7 @@
 msgstr ""
 
 #: src/applications/gap/gap.c:2215
-msgid "# gap spurious replies"
+msgid "# gap spurious replies (dropped)"
 msgstr ""
 
 #: src/applications/gap/gap.c:2216
@@ -3724,6 +3792,14 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s' falló.  ¿Es '%s' un fichero?\n"
 
+#: src/applications/fs/module/querymanager.c:227
+msgid "# FS currently tracked queries from clients"
+msgstr ""
+
+#: src/applications/fs/module/querymanager.c:229
+msgid "# FS replies passed to clients"
+msgstr ""
+
 #: src/applications/fs/module/ondemand.c:336
 #, fuzzy, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
@@ -3761,7 +3837,7 @@
 msgstr ""
 "Bloque ODB '%s' desindexado del offset %llu perdido de la base de datos.\n"
 
-#: src/applications/fs/module/fs.c:1146
+#: src/applications/fs/module/fs.c:1167
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -3770,12 +3846,21 @@
 "Debes especificar un número positivo para '%s' en la configuración en la "
 "sección '%s'.\n"
 
-#: src/applications/fs/module/fs.c:1188
+#: src/applications/fs/module/fs.c:1180
+msgid "# FS expired replies dropped"
+msgstr ""
+
+#: src/applications/fs/module/fs.c:1182
+#, fuzzy
+msgid "# FS valid replies received"
+msgstr "# bytes recibidos por TCP"
+
+#: src/applications/fs/module/fs.c:1219
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/module/fs.c:1228
+#: src/applications/fs/module/fs.c:1259
 msgid "enables (anonymous) file-sharing"
 msgstr "activa la compartición de ficheros anónima"
 
@@ -3837,12 +3922,12 @@
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "Imposible desenlazar temporalmente el fichero '%s': %s\n"
 
-#: src/applications/fs/ecrs/download.c:269
+#: src/applications/fs/ecrs/download.c:270
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Escribiendo(%d, %p, %d) se produjo un fallo: %s\n"
 
-#: src/applications/fs/ecrs/download.c:1042
+#: src/applications/fs/ecrs/download.c:1043
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -3850,7 +3935,7 @@
 "El contenido desencriptado no encuentra una clave. Esto puede ser un bug o "
 "un fichero introducido maliciosamente. Descarga abortada.\n"
 
-#: src/applications/fs/ecrs/download.c:1228
+#: src/applications/fs/ecrs/download.c:1229
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -3914,21 +3999,21 @@
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Imposible crear el pseudónimo '%s', el fichero '%s' ya existe.\n"
 
-#: src/applications/fs/ecrs/namespace.c:339
-#: src/applications/fs/ecrs/namespace.c:421
-#: src/applications/fs/ecrs/namespace.c:578
+#: src/applications/fs/ecrs/namespace.c:342
+#: src/applications/fs/ecrs/namespace.c:425
+#: src/applications/fs/ecrs/namespace.c:584
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/applications/fs/ecrs/namespace.c:351
-#: src/applications/fs/ecrs/namespace.c:432
+#: src/applications/fs/ecrs/namespace.c:354
+#: src/applications/fs/ecrs/namespace.c:436
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
-#: src/applications/fs/ecrs/namespace.c:592
-#: src/applications/fs/ecrs/namespace.c:603
+#: src/applications/fs/ecrs/namespace.c:598
+#: src/applications/fs/ecrs/namespace.c:609
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
@@ -3950,16 +4035,16 @@
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Recolección de identificadores de fichero desactivada.\n"
 
-#: src/applications/fs/uritrack/file_info.c:373
+#: src/applications/fs/uritrack/file_info.c:374
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr "Borrada base de datos de URIs corrupta en '%s'."
 
-#: src/applications/fs/namespace/namespace_info.c:656
+#: src/applications/fs/namespace/namespace_info.c:730
 msgid "Publication interval for periodic publication changed."
 msgstr "Intervalo de publicación periódica cambiado."
 
-#: src/applications/fs/namespace/namespace_info.c:677
+#: src/applications/fs/namespace/namespace_info.c:751
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -3994,35 +4079,46 @@
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:100
+#: src/applications/bootstrap_http/http.c:105
 #, fuzzy, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
-#: src/applications/bootstrap_http/http.c:173
+#: src/applications/bootstrap_http/http.c:176
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:229
+#: src/applications/bootstrap_http/http.c:211
 #, c-format
+msgid "Bootstrapping using `%s'.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:237
+#, c-format
 msgid "Trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:408
-msgid "# hellos downloaded via http"
+#: src/applications/bootstrap_http/http.c:388
+#, fuzzy, c-format
+msgid "Downloaded %llu bytes from `%s'.\n"
+msgstr "Descarga los ficheros de GNUnet"
+
+#: src/applications/bootstrap_http/http.c:421
+#, fuzzy
+msgid "# HELLOs downloaded via http"
 msgstr "# saludos descargados vía HTTP"
 
-#: src/applications/traffic/traffic.c:445
+#: src/applications/traffic/traffic.c:450
 #, c-format
 msgid "# bytes transmitted of type %d"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:465
+#: src/applications/traffic/traffic.c:470
 #, c-format
 msgid "# bytes received of type %d"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:610
+#: src/applications/traffic/traffic.c:624
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -4303,7 +4399,7 @@
 msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:382
+#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:389
 msgid "run as user LOGIN"
 msgstr "ejecuta como el usuario LOGIN"
 
@@ -4311,88 +4407,88 @@
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
-#: src/server/connection.c:1142
+#: src/server/connection.c:1133
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/server/connection.c:1151
+#: src/server/connection.c:1142
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Detalles del mensaje: %u: longitud %d, prioridad: %d\n"
 
-#: src/server/connection.c:2631
+#: src/server/connection.c:2675
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Mensaje de '%s' descartado: formato inválido.\n"
 
-#: src/server/connection.c:2709
+#: src/server/connection.c:2755
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Secuencia de números no válida %u <= %u, omitiendo mensaje.\n"
 
-#: src/server/connection.c:2726
+#: src/server/connection.c:2772
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "Mensajes recibidos de mas de un día de antigüedad. Omitidos.\n"
 
-#: src/server/connection.c:3167
+#: src/server/connection.c:3219
 msgid "# outgoing messages dropped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/server/connection.c:3171
+#: src/server/connection.c:3223
 msgid "# bytes of outgoing messages dropped"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/server/connection.c:3173
+#: src/server/connection.c:3225
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3176
+#: src/server/connection.c:3228
 msgid "# bytes encrypted"
 msgstr "# bytes encriptados"
 
-#: src/server/connection.c:3180
+#: src/server/connection.c:3232
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:3184
+#: src/server/connection.c:3236
 #, fuzzy
 msgid "# bytes received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/server/connection.c:3187
+#: src/server/connection.c:3239
 msgid "# bytes decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:3189
+#: src/server/connection.c:3241
 msgid "# bytes noise sent"
 msgstr "# \"bytes-ruido\" mandados"
 
-#: src/server/connection.c:3191
+#: src/server/connection.c:3243
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3193
+#: src/server/connection.c:3245
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "# bytes de ruido recibidos"
 
-#: src/server/connection.c:3195
+#: src/server/connection.c:3247
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "número de mensajes en un bloque de mensajes"
 
-#: src/server/connection.c:3197
+#: src/server/connection.c:3249
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3199
+#: src/server/connection.c:3251
 #, fuzzy
 msgid "# total number of bytes we were allowed to sent"
 msgstr "número de mensajes en un bloque de mensajes"
 
-#: src/server/connection.c:3201
+#: src/server/connection.c:3253
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
@@ -4456,7 +4552,7 @@
 msgid "specify username as which gnunetd should run"
 msgstr "especifica el host en el que gnunetd esta ejecutandose"
 
-#: src/server/gnunetd.c:270
+#: src/server/gnunetd.c:288
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -4540,7 +4636,7 @@
 msgid " Transport %d is not being tested\n"
 msgstr " El transporte %d no esta siendo probado\n"
 
-#: src/server/gnunet-transport-check.c:250
+#: src/server/gnunet-transport-check.c:253
 #, c-format
 msgid ""
 "\n"
@@ -4549,62 +4645,68 @@
 "\n"
 "Contactando '%s'."
 
-#: src/server/gnunet-transport-check.c:276
+#: src/server/gnunet-transport-check.c:279
 #, c-format
 msgid " Connection failed\n"
 msgstr "Conexión fallida\n"
 
-#: src/server/gnunet-transport-check.c:282
+#: src/server/gnunet-transport-check.c:285
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr "Conexión fallida (¿bug?)\n"
 
-#: src/server/gnunet-transport-check.c:335
+#: src/server/gnunet-transport-check.c:338
 #, c-format
-msgid "No reply received within %llums.\n"
-msgstr "No se ha recibido una respuesta en %llums.\n"
+msgid "Timeout after %llums.\n"
+msgstr ""
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:342
+#, fuzzy, c-format
+msgid "OK!\n"
+msgstr "OK"
+
+#: src/server/gnunet-transport-check.c:370
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:367
+#: src/server/gnunet-transport-check.c:374
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:370
+#: src/server/gnunet-transport-check.c:377
 msgid "send COUNT messages"
 msgstr "envia COUNT mensajes"
 
-#: src/server/gnunet-transport-check.c:373
+#: src/server/gnunet-transport-check.c:380
 msgid "send messages with SIZE bytes payload"
 msgstr "manda mensajes con SIZE bytes payload"
 
-#: src/server/gnunet-transport-check.c:376
+#: src/server/gnunet-transport-check.c:383
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:379
+#: src/server/gnunet-transport-check.c:386
 msgid "specifies after how many MS to time-out"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:387
+#: src/server/gnunet-transport-check.c:394
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:451
+#: src/server/gnunet-transport-check.c:459
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/server/gnunet-transport-check.c:454
+#: src/server/gnunet-transport-check.c:462
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/server/gnunet-transport-check.c:514
+#: src/server/gnunet-transport-check.c:527
 #, c-format
 msgid ""
+"\n"
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
@@ -4619,19 +4721,19 @@
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/server/tcpserver.c:396
+#: src/server/tcpserver.c:397
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:448
+#: src/server/tcpserver.c:449
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%s falló, el mensaje del tipo %d ya está en uso.\n"
 
-#: src/server/handler.c:379
+#: src/server/handler.c:380
 #, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
@@ -4663,6 +4765,11 @@
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
+#: src/util/boot/startup.c:212
+#, fuzzy, c-format
+msgid "Failed to run %s: %s %d\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
 #: src/util/network_client/tcpio.c:94 src/util/network_client/tcpio.c:135
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
@@ -4693,12 +4800,12 @@
 msgid "`%s' failed, reply invalid!\n"
 msgstr "¡'%s' falló, respuesta no válida!\n"
 
-#: src/util/crypto/hostkey_gcrypt.c:1031
+#: src/util/crypto/hostkey_gcrypt.c:1036
 #, c-format
 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/crypto/locking_gcrypt.c:67
+#: src/util/crypto/locking_gcrypt.c:74
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
@@ -4767,12 +4874,12 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Respuesta inválida a '%s'.\n"
 
-#: src/util/network/select.c:296
+#: src/util/network/select.c:306
 #, fuzzy
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
 
-#: src/util/network/select.c:454
+#: src/util/network/select.c:472
 msgid "select listen socket not valid!\n"
 msgstr ""
 
@@ -5096,21 +5203,21 @@
 msgid "Tool to setup GNUnet."
 msgstr "Herramienta de configuración de GNUnet."
 
-#: src/setup/gnunet-setup.c:187
+#: src/setup/gnunet-setup.c:188
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Argumentos en la linea de comandos inválidos.\n"
 
-#: src/setup/gnunet-setup.c:192
+#: src/setup/gnunet-setup.c:193
 msgid "No interface specified, using default\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/setup/gnunet-setup.c:267
+#: src/setup/gnunet-setup.c:268
 #, c-format
 msgid "`%s' is not available."
 msgstr "'%s' no esta disponible."
 
-#: src/setup/gnunet-setup.c:283
+#: src/setup/gnunet-setup.c:284
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Operación desconocida '%s'\n"
@@ -5825,6 +5932,30 @@
 msgid "Unknown error while creating a new user"
 msgstr "Error desconocido mientras se creaba un nuevo usuario"
 
+#, fuzzy
+#~ msgid "# bytes received via TCP-OLD"
+#~ msgstr "# bytes recibidos por TCP"
+
+#, fuzzy
+#~ msgid "# bytes sent via TCP-OLD"
+#~ msgstr "# bytes enviados por TCP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by TCP-OLD (outgoing)"
+#~ msgstr "# bytes omitidos por TCP (salientes)"
+
+#~ msgid "hello advertisement for protocol %d received.\n"
+#~ msgstr "Inicio de comunicación del protocolo %d recibido.\n"
+
+#~ msgid "`%s' failed (%d, %u). Will not send PING.\n"
+#~ msgstr "'%s' falló (%d, %u). No se mandará el PING.\n"
+
+#~ msgid "Removing hello from peer `%s' (expired %ds ago).\n"
+#~ msgstr "Eliminando saludo del par '%s' (expiró hace %ds).\n"
+
+#~ msgid "No reply received within %llums.\n"
+#~ msgstr "No se ha recibido una respuesta en %llums.\n"
+
 #~ msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 #~ msgstr "Esperando a gnunetd para empezar (%u ciclos restantes)...\n"
 
@@ -6105,9 +6236,6 @@
 #~ "El fichero de configuración debe especificar un directorio para que "
 #~ "GNUnet almacene la información por-par bajo%s%s\n"
 
-#~ msgid "Could not create hostkey!\n"
-#~ msgstr "¡Imposible crear la clave local!\n"
-
 #~ msgid "%s `%s' returned no known hosts!\n"
 #~ msgstr "¡%s '%s' devolvió hosts desconocidos!\n"
 
@@ -6330,9 +6458,6 @@
 #~ msgid "%s: symbol value `%s' invalid for %s\n"
 #~ msgstr "%s: valor del símbolo '%s' no válido para %s\n"
 
-#~ msgid "OK"
-#~ msgstr "OK"
-
 #~ msgid "Gtk GNUnet Configurator"
 #~ msgstr "Configurador Gtk de GNUnet"
 

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2007-06-09 08:10:48 UTC (rev 4986)
+++ GNUnet/po/rw.po     2007-06-09 08:20:05 UTC (rev 4987)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-27 22:50-0600\n"
+"POT-Creation-Date: 2007-06-09 01:06-0600\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <address@hidden>\n"
 "Language-Team: Kinyarwanda <address@hidden>\n"
@@ -227,12 +227,23 @@
 "Windows, this setting affects the creation of a new system service only."
 msgstr ""
 
-#: contrib/config-daemon.scm:320
-msgid "Which transport mechanisms should GNUnet use?"
+#: contrib/config-daemon.scm:321
+msgid "Should gnunetd be automatically started when the system boots?"
 msgstr ""
 
 #: contrib/config-daemon.scm:322
 msgid ""
+"Set to YES if gnunetd should be automatically started on boot.  If this "
+"option is set, gnunet-setup will install a script to start the daemon upon "
+"completion.  This option may not work on all systems."
+msgstr ""
+
+#: contrib/config-daemon.scm:334
+msgid "Which transport mechanisms should GNUnet use?"
+msgstr ""
+
+#: contrib/config-daemon.scm:336
+msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
 "available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
 "\t\t\n"
@@ -245,11 +256,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:350
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:338
+#: contrib/config-daemon.scm:352
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -286,15 +297,15 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:367
+#: contrib/config-daemon.scm:381
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:379
+#: contrib/config-daemon.scm:393
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:380
+#: contrib/config-daemon.scm:394
 msgid ""
 "The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
 "peer to peers of which the hostkey has been copied by hand to data/hosts;  "
@@ -306,16 +317,16 @@
 "lines above would need some minor editing :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:391
+#: contrib/config-daemon.scm:405
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:403
+#: contrib/config-daemon.scm:417
 #, fuzzy
 msgid "Disable automatic establishment of connections"
 msgstr "Byikoresha"
 
-#: contrib/config-daemon.scm:404
+#: contrib/config-daemon.scm:418
 msgid ""
 "If this option is enabled, GNUnet will not automatically establish "
 "connections to other peers, but instead wait for applications to "
@@ -323,15 +334,21 @@
 "connect to us)."
 msgstr ""
 
-#: contrib/config-daemon.scm:415
+#: contrib/config-daemon.scm:429
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:427
+#: contrib/config-daemon.scm:430
+msgid ""
+"This option maybe useful during testing, but turning it off is dangerous! If "
+"in any doubt, set it to YES (which is the default)."
+msgstr ""
+
+#: contrib/config-daemon.scm:441
 msgid "Client/Server Port"
 msgstr ""
 
-#: contrib/config-daemon.scm:428
+#: contrib/config-daemon.scm:442
 msgid ""
 "Which is the client-server port that is used between gnunetd and the clients "
 "(TCP only).  You may firewall this port for non-local machines (but you do "
@@ -339,11 +356,11 @@
 "connections from machines that are listed under TRUSTED)."
 msgstr ""
 
-#: contrib/config-daemon.scm:439
+#: contrib/config-daemon.scm:453
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:440
+#: contrib/config-daemon.scm:454
 msgid ""
 "This option specifies which hosts are trusted enough to connect as clients "
 "(to the TCP port).  This is useful if you run gnunetd on one host of your "
@@ -354,73 +371,73 @@
 "separated by a semicolon, spaces are not allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:452
+#: contrib/config-daemon.scm:466
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:453
+#: contrib/config-daemon.scm:467
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If it is set, "
 "only the specified peers are allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:464
+#: contrib/config-daemon.scm:478
 #, fuzzy
 msgid "Run gnunetd as this user."
 msgstr "Sitatisitiki"
 
-#: contrib/config-daemon.scm:465
+#: contrib/config-daemon.scm:479
 msgid ""
 "When started as root, gnunetd will change permissions to the given user."
 msgstr ""
 
-#: contrib/config-daemon.scm:476
+#: contrib/config-daemon.scm:490
 #, fuzzy
 msgid "Run gnunetd as this group."
 msgstr "ni OYA"
 
-#: contrib/config-daemon.scm:477
+#: contrib/config-daemon.scm:491
 msgid ""
 "When started as root, gnunetd will change permissions to the given group."
 msgstr ""
 
-#: contrib/config-daemon.scm:488
+#: contrib/config-daemon.scm:502
 msgid "Run gnunetd during system startup?"
 msgstr ""
 
-#: contrib/config-daemon.scm:501
+#: contrib/config-daemon.scm:515
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:502
+#: contrib/config-daemon.scm:516
 msgid "If this option is not set, any peer is allowed to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:513
+#: contrib/config-daemon.scm:527
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:533
+#: contrib/config-daemon.scm:547
 msgid "General settings"
 msgstr ""
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:548
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:561
+#: contrib/config-daemon.scm:576
 msgid "Path settings"
 msgstr ""
 
-#: contrib/config-daemon.scm:562
+#: contrib/config-daemon.scm:577
 msgid "Prefixes for paths used by GNUnet"
 msgstr ""
 
-#: contrib/config-daemon.scm:578
+#: contrib/config-daemon.scm:593
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:580
+#: contrib/config-daemon.scm:595
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -429,11 +446,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:593
+#: contrib/config-daemon.scm:608
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:595
+#: contrib/config-daemon.scm:610
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -446,42 +463,42 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:610
+#: contrib/config-daemon.scm:625
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:626
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:628
+#: contrib/config-daemon.scm:643
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:629
+#: contrib/config-daemon.scm:644
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:643
+#: contrib/config-daemon.scm:658
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:655
+#: contrib/config-daemon.scm:670
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:667
+#: contrib/config-daemon.scm:682
 msgid "Configuration of the MySQL database"
 msgstr ""
 
-#: contrib/config-daemon.scm:686
+#: contrib/config-daemon.scm:701
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:688
+#: contrib/config-daemon.scm:703
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -492,19 +509,19 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:702
+#: contrib/config-daemon.scm:717
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:714
+#: contrib/config-daemon.scm:729
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:727
+#: contrib/config-daemon.scm:742
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:729
+#: contrib/config-daemon.scm:744
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -516,13 +533,13 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:743
+#: contrib/config-daemon.scm:758
 msgid ""
 "MB of diskspace GNUnet can use for caching DHT index data (the data will be "
 "stored in /tmp)"
 msgstr ""
 
-#: contrib/config-daemon.scm:744
+#: contrib/config-daemon.scm:759
 msgid ""
 "DHT index data is inherently small and expires comparatively quickly.  It is "
 "deleted whenever gnunetd is shut down.\n"
@@ -530,20 +547,20 @@
 "The size of the DSTORE QUOTA is specified in MB."
 msgstr ""
 
-#: contrib/config-daemon.scm:758
+#: contrib/config-daemon.scm:773
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:777
+#: contrib/config-daemon.scm:792
 #, fuzzy
 msgid "Applications"
 msgstr "ibirindiro"
 
-#: contrib/config-daemon.scm:793
+#: contrib/config-daemon.scm:808
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:794
+#: contrib/config-daemon.scm:809
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port and that cannot be traversed using UPnP.  Note "
@@ -556,15 +573,15 @@
 "connections.  Use YES only if you get no connections otherwise."
 msgstr ""
 
-#: contrib/config-daemon.scm:805
+#: contrib/config-daemon.scm:820
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:817 contrib/config-daemon.scm:910
+#: contrib/config-daemon.scm:832 contrib/config-daemon.scm:925
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:818
+#: contrib/config-daemon.scm:833
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP.  You should disable this option if you are sure that you are "
@@ -572,34 +589,34 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:829 contrib/config-daemon.scm:934
-#: contrib/config-daemon.scm:989 contrib/config-daemon.scm:1054
+#: contrib/config-daemon.scm:844 contrib/config-daemon.scm:949
+#: contrib/config-daemon.scm:1004 contrib/config-daemon.scm:1069
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:841 contrib/config-daemon.scm:946
+#: contrib/config-daemon.scm:856
 msgid ""
-"Which IPs are allowed to connect? Leave empty to allow connections from any "
-"IP."
+"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
+"network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:853
+#: contrib/config-daemon.scm:868
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:871
+#: contrib/config-daemon.scm:886
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:883
+#: contrib/config-daemon.scm:898
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:898
+#: contrib/config-daemon.scm:913
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:926
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP. You should disable this option if you are sure that you are "
@@ -607,68 +624,74 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:922
+#: contrib/config-daemon.scm:937
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:958
+#: contrib/config-daemon.scm:961
+msgid ""
+"Which IPs are allowed to connect? Leave empty to allow connections from any "
+"IP."
+msgstr ""
+
+#: contrib/config-daemon.scm:973
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:977
+#: contrib/config-daemon.scm:992
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1001 contrib/config-daemon.scm:1066
+#: contrib/config-daemon.scm:1016 contrib/config-daemon.scm:1081
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow any IP to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:1013
+#: contrib/config-daemon.scm:1028
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1030
+#: contrib/config-daemon.scm:1045
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1042
+#: contrib/config-daemon.scm:1057
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1078
+#: contrib/config-daemon.scm:1093
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1096
+#: contrib/config-daemon.scm:1111
 msgid "Network interface"
 msgstr ""
 
-#: contrib/config-daemon.scm:1108
+#: contrib/config-daemon.scm:1123
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1120
+#: contrib/config-daemon.scm:1135
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1132
+#: contrib/config-daemon.scm:1147
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1155
+#: contrib/config-daemon.scm:1170
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1167
+#: contrib/config-daemon.scm:1182
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1179
+#: contrib/config-daemon.scm:1194
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1181
+#: contrib/config-daemon.scm:1196
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -678,11 +701,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1192
+#: contrib/config-daemon.scm:1207
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1194
+#: contrib/config-daemon.scm:1209
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -692,36 +715,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1205
+#: contrib/config-daemon.scm:1220
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1206
+#: contrib/config-daemon.scm:1221
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1217
+#: contrib/config-daemon.scm:1232
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1218
+#: contrib/config-daemon.scm:1233
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1229
+#: contrib/config-daemon.scm:1244
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1241
+#: contrib/config-daemon.scm:1256
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1243
+#: contrib/config-daemon.scm:1258
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -766,11 +789,11 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1260
+#: contrib/config-daemon.scm:1275
 msgid "Network interface to monitor"
 msgstr ""
 
-#: contrib/config-daemon.scm:1261
+#: contrib/config-daemon.scm:1276
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -781,11 +804,11 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1272
+#: contrib/config-daemon.scm:1287
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1297 contrib/config-client.scm:365
+#: contrib/config-daemon.scm:1312 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -888,19 +911,32 @@
 msgstr ""
 
 #: contrib/config-client.scm:322
+msgid "Do not show search results for files that were uploaded by us"
+msgstr ""
+
+#: contrib/config-client.scm:323
+msgid ""
+"This option is useful to eliminate files that the user already has from the "
+"search.  Naturally, enabling this option maybe confusing because some "
+"obviously expected search results would no longer show up.  This option only "
+"works if the URI_DB_SIZE option under FS is not zero (since the URI DB is "
+"used to determine which files the user is sharing)"
+msgstr ""
+
+#: contrib/config-client.scm:335
 msgid "To which directory should gnunet-gtk save downloads to?"
 msgstr ""
 
-#: contrib/config-client.scm:334
+#: contrib/config-client.scm:347
 msgid "Options related to gnunet-gtk"
 msgstr ""
 
-#: contrib/config-client.scm:353
+#: contrib/config-client.scm:367
 #, fuzzy
 msgid "Full pathname of GNUnet client HOME directory"
 msgstr "Tangaza Nka i Izina: Bya i IDOSIYE Cyangwa bushyinguro"
 
-#: contrib/config-client.scm:354
+#: contrib/config-client.scm:368
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
@@ -1559,7 +1595,7 @@
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp6.c:521 src/transports/udp.c:535
+#: src/transports/udp6.c:544 src/transports/udp.c:575
 #, fuzzy, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr "kugirango ni Byo hasi OYA"
@@ -1569,38 +1605,38 @@
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/http.c:753 src/transports/http.c:826
-#: src/transports/http.c:950 src/transports/http.c:1035
+#: src/transports/http.c:754 src/transports/http.c:827
+#: src/transports/http.c:951 src/transports/http.c:1036
 #: src/transports/upnp/upnp.c:335 src/transports/upnp/upnp.c:560
-#: src/applications/bootstrap_http/http.c:121
-#: src/applications/bootstrap_http/http.c:261
-#: src/applications/bootstrap_http/http.c:282
-#: src/applications/bootstrap_http/http.c:316
-#: src/applications/bootstrap_http/http.c:334
-#: src/applications/bootstrap_http/http.c:348
-#: src/applications/bootstrap_http/http.c:360
-#: src/applications/bootstrap_http/http.c:372
+#: src/applications/bootstrap_http/http.c:124
+#: src/applications/bootstrap_http/http.c:269
+#: src/applications/bootstrap_http/http.c:290
+#: src/applications/bootstrap_http/http.c:324
+#: src/applications/bootstrap_http/http.c:342
+#: src/applications/bootstrap_http/http.c:356
+#: src/applications/bootstrap_http/http.c:368
+#: src/applications/bootstrap_http/http.c:380
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/transports/http.c:1225
+#: src/transports/http.c:1248
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:1233
+#: src/transports/http.c:1256
 #, fuzzy
 msgid "# bytes received via HTTP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/http.c:1235
+#: src/transports/http.c:1258
 #, fuzzy
 msgid "# bytes sent via HTTP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/http.c:1237
+#: src/transports/http.c:1260
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
@@ -1626,17 +1662,17 @@
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "Muyunguruzi... Ikurikiranyanyuguti Kuri Kuri"
 
-#: src/transports/smtp.c:546
+#: src/transports/smtp.c:547
 #, fuzzy, c-format
 msgid "Failed to initialize libesmtp: %s.\n"
 msgstr "Kuri gutangiza Serivisi"
 
-#: src/transports/smtp.c:610
+#: src/transports/smtp.c:611
 #, fuzzy, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "E Ubutumwa Kuri Byanze"
 
-#: src/transports/smtp.c:678
+#: src/transports/smtp.c:679
 #, fuzzy, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
@@ -1649,17 +1685,17 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/smtp.c:706
+#: src/transports/smtp.c:707
 #, fuzzy, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr "kugirango ni Byo hasi OYA"
 
-#: src/transports/tcp.c:271
+#: src/transports/tcp.c:274
 #, fuzzy
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/tcp.c:357
+#: src/transports/tcp.c:358
 #, fuzzy, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
@@ -1679,37 +1715,37 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/tcp.c:424 src/transports/tcp6.c:379
+#: src/transports/tcp.c:425 src/transports/tcp6.c:382
 #, fuzzy, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
 
-#: src/transports/tcp.c:569
+#: src/transports/tcp.c:592
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:577
+#: src/transports/tcp.c:600
 #, fuzzy
 msgid "# bytes received via TCP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/tcp.c:579
+#: src/transports/tcp.c:602
 #, fuzzy
 msgid "# bytes sent via TCP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/tcp.c:581
+#: src/transports/tcp.c:604
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:276
+#: src/transports/udp.c:293
 #, fuzzy
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp.c:367
+#: src/transports/udp.c:382
 #, fuzzy, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
@@ -1729,41 +1765,41 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/udp.c:553
+#: src/transports/udp.c:593
 #, fuzzy
 msgid "# bytes received via UDP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/udp.c:555
+#: src/transports/udp.c:595
 #, fuzzy
 msgid "# bytes sent via UDP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/udp.c:557
+#: src/transports/udp.c:597
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
-#: src/transports/tcp6.c:223
+#: src/transports/tcp6.c:226
 #, fuzzy
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/tcp6.c:265
+#: src/transports/tcp6.c:268
 #, fuzzy, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "'%s':Kitazwi Serivisi"
 
-#: src/transports/tcp6.c:519
+#: src/transports/tcp6.c:547
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/tcp6.c:521
+#: src/transports/tcp6.c:549
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/tcp6.c:523
+#: src/transports/tcp6.c:551
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr ""
 
@@ -1777,25 +1813,12 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/tcp_old.c:1299
-#, fuzzy
-msgid "# bytes received via TCP-OLD"
-msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-
-#: src/transports/tcp_old.c:1301
-msgid "# bytes sent via TCP-OLD"
-msgstr ""
-
-#: src/transports/tcp_old.c:1303
-msgid "# bytes dropped by TCP-OLD (outgoing)"
-msgstr ""
-
 #: src/transports/tcp_helper.c:193
 #, fuzzy
 msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/transports/tcp_helper.c:204
+#: src/transports/tcp_helper.c:205
 #, fuzzy
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr "Ubutumwa Bivuye Ukwihuza"
@@ -1866,12 +1889,12 @@
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "'%s'Byanze."
 
-#: src/applications/dht/module/cs.c:230
+#: src/applications/dht/module/cs.c:240
 #, c-format
 msgid "`%s' registering client handlers: %d %d\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:249
+#: src/applications/dht/module/cs.c:259
 msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
@@ -1959,7 +1982,7 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:126
 #: src/applications/testbed/gnunet-testbed.c:547 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:286
+#: src/setup/gnunet-setup.c:287
 #, fuzzy, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
@@ -1984,146 +2007,181 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "OYA Kohereza Ubutumwa Kuri"
 
-#: src/applications/advertising/advertising.c:168
+#: src/applications/advertising/advertising.c:188
 #, fuzzy, c-format
-msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 msgstr "Ubutumwa Bivuye Sibyo Isinya Sibyo"
 
-#: src/applications/advertising/advertising.c:175
+#: src/applications/advertising/advertising.c:196
 #, fuzzy
-msgid ""
-"hello message received invalid (expiration time over limit). Dropping.\n"
+msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr "Ubutumwa BYAKIRIWE Sibyo Igihe KURI"
 
-#: src/applications/advertising/advertising.c:182
-#, c-format
-msgid "hello transport verification failed (%u).\n"
-msgstr ""
-
-#: src/applications/advertising/advertising.c:192
-#, fuzzy, c-format
-msgid "hello advertisement for protocol %d received.\n"
-msgstr "kugirango Porotokole BYAKIRIWE"
-
-#: src/applications/advertising/advertising.c:327
+#: src/applications/advertising/advertising.c:367
 #, fuzzy
-msgid "Could not send hellos+PING, ping buffer full.\n"
+msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr "OYA Kohereza"
 
-#: src/applications/advertising/advertising.c:341
-#, c-format
-msgid "`%s' failed (%d, %u). Will not send PING.\n"
+#: src/applications/advertising/advertising.c:385
+msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:504
+#: src/applications/advertising/advertising.c:549
 #, fuzzy, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Kuri Byahiswemo"
 
-#: src/applications/advertising/advertising.c:511
+#: src/applications/advertising/advertising.c:557
 #, fuzzy
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr "Oya Ikindi Kuri RW"
 
-#: src/applications/advertising/advertising.c:613
-#, fuzzy, c-format
-msgid "Removing hello from peer `%s' (expired %ds ago).\n"
-msgstr "Bivuye Byarengeje igihe"
-
-#: src/applications/advertising/advertising.c:794
+#: src/applications/advertising/advertising.c:832
 #, fuzzy
 msgid "# Peer advertisements received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:795
+#: src/applications/advertising/advertising.c:833
+#, fuzzy
+msgid "# Peer advertisements of type NAT received"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:834
+#, fuzzy
+msgid "# Peer advertisements confirmed via PONG"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:835
+#, fuzzy
+msgid "# Peer advertisements updating earlier HELLOs"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:836
+#, fuzzy
+msgid "# Peer advertisements discarded due to load"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:837
+#, fuzzy
+msgid "# Peer advertisements for unsupported transport"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:838
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to ping busy"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:839
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to lack of self ad"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:840
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to send error"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:841
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:796
+#: src/applications/advertising/advertising.c:842
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:798
-#: src/applications/pingpong/pingpong.c:493
+#: src/applications/advertising/advertising.c:844
+#: src/applications/pingpong/pingpong.c:516
 msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:802
-#: src/applications/session/connect.c:877
+#: src/applications/advertising/advertising.c:849
+#: src/applications/session/connect.c:936
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:820
+#: src/applications/advertising/advertising.c:867
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:447
+#: src/applications/topology_default/topology.c:448
 msgid "maintains GNUnet default mesh topology"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:123
-#: src/applications/pingpong/pingpong.c:191
-#: src/applications/pingpong/pingpong.c:244
-#: src/applications/pingpong/pingpong.c:314
+#: src/applications/pingpong/pingpong.c:128
+#: src/applications/pingpong/pingpong.c:199
+#: src/applications/pingpong/pingpong.c:264
+#: src/applications/pingpong/pingpong.c:335
 #, fuzzy, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr "Ubutumwa"
 
-#: src/applications/pingpong/pingpong.c:135
+#: src/applications/pingpong/pingpong.c:140
 #, fuzzy
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "kugirango"
 
-#: src/applications/pingpong/pingpong.c:201
+#: src/applications/pingpong/pingpong.c:210
 #, fuzzy
 msgid "Received PING not destined for us!\n"
 msgstr "OYA kugirango RW"
 
-#: src/applications/pingpong/pingpong.c:287
-#: src/applications/pingpong/pingpong.c:350
+#: src/applications/pingpong/pingpong.c:308
+#: src/applications/pingpong/pingpong.c:371
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:393
+#: src/applications/pingpong/pingpong.c:414
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:483
+#: src/applications/pingpong/pingpong.c:506
 #, fuzzy
 msgid "# encrypted PONG messages received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:485
+#: src/applications/pingpong/pingpong.c:508
 #, fuzzy
 msgid "# plaintext PONG messages received"
 msgstr "#Umukiriya Ibibazo BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:487
+#: src/applications/pingpong/pingpong.c:510
 #, fuzzy
 msgid "# encrypted PING messages received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:489
+#: src/applications/pingpong/pingpong.c:512
 #, fuzzy
 msgid "# PING messages created"
 msgstr "#Ubutumwa"
 
-#: src/applications/pingpong/pingpong.c:491
+#: src/applications/pingpong/pingpong.c:514
+#: src/applications/session/connect.c:931
 #, fuzzy
 msgid "# encrypted PONG messages sent"
 msgstr "#Bishunzwe: Bayite Yoherejwe:"
 
-#: src/applications/pingpong/pingpong.c:495
+#: src/applications/pingpong/pingpong.c:518
+#: src/applications/session/connect.c:929
 #, fuzzy
 msgid "# encrypted PING messages sent"
 msgstr "#Bishunzwe: Bayite Yoherejwe:"
 
-#: src/applications/pingpong/pingpong.c:505
+#: src/applications/pingpong/pingpong.c:520
+#, fuzzy
+msgid "# plaintext PONG messages sent"
+msgstr "#Umukiriya Ibibazo BYAKIRIWE"
+
+#: src/applications/pingpong/pingpong.c:522
+#, fuzzy
+msgid "# plaintext PONG transmissions failed"
+msgstr "#Umukiriya Ibibazo BYAKIRIWE"
+
+#: src/applications/pingpong/pingpong.c:532
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
@@ -2181,7 +2239,7 @@
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1369
+#: src/applications/sqstore_sqlite/sqlite.c:1370
 #: src/applications/sqstore_mysql/mysql.c:1352
 #, fuzzy
 msgid "# bytes in datastore"
@@ -2193,62 +2251,66 @@
 msgid "# of connected peers"
 msgstr "#Bya"
 
-#: src/applications/session/connect.c:257
-#: src/applications/session/connect.c:274
+#: src/applications/session/connect.c:261
+#: src/applications/session/connect.c:278
 #, fuzzy, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Urufunguzo Bivuye OYA Byagenzuwe"
 
-#: src/applications/session/connect.c:315
+#: src/applications/session/connect.c:321
 #, fuzzy, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr "Shyiraho Umutekano Ikindi OYA"
 
-#: src/applications/session/connect.c:572
+#: src/applications/session/connect.c:520
+msgid "Could not create any HELLO for myself!\n"
+msgstr ""
+
+#: src/applications/session/connect.c:621
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "'%s'Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:590
+#: src/applications/session/connect.c:639
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr "'%s'Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:622
+#: src/applications/session/connect.c:673
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:632
+#: src/applications/session/connect.c:683
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:701
+#: src/applications/session/connect.c:752
 #, fuzzy, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
 "invalid.\n"
 msgstr "Bishunzwe: Umukoro Urufunguzo Ubutumwa Ingano ni Sibyo"
 
-#: src/applications/session/connect.c:713
+#: src/applications/session/connect.c:764
 #, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:866
+#: src/applications/session/connect.c:921
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:868
+#: src/applications/session/connect.c:923
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:870
+#: src/applications/session/connect.c:925
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:872
+#: src/applications/session/connect.c:927
 msgid "# sessions established"
 msgstr ""
 
@@ -2398,21 +2460,25 @@
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:687
-#: src/applications/identity/identity.c:707
+#: src/applications/identity/identity.c:730
+#: src/applications/identity/identity.c:758
 #, fuzzy, c-format
-msgid "Removed file `%s' containing invalid hello data.\n"
+msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr "IDOSIYE Sibyo Ibyatanzwe"
 
-#: src/applications/identity/identity.c:760
+#: src/applications/identity/identity.c:812
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:769
+#: src/applications/identity/identity.c:822
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
+#: src/applications/identity/identity.c:1278
+msgid "invalid"
+msgstr ""
+
 #: src/applications/testbed/commands.c:1130
 #: src/applications/stats/gnunet-stats.c:65
 #, fuzzy, c-format
@@ -2661,46 +2727,52 @@
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:190
+#: src/applications/transport/transport.c:188
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:283
+#: src/applications/transport/transport.c:240
+#, c-format
+msgid ""
+"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:301
 #, fuzzy, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr "Bya Ubwoko"
 
-#: src/applications/transport/transport.c:372
+#: src/applications/transport/transport.c:389
 #, fuzzy, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Bya Ubwoko"
 
-#: src/applications/transport/transport.c:429
+#: src/applications/transport/transport.c:446
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:630
+#: src/applications/transport/transport.c:647
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "S"
 
-#: src/applications/transport/transport.c:650
+#: src/applications/transport/transport.c:667
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "OYA gutangiza Porogaramu"
 
-#: src/applications/transport/transport.c:660
+#: src/applications/transport/transport.c:677
 #, fuzzy, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr "Isomero OYA Bya ngombwa Umumaro"
 
-#: src/applications/transport/transport.c:687
+#: src/applications/transport/transport.c:704
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "S"
 
-#: src/applications/transport/transport.c:700
+#: src/applications/transport/transport.c:717
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
@@ -2779,12 +2851,12 @@
 msgid "# bytes of noise received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/stats/statistics.c:384
+#: src/applications/stats/statistics.c:398
 #, c-format
 msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:405
+#: src/applications/stats/statistics.c:419
 #, fuzzy
 msgid "keeps statistics about gnunetd's operation"
 msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
@@ -2998,25 +3070,21 @@
 msgstr "OYA Akira i Ubutumwa Bivuye"
 
 #: src/applications/tbench/tbenchtest.c:53
-#: src/applications/tbench/tbenchtest_udp.c:55
 #, c-format
 msgid "Using %u messages of size %u for %u times.\n"
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:80
-#: src/applications/tbench/tbenchtest_udp.c:82
 #, c-format
 msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:85
-#: src/applications/tbench/tbenchtest_udp.c:87
 #, c-format
 msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:91
-#: src/applications/tbench/tbenchtest_udp.c:93
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3024,7 +3092,6 @@
 msgstr "Kuri Akira Kuri Ubutumwa Bivuye"
 
 #: src/applications/tbench/tbenchtest.c:148
-#: src/applications/tbench/tbenchtest_udp.c:152
 #, c-format
 msgid "Running benchmark...\n"
 msgstr ""
@@ -3108,27 +3175,27 @@
 msgid "allows mapping of the network topology"
 msgstr "urusobe"
 
-#: src/applications/gap/gap.c:1707
+#: src/applications/gap/gap.c:1705
 #, fuzzy, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "Sibyo Ubutumwa Bivuye"
 
-#: src/applications/gap/gap.c:1708
+#: src/applications/gap/gap.c:1706
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1884
+#: src/applications/gap/gap.c:1882
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1896 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1894 src/applications/fs/module/anonymity.c:67
 #, fuzzy
 msgid "Failed to get traffic stats.\n"
 msgstr "Kuri Ikibazo# Ibyerekeye"
 
-#: src/applications/gap/gap.c:1903 src/applications/gap/gap.c:1909
-#: src/applications/gap/gap.c:1916
+#: src/applications/gap/gap.c:1901 src/applications/gap/gap.c:1907
+#: src/applications/gap/gap.c:1914
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
@@ -3188,7 +3255,7 @@
 
 #: src/applications/gap/gap.c:2215
 #, fuzzy
-msgid "# gap spurious replies"
+msgid "# gap spurious replies (dropped)"
 msgstr "#hejuru Ibibazo BYAKIRIWE"
 
 #: src/applications/gap/gap.c:2216
@@ -3787,6 +3854,15 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s'ntabwo ari idosiye"
 
+#: src/applications/fs/module/querymanager.c:227
+#, fuzzy
+msgid "# FS currently tracked queries from clients"
+msgstr "#Umukiriya Yoherejwe:"
+
+#: src/applications/fs/module/querymanager.c:229
+msgid "# FS replies passed to clients"
+msgstr ""
+
 #: src/applications/fs/module/ondemand.c:336
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
@@ -3817,19 +3893,28 @@
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1146
+#: src/applications/fs/module/fs.c:1167
 #, fuzzy, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
 "s'.\n"
 msgstr "a Umubare kugirango in i Iboneza in Icyiciro"
 
-#: src/applications/fs/module/fs.c:1188
+#: src/applications/fs/module/fs.c:1180
+msgid "# FS expired replies dropped"
+msgstr ""
+
+#: src/applications/fs/module/fs.c:1182
+#, fuzzy
+msgid "# FS valid replies received"
+msgstr "#Gushaka Ibisubizo ku BYAKIRIWE KB"
+
+#: src/applications/fs/module/fs.c:1219
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1228
+#: src/applications/fs/module/fs.c:1259
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -3888,19 +3973,19 @@
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "OYA Kwandika Kuri IDOSIYE"
 
-#: src/applications/fs/ecrs/download.c:269
+#: src/applications/fs/ecrs/download.c:270
 #, fuzzy, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "'%s'%sByanze"
 
-#: src/applications/fs/ecrs/download.c:1042
+#: src/applications/fs/ecrs/download.c:1043
 #, fuzzy
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
 msgstr "Ibikubiyemo OYA BIHUYE Urufunguzo ni a Cyangwa a Byinjijwemo IDOSIYE"
 
-#: src/applications/fs/ecrs/download.c:1228
+#: src/applications/fs/ecrs/download.c:1229
 #, fuzzy, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -3962,21 +4047,21 @@
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Kurema IDOSIYE"
 
-#: src/applications/fs/ecrs/namespace.c:339
-#: src/applications/fs/ecrs/namespace.c:421
-#: src/applications/fs/ecrs/namespace.c:578
+#: src/applications/fs/ecrs/namespace.c:342
+#: src/applications/fs/ecrs/namespace.c:425
+#: src/applications/fs/ecrs/namespace.c:584
 #, fuzzy, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Idosiye OYA a"
 
-#: src/applications/fs/ecrs/namespace.c:351
-#: src/applications/fs/ecrs/namespace.c:432
+#: src/applications/fs/ecrs/namespace.c:354
+#: src/applications/fs/ecrs/namespace.c:436
 #, fuzzy, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/fs/ecrs/namespace.c:592
-#: src/applications/fs/ecrs/namespace.c:603
+#: src/applications/fs/ecrs/namespace.c:598
+#: src/applications/fs/ecrs/namespace.c:609
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
@@ -3997,16 +4082,16 @@
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:373
+#: src/applications/fs/uritrack/file_info.c:374
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:656
+#: src/applications/fs/namespace/namespace_info.c:730
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:677
+#: src/applications/fs/namespace/namespace_info.c:751
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -4040,35 +4125,45 @@
 msgid "Template description."
 msgstr "/ku Isobanuramiterere"
 
-#: src/applications/bootstrap_http/http.c:100
+#: src/applications/bootstrap_http/http.c:105
 #, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:173
+#: src/applications/bootstrap_http/http.c:176
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:229
+#: src/applications/bootstrap_http/http.c:211
 #, c-format
+msgid "Bootstrapping using `%s'.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:237
+#, c-format
 msgid "Trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:408
-msgid "# hellos downloaded via http"
+#: src/applications/bootstrap_http/http.c:388
+#, fuzzy, c-format
+msgid "Downloaded %llu bytes from `%s'.\n"
+msgstr "Idosiye Bivuye"
+
+#: src/applications/bootstrap_http/http.c:421
+msgid "# HELLOs downloaded via http"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:445
+#: src/applications/traffic/traffic.c:450
 #, fuzzy, c-format
 msgid "# bytes transmitted of type %d"
 msgstr "#Bayite Bya Ubwoko"
 
-#: src/applications/traffic/traffic.c:465
+#: src/applications/traffic/traffic.c:470
 #, fuzzy, c-format
 msgid "# bytes received of type %d"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/applications/traffic/traffic.c:610
+#: src/applications/traffic/traffic.c:624
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -4353,7 +4448,7 @@
 msgid "Updates GNUnet datastructures after version change."
 msgstr "Nyuma Verisiyo Guhindura>>"
 
-#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:382
+#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:389
 #, fuzzy
 msgid "run as user LOGIN"
 msgstr "Gukoresha Nka Ukoresha:"
@@ -4363,93 +4458,93 @@
 msgid "run in client mode (for getting client configuration values)"
 msgstr "Gukoresha in Ukoresha: Ubwoko kugirango Ukoresha: Iboneza Uduciro"
 
-#: src/server/connection.c:1142
+#: src/server/connection.c:1133
 #, fuzzy, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "'%s'Byahiswemo Inyuma Bya Ubutumwa"
 
-#: src/server/connection.c:1151
+#: src/server/connection.c:1142
 #, fuzzy, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Birambuye Uburebure By'ibanze"
 
-#: src/server/connection.c:2631
+#: src/server/connection.c:2675
 #, fuzzy, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bivuye Sibyo Imiterere"
 
-#: src/server/connection.c:2709
+#: src/server/connection.c:2755
 #, fuzzy, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Umubare Bya"
 
-#: src/server/connection.c:2726
+#: src/server/connection.c:2772
 #, fuzzy
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
 
-#: src/server/connection.c:3167
+#: src/server/connection.c:3219
 #, fuzzy
 msgid "# outgoing messages dropped"
 msgstr "#Ubutumwa"
 
-#: src/server/connection.c:3171
+#: src/server/connection.c:3223
 #, fuzzy
 msgid "# bytes of outgoing messages dropped"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:3173
+#: src/server/connection.c:3225
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3176
+#: src/server/connection.c:3228
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:3180
+#: src/server/connection.c:3232
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "#Bayite Bya Ubwoko"
 
-#: src/server/connection.c:3184
+#: src/server/connection.c:3236
 #, fuzzy
 msgid "# bytes received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:3187
+#: src/server/connection.c:3239
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:3189
+#: src/server/connection.c:3241
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/server/connection.c:3191
+#: src/server/connection.c:3243
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3193
+#: src/server/connection.c:3245
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:3195
+#: src/server/connection.c:3247
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
 
-#: src/server/connection.c:3197
+#: src/server/connection.c:3249
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3199
+#: src/server/connection.c:3251
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3201
+#: src/server/connection.c:3253
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
@@ -4513,7 +4608,7 @@
 msgid "specify username as which gnunetd should run"
 msgstr "Ubuturo ku ni"
 
-#: src/server/gnunetd.c:270
+#: src/server/gnunetd.c:288
 #, fuzzy, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
@@ -4595,74 +4690,80 @@
 msgid " Transport %d is not being tested\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:250
+#: src/server/gnunet-transport-check.c:253
 #, c-format
 msgid ""
 "\n"
 "Contacting `%s'."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:276
+#: src/server/gnunet-transport-check.c:279
 #, fuzzy, c-format
 msgid " Connection failed\n"
 msgstr "OYA Iyinjizamo Byanze"
 
-#: src/server/gnunet-transport-check.c:282
+#: src/server/gnunet-transport-check.c:285
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:335
-#, fuzzy, c-format
-msgid "No reply received within %llums.\n"
-msgstr "Subiza BYAKIRIWE muri"
+#: src/server/gnunet-transport-check.c:338
+#, c-format
+msgid "Timeout after %llums.\n"
+msgstr ""
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:342
+#, c-format
+msgid "OK!\n"
+msgstr ""
+
+#: src/server/gnunet-transport-check.c:370
 #, fuzzy
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr "Kuri Igerageza NIBA"
 
-#: src/server/gnunet-transport-check.c:367
+#: src/server/gnunet-transport-check.c:374
 #, fuzzy
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr "Bivuye BIHUYE"
 
-#: src/server/gnunet-transport-check.c:370
+#: src/server/gnunet-transport-check.c:377
 #, fuzzy
 msgid "send COUNT messages"
 msgstr "Kohereza Ubutumwa"
 
-#: src/server/gnunet-transport-check.c:373
+#: src/server/gnunet-transport-check.c:380
 #, fuzzy
 msgid "send messages with SIZE bytes payload"
 msgstr "Kohereza Ubutumwa Na: Bayite"
 
-#: src/server/gnunet-transport-check.c:376
+#: src/server/gnunet-transport-check.c:383
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:379
+#: src/server/gnunet-transport-check.c:386
 #, fuzzy
 msgid "specifies after how many MS to time-out"
 msgstr "Nyuma Kuri Igihe Inyuma"
 
-#: src/server/gnunet-transport-check.c:387
+#: src/server/gnunet-transport-check.c:394
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:451
+#: src/server/gnunet-transport-check.c:459
 #, fuzzy, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "S"
 
-#: src/server/gnunet-transport-check.c:454
+#: src/server/gnunet-transport-check.c:462
 #, fuzzy, c-format
 msgid "Available transport(s): %s\n"
 msgstr "S"
 
-#: src/server/gnunet-transport-check.c:514
+#: src/server/gnunet-transport-check.c:527
 #, fuzzy, c-format
 msgid ""
+"\n"
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr "%dInyuma Bya Times"
 
@@ -4676,19 +4777,19 @@
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr "OYA Kuri Umuyoboro"
 
-#: src/server/tcpserver.c:396
+#: src/server/tcpserver.c:397
 #, fuzzy, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr "urusobe in i Iboneza in Icyiciro kugirango Icyinjijwe"
 
-#: src/server/tcpserver.c:448
+#: src/server/tcpserver.c:449
 #, fuzzy, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%sByanze Ubutumwa Ubwoko in Gukoresha"
 
-#: src/server/handler.c:379
+#: src/server/handler.c:380
 #, fuzzy, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Ubutumwa Bivuye in"
@@ -4722,6 +4823,11 @@
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Na: Na Aderesi"
 
+#: src/util/boot/startup.c:212
+#, fuzzy, c-format
+msgid "Failed to run %s: %s %d\n"
+msgstr "Byanze Kuri Kwihuza Kuri"
+
 #: src/util/network_client/tcpio.c:94 src/util/network_client/tcpio.c:135
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
@@ -4766,12 +4872,12 @@
 msgid "`%s' failed, reply invalid!\n"
 msgstr "'%s'Byanze Subiza Sibyo"
 
-#: src/util/crypto/hostkey_gcrypt.c:1031
+#: src/util/crypto/hostkey_gcrypt.c:1036
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Isinya Byanze ku"
 
-#: src/util/crypto/locking_gcrypt.c:67
+#: src/util/crypto/locking_gcrypt.c:74
 #, fuzzy, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "OYA i Ikitezwe: Verisiyo Verisiyo ni Bya ngombwa"
@@ -4841,12 +4947,12 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Kuri"
 
-#: src/util/network/select.c:296
+#: src/util/network/select.c:306
 #, fuzzy
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/util/network/select.c:454
+#: src/util/network/select.c:472
 msgid "select listen socket not valid!\n"
 msgstr ""
 
@@ -5189,23 +5295,23 @@
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:187
+#: src/setup/gnunet-setup.c:188
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Komandi: Umurongo ingingo"
 
-#: src/setup/gnunet-setup.c:192
+#: src/setup/gnunet-setup.c:193
 #, fuzzy
 msgid "No interface specified, using default\n"
 msgstr "imbonerahamwe# Izina: ikoresha"
 
 # 
uui/source\ids.src:RID_UUI_ERRHDL.(ERRCODE_UUI_IO_NOTAFILE_&_ERRCODE_RES_MASK).text
-#: src/setup/gnunet-setup.c:267
+#: src/setup/gnunet-setup.c:268
 #, fuzzy, c-format
 msgid "`%s' is not available."
 msgstr "'%s'ntabwo ari idosiye"
 
-#: src/setup/gnunet-setup.c:283
+#: src/setup/gnunet-setup.c:284
 #, fuzzy, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Imiterere Verisiyo"
@@ -5815,6 +5921,22 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "# bytes received via TCP-OLD"
+#~ msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+
+#, fuzzy
+#~ msgid "hello advertisement for protocol %d received.\n"
+#~ msgstr "kugirango Porotokole BYAKIRIWE"
+
+#, fuzzy
+#~ msgid "Removing hello from peer `%s' (expired %ds ago).\n"
+#~ msgstr "Bivuye Byarengeje igihe"
+
+#, fuzzy
+#~ msgid "No reply received within %llums.\n"
+#~ msgstr "Subiza BYAKIRIWE muri"
+
+#, fuzzy
 #~ msgid "Deleting expired content.  This may take a while.\n"
 #~ msgstr "Gishya iyi Gicurasi a"
 
@@ -7847,10 +7969,6 @@
 #~ msgstr "#Umukiriya BYAKIRIWE"
 
 #, fuzzy
-#~ msgid "# client trace replies sent"
-#~ msgstr "#Umukiriya Yoherejwe:"
-
-#, fuzzy
 #~ msgid "# p2p trace replies sent"
 #~ msgstr "#Yoherejwe:"
 

Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po     2007-06-09 08:10:48 UTC (rev 4986)
+++ GNUnet/po/sv.po     2007-06-09 08:20:05 UTC (rev 4987)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-03-25 14:37-0600\n"
+"POT-Creation-Date: 2007-06-09 01:06-0600\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -26,11 +26,22 @@
 
 #: contrib/config-daemon.scm:54 contrib/config-client.scm:59
 msgid ""
-"If EXPERIMENTAL is set to NO, options for experimental code are not shown.  
If in doubt, use NO.\n"
+"If EXPERIMENTAL is set to NO, options for experimental code are not shown.  "
+"If in doubt, use NO.\n"
 "\n"
-"Some options apply to experimental code that maybe in a state of development 
where the functionality, stability, or the level of testing is not yet high 
enough for general use.  These features are said to be of \"alpha\" quality.  
If a feature is currently in alpha, uninformed use is discouraged (since the 
developers then do not fancy \"Why doesn't this work?\" type messages).\n"
+"Some options apply to experimental code that maybe in a state of development "
+"where the functionality, stability, or the level of testing is not yet high "
+"enough for general use.  These features are said to be of \"alpha\" "
+"quality.  If a feature is currently in alpha, uninformed use is discouraged "
+"(since the developers then do not fancy \"Why doesn't this work?\" type "
+"messages).\n"
 "\n"
-"However, active testing and qualified feedback of these features is always 
welcome.  Users should just be aware that alpha features may not meet the 
normal level of reliability or it may fail to work in some special cases.  Bug 
reports are usually welcomed by the developers, but please read the documents 
<file://README> and <http://gnunet.org/faq.php3> and use 
<https://gnunet.org/mantis/> for how to report problems."
+"However, active testing and qualified feedback of these features is always "
+"welcome.  Users should just be aware that alpha features may not meet the "
+"normal level of reliability or it may fail to work in some special cases.  "
+"Bug reports are usually welcomed by the developers, but please read the "
+"documents <file://README> and <http://gnunet.org/faq.php3> and use <https://";
+"gnunet.org/mantis/> for how to report problems."
 msgstr ""
 
 #: contrib/config-daemon.scm:69 contrib/config-client.scm:74
@@ -38,7 +49,10 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:71 contrib/config-client.scm:76
-msgid "These are options that maybe difficult to understand for the beginner. 
These options typically refer to features that allow tweaking of the 
installation.  If in a hurry, say NO."
+msgid ""
+"These are options that maybe difficult to understand for the beginner. These "
+"options typically refer to features that allow tweaking of the "
+"installation.  If in a hurry, say NO."
 msgstr ""
 
 #: contrib/config-daemon.scm:82 contrib/config-client.scm:87
@@ -47,7 +61,10 @@
 msgstr "Visa alla alternativ"
 
 #: contrib/config-daemon.scm:84 contrib/config-client.scm:89
-msgid "These are options that hardly anyone actually needs.  If you plan on 
doing development on GNUnet, you may want to look into these.  If in doubt or 
in a hurry, say NO."
+msgid ""
+"These are options that hardly anyone actually needs.  If you plan on doing "
+"development on GNUnet, you may want to look into these.  If in doubt or in a "
+"hurry, say NO."
 msgstr ""
 
 #: contrib/config-daemon.scm:95 contrib/config-client.scm:100
@@ -65,7 +82,11 @@
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
 #: contrib/config-daemon.scm:115
-msgid "This gives the root-directory of the GNUnet installation. Make sure 
there is some space left in that directory. :-)  Users inserting or indexing 
files will be able to store data in this directory up to the (global) quota 
specified below.  Having a few gigabytes of free space is recommended."
+msgid ""
+"This gives the root-directory of the GNUnet installation. Make sure there is "
+"some space left in that directory. :-)  Users inserting or indexing files "
+"will be able to store data in this directory up to the (global) quota "
+"specified below.  Having a few gigabytes of free space is recommended."
 msgstr ""
 
 #: contrib/config-daemon.scm:128
@@ -89,7 +110,13 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:166
-msgid "How many minutes is the current IP valid?  (GNUnet will sign HELLO 
messages with this expiration timeline. If you are on dialup, 60 (for 1 hour) 
is suggested. If you are having a static IP address, you may want to set this 
to a large value (say 14400).  The default is 1440 (1 day). If your IP changes 
periodically, you will want to choose the expiration to be smaller than the 
frequency with which your IP changes."
+msgid ""
+"How many minutes is the current IP valid?  (GNUnet will sign HELLO messages "
+"with this expiration timeline. If you are on dialup, 60 (for 1 hour) is "
+"suggested. If you are having a static IP address, you may want to set this "
+"to a large value (say 14400).  The default is 1440 (1 day). If your IP "
+"changes periodically, you will want to choose the expiration to be smaller "
+"than the frequency with which your IP changes."
 msgstr ""
 
 #: contrib/config-daemon.scm:177
@@ -98,13 +125,21 @@
 
 #: contrib/config-daemon.scm:179
 msgid ""
-"GNUnet can automatically update the hostlist from the web. While GNUnet 
internally communicates which hosts are online, it is typically a good idea to 
get a fresh hostlist whenever gnunetd starts from the WEB. By setting this 
option, you can specify from which server gnunetd should try to download the 
hostlist. The default should be fine for now.\n"
+"GNUnet can automatically update the hostlist from the web. While GNUnet "
+"internally communicates which hosts are online, it is typically a good idea "
+"to get a fresh hostlist whenever gnunetd starts from the WEB. By setting "
+"this option, you can specify from which server gnunetd should try to "
+"download the hostlist. The default should be fine for now.\n"
 "\t\t\n"
-"The general format is a list of space-separated URLs.  Each URL must have the 
format http://HOSTNAME/FILENAME\n";
+"The general format is a list of space-separated URLs.  Each URL must have "
+"the format http://HOSTNAME/FILENAME\n";
 "\t\t\n"
-"If you want to setup an alternate hostlist server, you must run a permanent 
node and \"cat data/hosts/* > hostlist\" every few minutes to keep the list 
up-to-date.\n"
+"If you want to setup an alternate hostlist server, you must run a permanent "
+"node and \"cat data/hosts/* > hostlist\" every few minutes to keep the list "
+"up-to-date.\n"
 "\t\t\n"
-"If you do not specify a HOSTLISTURL, you must copy valid hostkeys to 
data/hosts manually."
+"If you do not specify a HOSTLISTURL, you must copy valid hostkeys to data/"
+"hosts manually."
 msgstr ""
 
 #: contrib/config-daemon.scm:196
@@ -112,7 +147,9 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:198
-msgid "If you have to use a proxy for outbound HTTP connections, specify the 
proxy configuration here.  Default is no proxy."
+msgid ""
+"If you have to use a proxy for outbound HTTP connections, specify the proxy "
+"configuration here.  Default is no proxy."
 msgstr ""
 
 #: contrib/config-daemon.scm:237 contrib/config-client.scm:144
@@ -120,15 +157,27 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:239 contrib/config-client.scm:146
-msgid "How long should logs be kept? If you specify a value greater than zero, 
a log is created each day with the date appended to its filename. These logs 
are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
+msgid ""
+"How long should logs be kept? If you specify a value greater than zero, a "
+"log is created each day with the date appended to its filename. These logs "
+"are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
 msgstr ""
 
 #: contrib/config-daemon.scm:250
-msgid "What maximum number of open file descriptors should be requested from 
the OS?"
+msgid ""
+"What maximum number of open file descriptors should be requested from the OS?"
 msgstr ""
 
 #: contrib/config-daemon.scm:252
-msgid "The default of 1024 should be fine for most systems.  If your system 
can support more, increasing the number might help support additional clients 
on machines with plenty of bandwidth.  For embedded systems, a smaller number 
might be acceptable.  A value of 0 will leave the descriptor limit untouched.  
This option is mostly for OS X systems where the default is too low.  Note that 
if gnunetd cannot obtain the desired number of file descriptors from the 
operating system, it will print a warning and try to run with what it is given."
+msgid ""
+"The default of 1024 should be fine for most systems.  If your system can "
+"support more, increasing the number might help support additional clients on "
+"machines with plenty of bandwidth.  For embedded systems, a smaller number "
+"might be acceptable.  A value of 0 will leave the descriptor limit "
+"untouched.  This option is mostly for OS X systems where the default is too "
+"low.  Note that if gnunetd cannot obtain the desired number of file "
+"descriptors from the operating system, it will print a warning and try to "
+"run with what it is given."
 msgstr ""
 
 #: contrib/config-daemon.scm:263
@@ -155,431 +204,609 @@
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:295
-msgid "In which file should gnunetd write the process-id of the server?  If 
you run gnunetd as root, you may want to choose /var/run/gnunetd.pid. It's not 
the default since gnunetd may not have write rights at that location."
+#: contrib/config-daemon.scm:294
+msgid ""
+"The default is no longer /var/run/gnunetd.pid since we could not delete the "
+"file on shutdown at that location."
 msgstr ""
 
-#: contrib/config-daemon.scm:307
+#: contrib/config-daemon.scm:306
 msgid "As which user should gnunetd run?"
 msgstr ""
 
-#: contrib/config-daemon.scm:309
-msgid "Empty means \"current user\". On computer startup, it is root/SYSTEM.  
Under Windows, this setting affects the creation of a new system service only."
+#: contrib/config-daemon.scm:308
+msgid ""
+"Empty means \"current user\". On computer startup, it is root/SYSTEM.  Under "
+"Windows, this setting affects the creation of a new system service only."
 msgstr ""
 
 #: contrib/config-daemon.scm:321
+msgid "Should gnunetd be automatically started when the system boots?"
+msgstr ""
+
+#: contrib/config-daemon.scm:322
+msgid ""
+"Set to YES if gnunetd should be automatically started on boot.  If this "
+"option is set, gnunet-setup will install a script to start the daemon upon "
+"completion.  This option may not work on all systems."
+msgstr ""
+
+#: contrib/config-daemon.scm:334
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:323
+#: contrib/config-daemon.scm:336
 msgid ""
-"Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The 
available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
+"Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
+"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
 "\t\t\n"
-"Loading the 'nat' and 'tcp' modules is required for peers behind NAT boxes 
that cannot directly be reached from the outside.  Peers that are NOT behind a 
NAT box and that want to *allow* peers that ARE behind a NAT box to connect 
must ALSO load the 'nat' module.  Note that the actual transfer will always be 
via tcp initiated by the peer behind the NAT box.  The nat transport requires 
the use of tcp, http, smtp and/or tcp6 in addition to nat itself."
+"Loading the 'nat' and 'tcp' modules is required for peers behind NAT boxes "
+"that cannot directly be reached from the outside.  Peers that are NOT behind "
+"a NAT box and that want to *allow* peers that ARE behind a NAT box to "
+"connect must ALSO load the 'nat' module.  Note that the actual transfer will "
+"always be via tcp initiated by the peer behind the NAT box.  The nat "
+"transport requires the use of tcp, http, smtp and/or tcp6 in addition to nat "
+"itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:337
+#: contrib/config-daemon.scm:350
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:339
+#: contrib/config-daemon.scm:352
 msgid ""
-"Whenever this option is changed, you MUST run gnunet-update. Currently, the 
available applications are:\n"
+"Whenever this option is changed, you MUST run gnunet-update. Currently, the "
+"available applications are:\n"
 "\n"
-"advertising: advertises your peer to other peers. Without it, your peer will 
not participate in informing peers about other peers.  You should always load 
this module.\n"
+"advertising: advertises your peer to other peers. Without it, your peer will "
+"not participate in informing peers about other peers.  You should always "
+"load this module.\n"
 "\n"
-"getoption:  allows clients to query gnunetd about the values of various 
configuration options.  Many tools need this.  You should always load this 
module.\n"
+"getoption:  allows clients to query gnunetd about the values of various "
+"configuration options.  Many tools need this.  You should always load this "
+"module.\n"
 "\n"
-"stats: allows tools like gnunet-stats and gnunet-gtk to query gnunetd about 
various statistics.  This information is usually quite useful to diagnose 
errors, hence it is recommended that you load this module.\n"
+"stats: allows tools like gnunet-stats and gnunet-gtk to query gnunetd about "
+"various statistics.  This information is usually quite useful to diagnose "
+"errors, hence it is recommended that you load this module.\n"
 "\n"
-"traffic: keeps track of how many messages were recently received and 
transmitted.  This information can then be used to establish how much cover 
traffic is currently available.  The amount of cover traffic becomes important 
if you want to make anonymous requests with an anonymity level that is greater 
than one.  It is recommended that you load this module.\n"
+"traffic: keeps track of how many messages were recently received and "
+"transmitted.  This information can then be used to establish how much cover "
+"traffic is currently available.  The amount of cover traffic becomes "
+"important if you want to make anonymous requests with an anonymity level "
+"that is greater than one.  It is recommended that you load this module.\n"
 "\n"
 "fs: needed for anonymous file sharing. You should always load this module.\n"
 "\n"
-"chat: broadcast chat (demo-application, ALPHA quality).\tRequired for 
gnunet-chat.  Note that the current implementation of chat is not considered to 
be secure.\n"
+"chat: broadcast chat (demo-application, ALPHA quality).\tRequired for gnunet-"
+"chat.  Note that the current implementation of chat is not considered to be "
+"secure.\n"
 "\n"
-"tbench: benchmark transport performance.  Required for gnunet-tbench.  Note 
that tbench allows other users to abuse your resources.\n"
+"tbench: benchmark transport performance.  Required for gnunet-tbench.  Note "
+"that tbench allows other users to abuse your resources.\n"
 "\n"
-"tracekit: topology visualization toolkit.  Required for gnunet-tracekit. Note 
that loading tracekit will make it slightly easier for an adversary to 
compromise your anonymity."
+"tracekit: topology visualization toolkit.  Required for gnunet-tracekit. "
+"Note that loading tracekit will make it slightly easier for an adversary to "
+"compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:368
+#: contrib/config-daemon.scm:381
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:380
+#: contrib/config-daemon.scm:393
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:381
-msgid "The option 'PRIVATE-NETWORK' can be used to limit the connections of 
this peer to peers of which the hostkey has been copied by hand to data/hosts;  
if this option is given, GNUnet will not accept advertisements of peers that 
the local node does not already know about.  Note that in order for this option 
to work, HOSTLISTURL should either not be set at all or be set to a trusted 
peer that only advertises the private network. Also, the option does NOT work 
at the moment if the NAT transport is loaded; for that, a couple of lines above 
would need some minor editing :-)."
+#: contrib/config-daemon.scm:394
+msgid ""
+"The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
+"peer to peers of which the hostkey has been copied by hand to data/hosts;  "
+"if this option is given, GNUnet will not accept advertisements of peers that "
+"the local node does not already know about.  Note that in order for this "
+"option to work, HOSTLISTURL should either not be set at all or be set to a "
+"trusted peer that only advertises the private network. Also, the option does "
+"NOT work at the moment if the NAT transport is loaded; for that, a couple of "
+"lines above would need some minor editing :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:392
+#: contrib/config-daemon.scm:405
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:404
+#: contrib/config-daemon.scm:417
 msgid "Disable automatic establishment of connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:405
-msgid "If this option is enabled, GNUnet will not automatically establish 
connections to other peers, but instead wait for applications to specifically 
request connections to other peers (or for other peers to connect to us)."
+#: contrib/config-daemon.scm:418
+msgid ""
+"If this option is enabled, GNUnet will not automatically establish "
+"connections to other peers, but instead wait for applications to "
+"specifically request connections to other peers (or for other peers to "
+"connect to us)."
 msgstr ""
 
-#: contrib/config-daemon.scm:416
+#: contrib/config-daemon.scm:429
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:428
+#: contrib/config-daemon.scm:430
+msgid ""
+"This option maybe useful during testing, but turning it off is dangerous! If "
+"in any doubt, set it to YES (which is the default)."
+msgstr ""
+
+#: contrib/config-daemon.scm:441
 msgid "Client/Server Port"
 msgstr ""
 
-#: contrib/config-daemon.scm:429
-msgid "Which is the client-server port that is used between gnunetd and the 
clients (TCP only).  You may firewall this port for non-local machines (but you 
do not have to since GNUnet will perform access control and only allow 
connections from machines that are listed under TRUSTED)."
+#: contrib/config-daemon.scm:442
+msgid ""
+"Which is the client-server port that is used between gnunetd and the clients "
+"(TCP only).  You may firewall this port for non-local machines (but you do "
+"not have to since GNUnet will perform access control and only allow "
+"connections from machines that are listed under TRUSTED)."
 msgstr ""
 
-#: contrib/config-daemon.scm:440
+#: contrib/config-daemon.scm:453
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:441
-msgid "This option specifies which hosts are trusted enough to connect as 
clients (to the TCP port).  This is useful if you run gnunetd on one host of 
your network and want to allow all other hosts to use this node as their 
server.  By default, this is set to 'loopback only'.  The format is IP/NETMASK 
where the IP is specified in dotted-decimal and the netmask either in CIDR 
notation (/16) or in dotted decimal (255.255.0.0). Several entries must be 
separated by a semicolon, spaces are not allowed."
+#: contrib/config-daemon.scm:454
+msgid ""
+"This option specifies which hosts are trusted enough to connect as clients "
+"(to the TCP port).  This is useful if you run gnunetd on one host of your "
+"network and want to allow all other hosts to use this node as their server.  "
+"By default, this is set to 'loopback only'.  The format is IP/NETMASK where "
+"the IP is specified in dotted-decimal and the netmask either in CIDR "
+"notation (/16) or in dotted decimal (255.255.0.0). Several entries must be "
+"separated by a semicolon, spaces are not allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:453
+#: contrib/config-daemon.scm:466
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:454
-msgid "If this option is not set, any peer is allowed to connect.  If it is 
set, only the specified peers are allowed."
+#: contrib/config-daemon.scm:467
+msgid ""
+"If this option is not set, any peer is allowed to connect.  If it is set, "
+"only the specified peers are allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:465
+#: contrib/config-daemon.scm:478
 #, fuzzy
 msgid "Run gnunetd as this user."
 msgstr "Kör gnunet-update"
 
-#: contrib/config-daemon.scm:466
-msgid "When started as root, gnunetd will change permissions to the given 
user."
+#: contrib/config-daemon.scm:479
+msgid ""
+"When started as root, gnunetd will change permissions to the given user."
 msgstr ""
 
-#: contrib/config-daemon.scm:477
+#: contrib/config-daemon.scm:490
 #, fuzzy
 msgid "Run gnunetd as this group."
 msgstr "Kör gnunet-update"
 
-#: contrib/config-daemon.scm:478
-msgid "When started as root, gnunetd will change permissions to the given 
group."
+#: contrib/config-daemon.scm:491
+msgid ""
+"When started as root, gnunetd will change permissions to the given group."
 msgstr ""
 
-#: contrib/config-daemon.scm:489
+#: contrib/config-daemon.scm:502
 msgid "Run gnunetd during system startup?"
 msgstr ""
 
-#: contrib/config-daemon.scm:502
+#: contrib/config-daemon.scm:515
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:503
+#: contrib/config-daemon.scm:516
 msgid "If this option is not set, any peer is allowed to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:514
+#: contrib/config-daemon.scm:527
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:547
 #, fuzzy
 msgid "General settings"
 msgstr "Andra inställningar"
 
-#: contrib/config-daemon.scm:535
+#: contrib/config-daemon.scm:548
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:562
+#: contrib/config-daemon.scm:576
 #, fuzzy
 msgid "Path settings"
 msgstr "Andra inställningar"
 
-#: contrib/config-daemon.scm:563
+#: contrib/config-daemon.scm:577
 msgid "Prefixes for paths used by GNUnet"
 msgstr ""
 
-#: contrib/config-daemon.scm:579
+#: contrib/config-daemon.scm:593
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:581
+#: contrib/config-daemon.scm:595
 msgid ""
-"Which database should be used?  The options are \"sqstore_sqlite\" and 
\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
+"Which database should be used?  The options are \"sqstore_sqlite\" and "
+"\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
 "\t\t\t\n"
-"In order to use sqstore_mysql, you must configure the mysql database, which 
is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
+"In order to use sqstore_mysql, you must configure the mysql database, which "
+"is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:594
+#: contrib/config-daemon.scm:608
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:596
+#: contrib/config-daemon.scm:610
 msgid ""
-"Which topology should be used?  The only options at the moment are 
\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try to 
connect to a diverse set of peers, and welcome connections from anyone.  In f2f 
(friend-to-friend) mode, GNUnet will only allow connections from peers that are 
explicitly listed in a FRIENDS file.  Note that you can list peers in the 
FRIENDS file that run in default mode.\n"
+"Which topology should be used?  The only options at the moment are "
+"\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
+"to connect to a diverse set of peers, and welcome connections from anyone.  "
+"In f2f (friend-to-friend) mode, GNUnet will only allow connections from "
+"peers that are explicitly listed in a FRIENDS file.  Note that you can list "
+"peers in the FRIENDS file that run in default mode.\n"
 "\n"
-"Use f2f only if you have (trustworthy) friends that use GNUnet and are afraid 
of establishing (direct) connections to unknown peers."
+"Use f2f only if you have (trustworthy) friends that use GNUnet and are "
+"afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:625
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:612
+#: contrib/config-daemon.scm:626
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:629
+#: contrib/config-daemon.scm:643
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:630
-msgid "Specifies the name of a file which contains a list of GNUnet peer IDs 
that are friends.  If used with the friend-to-friend topology, this will ensure 
that GNUnet only connects to these peers (via any available transport)."
+#: contrib/config-daemon.scm:644
+msgid ""
+"Specifies the name of a file which contains a list of GNUnet peer IDs that "
+"are friends.  If used with the friend-to-friend topology, this will ensure "
+"that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:644
+#: contrib/config-daemon.scm:658
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:656
+#: contrib/config-daemon.scm:670
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:668
+#: contrib/config-daemon.scm:682
 #, fuzzy
 msgid "Configuration of the MySQL database"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: contrib/config-daemon.scm:687
+#: contrib/config-daemon.scm:701
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:689
+#: contrib/config-daemon.scm:703
 msgid ""
-"How much disk space (MB) is GNUnet allowed to use for anonymous file sharing? 
 This does not take indexed files into account, only the space directly used by 
GNUnet is accounted for.  GNUnet will gather content from the network if the 
current space-consumption is below the number given here (and if content 
migration is allowed below).\n"
+"How much disk space (MB) is GNUnet allowed to use for anonymous file "
+"sharing?  This does not take indexed files into account, only the space "
+"directly used by GNUnet is accounted for.  GNUnet will gather content from "
+"the network if the current space-consumption is below the number given here "
+"(and if content migration is allowed below).\n"
 "\n"
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:703
+#: contrib/config-daemon.scm:717
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:715
+#: contrib/config-daemon.scm:729
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:728
+#: contrib/config-daemon.scm:742
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:730
+#: contrib/config-daemon.scm:744
 msgid ""
-"If you say yes here, GNUnet will migrate content to your server, and you will 
not be able to control what data is stored on your machine. \n"
+"If you say yes here, GNUnet will migrate content to your server, and you "
+"will not be able to control what data is stored on your machine. \n"
 "\t\t\t\n"
-"If you activate it, you can claim for *all* the non-indexed (-n to 
gnunet-insert) content that you did not know what it was even if an adversary 
takes control of your machine.  If you do not activate it, it is obvious that 
you have knowledge of all the content that is hosted on your machine and thus 
can be considered liable for it."
+"If you activate it, you can claim for *all* the non-indexed (-n to gnunet-"
+"insert) content that you did not know what it was even if an adversary takes "
+"control of your machine.  If you do not activate it, it is obvious that you "
+"have knowledge of all the content that is hosted on your machine and thus "
+"can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:744
-msgid "MB of diskspace GNUnet can use for caching DHT index data (the data 
will be stored in /tmp)"
+#: contrib/config-daemon.scm:758
+msgid ""
+"MB of diskspace GNUnet can use for caching DHT index data (the data will be "
+"stored in /tmp)"
 msgstr ""
 
-#: contrib/config-daemon.scm:745
+#: contrib/config-daemon.scm:759
 msgid ""
-"DHT index data is inherently small and expires comparatively quickly.  It is 
deleted whenever gnunetd is shut down.\n"
+"DHT index data is inherently small and expires comparatively quickly.  It is "
+"deleted whenever gnunetd is shut down.\n"
 "\n"
 "The size of the DSTORE QUOTA is specified in MB."
 msgstr ""
 
-#: contrib/config-daemon.scm:759
+#: contrib/config-daemon.scm:773
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "aktiverar (anonym) fildelning"
 
-#: contrib/config-daemon.scm:778
+#: contrib/config-daemon.scm:792
 #, fuzzy
 msgid "Applications"
 msgstr "_Alternativ"
 
-#: contrib/config-daemon.scm:794
+#: contrib/config-daemon.scm:808
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:795
-msgid "Set to YES if this machine is behind a NAT that limits connections from 
the outside to the GNUnet port and that cannot be traversed using UPnP.  Note 
that if you have configured your NAT box to allow direct connections from other 
machines to the GNUnet ports or if GNUnet can open ports using UPnP, you should 
set the option to NO.  Set this only to YES if other peers cannot contact you 
directly.  You can use 'make check' in src/transports/upnp/ to find out if your 
NAT supports UPnP.  You can also use gnunet-transport-check with the '-p' 
option in order to determine which setting results in more connections.  Use 
YES only if you get no connections otherwise."
+#: contrib/config-daemon.scm:809
+msgid ""
+"Set to YES if this machine is behind a NAT that limits connections from the "
+"outside to the GNUnet port and that cannot be traversed using UPnP.  Note "
+"that if you have configured your NAT box to allow direct connections from "
+"other machines to the GNUnet ports or if GNUnet can open ports using UPnP, "
+"you should set the option to NO.  Set this only to YES if other peers cannot "
+"contact you directly.  You can use 'make check' in src/transports/upnp/ to "
+"find out if your NAT supports UPnP.  You can also use gnunet-transport-check "
+"with the '-p' option in order to determine which setting results in more "
+"connections.  Use YES only if you get no connections otherwise."
 msgstr ""
 
-#: contrib/config-daemon.scm:806
+#: contrib/config-daemon.scm:820
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:818 contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:832 contrib/config-daemon.scm:925
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:819
-msgid "You can use 'make check' in src/transports/upnp/ to find out if your 
NAT supports UPnP.  You should disable this option if you are sure that you are 
not behind a NAT.  If your NAT box does not support UPnP, having this on will 
not do much harm (only cost a small amount of resources)."
+#: contrib/config-daemon.scm:833
+msgid ""
+"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
+"supports UPnP.  You should disable this option if you are sure that you are "
+"not behind a NAT.  If your NAT box does not support UPnP, having this on "
+"will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:830 contrib/config-daemon.scm:935
-#: contrib/config-daemon.scm:990 contrib/config-daemon.scm:1055
+#: contrib/config-daemon.scm:844 contrib/config-daemon.scm:949
+#: contrib/config-daemon.scm:1004 contrib/config-daemon.scm:1069
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:842 contrib/config-daemon.scm:947
-msgid "Which IPs are allowed to connect? Leave empty to allow connections from 
any IP."
+#: contrib/config-daemon.scm:856
+msgid ""
+"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
+"network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:854
+#: contrib/config-daemon.scm:868
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:872
+#: contrib/config-daemon.scm:886
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:884
+#: contrib/config-daemon.scm:898
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:899
+#: contrib/config-daemon.scm:913
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:912
-msgid "You can use 'make check' in src/transports/upnp/ to find out if your 
NAT supports UPnP. You should disable this option if you are sure that you are 
not behind a NAT.  If your NAT box does not support UPnP, having this on will 
not do much harm (only cost a small amount of resources)."
+#: contrib/config-daemon.scm:926
+msgid ""
+"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
+"supports UPnP. You should disable this option if you are sure that you are "
+"not behind a NAT.  If your NAT box does not support UPnP, having this on "
+"will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:923
+#: contrib/config-daemon.scm:937
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:959
+#: contrib/config-daemon.scm:961
+msgid ""
+"Which IPs are allowed to connect? Leave empty to allow connections from any "
+"IP."
+msgstr ""
+
+#: contrib/config-daemon.scm:973
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:978
+#: contrib/config-daemon.scm:992
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1002 contrib/config-daemon.scm:1067
-msgid "Which IPs are allowed to connect? Leave empty to allow any IP to 
connect."
+#: contrib/config-daemon.scm:1016 contrib/config-daemon.scm:1081
+msgid ""
+"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:1014
+#: contrib/config-daemon.scm:1028
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1031
+#: contrib/config-daemon.scm:1045
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1043
+#: contrib/config-daemon.scm:1057
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1079
+#: contrib/config-daemon.scm:1093
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1097
+#: contrib/config-daemon.scm:1111
 #, fuzzy
 msgid "Network interface"
 msgstr "Nätverksgränssnitt:"
 
-#: contrib/config-daemon.scm:1109
+#: contrib/config-daemon.scm:1123
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1121
+#: contrib/config-daemon.scm:1135
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1133
+#: contrib/config-daemon.scm:1147
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1156
+#: contrib/config-daemon.scm:1170
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1168
+#: contrib/config-daemon.scm:1182
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1180
+#: contrib/config-daemon.scm:1194
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1182
-msgid "Which CPU load can be tolerated.  Load here always refers to the total 
system load, that is it includes CPU utilization by other processes.  A value 
of 50 means that once your 1 minute-load average goes over 50% non-idle, GNUnet 
will try to reduce CPU consumption until the load goes under the threshold.  
Reasonable values are typically between 50 and 100.  Multiprocessors may use 
values above 100."
+#: contrib/config-daemon.scm:1196
+msgid ""
+"Which CPU load can be tolerated.  Load here always refers to the total "
+"system load, that is it includes CPU utilization by other processes.  A "
+"value of 50 means that once your 1 minute-load average goes over 50% non-"
+"idle, GNUnet will try to reduce CPU consumption until the load goes under "
+"the threshold.  Reasonable values are typically between 50 and 100.  "
+"Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1193
+#: contrib/config-daemon.scm:1207
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1195
-msgid "Which IO load can be tolerated.  Load here refers to the percentage of 
CPU cycles wasted waiting for IO for the entire system, that is it includes 
disk utilization by other processes.  A value of 10 means that once the average 
number of cycles wasted waiting for IO is more than 10% non-idle, GNUnet will 
try to reduce IO until the load goes under the threshold.  Reasonable values 
are typically between 10 and 75."
+#: contrib/config-daemon.scm:1209
+msgid ""
+"Which IO load can be tolerated.  Load here refers to the percentage of CPU "
+"cycles wasted waiting for IO for the entire system, that is it includes disk "
+"utilization by other processes.  A value of 10 means that once the average "
+"number of cycles wasted waiting for IO is more than 10% non-idle, GNUnet "
+"will try to reduce IO until the load goes under the threshold.  Reasonable "
+"values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1206
+#: contrib/config-daemon.scm:1220
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1207
-msgid "Which CPU load can be tolerated.  This is the hard limit, so once it is 
reached, gnunetd will start to massively drop data to reduce the load.  Use 
with caution."
+#: contrib/config-daemon.scm:1221
+msgid ""
+"Which CPU load can be tolerated.  This is the hard limit, so once it is "
+"reached, gnunetd will start to massively drop data to reduce the load.  Use "
+"with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1218
+#: contrib/config-daemon.scm:1232
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1219
-msgid "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 
to have MAXNETUPBPS be the hard limit.  Use zero for no limit."
+#: contrib/config-daemon.scm:1233
+msgid ""
+"The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
+"have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1230
+#: contrib/config-daemon.scm:1244
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1242
+#: contrib/config-daemon.scm:1256
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1244
+#: contrib/config-daemon.scm:1258
 msgid ""
-"Basic bandwidth limitation (YES) means simply that the bandwidth limits 
specified apply to GNUnet and only to GNUnet.  If set to YES, you simply 
specify the maximum bandwidth (upstream and downstream) that GNUnet is allowed 
to use and GNUnet will stick to those limitations.  This is useful if your 
overall bandwidth is so large that the limit is mostly used to ensure that 
enough capacity is left for other applications.  Even if you want to dedicate 
your entire connection to GNUnet you should not set the limits to values higher 
than what you have since GNUnet uses those limits to determine for example the 
number of connections to establish (and it would be inefficient if that 
computation yields a number that is far too high).  \n"
+"Basic bandwidth limitation (YES) means simply that the bandwidth limits "
+"specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
+"specify the maximum bandwidth (upstream and downstream) that GNUnet is "
+"allowed to use and GNUnet will stick to those limitations.  This is useful "
+"if your overall bandwidth is so large that the limit is mostly used to "
+"ensure that enough capacity is left for other applications.  Even if you "
+"want to dedicate your entire connection to GNUnet you should not set the "
+"limits to values higher than what you have since GNUnet uses those limits to "
+"determine for example the number of connections to establish (and it would "
+"be inefficient if that computation yields a number that is far too high).  \n"
 "\n"
-"While basic bandwidth limitation is simple and always works, there are some 
situations where it is not perfect.  Suppose you are running another 
application which performs a larger download. During that particular time, it 
would be nice if GNUnet would throttle its bandwidth consumption 
(automatically) and resume using more bandwidth after the download is complete. 
 This is obviously advanced magic since GNUnet will have to monitor the 
behavior of other applications. Another scenario is a monthly cap on bandwidth 
imposed by your ISP, which you would want to ensure is obeyed.  Here, you may 
want GNUnet to monitor the traffic from other applications to ensure that the 
combined long-term traffic is within the pre-set bounds.  Note that you should 
probably not set the bounds tightly since GNUnet may observe that the bounds 
are about to be broken but would be unable to stop other applications from 
continuing to use bandwidth.\n"
+"While basic bandwidth limitation is simple and always works, there are some "
+"situations where it is not perfect.  Suppose you are running another "
+"application which performs a larger download. During that particular time, "
+"it would be nice if GNUnet would throttle its bandwidth consumption "
+"(automatically) and resume using more bandwidth after the download is "
+"complete.  This is obviously advanced magic since GNUnet will have to "
+"monitor the behavior of other applications. Another scenario is a monthly "
+"cap on bandwidth imposed by your ISP, which you would want to ensure is "
+"obeyed.  Here, you may want GNUnet to monitor the traffic from other "
+"applications to ensure that the combined long-term traffic is within the pre-"
+"set bounds.  Note that you should probably not set the bounds tightly since "
+"GNUnet may observe that the bounds are about to be broken but would be "
+"unable to stop other applications from continuing to use bandwidth.\n"
 "\n"
-"If either of these two scenarios applies, set BASICLIMITING to NO. Then set 
the bandwidth limits to the COMBINED amount of traffic that is accepable for 
both GNUnet and other applications.  GNUnet will then immediately throttle 
bandwidth consumption if the short-term average is above the limit, and it will 
also try to ensure that the long-term average is below the limit.  Note however 
that using NO can have the effect of GNUnet (almost) ceasing operations after 
other applications perform high-volume downloads that are beyond the defined 
limits.  GNUnet would reduce consumption until the long-term limits are again 
within bounds.\n"
+"If either of these two scenarios applies, set BASICLIMITING to NO. Then set "
+"the bandwidth limits to the COMBINED amount of traffic that is accepable for "
+"both GNUnet and other applications.  GNUnet will then immediately throttle "
+"bandwidth consumption if the short-term average is above the limit, and it "
+"will also try to ensure that the long-term average is below the limit.  Note "
+"however that using NO can have the effect of GNUnet (almost) ceasing "
+"operations after other applications perform high-volume downloads that are "
+"beyond the defined limits.  GNUnet would reduce consumption until the long-"
+"term limits are again within bounds.\n"
 "\n"
-"NO only works on platforms where GNUnet can monitor the amount of traffic 
that the local host puts out on the network.  This is only implemented for 
Linux and Win32.  In order for the code to work, GNUnet needs to know the 
specific network interface that is used for the external connection (after all, 
the amount of traffic on loopback or on the LAN should never be counted since 
it is irrelevant)."
+"NO only works on platforms where GNUnet can monitor the amount of traffic "
+"that the local host puts out on the network.  This is only implemented for "
+"Linux and Win32.  In order for the code to work, GNUnet needs to know the "
+"specific network interface that is used for the external connection (after "
+"all, the amount of traffic on loopback or on the LAN should never be counted "
+"since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1261
+#: contrib/config-daemon.scm:1275
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Nätverksgränssnitt:"
 
-#: contrib/config-daemon.scm:1262
-msgid "For which interfaces should we do accounting?  GNUnet will evaluate the 
total traffic (not only the GNUnet related traffic) and adjust its bandwidth 
usage accordingly. You can currently only specify a single interface. GNUnet 
will also use this interface to determine the IP to use. Typical values are 
eth0, ppp0, eth1, wlan0, etc.  'ifconfig' will tell you what you have.  Never 
use 'lo', that just won't work.  Under Windows, specify the index number 
reported by  'gnunet-win-tool -n'."
+#: contrib/config-daemon.scm:1276
+msgid ""
+"For which interfaces should we do accounting?  GNUnet will evaluate the "
+"total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
+"usage accordingly. You can currently only specify a single interface. GNUnet "
+"will also use this interface to determine the IP to use. Typical values are "
+"eth0, ppp0, eth1, wlan0, etc.  'ifconfig' will tell you what you have.  "
+"Never use 'lo', that just won't work.  Under Windows, specify the index "
+"number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1273
+#: contrib/config-daemon.scm:1287
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1298 contrib/config-client.scm:353
+#: contrib/config-daemon.scm:1312 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -619,54 +846,97 @@
 
 #: contrib/config-client.scm:244
 msgid ""
-"Specify which additional extractor libraries should be used.  gnunet-insert 
uses libextractor to extract keywords from files. libextractor can be 
dynamically extended to handle additional file formats. If you want to use more 
than the default set of extractors, specify additional extractor libraries 
here.  The format is [[-]LIBRARYNAME[:[-]LIBRARYNAME]*].\n"
+"Specify which additional extractor libraries should be used.  gnunet-insert "
+"uses libextractor to extract keywords from files. libextractor can be "
+"dynamically extended to handle additional file formats. If you want to use "
+"more than the default set of extractors, specify additional extractor "
+"libraries here.  The format is [[-]LIBRARYNAME[:[-]LIBRARYNAME]*].\n"
 "\n"
-"The default is to use filenames and to break larger words at spaces (and 
underscores, etc.).  This should be just fine for most people. The '-' before a 
library name indicates that this should be executed last and makes only sense 
for the split-library."
+"The default is to use filenames and to break larger words at spaces (and "
+"underscores, etc.).  This should be just fine for most people. The '-' "
+"before a library name indicates that this should be executed last and makes "
+"only sense for the split-library."
 msgstr ""
 
+#: contrib/config-client.scm:257
+msgid "How many entries should the URI DB table have?"
+msgstr ""
+
 #: contrib/config-client.scm:258
+msgid ""
+"GNUnet uses two bytes per entry on the disk.  This database is used to keep "
+"track of how a particular URI has been used in the past.  For example, "
+"GNUnet may remember that a particular URI has been found in a search "
+"previously or corresponds to a file uploaded by the user.  This information "
+"can then be used by user-interfaces to filter URI lists, such as search "
+"results.  If the database is full, older entries will be discarded.  The "
+"default value should be sufficient without causing undue disk utilization."
+msgstr ""
+
+#: contrib/config-client.scm:269
 #, fuzzy
 msgid "File-Sharing options"
 msgstr "Visa alla alternativ"
 
-#: contrib/config-client.scm:273
+#: contrib/config-client.scm:285
 msgid "Which plugins should be loaded by gnunet-gtk?"
 msgstr ""
 
-#: contrib/config-client.scm:274
-msgid "Load the about plugin for the about dialog.  The daemon plugin allows 
starting and stopping of gnunetd and displays information about gnunetd.  The 
fs plugin provides the file-sharing functionality.  The stats plugin displays 
various statistics about gnunetd."
+#: contrib/config-client.scm:286
+msgid ""
+"Load the about plugin for the about dialog.  The daemon plugin allows "
+"starting and stopping of gnunetd and displays information about gnunetd.  "
+"The fs plugin provides the file-sharing functionality.  The stats plugin "
+"displays various statistics about gnunetd."
 msgstr ""
 
-#: contrib/config-client.scm:285
+#: contrib/config-client.scm:297
 msgid "How frequently (in milli-seconds) should the statistics update?"
 msgstr ""
 
-#: contrib/config-client.scm:286
-msgid "Each pixel in the stats dialog corresponds to the time interval 
specified here."
+#: contrib/config-client.scm:298
+msgid ""
+"Each pixel in the stats dialog corresponds to the time interval specified "
+"here."
 msgstr ""
 
-#: contrib/config-client.scm:298
+#: contrib/config-client.scm:310
 msgid "Do not show thumbnail previews from meta-data in search results"
 msgstr ""
 
-#: contrib/config-client.scm:299
-msgid "This option is useful for people who maybe offended by some previews or 
use gnunet-gtk at work and would like to avoid bad surprises."
+#: contrib/config-client.scm:311
+msgid ""
+"This option is useful for people who maybe offended by some previews or use "
+"gnunet-gtk at work and would like to avoid bad surprises."
 msgstr ""
 
-#: contrib/config-client.scm:310
+#: contrib/config-client.scm:322
+msgid "Do not show search results for files that were uploaded by us"
+msgstr ""
+
+#: contrib/config-client.scm:323
+msgid ""
+"This option is useful to eliminate files that the user already has from the "
+"search.  Naturally, enabling this option maybe confusing because some "
+"obviously expected search results would no longer show up.  This option only "
+"works if the URI_DB_SIZE option under FS is not zero (since the URI DB is "
+"used to determine which files the user is sharing)"
+msgstr ""
+
+#: contrib/config-client.scm:335
 msgid "To which directory should gnunet-gtk save downloads to?"
 msgstr ""
 
-#: contrib/config-client.scm:322
+#: contrib/config-client.scm:347
 #, fuzzy
 msgid "Options related to gnunet-gtk"
 msgstr "Ej ansluten till gnunetd."
 
-#: contrib/config-client.scm:341
+#: contrib/config-client.scm:367
 msgid "Full pathname of GNUnet client HOME directory"
 msgstr ""
 
-#: contrib/config-client.scm:342
+#: contrib/config-client.scm:368
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
@@ -681,7 +951,8 @@
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
-"This assistant will ask you a few basic questions in order to configure 
GNUnet.\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
 "\n"
 "Please visit our homepage at\n"
 "\thttp://gnunet.org\n";
@@ -694,7 +965,8 @@
 msgstr ""
 "Välkommen till GNUnet!\n"
 "\n"
-"Denna assistant kommer att fråga dig några enkla frågor för att konfigurera 
GNUnet.\n"
+"Denna assistant kommer att fråga dig några enkla frågor för att konfigurera "
+"GNUnet.\n"
 "\n"
 "Vänligen besök på webbplats på\n"
 "\thttp://gnunet.org/\n";
@@ -720,12 +992,23 @@
 msgid ""
 "Enter information about your network connection here.\n"
 "\n"
-"The \"Network interface\" is the device that connects your computer to the 
internet. This is usually a modem, an ISDN card or a network card in case you 
are using DSL.\n"
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL.\n"
 "\n"
-"If your provider always assigns the same IP-Address to you (a \"static\" 
IP-Address), enter it into the \"IP-Address\" field. If your IP-Address changes 
every now and then (\"dynamic\" IP-Address) but there's a hostname that always 
points to your actual IP-Address (\"Dynamic DNS\"), you can also enter it 
here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your 
IP-Address.\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address.\n"
 "\n"
-"If you are connected to the internet through another computer doing SNAT, a 
router or a \"hardware firewall\" and other computers on the internet cannot 
connect to this computer, check the last option on this page. Leave it 
unchecked on direct connections through modems, ISDN cards and DNAT (also known 
as \"port forwarding\")."
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, check the last option on this page. Leave it "
+"unchecked on direct connections through modems, ISDN cards and DNAT (also "
+"known as \"port forwarding\")."
 msgstr ""
 
 #: src/setup/gtk/gnunet-setup.glade:372
@@ -748,9 +1031,12 @@
 msgid ""
 "You can limit GNUnet's ressource usage here.\n"
 "\n"
-"\"Bandwidth limitation\" is how much data may be sent per second. If you have 
a flatrate you can set it to the maximum speed of your internet connection.\n"
+"\"Bandwidth limitation\" is how much data may be sent per second. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection.\n"
 "\n"
-"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed 
to use."
+"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
+"to use."
 msgstr ""
 
 #: src/setup/gtk/gnunet-setup.glade:833
@@ -796,14 +1082,23 @@
 
 #: src/setup/gtk/gnunet-setup.glade:1495
 msgid ""
-"GNUnet is able to store data from other peers in your datastore. This is 
useful if an adversary has access to your inserted content and you need to deny 
that the content is yours. With \"content migration\" on, the content could 
have \"migrated\" over the internet to your node without your knowledge.\n"
-"It also helps to spread popular content over different peers to enhance 
availability.\n"
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability.\n"
 "\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, 
inserted and migrated content). Its maximum size can be specified below.\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content). Its maximum size can be specified below.\n"
 "\n"
-"If you are an experienced user, you may want to tweak your GNUnet 
installation using the enhanced configurator.\n"
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
 "\n"
-"After changing the configuration and/or updating GNUnet, it is sometimes 
required to run gnunet-update to update internal data structures. Depending on 
the changes made, this may take some time."
+"After changing the configuration and/or updating GNUnet, it is sometimes "
+"required to run gnunet-update to update internal data structures. Depending "
+"on the changes made, this may take some time."
 msgstr ""
 
 #: src/setup/gtk/gnunet-setup.glade:1541
@@ -838,9 +1133,13 @@
 msgid ""
 "Define the user and the group owning the GNUnet service here.\n"
 "\n"
-"For security reasons, it is a good idea to let this setup create a new user 
account and a new group under which the GNUnet service is started at system 
startup.\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account and a new group under which the GNUnet service is started at system "
+"startup.\n"
 "\n"
-"However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
 "\n"
 "Leave the fields empty to run GNUnet with system privileges."
 msgstr ""
@@ -1016,7 +1315,8 @@
 "\n"
 "    a) Accompany it with the complete corresponding machine-readable\n"
 "    source code, which must be distributed under the terms of Sections\n"
-"    1 and 2 above on a medium customarily used for software interchange; 
or,\n"
+"    1 and 2 above on a medium customarily used for software interchange; "
+"or,\n"
 "\n"
 "    b) Accompany it with a written offer, valid for at least three\n"
 "    years, to give any third party, for a charge no more than your\n"
@@ -1123,7 +1423,8 @@
 "later version\", you have the option of following the terms and conditions\n"
 "either of that version or of any later version published by the Free\n"
 "Software Foundation.  If the Program does not specify a version number of\n"
-"this License, you may choose any version ever published by the Free 
Software\n"
+"this License, you may choose any version ever published by the Free "
+"Software\n"
 "Foundation.\n"
 "\n"
 "  10. If you wish to incorporate parts of the Program into other free\n"
@@ -1139,7 +1440,8 @@
 "  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
 "FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
 "OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
-"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER 
EXPRESSED\n"
+"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
+"EXPRESSED\n"
 "OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
 "MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
 "TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
@@ -1184,7 +1486,8 @@
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA\n"
+"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+"USA\n"
 "\n"
 "\n"
 "Also add information on how to contact you by electronic and paper mail.\n"
@@ -1193,7 +1496,8 @@
 "when it starts in an interactive mode:\n"
 "\n"
 "    Gnomovision version 69, Copyright (C) year  name of author\n"
-"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show 
w'.\n"
+"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
+"w'.\n"
 "    This is free software, and you are welcome to redistribute it\n"
 "    under certain conditions; type `show c' for details.\n"
 "\n"
@@ -1247,19 +1551,19 @@
 msgid "specify host on which gnunetd is running"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: src/include/gnunet_util_error.h:177 src/include/gnunet_util_error.h:179
-#: src/include/gnunet_util_error.h:181 src/include/gnunet_util_error.h:183
+#: src/include/gnunet_util_error.h:215 src/include/gnunet_util_error.h:217
+#: src/include/gnunet_util_error.h:219 src/include/gnunet_util_error.h:221
 #, c-format
 msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
-#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
+#: src/include/gnunet_util_error.h:228 src/include/gnunet_util_error.h:235
+#: src/include/gnunet_util_error.h:242 src/include/gnunet_util_error.h:249
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:225
+#: src/include/gnunet_util_error.h:256 src/include/gnunet_util_error.h:263
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
@@ -1272,7 +1576,9 @@
 #: src/transports/ip6.c:104 src/util/network/ip.c:83 src/util/network/ip.c:144
 #, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
-msgstr "Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under 
\"%s\"!\n"
+msgstr ""
+"Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%s"
+"\"!\n"
 
 #: src/transports/ip6.c:134 src/util/network/ip.c:113
 #: src/util/network/ip.c:234
@@ -1299,50 +1605,56 @@
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/udp6.c:521 src/transports/udp.c:534
+#: src/transports/udp6.c:544 src/transports/udp.c:575
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/http.c:447
+#: src/transports/http.c:448
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
 
-#: src/transports/http.c:672 src/transports/http.c:750
-#: src/transports/http.c:799 src/transports/http.c:936
+#: src/transports/http.c:754 src/transports/http.c:827
+#: src/transports/http.c:951 src/transports/http.c:1036
 #: src/transports/upnp/upnp.c:335 src/transports/upnp/upnp.c:560
-#: src/applications/bootstrap_http/http.c:121
-#: src/applications/bootstrap_http/http.c:261
-#: src/applications/bootstrap_http/http.c:282
-#: src/applications/bootstrap_http/http.c:316
-#: src/applications/bootstrap_http/http.c:334
-#: src/applications/bootstrap_http/http.c:348
-#: src/applications/bootstrap_http/http.c:360
-#: src/applications/bootstrap_http/http.c:372
+#: src/applications/bootstrap_http/http.c:124
+#: src/applications/bootstrap_http/http.c:269
+#: src/applications/bootstrap_http/http.c:290
+#: src/applications/bootstrap_http/http.c:324
+#: src/applications/bootstrap_http/http.c:342
+#: src/applications/bootstrap_http/http.c:356
+#: src/applications/bootstrap_http/http.c:368
+#: src/applications/bootstrap_http/http.c:380
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/transports/http.c:1126
-msgid "The UPnP service could not be loaded. To disable UPnP, set the 
configuration option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
+#: src/transports/http.c:1248
+msgid ""
+"The UPnP service could not be loaded. To disable UPnP, set the configuration "
+"option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:1134
+#: src/transports/http.c:1256
 msgid "# bytes received via HTTP"
 msgstr "# byte mottagna via HTTP"
 
-#: src/transports/http.c:1136
+#: src/transports/http.c:1258
 msgid "# bytes sent via HTTP"
 msgstr "# byte skickade via HTTP"
 
-#: src/transports/http.c:1138
+#: src/transports/http.c:1260
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte kastade via HTTP (utgående)"
 
 #: src/transports/smtp.c:257
 #, c-format
-msgid "You must specify the name of a pipe for the SMTP transport in section 
`%s' under `%s'.\n"
-msgstr "Du måste ange ett namn på röret för SMTP-transporten i sektion \"%s\" 
under \"%s\".\n"
+msgid ""
+"You must specify the name of a pipe for the SMTP transport in section `%s' "
+"under `%s'.\n"
+msgstr ""
+"Du måste ange ett namn på röret för SMTP-transporten i sektion \"%s\" under "
+"\"%s\".\n"
 
 #: src/transports/smtp.c:334
 msgid "Received malformed message via SMTP (size mismatch).\n"
@@ -1358,98 +1670,100 @@
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
-#: src/transports/smtp.c:546
+#: src/transports/smtp.c:547
 #, fuzzy, c-format
 msgid "Failed to initialize libesmtp: %s.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transports/smtp.c:610
+#: src/transports/smtp.c:611
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Sändning av e-post till \"%s\" misslyckades.\n"
 
-#: src/transports/smtp.c:678
+#: src/transports/smtp.c:679
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s filter %s (SMTP)"
 
-#: src/transports/smtp.c:706
+#: src/transports/smtp.c:707
 #, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 
-#: src/transports/tcp.c:271
+#: src/transports/tcp.c:274
 #, fuzzy
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
 
-#: src/transports/tcp.c:357
+#: src/transports/tcp.c:358
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/transports/tcp.c:424 src/transports/tcp6.c:379
+#: src/transports/tcp.c:425 src/transports/tcp6.c:382
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:569
-msgid "The UPnP service could not be loaded. To disable UPnP, set the 
configuration option \"UPNP\" in section \"TCP\" to \"NO\"\n"
+#: src/transports/tcp.c:592
+msgid ""
+"The UPnP service could not be loaded. To disable UPnP, set the configuration "
+"option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:577
+#: src/transports/tcp.c:600
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transports/tcp.c:579
+#: src/transports/tcp.c:602
 msgid "# bytes sent via TCP"
 msgstr "# byte skickades via TCP"
 
-#: src/transports/tcp.c:581
+#: src/transports/tcp.c:604
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transports/udp.c:276
+#: src/transports/udp.c:293
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/udp.c:367
+#: src/transports/udp.c:382
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/transports/udp.c:552
+#: src/transports/udp.c:593
 msgid "# bytes received via UDP"
 msgstr "# byte mottagna via UDP"
 
-#: src/transports/udp.c:554
+#: src/transports/udp.c:595
 msgid "# bytes sent via UDP"
 msgstr "# byte skickade via UDP"
 
-#: src/transports/udp.c:556
+#: src/transports/udp.c:597
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/transports/tcp6.c:223
+#: src/transports/tcp6.c:226
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/transports/tcp6.c:265
+#: src/transports/tcp6.c:268
 #, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/transports/tcp6.c:519
+#: src/transports/tcp6.c:547
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "# byte mottogs via TCP"
 
-#: src/transports/tcp6.c:521
+#: src/transports/tcp6.c:549
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "# byte skickades via TCP"
 
-#: src/transports/tcp6.c:523
+#: src/transports/tcp6.c:551
 #, fuzzy
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
@@ -1464,26 +1778,11 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/tcp_old.c:1299
-#, fuzzy
-msgid "# bytes received via TCP-OLD"
-msgstr "# byte mottogs via TCP"
-
-#: src/transports/tcp_old.c:1301
-#, fuzzy
-msgid "# bytes sent via TCP-OLD"
-msgstr "# byte skickades via TCP"
-
-#: src/transports/tcp_old.c:1303
-#, fuzzy
-msgid "# bytes dropped by TCP-OLD (outgoing)"
-msgstr "# byte kastade via TCP (utgående)"
-
 #: src/transports/tcp_helper.c:193
 msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr ""
 
-#: src/transports/tcp_helper.c:204
+#: src/transports/tcp_helper.c:205
 #, fuzzy
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
@@ -1493,34 +1792,20 @@
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/applications/dht/tools/dhttest2.c:45
-#: src/applications/session/sessiontest.c:42
-#: src/applications/stats/statistics.c:229
-#: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:100
-#: src/applications/gap/gaptest.c:49
-msgid "# of connected peers"
-msgstr "# av anslutna parter"
+#: src/applications/dht/tools/dhttest2.c:46
+#: src/applications/dht/module/table.c:701
+#, fuzzy
+msgid "# dht connections"
+msgstr "Nätverksanslutning"
 
-#: src/applications/dht/tools/dhttest2.c:160
-#, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr "Väntar på att gnunetd ska starta (%u iterationer kvar)...\n"
-
-#: src/applications/dht/tools/dhttest2.c:173
-#: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:116
-#, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
-
 #: src/applications/dht/tools/dht-query.c:55
 msgid "Query (get KEY, put KEY VALUE) DHT table."
 msgstr ""
 
 #: src/applications/dht/tools/dht-query.c:59
 #, fuzzy
-msgid "allow TIME ms to process a GET command or expire PUT content after ms 
TIME"
+msgid ""
+"allow TIME ms to process a GET command or expire PUT content after ms TIME"
 msgstr "tillåt TID ms för behandling av varje kommando"
 
 #: src/applications/dht/tools/dht-query.c:103
@@ -1568,20 +1853,15 @@
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "\"%s\" misslyckades. Terminerar anslutning till klient.\n"
 
-#: src/applications/dht/module/cs.c:230
+#: src/applications/dht/module/cs.c:240
 #, fuzzy, c-format
 msgid "`%s' registering client handlers: %d %d\n"
 msgstr "\"%s\" registrerar klienthandtag %d\n"
 
-#: src/applications/dht/module/cs.c:249
+#: src/applications/dht/module/cs.c:259
 msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
-#: src/applications/dht/module/table.c:701
-#, fuzzy
-msgid "# dht connections"
-msgstr "Nätverksanslutning"
-
 #: src/applications/dht/module/table.c:702
 #, fuzzy
 msgid "# dht discovery messages received"
@@ -1659,7 +1939,7 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:126
 #: src/applications/testbed/gnunet-testbed.c:547 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:286
+#: src/setup/gnunet-setup.c:287
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Använd --help för att få en lista på flaggor.\n"
@@ -1681,156 +1961,188 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
 
-#: src/applications/advertising/advertising.c:168
-#, c-format
-msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+#: src/applications/advertising/advertising.c:188
+#, fuzzy, c-format
+msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
+msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
+
+#: src/applications/advertising/advertising.c:196
+msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:175
-msgid "hello message received invalid (expiration time over limit). 
Dropping.\n"
+#: src/applications/advertising/advertising.c:367
+msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:182
-#, c-format
-msgid "hello transport verification failed (%u).\n"
+#: src/applications/advertising/advertising.c:385
+msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:192
+#: src/applications/advertising/advertising.c:549
 #, c-format
-msgid "hello advertisement for protocol %d received.\n"
+msgid "Advertising my transport %d to selected peers.\n"
+msgstr "Annonserar min transport %d till valda ändpunkter.\n"
+
+#: src/applications/advertising/advertising.c:557
+msgid ""
+"Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:327
-msgid "Could not send hellos+PING, ping buffer full.\n"
+#: src/applications/advertising/advertising.c:832
+msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:341
-#, c-format
-msgid "`%s' failed (%d, %u). Will not send PING.\n"
-msgstr "\"%s\" misslyckades (%d, %u). Kommer inte skicka PING.\n"
+#: src/applications/advertising/advertising.c:833
+msgid "# Peer advertisements of type NAT received"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:504
-#, c-format
-msgid "Advertising my transport %d to selected peers.\n"
-msgstr "Annonserar min transport %d till valda ändpunkter.\n"
+#: src/applications/advertising/advertising.c:834
+msgid "# Peer advertisements confirmed via PONG"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:511
-msgid "Announcing ourselves pointless: no other peers are known to us so 
far.\n"
+#: src/applications/advertising/advertising.c:835
+msgid "# Peer advertisements updating earlier HELLOs"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:613
-#, c-format
-msgid "Removing hello from peer `%s' (expired %ds ago).\n"
+#: src/applications/advertising/advertising.c:836
+#, fuzzy
+msgid "# Peer advertisements discarded due to load"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/applications/advertising/advertising.c:837
+msgid "# Peer advertisements for unsupported transport"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:794
-msgid "# Peer advertisements received"
+#: src/applications/advertising/advertising.c:838
+msgid "# Peer advertisements not confirmed due to ping busy"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:795
+#: src/applications/advertising/advertising.c:839
+msgid "# Peer advertisements not confirmed due to lack of self ad"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:840
+msgid "# Peer advertisements not confirmed due to send error"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:841
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:796
+#: src/applications/advertising/advertising.c:842
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:798
-#: src/applications/pingpong/pingpong.c:493
+#: src/applications/advertising/advertising.c:844
+#: src/applications/pingpong/pingpong.c:516
 msgid "# plaintext PING messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/applications/advertising/advertising.c:802
-#: src/applications/session/connect.c:892
+#: src/applications/advertising/advertising.c:849
+#: src/applications/session/connect.c:936
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "\"%s\" registrerar handtag %d (klartext och kryptotext)\n"
 
-#: src/applications/advertising/advertising.c:820
-msgid "ensures that this peer is known by other peers and discovers other 
peers"
+#: src/applications/advertising/advertising.c:867
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:447
+#: src/applications/topology_default/topology.c:448
 msgid "maintains GNUnet default mesh topology"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:123
-#: src/applications/pingpong/pingpong.c:191
-#: src/applications/pingpong/pingpong.c:244
-#: src/applications/pingpong/pingpong.c:314
+#: src/applications/pingpong/pingpong.c:128
+#: src/applications/pingpong/pingpong.c:199
+#: src/applications/pingpong/pingpong.c:264
+#: src/applications/pingpong/pingpong.c:335
 #, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:135
+#: src/applications/pingpong/pingpong.c:140
 msgid "Received ping for another peer. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:201
+#: src/applications/pingpong/pingpong.c:210
 msgid "Received PING not destined for us!\n"
 msgstr "Mottog PING som ej var ämnat för oss!\n"
 
-#: src/applications/pingpong/pingpong.c:287
-#: src/applications/pingpong/pingpong.c:350
-msgid "Could not match PONG against any PING. Try increasing MAX_PING_PONG 
constant.\n"
+#: src/applications/pingpong/pingpong.c:308
+#: src/applications/pingpong/pingpong.c:371
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:393
+#: src/applications/pingpong/pingpong.c:414
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr "Kan inte skapa PING, tabell är full. Försök att öka MAX_PING_PONG.\n"
 
-#: src/applications/pingpong/pingpong.c:483
+#: src/applications/pingpong/pingpong.c:506
 msgid "# encrypted PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/applications/pingpong/pingpong.c:485
+#: src/applications/pingpong/pingpong.c:508
 msgid "# plaintext PONG messages received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/applications/pingpong/pingpong.c:487
+#: src/applications/pingpong/pingpong.c:510
 msgid "# encrypted PING messages received"
 msgstr "# krypterade PING-meddelanden mottagna"
 
-#: src/applications/pingpong/pingpong.c:489
+#: src/applications/pingpong/pingpong.c:512
 msgid "# PING messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/applications/pingpong/pingpong.c:491
+#: src/applications/pingpong/pingpong.c:514
+#: src/applications/session/connect.c:931
 msgid "# encrypted PONG messages sent"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/applications/pingpong/pingpong.c:495
+#: src/applications/pingpong/pingpong.c:518
+#: src/applications/session/connect.c:929
 msgid "# encrypted PING messages sent"
 msgstr "# krypterade PING-meddelanden skickade"
 
-#: src/applications/pingpong/pingpong.c:505
+#: src/applications/pingpong/pingpong.c:520
+#, fuzzy
+msgid "# plaintext PONG messages sent"
+msgstr "# PING-meddelanden i klartext skickade"
+
+#: src/applications/pingpong/pingpong.c:522
+#, fuzzy
+msgid "# plaintext PONG transmissions failed"
+msgstr "# klartext PONG-meddelanden mottagna"
+
+#: src/applications/pingpong/pingpong.c:532
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "\"%s\" registrerar handtag %d %d (klartext och kryptotext)\n"
 
 #: src/applications/sqstore_sqlite/sqlite.c:46
 #: src/applications/sqstore_sqlite/sqlite.c:53
-#: src/applications/sqstore_mysql/mysql.c:138
-#: src/applications/sqstore_mysql/mysql.c:145
-#: src/applications/sqstore_mysql/mysql.c:423
-#: src/applications/sqstore_mysql/mysql.c:754
-#: src/applications/sqstore_mysql/mysql.c:770
-#: src/applications/sqstore_mysql/mysql.c:780
-#: src/applications/sqstore_mysql/mysql.c:805
-#: src/applications/sqstore_mysql/mysql.c:816
-#: src/applications/sqstore_mysql/mysql.c:873
-#: src/applications/sqstore_mysql/mysql.c:960
-#: src/applications/sqstore_mysql/mysql.c:971
-#: src/applications/sqstore_mysql/mysql.c:1035
-#: src/applications/sqstore_mysql/mysql.c:1051
-#: src/applications/sqstore_mysql/mysql.c:1061
-#: src/applications/sqstore_mysql/mysql.c:1085
-#: src/applications/sqstore_mysql/mysql.c:1096
-#: src/applications/sqstore_mysql/mysql.c:1108
-#: src/applications/sqstore_mysql/mysql.c:1171
-#: src/applications/sqstore_mysql/mysql.c:1183
-#: src/applications/sqstore_mysql/mysql.c:1234
-#: src/applications/sqstore_mysql/mysql.c:1249
+#: src/applications/sqstore_mysql/mysql.c:139
+#: src/applications/sqstore_mysql/mysql.c:146
+#: src/applications/sqstore_mysql/mysql.c:795
+#: src/applications/sqstore_mysql/mysql.c:811
+#: src/applications/sqstore_mysql/mysql.c:821
+#: src/applications/sqstore_mysql/mysql.c:846
+#: src/applications/sqstore_mysql/mysql.c:857
+#: src/applications/sqstore_mysql/mysql.c:914
+#: src/applications/sqstore_mysql/mysql.c:1001
+#: src/applications/sqstore_mysql/mysql.c:1012
+#: src/applications/sqstore_mysql/mysql.c:1076
+#: src/applications/sqstore_mysql/mysql.c:1092
+#: src/applications/sqstore_mysql/mysql.c:1102
+#: src/applications/sqstore_mysql/mysql.c:1126
+#: src/applications/sqstore_mysql/mysql.c:1137
+#: src/applications/sqstore_mysql/mysql.c:1149
+#: src/applications/sqstore_mysql/mysql.c:1212
+#: src/applications/sqstore_mysql/mysql.c:1224
+#: src/applications/sqstore_mysql/mysql.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1291
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/applications/dstore/dstore.c:91 src/applications/dstore/dstore.c:178
@@ -1850,9 +2162,9 @@
 
 #: src/applications/sqstore_sqlite/sqlite.c:357
 #: src/applications/sqstore_sqlite/sqlite.c:378
-#: src/applications/sqstore_mysql/mysql.c:260
-#: src/applications/sqstore_mysql/mysql.c:834
-#: src/applications/sqstore_mysql/mysql.c:1123
+#: src/applications/sqstore_mysql/mysql.c:261
+#: src/applications/sqstore_mysql/mysql.c:875
+#: src/applications/sqstore_mysql/mysql.c:1164
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
@@ -1862,76 +2174,92 @@
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1342
-#: src/applications/sqstore_mysql/mysql.c:1310
+#: src/applications/sqstore_sqlite/sqlite.c:1370
+#: src/applications/sqstore_mysql/mysql.c:1352
 msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/session/connect.c:257
-#: src/applications/session/connect.c:274
+#: src/applications/session/sessiontest.c:43
+#: src/applications/stats/statistics.c:229
+msgid "# of connected peers"
+msgstr "# av anslutna parter"
+
+#: src/applications/session/connect.c:261
+#: src/applications/session/connect.c:278
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:315
+#: src/applications/session/connect.c:321
 #, fuzzy, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
 
-#: src/applications/session/connect.c:587
+#: src/applications/session/connect.c:520
+#, fuzzy
+msgid "Could not create any HELLO for myself!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/applications/session/connect.c:621
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "Meddelande mottaget från motpart är ogiltig.\n"
 
-#: src/applications/session/connect.c:605
+#: src/applications/session/connect.c:639
 #, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:637
+#: src/applications/session/connect.c:673
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:647
+#: src/applications/session/connect.c:683
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:716
+#: src/applications/session/connect.c:752
 #, c-format
-msgid "Error parsing encrypted session key from `%s', given message part size 
is invalid.\n"
+msgid ""
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:728
+#: src/applications/session/connect.c:764
 #, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:881
+#: src/applications/session/connect.c:921
 msgid "# session keys sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/applications/session/connect.c:883
+#: src/applications/session/connect.c:923
 msgid "# session keys rejected"
 msgstr "# sessionnycklar vägrade"
 
-#: src/applications/session/connect.c:885
+#: src/applications/session/connect.c:925
 msgid "# session keys accepted"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/applications/session/connect.c:887
+#: src/applications/session/connect.c:927
 msgid "# sessions established"
 msgstr "# sessioner etablerade"
 
 #: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be registered: another callback is already 
using this name (%p)\n"
+msgid ""
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
 msgstr ""
 
 #: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be unregistered: another callback 
registered under that name: %p\n"
+msgid ""
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
 msgstr ""
 
 #: src/applications/rpc/rpc.c:233
@@ -1983,19 +2311,28 @@
 msgid "async RPC reply not received.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:261
-#: src/applications/sqstore_mysql/mysql.c:835
-#: src/applications/sqstore_mysql/mysql.c:1124
+#: src/applications/sqstore_mysql/mysql.c:262
+#: src/applications/sqstore_mysql/mysql.c:876
+#: src/applications/sqstore_mysql/mysql.c:1165
 msgid "mysql datastore"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1340
+#: src/applications/sqstore_mysql/mysql.c:424
+#, fuzzy, c-format
+msgid ""
+"`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s DG/%"
+"s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/applications/sqstore_mysql/mysql.c:1382
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1363
-msgid "Failed to load MySQL database module.  Check that MySQL is running and 
configured properly!\n"
+#: src/applications/sqstore_mysql/mysql.c:1405
+msgid ""
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
 msgstr ""
 
 #: src/applications/datastore/datastore.c:120
@@ -2013,67 +2350,67 @@
 msgstr ""
 
 #: src/applications/datastore/datastore.c:392
-#: src/applications/datastore/datastore.c:501
+#: src/applications/datastore/datastore.c:489
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:476
-#, fuzzy
-msgid "Deleting expired content.  This may take a while.\n"
-msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
-
-#: src/applications/datastore/datastore.c:482
-msgid "Completed deleting expired content.\n"
-msgstr ""
-
 #: src/applications/identity/hostkey.c:123
 #, fuzzy, c-format
 msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/applications/identity/hostkey.c:157
+#: src/applications/identity/hostkey.c:154
 #, c-format
-msgid "Existing hostkey in file `%s' failed format check, creating new 
hostkey.\n"
-msgstr "Existerande värdnyckel i filen \"%s\" felade vid formatkontroll, 
skapar en ny värdnyckel.\n"
+msgid ""
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+msgstr ""
+"Existerande värdnyckel i filen \"%s\" felade vid formatkontroll, skapar en "
+"ny värdnyckel.\n"
 
-#: src/applications/identity/hostkey.c:165
+#: src/applications/identity/hostkey.c:162
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/applications/identity/hostkey.c:178
+#: src/applications/identity/hostkey.c:175
 msgid "Done creating hostkey.\n"
 msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/applications/identity/identity.c:346
+#: src/applications/identity/identity.c:347
 #, c-format
-msgid "File `%s' in directory `%s' does not match naming convention. 
Removed.\n"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:359
+#: src/applications/identity/identity.c:360
 #, c-format
-msgid "Directory `%s' in directory `%s' does not match naming convention. 
Removed.\n"
+msgid ""
+"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:396
+#: src/applications/identity/identity.c:397
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:686
-#: src/applications/identity/identity.c:706
+#: src/applications/identity/identity.c:730
+#: src/applications/identity/identity.c:758
 #, c-format
-msgid "Removed file `%s' containing invalid hello data.\n"
+msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:759
+#: src/applications/identity/identity.c:812
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:768
+#: src/applications/identity/identity.c:822
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
+#: src/applications/identity/identity.c:1278
+msgid "invalid"
+msgstr ""
+
 #: src/applications/testbed/commands.c:1130
 #: src/applications/stats/gnunet-stats.c:65
 #, c-format
@@ -2224,7 +2561,8 @@
 
 #: src/applications/testbed/testbed.c:1002
 #, c-format
-msgid "Received testbed message of type %u but unexpected size %u, expected 
%u\n"
+msgid ""
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
 msgstr ""
 
 #: src/applications/testbed/testbed.c:1045
@@ -2271,49 +2609,56 @@
 
 #: src/applications/transport/transport.c:142
 #, c-format
-msgid "Converting peer address to string failed, transport type %d not 
supported\n"
+msgid ""
+"Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:189
+#: src/applications/transport/transport.c:188
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:284
+#: src/applications/transport/transport.c:240
+#, c-format
+msgid ""
+"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:301
 #, fuzzy, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/applications/transport/transport.c:373
+#: src/applications/transport/transport.c:389
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/applications/transport/transport.c:430
+#: src/applications/transport/transport.c:446
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:631
+#: src/applications/transport/transport.c:647
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/applications/transport/transport.c:651
+#: src/applications/transport/transport.c:667
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/applications/transport/transport.c:661
+#: src/applications/transport/transport.c:677
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:688
+#: src/applications/transport/transport.c:704
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/applications/transport/transport.c:701
+#: src/applications/transport/transport.c:717
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
@@ -2386,12 +2731,12 @@
 msgid "# bytes of noise received"
 msgstr ""
 
-#: src/applications/stats/statistics.c:384
+#: src/applications/stats/statistics.c:398
 #, fuzzy, c-format
 msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
 
-#: src/applications/stats/statistics.c:405
+#: src/applications/stats/statistics.c:419
 msgid "keeps statistics about gnunetd's operation"
 msgstr "behåller statistik om gnunetds operation"
 
@@ -2580,34 +2925,29 @@
 "Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:51
-#: src/applications/tbench/tbenchtest_udp.c:50
+#: src/applications/tbench/tbenchtest.c:53
 #, c-format
 msgid "Using %u messages of size %u for %u times.\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:78
-#: src/applications/tbench/tbenchtest_udp.c:77
+#: src/applications/tbench/tbenchtest.c:80
 #, c-format
 msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:83
-#: src/applications/tbench/tbenchtest_udp.c:82
+#: src/applications/tbench/tbenchtest.c:85
 #, c-format
 msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:89
-#: src/applications/tbench/tbenchtest_udp.c:88
+#: src/applications/tbench/tbenchtest.c:91
 #, c-format
 msgid ""
 "\n"
 "Failed to receive reply from gnunetd.\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:212
-#: src/applications/tbench/tbenchtest_udp.c:211
+#: src/applications/tbench/tbenchtest.c:148
 #, c-format
 msgid "Running benchmark...\n"
 msgstr ""
@@ -2621,7 +2961,8 @@
 msgstr ""
 
 #: src/applications/tracekit/gnunet-tracekit.c:51
-msgid "specify output format; 0 for human readable output, 1 for dot, 2 for 
vcg"
+msgid ""
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
 #: src/applications/tracekit/gnunet-tracekit.c:57
@@ -2634,7 +2975,9 @@
 
 #: src/applications/tracekit/gnunet-tracekit.c:115
 #, c-format
-msgid "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for 
vcg.\n"
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
 msgstr ""
 
 #: src/applications/tracekit/gnunet-tracekit.c:163
@@ -2680,109 +3023,112 @@
 msgid "allows mapping of the network topology"
 msgstr "tillåter kartläggning av nätverkstopologin"
 
-#: src/applications/gap/gap.c:1690
+#: src/applications/gap/gap.c:1705
 #, fuzzy, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/applications/gap/gap.c:1691
+#: src/applications/gap/gap.c:1706
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1865
-msgid "Cover traffic requested but traffic service not loaded.  Rejecting 
request.\n"
+#: src/applications/gap/gap.c:1882
+msgid ""
+"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1877 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1894 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1884 src/applications/gap/gap.c:1890
-#: src/applications/gap/gap.c:1897
+#: src/applications/gap/gap.c:1901 src/applications/gap/gap.c:1907
+#: src/applications/gap/gap.c:1914
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2181
+#: src/applications/gap/gap.c:2202
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2182
+#: src/applications/gap/gap.c:2203
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2183
+#: src/applications/gap/gap.c:2204
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2184
+#: src/applications/gap/gap.c:2205
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2185
+#: src/applications/gap/gap.c:2206
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2207
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2187
+#: src/applications/gap/gap.c:2208
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2188
+#: src/applications/gap/gap.c:2209
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2189
+#: src/applications/gap/gap.c:2210
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2190
+#: src/applications/gap/gap.c:2211
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2191
+#: src/applications/gap/gap.c:2212
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2192
+#: src/applications/gap/gap.c:2213
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2193
+#: src/applications/gap/gap.c:2214
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2194
-msgid "# gap spurious replies"
+#: src/applications/gap/gap.c:2215
+msgid "# gap spurious replies (dropped)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2195
+#: src/applications/gap/gap.c:2216
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2196
+#: src/applications/gap/gap.c:2217
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2197
+#: src/applications/gap/gap.c:2218
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2198
+#: src/applications/gap/gap.c:2219
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2199
+#: src/applications/gap/gap.c:2220
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2215
-msgid "Traffic service failed to load; gap cannot ensure cover-traffic 
availability.\n"
+#: src/applications/gap/gap.c:2236
+msgid ""
+"Traffic service failed to load; gap cannot ensure cover-traffic "
+"availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2243
+#: src/applications/gap/gap.c:2264
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "\"%s\" registrerar handtag %d %d\n"
@@ -2829,10 +3175,14 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:86
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
-msgstr "Skapa nya pseudonymer, ta bort pseudonymer eller lista existerande 
pseudonymer."
+msgstr ""
+"Skapa nya pseudonymer, ta bort pseudonymer eller lista existerande "
+"pseudonymer."
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:89
-msgid "use the given keyword to advertise the namespace (use when creating a 
new pseudonym)"
+msgid ""
+"use the given keyword to advertise the namespace (use when creating a new "
+"pseudonym)"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:92
@@ -2840,7 +3190,9 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:95
-msgid "do not generate an advertisement for this namespace (use when creating 
a new pseudonym)"
+msgid ""
+"do not generate an advertisement for this namespace (use when creating a new "
+"pseudonym)"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:98
@@ -2848,7 +3200,9 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:101
-msgid "specify IDENTIFIER to be the address of the entrypoint to content in 
the namespace (use when creating a new pseudonym)"
+msgid ""
+"specify IDENTIFIER to be the address of the entrypoint to content in the "
+"namespace (use when creating a new pseudonym)"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:104
@@ -2992,7 +3346,8 @@
 #: src/applications/fs/tools/gnunet-insert.c:224
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
-msgstr "Uppladdning av \"%s\" klar, %llu byte tog %llu sekunder (%8.3f 
kbps).\n"
+msgstr ""
+"Uppladdning av \"%s\" klar, %llu byte tog %llu sekunder (%8.3f kbps).\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:235
 #, c-format
@@ -3007,10 +3362,10 @@
 msgstr "Nedladdning avbruten."
 
 #: src/applications/fs/tools/gnunet-insert.c:251
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Error uploading file: %s\n"
+"Error uploading file: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
@@ -3023,8 +3378,12 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:277
-msgid "even if gnunetd is running on the local machine, force the creation of 
a copy instead of making a link to the GNUnet share directory"
-msgstr "även om gnunetd körs på den lokala maskinen, tvinga fram skapandet av 
en kopia istället för att göra en länk till GNUnets utdelade katalog"
+msgid ""
+"even if gnunetd is running on the local machine, force the creation of a "
+"copy instead of making a link to the GNUnet share directory"
+msgstr ""
+"även om gnunetd körs på den lokala maskinen, tvinga fram skapandet av en "
+"kopia istället för att göra en länk till GNUnets utdelade katalog"
 
 #: src/applications/fs/tools/gnunet-insert.c:281
 msgid "disable adding the creation time to the metadata of the uploaded file"
@@ -3032,11 +3391,17 @@
 
 #: src/applications/fs/tools/gnunet-insert.c:284
 #, fuzzy
-msgid "do not use libextractor to add additional references to directory 
entries and/or the published file"
-msgstr "använd libextractor för att lägga till ytterligare direktreferenser 
till katalogposter"
+msgid ""
+"do not use libextractor to add additional references to directory entries "
+"and/or the published file"
+msgstr ""
+"använd libextractor för att lägga till ytterligare direktreferenser till "
+"katalogposter"
 
 #: src/applications/fs/tools/gnunet-insert.c:287
-msgid "print list of extracted keywords that would be used, but do not perform 
upload"
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:289
@@ -3044,15 +3409,21 @@
 msgstr "Gör filer tillgängliga via utdelning till GNUnet."
 
 #: src/applications/fs/tools/gnunet-insert.c:292
-msgid "set interval for availability of updates to SECONDS (for namespace 
insertions only)"
+msgid ""
+"set interval for availability of updates to SECONDS (for namespace "
+"insertions only)"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:296
-msgid "add an additional keyword for the top-level file or directory (this 
option can be specified multiple times)"
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:300
-msgid "add an additional keyword for all files and directories (this option 
can be specified multiple times)"
+msgid ""
+"add an additional keyword for all files and directories (this option can be "
+"specified multiple times)"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:305
@@ -3060,11 +3431,15 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:308
-msgid "do not index, perform full insertion (stores entire file in encrypted 
form in GNUnet database)"
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:312
-msgid "specify ID of an updated version to be published in the future (for 
namespace insertions only)"
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:316
@@ -3076,11 +3451,14 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:322
-msgid "specifies this as an aperiodic but updated publication (for namespace 
insertions only)"
+msgid ""
+"specifies this as an aperiodic but updated publication (for namespace "
+"insertions only)"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:326
-msgid "set the ID of this version of the publication (for namespace insertions 
only)"
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:330
@@ -3137,7 +3515,11 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-download.c:71
-msgid "download a GNUnet directory that has already been downloaded.  Requires 
that a filename of an existing file is specified instead of the URI.  The 
download will only download the top-level files in the directory unless the 
`-R' option is also specified."
+msgid ""
+"download a GNUnet directory that has already been downloaded.  Requires that "
+"a filename of an existing file is specified instead of the URI.  The "
+"download will only download the top-level files in the directory unless the "
+"`-R' option is also specified."
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-download.c:73
@@ -3170,7 +3552,8 @@
 #: src/applications/fs/tools/gnunet-download.c:123
 #, fuzzy, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
-msgstr "Hämtning av fil \"%s\" färdig.  Hastigheten var %8.3f kilobyte per 
sekund.\n"
+msgstr ""
+"Hämtning av fil \"%s\" färdig.  Hastigheten var %8.3f kilobyte per sekund.\n"
 
 #: src/applications/fs/tools/gnunet-download.c:171
 msgid "no name given"
@@ -3183,7 +3566,8 @@
 
 #: src/applications/fs/tools/gnunet-download.c:225
 msgid "Not enough arguments. You must specify a GNUnet file URI\n"
-msgstr "Inte tillräckligt med argument. Du måste ange en URI till en 
GNUnet-fil\n"
+msgstr ""
+"Inte tillräckligt med argument. Du måste ange en URI till en GNUnet-fil\n"
 
 #: src/applications/fs/tools/gnunet-download.c:246
 #, c-format
@@ -3217,8 +3601,12 @@
 
 #: src/applications/fs/tools/gnunet-unindex.c:57
 #, c-format
-msgid "%16llu of %16llu bytes unindexed (estimating %llu seconds to 
completion)                "
-msgstr "%16llu av %16llu byte avindexerat (uppskattar %llu sekunder till 
färdigställd)                "
+msgid ""
+"%16llu of %16llu bytes unindexed (estimating %llu seconds to "
+"completion)                "
+msgstr ""
+"%16llu av %16llu byte avindexerat (uppskattar %llu sekunder till "
+"färdigställd)                "
 
 #: src/applications/fs/tools/gnunet-unindex.c:68
 #, fuzzy, c-format
@@ -3245,13 +3633,22 @@
 #: src/applications/fs/tools/gnunet-unindex.c:137
 #, fuzzy
 msgid "Not enough arguments. You must specify a filename.\n"
-msgstr "Inte tillräckligt med argument. Du måste ange en URI till en 
GNUnet-fil\n"
+msgstr ""
+"Inte tillräckligt med argument. Du måste ange en URI till en GNUnet-fil\n"
 
 #: src/applications/fs/tools/gnunet-unindex.c:164
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "\"%s\" misslyckades.  Är \"%s\" en fil?\n"
 
+#: src/applications/fs/module/querymanager.c:227
+msgid "# FS currently tracked queries from clients"
+msgstr ""
+
+#: src/applications/fs/module/querymanager.c:229
+msgid "# FS replies passed to clients"
+msgstr ""
+
 #: src/applications/fs/module/ondemand.c:336
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
@@ -3259,12 +3656,17 @@
 
 #: src/applications/fs/module/ondemand.c:434
 #, c-format
-msgid "Because the file `%s' has been unavailable for 3 days it got removed 
from your share.  Please unindex files before deleting them as the index now 
contains invalid references!\n"
+msgid ""
+"Because the file `%s' has been unavailable for 3 days it got removed from "
+"your share.  Please unindex files before deleting them as the index now "
+"contains invalid references!\n"
 msgstr ""
 
 #: src/applications/fs/module/ondemand.c:461
 #, c-format
-msgid "Configuration file must specify directory for storage of FS data in 
section `%s' under `%s'.\n"
+msgid ""
+"Configuration file must specify directory for storage of FS data in section `"
+"%s' under `%s'.\n"
 msgstr ""
 
 #: src/applications/fs/module/ondemand.c:518
@@ -3273,20 +3675,34 @@
 
 #: src/applications/fs/module/ondemand.c:681
 #, c-format
-msgid "Unindexed ODB block `%s' from offset %llu already missing from 
datastore.\n"
+msgid ""
+"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1139
+#: src/applications/fs/module/fs.c:1167
 #, c-format
-msgid "You must specify a postive number for `%s' in the configuration in 
section `%s'.\n"
-msgstr "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i 
sektion \"%s\".\n"
+msgid ""
+"You must specify a postive number for `%s' in the configuration in section `%"
+"s'.\n"
+msgstr ""
+"Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
+"\".\n"
 
 #: src/applications/fs/module/fs.c:1180
+msgid "# FS expired replies dropped"
+msgstr ""
+
+#: src/applications/fs/module/fs.c:1182
+#, fuzzy
+msgid "# FS valid replies received"
+msgstr "# byte mottogs via TCP"
+
+#: src/applications/fs/module/fs.c:1219
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1220
+#: src/applications/fs/module/fs.c:1259
 msgid "enables (anonymous) file-sharing"
 msgstr "aktiverar (anonym) fildelning"
 
@@ -3309,11 +3725,11 @@
 msgid "AND"
 msgstr "OCH"
 
-#: src/applications/fs/fsui/search.c:275
+#: src/applications/fs/fsui/search.c:281
 msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:267
+#: src/applications/fs/fsui/download.c:308
 #, fuzzy
 msgid "Download failed (no reason given)"
 msgstr "Ladda ner filer från GNUnet."
@@ -3322,7 +3738,7 @@
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:246
+#: src/applications/fs/fsui/upload.c:281
 msgid "Failed to create temporary directory."
 msgstr ""
 
@@ -3339,23 +3755,28 @@
 msgid "LOC URI not allowed for search.\n"
 msgstr "LOC URI tillåts inte för sökning.\n"
 
-#: src/applications/fs/ecrs/download.c:124
+#: src/applications/fs/ecrs/download.c:125
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:255
+#: src/applications/fs/ecrs/download.c:270
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Skrivning(%d, %p, %d) misslyckades: %s\n"
 
-#: src/applications/fs/ecrs/download.c:1001
-msgid "Decrypted content does not match key. This is either a bug or a 
maliciously inserted file. Download aborted.\n"
-msgstr "Dekrypterat innehåll stämmer inte med nyckeln. Det är antingen ett fel 
eller en fil inlagd med onda avsikter. Hämtning avbruten.\n"
+#: src/applications/fs/ecrs/download.c:1043
+msgid ""
+"Decrypted content does not match key. This is either a bug or a maliciously "
+"inserted file. Download aborted.\n"
+msgstr ""
+"Dekrypterat innehåll stämmer inte med nyckeln. Det är antingen ett fel eller "
+"en fil inlagd med onda avsikter. Hämtning avbruten.\n"
 
-#: src/applications/fs/ecrs/download.c:1186
+#: src/applications/fs/ecrs/download.c:1229
 #, c-format
-msgid "Content `%s' seems to be not available on the network (tried %u 
times).\n"
+msgid ""
+"Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
 #: src/applications/fs/ecrs/upload.c:164
@@ -3413,21 +3834,21 @@
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Kan inte skapa pseudonym \"%s\", filen \"%s\" existerar.\n"
 
-#: src/applications/fs/ecrs/namespace.c:339
-#: src/applications/fs/ecrs/namespace.c:420
-#: src/applications/fs/ecrs/namespace.c:575
+#: src/applications/fs/ecrs/namespace.c:342
+#: src/applications/fs/ecrs/namespace.c:425
+#: src/applications/fs/ecrs/namespace.c:584
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/applications/fs/ecrs/namespace.c:351
-#: src/applications/fs/ecrs/namespace.c:431
+#: src/applications/fs/ecrs/namespace.c:354
+#: src/applications/fs/ecrs/namespace.c:436
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:589
-#: src/applications/fs/ecrs/namespace.c:600
+#: src/applications/fs/ecrs/namespace.c:598
+#: src/applications/fs/ecrs/namespace.c:609
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Formatet på filen \"%s\" är ogiltig.\n"
@@ -3438,24 +3859,28 @@
 
 #: src/applications/fs/ecrs/parser.c:122
 #, c-format
-msgid "Unknown metadata type in metadata option `%s'.  Using metadata type 
`unknown' instead.\n"
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
 #: src/applications/fs/uritrack/file_info.c:131
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:373
+#: src/applications/fs/uritrack/file_info.c:374
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:656
+#: src/applications/fs/namespace/namespace_info.c:730
 msgid "Publication interval for periodic publication changed."
 msgstr "Publiseringsintervall för periodisk publisering har ändrats."
 
-#: src/applications/fs/namespace/namespace_info.c:677
-msgid "Publishing update for periodically updated content more than a week 
ahead of schedule.\n"
+#: src/applications/fs/namespace/namespace_info.c:751
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
 msgstr ""
 
 #: src/applications/topology_f2f/topology.c:368
@@ -3485,35 +3910,45 @@
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:100
+#: src/applications/bootstrap_http/http.c:105
 #, fuzzy, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/applications/bootstrap_http/http.c:173
+#: src/applications/bootstrap_http/http.c:176
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:229
+#: src/applications/bootstrap_http/http.c:211
+#, c-format
+msgid "Bootstrapping using `%s'.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:237
 #, fuzzy, c-format
 msgid "Trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/applications/bootstrap_http/http.c:408
-msgid "# hellos downloaded via http"
+#: src/applications/bootstrap_http/http.c:388
+#, fuzzy, c-format
+msgid "Downloaded %llu bytes from `%s'.\n"
+msgstr "Ladda ner filer från GNUnet."
+
+#: src/applications/bootstrap_http/http.c:421
+msgid "# HELLOs downloaded via http"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:445
+#: src/applications/traffic/traffic.c:450
 #, c-format
 msgid "# bytes transmitted of type %d"
 msgstr "# byte skickade av typen %d"
 
-#: src/applications/traffic/traffic.c:465
+#: src/applications/traffic/traffic.c:470
 #, c-format
 msgid "# bytes received of type %d"
 msgstr "# byte mottagna av typen %d"
 
-#: src/applications/traffic/traffic.c:609
+#: src/applications/traffic/traffic.c:624
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -3617,7 +4052,9 @@
 msgstr ""
 
 #: src/applications/vpn/vpn.c:660
-msgid "RFC4193 We have run out of memory and so I can't store a tunnel for 
this peer.\n"
+msgid ""
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
 msgstr ""
 
 #: src/applications/vpn/vpn.c:706
@@ -3778,7 +4215,7 @@
 msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:196 src/server/gnunetd.c:124
+#: src/server/gnunet-update.c:196 src/server/gnunetd.c:144
 #, fuzzy
 msgid "Core initialization failed.\n"
 msgstr " Anslutning misslyckades\n"
@@ -3791,7 +4228,7 @@
 msgid "Updates GNUnet datastructures after version change."
 msgstr "Uppdaterar GNUnets datastruktur efter versionsändring."
 
-#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:382
+#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:389
 msgid "run as user LOGIN"
 msgstr "kör som användare LOGIN"
 
@@ -3799,86 +4236,86 @@
 msgid "run in client mode (for getting client configuration values)"
 msgstr "kör i klientläge (för att hämta värden från klientkonfiguration)"
 
-#: src/server/connection.c:1142
+#: src/server/connection.c:1133
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "\"%s\" valda %d av %d meddelanden (MTU: %d).\n"
 
-#: src/server/connection.c:1151
+#: src/server/connection.c:1142
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Detaljer om meddelande: %u: längd %d, prioritet: %d\n"
 
-#: src/server/connection.c:2630
+#: src/server/connection.c:2675
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
 
-#: src/server/connection.c:2708
+#: src/server/connection.c:2755
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2725
+#: src/server/connection.c:2772
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:3166
+#: src/server/connection.c:3219
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3170
+#: src/server/connection.c:3223
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3172
+#: src/server/connection.c:3225
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3175
+#: src/server/connection.c:3228
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/server/connection.c:3179
+#: src/server/connection.c:3232
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/server/connection.c:3183
+#: src/server/connection.c:3236
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/server/connection.c:3186
+#: src/server/connection.c:3239
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/server/connection.c:3188
+#: src/server/connection.c:3241
 msgid "# bytes noise sent"
 msgstr ""
 
-#: src/server/connection.c:3190
+#: src/server/connection.c:3243
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3192
+#: src/server/connection.c:3245
 msgid "# total bytes per second receive limit"
 msgstr ""
 
-#: src/server/connection.c:3194
+#: src/server/connection.c:3247
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "antal meddelanden i ett meddelandeblock"
 
-#: src/server/connection.c:3196
+#: src/server/connection.c:3249
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3198
+#: src/server/connection.c:3251
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3200
+#: src/server/connection.c:3253
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
@@ -3889,49 +4326,62 @@
 
 #: src/server/startup.c:224
 #, c-format
-msgid "Filesystem `%s' of partition `%s' is unknown. Please contact 
address@hidden"
+msgid ""
+"Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
+"address@hidden"
 msgstr ""
 
 #: src/server/startup.c:238
 #, c-format
-msgid "Limiting datastore size to %llu GB, because the `%s' filesystem does 
not support larger files. Please consider storing the database on a NTFS 
partition!\n"
+msgid ""
+"Limiting datastore size to %llu GB, because the `%s' filesystem does not "
+"support larger files. Please consider storing the database on a NTFS "
+"partition!\n"
 msgstr ""
 
-#: src/server/gnunetd.c:83
+#: src/server/startup.c:285
 #, c-format
+msgid "Insufficient access permissions for `%s': %s\n"
+msgstr ""
+
+#: src/server/gnunetd.c:84
+#, c-format
 msgid "`%s' startup complete.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/server/gnunetd.c:88
+#: src/server/gnunetd.c:89
 #, c-format
 msgid "`%s' is shutting down.\n"
 msgstr ""
 
-#: src/server/gnunetd.c:187
-msgid "run in debug mode; gnunetd will not daemonize and error messages will 
be written to stderr instead of a logfile"
+#: src/server/gnunetd.c:206
+msgid ""
+"run in debug mode; gnunetd will not daemonize and error messages will be "
+"written to stderr instead of a logfile"
 msgstr ""
 
-#: src/server/gnunetd.c:191
+#: src/server/gnunetd.c:210
 msgid "Starts the gnunetd daemon."
 msgstr "Startar gnunetd-demonen."
 
-#: src/server/gnunetd.c:194
+#: src/server/gnunetd.c:213
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:197
-msgid "run in quiet mode"
+#: src/server/gnunetd.c:216
+msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:201
+#: src/server/gnunetd.c:220
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: src/server/gnunetd.c:252
+#: src/server/gnunetd.c:288
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
-msgstr "Konfiguration eller version av GNUnet ändrad.  Du behöver köra 
\"%s\"!\n"
+msgstr ""
+"Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
 
 #: src/server/core.c:124
 #, c-format
@@ -4000,15 +4450,19 @@
 
 #: src/server/gnunet-transport-check.c:204
 #, fuzzy, c-format
-msgid "`%s' transport OK.  It took %ums to transmit %llu messages of %llu 
bytes each.\n"
-msgstr "\"%s\" transport OK.  Det tog %ums att överföra %d meddelanden på %d 
byte styck.\n"
+msgid ""
+"`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
+"each.\n"
+msgstr ""
+"\"%s\" transport OK.  Det tog %ums att överföra %d meddelanden på %d byte "
+"styck.\n"
 
 #: src/server/gnunet-transport-check.c:232
 #, fuzzy, c-format
 msgid " Transport %d is not being tested\n"
 msgstr " Transport %d ej tillgänglig\n"
 
-#: src/server/gnunet-transport-check.c:250
+#: src/server/gnunet-transport-check.c:253
 #, c-format
 msgid ""
 "\n"
@@ -4017,62 +4471,69 @@
 "\n"
 "Kontaktar \"%s\"."
 
-#: src/server/gnunet-transport-check.c:276
+#: src/server/gnunet-transport-check.c:279
 #, c-format
 msgid " Connection failed\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/server/gnunet-transport-check.c:282
+#: src/server/gnunet-transport-check.c:285
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/server/gnunet-transport-check.c:335
+#: src/server/gnunet-transport-check.c:338
 #, c-format
-msgid "No reply received within %llums.\n"
-msgstr "Inget svar mottaget inom %llums.\n"
+msgid "Timeout after %llums.\n"
+msgstr ""
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:342
+#, fuzzy, c-format
+msgid "OK!\n"
+msgstr "OK"
+
+#: src/server/gnunet-transport-check.c:370
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:367
+#: src/server/gnunet-transport-check.c:374
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:370
+#: src/server/gnunet-transport-check.c:377
 msgid "send COUNT messages"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/server/gnunet-transport-check.c:373
+#: src/server/gnunet-transport-check.c:380
 msgid "send messages with SIZE bytes payload"
 msgstr "skicka meddelanden med STORLEK bytes nyttolast"
 
-#: src/server/gnunet-transport-check.c:376
+#: src/server/gnunet-transport-check.c:383
 msgid "specifies which TRANSPORT should be tested"
 msgstr "anger vilken TRANSPORT som ska testas"
 
-#: src/server/gnunet-transport-check.c:379
+#: src/server/gnunet-transport-check.c:386
 msgid "specifies after how many MS to time-out"
 msgstr "anger timeout efter antal MS"
 
-#: src/server/gnunet-transport-check.c:387
+#: src/server/gnunet-transport-check.c:394
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:451
+#: src/server/gnunet-transport-check.c:459
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/server/gnunet-transport-check.c:454
+#: src/server/gnunet-transport-check.c:462
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/server/gnunet-transport-check.c:514
+#: src/server/gnunet-transport-check.c:527
 #, c-format
-msgid "%d out of %d peers contacted successfully (%d times transport 
unavailable).\n"
+msgid ""
+"\n"
+"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
 #: src/server/tcpserver.c:103
@@ -4085,23 +4546,26 @@
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/server/tcpserver.c:387
+#: src/server/tcpserver.c:397
 #, c-format
-msgid "Malformed network specification in the configuration in section `%s' 
for entry `%s': %s\n"
+msgid ""
+"Malformed network specification in the configuration in section `%s' for "
+"entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:440
+#: src/server/tcpserver.c:449
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr ""
 
-#: src/server/handler.c:379
+#: src/server/handler.c:380
 #, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
 #: src/server/version.c:152
-msgid "Failed to determine filename used to store GNUnet version 
information!\n"
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
 
 #: src/server/gnunet-peer-info.c:53
@@ -4126,6 +4590,11 @@
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
+#: src/util/boot/startup.c:212
+#, fuzzy, c-format
+msgid "Failed to run %s: %s %d\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
 #: src/util/network_client/tcpio.c:94 src/util/network_client/tcpio.c:135
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
@@ -4157,12 +4626,12 @@
 msgid "`%s' failed, reply invalid!\n"
 msgstr "\"%s\" misslyckades, svar ogiltigt!\n"
 
-#: src/util/crypto/hostkey_gcrypt.c:1031
+#: src/util/crypto/hostkey_gcrypt.c:1036
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto/locking_gcrypt.c:67
+#: src/util/crypto/locking_gcrypt.c:74
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
@@ -4174,8 +4643,11 @@
 
 #: src/util/os/statuscalls.c:365 src/util/os/statuscalls.c:374
 #, c-format
-msgid "No network interfaces defined in configuration section `%s' under 
`%s'!\n"
-msgstr "Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under 
\"%s\"!\n"
+msgid ""
+"No network interfaces defined in configuration section `%s' under `%s'!\n"
+msgstr ""
+"Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%s"
+"\"!\n"
 
 #: src/util/os/semaphore.c:219
 #, c-format
@@ -4214,12 +4686,12 @@
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Kan inte fråga efter CPU-användning (Win 9x).\n"
 
-#: src/util/os/user.c:124
-#, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
-msgstr ""
+#: src/util/os/user.c:125 src/util/os/user.c:166
+#, fuzzy, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/os/user.c:138
+#: src/util/os/user.c:140
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
@@ -4229,11 +4701,11 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/network/select.c:296
+#: src/util/network/select.c:306
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 
-#: src/util/network/select.c:454
+#: src/util/network/select.c:472
 msgid "select listen socket not valid!\n"
 msgstr ""
 
@@ -4265,7 +4737,8 @@
 
 #: src/util/network/ip.c:202
 #, c-format
-msgid "Could not find interface `%s' using `%s', trying to find another 
interface.\n"
+msgid ""
+"Could not find interface `%s' using `%s', trying to find another interface.\n"
 msgstr ""
 
 #: src/util/network/ip.c:278
@@ -4291,106 +4764,110 @@
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/disk/storage.c:201
+#: src/util/disk/storage.c:202
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk/storage.c:518
+#: src/util/disk/storage.c:519
 #, 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/config_impl/impl.c:275
+#: src/util/config_impl/impl.c:289
 #, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/config_impl/impl.c:518
+#: src/util/config_impl/impl.c:532
 #, c-format
 msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:564
+#: src/util/config_impl/impl.c:578
 #, c-format
-msgid "Configuration value '%llu' for '%s' in section '%s' is out of legal 
bounds [%llu,%llu]\n"
+msgid ""
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:576
+#: src/util/config_impl/impl.c:590
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:666
+#: src/util/config_impl/impl.c:680
 #, c-format
-msgid "Configuration value '%s' for '%s' in section '%s' is not in set of 
legal choices\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/util/error/error.c:78 src/util/error/error.c:80
+#: src/util/error/error.c:93 src/util/error/error.c:95
 #, fuzzy
-msgid "Error log:"
+msgid "Error log:\n"
 msgstr "Fel"
 
-#: src/util/error/error.c:130
+#: src/util/error/error.c:140
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:198 src/util/error/error.c:242
+#: src/util/error/error.c:208 src/util/error/error.c:252
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/error/error.c:201 src/util/error/error.c:244
+#: src/util/error/error.c:211 src/util/error/error.c:254
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:204 src/util/error/error.c:248
+#: src/util/error/error.c:214 src/util/error/error.c:258
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/error/error.c:207 src/util/error/error.c:250
+#: src/util/error/error.c:217 src/util/error/error.c:260
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/error/error.c:210 src/util/error/error.c:252
+#: src/util/error/error.c:220 src/util/error/error.c:262
 msgid "FATAL"
 msgstr "ÖDESDIGER"
 
-#: src/util/error/error.c:213 src/util/error/error.c:254
+#: src/util/error/error.c:223 src/util/error/error.c:264
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:216 src/util/error/error.c:256
+#: src/util/error/error.c:226 src/util/error/error.c:266
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:219 src/util/error/error.c:258
+#: src/util/error/error.c:229 src/util/error/error.c:268
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:222 src/util/error/error.c:260
+#: src/util/error/error.c:232 src/util/error/error.c:270
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:225 src/util/error/error.c:262
+#: src/util/error/error.c:235 src/util/error/error.c:272
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:228 src/util/error/error.c:264
+#: src/util/error/error.c:238 src/util/error/error.c:274
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:231
+#: src/util/error/error.c:241
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:246
+#: src/util/error/error.c:256
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/error/error.c:265
+#: src/util/error/error.c:275
 msgid "NOTHING"
 msgstr "INGET"
 
@@ -4481,7 +4958,9 @@
 
 #: src/util/getopt/setoption.c:58
 #, c-format
-msgid "Setting option `%s' in section `%s' to `%s' when processing command 
line option `%s' was denied.\n"
+msgid ""
+"Setting option `%s' in section `%s' to `%s' when processing command line "
+"option `%s' was denied.\n"
 msgstr ""
 
 #: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
@@ -4491,8 +4970,11 @@
 
 #: src/util/getopt/printhelp.c:50
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
-msgstr "Argument som är obligatoriska för långa flaggor är också obligatoriska 
för korta flaggor.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Argument som är obligatoriska för långa flaggor är också obligatoriska för "
+"korta flaggor.\n"
 
 #: src/util/string/string.c:121
 msgid "ms"
@@ -4546,21 +5028,21 @@
 msgid "Tool to setup GNUnet."
 msgstr "Verktyg för att ställa in GNUnet."
 
-#: src/setup/gnunet-setup.c:187
+#: src/setup/gnunet-setup.c:188
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Ogiltiga kommandoradsargument.\n"
 
-#: src/setup/gnunet-setup.c:192
+#: src/setup/gnunet-setup.c:193
 msgid "No interface specified, using default\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:267
+#: src/setup/gnunet-setup.c:268
 #, c-format
 msgid "`%s' is not available."
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/setup/gnunet-setup.c:283
+#: src/setup/gnunet-setup.c:284
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
@@ -4698,7 +5180,8 @@
 #: src/setup/gtk/wizard_gtk.c:505
 msgid ""
 "Running gnunet-update failed.\n"
-"This maybe due to insufficient permissions, please check your 
configuration.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
 "Finally, run gnunet-update manually."
 msgstr ""
 
@@ -4741,7 +5224,9 @@
 
 #: src/setup/text/conf.c:158
 #, c-format
-msgid "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default 
value %llu): "
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
 msgstr ""
 
 #: src/setup/text/conf.c:191
@@ -4811,17 +5296,21 @@
 #: src/setup/text/conf.c:575 src/setup/ncurses/mconf.c:519
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
-msgstr "Konfiguration eller version av GNUnet ändrad.  Du behöver köra 
\"%s\"!\n"
+msgstr ""
+"Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
 
 #: src/setup/text/conf.c:580
 #, c-format
-msgid "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat 
configuration. "
+msgid ""
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
 msgstr ""
 
 #: src/setup/text/conf.c:592
 #, fuzzy, c-format
 msgid "Configuration was unchanged, no need to save.\n"
-msgstr "Konfiguration eller version av GNUnet ändrad.  Du behöver köra 
\"%s\"!\n"
+msgstr ""
+"Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
 
 #: src/setup/text/conf.c:597
 #, fuzzy, c-format
@@ -4912,7 +5401,8 @@
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
-"This assistant will ask you a few basic questions in order to configure 
GNUnet.\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
 "\n"
 "Please visit our homepage at\n"
 "\thttp://gnunet.org/\n";
@@ -4925,7 +5415,8 @@
 msgstr ""
 "Välkommen till GNUnet!\n"
 "\n"
-"Denna assistant kommer att fråga dig några enkla frågor för att konfigurera 
GNUnet.\n"
+"Denna assistant kommer att fråga dig några enkla frågor för att konfigurera "
+"GNUnet.\n"
 "\n"
 "Vänligen besök på webbplats på\n"
 "\thttp://gnunet.org/\n";
@@ -4937,11 +5428,16 @@
 "the GNUnet team"
 
 #: src/setup/ncurses/wizard_curs.c:291
-msgid "Choose the network interface that connects your computer to the 
internet from the list below."
+msgid ""
+"Choose the network interface that connects your computer to the internet "
+"from the list below."
 msgstr ""
 
 #: src/setup/ncurses/wizard_curs.c:312 src/setup/ncurses/wizard_curs.c:325
-msgid "The \"Network interface\" is the device that connects your computer to 
the internet. This is usually a modem, an ISDN card or a network card in case 
you are using DSL."
+msgid ""
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL."
 msgstr ""
 
 #: src/setup/ncurses/wizard_curs.c:323
@@ -4950,7 +5446,9 @@
 msgstr "Nätverksgränssnitt:"
 
 #: src/setup/ncurses/wizard_curs.c:324
-msgid "What is the name of the network interface that connects your computer 
to the Internet?"
+msgid ""
+"What is the name of the network interface that connects your computer to the "
+"Internet?"
 msgstr ""
 
 #: src/setup/ncurses/wizard_curs.c:335
@@ -4962,7 +5460,11 @@
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
-"If you are connected to the internet through another computer doing SNAT, a 
router or a \"hardware firewall\" and other computers on the internet cannot 
connect to this computer, say \"yes\" here. Answer \"no\" on direct connections 
through modems, ISDN cards and DNAT (also known as \"port forwarding\")."
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
+"connections through modems, ISDN cards and DNAT (also known as \"port "
+"forwarding\")."
 msgstr ""
 
 #: src/setup/ncurses/wizard_curs.c:349
@@ -4976,7 +5478,11 @@
 
 #: src/setup/ncurses/wizard_curs.c:351
 msgid ""
-"If your provider always assigns the same IP-Address to you (a \"static\" 
IP-Address), enter it into the \"IP-Address\" field. If your IP-Address changes 
every now and then (\"dynamic\" IP-Address) but there's a hostname that always 
points to your actual IP-Address (\"Dynamic DNS\"), you can also enter it 
here.\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
 "If left empty, GNUnet will try to automatically detect the IP.\n"
 "You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
 "If in doubt, leave this empty."
@@ -4996,7 +5502,11 @@
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
-"The \"upstream\" is the data channel through which data is *sent* to the 
internet. The limit is the maximum amountwhich GNUnet is allowed to use. If you 
have a flatrate, you can set it to the maximum speed of your internet 
connection. You should not use a value that is higher than what your actual 
connection allows."
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
+"you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
 msgstr ""
 
 #: src/setup/ncurses/wizard_curs.c:380
@@ -5013,7 +5523,11 @@
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
-"The \"downstream\" is the data channel through which data is *received* from 
the internet. The limit is the maximum amountwhich GNUnet is allowed to use. If 
you have a flatrate, you can set it to the maximum speed of your internet 
connection. You should not use a value that is higher than what your actual 
connection allows."
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
+"If you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
 msgstr ""
 
 #: src/setup/ncurses/wizard_curs.c:394
@@ -5026,7 +5540,9 @@
 msgstr ""
 
 #: src/setup/ncurses/wizard_curs.c:396
-msgid "The GNUnet datastore contains all content that GNUnet needs to store 
(indexed, inserted and migrated content)."
+msgid ""
+"The GNUnet datastore contains all content that GNUnet needs to store "
+"(indexed, inserted and migrated content)."
 msgstr ""
 
 #: src/setup/ncurses/wizard_curs.c:409
@@ -5040,9 +5556,12 @@
 
 #: src/setup/ncurses/wizard_curs.c:411
 msgid ""
-"For security reasons, it is a good idea to let this setup create a new user 
account under which the GNUnet service is started at system startup.\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account under which the GNUnet service is started at system startup.\n"
 "\n"
-"However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
 "\n"
 "Leave the field empty to run GNUnet with system privileges.\n"
 msgstr ""
@@ -5057,11 +5576,13 @@
 
 #: src/setup/ncurses/wizard_curs.c:431
 msgid ""
-"For security reasons, it is a good idea to let this setup create a new group 
for the chosen user account.\n"
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
 "\n"
 "You can also specify a already existant group here.\n"
 "\n"
-"Only members of this group will be allowed to start and stop the the GNUnet 
server and have access to GNUnet server data.\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
 msgstr ""
 
 #: src/setup/ncurses/wizard_curs.c:444
@@ -5069,7 +5590,10 @@
 msgstr ""
 
 #: src/setup/ncurses/wizard_curs.c:445
-msgid "If you say \"yes\" here, the GNUnet background process will be 
automatically started when you turn on your computer. If you say \"no\" here, 
you have to launch GNUnet yourself each time you want to use it."
+msgid ""
+"If you say \"yes\" here, the GNUnet background process will be automatically "
+"started when you turn on your computer. If you say \"no\" here, you have to "
+"launch GNUnet yourself each time you want to use it."
 msgstr ""
 
 #: src/setup/ncurses/wizard_curs.c:493
@@ -5093,12 +5617,15 @@
 
 #: src/setup/lib/gns.c:278
 #, c-format
-msgid "Configuration does not satisfy constraints of configuration 
specification file `%s'!\n"
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
 msgstr ""
 
 #: src/setup/lib/tree.c:189
 #, c-format
-msgid "Internal error: entry `%s' in section `%s' not found for visibility 
change!\n"
+msgid ""
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
 #: src/setup/lib/wizard_util.c:101
@@ -5149,9 +5676,34 @@
 msgid "Unknown error while creating a new user"
 msgstr "Okänt fel vid skapandet av ny användare"
 
-#~ msgid "Network advertisements disabled by configuration!\n"
-#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+#, fuzzy
+#~ msgid "# bytes received via TCP-OLD"
+#~ msgstr "# byte mottogs via TCP"
 
+#, fuzzy
+#~ msgid "# bytes sent via TCP-OLD"
+#~ msgstr "# byte skickades via TCP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by TCP-OLD (outgoing)"
+#~ msgstr "# byte kastade via TCP (utgående)"
+
+#~ msgid "Waiting for gnunetd to start (%u iterations left)...\n"
+#~ msgstr "Väntar på att gnunetd ska starta (%u iterationer kvar)...\n"
+
+#~ msgid "Waiting for peers to connect (%u iterations left)...\n"
+#~ msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
+
+#~ msgid "`%s' failed (%d, %u). Will not send PING.\n"
+#~ msgstr "\"%s\" misslyckades (%d, %u). Kommer inte skicka PING.\n"
+
+#, fuzzy
+#~ msgid "Deleting expired content.  This may take a while.\n"
+#~ msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
+
+#~ msgid "No reply received within %llums.\n"
+#~ msgstr "Inget svar mottaget inom %llums.\n"
+
 #~ msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
 #~ msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
@@ -5159,7 +5711,8 @@
 #~ msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
 #~ msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
-#~ msgstr "Kunde inte slå upp namn för HTTP-proxy \"%s\". Försöker utan 
proxy.\n"
+#~ msgstr ""
+#~ "Kunde inte slå upp namn för HTTP-proxy \"%s\". Försöker utan proxy.\n"
 
 #~ msgid "`%s' failed: table not found!\n"
 #~ msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
@@ -5243,7 +5796,8 @@
 #~ msgstr "%8u av %8u byte togs bort."
 
 #~ msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
-#~ msgstr "ange filen att ta bort från GNUnet (obligatorisk, filen måste 
existera)"
+#~ msgstr ""
+#~ "ange filen att ta bort från GNUnet (obligatorisk, filen måste existera)"
 
 #~ msgid ""
 #~ "Remove file from GNUnet.  The specified file is not removed\n"
@@ -5265,7 +5819,8 @@
 #~ msgstr "FILNAMN"
 
 #~ msgid "Upload of `%s' complete, current average speed is %8.3f kbps.\n"
-#~ msgstr "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f 
kbps.\n"
+#~ msgstr ""
+#~ "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
 #~ msgid "process directories recursively"
 #~ msgstr "bearbeta kataloger rekursivt"
@@ -5283,14 +5838,17 @@
 #~ msgstr "Ogiltiga argument. Avslutar.\n"
 
 #~ msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-#~ msgstr "Inte tillräckligt med argument. Du måste ange ett nyckelord eller 
identifierare.\n"
+#~ msgstr ""
+#~ "Inte tillräckligt med argument. Du måste ange ett nyckelord eller "
+#~ "identifierare.\n"
 
-#~ msgid "Configuration file must specify a directory for GNUnet to store 
per-peer data under %s%s\n"
-#~ msgstr "Konfigurationsfil måste ange en katalog för GNUnet att lagra 
motpartsdata under %s%s\n"
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s\n"
+#~ msgstr ""
+#~ "Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
+#~ "under %s%s\n"
 
-#~ msgid "Could not create hostkey!\n"
-#~ msgstr "Kunde inte skapa värdnyckel!\n"
-
 #~ msgid "%s `%s' returned no known hosts!\n"
 #~ msgstr "%s \"%s\" returnerade inga kända värdar!\n"
 
@@ -5422,7 +5980,8 @@
 #~ "\n"
 
 #~ msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
-#~ msgstr "gnunet-setup måste ha skrivrättighet till konfigurationsfilen 
\"%s\"\n"
+#~ msgstr ""
+#~ "gnunet-setup måste ha skrivrättighet till konfigurationsfilen \"%s\"\n"
 
 #~ msgid ""
 #~ "Can only run wizard to configure gnunetd.\n"
@@ -5443,7 +6002,8 @@
 #~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"
-#~ "This assistant will ask you a few basic questions in order to configure 
GNUnet.\n"
+#~ "This assistant will ask you a few basic questions in order to configure "
+#~ "GNUnet.\n"
 #~ "\n"
 #~ "Please visit our homepage at\n"
 #~ "\thttp://www.gnunet.org\n";
@@ -5456,7 +6016,8 @@
 #~ msgstr ""
 #~ "Välkommen till GNUnet!\n"
 #~ "\n"
-#~ "Denna assistant kommer att fråga dig några enkla frågor för att 
konfigurera GNUnet.\n"
+#~ "Denna assistant kommer att fråga dig några enkla frågor för att "
+#~ "konfigurera GNUnet.\n"
 #~ "\n"
 #~ "Besök på webbplats på\n"
 #~ "\thttp://gnunet.org/\n";
@@ -5467,9 +6028,6 @@
 #~ "\n"
 #~ "GNUnet-laget"
 
-#~ msgid "OK"
-#~ msgstr "OK"
-
 #~ msgid "gnunet-update failed!"
 #~ msgstr "gnunet-update misslyckades!"
 
@@ -5510,8 +6068,12 @@
 #~ msgid "Configuration file `%s' not found.  Run gnunet-setup!\n"
 #~ msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör gnunet-setup!\n"
 
-#~ msgid "Configuration file not found. Please run GNUnet Setup (Client 
Configuration) first."
-#~ msgstr "Konfigurationsfil hittades inte. Vänligen kör konfigurationen för 
GNUnet (klientkonfiguration) först."
+#~ msgid ""
+#~ "Configuration file not found. Please run GNUnet Setup (Client "
+#~ "Configuration) first."
+#~ msgstr ""
+#~ "Konfigurationsfil hittades inte. Vänligen kör konfigurationen för GNUnet "
+#~ "(klientkonfiguration) först."
 
 #~ msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
 #~ msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
@@ -5555,8 +6117,12 @@
 #~ "%s\n"
 #~ "\n"
 
-#~ msgid "Configuration file must specify a directory for GNUnet to store 
per-peer data under %s\\%s.\n"
-#~ msgstr "Konfigurationsfil måste ange en katalog för GNUnet att lagra 
motpartsdata under %s\\%s.\n"
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s\\%s.\n"
+#~ msgstr ""
+#~ "Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
+#~ "under %s\\%s.\n"
 
 #~ msgid "`%s' is not a regular file.\n"
 #~ msgstr "\"%s\" är inte en vanlig fil.\n"

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2007-06-09 08:10:48 UTC (rev 4986)
+++ GNUnet/po/vi.po     2007-06-09 08:20:05 UTC (rev 4987)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-03-25 14:37-0600\n"
+"POT-Creation-Date: 2007-06-09 01:06-0600\n"
 "PO-Revision-Date: 2005-07-05 21:18+0400\n"
 "Last-Translator: Phan Vinh Thinh <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -25,11 +25,22 @@
 
 #: contrib/config-daemon.scm:54 contrib/config-client.scm:59
 msgid ""
-"If EXPERIMENTAL is set to NO, options for experimental code are not shown.  
If in doubt, use NO.\n"
+"If EXPERIMENTAL is set to NO, options for experimental code are not shown.  "
+"If in doubt, use NO.\n"
 "\n"
-"Some options apply to experimental code that maybe in a state of development 
where the functionality, stability, or the level of testing is not yet high 
enough for general use.  These features are said to be of \"alpha\" quality.  
If a feature is currently in alpha, uninformed use is discouraged (since the 
developers then do not fancy \"Why doesn't this work?\" type messages).\n"
+"Some options apply to experimental code that maybe in a state of development "
+"where the functionality, stability, or the level of testing is not yet high "
+"enough for general use.  These features are said to be of \"alpha\" "
+"quality.  If a feature is currently in alpha, uninformed use is discouraged "
+"(since the developers then do not fancy \"Why doesn't this work?\" type "
+"messages).\n"
 "\n"
-"However, active testing and qualified feedback of these features is always 
welcome.  Users should just be aware that alpha features may not meet the 
normal level of reliability or it may fail to work in some special cases.  Bug 
reports are usually welcomed by the developers, but please read the documents 
<file://README> and <http://gnunet.org/faq.php3> and use 
<https://gnunet.org/mantis/> for how to report problems."
+"However, active testing and qualified feedback of these features is always "
+"welcome.  Users should just be aware that alpha features may not meet the "
+"normal level of reliability or it may fail to work in some special cases.  "
+"Bug reports are usually welcomed by the developers, but please read the "
+"documents <file://README> and <http://gnunet.org/faq.php3> and use <https://";
+"gnunet.org/mantis/> for how to report problems."
 msgstr ""
 
 #: contrib/config-daemon.scm:69 contrib/config-client.scm:74
@@ -37,7 +48,10 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:71 contrib/config-client.scm:76
-msgid "These are options that maybe difficult to understand for the beginner. 
These options typically refer to features that allow tweaking of the 
installation.  If in a hurry, say NO."
+msgid ""
+"These are options that maybe difficult to understand for the beginner. These "
+"options typically refer to features that allow tweaking of the "
+"installation.  If in a hurry, say NO."
 msgstr ""
 
 #: contrib/config-daemon.scm:82 contrib/config-client.scm:87
@@ -46,7 +60,10 @@
 msgstr "Hiển thị tùy chọn che giấu"
 
 #: contrib/config-daemon.scm:84 contrib/config-client.scm:89
-msgid "These are options that hardly anyone actually needs.  If you plan on 
doing development on GNUnet, you may want to look into these.  If in doubt or 
in a hurry, say NO."
+msgid ""
+"These are options that hardly anyone actually needs.  If you plan on doing "
+"development on GNUnet, you may want to look into these.  If in doubt or in a "
+"hurry, say NO."
 msgstr ""
 
 #: contrib/config-daemon.scm:95 contrib/config-client.scm:100
@@ -64,7 +81,11 @@
 msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
 
 #: contrib/config-daemon.scm:115
-msgid "This gives the root-directory of the GNUnet installation. Make sure 
there is some space left in that directory. :-)  Users inserting or indexing 
files will be able to store data in this directory up to the (global) quota 
specified below.  Having a few gigabytes of free space is recommended."
+msgid ""
+"This gives the root-directory of the GNUnet installation. Make sure there is "
+"some space left in that directory. :-)  Users inserting or indexing files "
+"will be able to store data in this directory up to the (global) quota "
+"specified below.  Having a few gigabytes of free space is recommended."
 msgstr ""
 
 #: contrib/config-daemon.scm:128
@@ -88,7 +109,13 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:166
-msgid "How many minutes is the current IP valid?  (GNUnet will sign HELLO 
messages with this expiration timeline. If you are on dialup, 60 (for 1 hour) 
is suggested. If you are having a static IP address, you may want to set this 
to a large value (say 14400).  The default is 1440 (1 day). If your IP changes 
periodically, you will want to choose the expiration to be smaller than the 
frequency with which your IP changes."
+msgid ""
+"How many minutes is the current IP valid?  (GNUnet will sign HELLO messages "
+"with this expiration timeline. If you are on dialup, 60 (for 1 hour) is "
+"suggested. If you are having a static IP address, you may want to set this "
+"to a large value (say 14400).  The default is 1440 (1 day). If your IP "
+"changes periodically, you will want to choose the expiration to be smaller "
+"than the frequency with which your IP changes."
 msgstr ""
 
 #: contrib/config-daemon.scm:177
@@ -97,13 +124,21 @@
 
 #: contrib/config-daemon.scm:179
 msgid ""
-"GNUnet can automatically update the hostlist from the web. While GNUnet 
internally communicates which hosts are online, it is typically a good idea to 
get a fresh hostlist whenever gnunetd starts from the WEB. By setting this 
option, you can specify from which server gnunetd should try to download the 
hostlist. The default should be fine for now.\n"
+"GNUnet can automatically update the hostlist from the web. While GNUnet "
+"internally communicates which hosts are online, it is typically a good idea "
+"to get a fresh hostlist whenever gnunetd starts from the WEB. By setting "
+"this option, you can specify from which server gnunetd should try to "
+"download the hostlist. The default should be fine for now.\n"
 "\t\t\n"
-"The general format is a list of space-separated URLs.  Each URL must have the 
format http://HOSTNAME/FILENAME\n";
+"The general format is a list of space-separated URLs.  Each URL must have "
+"the format http://HOSTNAME/FILENAME\n";
 "\t\t\n"
-"If you want to setup an alternate hostlist server, you must run a permanent 
node and \"cat data/hosts/* > hostlist\" every few minutes to keep the list 
up-to-date.\n"
+"If you want to setup an alternate hostlist server, you must run a permanent "
+"node and \"cat data/hosts/* > hostlist\" every few minutes to keep the list "
+"up-to-date.\n"
 "\t\t\n"
-"If you do not specify a HOSTLISTURL, you must copy valid hostkeys to 
data/hosts manually."
+"If you do not specify a HOSTLISTURL, you must copy valid hostkeys to data/"
+"hosts manually."
 msgstr ""
 
 #: contrib/config-daemon.scm:196
@@ -111,7 +146,9 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:198
-msgid "If you have to use a proxy for outbound HTTP connections, specify the 
proxy configuration here.  Default is no proxy."
+msgid ""
+"If you have to use a proxy for outbound HTTP connections, specify the proxy "
+"configuration here.  Default is no proxy."
 msgstr ""
 
 #: contrib/config-daemon.scm:237 contrib/config-client.scm:144
@@ -119,15 +156,27 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:239 contrib/config-client.scm:146
-msgid "How long should logs be kept? If you specify a value greater than zero, 
a log is created each day with the date appended to its filename. These logs 
are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
+msgid ""
+"How long should logs be kept? If you specify a value greater than zero, a "
+"log is created each day with the date appended to its filename. These logs "
+"are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
 msgstr ""
 
 #: contrib/config-daemon.scm:250
-msgid "What maximum number of open file descriptors should be requested from 
the OS?"
+msgid ""
+"What maximum number of open file descriptors should be requested from the OS?"
 msgstr ""
 
 #: contrib/config-daemon.scm:252
-msgid "The default of 1024 should be fine for most systems.  If your system 
can support more, increasing the number might help support additional clients 
on machines with plenty of bandwidth.  For embedded systems, a smaller number 
might be acceptable.  A value of 0 will leave the descriptor limit untouched.  
This option is mostly for OS X systems where the default is too low.  Note that 
if gnunetd cannot obtain the desired number of file descriptors from the 
operating system, it will print a warning and try to run with what it is given."
+msgid ""
+"The default of 1024 should be fine for most systems.  If your system can "
+"support more, increasing the number might help support additional clients on "
+"machines with plenty of bandwidth.  For embedded systems, a smaller number "
+"might be acceptable.  A value of 0 will leave the descriptor limit "
+"untouched.  This option is mostly for OS X systems where the default is too "
+"low.  Note that if gnunetd cannot obtain the desired number of file "
+"descriptors from the operating system, it will print a warning and try to "
+"run with what it is given."
 msgstr ""
 
 #: contrib/config-daemon.scm:263
@@ -154,427 +203,605 @@
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:295
-msgid "In which file should gnunetd write the process-id of the server?  If 
you run gnunetd as root, you may want to choose /var/run/gnunetd.pid. It's not 
the default since gnunetd may not have write rights at that location."
+#: contrib/config-daemon.scm:294
+msgid ""
+"The default is no longer /var/run/gnunetd.pid since we could not delete the "
+"file on shutdown at that location."
 msgstr ""
 
-#: contrib/config-daemon.scm:307
+#: contrib/config-daemon.scm:306
 msgid "As which user should gnunetd run?"
 msgstr ""
 
-#: contrib/config-daemon.scm:309
-msgid "Empty means \"current user\". On computer startup, it is root/SYSTEM.  
Under Windows, this setting affects the creation of a new system service only."
+#: contrib/config-daemon.scm:308
+msgid ""
+"Empty means \"current user\". On computer startup, it is root/SYSTEM.  Under "
+"Windows, this setting affects the creation of a new system service only."
 msgstr ""
 
 #: contrib/config-daemon.scm:321
+msgid "Should gnunetd be automatically started when the system boots?"
+msgstr ""
+
+#: contrib/config-daemon.scm:322
+msgid ""
+"Set to YES if gnunetd should be automatically started on boot.  If this "
+"option is set, gnunet-setup will install a script to start the daemon upon "
+"completion.  This option may not work on all systems."
+msgstr ""
+
+#: contrib/config-daemon.scm:334
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:323
+#: contrib/config-daemon.scm:336
 msgid ""
-"Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The 
available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
+"Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
+"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
 "\t\t\n"
-"Loading the 'nat' and 'tcp' modules is required for peers behind NAT boxes 
that cannot directly be reached from the outside.  Peers that are NOT behind a 
NAT box and that want to *allow* peers that ARE behind a NAT box to connect 
must ALSO load the 'nat' module.  Note that the actual transfer will always be 
via tcp initiated by the peer behind the NAT box.  The nat transport requires 
the use of tcp, http, smtp and/or tcp6 in addition to nat itself."
+"Loading the 'nat' and 'tcp' modules is required for peers behind NAT boxes "
+"that cannot directly be reached from the outside.  Peers that are NOT behind "
+"a NAT box and that want to *allow* peers that ARE behind a NAT box to "
+"connect must ALSO load the 'nat' module.  Note that the actual transfer will "
+"always be via tcp initiated by the peer behind the NAT box.  The nat "
+"transport requires the use of tcp, http, smtp and/or tcp6 in addition to nat "
+"itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:337
+#: contrib/config-daemon.scm:350
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:339
+#: contrib/config-daemon.scm:352
 msgid ""
-"Whenever this option is changed, you MUST run gnunet-update. Currently, the 
available applications are:\n"
+"Whenever this option is changed, you MUST run gnunet-update. Currently, the "
+"available applications are:\n"
 "\n"
-"advertising: advertises your peer to other peers. Without it, your peer will 
not participate in informing peers about other peers.  You should always load 
this module.\n"
+"advertising: advertises your peer to other peers. Without it, your peer will "
+"not participate in informing peers about other peers.  You should always "
+"load this module.\n"
 "\n"
-"getoption:  allows clients to query gnunetd about the values of various 
configuration options.  Many tools need this.  You should always load this 
module.\n"
+"getoption:  allows clients to query gnunetd about the values of various "
+"configuration options.  Many tools need this.  You should always load this "
+"module.\n"
 "\n"
-"stats: allows tools like gnunet-stats and gnunet-gtk to query gnunetd about 
various statistics.  This information is usually quite useful to diagnose 
errors, hence it is recommended that you load this module.\n"
+"stats: allows tools like gnunet-stats and gnunet-gtk to query gnunetd about "
+"various statistics.  This information is usually quite useful to diagnose "
+"errors, hence it is recommended that you load this module.\n"
 "\n"
-"traffic: keeps track of how many messages were recently received and 
transmitted.  This information can then be used to establish how much cover 
traffic is currently available.  The amount of cover traffic becomes important 
if you want to make anonymous requests with an anonymity level that is greater 
than one.  It is recommended that you load this module.\n"
+"traffic: keeps track of how many messages were recently received and "
+"transmitted.  This information can then be used to establish how much cover "
+"traffic is currently available.  The amount of cover traffic becomes "
+"important if you want to make anonymous requests with an anonymity level "
+"that is greater than one.  It is recommended that you load this module.\n"
 "\n"
 "fs: needed for anonymous file sharing. You should always load this module.\n"
 "\n"
-"chat: broadcast chat (demo-application, ALPHA quality).\tRequired for 
gnunet-chat.  Note that the current implementation of chat is not considered to 
be secure.\n"
+"chat: broadcast chat (demo-application, ALPHA quality).\tRequired for gnunet-"
+"chat.  Note that the current implementation of chat is not considered to be "
+"secure.\n"
 "\n"
-"tbench: benchmark transport performance.  Required for gnunet-tbench.  Note 
that tbench allows other users to abuse your resources.\n"
+"tbench: benchmark transport performance.  Required for gnunet-tbench.  Note "
+"that tbench allows other users to abuse your resources.\n"
 "\n"
-"tracekit: topology visualization toolkit.  Required for gnunet-tracekit. Note 
that loading tracekit will make it slightly easier for an adversary to 
compromise your anonymity."
+"tracekit: topology visualization toolkit.  Required for gnunet-tracekit. "
+"Note that loading tracekit will make it slightly easier for an adversary to "
+"compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:368
+#: contrib/config-daemon.scm:381
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:380
+#: contrib/config-daemon.scm:393
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:381
-msgid "The option 'PRIVATE-NETWORK' can be used to limit the connections of 
this peer to peers of which the hostkey has been copied by hand to data/hosts;  
if this option is given, GNUnet will not accept advertisements of peers that 
the local node does not already know about.  Note that in order for this option 
to work, HOSTLISTURL should either not be set at all or be set to a trusted 
peer that only advertises the private network. Also, the option does NOT work 
at the moment if the NAT transport is loaded; for that, a couple of lines above 
would need some minor editing :-)."
+#: contrib/config-daemon.scm:394
+msgid ""
+"The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
+"peer to peers of which the hostkey has been copied by hand to data/hosts;  "
+"if this option is given, GNUnet will not accept advertisements of peers that "
+"the local node does not already know about.  Note that in order for this "
+"option to work, HOSTLISTURL should either not be set at all or be set to a "
+"trusted peer that only advertises the private network. Also, the option does "
+"NOT work at the moment if the NAT transport is loaded; for that, a couple of "
+"lines above would need some minor editing :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:392
+#: contrib/config-daemon.scm:405
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:404
+#: contrib/config-daemon.scm:417
 msgid "Disable automatic establishment of connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:405
-msgid "If this option is enabled, GNUnet will not automatically establish 
connections to other peers, but instead wait for applications to specifically 
request connections to other peers (or for other peers to connect to us)."
+#: contrib/config-daemon.scm:418
+msgid ""
+"If this option is enabled, GNUnet will not automatically establish "
+"connections to other peers, but instead wait for applications to "
+"specifically request connections to other peers (or for other peers to "
+"connect to us)."
 msgstr ""
 
-#: contrib/config-daemon.scm:416
+#: contrib/config-daemon.scm:429
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:428
+#: contrib/config-daemon.scm:430
+msgid ""
+"This option maybe useful during testing, but turning it off is dangerous! If "
+"in any doubt, set it to YES (which is the default)."
+msgstr ""
+
+#: contrib/config-daemon.scm:441
 msgid "Client/Server Port"
 msgstr ""
 
-#: contrib/config-daemon.scm:429
-msgid "Which is the client-server port that is used between gnunetd and the 
clients (TCP only).  You may firewall this port for non-local machines (but you 
do not have to since GNUnet will perform access control and only allow 
connections from machines that are listed under TRUSTED)."
+#: contrib/config-daemon.scm:442
+msgid ""
+"Which is the client-server port that is used between gnunetd and the clients "
+"(TCP only).  You may firewall this port for non-local machines (but you do "
+"not have to since GNUnet will perform access control and only allow "
+"connections from machines that are listed under TRUSTED)."
 msgstr ""
 
-#: contrib/config-daemon.scm:440
+#: contrib/config-daemon.scm:453
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:441
-msgid "This option specifies which hosts are trusted enough to connect as 
clients (to the TCP port).  This is useful if you run gnunetd on one host of 
your network and want to allow all other hosts to use this node as their 
server.  By default, this is set to 'loopback only'.  The format is IP/NETMASK 
where the IP is specified in dotted-decimal and the netmask either in CIDR 
notation (/16) or in dotted decimal (255.255.0.0). Several entries must be 
separated by a semicolon, spaces are not allowed."
+#: contrib/config-daemon.scm:454
+msgid ""
+"This option specifies which hosts are trusted enough to connect as clients "
+"(to the TCP port).  This is useful if you run gnunetd on one host of your "
+"network and want to allow all other hosts to use this node as their server.  "
+"By default, this is set to 'loopback only'.  The format is IP/NETMASK where "
+"the IP is specified in dotted-decimal and the netmask either in CIDR "
+"notation (/16) or in dotted decimal (255.255.0.0). Several entries must be "
+"separated by a semicolon, spaces are not allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:453
+#: contrib/config-daemon.scm:466
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:454
-msgid "If this option is not set, any peer is allowed to connect.  If it is 
set, only the specified peers are allowed."
+#: contrib/config-daemon.scm:467
+msgid ""
+"If this option is not set, any peer is allowed to connect.  If it is set, "
+"only the specified peers are allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:465
+#: contrib/config-daemon.scm:478
 msgid "Run gnunetd as this user."
 msgstr ""
 
-#: contrib/config-daemon.scm:466
-msgid "When started as root, gnunetd will change permissions to the given 
user."
+#: contrib/config-daemon.scm:479
+msgid ""
+"When started as root, gnunetd will change permissions to the given user."
 msgstr ""
 
-#: contrib/config-daemon.scm:477
+#: contrib/config-daemon.scm:490
 msgid "Run gnunetd as this group."
 msgstr ""
 
-#: contrib/config-daemon.scm:478
-msgid "When started as root, gnunetd will change permissions to the given 
group."
+#: contrib/config-daemon.scm:491
+msgid ""
+"When started as root, gnunetd will change permissions to the given group."
 msgstr ""
 
-#: contrib/config-daemon.scm:489
+#: contrib/config-daemon.scm:502
 msgid "Run gnunetd during system startup?"
 msgstr ""
 
-#: contrib/config-daemon.scm:502
+#: contrib/config-daemon.scm:515
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:503
+#: contrib/config-daemon.scm:516
 msgid "If this option is not set, any peer is allowed to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:514
+#: contrib/config-daemon.scm:527
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:547
 #, fuzzy
 msgid "General settings"
 msgstr "Thiết lập khác"
 
-#: contrib/config-daemon.scm:535
+#: contrib/config-daemon.scm:548
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:562
+#: contrib/config-daemon.scm:576
 #, fuzzy
 msgid "Path settings"
 msgstr "Thiết lập khác"
 
-#: contrib/config-daemon.scm:563
+#: contrib/config-daemon.scm:577
 msgid "Prefixes for paths used by GNUnet"
 msgstr ""
 
-#: contrib/config-daemon.scm:579
+#: contrib/config-daemon.scm:593
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:581
+#: contrib/config-daemon.scm:595
 msgid ""
-"Which database should be used?  The options are \"sqstore_sqlite\" and 
\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
+"Which database should be used?  The options are \"sqstore_sqlite\" and "
+"\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
 "\t\t\t\n"
-"In order to use sqstore_mysql, you must configure the mysql database, which 
is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
+"In order to use sqstore_mysql, you must configure the mysql database, which "
+"is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:594
+#: contrib/config-daemon.scm:608
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:596
+#: contrib/config-daemon.scm:610
 msgid ""
-"Which topology should be used?  The only options at the moment are 
\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try to 
connect to a diverse set of peers, and welcome connections from anyone.  In f2f 
(friend-to-friend) mode, GNUnet will only allow connections from peers that are 
explicitly listed in a FRIENDS file.  Note that you can list peers in the 
FRIENDS file that run in default mode.\n"
+"Which topology should be used?  The only options at the moment are "
+"\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
+"to connect to a diverse set of peers, and welcome connections from anyone.  "
+"In f2f (friend-to-friend) mode, GNUnet will only allow connections from "
+"peers that are explicitly listed in a FRIENDS file.  Note that you can list "
+"peers in the FRIENDS file that run in default mode.\n"
 "\n"
-"Use f2f only if you have (trustworthy) friends that use GNUnet and are afraid 
of establishing (direct) connections to unknown peers."
+"Use f2f only if you have (trustworthy) friends that use GNUnet and are "
+"afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:625
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:612
+#: contrib/config-daemon.scm:626
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:629
+#: contrib/config-daemon.scm:643
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:630
-msgid "Specifies the name of a file which contains a list of GNUnet peer IDs 
that are friends.  If used with the friend-to-friend topology, this will ensure 
that GNUnet only connects to these peers (via any available transport)."
+#: contrib/config-daemon.scm:644
+msgid ""
+"Specifies the name of a file which contains a list of GNUnet peer IDs that "
+"are friends.  If used with the friend-to-friend topology, this will ensure "
+"that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:644
+#: contrib/config-daemon.scm:658
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:656
+#: contrib/config-daemon.scm:670
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:668
+#: contrib/config-daemon.scm:682
 msgid "Configuration of the MySQL database"
 msgstr ""
 
-#: contrib/config-daemon.scm:687
+#: contrib/config-daemon.scm:701
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:689
+#: contrib/config-daemon.scm:703
 msgid ""
-"How much disk space (MB) is GNUnet allowed to use for anonymous file sharing? 
 This does not take indexed files into account, only the space directly used by 
GNUnet is accounted for.  GNUnet will gather content from the network if the 
current space-consumption is below the number given here (and if content 
migration is allowed below).\n"
+"How much disk space (MB) is GNUnet allowed to use for anonymous file "
+"sharing?  This does not take indexed files into account, only the space "
+"directly used by GNUnet is accounted for.  GNUnet will gather content from "
+"the network if the current space-consumption is below the number given here "
+"(and if content migration is allowed below).\n"
 "\n"
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:703
+#: contrib/config-daemon.scm:717
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:715
+#: contrib/config-daemon.scm:729
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:728
+#: contrib/config-daemon.scm:742
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:730
+#: contrib/config-daemon.scm:744
 msgid ""
-"If you say yes here, GNUnet will migrate content to your server, and you will 
not be able to control what data is stored on your machine. \n"
+"If you say yes here, GNUnet will migrate content to your server, and you "
+"will not be able to control what data is stored on your machine. \n"
 "\t\t\t\n"
-"If you activate it, you can claim for *all* the non-indexed (-n to 
gnunet-insert) content that you did not know what it was even if an adversary 
takes control of your machine.  If you do not activate it, it is obvious that 
you have knowledge of all the content that is hosted on your machine and thus 
can be considered liable for it."
+"If you activate it, you can claim for *all* the non-indexed (-n to gnunet-"
+"insert) content that you did not know what it was even if an adversary takes "
+"control of your machine.  If you do not activate it, it is obvious that you "
+"have knowledge of all the content that is hosted on your machine and thus "
+"can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:744
-msgid "MB of diskspace GNUnet can use for caching DHT index data (the data 
will be stored in /tmp)"
+#: contrib/config-daemon.scm:758
+msgid ""
+"MB of diskspace GNUnet can use for caching DHT index data (the data will be "
+"stored in /tmp)"
 msgstr ""
 
-#: contrib/config-daemon.scm:745
+#: contrib/config-daemon.scm:759
 msgid ""
-"DHT index data is inherently small and expires comparatively quickly.  It is 
deleted whenever gnunetd is shut down.\n"
+"DHT index data is inherently small and expires comparatively quickly.  It is "
+"deleted whenever gnunetd is shut down.\n"
 "\n"
 "The size of the DSTORE QUOTA is specified in MB."
 msgstr ""
 
-#: contrib/config-daemon.scm:759
+#: contrib/config-daemon.scm:773
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:778
+#: contrib/config-daemon.scm:792
 #, fuzzy
 msgid "Applications"
 msgstr "Tùy _chọn"
 
-#: contrib/config-daemon.scm:794
+#: contrib/config-daemon.scm:808
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:795
-msgid "Set to YES if this machine is behind a NAT that limits connections from 
the outside to the GNUnet port and that cannot be traversed using UPnP.  Note 
that if you have configured your NAT box to allow direct connections from other 
machines to the GNUnet ports or if GNUnet can open ports using UPnP, you should 
set the option to NO.  Set this only to YES if other peers cannot contact you 
directly.  You can use 'make check' in src/transports/upnp/ to find out if your 
NAT supports UPnP.  You can also use gnunet-transport-check with the '-p' 
option in order to determine which setting results in more connections.  Use 
YES only if you get no connections otherwise."
+#: contrib/config-daemon.scm:809
+msgid ""
+"Set to YES if this machine is behind a NAT that limits connections from the "
+"outside to the GNUnet port and that cannot be traversed using UPnP.  Note "
+"that if you have configured your NAT box to allow direct connections from "
+"other machines to the GNUnet ports or if GNUnet can open ports using UPnP, "
+"you should set the option to NO.  Set this only to YES if other peers cannot "
+"contact you directly.  You can use 'make check' in src/transports/upnp/ to "
+"find out if your NAT supports UPnP.  You can also use gnunet-transport-check "
+"with the '-p' option in order to determine which setting results in more "
+"connections.  Use YES only if you get no connections otherwise."
 msgstr ""
 
-#: contrib/config-daemon.scm:806
+#: contrib/config-daemon.scm:820
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:818 contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:832 contrib/config-daemon.scm:925
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:819
-msgid "You can use 'make check' in src/transports/upnp/ to find out if your 
NAT supports UPnP.  You should disable this option if you are sure that you are 
not behind a NAT.  If your NAT box does not support UPnP, having this on will 
not do much harm (only cost a small amount of resources)."
+#: contrib/config-daemon.scm:833
+msgid ""
+"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
+"supports UPnP.  You should disable this option if you are sure that you are "
+"not behind a NAT.  If your NAT box does not support UPnP, having this on "
+"will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:830 contrib/config-daemon.scm:935
-#: contrib/config-daemon.scm:990 contrib/config-daemon.scm:1055
+#: contrib/config-daemon.scm:844 contrib/config-daemon.scm:949
+#: contrib/config-daemon.scm:1004 contrib/config-daemon.scm:1069
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:842 contrib/config-daemon.scm:947
-msgid "Which IPs are allowed to connect? Leave empty to allow connections from 
any IP."
+#: contrib/config-daemon.scm:856
+msgid ""
+"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
+"network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:854
+#: contrib/config-daemon.scm:868
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:872
+#: contrib/config-daemon.scm:886
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:884
+#: contrib/config-daemon.scm:898
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:899
+#: contrib/config-daemon.scm:913
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:912
-msgid "You can use 'make check' in src/transports/upnp/ to find out if your 
NAT supports UPnP. You should disable this option if you are sure that you are 
not behind a NAT.  If your NAT box does not support UPnP, having this on will 
not do much harm (only cost a small amount of resources)."
+#: contrib/config-daemon.scm:926
+msgid ""
+"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
+"supports UPnP. You should disable this option if you are sure that you are "
+"not behind a NAT.  If your NAT box does not support UPnP, having this on "
+"will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:923
+#: contrib/config-daemon.scm:937
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:959
+#: contrib/config-daemon.scm:961
+msgid ""
+"Which IPs are allowed to connect? Leave empty to allow connections from any "
+"IP."
+msgstr ""
+
+#: contrib/config-daemon.scm:973
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:978
+#: contrib/config-daemon.scm:992
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1002 contrib/config-daemon.scm:1067
-msgid "Which IPs are allowed to connect? Leave empty to allow any IP to 
connect."
+#: contrib/config-daemon.scm:1016 contrib/config-daemon.scm:1081
+msgid ""
+"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:1014
+#: contrib/config-daemon.scm:1028
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1031
+#: contrib/config-daemon.scm:1045
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1043
+#: contrib/config-daemon.scm:1057
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1079
+#: contrib/config-daemon.scm:1093
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1097
+#: contrib/config-daemon.scm:1111
 #, fuzzy
 msgid "Network interface"
 msgstr "Giao diện mạng:"
 
-#: contrib/config-daemon.scm:1109
+#: contrib/config-daemon.scm:1123
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1121
+#: contrib/config-daemon.scm:1135
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1133
+#: contrib/config-daemon.scm:1147
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1156
+#: contrib/config-daemon.scm:1170
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1168
+#: contrib/config-daemon.scm:1182
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1180
+#: contrib/config-daemon.scm:1194
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1182
-msgid "Which CPU load can be tolerated.  Load here always refers to the total 
system load, that is it includes CPU utilization by other processes.  A value 
of 50 means that once your 1 minute-load average goes over 50% non-idle, GNUnet 
will try to reduce CPU consumption until the load goes under the threshold.  
Reasonable values are typically between 50 and 100.  Multiprocessors may use 
values above 100."
+#: contrib/config-daemon.scm:1196
+msgid ""
+"Which CPU load can be tolerated.  Load here always refers to the total "
+"system load, that is it includes CPU utilization by other processes.  A "
+"value of 50 means that once your 1 minute-load average goes over 50% non-"
+"idle, GNUnet will try to reduce CPU consumption until the load goes under "
+"the threshold.  Reasonable values are typically between 50 and 100.  "
+"Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1193
+#: contrib/config-daemon.scm:1207
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1195
-msgid "Which IO load can be tolerated.  Load here refers to the percentage of 
CPU cycles wasted waiting for IO for the entire system, that is it includes 
disk utilization by other processes.  A value of 10 means that once the average 
number of cycles wasted waiting for IO is more than 10% non-idle, GNUnet will 
try to reduce IO until the load goes under the threshold.  Reasonable values 
are typically between 10 and 75."
+#: contrib/config-daemon.scm:1209
+msgid ""
+"Which IO load can be tolerated.  Load here refers to the percentage of CPU "
+"cycles wasted waiting for IO for the entire system, that is it includes disk "
+"utilization by other processes.  A value of 10 means that once the average "
+"number of cycles wasted waiting for IO is more than 10% non-idle, GNUnet "
+"will try to reduce IO until the load goes under the threshold.  Reasonable "
+"values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1206
+#: contrib/config-daemon.scm:1220
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1207
-msgid "Which CPU load can be tolerated.  This is the hard limit, so once it is 
reached, gnunetd will start to massively drop data to reduce the load.  Use 
with caution."
+#: contrib/config-daemon.scm:1221
+msgid ""
+"Which CPU load can be tolerated.  This is the hard limit, so once it is "
+"reached, gnunetd will start to massively drop data to reduce the load.  Use "
+"with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1218
+#: contrib/config-daemon.scm:1232
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1219
-msgid "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 
to have MAXNETUPBPS be the hard limit.  Use zero for no limit."
+#: contrib/config-daemon.scm:1233
+msgid ""
+"The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
+"have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1230
+#: contrib/config-daemon.scm:1244
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1242
+#: contrib/config-daemon.scm:1256
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1244
+#: contrib/config-daemon.scm:1258
 msgid ""
-"Basic bandwidth limitation (YES) means simply that the bandwidth limits 
specified apply to GNUnet and only to GNUnet.  If set to YES, you simply 
specify the maximum bandwidth (upstream and downstream) that GNUnet is allowed 
to use and GNUnet will stick to those limitations.  This is useful if your 
overall bandwidth is so large that the limit is mostly used to ensure that 
enough capacity is left for other applications.  Even if you want to dedicate 
your entire connection to GNUnet you should not set the limits to values higher 
than what you have since GNUnet uses those limits to determine for example the 
number of connections to establish (and it would be inefficient if that 
computation yields a number that is far too high).  \n"
+"Basic bandwidth limitation (YES) means simply that the bandwidth limits "
+"specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
+"specify the maximum bandwidth (upstream and downstream) that GNUnet is "
+"allowed to use and GNUnet will stick to those limitations.  This is useful "
+"if your overall bandwidth is so large that the limit is mostly used to "
+"ensure that enough capacity is left for other applications.  Even if you "
+"want to dedicate your entire connection to GNUnet you should not set the "
+"limits to values higher than what you have since GNUnet uses those limits to "
+"determine for example the number of connections to establish (and it would "
+"be inefficient if that computation yields a number that is far too high).  \n"
 "\n"
-"While basic bandwidth limitation is simple and always works, there are some 
situations where it is not perfect.  Suppose you are running another 
application which performs a larger download. During that particular time, it 
would be nice if GNUnet would throttle its bandwidth consumption 
(automatically) and resume using more bandwidth after the download is complete. 
 This is obviously advanced magic since GNUnet will have to monitor the 
behavior of other applications. Another scenario is a monthly cap on bandwidth 
imposed by your ISP, which you would want to ensure is obeyed.  Here, you may 
want GNUnet to monitor the traffic from other applications to ensure that the 
combined long-term traffic is within the pre-set bounds.  Note that you should 
probably not set the bounds tightly since GNUnet may observe that the bounds 
are about to be broken but would be unable to stop other applications from 
continuing to use bandwidth.\n"
+"While basic bandwidth limitation is simple and always works, there are some "
+"situations where it is not perfect.  Suppose you are running another "
+"application which performs a larger download. During that particular time, "
+"it would be nice if GNUnet would throttle its bandwidth consumption "
+"(automatically) and resume using more bandwidth after the download is "
+"complete.  This is obviously advanced magic since GNUnet will have to "
+"monitor the behavior of other applications. Another scenario is a monthly "
+"cap on bandwidth imposed by your ISP, which you would want to ensure is "
+"obeyed.  Here, you may want GNUnet to monitor the traffic from other "
+"applications to ensure that the combined long-term traffic is within the pre-"
+"set bounds.  Note that you should probably not set the bounds tightly since "
+"GNUnet may observe that the bounds are about to be broken but would be "
+"unable to stop other applications from continuing to use bandwidth.\n"
 "\n"
-"If either of these two scenarios applies, set BASICLIMITING to NO. Then set 
the bandwidth limits to the COMBINED amount of traffic that is accepable for 
both GNUnet and other applications.  GNUnet will then immediately throttle 
bandwidth consumption if the short-term average is above the limit, and it will 
also try to ensure that the long-term average is below the limit.  Note however 
that using NO can have the effect of GNUnet (almost) ceasing operations after 
other applications perform high-volume downloads that are beyond the defined 
limits.  GNUnet would reduce consumption until the long-term limits are again 
within bounds.\n"
+"If either of these two scenarios applies, set BASICLIMITING to NO. Then set "
+"the bandwidth limits to the COMBINED amount of traffic that is accepable for "
+"both GNUnet and other applications.  GNUnet will then immediately throttle "
+"bandwidth consumption if the short-term average is above the limit, and it "
+"will also try to ensure that the long-term average is below the limit.  Note "
+"however that using NO can have the effect of GNUnet (almost) ceasing "
+"operations after other applications perform high-volume downloads that are "
+"beyond the defined limits.  GNUnet would reduce consumption until the long-"
+"term limits are again within bounds.\n"
 "\n"
-"NO only works on platforms where GNUnet can monitor the amount of traffic 
that the local host puts out on the network.  This is only implemented for 
Linux and Win32.  In order for the code to work, GNUnet needs to know the 
specific network interface that is used for the external connection (after all, 
the amount of traffic on loopback or on the LAN should never be counted since 
it is irrelevant)."
+"NO only works on platforms where GNUnet can monitor the amount of traffic "
+"that the local host puts out on the network.  This is only implemented for "
+"Linux and Win32.  In order for the code to work, GNUnet needs to know the "
+"specific network interface that is used for the external connection (after "
+"all, the amount of traffic on loopback or on the LAN should never be counted "
+"since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1261
+#: contrib/config-daemon.scm:1275
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Giao diện mạng:"
 
-#: contrib/config-daemon.scm:1262
-msgid "For which interfaces should we do accounting?  GNUnet will evaluate the 
total traffic (not only the GNUnet related traffic) and adjust its bandwidth 
usage accordingly. You can currently only specify a single interface. GNUnet 
will also use this interface to determine the IP to use. Typical values are 
eth0, ppp0, eth1, wlan0, etc.  'ifconfig' will tell you what you have.  Never 
use 'lo', that just won't work.  Under Windows, specify the index number 
reported by  'gnunet-win-tool -n'."
+#: contrib/config-daemon.scm:1276
+msgid ""
+"For which interfaces should we do accounting?  GNUnet will evaluate the "
+"total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
+"usage accordingly. You can currently only specify a single interface. GNUnet "
+"will also use this interface to determine the IP to use. Typical values are "
+"eth0, ppp0, eth1, wlan0, etc.  'ifconfig' will tell you what you have.  "
+"Never use 'lo', that just won't work.  Under Windows, specify the index "
+"number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1273
+#: contrib/config-daemon.scm:1287
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1298 contrib/config-client.scm:353
+#: contrib/config-daemon.scm:1312 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -614,53 +841,96 @@
 
 #: contrib/config-client.scm:244
 msgid ""
-"Specify which additional extractor libraries should be used.  gnunet-insert 
uses libextractor to extract keywords from files. libextractor can be 
dynamically extended to handle additional file formats. If you want to use more 
than the default set of extractors, specify additional extractor libraries 
here.  The format is [[-]LIBRARYNAME[:[-]LIBRARYNAME]*].\n"
+"Specify which additional extractor libraries should be used.  gnunet-insert "
+"uses libextractor to extract keywords from files. libextractor can be "
+"dynamically extended to handle additional file formats. If you want to use "
+"more than the default set of extractors, specify additional extractor "
+"libraries here.  The format is [[-]LIBRARYNAME[:[-]LIBRARYNAME]*].\n"
 "\n"
-"The default is to use filenames and to break larger words at spaces (and 
underscores, etc.).  This should be just fine for most people. The '-' before a 
library name indicates that this should be executed last and makes only sense 
for the split-library."
+"The default is to use filenames and to break larger words at spaces (and "
+"underscores, etc.).  This should be just fine for most people. The '-' "
+"before a library name indicates that this should be executed last and makes "
+"only sense for the split-library."
 msgstr ""
 
+#: contrib/config-client.scm:257
+msgid "How many entries should the URI DB table have?"
+msgstr ""
+
 #: contrib/config-client.scm:258
+msgid ""
+"GNUnet uses two bytes per entry on the disk.  This database is used to keep "
+"track of how a particular URI has been used in the past.  For example, "
+"GNUnet may remember that a particular URI has been found in a search "
+"previously or corresponds to a file uploaded by the user.  This information "
+"can then be used by user-interfaces to filter URI lists, such as search "
+"results.  If the database is full, older entries will be discarded.  The "
+"default value should be sufficient without causing undue disk utilization."
+msgstr ""
+
+#: contrib/config-client.scm:269
 #, fuzzy
 msgid "File-Sharing options"
 msgstr "Hiển thị mọi tùy chọn"
 
-#: contrib/config-client.scm:273
+#: contrib/config-client.scm:285
 msgid "Which plugins should be loaded by gnunet-gtk?"
 msgstr ""
 
-#: contrib/config-client.scm:274
-msgid "Load the about plugin for the about dialog.  The daemon plugin allows 
starting and stopping of gnunetd and displays information about gnunetd.  The 
fs plugin provides the file-sharing functionality.  The stats plugin displays 
various statistics about gnunetd."
+#: contrib/config-client.scm:286
+msgid ""
+"Load the about plugin for the about dialog.  The daemon plugin allows "
+"starting and stopping of gnunetd and displays information about gnunetd.  "
+"The fs plugin provides the file-sharing functionality.  The stats plugin "
+"displays various statistics about gnunetd."
 msgstr ""
 
-#: contrib/config-client.scm:285
+#: contrib/config-client.scm:297
 msgid "How frequently (in milli-seconds) should the statistics update?"
 msgstr ""
 
-#: contrib/config-client.scm:286
-msgid "Each pixel in the stats dialog corresponds to the time interval 
specified here."
+#: contrib/config-client.scm:298
+msgid ""
+"Each pixel in the stats dialog corresponds to the time interval specified "
+"here."
 msgstr ""
 
-#: contrib/config-client.scm:298
+#: contrib/config-client.scm:310
 msgid "Do not show thumbnail previews from meta-data in search results"
 msgstr ""
 
-#: contrib/config-client.scm:299
-msgid "This option is useful for people who maybe offended by some previews or 
use gnunet-gtk at work and would like to avoid bad surprises."
+#: contrib/config-client.scm:311
+msgid ""
+"This option is useful for people who maybe offended by some previews or use "
+"gnunet-gtk at work and would like to avoid bad surprises."
 msgstr ""
 
-#: contrib/config-client.scm:310
+#: contrib/config-client.scm:322
+msgid "Do not show search results for files that were uploaded by us"
+msgstr ""
+
+#: contrib/config-client.scm:323
+msgid ""
+"This option is useful to eliminate files that the user already has from the "
+"search.  Naturally, enabling this option maybe confusing because some "
+"obviously expected search results would no longer show up.  This option only "
+"works if the URI_DB_SIZE option under FS is not zero (since the URI DB is "
+"used to determine which files the user is sharing)"
+msgstr ""
+
+#: contrib/config-client.scm:335
 msgid "To which directory should gnunet-gtk save downloads to?"
 msgstr ""
 
-#: contrib/config-client.scm:322
+#: contrib/config-client.scm:347
 msgid "Options related to gnunet-gtk"
 msgstr ""
 
-#: contrib/config-client.scm:341
+#: contrib/config-client.scm:367
 msgid "Full pathname of GNUnet client HOME directory"
 msgstr ""
 
-#: contrib/config-client.scm:342
+#: contrib/config-client.scm:368
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
@@ -675,7 +945,8 @@
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
-"This assistant will ask you a few basic questions in order to configure 
GNUnet.\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
 "\n"
 "Please visit our homepage at\n"
 "\thttp://gnunet.org\n";
@@ -714,20 +985,40 @@
 msgid ""
 "Enter information about your network connection here.\n"
 "\n"
-"The \"Network interface\" is the device that connects your computer to the 
internet. This is usually a modem, an ISDN card or a network card in case you 
are using DSL.\n"
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL.\n"
 "\n"
-"If your provider always assigns the same IP-Address to you (a \"static\" 
IP-Address), enter it into the \"IP-Address\" field. If your IP-Address changes 
every now and then (\"dynamic\" IP-Address) but there's a hostname that always 
points to your actual IP-Address (\"Dynamic DNS\"), you can also enter it 
here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your 
IP-Address.\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address.\n"
 "\n"
-"If you are connected to the internet through another computer doing SNAT, a 
router or a \"hardware firewall\" and other computers on the internet cannot 
connect to this computer, check the last option on this page. Leave it 
unchecked on direct connections through modems, ISDN cards and DNAT (also known 
as \"port forwarding\")."
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, check the last option on this page. Leave it "
+"unchecked on direct connections through modems, ISDN cards and DNAT (also "
+"known as \"port forwarding\")."
 msgstr ""
 "Nhập thông tin về kết nối mạng tại đây.\n"
 "\n"
-"\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây thường là 
một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL.\n"
+"\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây thường là "
+"một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL.\n"
 "\n"
-"Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh\"), 
thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay đổi sau 
mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn luôn chỉ tới 
địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập nó ở đây.\n"
-"Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra địa 
chỉ IP. \n"
-"Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến 
router hay một \"phần cứng tường lửa\" và các máy khác trong internet không thể 
kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu kết nối thẳng qua 
môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp cổng\")."
+"Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh"
+"\"), thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay "
+"đổi sau mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn luôn "
+"chỉ tới địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập nó ở "
+"đây.\n"
+"Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra địa "
+"chỉ IP. \n"
+"Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến "
+"router hay một \"phần cứng tường lửa\" và các máy khác trong internet không "
+"thể kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu kết nối "
+"thẳng qua môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp cổng\")."
 
 #: src/setup/gtk/gnunet-setup.glade:372
 msgid "Network interface:"
@@ -749,15 +1040,21 @@
 msgid ""
 "You can limit GNUnet's ressource usage here.\n"
 "\n"
-"\"Bandwidth limitation\" is how much data may be sent per second. If you have 
a flatrate you can set it to the maximum speed of your internet connection.\n"
+"\"Bandwidth limitation\" is how much data may be sent per second. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection.\n"
 "\n"
-"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed 
to use."
+"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
+"to use."
 msgstr ""
 "Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
 "\n"
-"\"Giới hạn băng thông\" cho biết bao nhiêu dữ liệu có thể gửi mỗi giây. Nếu 
có một tốc độ đều thì có thể đặt thành tốc độ lớn nhất của kết nối internet.\n"
+"\"Giới hạn băng thông\" cho biết bao nhiêu dữ liệu có thể gửi mỗi giây. Nếu "
+"có một tốc độ đều thì có thể đặt thành tốc độ lớn nhất của kết nối "
+"internet.\n"
 "\n"
-"\"Sử dụng CPU lớn nhất\" là phần trăm thời gian của bộ xử lý cho phép GNUnet 
sử dụng."
+"\"Sử dụng CPU lớn nhất\" là phần trăm thời gian của bộ xử lý cho phép GNUnet "
+"sử dụng."
 
 #: src/setup/gtk/gnunet-setup.glade:833
 msgid "Upstream (Bytes/s):"
@@ -803,20 +1100,36 @@
 #: src/setup/gtk/gnunet-setup.glade:1495
 #, fuzzy
 msgid ""
-"GNUnet is able to store data from other peers in your datastore. This is 
useful if an adversary has access to your inserted content and you need to deny 
that the content is yours. With \"content migration\" on, the content could 
have \"migrated\" over the internet to your node without your knowledge.\n"
-"It also helps to spread popular content over different peers to enhance 
availability.\n"
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability.\n"
 "\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, 
inserted and migrated content). Its maximum size can be specified below.\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content). Its maximum size can be specified below.\n"
 "\n"
-"If you are an experienced user, you may want to tweak your GNUnet 
installation using the enhanced configurator.\n"
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
 "\n"
-"After changing the configuration and/or updating GNUnet, it is sometimes 
required to run gnunet-update to update internal data structures. Depending on 
the changes made, this may take some time."
+"After changing the configuration and/or updating GNUnet, it is sometimes "
+"required to run gnunet-update to update internal data structures. Depending "
+"on the changes made, this may take some time."
 msgstr ""
-"GNUnet có thể chứa ghi nhớ dữ liệu từ các đầu peer khác trong kho dữ liệu. 
Tính năng này có ích nếu một đối tượng xấu truy cập tới nội dung đã chèn và 
người dùng cần loại bỏ nội dung đó. Khi \"nhập nội dung\" bật dùng, nội dung có 
thể \"nhập\" qua internet tới nút của người dùng mà người dùng không biết.\n"
-"Nó đồng thời giúp chia sẻ nội dung phổ biến qua các đầu peer khác nhau để dễ 
dàng truy cập.\n"
-"Kho dữ liệu GNUnet chứa mọi dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, nội dung 
chèn và nhập vào). Có thể chỉ ra kích thước lớn nhất ở dưới\n"
+"GNUnet có thể chứa ghi nhớ dữ liệu từ các đầu peer khác trong kho dữ liệu. "
+"Tính năng này có ích nếu một đối tượng xấu truy cập tới nội dung đã chèn và "
+"người dùng cần loại bỏ nội dung đó. Khi \"nhập nội dung\" bật dùng, nội dung "
+"có thể \"nhập\" qua internet tới nút của người dùng mà người dùng không "
+"biết.\n"
+"Nó đồng thời giúp chia sẻ nội dung phổ biến qua các đầu peer khác nhau để dễ "
+"dàng truy cập.\n"
+"Kho dữ liệu GNUnet chứa mọi dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, nội dung "
+"chèn và nhập vào). Có thể chỉ ra kích thước lớn nhất ở dưới\n"
 "\n"
-"Nếu là một người dùng có kinh nghiệm, bạn có thể chỉnh sửa cài đặt GNUnet của 
mình bằng trình cấu hình nâng cấp."
+"Nếu là một người dùng có kinh nghiệm, bạn có thể chỉnh sửa cài đặt GNUnet "
+"của mình bằng trình cấu hình nâng cấp."
 
 #: src/setup/gtk/gnunet-setup.glade:1541
 msgid "Store migrated content"
@@ -850,17 +1163,24 @@
 msgid ""
 "Define the user and the group owning the GNUnet service here.\n"
 "\n"
-"For security reasons, it is a good idea to let this setup create a new user 
account and a new group under which the GNUnet service is started at system 
startup.\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account and a new group under which the GNUnet service is started at system "
+"startup.\n"
 "\n"
-"However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
 "\n"
 "Leave the fields empty to run GNUnet with system privileges."
 msgstr ""
 "Xác định người dùng và nhóm sở hữu dịch vụ GNUnet ở đây.\n"
 "\n"
-"Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng và một nhóm mới 
sở hữu dịch vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
+"Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng và một nhóm mới "
+"sở hữu dịch vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
 "\n"
-"Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao gồm 
các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho phép người 
dùng chỉ ra dưới đây quyền đọc chúng.\n"
+"Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao gồm "
+"các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho phép "
+"người dùng chỉ ra dưới đây quyền đọc chúng.\n"
 "\n"
 "Để trống để chạy GNUnet với quyền hệ thống."
 
@@ -1035,7 +1355,8 @@
 "\n"
 "    a) Accompany it with the complete corresponding machine-readable\n"
 "    source code, which must be distributed under the terms of Sections\n"
-"    1 and 2 above on a medium customarily used for software interchange; 
or,\n"
+"    1 and 2 above on a medium customarily used for software interchange; "
+"or,\n"
 "\n"
 "    b) Accompany it with a written offer, valid for at least three\n"
 "    years, to give any third party, for a charge no more than your\n"
@@ -1142,7 +1463,8 @@
 "later version\", you have the option of following the terms and conditions\n"
 "either of that version or of any later version published by the Free\n"
 "Software Foundation.  If the Program does not specify a version number of\n"
-"this License, you may choose any version ever published by the Free 
Software\n"
+"this License, you may choose any version ever published by the Free "
+"Software\n"
 "Foundation.\n"
 "\n"
 "  10. If you wish to incorporate parts of the Program into other free\n"
@@ -1158,7 +1480,8 @@
 "  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
 "FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
 "OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
-"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER 
EXPRESSED\n"
+"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
+"EXPRESSED\n"
 "OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
 "MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
 "TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
@@ -1203,7 +1526,8 @@
 "\n"
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  
USA\n"
+"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+"USA\n"
 "\n"
 "\n"
 "Also add information on how to contact you by electronic and paper mail.\n"
@@ -1212,7 +1536,8 @@
 "when it starts in an interactive mode:\n"
 "\n"
 "    Gnomovision version 69, Copyright (C) year  name of author\n"
-"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show 
w'.\n"
+"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
+"w'.\n"
 "    This is free software, and you are welcome to redistribute it\n"
 "    under certain conditions; type `show c' for details.\n"
 "\n"
@@ -1266,19 +1591,19 @@
 msgid "specify host on which gnunetd is running"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/include/gnunet_util_error.h:177 src/include/gnunet_util_error.h:179
-#: src/include/gnunet_util_error.h:181 src/include/gnunet_util_error.h:183
+#: src/include/gnunet_util_error.h:215 src/include/gnunet_util_error.h:217
+#: src/include/gnunet_util_error.h:219 src/include/gnunet_util_error.h:221
 #, fuzzy, c-format
 msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr "Xác nhận thất bại tại %s:%d.\n"
 
-#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
-#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
+#: src/include/gnunet_util_error.h:228 src/include/gnunet_util_error.h:235
+#: src/include/gnunet_util_error.h:242 src/include/gnunet_util_error.h:249
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:225
+#: src/include/gnunet_util_error.h:256 src/include/gnunet_util_error.h:263
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "'%s' thất bại trên tập tin'%s' tại %s:%d với lỗi: %s\n"
@@ -1291,7 +1616,8 @@
 #: src/transports/ip6.c:104 src/util/network/ip.c:83 src/util/network/ip.c:144
 #, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
-msgstr "Không có giao diện mạng được xác định trong cấu hình phần '%s' dưới 
'%s'!\n"
+msgstr ""
+"Không có giao diện mạng được xác định trong cấu hình phần '%s' dưới '%s'!\n"
 
 #: src/transports/ip6.c:134 src/util/network/ip.c:113
 #: src/util/network/ip.c:234
@@ -1318,50 +1644,56 @@
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "UDP6: Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/transports/udp6.c:521 src/transports/udp.c:534
+#: src/transports/udp6.c:544 src/transports/udp.c:575
 #, fuzzy, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
 
-#: src/transports/http.c:447
+#: src/transports/http.c:448
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/transports/http.c:672 src/transports/http.c:750
-#: src/transports/http.c:799 src/transports/http.c:936
+#: src/transports/http.c:754 src/transports/http.c:827
+#: src/transports/http.c:951 src/transports/http.c:1036
 #: src/transports/upnp/upnp.c:335 src/transports/upnp/upnp.c:560
-#: src/applications/bootstrap_http/http.c:121
-#: src/applications/bootstrap_http/http.c:261
-#: src/applications/bootstrap_http/http.c:282
-#: src/applications/bootstrap_http/http.c:316
-#: src/applications/bootstrap_http/http.c:334
-#: src/applications/bootstrap_http/http.c:348
-#: src/applications/bootstrap_http/http.c:360
-#: src/applications/bootstrap_http/http.c:372
+#: src/applications/bootstrap_http/http.c:124
+#: src/applications/bootstrap_http/http.c:269
+#: src/applications/bootstrap_http/http.c:290
+#: src/applications/bootstrap_http/http.c:324
+#: src/applications/bootstrap_http/http.c:342
+#: src/applications/bootstrap_http/http.c:356
+#: src/applications/bootstrap_http/http.c:368
+#: src/applications/bootstrap_http/http.c:380
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/transports/http.c:1126
-msgid "The UPnP service could not be loaded. To disable UPnP, set the 
configuration option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
+#: src/transports/http.c:1248
+msgid ""
+"The UPnP service could not be loaded. To disable UPnP, set the configuration "
+"option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:1134
+#: src/transports/http.c:1256
 msgid "# bytes received via HTTP"
 msgstr "# byte nhận được qua HTTP"
 
-#: src/transports/http.c:1136
+#: src/transports/http.c:1258
 msgid "# bytes sent via HTTP"
 msgstr "# byte gửi qua HTTP"
 
-#: src/transports/http.c:1138
+#: src/transports/http.c:1260
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte loại bỏ bởi HTTP (đi ra)"
 
 #: src/transports/smtp.c:257
 #, fuzzy, c-format
-msgid "You must specify the name of a pipe for the SMTP transport in section 
`%s' under `%s'.\n"
-msgstr "Người dùng phải chỉ ra tên của ống pipe cho truyền tải SMTP trong phần 
'%s' dưới '%s'.\n"
+msgid ""
+"You must specify the name of a pipe for the SMTP transport in section `%s' "
+"under `%s'.\n"
+msgstr ""
+"Người dùng phải chỉ ra tên của ống pipe cho truyền tải SMTP trong phần '%s' "
+"dưới '%s'.\n"
 
 #: src/transports/smtp.c:334
 msgid "Received malformed message via SMTP (size mismatch).\n"
@@ -1376,98 +1708,102 @@
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "Đầu lọc SMTP quá dài, đổi thành '%s'\n"
 
-#: src/transports/smtp.c:546
+#: src/transports/smtp.c:547
 #, fuzzy, c-format
 msgid "Failed to initialize libesmtp: %s.\n"
 msgstr "Chạy dịch vụ '%s' không thành công.\n"
 
-#: src/transports/smtp.c:610
+#: src/transports/smtp.c:611
 #, fuzzy, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Gửi E-mail tới '%s' thất bại.\n"
 
-#: src/transports/smtp.c:678
+#: src/transports/smtp.c:679
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s đầu lọc %s (SMTP)"
 
-#: src/transports/smtp.c:706
+#: src/transports/smtp.c:707
 #, fuzzy, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
 
-#: src/transports/tcp.c:271
+#: src/transports/tcp.c:274
 #, fuzzy
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr "HTTP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/transports/tcp.c:357
+#: src/transports/tcp.c:358
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr "Không kết nối được tới %u.%u.%u.%u:%u: %s\n"
 
-#: src/transports/tcp.c:424 src/transports/tcp6.c:379
+#: src/transports/tcp.c:425 src/transports/tcp6.c:382
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Chạy dịch vụ truyền tải trên cổng %d thất bại.\n"
 
-#: src/transports/tcp.c:569
-msgid "The UPnP service could not be loaded. To disable UPnP, set the 
configuration option \"UPNP\" in section \"TCP\" to \"NO\"\n"
+#: src/transports/tcp.c:592
+msgid ""
+"The UPnP service could not be loaded. To disable UPnP, set the configuration "
+"option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:577
+#: src/transports/tcp.c:600
 msgid "# bytes received via TCP"
 msgstr "# byte nhận được qua TCP"
 
-#: src/transports/tcp.c:579
+#: src/transports/tcp.c:602
 msgid "# bytes sent via TCP"
 msgstr "# Byte gửi qua TCP"
 
-#: src/transports/tcp.c:581
+#: src/transports/tcp.c:604
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte loại đi bởi TCP (đi ra)"
 
-#: src/transports/udp.c:276
+#: src/transports/udp.c:293
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "UDP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/transports/udp.c:367
+#: src/transports/udp.c:382
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
-msgstr "Gửi thông báo với kích thước %d qua UDP tới %u.%u.%u.%u:%u không thành 
công: %s\n"
+msgstr ""
+"Gửi thông báo với kích thước %d qua UDP tới %u.%u.%u.%u:%u không thành công: "
+"%s\n"
 
-#: src/transports/udp.c:552
+#: src/transports/udp.c:593
 msgid "# bytes received via UDP"
 msgstr "# byte nhận được qua UDP"
 
-#: src/transports/udp.c:554
+#: src/transports/udp.c:595
 msgid "# bytes sent via UDP"
 msgstr "# byte gửi qua UDP"
 
-#: src/transports/udp.c:556
+#: src/transports/udp.c:597
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte loại bỏ bởi UDP (đi ra)"
 
-#: src/transports/tcp6.c:223
+#: src/transports/tcp6.c:226
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Không nhận ra địa chỉ IPv6 của tôi.\n"
 
-#: src/transports/tcp6.c:265
+#: src/transports/tcp6.c:268
 #, fuzzy, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "'%s': không rõ dịch vụ: %s\n"
 
-#: src/transports/tcp6.c:519
+#: src/transports/tcp6.c:547
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "# byte nhận được qua TCP"
 
-#: src/transports/tcp6.c:521
+#: src/transports/tcp6.c:549
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "# Byte gửi qua TCP"
 
-#: src/transports/tcp6.c:523
+#: src/transports/tcp6.c:551
 #, fuzzy
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr "# byte loại đi bởi TCP (đi ra)"
@@ -1482,57 +1818,33 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/tcp_old.c:1299
-#, fuzzy
-msgid "# bytes received via TCP-OLD"
-msgstr "# byte nhận được qua TCP"
-
-#: src/transports/tcp_old.c:1301
-#, fuzzy
-msgid "# bytes sent via TCP-OLD"
-msgstr "# Byte gửi qua TCP"
-
-#: src/transports/tcp_old.c:1303
-#, fuzzy
-msgid "# bytes dropped by TCP-OLD (outgoing)"
-msgstr "# byte loại đi bởi TCP (đi ra)"
-
 #: src/transports/tcp_helper.c:193
 #, fuzzy
 msgid "Received malformed message instead of welcome message. Closing.\n"
-msgstr "Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. 
Đang đóng.\n"
+msgstr ""
+"Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
+"đóng.\n"
 
-#: src/transports/tcp_helper.c:204
+#: src/transports/tcp_helper.c:205
 #, fuzzy
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
-msgstr "Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. 
Đang đóng.\n"
+msgstr ""
+"Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
+"đóng.\n"
 
 #: src/transports/udp_helper.c:91
 #, fuzzy
 msgid "Received malformed message from udp-peer connection. Closing.\n"
-msgstr "Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. 
Đang đóng.\n"
+msgstr ""
+"Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
+"đóng.\n"
 
-#: src/applications/dht/tools/dhttest2.c:45
-#: src/applications/session/sessiontest.c:42
-#: src/applications/stats/statistics.c:229
-#: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:100
-#: src/applications/gap/gaptest.c:49
-msgid "# of connected peers"
-msgstr "# của các đầu đã kết nối"
+#: src/applications/dht/tools/dhttest2.c:46
+#: src/applications/dht/module/table.c:701
+#, fuzzy
+msgid "# dht connections"
+msgstr "Kết nối mạng"
 
-#: src/applications/dht/tools/dhttest2.c:160
-#, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr "Đang chờ chạy gnunetd (còn %u lần thử)...\n"
-
-#: src/applications/dht/tools/dhttest2.c:173
-#: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:116
-#, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr "Đang chờ kết nối các đầu (còn %u lần thử)...\n"
-
 #: src/applications/dht/tools/dht-query.c:55
 #, fuzzy
 msgid "Query (get KEY, put KEY VALUE) DHT table."
@@ -1540,7 +1852,8 @@
 
 #: src/applications/dht/tools/dht-query.c:59
 #, fuzzy
-msgid "allow TIME ms to process a GET command or expire PUT content after ms 
TIME"
+msgid ""
+"allow TIME ms to process a GET command or expire PUT content after ms TIME"
 msgstr "cho phép TIME mili giây để tiến hành mỗi câu lệnh"
 
 #: src/applications/dht/tools/dht-query.c:103
@@ -1588,20 +1901,15 @@
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "'%s' không thành công. Ngắt kết nối tới máy khách.\n"
 
-#: src/applications/dht/module/cs.c:230
+#: src/applications/dht/module/cs.c:240
 #, fuzzy, c-format
 msgid "`%s' registering client handlers: %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển máy khách %d\n"
 
-#: src/applications/dht/module/cs.c:249
+#: src/applications/dht/module/cs.c:259
 msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
-#: src/applications/dht/module/table.c:701
-#, fuzzy
-msgid "# dht connections"
-msgstr "Kết nối mạng"
-
 #: src/applications/dht/module/table.c:702
 #, fuzzy
 msgid "# dht discovery messages received"
@@ -1682,7 +1990,7 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:126
 #: src/applications/testbed/gnunet-testbed.c:547 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:286
+#: src/setup/gnunet-setup.c:287
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Dùng --help để xem danh sách các tùy chọn.\n"
@@ -1704,158 +2012,204 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "Không gửi được thông báo tới gnunetd\n"
 
-#: src/applications/advertising/advertising.c:168
+#: src/applications/advertising/advertising.c:188
 #, fuzzy, c-format
-msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 msgstr "Thông báo HELO từ '%s' bị sai (sai chữ ký). Đang bỏ đi.\n"
 
-#: src/applications/advertising/advertising.c:175
+#: src/applications/advertising/advertising.c:196
 #, fuzzy
-msgid "hello message received invalid (expiration time over limit). 
Dropping.\n"
+msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr "Thông báo HELO nhận được bị sai (vượt quá thời hạn). Đang bỏ đi.\n"
 
-#: src/applications/advertising/advertising.c:182
-#, c-format
-msgid "hello transport verification failed (%u).\n"
-msgstr ""
-
-#: src/applications/advertising/advertising.c:192
-#, fuzzy, c-format
-msgid "hello advertisement for protocol %d received.\n"
-msgstr "Nhận được quảng cáo HELO cho giao thức %d.\n"
-
-#: src/applications/advertising/advertising.c:327
+#: src/applications/advertising/advertising.c:367
 #, fuzzy
-msgid "Could not send hellos+PING, ping buffer full.\n"
+msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr "Không gửi được các HELO+PING, đầy bộ đệm ping.\n"
 
-#: src/applications/advertising/advertising.c:341
-#, fuzzy, c-format
-msgid "`%s' failed (%d, %u). Will not send PING.\n"
-msgstr "'%s' thất bại (%d, %u). Sẽ không gửi PING.\n"
+#: src/applications/advertising/advertising.c:385
+msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:504
+#: src/applications/advertising/advertising.c:549
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Đang quảng cáo giao thông %d tới các đầu peer đã chọn.\n"
 
-#: src/applications/advertising/advertising.c:511
-msgid "Announcing ourselves pointless: no other peers are known to us so 
far.\n"
-msgstr "Đang tự thông báo sự vô nghĩa: chúng ta không còn biết đến một đầu 
peer nào.\n"
+#: src/applications/advertising/advertising.c:557
+msgid ""
+"Announcing ourselves pointless: no other peers are known to us so far.\n"
+msgstr ""
+"Đang tự thông báo sự vô nghĩa: chúng ta không còn biết đến một đầu peer "
+"nào.\n"
 
-#: src/applications/advertising/advertising.c:613
-#, fuzzy, c-format
-msgid "Removing hello from peer `%s' (expired %ds ago).\n"
-msgstr "Đang xóa bỏ HELO từ đầu peer '%s' (đã hết hạn %dgiây).\n"
-
-#: src/applications/advertising/advertising.c:794
+#: src/applications/advertising/advertising.c:832
 msgid "# Peer advertisements received"
 msgstr "# Nhận được quảng cáo của đầu peer"
 
-#: src/applications/advertising/advertising.c:795
+#: src/applications/advertising/advertising.c:833
+#, fuzzy
+msgid "# Peer advertisements of type NAT received"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:834
+#, fuzzy
+msgid "# Peer advertisements confirmed via PONG"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:835
+#, fuzzy
+msgid "# Peer advertisements updating earlier HELLOs"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:836
+#, fuzzy
+msgid "# Peer advertisements discarded due to load"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:837
+#, fuzzy
+msgid "# Peer advertisements for unsupported transport"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:838
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to ping busy"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:839
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to lack of self ad"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:840
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to send error"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:841
 msgid "# Self advertisments transmitted"
 msgstr "# Đã truyền tải tự quảng cáo"
 
-#: src/applications/advertising/advertising.c:796
+#: src/applications/advertising/advertising.c:842
 msgid "# Foreign advertisements forwarded"
 msgstr "# Đã chuyển tiếp quàng cáo ngoài"
 
-#: src/applications/advertising/advertising.c:798
-#: src/applications/pingpong/pingpong.c:493
+#: src/applications/advertising/advertising.c:844
+#: src/applications/pingpong/pingpong.c:516
 msgid "# plaintext PING messages sent"
 msgstr "# đã gửi các thông báo PING dạng văn bản thông thường"
 
-#: src/applications/advertising/advertising.c:802
-#: src/applications/session/connect.c:892
+#: src/applications/advertising/advertising.c:849
+#: src/applications/session/connect.c:936
 #, fuzzy, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
-msgstr "'%s' đăng ký trình điều khiển %d (văn bản thông thường và văn bản mã 
hóa)\n"
+msgstr ""
+"'%s' đăng ký trình điều khiển %d (văn bản thông thường và văn bản mã hóa)\n"
 
-#: src/applications/advertising/advertising.c:820
-msgid "ensures that this peer is known by other peers and discovers other 
peers"
+#: src/applications/advertising/advertising.c:867
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:447
+#: src/applications/topology_default/topology.c:448
 msgid "maintains GNUnet default mesh topology"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:123
-#: src/applications/pingpong/pingpong.c:191
-#: src/applications/pingpong/pingpong.c:244
-#: src/applications/pingpong/pingpong.c:314
+#: src/applications/pingpong/pingpong.c:128
+#: src/applications/pingpong/pingpong.c:199
+#: src/applications/pingpong/pingpong.c:264
+#: src/applications/pingpong/pingpong.c:335
 #, fuzzy, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr "Nhận được thông báo '%s' hỏng. Đang bỏ đi.\n"
 
-#: src/applications/pingpong/pingpong.c:135
+#: src/applications/pingpong/pingpong.c:140
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "Nhận được ping cho đầu peer khác. Đang bỏ đi.\n"
 
-#: src/applications/pingpong/pingpong.c:201
+#: src/applications/pingpong/pingpong.c:210
 msgid "Received PING not destined for us!\n"
 msgstr "Nhận được PING không dành cho chúng ta!\n"
 
-#: src/applications/pingpong/pingpong.c:287
-#: src/applications/pingpong/pingpong.c:350
-msgid "Could not match PONG against any PING. Try increasing MAX_PING_PONG 
constant.\n"
-msgstr "Không tương ứng được PONG đối với bất kỳ PING. Hãy thử tăng hằng số 
MAX_PING_PONG.\n"
+#: src/applications/pingpong/pingpong.c:308
+#: src/applications/pingpong/pingpong.c:371
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
+msgstr ""
+"Không tương ứng được PONG đối với bất kỳ PING. Hãy thử tăng hằng số "
+"MAX_PING_PONG.\n"
 
-#: src/applications/pingpong/pingpong.c:393
+#: src/applications/pingpong/pingpong.c:414
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr "Không tạo được PING, bảng đầy. Hãy thử tăng MAX_PING_PONG.\n"
 
-#: src/applications/pingpong/pingpong.c:483
+#: src/applications/pingpong/pingpong.c:506
 msgid "# encrypted PONG messages received"
 msgstr "# nhận được thông báo PONG đã mã hóa"
 
-#: src/applications/pingpong/pingpong.c:485
+#: src/applications/pingpong/pingpong.c:508
 msgid "# plaintext PONG messages received"
 msgstr "# nhận được thông báo PONG dạng văn bản thường"
 
-#: src/applications/pingpong/pingpong.c:487
+#: src/applications/pingpong/pingpong.c:510
 msgid "# encrypted PING messages received"
 msgstr "# nhận được thông báo PING đã mã hóa"
 
-#: src/applications/pingpong/pingpong.c:489
+#: src/applications/pingpong/pingpong.c:512
 msgid "# PING messages created"
 msgstr "# đã tạo tin nhắn PING"
 
-#: src/applications/pingpong/pingpong.c:491
+#: src/applications/pingpong/pingpong.c:514
+#: src/applications/session/connect.c:931
 msgid "# encrypted PONG messages sent"
 msgstr "# đã gửi thông báo PONG đã mã hóa"
 
-#: src/applications/pingpong/pingpong.c:495
+#: src/applications/pingpong/pingpong.c:518
+#: src/applications/session/connect.c:929
 msgid "# encrypted PING messages sent"
 msgstr "# đã gửi các thông báo PING mã hóa"
 
-#: src/applications/pingpong/pingpong.c:505
+#: src/applications/pingpong/pingpong.c:520
+#, fuzzy
+msgid "# plaintext PONG messages sent"
+msgstr "# đã gửi các thông báo PING dạng văn bản thông thường"
+
+#: src/applications/pingpong/pingpong.c:522
+#, fuzzy
+msgid "# plaintext PONG transmissions failed"
+msgstr "# nhận được thông báo PONG dạng văn bản thường"
+
+#: src/applications/pingpong/pingpong.c:532
 #, fuzzy, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
-msgstr "'%s' đăng ký trình điều khiển %d %d (văn bản thông thường và văn bản 
mã hóa)\n"
+msgstr ""
+"'%s' đăng ký trình điều khiển %d %d (văn bản thông thường và văn bản mã "
+"hóa)\n"
 
 #: src/applications/sqstore_sqlite/sqlite.c:46
 #: src/applications/sqstore_sqlite/sqlite.c:53
-#: src/applications/sqstore_mysql/mysql.c:138
-#: src/applications/sqstore_mysql/mysql.c:145
-#: src/applications/sqstore_mysql/mysql.c:423
-#: src/applications/sqstore_mysql/mysql.c:754
-#: src/applications/sqstore_mysql/mysql.c:770
-#: src/applications/sqstore_mysql/mysql.c:780
-#: src/applications/sqstore_mysql/mysql.c:805
-#: src/applications/sqstore_mysql/mysql.c:816
-#: src/applications/sqstore_mysql/mysql.c:873
-#: src/applications/sqstore_mysql/mysql.c:960
-#: src/applications/sqstore_mysql/mysql.c:971
-#: src/applications/sqstore_mysql/mysql.c:1035
-#: src/applications/sqstore_mysql/mysql.c:1051
-#: src/applications/sqstore_mysql/mysql.c:1061
-#: src/applications/sqstore_mysql/mysql.c:1085
-#: src/applications/sqstore_mysql/mysql.c:1096
-#: src/applications/sqstore_mysql/mysql.c:1108
-#: src/applications/sqstore_mysql/mysql.c:1171
-#: src/applications/sqstore_mysql/mysql.c:1183
-#: src/applications/sqstore_mysql/mysql.c:1234
-#: src/applications/sqstore_mysql/mysql.c:1249
+#: src/applications/sqstore_mysql/mysql.c:139
+#: src/applications/sqstore_mysql/mysql.c:146
+#: src/applications/sqstore_mysql/mysql.c:795
+#: src/applications/sqstore_mysql/mysql.c:811
+#: src/applications/sqstore_mysql/mysql.c:821
+#: src/applications/sqstore_mysql/mysql.c:846
+#: src/applications/sqstore_mysql/mysql.c:857
+#: src/applications/sqstore_mysql/mysql.c:914
+#: src/applications/sqstore_mysql/mysql.c:1001
+#: src/applications/sqstore_mysql/mysql.c:1012
+#: src/applications/sqstore_mysql/mysql.c:1076
+#: src/applications/sqstore_mysql/mysql.c:1092
+#: src/applications/sqstore_mysql/mysql.c:1102
+#: src/applications/sqstore_mysql/mysql.c:1126
+#: src/applications/sqstore_mysql/mysql.c:1137
+#: src/applications/sqstore_mysql/mysql.c:1149
+#: src/applications/sqstore_mysql/mysql.c:1212
+#: src/applications/sqstore_mysql/mysql.c:1224
+#: src/applications/sqstore_mysql/mysql.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1291
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/applications/dstore/dstore.c:91 src/applications/dstore/dstore.c:178
@@ -1875,9 +2229,9 @@
 
 #: src/applications/sqstore_sqlite/sqlite.c:357
 #: src/applications/sqstore_sqlite/sqlite.c:378
-#: src/applications/sqstore_mysql/mysql.c:260
-#: src/applications/sqstore_mysql/mysql.c:834
-#: src/applications/sqstore_mysql/mysql.c:1123
+#: src/applications/sqstore_mysql/mysql.c:261
+#: src/applications/sqstore_mysql/mysql.c:875
+#: src/applications/sqstore_mysql/mysql.c:1164
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
@@ -1887,77 +2241,100 @@
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1342
-#: src/applications/sqstore_mysql/mysql.c:1310
+#: src/applications/sqstore_sqlite/sqlite.c:1370
+#: src/applications/sqstore_mysql/mysql.c:1352
 msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/session/connect.c:257
-#: src/applications/session/connect.c:274
+#: src/applications/session/sessiontest.c:43
+#: src/applications/stats/statistics.c:229
+msgid "# of connected peers"
+msgstr "# của các đầu đã kết nối"
+
+#: src/applications/session/connect.c:261
+#: src/applications/session/connect.c:278
 #, fuzzy, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Không kiểm tra được chìa khóa buổi làm việc từ đầu peer '%s'.\n"
 
-#: src/applications/session/connect.c:315
+#: src/applications/session/connect.c:321
 #, fuzzy, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
-msgstr "Không mã hóa được chìa khóa buổi làm việc, không biết đến đầu peer 
khác!\n"
+msgstr ""
+"Không mã hóa được chìa khóa buổi làm việc, không biết đến đầu peer khác!\n"
 
-#: src/applications/session/connect.c:587
+#: src/applications/session/connect.c:520
+#, fuzzy
+msgid "Could not create any HELLO for myself!\n"
+msgstr "Không tạo được chìa khóa máy!\n"
+
+#: src/applications/session/connect.c:621
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "Thông báo nhận được từ một đầu là sai.\n"
 
-#: src/applications/session/connect.c:605
+#: src/applications/session/connect.c:639
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr "Không kiểm tra được chìa khóa buổi làm việc từ đầu peer '%s'.\n"
 
-#: src/applications/session/connect.c:637
+#: src/applications/session/connect.c:673
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Nhận được thông báo '%s' sai từ đầu peer '%s'.\n"
 
-#: src/applications/session/connect.c:647
+#: src/applications/session/connect.c:683
 #, fuzzy, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr "Kiểm tra CRC của SKEY từ '%s' không thành công (có: %u, muốn %u).\n"
 
-#: src/applications/session/connect.c:716
+#: src/applications/session/connect.c:752
 #, fuzzy, c-format
-msgid "Error parsing encrypted session key from `%s', given message part size 
is invalid.\n"
-msgstr "Lỗi phân tích chìa khóa buổi làm việc đã mã hóa, kích thước của phần 
thông báo đưa ra là sai.\n"
+msgid ""
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
+msgstr ""
+"Lỗi phân tích chìa khóa buổi làm việc đã mã hóa, kích thước của phần thông "
+"báo đưa ra là sai.\n"
 
-#: src/applications/session/connect.c:728
+#: src/applications/session/connect.c:764
 #, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:881
+#: src/applications/session/connect.c:921
 msgid "# session keys sent"
 msgstr "# đã gửi các phím buổi làm việc"
 
-#: src/applications/session/connect.c:883
+#: src/applications/session/connect.c:923
 msgid "# session keys rejected"
 msgstr "# đã nhả ra các phím buổi làm việc"
 
-#: src/applications/session/connect.c:885
+#: src/applications/session/connect.c:925
 msgid "# session keys accepted"
 msgstr "# đã chấp nhận các phím buổi làm việc"
 
-#: src/applications/session/connect.c:887
+#: src/applications/session/connect.c:927
 msgid "# sessions established"
 msgstr "# đã thiết lập buổi làm việc"
 
 #: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be registered: another callback is already 
using this name (%p)\n"
-msgstr "%s::%s - RPC %s:%p không đăng ký được: một gọi lại khác đã dùng tên 
này (%p)\n"
+msgid ""
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
+msgstr ""
+"%s::%s - RPC %s:%p không đăng ký được: một gọi lại khác đã dùng tên này (%"
+"p)\n"
 
 #: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be unregistered: another callback 
registered under that name: %p\n"
-msgstr "%s::%s - RPC %s:%p không đăng ký được: một gọi lại khác đã đăng ký 
dưới tên đó (%p)\n"
+msgid ""
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
+msgstr ""
+"%s::%s - RPC %s:%p không đăng ký được: một gọi lại khác đã đăng ký dưới tên "
+"đó (%p)\n"
 
 #: src/applications/rpc/rpc.c:233
 #, c-format
@@ -2008,19 +2385,28 @@
 msgid "async RPC reply not received.\n"
 msgstr "Không nhận được câu trả lời async của RPC.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:261
-#: src/applications/sqstore_mysql/mysql.c:835
-#: src/applications/sqstore_mysql/mysql.c:1124
+#: src/applications/sqstore_mysql/mysql.c:262
+#: src/applications/sqstore_mysql/mysql.c:876
+#: src/applications/sqstore_mysql/mysql.c:1165
 msgid "mysql datastore"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1340
+#: src/applications/sqstore_mysql/mysql.c:424
 #, fuzzy, c-format
+msgid ""
+"`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s DG/%"
+"s\n"
+msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
+
+#: src/applications/sqstore_mysql/mysql.c:1382
+#, fuzzy, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Đang thử dùng tập tin '%s' cho cấu hình MySQL.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1363
-msgid "Failed to load MySQL database module.  Check that MySQL is running and 
configured properly!\n"
+#: src/applications/sqstore_mysql/mysql.c:1405
+msgid ""
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
 msgstr ""
 
 #: src/applications/datastore/datastore.c:120
@@ -2038,68 +2424,70 @@
 msgstr ""
 
 #: src/applications/datastore/datastore.c:392
-#: src/applications/datastore/datastore.c:501
+#: src/applications/datastore/datastore.c:489
 #, fuzzy
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr "Chạy dịch vụ truyền tải trên cổng %d thất bại.\n"
 
-#: src/applications/datastore/datastore.c:476
-#, fuzzy
-msgid "Deleting expired content.  This may take a while.\n"
-msgstr "Đang tạo chìa khóa máy mới (có thể cần một chút thời gian).\n"
-
-#: src/applications/datastore/datastore.c:482
-msgid "Completed deleting expired content.\n"
-msgstr ""
-
 #: src/applications/identity/hostkey.c:123
 #, fuzzy, c-format
 msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
 
-#: src/applications/identity/hostkey.c:157
+#: src/applications/identity/hostkey.c:154
 #, fuzzy, c-format
-msgid "Existing hostkey in file `%s' failed format check, creating new 
hostkey.\n"
-msgstr "Kiểm tra chìa khóa máy có trong '%s' không thành công, đang tạo chìa 
khóa máy mới.\n"
+msgid ""
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+msgstr ""
+"Kiểm tra chìa khóa máy có trong '%s' không thành công, đang tạo chìa khóa "
+"máy mới.\n"
 
-#: src/applications/identity/hostkey.c:165
+#: src/applications/identity/hostkey.c:162
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Đang tạo chìa khóa máy mới (có thể cần một chút thời gian).\n"
 
-#: src/applications/identity/hostkey.c:178
+#: src/applications/identity/hostkey.c:175
 msgid "Done creating hostkey.\n"
 msgstr "Đã tạo xong chìa khóa máy.\n"
 
-#: src/applications/identity/identity.c:346
+#: src/applications/identity/identity.c:347
 #, fuzzy, c-format
-msgid "File `%s' in directory `%s' does not match naming convention. 
Removed.\n"
-msgstr "Tập tin '%s' trong thư mục '%s' không tương ứng quy ước tên. Đã xóa 
bỏ.\n"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"Tập tin '%s' trong thư mục '%s' không tương ứng quy ước tên. Đã xóa bỏ.\n"
 
-#: src/applications/identity/identity.c:359
+#: src/applications/identity/identity.c:360
 #, fuzzy, c-format
-msgid "Directory `%s' in directory `%s' does not match naming convention. 
Removed.\n"
-msgstr "Tập tin '%s' trong thư mục '%s' không tương ứng quy ước tên. Đã xóa 
bỏ.\n"
+msgid ""
+"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"Tập tin '%s' trong thư mục '%s' không tương ứng quy ước tên. Đã xóa bỏ.\n"
 
-#: src/applications/identity/identity.c:396
+#: src/applications/identity/identity.c:397
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:686
-#: src/applications/identity/identity.c:706
+#: src/applications/identity/identity.c:730
+#: src/applications/identity/identity.c:758
 #, fuzzy, c-format
-msgid "Removed file `%s' containing invalid hello data.\n"
+msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr "Xóa bỏ tập tin '%s' chứa dữ liệu HELO sai.\n"
 
-#: src/applications/identity/identity.c:759
+#: src/applications/identity/identity.c:812
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:768
+#: src/applications/identity/identity.c:822
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
+#: src/applications/identity/identity.c:1278
+msgid "invalid"
+msgstr ""
+
 #: src/applications/testbed/commands.c:1130
 #: src/applications/stats/gnunet-stats.c:65
 #, c-format
@@ -2234,7 +2622,8 @@
 
 #: src/applications/testbed/testbed.c:833
 msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
-msgstr "Tên tập tin cho thông báo UPLOAD_FILE không phải là kết thúc rỗng 
(sai)!\n"
+msgstr ""
+"Tên tập tin cho thông báo UPLOAD_FILE không phải là kết thúc rỗng (sai)!\n"
 
 #: src/applications/testbed/testbed.c:841
 msgid "Upload refused!"
@@ -2252,8 +2641,11 @@
 
 #: src/applications/testbed/testbed.c:1002
 #, c-format
-msgid "Received testbed message of type %u but unexpected size %u, expected 
%u\n"
-msgstr "Nhận được thông báo testbed dạng %u nhưng kích thước không mong đợi 
%u, mong đợi %u\n"
+msgid ""
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
+msgstr ""
+"Nhận được thông báo testbed dạng %u nhưng kích thước không mong đợi %u, mong "
+"đợi %u\n"
 
 #: src/applications/testbed/testbed.c:1045
 msgid "No testbed URL given, not registered.\n"
@@ -2299,49 +2691,56 @@
 
 #: src/applications/transport/transport.c:142
 #, c-format
-msgid "Converting peer address to string failed, transport type %d not 
supported\n"
+msgid ""
+"Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:189
+#: src/applications/transport/transport.c:188
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:284
+#: src/applications/transport/transport.c:240
+#, c-format
+msgid ""
+"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:301
 #, fuzzy, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr "Không biết đến giao thông dạng %d.\n"
 
-#: src/applications/transport/transport.c:373
+#: src/applications/transport/transport.c:389
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Không biết đến giao thông dạng %d.\n"
 
-#: src/applications/transport/transport.c:430
+#: src/applications/transport/transport.c:446
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:631
+#: src/applications/transport/transport.c:647
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/applications/transport/transport.c:651
+#: src/applications/transport/transport.c:667
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "Không chạy được ứng dụng '%s'\n"
 
-#: src/applications/transport/transport.c:661
+#: src/applications/transport/transport.c:677
 #, fuzzy, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr "Thư viện giao thông '%s' không cung cấp chức năng yêu cầu '%s%s'.\n"
 
-#: src/applications/transport/transport.c:688
+#: src/applications/transport/transport.c:704
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "(Các) truyền tải có: %s\n"
 
-#: src/applications/transport/transport.c:701
+#: src/applications/transport/transport.c:717
 #, fuzzy, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là một đầu peer '%s'.\n"
@@ -2414,12 +2813,12 @@
 msgid "# bytes of noise received"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/applications/stats/statistics.c:384
+#: src/applications/stats/statistics.c:398
 #, fuzzy, c-format
 msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr "'%s' đăng ký trình điều khiển máy khách %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/stats/statistics.c:405
+#: src/applications/stats/statistics.c:419
 #, fuzzy
 msgid "keeps statistics about gnunetd's operation"
 msgstr "In thống kê về các thao tác của GNUnet."
@@ -2611,26 +3010,22 @@
 "\n"
 "Không nhận được thông báo từ gnunetd. gnunetd đang chạy?\n"
 
-#: src/applications/tbench/tbenchtest.c:51
-#: src/applications/tbench/tbenchtest_udp.c:50
+#: src/applications/tbench/tbenchtest.c:53
 #, c-format
 msgid "Using %u messages of size %u for %u times.\n"
 msgstr "Sử dụng %u thông báo với kích thước %u trong %u lần.\n"
 
-#: src/applications/tbench/tbenchtest.c:78
-#: src/applications/tbench/tbenchtest_udp.c:77
+#: src/applications/tbench/tbenchtest.c:80
 #, c-format
 msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 msgstr "Thời gian:  max %16llu  min %16llu  có nghĩa %12.3f  biến %12.3f\n"
 
-#: src/applications/tbench/tbenchtest.c:83
-#: src/applications/tbench/tbenchtest_udp.c:82
+#: src/applications/tbench/tbenchtest.c:85
 #, c-format
 msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
 msgstr "Mất:  max %16u  min %16u  có nghĩa %12.3f  biến %12.3f\n"
 
-#: src/applications/tbench/tbenchtest.c:89
-#: src/applications/tbench/tbenchtest_udp.c:88
+#: src/applications/tbench/tbenchtest.c:91
 #, c-format
 msgid ""
 "\n"
@@ -2639,8 +3034,7 @@
 "\n"
 "Không nhận thành công câu trả lời từ gnunetd.\n"
 
-#: src/applications/tbench/tbenchtest.c:212
-#: src/applications/tbench/tbenchtest_udp.c:211
+#: src/applications/tbench/tbenchtest.c:148
 #, c-format
 msgid "Running benchmark...\n"
 msgstr "Đang chạy thử mức độ (benchmark)...\n"
@@ -2654,8 +3048,10 @@
 msgstr "thử mạng tới độ sâu DEPTH đưa ra"
 
 #: src/applications/tracekit/gnunet-tracekit.c:51
-msgid "specify output format; 0 for human readable output, 1 for dot, 2 for 
vcg"
-msgstr "chỉ ra định dạng kết quả; 0 - dạng người dùng dễ đọc, 1 - dấu chấm, 2 
- vcg"
+msgid ""
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+msgstr ""
+"chỉ ra định dạng kết quả; 0 - dạng người dùng dễ đọc, 1 - dấu chấm, 2 - vcg"
 
 #: src/applications/tracekit/gnunet-tracekit.c:57
 msgid "use PRIO for the priority of the trace request"
@@ -2667,8 +3063,11 @@
 
 #: src/applications/tracekit/gnunet-tracekit.c:115
 #, c-format
-msgid "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for 
vcg.\n"
-msgstr "Định dạng bị sai. Dùng 0 cho người dùng dễ đọc, 1 cho chấm, 2 cho 
vcg.\n"
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
+msgstr ""
+"Định dạng bị sai. Dùng 0 cho người dùng dễ đọc, 1 cho chấm, 2 cho vcg.\n"
 
 #: src/applications/tracekit/gnunet-tracekit.c:163
 #, fuzzy, c-format
@@ -2714,111 +3113,118 @@
 msgid "allows mapping of the network topology"
 msgstr "Theo dấu vết trace hình học của mạng GNUnet."
 
-#: src/applications/gap/gap.c:1690
+#: src/applications/gap/gap.c:1705
 #, fuzzy, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "Nhận được thông báo sai '%s' từ '%s'.\n"
 
-#: src/applications/gap/gap.c:1691
+#: src/applications/gap/gap.c:1706
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1865
-msgid "Cover traffic requested but traffic service not loaded.  Rejecting 
request.\n"
-msgstr "Đã yêu cầu che truyền tải nhưng chưa nạp dịch vụ truyền tải.  Đang nhả 
ra yêu cầu.\n"
+#: src/applications/gap/gap.c:1882
+msgid ""
+"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
+msgstr ""
+"Đã yêu cầu che truyền tải nhưng chưa nạp dịch vụ truyền tải.  Đang nhả ra "
+"yêu cầu.\n"
 
-#: src/applications/gap/gap.c:1877 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1894 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr "Lấy các thông tin truyền tải không thành công.\n"
 
-#: src/applications/gap/gap.c:1884 src/applications/gap/gap.c:1890
-#: src/applications/gap/gap.c:1897
+#: src/applications/gap/gap.c:1901 src/applications/gap/gap.c:1907
+#: src/applications/gap/gap.c:1914
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr "Không thể thỏa mãn mức độ dấu tên mong muốn, đang lờ đi yêu cầu.\n"
 
-#: src/applications/gap/gap.c:2181
+#: src/applications/gap/gap.c:2202
 #, fuzzy
 msgid "# gap requests total received"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/gap/gap.c:2182
+#: src/applications/gap/gap.c:2203
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2183
+#: src/applications/gap/gap.c:2204
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2184
+#: src/applications/gap/gap.c:2205
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2185
+#: src/applications/gap/gap.c:2206
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2207
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2187
+#: src/applications/gap/gap.c:2208
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2188
+#: src/applications/gap/gap.c:2209
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2189
+#: src/applications/gap/gap.c:2210
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2190
+#: src/applications/gap/gap.c:2211
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2191
+#: src/applications/gap/gap.c:2212
 #, fuzzy
 msgid "# gap duplicate requests that were re-tried"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/gap/gap.c:2192
+#: src/applications/gap/gap.c:2213
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2193
+#: src/applications/gap/gap.c:2214
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2194
-msgid "# gap spurious replies"
+#: src/applications/gap/gap.c:2215
+msgid "# gap spurious replies (dropped)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2195
+#: src/applications/gap/gap.c:2216
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2196
+#: src/applications/gap/gap.c:2217
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2197
+#: src/applications/gap/gap.c:2218
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2198
+#: src/applications/gap/gap.c:2219
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2199
+#: src/applications/gap/gap.c:2220
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2215
-msgid "Traffic service failed to load; gap cannot ensure cover-traffic 
availability.\n"
-msgstr "Nạp dịch vụ truyền tải không thành công; lỗ hổng không thể chắc chắn 
khả năng truyền tải.\n"
+#: src/applications/gap/gap.c:2236
+msgid ""
+"Traffic service failed to load; gap cannot ensure cover-traffic "
+"availability.\n"
+msgstr ""
+"Nạp dịch vụ truyền tải không thành công; lỗ hổng không thể chắc chắn khả "
+"năng truyền tải.\n"
 
-#: src/applications/gap/gap.c:2243
+#: src/applications/gap/gap.c:2264
 #, fuzzy, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d %d\n"
@@ -2869,8 +3275,12 @@
 msgstr "Tạo tên hiệu mới, xóa tên hiệu hoặc liệt kê các tên hiệu có."
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:89
-msgid "use the given keyword to advertise the namespace (use when creating a 
new pseudonym)"
-msgstr "sử dụng từ khóa đưa ra để quảng cáo không gian tên (dùng khi tạo một 
tên hiệu mới)"
+msgid ""
+"use the given keyword to advertise the namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"sử dụng từ khóa đưa ra để quảng cáo không gian tên (dùng khi tạo một tên "
+"hiệu mới)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:92
 #, fuzzy
@@ -2878,16 +3288,24 @@
 msgstr "kết thúc việc tự động xây dựng một không gian tên (kết thúc thu thập)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:95
-msgid "do not generate an advertisement for this namespace (use when creating 
a new pseudonym)"
-msgstr "không tạo một quảng cáo cho không gian tên này (dùng khi tạo một tên 
hiệu mới)"
+msgid ""
+"do not generate an advertisement for this namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"không tạo một quảng cáo cho không gian tên này (dùng khi tạo một tên hiệu "
+"mới)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:98
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr "không liệt kê tên hiệu từ cơ sở dữ liệu tên hiệu"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:101
-msgid "specify IDENTIFIER to be the address of the entrypoint to content in 
the namespace (use when creating a new pseudonym)"
-msgstr "dùng IDENTIFIER làm địa chỉ của điểm chỉ tới nội dung trong không gian 
tên (dùng khi tạo một tên hiệu mới)"
+msgid ""
+"specify IDENTIFIER to be the address of the entrypoint to content in the "
+"namespace (use when creating a new pseudonym)"
+msgstr ""
+"dùng IDENTIFIER làm địa chỉ của điểm chỉ tới nội dung trong không gian tên "
+"(dùng khi tạo một tên hiệu mới)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:104
 msgid "set the rating of a namespace"
@@ -2951,7 +3369,8 @@
 #: src/applications/fs/tools/gnunet-pseudonym.c:304
 #, fuzzy, c-format
 msgid "You must specify a name for the collection (`%s' option).\n"
-msgstr "Người dùng phải chỉ ra một tên cho tập tin PID trong phần '%s' dưới 
'%s'.\n"
+msgstr ""
+"Người dùng phải chỉ ra một tên cho tập tin PID trong phần '%s' dưới '%s'.\n"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:315
 #, c-format
@@ -3045,10 +3464,10 @@
 msgstr "Dừng tải xuống."
 
 #: src/applications/fs/tools/gnunet-insert.c:251
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Error uploading file: %s\n"
+"Error uploading file: %s"
 msgstr ""
 "\n"
 "Lỗi tải lên tập tin: %s\n"
@@ -3061,48 +3480,77 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:277
-msgid "even if gnunetd is running on the local machine, force the creation of 
a copy instead of making a link to the GNUnet share directory"
-msgstr "thậm chí nếu gnunetd đang chạy trên máy nội bộ, bắt buộc tạo một bản 
sao thay vì tạo một liên kết đến thư mục chia sẻ của GNUnet"
+msgid ""
+"even if gnunetd is running on the local machine, force the creation of a "
+"copy instead of making a link to the GNUnet share directory"
+msgstr ""
+"thậm chí nếu gnunetd đang chạy trên máy nội bộ, bắt buộc tạo một bản sao "
+"thay vì tạo một liên kết đến thư mục chia sẻ của GNUnet"
 
 #: src/applications/fs/tools/gnunet-insert.c:281
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:284
-msgid "do not use libextractor to add additional references to directory 
entries and/or the published file"
+msgid ""
+"do not use libextractor to add additional references to directory entries "
+"and/or the published file"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-insert.c:287
-msgid "print list of extracted keywords that would be used, but do not perform 
upload"
-msgstr "in ra danh sách của các từ khóa đã giải phóng cần sử dụng, nhưng không 
thực hiện tải lên"
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+"in ra danh sách của các từ khóa đã giải phóng cần sử dụng, nhưng không thực "
+"hiện tải lên"
 
 #: src/applications/fs/tools/gnunet-insert.c:289
 msgid "Make files available to GNUnet for sharing."
 msgstr "Cho phép GNUnet chia sẻ các tập tin."
 
 #: src/applications/fs/tools/gnunet-insert.c:292
-msgid "set interval for availability of updates to SECONDS (for namespace 
insertions only)"
-msgstr "đặt khoảng thời gian cho cập nhật thành GIÂY (chỉ cho sự chèn không 
gian tên)"
+msgid ""
+"set interval for availability of updates to SECONDS (for namespace "
+"insertions only)"
+msgstr ""
+"đặt khoảng thời gian cho cập nhật thành GIÂY (chỉ cho sự chèn không gian tên)"
 
 #: src/applications/fs/tools/gnunet-insert.c:296
-msgid "add an additional keyword for the top-level file or directory (this 
option can be specified multiple times)"
-msgstr "thêm một từ khóa phụ cho tập tin hoặc thư mục cao nhất (có thể chỉ ra 
tùy chọn này nhiều lần)"
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
+msgstr ""
+"thêm một từ khóa phụ cho tập tin hoặc thư mục cao nhất (có thể chỉ ra tùy "
+"chọn này nhiều lần)"
 
 #: src/applications/fs/tools/gnunet-insert.c:300
-msgid "add an additional keyword for all files and directories (this option 
can be specified multiple times)"
-msgstr "thêm một từ khóa phụ 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)"
+msgid ""
+"add an additional keyword for all files and directories (this option can be "
+"specified multiple times)"
+msgstr ""
+"thêm một từ khóa phụ 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/applications/fs/tools/gnunet-insert.c:305
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt dữ liệu meta cho TYPE đưa ra tới VALUE chỉ ra"
 
 #: src/applications/fs/tools/gnunet-insert.c:308
-msgid "do not index, perform full insertion (stores entire file in encrypted 
form in GNUnet database)"
-msgstr "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở 
dạng mã hóa trong cơ sở dữ liệu GNUnet)"
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
+msgstr ""
+"không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
+"mã hóa trong cơ sở dữ liệu GNUnet)"
 
 #: src/applications/fs/tools/gnunet-insert.c:312
-msgid "specify ID of an updated version to be published in the future (for 
namespace insertions only)"
-msgstr "chỉ ra ID của một phiên bản đã cập nhật để chia sẻ trong tương lai 
(chỉ cho sự chèn không gian tên)"
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+"chỉ ra ID của một phiên bản đã cập nhật để chia sẻ trong tương lai (chỉ cho "
+"sự chèn không gian tên)"
 
 #: src/applications/fs/tools/gnunet-insert.c:316
 msgid "specify the priority of the content"
@@ -3110,14 +3558,21 @@
 
 #: src/applications/fs/tools/gnunet-insert.c:319
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
-msgstr "đưa ra dùng chung các tập tin dưới tên hiệu TÊN (đặt tập tin vào không 
gian tên)"
+msgstr ""
+"đưa ra dùng chung các tập tin dưới tên hiệu TÊN (đặt tập tin vào không gian "
+"tên)"
 
 #: src/applications/fs/tools/gnunet-insert.c:322
-msgid "specifies this as an aperiodic but updated publication (for namespace 
insertions only)"
-msgstr "chỉ ra sự chia sẻ này không theo chu kỳ nhưng đã cập nhật (chỉ cho 
chèn không gian tên)"
+msgid ""
+"specifies this as an aperiodic but updated publication (for namespace "
+"insertions only)"
+msgstr ""
+"chỉ ra sự chia sẻ này không theo chu kỳ nhưng đã cập nhật (chỉ cho chèn "
+"không gian tên)"
 
 #: src/applications/fs/tools/gnunet-insert.c:326
-msgid "set the ID of this version of the publication (for namespace insertions 
only)"
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
 msgstr "đặt ID của phiên bản này của sự chia sẻ (chỉ cho chèn không gian tên)"
 
 #: src/applications/fs/tools/gnunet-insert.c:330
@@ -3126,7 +3581,8 @@
 
 #: src/applications/fs/tools/gnunet-insert.c:333
 msgid "ID of the previous version of the content (for namespace update only)"
-msgstr "ID của phiên bản trước của nội dung (chỉ cho sự cập nhật không gian 
tên)"
+msgstr ""
+"ID của phiên bản trước của nội dung (chỉ cho sự cập nhật không gian tên)"
 
 #: src/applications/fs/tools/gnunet-insert.c:368
 #, fuzzy, c-format
@@ -3175,7 +3631,11 @@
 msgstr "Lỗi chuyển đổi tham số tới URI!\n"
 
 #: src/applications/fs/tools/gnunet-download.c:71
-msgid "download a GNUnet directory that has already been downloaded.  Requires 
that a filename of an existing file is specified instead of the URI.  The 
download will only download the top-level files in the directory unless the 
`-R' option is also specified."
+msgid ""
+"download a GNUnet directory that has already been downloaded.  Requires that "
+"a filename of an existing file is specified instead of the URI.  The "
+"download will only download the top-level files in the directory unless the "
+"`-R' option is also specified."
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-download.c:73
@@ -3208,7 +3668,8 @@
 #: src/applications/fs/tools/gnunet-download.c:123
 #, fuzzy, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
-msgstr "Hoàn thành tải xuống tập tin '%s'.  Tốc độ là %8.3f kilô byte một 
giây.\n"
+msgstr ""
+"Hoàn thành tải xuống tập tin '%s'.  Tốc độ là %8.3f kilô byte một giây.\n"
 
 #: src/applications/fs/tools/gnunet-download.c:171
 msgid "no name given"
@@ -3255,8 +3716,12 @@
 
 #: src/applications/fs/tools/gnunet-unindex.c:57
 #, c-format
-msgid "%16llu of %16llu bytes unindexed (estimating %llu seconds to 
completion)                "
-msgstr "Đã bỏ chỉ mục %16llu từ %16llu byte (sẽ hoàn thành sau %llu giây)      
          "
+msgid ""
+"%16llu of %16llu bytes unindexed (estimating %llu seconds to "
+"completion)                "
+msgstr ""
+"Đã bỏ chỉ mục %16llu từ %16llu byte (sẽ hoàn thành sau %llu "
+"giây)                "
 
 #: src/applications/fs/tools/gnunet-unindex.c:68
 #, fuzzy, c-format
@@ -3290,6 +3755,15 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s' thất bại.  '%s' là một tập tin?\n"
 
+#: src/applications/fs/module/querymanager.c:227
+#, fuzzy
+msgid "# FS currently tracked queries from clients"
+msgstr "# đã gửi câu trả lời theo vết trace đến máy khách"
+
+#: src/applications/fs/module/querymanager.c:229
+msgid "# FS replies passed to clients"
+msgstr ""
+
 #: src/applications/fs/module/ondemand.c:336
 #, fuzzy, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
@@ -3297,13 +3771,23 @@
 
 #: src/applications/fs/module/ondemand.c:434
 #, fuzzy, c-format
-msgid "Because the file `%s' has been unavailable for 3 days it got removed 
from your share.  Please unindex files before deleting them as the index now 
contains invalid references!\n"
-msgstr "Vì không có tập tin '%s' trong 3 ngày nên đã xóa bỏ nó khỏi chia sẻ.  
Xin hãy bỏ chỉ mục các tập tin trước khi xóa chúng vì chỉ mục hiện thời chứa 
các liên kết sai!"
+msgid ""
+"Because the file `%s' has been unavailable for 3 days it got removed from "
+"your share.  Please unindex files before deleting them as the index now "
+"contains invalid references!\n"
+msgstr ""
+"Vì không có tập tin '%s' trong 3 ngày nên đã xóa bỏ nó khỏi chia sẻ.  Xin "
+"hãy bỏ chỉ mục các tập tin trước khi xóa chúng vì chỉ mục hiện thời chứa các "
+"liên kết sai!"
 
 #: src/applications/fs/module/ondemand.c:461
 #, fuzzy, c-format
-msgid "Configuration file must specify directory for storage of FS data in 
section `%s' under `%s'.\n"
-msgstr "Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu FS trong phần 
'%s' dưới '%s'.\n"
+msgid ""
+"Configuration file must specify directory for storage of FS data in section `"
+"%s' under `%s'.\n"
+msgstr ""
+"Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu FS trong phần '%s' dưới "
+"'%s'.\n"
 
 #: src/applications/fs/module/ondemand.c:518
 msgid "Indexed content changed (does not match its hash).\n"
@@ -3311,20 +3795,33 @@
 
 #: src/applications/fs/module/ondemand.c:681
 #, fuzzy, c-format
-msgid "Unindexed ODB block `%s' from offset %llu already missing from 
datastore.\n"
+msgid ""
+"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr "Khối ODB đã bỏ chỉ mục '%s' từ %llu không có trong kho dữ liệu.\n"
 
-#: src/applications/fs/module/fs.c:1139
+#: src/applications/fs/module/fs.c:1167
 #, fuzzy, c-format
-msgid "You must specify a postive number for `%s' in the configuration in 
section `%s'.\n"
-msgstr "Người dùng phải chỉ ra một số dương cho '%s' trong phần '%s' của cấu 
hình.\n"
+msgid ""
+"You must specify a postive number for `%s' in the configuration in section `%"
+"s'.\n"
+msgstr ""
+"Người dùng phải chỉ ra một số dương cho '%s' trong phần '%s' của cấu hình.\n"
 
 #: src/applications/fs/module/fs.c:1180
+msgid "# FS expired replies dropped"
+msgstr ""
+
+#: src/applications/fs/module/fs.c:1182
+#, fuzzy
+msgid "# FS valid replies received"
+msgstr "# nhận được yêu cầu theo vết trace p2p"
+
+#: src/applications/fs/module/fs.c:1219
 #, fuzzy, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển máy khách %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/module/fs.c:1220
+#: src/applications/fs/module/fs.c:1259
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -3347,11 +3844,11 @@
 msgid "AND"
 msgstr "VÀ"
 
-#: src/applications/fs/fsui/search.c:275
+#: src/applications/fs/fsui/search.c:281
 msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:267
+#: src/applications/fs/fsui/download.c:308
 #, fuzzy
 msgid "Download failed (no reason given)"
 msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
@@ -3360,7 +3857,7 @@
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:246
+#: src/applications/fs/fsui/upload.c:281
 #, fuzzy
 msgid "Failed to create temporary directory."
 msgstr "Lấy các thông tin truyền tải không thành công.\n"
@@ -3378,23 +3875,28 @@
 msgid "LOC URI not allowed for search.\n"
 msgstr "Không cho phép tìm kiếm LOC URI.\n"
 
-#: src/applications/fs/ecrs/download.c:124
+#: src/applications/fs/ecrs/download.c:125
 #, fuzzy, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "Không ghi được PID tới tập tin '%s': %s.\n"
 
-#: src/applications/fs/ecrs/download.c:255
+#: src/applications/fs/ecrs/download.c:270
 #, fuzzy, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "'%s' %s không thành công: %s\n"
 
-#: src/applications/fs/ecrs/download.c:1001
-msgid "Decrypted content does not match key. This is either a bug or a 
maliciously inserted file. Download aborted.\n"
-msgstr "Nội dung đã giải mã không tương ứng chìa khóa. Đây là một lỗi bug hoặc 
một tập tin chèn vào với ý xấu. Dừng tải xuống.\n"
+#: src/applications/fs/ecrs/download.c:1043
+msgid ""
+"Decrypted content does not match key. This is either a bug or a maliciously "
+"inserted file. Download aborted.\n"
+msgstr ""
+"Nội dung đã giải mã không tương ứng chìa khóa. Đây là một lỗi bug hoặc một "
+"tập tin chèn vào với ý xấu. Dừng tải xuống.\n"
 
-#: src/applications/fs/ecrs/download.c:1186
+#: src/applications/fs/ecrs/download.c:1229
 #, fuzzy, c-format
-msgid "Content `%s' seems to be not available on the network (tried %u 
times).\n"
+msgid ""
+"Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr "Nội dung '%s' có vẻ không có trên mạng.\n"
 
 #: src/applications/fs/ecrs/upload.c:164
@@ -3452,21 +3954,21 @@
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Không tạo được tên hiệu '%s', tập tin '%s' tồn tại.\n"
 
-#: src/applications/fs/ecrs/namespace.c:339
-#: src/applications/fs/ecrs/namespace.c:420
-#: src/applications/fs/ecrs/namespace.c:575
+#: src/applications/fs/ecrs/namespace.c:342
+#: src/applications/fs/ecrs/namespace.c:425
+#: src/applications/fs/ecrs/namespace.c:584
 #, fuzzy, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Tập tin '%s' không chứa một tên hiệu.\n"
 
-#: src/applications/fs/ecrs/namespace.c:351
-#: src/applications/fs/ecrs/namespace.c:431
+#: src/applications/fs/ecrs/namespace.c:354
+#: src/applications/fs/ecrs/namespace.c:436
 #, fuzzy, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Định dạng của tên hiệu '%s' sai.\n"
 
-#: src/applications/fs/ecrs/namespace.c:589
-#: src/applications/fs/ecrs/namespace.c:600
+#: src/applications/fs/ecrs/namespace.c:598
+#: src/applications/fs/ecrs/namespace.c:609
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Định dạng của tập tin '%s' sai.\n"
@@ -3477,25 +3979,32 @@
 
 #: src/applications/fs/ecrs/parser.c:122
 #, c-format
-msgid "Unknown metadata type in metadata option `%s'.  Using metadata type 
`unknown' instead.\n"
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
 #: src/applications/fs/uritrack/file_info.c:131
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Tắt bỏ thu thập tên tập tin.\n"
 
-#: src/applications/fs/uritrack/file_info.c:373
+#: src/applications/fs/uritrack/file_info.c:374
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:656
+#: src/applications/fs/namespace/namespace_info.c:730
 msgid "Publication interval for periodic publication changed."
-msgstr "Đã thay đổi khoảng thời gian giữa các lần đưa ra chia sẻ cho chia sẻ 
định kỳ."
+msgstr ""
+"Đã thay đổi khoảng thời gian giữa các lần đưa ra chia sẻ cho chia sẻ định kỳ."
 
-#: src/applications/fs/namespace/namespace_info.c:677
-msgid "Publishing update for periodically updated content more than a week 
ahead of schedule.\n"
-msgstr "Đang đưa ra các cập nhật cho nội dung cập nhật thường xuyên trước một 
tuần so với lịch.\n"
+#: src/applications/fs/namespace/namespace_info.c:751
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
+msgstr ""
+"Đang đưa ra các cập nhật cho nội dung cập nhật thường xuyên trước một tuần "
+"so với lịch.\n"
 
 #: src/applications/topology_f2f/topology.c:368
 #, fuzzy, c-format
@@ -3524,36 +4033,46 @@
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:100
+#: src/applications/bootstrap_http/http.c:105
 #, fuzzy, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr "Định dạng của tên hiệu '%s' sai.\n"
 
-#: src/applications/bootstrap_http/http.c:173
+#: src/applications/bootstrap_http/http.c:176
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:229
+#: src/applications/bootstrap_http/http.c:211
+#, c-format
+msgid "Bootstrapping using `%s'.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:237
 #, fuzzy, c-format
 msgid "Trying to download hostlist from `%s'\n"
 msgstr "Đọc danh sách bạn bè từ '%s' không thành công\n"
 
-#: src/applications/bootstrap_http/http.c:408
+#: src/applications/bootstrap_http/http.c:388
+#, fuzzy, c-format
+msgid "Downloaded %llu bytes from `%s'.\n"
+msgstr "Tải tập tin từ GNUnet."
+
+#: src/applications/bootstrap_http/http.c:421
 #, fuzzy
-msgid "# hellos downloaded via http"
+msgid "# HELLOs downloaded via http"
 msgstr "# đã tải xuống HELO qua http"
 
-#: src/applications/traffic/traffic.c:445
+#: src/applications/traffic/traffic.c:450
 #, c-format
 msgid "# bytes transmitted of type %d"
 msgstr "# byte đã truyền của dạng %d"
 
-#: src/applications/traffic/traffic.c:465
+#: src/applications/traffic/traffic.c:470
 #, c-format
 msgid "# bytes received of type %d"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/applications/traffic/traffic.c:609
+#: src/applications/traffic/traffic.c:624
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -3657,7 +4176,9 @@
 msgstr "Không tìm thấy một địa chỉ IP cho giao diện '%s'.\n"
 
 #: src/applications/vpn/vpn.c:660
-msgid "RFC4193 We have run out of memory and so I can't store a tunnel for 
this peer.\n"
+msgid ""
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
 msgstr ""
 
 #: src/applications/vpn/vpn.c:706
@@ -3816,7 +4337,7 @@
 msgid "Failed to update data for module `%s'\n"
 msgstr "Cập nhật dữ liệu cho môđun '%s' không thành công\n"
 
-#: src/server/gnunet-update.c:196 src/server/gnunetd.c:124
+#: src/server/gnunet-update.c:196 src/server/gnunetd.c:144
 #, fuzzy
 msgid "Core initialization failed.\n"
 msgstr " Kết nối không thành công\n"
@@ -3829,7 +4350,7 @@
 msgid "Updates GNUnet datastructures after version change."
 msgstr "Cập nhật cấu trúc dữ liệu GNUnet sau khi thay đổi phiên bản."
 
-#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:382
+#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:389
 msgid "run as user LOGIN"
 msgstr "chạy dưới người dùng LOGIN"
 
@@ -3838,90 +4359,90 @@
 msgid "run in client mode (for getting client configuration values)"
 msgstr "chạy trong chế độ người dùng (để lấy giá trị cấu hình của người dùng)"
 
-#: src/server/connection.c:1142
+#: src/server/connection.c:1133
 #, fuzzy, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "'%s' đã chọn %d vượt quá %d thông báo (MTU: %d).\n"
 
-#: src/server/connection.c:1151
+#: src/server/connection.c:1142
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Chi tiết về thông báo: %u: dài %d, ưu tiên: %d\n"
 
-#: src/server/connection.c:2630
+#: src/server/connection.c:2675
 #, fuzzy, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bỏ đi thông báo từ '%s': định dạng sai.\n"
 
-#: src/server/connection.c:2708
+#: src/server/connection.c:2755
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Số của chuỗi sai %u <= %u, đang bỏ đi thông báo.\n"
 
-#: src/server/connection.c:2725
+#: src/server/connection.c:2772
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
 
-#: src/server/connection.c:3166
+#: src/server/connection.c:3219
 msgid "# outgoing messages dropped"
 msgstr "# thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:3170
+#: src/server/connection.c:3223
 msgid "# bytes of outgoing messages dropped"
 msgstr "# byte của các thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:3172
+#: src/server/connection.c:3225
 msgid "# connections closed (HANGUP sent)"
 msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
-#: src/server/connection.c:3175
+#: src/server/connection.c:3228
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:3179
+#: src/server/connection.c:3232
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte đã truyền của dạng %d"
 
-#: src/server/connection.c:3183
+#: src/server/connection.c:3236
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte nhận được qua TCP"
 
-#: src/server/connection.c:3186
+#: src/server/connection.c:3239
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:3188
+#: src/server/connection.c:3241
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/server/connection.c:3190
+#: src/server/connection.c:3243
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3192
+#: src/server/connection.c:3245
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/server/connection.c:3194
+#: src/server/connection.c:3247
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "số thông báo trong một khối tin nhắn"
 
-#: src/server/connection.c:3196
+#: src/server/connection.c:3249
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3198
+#: src/server/connection.c:3251
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3200
+#: src/server/connection.c:3253
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
@@ -3932,49 +4453,64 @@
 
 #: src/server/startup.c:224
 #, c-format
-msgid "Filesystem `%s' of partition `%s' is unknown. Please contact 
address@hidden"
+msgid ""
+"Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
+"address@hidden"
 msgstr ""
 
 #: src/server/startup.c:238
 #, c-format
-msgid "Limiting datastore size to %llu GB, because the `%s' filesystem does 
not support larger files. Please consider storing the database on a NTFS 
partition!\n"
+msgid ""
+"Limiting datastore size to %llu GB, because the `%s' filesystem does not "
+"support larger files. Please consider storing the database on a NTFS "
+"partition!\n"
 msgstr ""
 
-#: src/server/gnunetd.c:83
+#: src/server/startup.c:285
+#, c-format
+msgid "Insufficient access permissions for `%s': %s\n"
+msgstr ""
+
+#: src/server/gnunetd.c:84
 #, fuzzy, c-format
 msgid "`%s' startup complete.\n"
 msgstr "'%s' khởi động thành công.\n"
 
-#: src/server/gnunetd.c:88
+#: src/server/gnunetd.c:89
 #, fuzzy, c-format
 msgid "`%s' is shutting down.\n"
 msgstr "'%s' đang tắt.\n"
 
-#: src/server/gnunetd.c:187
-msgid "run in debug mode; gnunetd will not daemonize and error messages will 
be written to stderr instead of a logfile"
-msgstr "chạy trong chế độ tìm sửa lỗi debug; gnunetd sẽ không tạo daemon và sẽ 
ghi thông báo lỗi ra stderr thay vì vào một tập tin bản ghi log"
+#: src/server/gnunetd.c:206
+msgid ""
+"run in debug mode; gnunetd will not daemonize and error messages will be "
+"written to stderr instead of a logfile"
+msgstr ""
+"chạy trong chế độ tìm sửa lỗi debug; gnunetd sẽ không tạo daemon và sẽ ghi "
+"thông báo lỗi ra stderr thay vì vào một tập tin bản ghi log"
 
-#: src/server/gnunetd.c:191
+#: src/server/gnunetd.c:210
 msgid "Starts the gnunetd daemon."
 msgstr "Chạy daemon gnunetd."
 
-#: src/server/gnunetd.c:194
+#: src/server/gnunetd.c:213
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:197
-msgid "run in quiet mode"
+#: src/server/gnunetd.c:216
+msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:201
+#: src/server/gnunetd.c:220
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/server/gnunetd.c:252
+#: src/server/gnunetd.c:288
 #, fuzzy, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
-msgstr "Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy 
'%s'!\n"
+msgstr ""
+"Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
 
 #: src/server/core.c:124
 #, fuzzy, c-format
@@ -4043,15 +4579,19 @@
 
 #: src/server/gnunet-transport-check.c:204
 #, fuzzy, c-format
-msgid "`%s' transport OK.  It took %ums to transmit %llu messages of %llu 
bytes each.\n"
-msgstr "'%s' truyền tải OK.  Cần %umiligiây để truyền đi %d thông báo với %d 
byte mỗi cái.\n"
+msgid ""
+"`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
+"each.\n"
+msgstr ""
+"'%s' truyền tải OK.  Cần %umiligiây để truyền đi %d thông báo với %d byte "
+"mỗi cái.\n"
 
 #: src/server/gnunet-transport-check.c:232
 #, fuzzy, c-format
 msgid " Transport %d is not being tested\n"
 msgstr " Giao thông %d là không thể\n"
 
-#: src/server/gnunet-transport-check.c:250
+#: src/server/gnunet-transport-check.c:253
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4060,62 +4600,70 @@
 "\n"
 "Đang liên hệ '%s'."
 
-#: src/server/gnunet-transport-check.c:276
+#: src/server/gnunet-transport-check.c:279
 #, c-format
 msgid " Connection failed\n"
 msgstr " Kết nối không thành công\n"
 
-#: src/server/gnunet-transport-check.c:282
+#: src/server/gnunet-transport-check.c:285
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Kết nối thất bại (lỗi bug?)\n"
 
-#: src/server/gnunet-transport-check.c:335
+#: src/server/gnunet-transport-check.c:338
 #, c-format
-msgid "No reply received within %llums.\n"
-msgstr "Không nhận được trả lời trong %llu miligiây.\n"
+msgid "Timeout after %llums.\n"
+msgstr ""
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:342
+#, fuzzy, c-format
+msgid "OK!\n"
+msgstr "Ừ"
+
+#: src/server/gnunet-transport-check.c:370
 msgid "Tool to test if GNUnet transport services are operational."
-msgstr "Công cụ để thử nghiệm xem dịch vụ truyền tải GNUnet có hoạt động 
không."
+msgstr ""
+"Công cụ để thử nghiệm xem dịch vụ truyền tải GNUnet có hoạt động không."
 
-#: src/server/gnunet-transport-check.c:367
+#: src/server/gnunet-transport-check.c:374
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr "ping các đầu peer từ HOSTLISTURL tương ứng với truyền tải"
 
-#: src/server/gnunet-transport-check.c:370
+#: src/server/gnunet-transport-check.c:377
 msgid "send COUNT messages"
 msgstr "gửi COUNT thông báo"
 
-#: src/server/gnunet-transport-check.c:373
+#: src/server/gnunet-transport-check.c:380
 msgid "send messages with SIZE bytes payload"
 msgstr "gửi các thông báo với SIZE byte nạp trả"
 
-#: src/server/gnunet-transport-check.c:376
+#: src/server/gnunet-transport-check.c:383
 msgid "specifies which TRANSPORT should be tested"
 msgstr "chỉ ra TRANSPORT cần được thử nghiệm"
 
-#: src/server/gnunet-transport-check.c:379
+#: src/server/gnunet-transport-check.c:386
 msgid "specifies after how many MS to time-out"
 msgstr "chỉ ra hết thời gian chờ sau bao nhiên MS"
 
-#: src/server/gnunet-transport-check.c:387
+#: src/server/gnunet-transport-check.c:394
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:451
+#: src/server/gnunet-transport-check.c:459
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/server/gnunet-transport-check.c:454
+#: src/server/gnunet-transport-check.c:462
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "(Các) truyền tải có: %s\n"
 
-#: src/server/gnunet-transport-check.c:514
-#, c-format
-msgid "%d out of %d peers contacted successfully (%d times transport 
unavailable).\n"
+#: src/server/gnunet-transport-check.c:527
+#, fuzzy, c-format
+msgid ""
+"\n"
+"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr "đã kết nối thành công %d từ %d đầu peer (có %d lần truyền tải).\n"
 
 #: src/server/tcpserver.c:103
@@ -4128,23 +4676,27 @@
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr ""
 
-#: src/server/tcpserver.c:387
+#: src/server/tcpserver.c:397
 #, fuzzy, c-format
-msgid "Malformed network specification in the configuration in section `%s' 
for entry `%s': %s\n"
-msgstr "Sự xác định mạng không đúng trong phần '%s' của cấu hình cho mục '%s': 
%s\n"
+msgid ""
+"Malformed network specification in the configuration in section `%s' for "
+"entry `%s': %s\n"
+msgstr ""
+"Sự xác định mạng không đúng trong phần '%s' của cấu hình cho mục '%s': %s\n"
 
-#: src/server/tcpserver.c:440
+#: src/server/tcpserver.c:449
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%s thất bại, dạng thông báo %d đã sử dụng.\n"
 
-#: src/server/handler.c:379
+#: src/server/handler.c:380
 #, fuzzy, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Nhận được thông báo không đúng từ đầu peer '%s' trong '%s': %d.\n"
 
 #: src/server/version.c:152
-msgid "Failed to determine filename used to store GNUnet version 
information!\n"
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
 
 #: src/server/gnunet-peer-info.c:53
@@ -4170,6 +4722,11 @@
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Đầu peer '%s' với tin tưởng %8u và địa chỉ '%s'\n"
 
+#: src/util/boot/startup.c:212
+#, fuzzy, c-format
+msgid "Failed to run %s: %s %d\n"
+msgstr "Kết nối tới gnunetd không thành công.\n"
+
 #: src/util/network_client/tcpio.c:94 src/util/network_client/tcpio.c:135
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
@@ -4201,12 +4758,12 @@
 msgid "`%s' failed, reply invalid!\n"
 msgstr "'%s' thất bại, câu trả lời sai!\n"
 
-#: src/util/crypto/hostkey_gcrypt.c:1031
+#: src/util/crypto/hostkey_gcrypt.c:1036
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Kiểm tra chữ ký RSA thất bại tại %s:%d: %s\n"
 
-#: src/util/crypto/locking_gcrypt.c:67
+#: src/util/crypto/locking_gcrypt.c:74
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
@@ -4218,8 +4775,10 @@
 
 #: src/util/os/statuscalls.c:365 src/util/os/statuscalls.c:374
 #, fuzzy, c-format
-msgid "No network interfaces defined in configuration section `%s' under 
`%s'!\n"
-msgstr "Không có giao diện mạng được xác định trong cấu hình phần '%s' dưới 
'%s'!\n"
+msgid ""
+"No network interfaces defined in configuration section `%s' under `%s'!\n"
+msgstr ""
+"Không có giao diện mạng được xác định trong cấu hình phần '%s' dưới '%s'!\n"
 
 #: src/util/os/semaphore.c:219
 #, c-format
@@ -4248,7 +4807,8 @@
 #: src/util/os/dso.c:152
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
-msgstr "'%s' thất bại khi giải quyết phương pháp '%s%s' tại %s:%d với lỗi: 
%s\n"
+msgstr ""
+"'%s' thất bại khi giải quyết phương pháp '%s%s' tại %s:%d với lỗi: %s\n"
 
 #: src/util/os/cpustatus.c:426
 msgid "Cannot query the CPU usage (Windows NT).\n"
@@ -4258,12 +4818,12 @@
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Không hỏi được sự sử dụng CPU (Windows 9x).\n"
 
-#: src/util/os/user.c:124
+#: src/util/os/user.c:125 src/util/os/user.c:166
 #, fuzzy, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
-msgstr "Người dùng '%s' không rõ, không thay đổi được UID thành nó."
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Không ghi được các tập tin cấu hình: %s.\n"
 
-#: src/util/os/user.c:138
+#: src/util/os/user.c:140
 #, fuzzy, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thay đổi được người dùng/nhóm thành '%s': %s"
@@ -4273,12 +4833,14 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Câu trả lời không đúng tới '%s'.\n"
 
-#: src/util/network/select.c:296
+#: src/util/network/select.c:306
 #, fuzzy
 msgid "Received malformed message (too small) from connection. Closing.\n"
-msgstr "Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. 
Đang đóng.\n"
+msgstr ""
+"Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
+"đóng.\n"
 
-#: src/util/network/select.c:454
+#: src/util/network/select.c:472
 msgid "select listen socket not valid!\n"
 msgstr ""
 
@@ -4310,8 +4872,11 @@
 
 #: src/util/network/ip.c:202
 #, fuzzy, c-format
-msgid "Could not find interface `%s' using `%s', trying to find another 
interface.\n"
-msgstr "Không tìm thấy giao diện '%s' trong '%s', đang thử kết gắn tới giao 
diện khác.\n"
+msgid ""
+"Could not find interface `%s' using `%s', trying to find another interface.\n"
+msgstr ""
+"Không tìm thấy giao diện '%s' trong '%s', đang thử kết gắn tới giao diện "
+"khác.\n"
 
 #: src/util/network/ip.c:278
 #, fuzzy, c-format
@@ -4337,106 +4902,111 @@
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %u.%u.%u.%u.\n"
 
-#: src/util/disk/storage.c:201
+#: src/util/disk/storage.c:202
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "'%s' thất bại cho ổ %s: %u\n"
 
-#: src/util/disk/storage.c:518
+#: src/util/disk/storage.c:519
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "'%s' mong đợi '%s' là một thư mục!\n"
 
-#: src/util/config_impl/impl.c:275
+#: src/util/config_impl/impl.c:289
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr "Lỗi cú pháp trong tập tin cấu hình '%s' trên dòng %d.\n"
 
-#: src/util/config_impl/impl.c:518
+#: src/util/config_impl/impl.c:532
 #, c-format
 msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:564
+#: src/util/config_impl/impl.c:578
 #, c-format
-msgid "Configuration value '%llu' for '%s' in section '%s' is out of legal 
bounds [%llu,%llu]\n"
+msgid ""
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:576
+#: src/util/config_impl/impl.c:590
 #, fuzzy, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
-msgstr "Trong phần '%s' dưới '%s' của cấu hình phải chỉ ra thư mục cho dữ liệu 
FS.\n"
+msgstr ""
+"Trong phần '%s' dưới '%s' của cấu hình phải chỉ ra thư mục cho dữ liệu FS.\n"
 
-#: src/util/config_impl/impl.c:666
+#: src/util/config_impl/impl.c:680
 #, c-format
-msgid "Configuration value '%s' for '%s' in section '%s' is not in set of 
legal choices\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/util/error/error.c:78 src/util/error/error.c:80
+#: src/util/error/error.c:93 src/util/error/error.c:95
 #, fuzzy
-msgid "Error log:"
+msgid "Error log:\n"
 msgstr "Lỗi"
 
-#: src/util/error/error.c:130
+#: src/util/error/error.c:140
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:198 src/util/error/error.c:242
+#: src/util/error/error.c:208 src/util/error/error.c:252
 msgid "DEBUG"
 msgstr "TÌMLỖI"
 
-#: src/util/error/error.c:201 src/util/error/error.c:244
+#: src/util/error/error.c:211 src/util/error/error.c:254
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:204 src/util/error/error.c:248
+#: src/util/error/error.c:214 src/util/error/error.c:258
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/error/error.c:207 src/util/error/error.c:250
+#: src/util/error/error.c:217 src/util/error/error.c:260
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/error/error.c:210 src/util/error/error.c:252
+#: src/util/error/error.c:220 src/util/error/error.c:262
 msgid "FATAL"
 msgstr "LỖI NẶNG"
 
-#: src/util/error/error.c:213 src/util/error/error.c:254
+#: src/util/error/error.c:223 src/util/error/error.c:264
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:216 src/util/error/error.c:256
+#: src/util/error/error.c:226 src/util/error/error.c:266
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:219 src/util/error/error.c:258
+#: src/util/error/error.c:229 src/util/error/error.c:268
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:222 src/util/error/error.c:260
+#: src/util/error/error.c:232 src/util/error/error.c:270
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:225 src/util/error/error.c:262
+#: src/util/error/error.c:235 src/util/error/error.c:272
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:228 src/util/error/error.c:264
+#: src/util/error/error.c:238 src/util/error/error.c:274
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:231
+#: src/util/error/error.c:241
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:246
+#: src/util/error/error.c:256
 msgid "INFO"
 msgstr "THÔNGTIN"
 
-#: src/util/error/error.c:265
+#: src/util/error/error.c:275
 msgid "NOTHING"
 msgstr "KHÔNGCÓGÌ"
 
@@ -4527,7 +5097,9 @@
 
 #: src/util/getopt/setoption.c:58
 #, c-format
-msgid "Setting option `%s' in section `%s' to `%s' when processing command 
line option `%s' was denied.\n"
+msgid ""
+"Setting option `%s' in section `%s' to `%s' when processing command line "
+"option `%s' was denied.\n"
 msgstr ""
 
 #: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
@@ -4537,7 +5109,8 @@
 
 #: src/util/getopt/printhelp.c:50
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "Tham số cho tùy chọn dài cũng là tham số cho tùy chọn ngắn.\n"
 
 #: src/util/string/string.c:121
@@ -4592,22 +5165,22 @@
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:187
+#: src/setup/gnunet-setup.c:188
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Sai tham số dòng lệnh.\n"
 
-#: src/setup/gnunet-setup.c:192
+#: src/setup/gnunet-setup.c:193
 #, fuzzy
 msgid "No interface specified, using default\n"
 msgstr "Chưa chỉ ra tên bảng, đang dùng '%s'.\n"
 
-#: src/setup/gnunet-setup.c:267
+#: src/setup/gnunet-setup.c:268
 #, fuzzy, c-format
 msgid "`%s' is not available."
 msgstr "'%s' không phải là một tập tin thông thường.\n"
 
-#: src/setup/gnunet-setup.c:283
+#: src/setup/gnunet-setup.c:284
 #, fuzzy, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Lỗi không rõ.\n"
@@ -4745,7 +5318,8 @@
 #: src/setup/gtk/wizard_gtk.c:505
 msgid ""
 "Running gnunet-update failed.\n"
-"This maybe due to insufficient permissions, please check your 
configuration.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
 "Finally, run gnunet-update manually."
 msgstr ""
 
@@ -4788,7 +5362,9 @@
 
 #: src/setup/text/conf.c:158
 #, c-format
-msgid "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default 
value %llu): "
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
 msgstr ""
 
 #: src/setup/text/conf.c:191
@@ -4858,17 +5434,21 @@
 #: src/setup/text/conf.c:575 src/setup/ncurses/mconf.c:519
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
-msgstr "Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy 
'%s'!\n"
+msgstr ""
+"Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
 
 #: src/setup/text/conf.c:580
 #, c-format
-msgid "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat 
configuration. "
+msgid ""
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
 msgstr ""
 
 #: src/setup/text/conf.c:592
 #, fuzzy, c-format
 msgid "Configuration was unchanged, no need to save.\n"
-msgstr "Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy 
'%s'!\n"
+msgstr ""
+"Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
 
 #: src/setup/text/conf.c:597
 #, fuzzy, c-format
@@ -4959,7 +5539,8 @@
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
-"This assistant will ask you a few basic questions in order to configure 
GNUnet.\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
 "\n"
 "Please visit our homepage at\n"
 "\thttp://gnunet.org/\n";
@@ -4984,12 +5565,20 @@
 "đội GNUnet"
 
 #: src/setup/ncurses/wizard_curs.c:291
-msgid "Choose the network interface that connects your computer to the 
internet from the list below."
-msgstr "Chọn giao diện mạng kết nối máy tính tới internet từ danh sách dưới 
đây."
+msgid ""
+"Choose the network interface that connects your computer to the internet "
+"from the list below."
+msgstr ""
+"Chọn giao diện mạng kết nối máy tính tới internet từ danh sách dưới đây."
 
 #: src/setup/ncurses/wizard_curs.c:312 src/setup/ncurses/wizard_curs.c:325
-msgid "The \"Network interface\" is the device that connects your computer to 
the internet. This is usually a modem, an ISDN card or a network card in case 
you are using DSL."
-msgstr "\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây 
thường là một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL."
+msgid ""
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL."
+msgstr ""
+"\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây thường là "
+"một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL."
 
 #: src/setup/ncurses/wizard_curs.c:323
 #, fuzzy
@@ -4997,7 +5586,9 @@
 msgstr "Giao diện mạng:"
 
 #: src/setup/ncurses/wizard_curs.c:324
-msgid "What is the name of the network interface that connects your computer 
to the Internet?"
+msgid ""
+"What is the name of the network interface that connects your computer to the "
+"Internet?"
 msgstr "Tên của giao diện mạng kết nối máy tính tới Internet là gì?"
 
 #: src/setup/ncurses/wizard_curs.c:335
@@ -5009,11 +5600,18 @@
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
-"If you are connected to the internet through another computer doing SNAT, a 
router or a \"hardware firewall\" and other computers on the internet cannot 
connect to this computer, say \"yes\" here. Answer \"no\" on direct connections 
through modems, ISDN cards and DNAT (also known as \"port forwarding\")."
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
+"connections through modems, ISDN cards and DNAT (also known as \"port "
+"forwarding\")."
 msgstr ""
 "Máy này nằm dưới NAT?\n"
 "\n"
-"Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến 
router hay một \"phần cứng tường lửa\" và các máy khác trong internet không thể 
kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu kết nối thẳng qua 
môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp cổng\")."
+"Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến "
+"router hay một \"phần cứng tường lửa\" và các máy khác trong internet không "
+"thể kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu kết nối "
+"thẳng qua môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp cổng\")."
 
 #: src/setup/ncurses/wizard_curs.c:349
 #, fuzzy
@@ -5031,13 +5629,22 @@
 #: src/setup/ncurses/wizard_curs.c:351
 #, fuzzy
 msgid ""
-"If your provider always assigns the same IP-Address to you (a \"static\" 
IP-Address), enter it into the \"IP-Address\" field. If your IP-Address changes 
every now and then (\"dynamic\" IP-Address) but there's a hostname that always 
points to your actual IP-Address (\"Dynamic DNS\"), you can also enter it 
here.\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
 "If left empty, GNUnet will try to automatically detect the IP.\n"
 "You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
 "If in doubt, leave this empty."
 msgstr ""
-"Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh\"), 
thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay đổi sau 
mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn luôn chỉ tới 
địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập nó ở đây.\n"
-"Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra địa 
chỉ IP."
+"Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh"
+"\"), thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay "
+"đổi sau mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn luôn "
+"chỉ tới địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập nó ở "
+"đây.\n"
+"Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra địa "
+"chỉ IP."
 
 #: src/setup/ncurses/wizard_curs.c:366
 #, fuzzy
@@ -5054,11 +5661,18 @@
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
-"The \"upstream\" is the data channel through which data is *sent* to the 
internet. The limit is the maximum amountwhich GNUnet is allowed to use. If you 
have a flatrate, you can set it to the maximum speed of your internet 
connection. You should not use a value that is higher than what your actual 
connection allows."
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
+"you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
 msgstr ""
 "Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
 "\n"
-"\"Dòng ra\" là kênh dữ liệu qua đó *gửi* dữ liệu tới internet. Có thể giới 
hạn hoặc cho cả máy tính này hoặc chỉ giới hạn cho GNUnet. Người dùng có thể 
chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối 
internet lớn nhất."
+"\"Dòng ra\" là kênh dữ liệu qua đó *gửi* dữ liệu tới internet. Có thể giới "
+"hạn hoặc cho cả máy tính này hoặc chỉ giới hạn cho GNUnet. Người dùng có thể "
+"chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
+"internet lớn nhất."
 
 #: src/setup/ncurses/wizard_curs.c:380
 #, fuzzy
@@ -5075,11 +5689,18 @@
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
-"The \"downstream\" is the data channel through which data is *received* from 
the internet. The limit is the maximum amountwhich GNUnet is allowed to use. If 
you have a flatrate, you can set it to the maximum speed of your internet 
connection. You should not use a value that is higher than what your actual 
connection allows."
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
+"If you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
 msgstr ""
 "Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
 "\n"
-"\"Dòng vào\" là kênh dữ liệu qua đó *nhận* dữ liệu từ internet. Có thể giới 
hạn hoặc cho cả máy tính này hoặc chỉ giới hạn cho GNUnet. Người dùng có thể 
chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối 
internet lớn nhất."
+"\"Dòng vào\" là kênh dữ liệu qua đó *nhận* dữ liệu từ internet. Có thể giới "
+"hạn hoặc cho cả máy tính này hoặc chỉ giới hạn cho GNUnet. Người dùng có thể "
+"chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
+"internet lớn nhất."
 
 #: src/setup/ncurses/wizard_curs.c:394
 #, fuzzy
@@ -5092,11 +5713,14 @@
 
 #: src/setup/ncurses/wizard_curs.c:396
 #, fuzzy
-msgid "The GNUnet datastore contains all content that GNUnet needs to store 
(indexed, inserted and migrated content)."
+msgid ""
+"The GNUnet datastore contains all content that GNUnet needs to store "
+"(indexed, inserted and migrated content)."
 msgstr ""
 "Kích thước lớn nhất của kho dữ liệu tính theo MB?\n"
 "\n"
-"Kho dữ liệu GNUnet chứa tất cả các dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, 
nội dung chèn và nhập vào)."
+"Kho dữ liệu GNUnet chứa tất cả các dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, "
+"nội dung chèn và nhập vào)."
 
 #: src/setup/ncurses/wizard_curs.c:409
 #, fuzzy
@@ -5110,17 +5734,23 @@
 #: src/setup/ncurses/wizard_curs.c:411
 #, fuzzy
 msgid ""
-"For security reasons, it is a good idea to let this setup create a new user 
account under which the GNUnet service is started at system startup.\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account under which the GNUnet service is started at system startup.\n"
 "\n"
-"However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
 "\n"
 "Leave the field empty to run GNUnet with system privileges.\n"
 msgstr ""
 "Xác định người dùng sở hữu dịch vụ GNUnet.\n"
 "\n"
-"Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng mới sở hữu dịch 
vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
+"Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng mới sở hữu dịch "
+"vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
 "\n"
-"Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao gồm 
các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho phép người 
dùng chỉ ra dưới đây quyền đọc chúng.\n"
+"Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao gồm "
+"các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho phép "
+"người dùng chỉ ra dưới đây quyền đọc chúng.\n"
 "\n"
 "Để trống để chạy GNUnet với quyền hệ thống.\n"
 "Người dùng GNUnet:"
@@ -5136,19 +5766,23 @@
 #: src/setup/ncurses/wizard_curs.c:431
 #, fuzzy
 msgid ""
-"For security reasons, it is a good idea to let this setup create a new group 
for the chosen user account.\n"
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
 "\n"
 "You can also specify a already existant group here.\n"
 "\n"
-"Only members of this group will be allowed to start and stop the the GNUnet 
server and have access to GNUnet server data.\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
 msgstr ""
 "Xác định nhóm sở hữu dịch vụ GNUnet.\n"
 "\n"
-"Vì lý do bảo mật, nên để cài đặt này tạo một nhóm mới cho tài khoản người 
dùng đã chọn\n"
+"Vì lý do bảo mật, nên để cài đặt này tạo một nhóm mới cho tài khoản người "
+"dùng đã chọn\n"
 "\n"
 "Cũng có thể chỉ ra một nhóm đã có.\n"
 "\n"
-"Chỉ thành viên của nhóm này mới có quyền chạy và dừng máy chủ GNUnet và có 
truy cập tới dữ liệu máy chủ GNUnet.\n"
+"Chỉ thành viên của nhóm này mới có quyền chạy và dừng máy chủ GNUnet và có "
+"truy cập tới dữ liệu máy chủ GNUnet.\n"
 "\n"
 "Nhóm GNUnet:"
 
@@ -5158,11 +5792,15 @@
 
 #: src/setup/ncurses/wizard_curs.c:445
 #, fuzzy
-msgid "If you say \"yes\" here, the GNUnet background process will be 
automatically started when you turn on your computer. If you say \"no\" here, 
you have to launch GNUnet yourself each time you want to use it."
+msgid ""
+"If you say \"yes\" here, the GNUnet background process will be automatically "
+"started when you turn on your computer. If you say \"no\" here, you have to "
+"launch GNUnet yourself each time you want to use it."
 msgstr ""
 "Chạy GNUnet như một dịch vụ hệ thống?\n"
 "\n"
-"Nếu chọn \"yes\", tiến trình nền sau GNUnet sẽ tự động chạy khi bật máy tính. 
Nếu chọn \"no\", thì cần chạy GNUnet mỗi khi muốn sử dụng."
+"Nếu chọn \"yes\", tiến trình nền sau GNUnet sẽ tự động chạy khi bật máy "
+"tính. Nếu chọn \"no\", thì cần chạy GNUnet mỗi khi muốn sử dụng."
 
 #: src/setup/ncurses/wizard_curs.c:493
 #, fuzzy
@@ -5185,12 +5823,15 @@
 
 #: src/setup/lib/gns.c:278
 #, c-format
-msgid "Configuration does not satisfy constraints of configuration 
specification file `%s'!\n"
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
 msgstr ""
 
 #: src/setup/lib/tree.c:189
 #, c-format
-msgid "Internal error: entry `%s' in section `%s' not found for visibility 
change!\n"
+msgid ""
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
 #: src/setup/lib/wizard_util.c:101
@@ -5241,17 +5882,60 @@
 msgid "Unknown error while creating a new user"
 msgstr "Lỗi không rõ khi tạo một người dùng mới"
 
+#, fuzzy
+#~ msgid "# bytes received via TCP-OLD"
+#~ msgstr "# byte nhận được qua TCP"
+
+#, fuzzy
+#~ msgid "# bytes sent via TCP-OLD"
+#~ msgstr "# Byte gửi qua TCP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by TCP-OLD (outgoing)"
+#~ msgstr "# byte loại đi bởi TCP (đi ra)"
+
+#~ msgid "Waiting for gnunetd to start (%u iterations left)...\n"
+#~ msgstr "Đang chờ chạy gnunetd (còn %u lần thử)...\n"
+
+#~ msgid "Waiting for peers to connect (%u iterations left)...\n"
+#~ msgstr "Đang chờ kết nối các đầu (còn %u lần thử)...\n"
+
+#, fuzzy
+#~ msgid "hello advertisement for protocol %d received.\n"
+#~ msgstr "Nhận được quảng cáo HELO cho giao thức %d.\n"
+
+#, fuzzy
+#~ msgid "`%s' failed (%d, %u). Will not send PING.\n"
+#~ msgstr "'%s' thất bại (%d, %u). Sẽ không gửi PING.\n"
+
+#, fuzzy
+#~ msgid "Removing hello from peer `%s' (expired %ds ago).\n"
+#~ msgstr "Đang xóa bỏ HELO từ đầu peer '%s' (đã hết hạn %dgiây).\n"
+
+#, fuzzy
+#~ msgid "Deleting expired content.  This may take a while.\n"
+#~ msgstr "Đang tạo chìa khóa máy mới (có thể cần một chút thời gian).\n"
+
+#~ msgid "No reply received within %llums.\n"
+#~ msgstr "Không nhận được trả lời trong %llu miligiây.\n"
+
+#, fuzzy
+#~ msgid "User `%s' not known, cannot change UID to it.\n"
+#~ msgstr "Người dùng '%s' không rõ, không thay đổi được UID thành nó."
+
 #~ msgid "Network advertisements disabled by configuration!\n"
 #~ msgstr "Tắt quàng cáo trong mạng bằng cấu hình!\n"
 
 #~ msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
-#~ msgstr "Cổng sai \"%s\" nằm trong xác định danh sách máy, đang thử cổng 
%d.\n"
+#~ msgstr ""
+#~ "Cổng sai \"%s\" nằm trong xác định danh sách máy, đang thử cổng %d.\n"
 
 #~ msgid "'%s' failed at %s:%d with error: '%s'.\n"
 #~ msgstr "'%s' thất bại tại %s:%d với lỗi: '%s'.\n"
 
 #~ msgid "Could not download list of peer contacts, host '%s' unknown.\n"
-#~ msgstr "Không tải xuống được danh sách liên hệ các đầu peer, máy '%s' không 
rõ.\n"
+#~ msgstr ""
+#~ "Không tải xuống được danh sách liên hệ các đầu peer, máy '%s' không rõ.\n"
 
 #~ msgid "'%s' to '%s' failed at %s:%d with error: %s\n"
 #~ msgstr "'%s' tới '%s' thất bại tại %s:%d với lỗi: %s\n"
@@ -5263,7 +5947,8 @@
 #~ msgstr "Phân tích HELO từ '%s' không thành công.\n"
 
 #~ msgid "Could not resolve name of HTTP proxy '%s'. Trying without a proxy.\n"
-#~ msgstr "Không tìm thấy tên của HTTP proxy '%s'. Đang thử không dùng 
proxy.\n"
+#~ msgstr ""
+#~ "Không tìm thấy tên của HTTP proxy '%s'. Đang thử không dùng proxy.\n"
 
 #~ msgid "'%s' failed: table not found!\n"
 #~ msgstr "'%s' không thành công: không tìm thấy bảng!\n"
@@ -5367,11 +6052,19 @@
 #~ msgid "Unexpected reply to '%s' operation.\n"
 #~ msgstr "Câu trả lời không mong đợi tới thao tác '%s'.\n"
 
-#~ msgid "Configuration file must specify a directory for GNUnet to store 
per-peer data under %s%s.\n"
-#~ msgstr "Tập tin cấu hình phải chỉ ra một thư mục để GNUnet chứa các dữ liệu 
per-peer dưới %s%s.\n"
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s.\n"
+#~ msgstr ""
+#~ "Tập tin cấu hình phải chỉ ra một thư mục để GNUnet chứa các dữ liệu per-"
+#~ "peer dưới %s%s.\n"
 
-#~ msgid "Indexing file '%s' failed. Check file permissions and consult your 
GNUnet server's logs.\n"
-#~ msgstr "Đánh chỉ mục tập tin '%s' thất bại. Hãy kiểm tra quyền hạn và xem 
các bản ghi log của máy chủ GNUnet.\n"
+#~ msgid ""
+#~ "Indexing file '%s' failed. Check file permissions and consult your GNUnet "
+#~ "server's logs.\n"
+#~ msgstr ""
+#~ "Đánh chỉ mục tập tin '%s' thất bại. Hãy kiểm tra quyền hạn và xem các bản "
+#~ "ghi log của máy chủ GNUnet.\n"
 
 #~ msgid "FSUI persistence: error restoring download\n"
 #~ msgstr "FSUI: lỗi phục hồi tải xuống\n"
@@ -5388,8 +6081,12 @@
 #~ msgid "Cannot upload directory without using recursion.\n"
 #~ msgstr "Không tải lên được thư mục khi không dùng đệ quy.\n"
 
-#~ msgid "You must specify a directory for FS files in the configuration in 
section '%s' under '%s'."
-#~ msgstr "Người dùng phải chỉ ra một thư mục cho các tập tin FS trong phần 
'%s' dưới '%s' của cấu hình."
+#~ msgid ""
+#~ "You must specify a directory for FS files in the configuration in section "
+#~ "'%s' under '%s'."
+#~ msgstr ""
+#~ "Người dùng phải chỉ ra một thư mục cho các tập tin FS trong phần '%s' "
+#~ "dưới '%s' của cấu hình."
 
 #~ msgid "%8u of %8u bytes deleted."
 #~ msgstr "Đã xóa %8u của %8u byte."
@@ -5430,7 +6127,8 @@
 #~ msgstr "Tải đệ quy thư mục '%s' tại %llu trong số %llu byte.\n"
 
 #~ msgid "Upload of '%s' complete, current average speed is %8.3f kbps.\n"
-#~ msgstr "Hoàn thành tải lên '%s', tốc độ trung bình hiện thời là %8.3f 
kbps.\n"
+#~ msgstr ""
+#~ "Hoàn thành tải lên '%s', tốc độ trung bình hiện thời là %8.3f kbps.\n"
 
 #~ msgid "process directories recursively"
 #~ msgstr "tiến hành đệ qui trên các thư mục"
@@ -5447,38 +6145,57 @@
 #~ msgid "You must specify a file or directory to upload.\n"
 #~ msgstr "Người dùng phải chỉ ra một tập tin hay thư mục để tải lên.\n"
 
-#~ msgid "specify that the contents of the namespace are of the given MIMETYPE 
(use when creating a new pseudonym)"
-#~ msgstr "cho biết rằng nội dung của không gian tên có dạng MIMETYPE (dùng 
khi tạo một tên hiệu mới)"
+#~ msgid ""
+#~ "specify that the contents of the namespace are of the given MIMETYPE (use "
+#~ "when creating a new pseudonym)"
+#~ msgstr ""
+#~ "cho biết rằng nội dung của không gian tên có dạng MIMETYPE (dùng khi tạo "
+#~ "một tên hiệu mới)"
 
-#~ msgid "specify NAME to be the realname of the user controlling the 
namespace (use when creating a new pseudonym)"
-#~ msgstr "dùng NAME làm tên thật của điều khiển không gian tên của người dùng 
(dùng khi tạo một tên hiệu mới)"
+#~ msgid ""
+#~ "specify NAME to be the realname of the user controlling the namespace "
+#~ "(use when creating a new pseudonym)"
+#~ msgstr ""
+#~ "dùng NAME làm tên thật của điều khiển không gian tên của người dùng (dùng "
+#~ "khi tạo một tên hiệu mới)"
 
-#~ msgid "use DESCRIPTION to describe the content of the namespace (use when 
creating a new pseudonym)"
-#~ msgstr "dùng DESCRIPTION để mô tả nội dung của không gian tên (dùng khi tạo 
một tên hiệu mới)"
+#~ msgid ""
+#~ "use DESCRIPTION to describe the content of the namespace (use when "
+#~ "creating a new pseudonym)"
+#~ msgstr ""
+#~ "dùng DESCRIPTION để mô tả nội dung của không gian tên (dùng khi tạo một "
+#~ "tên hiệu mới)"
 
-#~ msgid "specify the given URI as an address that contains more information 
about the namespace (use when creating a new pseudonym)"
-#~ msgstr "dùng URI đưa ra làm địa chỉ chứa thêm thông tin về không gian tên 
(dùng khi tạo một tên hiệu mới)"
+#~ msgid ""
+#~ "specify the given URI as an address that contains more information about "
+#~ "the namespace (use when creating a new pseudonym)"
+#~ msgstr ""
+#~ "dùng URI đưa ra làm địa chỉ chứa thêm thông tin về không gian tên (dùng "
+#~ "khi tạo một tên hiệu mới)"
 
 #~ msgid "Invalid arguments. Exiting.\n"
 #~ msgstr "Tham số sai. Đang thoát.\n"
 
 #~ msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-#~ msgstr "Không đủ tham số. Người dùng phải chỉ ra một từ khóa hoặc một 
tên.\n"
+#~ msgstr ""
+#~ "Không đủ tham số. Người dùng phải chỉ ra một từ khóa hoặc một tên.\n"
 
 #~ msgid "Starting search failed. Consult logs.\n"
 #~ msgstr "Bắt đầu tìm kiếm thất bại. Hãy xem các bản ghi log.\n"
 
-#~ msgid "Configuration file must specify a directory for GNUnet to store 
per-peer data under %s%s\n"
-#~ msgstr "Tập tin cấu hình phải chỉ ra thư mục cho GNUnet để chứa dữ liệu 
per-peer dưới %s%s\n"
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s\n"
+#~ msgstr ""
+#~ "Tập tin cấu hình phải chỉ ra thư mục cho GNUnet để chứa dữ liệu per-peer "
+#~ "dưới %s%s\n"
 
-#~ msgid "Could not create hostkey!\n"
-#~ msgstr "Không tạo được chìa khóa máy!\n"
-
 #~ msgid "%s '%s' returned no known hosts!\n"
 #~ msgstr "%s '%s' không trả lại máy biết đến!\n"
 
 #~ msgid "Invalid data in MySQL database.  Please verify integrity!\n"
-#~ msgstr "Dữ liệu sai trong cơ sở dữ liệu MySQL.  Xin hãy kiểm tra tính trọn 
vẹn!\n"
+#~ msgstr ""
+#~ "Dữ liệu sai trong cơ sở dữ liệu MySQL.  Xin hãy kiểm tra tính trọn vẹn!\n"
 
 #~ msgid "Query '%s' had no results.\n"
 #~ msgstr "Câu hỏi '%s' không có kết quả.\n"
@@ -5492,8 +6209,12 @@
 #~ msgid "Invalid data in database.  Please verify integrity!\n"
 #~ msgstr "Dữ liệu sai trong cơ sở dữ liệu.  Xin hãy kiểm tra tính trọn vẹn!\n"
 
-#~ msgid "Configuration file must specify directory for storing FS data in 
section '%s' under '%s'.\n"
-#~ msgstr "Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu PS trong phần 
'%s' dưới '%s'.\n"
+#~ msgid ""
+#~ "Configuration file must specify directory for storing FS data in section "
+#~ "'%s' under '%s'.\n"
+#~ msgstr ""
+#~ "Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu PS trong phần '%s' "
+#~ "dưới '%s'.\n"
 
 #~ msgid "helptext for -t"
 #~ msgstr "trợ giúp cho -t"
@@ -5504,15 +6225,14 @@
 #~ msgid "Version mismatch ('%s' vs. '%s'), run gnunet-update!\n"
 #~ msgstr "Phiên bản không tương ứng ('%s' và '%s'), hãy chạy gnunet-update!\n"
 
-#~ msgid "Need to have list of friends in configuration under '%s' in section 
'%s'.\n"
+#~ msgid ""
+#~ "Need to have list of friends in configuration under '%s' in section '%"
+#~ "s'.\n"
 #~ msgstr "Cần có danh sách bạn bè dưới '%s' của phần '%s' trong cấu hình.\n"
 
 #~ msgid "# client trace requests received"
 #~ msgstr "# nhận được yêu cầu theo vết trace của máy khách"
 
-#~ msgid "# client trace replies sent"
-#~ msgstr "# đã gửi câu trả lời theo vết trace đến máy khách"
-
 #~ msgid "# p2p trace replies sent"
 #~ msgstr "# đã gửi câu trả lời theo vết trace p2p"
 
@@ -5520,13 +6240,20 @@
 #~ msgstr "Lỗi khi hỏi gnunetd về các điều khoản truyền tải.\n"
 
 #~ msgid "Did not receive reply from gnunetd about traffic conditions.\n"
-#~ msgstr "Không nhận được câu trả lời từ gnunetd về các điều khoản truyền 
tải.\n"
+#~ msgstr ""
+#~ "Không nhận được câu trả lời từ gnunetd về các điều khoản truyền tải.\n"
 
-#~ msgid "Option '%s' not set in configuration in section '%s', setting to 
%dm.\n"
-#~ msgstr "Chưa đặt tùy chọn '%s' trong phần '%s' của cấu hình, đang đặt thành 
%dm.\n"
+#~ msgid ""
+#~ "Option '%s' not set in configuration in section '%s', setting to %dm.\n"
+#~ msgstr ""
+#~ "Chưa đặt tùy chọn '%s' trong phần '%s' của cấu hình, đang đặt thành %dm.\n"
 
-#~ msgid "You should specify at least one transport service under option '%s' 
in section '%s'.\n"
-#~ msgstr "Người dùng phải chỉ ra ít nhất một dịch vụ giao thông dưới tùy chọn 
'%s' trong phần '%s'.\n"
+#~ msgid ""
+#~ "You should specify at least one transport service under option '%s' in "
+#~ "section '%s'.\n"
+#~ msgstr ""
+#~ "Người dùng phải chỉ ra ít nhất một dịch vụ giao thông dưới tùy chọn '%s' "
+#~ "trong phần '%s'.\n"
 
 #~ msgid "Gtk GNUnet Configurator"
 #~ msgstr "Trình cấu hình Gtk của GNUnet"
@@ -5659,11 +6386,24 @@
 #~ msgid ""
 #~ "Share denoted bandwidth with other applications?\n"
 #~ "\n"
-#~ "Say \"yes\" here, if you don't want other network traffic to interfere 
with GNUnet's operation, but still wish to constrain GNUnet's bandwidth usage 
to values entered in the previous steps, or if you can't reliably measure the 
maximum capabilities of your connection. \"No\" can be very useful if other 
applications are causing a lot of traffic on your LAN.  In this case, you do 
not want to limit the traffic that GNUnet can inflict on your internet 
connection whenever your high-speed LAN gets used (e.g. by NFS)."
+#~ "Say \"yes\" here, if you don't want other network traffic to interfere "
+#~ "with GNUnet's operation, but still wish to constrain GNUnet's bandwidth "
+#~ "usage to values entered in the previous steps, or if you can't reliably "
+#~ "measure the maximum capabilities of your connection. \"No\" can be very "
+#~ "useful if other applications are causing a lot of traffic on your LAN.  "
+#~ "In this case, you do not want to limit the traffic that GNUnet can "
+#~ "inflict on your internet connection whenever your high-speed LAN gets "
+#~ "used (e.g. by NFS)."
 #~ msgstr ""
 #~ "Chia sẻ băng thông chỉ ra với các ứng dụng khác?\n"
 #~ "\n"
-#~ "Chọn \"yes\", nếu không muốn các truyền tải mạng khác gây trở ngại đối với 
các thao tác của GNUnet, nhưng vẫn muốn bắt buộc dùng giá trị đã nhập trong các 
bước trước đây làm sử dụng băng thông của GNUnet, hoặc nếu người dùng không thể 
đo được khả năng lớn nhất của kết nối mạng. \"No\" có ích khi các ứng dụng khác 
dùng nhiều truyền tải trong mạng LAN.  Trong trường hợp này, người dùng không 
nên giới hạn truyền tải GNUnet phải chịu trên kết nối internet mỗi khi sử dụng 
LAN tốc độ cao (ví dụ bởi NFS)."
+#~ "Chọn \"yes\", nếu không muốn các truyền tải mạng khác gây trở ngại đối "
+#~ "với các thao tác của GNUnet, nhưng vẫn muốn bắt buộc dùng giá trị đã nhập "
+#~ "trong các bước trước đây làm sử dụng băng thông của GNUnet, hoặc nếu "
+#~ "người dùng không thể đo được khả năng lớn nhất của kết nối mạng. \"No\" "
+#~ "có ích khi các ứng dụng khác dùng nhiều truyền tải trong mạng LAN.  Trong "
+#~ "trường hợp này, người dùng không nên giới hạn truyền tải GNUnet phải chịu "
+#~ "trên kết nối internet mỗi khi sử dụng LAN tốc độ cao (ví dụ bởi NFS)."
 
 #~ msgid "How much CPU (in %) may be used?"
 #~ msgstr "Sử dụng bao nhiêu CPU (tính theo %)?"
@@ -5680,20 +6420,32 @@
 #~ msgid ""
 #~ "Store migrated content?\n"
 #~ "\n"
-#~ "GNUnet is able to store data from other peers in your datastore. This is 
useful if an adversary has access to your inserted content and you need to deny 
that the content is yours. With \"content migration\" on, the content could 
have \"migrated\" over the internet to your node without your knowledge.\n"
-#~ "It also helps to spread popular content over different peers to enhance 
availability."
+#~ "GNUnet is able to store data from other peers in your datastore. This is "
+#~ "useful if an adversary has access to your inserted content and you need "
+#~ "to deny that the content is yours. With \"content migration\" on, the "
+#~ "content could have \"migrated\" over the internet to your node without "
+#~ "your knowledge.\n"
+#~ "It also helps to spread popular content over different peers to enhance "
+#~ "availability."
 #~ msgstr ""
 #~ "Giữ nội dung nhập vào?\n"
 #~ "\n"
-#~ "GNUnet có thể chứa ghi nhớ dữ liệu từ các đầu peer khác trong kho dữ liệu. 
Tính năng này có ích nếu một đối tượng xấu truy cập tới nội dung đã chèn và 
người dùng cần loại bỏ nội dung đó. Khi \"nhập nội dung\" bật dùng, nội dung có 
thể \"nhập\" qua internet tới nút của người dùng mà người dùng không biết.\n"
-#~ "Nó đồng thời giúp chia sẻ nội dung phổ biến qua các đầu peer khác nhau để 
dễ dàng truy cập."
+#~ "GNUnet có thể chứa ghi nhớ dữ liệu từ các đầu peer khác trong kho dữ "
+#~ "liệu. Tính năng này có ích nếu một đối tượng xấu truy cập tới nội dung đã "
+#~ "chèn và người dùng cần loại bỏ nội dung đó. Khi \"nhập nội dung\" bật "
+#~ "dùng, nội dung có thể \"nhập\" qua internet tới nút của người dùng mà "
+#~ "người dùng không biết.\n"
+#~ "Nó đồng thời giúp chia sẻ nội dung phổ biến qua các đầu peer khác nhau để "
+#~ "dễ dàng truy cập."
 
 #~ msgid ""
-#~ "If you are an experienced user, you may want to tweak your GNUnet 
installation using the enhanced configurator.\n"
+#~ "If you are an experienced user, you may want to tweak your GNUnet "
+#~ "installation using the enhanced configurator.\n"
 #~ "\n"
 #~ "Do you want to start it after saving your configuration?"
 #~ msgstr ""
-#~ "Nếu là một người dùng có kinh nghiệm, bạn có thể sửa đổi cấu hình của 
GNUnet bẳng trình cấu hình nâng cấp.\n"
+#~ "Nếu là một người dùng có kinh nghiệm, bạn có thể sửa đổi cấu hình của "
+#~ "GNUnet bẳng trình cấu hình nâng cấp.\n"
 #~ "\n"
 #~ "Chạy nó sau khi ghi cấu hình?"
 
@@ -5706,17 +6458,16 @@
 #~ "\n"
 #~ "Thử lại?"
 
-#~ msgid "OK"
-#~ msgstr "Ừ"
-
 #~ msgid "Session with peer '%s' confirmed, but I cannot connect! (bug?)\n"
-#~ msgstr "Đã xác nhận buổi làm việc với '%s', nhưng không kết nối được! (lỗi 
bug?)\n"
+#~ msgstr ""
+#~ "Đã xác nhận buổi làm việc với '%s', nhưng không kết nối được! (lỗi bug?)\n"
 
 #~ msgid "FATAL: Identity plugin not found!\n"
 #~ msgstr "LỖI NẶNG: Không tìm thấy plugin đồng nhất!\n"
 
 #~ msgid "You must specify a non-empty set of transports to test!\n"
-#~ msgstr "Người dùng phải chỉ ra một bộ không rỗng của truyền tải để thử 
nghiệm!\n"
+#~ msgstr ""
+#~ "Người dùng phải chỉ ra một bộ không rỗng của truyền tải để thử nghiệm!\n"
 
 #~ msgid "Option '%s' makes no sense without option '%s'."
 #~ msgstr "Tùy chọn '%s' không có ý nghĩa khi không có tùy chọn '%s'."
@@ -5746,14 +6497,19 @@
 #~ msgid "Failed to obtain my (external) IPv6 address!\n"
 #~ msgstr "Không lấy được địa chỉ IPv6 (ngoài) của tôi!\n"
 
-#~ msgid "Expected welcome on http connection, got garbage. Closing 
connection.\n"
+#~ msgid ""
+#~ "Expected welcome on http connection, got garbage. Closing connection.\n"
 #~ msgstr "Mong chào mừng từ kết nối http, nhận được rác. Đang đóng kết nối.\n"
 
 #~ msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
 #~ msgstr "%s: Nhả ra kết nối có trong danh sách đen từ %u.%u.%u.%u.\n"
 
-#~ msgid "Could not bind the HTTP listener to port %d. No transport service 
started.\n"
-#~ msgstr "Không kết gắn được trình nghe HTTP tới cổng %d. Dịch vụ truyền tải 
chưa chạy.\n"
+#~ msgid ""
+#~ "Could not bind the HTTP listener to port %d. No transport service "
+#~ "started.\n"
+#~ msgstr ""
+#~ "Không kết gắn được trình nghe HTTP tới cổng %d. Dịch vụ truyền tải chưa "
+#~ "chạy.\n"
 
 #~ msgid "Could not resolve name of SMTP server '%s': %s"
 #~ msgstr "Không tìm thấy tên của máy chủ SMTP '%s': %s"
@@ -5761,8 +6517,11 @@
 #~ msgid "SMTP server send unexpected response at %s:%d.\n"
 #~ msgstr "Máy chủ SMTP gửi cầu trả lời không mong đợi tại %s: %d.\n"
 
-#~ msgid "Expected welcome message on tcp connection, got garbage (%u, %u). 
Closing.\n"
-#~ msgstr "Mong đợi chào mừng trên kết nối tcp, nhận được rác (%u, %u). Đang 
đóng.\n"
+#~ msgid ""
+#~ "Expected welcome message on tcp connection, got garbage (%u, %u). "
+#~ "Closing.\n"
+#~ msgstr ""
+#~ "Mong đợi chào mừng trên kết nối tcp, nhận được rác (%u, %u). Đang đóng.\n"
 
 #~ msgid "Could not determine my public IP address.\n"
 #~ msgstr "Không nhận ra địa chỉ IP công cộng của tôi.\n"
@@ -5770,20 +6529,29 @@
 #~ msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
 #~ msgstr "Mong chào mừng từ kết nối tcp, nhận được rác. Đang đóng.\n"
 
-#~ msgid "Received malformed message from tcp6-peer connection. Closing 
connection.\n"
-#~ msgstr "Nhận được thông báo bị hỏng từ kết nối tcp6-đầu peer. Đang đóng kết 
nối.\n"
+#~ msgid ""
+#~ "Received malformed message from tcp6-peer connection. Closing "
+#~ "connection.\n"
+#~ msgstr ""
+#~ "Nhận được thông báo bị hỏng từ kết nối tcp6-đầu peer. Đang đóng kết nối.\n"
 
 #~ msgid "%s: Rejected connection from blacklisted address %s.\n"
 #~ msgstr "%s: Nhả ra kết nối có trong danh sách đen từ địa chỉ %s.\n"
 
-#~ msgid "Cannot determine port to bind to.  Define in configuration file in 
section '%s' under '%s' or in '%s' under %s/%s.\n"
-#~ msgstr "Không nhận ra cổng để kết gắn tới.  Hãy xác định trong tập tin cấu 
hình phần '%s' dưới '%s' hoặc phần '%s' dưới %s/%s.\n"
+#~ msgid ""
+#~ "Cannot determine port to bind to.  Define in configuration file in "
+#~ "section '%s' under '%s' or in '%s' under %s/%s.\n"
+#~ msgstr ""
+#~ "Không nhận ra cổng để kết gắn tới.  Hãy xác định trong tập tin cấu hình "
+#~ "phần '%s' dưới '%s' hoặc phần '%s' dưới %s/%s.\n"
 
 #~ msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
 #~ msgstr "Nhận được thông báo UDP sai từ %u.%u.%u.%u:%u, đang loại bỏ.\n"
 
 #~ msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-#~ msgstr "Kiểm tra định dạng gói nhận được từ %u.%u.%u.%u:%u (UDP) không 
thành công.\n"
+#~ msgstr ""
+#~ "Kiểm tra định dạng gói nhận được từ %u.%u.%u.%u:%u (UDP) không thành "
+#~ "công.\n"
 
 #~ msgid "Failed to bind to UDP6 port %d.\n"
 #~ msgstr "Kết gắn bind tới cổng UDP6 %d không thành công.\n"
@@ -5797,14 +6565,22 @@
 #~ msgid "inlining configration file '%s'\n"
 #~ msgstr "đang chạy nạp tập tin cấu hình '%s'\n"
 
-#~ msgid "Configuration file '%s' not found. I will try to create the default 
configuration file at that location.\n"
-#~ msgstr "Không tìm thấy tập tin cấu hình '%s'. Chương trình sẽ thử tạo tập 
tin cấu hình mặc định tại vị trí đó.\n"
+#~ msgid ""
+#~ "Configuration file '%s' not found. I will try to create the default "
+#~ "configuration file at that location.\n"
+#~ msgstr ""
+#~ "Không tìm thấy tập tin cấu hình '%s'. Chương trình sẽ thử tạo tập tin cấu "
+#~ "hình mặc định tại vị trí đó.\n"
 
 #~ msgid "Cron stopped\n"
 #~ msgstr "Đã dừng cron\n"
 
-#~ msgid "'%s' called with cron job not in queue, adding.  This may not be 
what you want.\n"
-#~ msgstr "'%s' gọi với công việc cron không trong hàng đợi, đang thêm.  Đây 
có thể không phải cái người dùng muốn.\n"
+#~ msgid ""
+#~ "'%s' called with cron job not in queue, adding.  This may not be what you "
+#~ "want.\n"
+#~ msgstr ""
+#~ "'%s' gọi với công việc cron không trong hàng đợi, đang thêm.  Đây có thể "
+#~ "không phải cái người dùng muốn.\n"
 
 #~ msgid "Shutdown complete.\n"
 #~ msgstr "Tắt xong.\n"
@@ -5836,8 +6612,12 @@
 #~ msgid "Failure at %s:%d.\n"
 #~ msgstr "Thất bại tại %s: %d.\n"
 
-#~ msgid "Cannot determine port of gnunetd server. Define in configuration 
file in section '%s' under '%s'.\n"
-#~ msgstr "Không nhận ra cổng của máy chủ gnunetd. Hãy xác định trong phần 
'%s' của tập tin cấu hình dưới '%s'.\n"
+#~ msgid ""
+#~ "Cannot determine port of gnunetd server. Define in configuration file in "
+#~ "section '%s' under '%s'.\n"
+#~ msgstr ""
+#~ "Không nhận ra cổng của máy chủ gnunetd. Hãy xác định trong phần '%s' của "
+#~ "tập tin cấu hình dưới '%s'.\n"
 
 #~ msgid ""
 #~ "Usage: %s\n"
@@ -5851,14 +6631,24 @@
 #~ msgid "Invalid argument for '%s' at %s:%d.\n"
 #~ msgstr "Sai tham số cho '%s' tại %s: %d.\n"
 
-#~ msgid "Configuration file must specify a directory for GNUnet to store 
per-peer data under %s\\%s.\n"
-#~ msgstr "Tập tin cấu hình phải chỉ ra một thư mục để GNUnet chứa các dữ liệu 
per-peer dưới %s\\%s.\n"
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s\\%s.\n"
+#~ msgstr ""
+#~ "Tập tin cấu hình phải chỉ ra một thư mục để GNUnet chứa các dữ liệu per-"
+#~ "peer dưới %s\\%s.\n"
 
-#~ msgid "Interfaces string (%s) in configuration section '%s' under '%s' is 
malformed.\n"
+#~ msgid ""
+#~ "Interfaces string (%s) in configuration section '%s' under '%s' is "
+#~ "malformed.\n"
 #~ msgstr "Chuỗi giao diện (%s) trong cấu hình phần '%s' dưới '%s' bị hỏng.\n"
 
-#~ msgid "No network interfaces specified in the configuration file in section 
'%s' under '%s'.\n"
-#~ msgstr "Không có giao diện mạng nào được xác định trong tập tin cấu hình 
phần '%s' dưới '%s'.\n"
+#~ msgid ""
+#~ "No network interfaces specified in the configuration file in section '%s' "
+#~ "under '%s'.\n"
+#~ msgstr ""
+#~ "Không có giao diện mạng nào được xác định trong tập tin cấu hình phần '%"
+#~ "s' dưới '%s'.\n"
 
 #~ msgid "Failed to parse interface data '%s' output at %s:%d.\n"
 #~ msgstr "Thất bại khi phân tích dữ liệu giao diện '%s' ra tại %s:%d.\n"

Modified: GNUnet/src/applications/transport/transport.c
===================================================================
--- GNUnet/src/applications/transport/transport.c       2007-06-09 08:10:48 UTC 
(rev 4986)
+++ GNUnet/src/applications/transport/transport.c       2007-06-09 08:20:05 UTC 
(rev 4987)
@@ -108,12 +108,14 @@
  * Add an implementation of a transport protocol.
  */
 static int addTransport(TransportAPI * tapi) {
+  MUTEX_LOCK(tapis_lock);
   if (tapi->protocolNumber >= tapis_count)
     GROW(tapis,
         tapis_count,
         tapi->protocolNumber+1);
   if (tapis[tapi->protocolNumber] != NULL) {
     GE_BREAK(ectx, 0);
+    MUTEX_UNLOCK(tapis_lock);
     return SYSERR;
   }
   tapis[tapi->protocolNumber] = tapi;
@@ -123,6 +125,7 @@
               HELLO_RECREATE_FREQ,
               HELLO_RECREATE_FREQ,
               tapi);
+  MUTEX_UNLOCK(tapis_lock);
   return OK;
 }
 
@@ -133,17 +136,22 @@
 helloToString(const P2P_hello_MESSAGE * hello,
              int resolve_ip) {
   unsigned short prot;
+  char * ret;
 
   prot = ntohs(hello->protocol);
-  if ( (ntohs(hello->protocol) >= tapis_count) ||
+  MUTEX_LOCK(tapis_lock);
+  if ( (prot >= tapis_count) ||
        (tapis[prot] == NULL) ) {
     GE_LOG(ectx,
           GE_INFO | GE_REQUEST | GE_USER,
           _("Converting peer address to string failed, transport type %d not 
supported\n"),
           ntohs(hello->protocol));
+    MUTEX_UNLOCK(tapis_lock);
     return NULL;
   }
-  return tapis[prot]->addressToString(hello, resolve_ip);
+  ret = tapis[prot]->addressToString(hello, resolve_ip);
+  MUTEX_UNLOCK(tapis_lock);
+  return ret;
 }
 
 /**
@@ -157,6 +165,7 @@
   int ret;
 
   ret = 0;
+  MUTEX_LOCK(tapis_lock);
   for (i=0;i<tapis_count;i++) {
     if (tapis[i] != NULL) {
       ret++;
@@ -164,6 +173,7 @@
        callback(tapis[i], data);
     }
   }
+  MUTEX_UNLOCK(tapis_lock);
   return ret;
 }
 
@@ -181,18 +191,23 @@
   TSession * tsession;
 
   prot = ntohs(hello->protocol);
+  MUTEX_LOCK(tapis_lock);
   if ( (prot >= tapis_count)  ||
        (tapis[prot] == NULL) ) {
     GE_LOG(ectx,
           GE_INFO | GE_REQUEST | GE_USER | GE_ADMIN,
           _("Transport connection attempt failed, transport type %d not 
supported\n"),
           prot);
+    MUTEX_UNLOCK(tapis_lock);
     return NULL;
   }
   tsession = NULL;
   if (OK != tapis[prot]->connect(hello,
-                                &tsession))
+                                &tsession)) {
+    MUTEX_UNLOCK(tapis_lock);
     return NULL;
+  }
+  MUTEX_UNLOCK(tapis_lock);
   tsession->ttype = prot;
   return tsession;
 }
@@ -257,21 +272,35 @@
  *         SYSERR if not.
  */
 static int transportAssociate(TSession * tsession) {
-  if ( (tsession == NULL) ||
-       (tsession->ttype >= tapis_count) ||
-       (tapis[tsession->ttype] == NULL) )
+  int ret;
+
+  if (tsession == NULL) 
     return SYSERR;
-  return tapis[tsession->ttype]->associate(tsession);
+  MUTEX_LOCK(tapis_lock);
+  if ( (tsession->ttype >= tapis_count) ||
+       (tapis[tsession->ttype] == NULL) ) {
+    MUTEX_UNLOCK(tapis_lock);
+    return SYSERR;
+  }
+  ret = tapis[tsession->ttype]->associate(tsession);
+  MUTEX_UNLOCK(tapis_lock);
+  return ret;
 }
 
 /**
  * Get the cost of a message in for the given transport mechanism.
  */
 static unsigned int transportGetCost(int ttype) {
+  unsigned int ret;
+  MUTEX_LOCK(tapis_lock);
   if ( (ttype >= tapis_count) ||
-       (tapis[ttype] == NULL) )
+       (tapis[ttype] == NULL) ) {
+    MUTEX_UNLOCK(tapis_lock);
     return SYSERR; /* -1 = INFTY */
-  return tapis[ttype]->cost;
+  }
+  ret = tapis[ttype]->cost;
+  MUTEX_UNLOCK(tapis_lock);
+  return ret;
 }
 
 /**
@@ -287,6 +316,7 @@
                         const void * msg,
                         unsigned int size,
                         int important) {
+  int ret;
   if (tsession == NULL) {
     GE_LOG(ectx,
           GE_DEBUG | GE_DEVELOPER | GE_BULK,
@@ -294,18 +324,22 @@
     return SYSERR; /* can't do that, can happen for unidirectional pipes
                      that call core with TSession being NULL. */
   }
+  MUTEX_LOCK(tapis_lock);
   if ( (tsession->ttype >= tapis_count) ||
        (tapis[tsession->ttype] == NULL) ) {
     GE_LOG(ectx,
           GE_ERROR | GE_BULK | GE_USER,
           _("Transmission attempt failed, transport type %d unknown.\n"),
           tsession->ttype);
+    MUTEX_UNLOCK(tapis_lock);
     return SYSERR;
   }
-  return tapis[tsession->ttype]->send(tsession,
-                                     msg,
-                                     size,
-                                     important);
+  ret = tapis[tsession->ttype]->send(tsession,
+                                    msg,
+                                    size,
+                                    important);
+  MUTEX_UNLOCK(tapis_lock);
+  return ret;
 }
 
 /**
@@ -313,16 +347,21 @@
  * @return OK on success, SYSERR on error
  */
 static int transportDisconnect(TSession * tsession) {
+  int ret;
   if (tsession == NULL) {
     GE_BREAK(ectx, 0);
     return SYSERR;
   }
+  MUTEX_LOCK(tapis_lock);
   if ( (tsession->ttype >= tapis_count) ||
        (tapis[tsession->ttype] == NULL) ) {
     GE_BREAK(ectx, 0);
+    MUTEX_UNLOCK(tapis_lock);
     return SYSERR;
   }
-  return tapis[tsession->ttype]->disconnect(tsession);
+  ret = tapis[tsession->ttype]->disconnect(tsession);
+  MUTEX_UNLOCK(tapis_lock);
+  return ret;
 }
 
 /**
@@ -333,25 +372,38 @@
  */
 static int transportVerifyHello(const P2P_hello_MESSAGE * hello) {
   unsigned short prot;
+  int ret;
 
-  prot = ntohs(hello->protocol);
   if ( (ntohs(hello->header.size) != P2P_hello_MESSAGE_size(hello)) ||
        (ntohs(hello->header.type) != p2p_PROTO_hello) )
     return SYSERR; /* invalid */
-  if ( (ntohs(hello->protocol) >= tapis_count) ||
-       (tapis[prot] == NULL) )
+  prot = ntohs(hello->protocol);
+  MUTEX_LOCK(tapis_lock);
+  if ( (prot >= tapis_count) ||
+       (tapis[prot] == NULL) ) {
+    MUTEX_UNLOCK(tapis_lock);
     return SYSERR; /* not supported */
-  return tapis[prot]->verifyHello(hello);
+  }
+  ret = tapis[prot]->verifyHello(hello);
+  MUTEX_UNLOCK(tapis_lock);  
+  return ret;
 }
 
 /**
  * Get the MTU for a given transport type.
  */
 static int transportGetMTU(unsigned short ttype) {
+  int mtu;
+
+  MUTEX_LOCK(tapis_lock);
   if ( (ttype >= tapis_count) ||
-       (tapis[ttype] == NULL) )
+       (tapis[ttype] == NULL) ) {
+    MUTEX_UNLOCK(tapis_lock);
     return SYSERR;
-  return tapis[ttype]->mtu;
+  }
+  mtu = tapis[ttype]->mtu;
+  MUTEX_UNLOCK(tapis_lock);
+  return mtu;
 }
 
 /**
@@ -465,7 +517,7 @@
   if (used == 0)
     GE_LOG(ectx,
           GE_DEBUG | GE_DEVELOPER | GE_REQUEST,
-          "No hellos fit in %u bytes.\n",
+          "No HELLOs fit in %u bytes.\n",
           maxLen);
   return used;
 }

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2007-06-09 08:10:48 UTC (rev 4986)
+++ GNUnet/todo 2007-06-09 08:20:05 UTC (rev 4987)
@@ -3,16 +3,13 @@
 Annotations:
   RC == Release Critical
 
-
 0.7.2 [5'07]:
 - new features:
   * HTTP transport (libcurl, libmicrohttpd) [#765] [likely 0.7.2a]
 - RC bugs:
   * UDP assertion failure (mtu < size) [#1209]
-  * low connectivity (NAT? real issue?)
-    - session keys sent to wrong peers? => assertions added
-      - related: gnunet.org's Decrypting message failed errors!?
-    - gnunet-transport-check -t udp -p fails consistently even in ideal 
network!?
+  * low connectivity (still an issue?)
+  * session keys sent to wrong peers? => assertions added
 
 0.7.3 [7'07] (aka "features"):
 - chat support basics [RC]





reply via email to

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