gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r4895 - in GNUnet: . m4 po src/include


From: gnunet
Subject: [GNUnet-SVN] r4895 - in GNUnet: . m4 po src/include
Date: Sat, 2 Jun 2007 00:51:48 -0600 (MDT)

Author: grothoff
Date: 2007-06-02 00:51:48 -0600 (Sat, 02 Jun 2007)
New Revision: 4895

Modified:
   GNUnet/m4/Makefile.in
   GNUnet/po/sv.po
   GNUnet/po/vi.po
   GNUnet/src/include/gnunet_util_network.h
   GNUnet/todo
Log:
include update and new translations

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2007-06-02 06:51:04 UTC (rev 4894)
+++ GNUnet/m4/Makefile.in       2007-06-02 06:51:48 UTC (rev 4895)
@@ -252,6 +252,7 @@
 longdouble.m4\
 longlong.m4\
 mkdir.m4\
+mkdirp.m4\
 nls.m4\
 pkg.m4\
 po.m4\

Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po     2007-06-02 06:51:04 UTC (rev 4894)
+++ GNUnet/po/sv.po     2007-06-02 06:51:48 UTC (rev 4895)
@@ -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-03-25 14:37-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,22 +26,11 @@
 
 #: 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
@@ -49,10 +38,7 @@
 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
@@ -61,10 +47,7 @@
 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
@@ -82,11 +65,7 @@
 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
@@ -110,13 +89,7 @@
 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
@@ -125,21 +98,13 @@
 
 #: 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
@@ -147,9 +112,7 @@
 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
@@ -157,27 +120,15 @@
 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
@@ -204,586 +155,431 @@
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: 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."
+#: 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:306
+#: contrib/config-daemon.scm:307
 msgid "As which user should gnunetd run?"
 msgstr ""
 
-#: 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."
+#: 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:320
+#: contrib/config-daemon.scm:321
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:322
+#: contrib/config-daemon.scm:323
 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:336
+#: contrib/config-daemon.scm:337
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:338
+#: contrib/config-daemon.scm:339
 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:367
+#: contrib/config-daemon.scm:368
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:379
+#: contrib/config-daemon.scm:380
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:380
-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: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 :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:391
+#: contrib/config-daemon.scm:392
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:403
+#: contrib/config-daemon.scm:404
 msgid "Disable automatic establishment of connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:404
-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: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)."
 msgstr ""
 
-#: contrib/config-daemon.scm:415
+#: contrib/config-daemon.scm:416
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:427
+#: contrib/config-daemon.scm:428
 msgid "Client/Server Port"
 msgstr ""
 
-#: contrib/config-daemon.scm:428
-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: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)."
 msgstr ""
 
-#: contrib/config-daemon.scm:439
+#: contrib/config-daemon.scm:440
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:440
-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: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."
 msgstr ""
 
-#: contrib/config-daemon.scm:452
+#: contrib/config-daemon.scm:453
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:453
-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:454
+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:465
 #, fuzzy
 msgid "Run gnunetd as this user."
 msgstr "Kör gnunet-update"
 
-#: contrib/config-daemon.scm:465
-msgid ""
-"When started as root, gnunetd will change permissions to the given user."
+#: contrib/config-daemon.scm:466
+msgid "When started as root, gnunetd will change permissions to the given 
user."
 msgstr ""
 
-#: contrib/config-daemon.scm:476
+#: contrib/config-daemon.scm:477
 #, fuzzy
 msgid "Run gnunetd as this group."
 msgstr "Kör gnunet-update"
 
-#: contrib/config-daemon.scm:477
-msgid ""
-"When started as root, gnunetd will change permissions to the given group."
+#: contrib/config-daemon.scm:478
+msgid "When started as root, gnunetd will change permissions to the given 
group."
 msgstr ""
 
-#: contrib/config-daemon.scm:488
+#: contrib/config-daemon.scm:489
 msgid "Run gnunetd during system startup?"
 msgstr ""
 
-#: contrib/config-daemon.scm:501
+#: contrib/config-daemon.scm:502
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:502
+#: contrib/config-daemon.scm:503
 msgid "If this option is not set, any peer is allowed to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:513
+#: contrib/config-daemon.scm:514
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:533
+#: contrib/config-daemon.scm:534
 #, fuzzy
 msgid "General settings"
 msgstr "Andra inställningar"
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:535
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:561
+#: contrib/config-daemon.scm:562
 #, fuzzy
 msgid "Path settings"
 msgstr "Andra inställningar"
 
-#: contrib/config-daemon.scm:562
+#: contrib/config-daemon.scm:563
 msgid "Prefixes for paths used by GNUnet"
 msgstr ""
 
-#: contrib/config-daemon.scm:578
+#: contrib/config-daemon.scm:579
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:580
+#: contrib/config-daemon.scm:581
 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:593
+#: contrib/config-daemon.scm:594
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:595
+#: contrib/config-daemon.scm:596
 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:610
+#: contrib/config-daemon.scm:611
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:612
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:628
+#: contrib/config-daemon.scm:629
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:629
-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: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)."
 msgstr ""
 
-#: contrib/config-daemon.scm:643
+#: contrib/config-daemon.scm:644
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:655
+#: contrib/config-daemon.scm:656
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:667
+#: contrib/config-daemon.scm:668
 #, fuzzy
 msgid "Configuration of the MySQL database"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: contrib/config-daemon.scm:686
+#: contrib/config-daemon.scm:687
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:688
+#: contrib/config-daemon.scm:689
 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:702
+#: contrib/config-daemon.scm:703
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:714
+#: contrib/config-daemon.scm:715
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:727
+#: contrib/config-daemon.scm:728
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:729
+#: contrib/config-daemon.scm:730
 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:743
-msgid ""
-"MB of diskspace GNUnet can use for caching DHT index data (the data will be "
-"stored in /tmp)"
+#: contrib/config-daemon.scm:744
+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:745
 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:758
+#: contrib/config-daemon.scm:759
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "aktiverar (anonym) fildelning"
 
-#: contrib/config-daemon.scm:777
+#: contrib/config-daemon.scm:778
 #, fuzzy
 msgid "Applications"
 msgstr "_Alternativ"
 
-#: contrib/config-daemon.scm:793
+#: contrib/config-daemon.scm:794
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:794
-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: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."
 msgstr ""
 
-#: contrib/config-daemon.scm:805
+#: contrib/config-daemon.scm:806
 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:818 contrib/config-daemon.scm:911
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:818
-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: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)."
 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:830 contrib/config-daemon.scm:935
+#: contrib/config-daemon.scm:990 contrib/config-daemon.scm:1055
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:841 contrib/config-daemon.scm:946
-msgid ""
-"Which IPs are allowed to connect? Leave empty to allow connections from any "
-"IP."
+#: 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:853
+#: contrib/config-daemon.scm:854
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:871
+#: contrib/config-daemon.scm:872
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:883
+#: contrib/config-daemon.scm:884
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:898
+#: contrib/config-daemon.scm:899
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:911
-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: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)."
 msgstr ""
 
-#: contrib/config-daemon.scm:922
+#: contrib/config-daemon.scm:923
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:958
+#: contrib/config-daemon.scm:959
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:977
+#: contrib/config-daemon.scm:978
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1001 contrib/config-daemon.scm:1066
-msgid ""
-"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
+#: 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:1013
+#: contrib/config-daemon.scm:1014
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1030
+#: contrib/config-daemon.scm:1031
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1042
+#: contrib/config-daemon.scm:1043
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1078
+#: contrib/config-daemon.scm:1079
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1096
+#: contrib/config-daemon.scm:1097
 #, fuzzy
 msgid "Network interface"
 msgstr "Nätverksgränssnitt:"
 
-#: contrib/config-daemon.scm:1108
+#: contrib/config-daemon.scm:1109
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1120
+#: contrib/config-daemon.scm:1121
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1132
+#: contrib/config-daemon.scm:1133
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1155
+#: contrib/config-daemon.scm:1156
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1167
+#: contrib/config-daemon.scm:1168
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1179
+#: contrib/config-daemon.scm:1180
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1181
-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: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."
 msgstr ""
 
-#: contrib/config-daemon.scm:1192
+#: contrib/config-daemon.scm:1193
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1194
-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: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."
 msgstr ""
 
-#: contrib/config-daemon.scm:1205
+#: contrib/config-daemon.scm:1206
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1206
-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: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."
 msgstr ""
 
-#: contrib/config-daemon.scm:1217
+#: contrib/config-daemon.scm:1218
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1218
-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: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."
 msgstr ""
 
-#: contrib/config-daemon.scm:1229
+#: contrib/config-daemon.scm:1230
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1241
+#: contrib/config-daemon.scm:1242
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1243
+#: contrib/config-daemon.scm:1244
 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:1260
+#: contrib/config-daemon.scm:1261
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Nätverksgränssnitt:"
 
-#: contrib/config-daemon.scm:1261
-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: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'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1272
+#: contrib/config-daemon.scm:1273
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1297 contrib/config-client.scm:365
+#: contrib/config-daemon.scm:1298 contrib/config-client.scm:353
 msgid "Root node"
 msgstr ""
 
@@ -823,84 +619,54 @@
 
 #: 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:285
+#: contrib/config-client.scm:273
 msgid "Which plugins should be loaded by gnunet-gtk?"
 msgstr ""
 
-#: 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."
+#: 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."
 msgstr ""
 
-#: contrib/config-client.scm:297
+#: contrib/config-client.scm:285
 msgid "How frequently (in milli-seconds) should the statistics update?"
 msgstr ""
 
-#: contrib/config-client.scm:298
-msgid ""
-"Each pixel in the stats dialog corresponds to the time interval specified "
-"here."
+#: contrib/config-client.scm:286
+msgid "Each pixel in the stats dialog corresponds to the time interval 
specified here."
 msgstr ""
 
-#: contrib/config-client.scm:310
+#: contrib/config-client.scm:298
 msgid "Do not show thumbnail previews from meta-data in search results"
 msgstr ""
 
-#: 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."
+#: 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."
 msgstr ""
 
-#: contrib/config-client.scm:322
+#: contrib/config-client.scm:310
 msgid "To which directory should gnunet-gtk save downloads to?"
 msgstr ""
 
-#: contrib/config-client.scm:334
+#: contrib/config-client.scm:322
 #, fuzzy
 msgid "Options related to gnunet-gtk"
 msgstr "Ej ansluten till gnunetd."
 
-#: contrib/config-client.scm:353
+#: contrib/config-client.scm:341
 msgid "Full pathname of GNUnet client HOME directory"
 msgstr ""
 
-#: contrib/config-client.scm:354
+#: contrib/config-client.scm:342
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
@@ -915,8 +681,7 @@
 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";
@@ -929,8 +694,7 @@
 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";
@@ -956,23 +720,12 @@
 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
@@ -995,12 +748,9 @@
 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
@@ -1046,23 +796,14 @@
 
 #: 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
@@ -1097,13 +838,9 @@
 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 ""
@@ -1279,8 +1016,7 @@
 "\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"
@@ -1387,8 +1123,7 @@
 "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"
@@ -1404,8 +1139,7 @@
 "  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"
@@ -1450,8 +1184,7 @@
 "\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"
@@ -1460,8 +1193,7 @@
 "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"
@@ -1515,19 +1247,19 @@
 msgid "specify host on which gnunetd is running"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: 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
+#: 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
 #, c-format
 msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr ""
 
-#: 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
+#: 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
 #, 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:256 src/include/gnunet_util_error.h:263
+#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:225
 #, 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"
@@ -1540,9 +1272,7 @@
 #: 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
@@ -1569,17 +1299,17 @@
 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:521 src/transports/udp.c:534
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/http.c:448
+#: src/transports/http.c:447
 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:753 src/transports/http.c:826
-#: src/transports/http.c:950 src/transports/http.c:1035
+#: src/transports/http.c:672 src/transports/http.c:750
+#: src/transports/http.c:799 src/transports/http.c:936
 #: 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
@@ -1593,32 +1323,26 @@
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/transports/http.c:1225
-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:1126
+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:1134
 msgid "# bytes received via HTTP"
 msgstr "# byte mottagna via HTTP"
 
-#: src/transports/http.c:1235
+#: src/transports/http.c:1136
 msgid "# bytes sent via HTTP"
 msgstr "# byte skickade via HTTP"
 
-#: src/transports/http.c:1237
+#: src/transports/http.c:1138
 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"
@@ -1670,9 +1394,7 @@
 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"
+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
@@ -1696,15 +1418,15 @@
 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:552
 msgid "# bytes received via UDP"
 msgstr "# byte mottagna via UDP"
 
-#: src/transports/udp.c:555
+#: src/transports/udp.c:554
 msgid "# bytes sent via UDP"
 msgstr "# byte skickade via UDP"
 
-#: src/transports/udp.c:557
+#: src/transports/udp.c:556
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte kastade via UDP (utgående)"
 
@@ -1771,20 +1493,34 @@
 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:46
-#: src/applications/dht/module/table.c:701
-#, fuzzy
-msgid "# dht connections"
-msgstr "Nätverksanslutning"
+#: 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: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
@@ -1841,6 +1577,11 @@
 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"
@@ -1946,8 +1687,7 @@
 msgstr ""
 
 #: src/applications/advertising/advertising.c:175
-msgid ""
-"hello message received invalid (expiration time over limit). Dropping.\n"
+msgid "hello message received invalid (expiration time over limit). 
Dropping.\n"
 msgstr ""
 
 #: src/applications/advertising/advertising.c:182
@@ -1975,8 +1715,7 @@
 msgstr "Annonserar min transport %d till valda ändpunkter.\n"
 
 #: src/applications/advertising/advertising.c:511
-msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
+msgid "Announcing ourselves pointless: no other peers are known to us so 
far.\n"
 msgstr ""
 
 #: src/applications/advertising/advertising.c:613
@@ -2002,14 +1741,13 @@
 msgstr "# PING-meddelanden i klartext skickade"
 
 #: src/applications/advertising/advertising.c:802
-#: src/applications/session/connect.c:877
+#: src/applications/session/connect.c:892
 #, 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"
+msgid "ensures that this peer is known by other peers and discovers other 
peers"
 msgstr ""
 
 #: src/applications/topology_default/topology.c:447
@@ -2034,9 +1772,7 @@
 
 #: 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"
+msgid "Could not match PONG against any PING. Try increasing MAX_PING_PONG 
constant.\n"
 msgstr ""
 
 #: src/applications/pingpong/pingpong.c:393
@@ -2074,26 +1810,27 @@
 
 #: src/applications/sqstore_sqlite/sqlite.c:46
 #: src/applications/sqstore_sqlite/sqlite.c:53
-#: 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/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/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
@@ -2113,9 +1850,9 @@
 
 #: src/applications/sqstore_sqlite/sqlite.c:357
 #: src/applications/sqstore_sqlite/sqlite.c:378
-#: src/applications/sqstore_mysql/mysql.c:261
-#: src/applications/sqstore_mysql/mysql.c:875
-#: src/applications/sqstore_mysql/mysql.c:1164
+#: src/applications/sqstore_mysql/mysql.c:260
+#: src/applications/sqstore_mysql/mysql.c:834
+#: src/applications/sqstore_mysql/mysql.c:1123
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
@@ -2125,16 +1862,11 @@
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1369
-#: src/applications/sqstore_mysql/mysql.c:1352
+#: src/applications/sqstore_sqlite/sqlite.c:1342
+#: src/applications/sqstore_mysql/mysql.c:1310
 msgid "# bytes in datastore"
 msgstr ""
 
-#: 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:257
 #: src/applications/session/connect.c:274
 #, c-format
@@ -2146,66 +1878,60 @@
 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:572
+#: src/applications/session/connect.c:587
 #, 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:590
+#: src/applications/session/connect.c:605
 #, 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:637
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:632
+#: src/applications/session/connect.c:647
 #, 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:716
 #, 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:713
+#: src/applications/session/connect.c:728
 #, 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:881
 msgid "# session keys sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/applications/session/connect.c:868
+#: src/applications/session/connect.c:883
 msgid "# session keys rejected"
 msgstr "# sessionnycklar vägrade"
 
-#: src/applications/session/connect.c:870
+#: src/applications/session/connect.c:885
 msgid "# session keys accepted"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/applications/session/connect.c:872
+#: src/applications/session/connect.c:887
 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
@@ -2257,28 +1983,19 @@
 msgid "async RPC reply not received.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:262
-#: src/applications/sqstore_mysql/mysql.c:876
-#: src/applications/sqstore_mysql/mysql.c:1165
+#: src/applications/sqstore_mysql/mysql.c:261
+#: src/applications/sqstore_mysql/mysql.c:835
+#: src/applications/sqstore_mysql/mysql.c:1124
 msgid "mysql datastore"
 msgstr ""
 
-#: 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
+#: src/applications/sqstore_mysql/mysql.c:1340
 #, 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:1405
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
+#: src/applications/sqstore_mysql/mysql.c:1363
+msgid "Failed to load MySQL database module.  Check that MySQL is running and 
configured properly!\n"
 msgstr ""
 
 #: src/applications/datastore/datastore.c:120
@@ -2296,60 +2013,64 @@
 msgstr ""
 
 #: src/applications/datastore/datastore.c:392
-#: src/applications/datastore/datastore.c:489
+#: src/applications/datastore/datastore.c:501
 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:154
+#: src/applications/identity/hostkey.c:157
 #, 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:162
+#: src/applications/identity/hostkey.c:165
 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:175
+#: src/applications/identity/hostkey.c:178
 msgid "Done creating hostkey.\n"
 msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/applications/identity/identity.c:347
+#: src/applications/identity/identity.c:346
 #, 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:360
+#: src/applications/identity/identity.c:359
 #, 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:397
+#: src/applications/identity/identity.c:396
 #, c-format
 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:686
+#: src/applications/identity/identity.c:706
 #, c-format
 msgid "Removed file `%s' containing invalid hello data.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:760
+#: src/applications/identity/identity.c:759
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:769
+#: src/applications/identity/identity.c:768
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
@@ -2503,8 +2224,7 @@
 
 #: 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
@@ -2551,50 +2271,49 @@
 
 #: 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:190
+#: src/applications/transport/transport.c:189
 #, 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:284
 #, 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:372
+#: src/applications/transport/transport.c:373
 #, 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:429
+#: src/applications/transport/transport.c:430
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:630
+#: src/applications/transport/transport.c:631
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/applications/transport/transport.c:650
+#: src/applications/transport/transport.c:651
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/applications/transport/transport.c:660
+#: src/applications/transport/transport.c:661
 #, 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:688
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/applications/transport/transport.c:700
+#: src/applications/transport/transport.c:701
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
@@ -2861,34 +2580,34 @@
 "Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:53
-#: src/applications/tbench/tbenchtest_udp.c:55
+#: src/applications/tbench/tbenchtest.c:51
+#: src/applications/tbench/tbenchtest_udp.c:50
 #, 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
+#: src/applications/tbench/tbenchtest.c:78
+#: src/applications/tbench/tbenchtest_udp.c:77
 #, 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
+#: src/applications/tbench/tbenchtest.c:83
+#: src/applications/tbench/tbenchtest_udp.c:82
 #, 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
+#: src/applications/tbench/tbenchtest.c:89
+#: src/applications/tbench/tbenchtest_udp.c:88
 #, c-format
 msgid ""
 "\n"
 "Failed to receive reply from gnunetd.\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:148
-#: src/applications/tbench/tbenchtest_udp.c:152
+#: src/applications/tbench/tbenchtest.c:212
+#: src/applications/tbench/tbenchtest_udp.c:211
 #, c-format
 msgid "Running benchmark...\n"
 msgstr ""
@@ -2902,8 +2621,7 @@
 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
@@ -2916,9 +2634,7 @@
 
 #: 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
@@ -2964,112 +2680,109 @@
 msgid "allows mapping of the network topology"
 msgstr "tillåter kartläggning av nätverkstopologin"
 
-#: src/applications/gap/gap.c:1707
+#: src/applications/gap/gap.c:1690
 #, 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:1708
+#: src/applications/gap/gap.c:1691
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1884
-msgid ""
-"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
+#: src/applications/gap/gap.c:1865
+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:1877 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:1884 src/applications/gap/gap.c:1890
+#: src/applications/gap/gap.c:1897
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2202
+#: src/applications/gap/gap.c:2181
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2203
+#: src/applications/gap/gap.c:2182
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2204
+#: src/applications/gap/gap.c:2183
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2205
+#: src/applications/gap/gap.c:2184
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2206
+#: src/applications/gap/gap.c:2185
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2207
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2208
+#: src/applications/gap/gap.c:2187
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2209
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2210
+#: src/applications/gap/gap.c:2189
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2211
+#: src/applications/gap/gap.c:2190
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2212
+#: src/applications/gap/gap.c:2191
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2213
+#: src/applications/gap/gap.c:2192
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2193
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2215
+#: src/applications/gap/gap.c:2194
 msgid "# gap spurious replies"
 msgstr ""
 
-#: src/applications/gap/gap.c:2216
+#: src/applications/gap/gap.c:2195
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2217
+#: src/applications/gap/gap.c:2196
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2218
+#: src/applications/gap/gap.c:2197
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2219
+#: src/applications/gap/gap.c:2198
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2220
+#: src/applications/gap/gap.c:2199
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2236
-msgid ""
-"Traffic service failed to load; gap cannot ensure cover-traffic "
-"availability.\n"
+#: src/applications/gap/gap.c:2215
+msgid "Traffic service failed to load; gap cannot ensure cover-traffic 
availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2264
+#: src/applications/gap/gap.c:2243
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "\"%s\" registrerar handtag %d %d\n"
@@ -3116,14 +2829,10 @@
 
 #: 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
@@ -3131,9 +2840,7 @@
 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
@@ -3141,9 +2848,7 @@
 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
@@ -3287,8 +2992,7 @@
 #: 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
@@ -3303,10 +3007,10 @@
 msgstr "Nedladdning avbruten."
 
 #: src/applications/fs/tools/gnunet-insert.c:251
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
-"Error uploading file: %s"
+"Error uploading file: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
@@ -3319,12 +3023,8 @@
 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"
@@ -3332,17 +3032,11 @@
 
 #: 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
@@ -3350,21 +3044,15 @@
 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
@@ -3372,15 +3060,11 @@
 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
@@ -3392,14 +3076,11 @@
 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
@@ -3456,11 +3137,7 @@
 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
@@ -3493,8 +3170,7 @@
 #: 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"
@@ -3507,8 +3183,7 @@
 
 #: 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
@@ -3542,12 +3217,8 @@
 
 #: 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
@@ -3574,8 +3245,7 @@
 #: 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
@@ -3589,17 +3259,12 @@
 
 #: 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
@@ -3608,25 +3273,20 @@
 
 #: 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:1146
+#: src/applications/fs/module/fs.c:1139
 #, 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:1188
+#: src/applications/fs/module/fs.c:1180
 #, 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:1220
 msgid "enables (anonymous) file-sharing"
 msgstr "aktiverar (anonym) fildelning"
 
@@ -3649,11 +3309,11 @@
 msgid "AND"
 msgstr "OCH"
 
-#: src/applications/fs/fsui/search.c:281
+#: src/applications/fs/fsui/search.c:275
 msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:308
+#: src/applications/fs/fsui/download.c:267
 #, fuzzy
 msgid "Download failed (no reason given)"
 msgstr "Ladda ner filer från GNUnet."
@@ -3662,7 +3322,7 @@
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:281
+#: src/applications/fs/fsui/upload.c:246
 msgid "Failed to create temporary directory."
 msgstr ""
 
@@ -3679,28 +3339,23 @@
 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:125
+#: src/applications/fs/ecrs/download.c:124
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:269
+#: src/applications/fs/ecrs/download.c:255
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Skrivning(%d, %p, %d) misslyckades: %s\n"
 
-#: src/applications/fs/ecrs/download.c:1042
-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: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:1228
+#: src/applications/fs/ecrs/download.c:1186
 #, 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
@@ -3759,20 +3414,20 @@
 msgstr "Kan inte skapa pseudonym \"%s\", filen \"%s\" existerar.\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:420
+#: src/applications/fs/ecrs/namespace.c:575
 #, 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:432
+#: src/applications/fs/ecrs/namespace.c:431
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:592
-#: src/applications/fs/ecrs/namespace.c:603
+#: src/applications/fs/ecrs/namespace.c:589
+#: src/applications/fs/ecrs/namespace.c:600
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Formatet på filen \"%s\" är ogiltig.\n"
@@ -3783,9 +3438,7 @@
 
 #: 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
@@ -3802,9 +3455,7 @@
 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"
+msgid "Publishing update for periodically updated content more than a week 
ahead of schedule.\n"
 msgstr ""
 
 #: src/applications/topology_f2f/topology.c:368
@@ -3862,7 +3513,7 @@
 msgid "# bytes received of type %d"
 msgstr "# byte mottagna av typen %d"
 
-#: src/applications/traffic/traffic.c:610
+#: src/applications/traffic/traffic.c:609
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -3966,9 +3617,7 @@
 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
@@ -4129,7 +3778,7 @@
 msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:196 src/server/gnunetd.c:144
+#: src/server/gnunet-update.c:196 src/server/gnunetd.c:124
 #, fuzzy
 msgid "Core initialization failed.\n"
 msgstr " Anslutning misslyckades\n"
@@ -4160,76 +3809,76 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Detaljer om meddelande: %u: längd %d, prioritet: %d\n"
 
-#: src/server/connection.c:2631
+#: src/server/connection.c:2630
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
 
-#: src/server/connection.c:2709
+#: src/server/connection.c:2708
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2726
+#: src/server/connection.c:2725
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:3167
+#: src/server/connection.c:3166
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3171
+#: src/server/connection.c:3170
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3173
+#: src/server/connection.c:3172
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3176
+#: src/server/connection.c:3175
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/server/connection.c:3180
+#: src/server/connection.c:3179
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/server/connection.c:3184
+#: src/server/connection.c:3183
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/server/connection.c:3187
+#: src/server/connection.c:3186
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/server/connection.c:3189
+#: src/server/connection.c:3188
 msgid "# bytes noise sent"
 msgstr ""
 
-#: src/server/connection.c:3191
+#: src/server/connection.c:3190
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3193
+#: src/server/connection.c:3192
 msgid "# total bytes per second receive limit"
 msgstr ""
 
-#: src/server/connection.c:3195
+#: src/server/connection.c:3194
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "antal meddelanden i ett meddelandeblock"
 
-#: src/server/connection.c:3197
+#: src/server/connection.c:3196
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3199
+#: src/server/connection.c:3198
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3201
+#: src/server/connection.c:3200
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
@@ -4240,62 +3889,49 @@
 
 #: src/server/startup.c:224
 #, c-format
-msgid ""
-"Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
-"address@hidden"
+msgid "Filesystem `%s' of partition `%s' is unknown. Please contact 
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/startup.c:285
+#: src/server/gnunetd.c:83
 #, 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:89
+#: src/server/gnunetd.c:88
 #, c-format
 msgid "`%s' is shutting down.\n"
 msgstr ""
 
-#: 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"
+#: 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 ""
 
-#: src/server/gnunetd.c:210
+#: src/server/gnunetd.c:191
 msgid "Starts the gnunetd daemon."
 msgstr "Startar gnunetd-demonen."
 
-#: src/server/gnunetd.c:213
+#: src/server/gnunetd.c:194
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:216
-msgid "print all log messages to the console (only works together with -d)"
+#: src/server/gnunetd.c:197
+msgid "run in quiet mode"
 msgstr ""
 
-#: src/server/gnunetd.c:220
+#: src/server/gnunetd.c:201
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: src/server/gnunetd.c:270
+#: src/server/gnunetd.c:252
 #, 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
@@ -4364,12 +4000,8 @@
 
 #: 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
@@ -4440,8 +4072,7 @@
 
 #: src/server/gnunet-transport-check.c:514
 #, c-format
-msgid ""
-"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
+msgid "%d out of %d peers contacted successfully (%d times transport 
unavailable).\n"
 msgstr ""
 
 #: src/server/tcpserver.c:103
@@ -4454,14 +4085,12 @@
 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:396
+#: src/server/tcpserver.c:387
 #, 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:448
+#: src/server/tcpserver.c:440
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr ""
@@ -4472,8 +4101,7 @@
 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
@@ -4546,11 +4174,8 @@
 
 #: 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
@@ -4589,12 +4214,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: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:124
+#, c-format
+msgid "User `%s' not known, cannot change UID to it.\n"
+msgstr ""
 
-#: src/util/os/user.c:140
+#: src/util/os/user.c:138
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
@@ -4640,8 +4265,7 @@
 
 #: 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
@@ -4667,110 +4291,106 @@
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/disk/storage.c:202
+#: src/util/disk/storage.c:201
 #, 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:519
+#: src/util/disk/storage.c:518
 #, 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:289
+#: src/util/config_impl/impl.c:275
 #, 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:532
+#: src/util/config_impl/impl.c:518
 #, c-format
 msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:578
+#: src/util/config_impl/impl.c:564
 #, 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:590
+#: src/util/config_impl/impl.c:576
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:680
+#: src/util/config_impl/impl.c:666
 #, 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:93 src/util/error/error.c:95
+#: src/util/error/error.c:78 src/util/error/error.c:80
 #, fuzzy
-msgid "Error log:\n"
+msgid "Error log:"
 msgstr "Fel"
 
-#: src/util/error/error.c:140
+#: src/util/error/error.c:130
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:208 src/util/error/error.c:252
+#: src/util/error/error.c:198 src/util/error/error.c:242
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/error/error.c:211 src/util/error/error.c:254
+#: src/util/error/error.c:201 src/util/error/error.c:244
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:214 src/util/error/error.c:258
+#: src/util/error/error.c:204 src/util/error/error.c:248
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/error/error.c:217 src/util/error/error.c:260
+#: src/util/error/error.c:207 src/util/error/error.c:250
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/error/error.c:220 src/util/error/error.c:262
+#: src/util/error/error.c:210 src/util/error/error.c:252
 msgid "FATAL"
 msgstr "ÖDESDIGER"
 
-#: src/util/error/error.c:223 src/util/error/error.c:264
+#: src/util/error/error.c:213 src/util/error/error.c:254
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:226 src/util/error/error.c:266
+#: src/util/error/error.c:216 src/util/error/error.c:256
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:229 src/util/error/error.c:268
+#: src/util/error/error.c:219 src/util/error/error.c:258
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:232 src/util/error/error.c:270
+#: src/util/error/error.c:222 src/util/error/error.c:260
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:235 src/util/error/error.c:272
+#: src/util/error/error.c:225 src/util/error/error.c:262
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:238 src/util/error/error.c:274
+#: src/util/error/error.c:228 src/util/error/error.c:264
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:241
+#: src/util/error/error.c:231
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:256
+#: src/util/error/error.c:246
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/error/error.c:275
+#: src/util/error/error.c:265
 msgid "NOTHING"
 msgstr "INGET"
 
@@ -4861,9 +4481,7 @@
 
 #: 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
@@ -4873,11 +4491,8 @@
 
 #: 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"
@@ -5083,8 +4698,7 @@
 #: 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 ""
 
@@ -5127,9 +4741,7 @@
 
 #: 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
@@ -5199,21 +4811,17 @@
 #: 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
@@ -5304,8 +4912,7 @@
 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";
@@ -5318,8 +4925,7 @@
 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";
@@ -5331,16 +4937,11 @@
 "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
@@ -5349,9 +4950,7 @@
 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
@@ -5363,11 +4962,7 @@
 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
@@ -5381,11 +4976,7 @@
 
 #: 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."
@@ -5405,11 +4996,7 @@
 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
@@ -5426,11 +5013,7 @@
 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
@@ -5443,9 +5026,7 @@
 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
@@ -5459,12 +5040,9 @@
 
 #: 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 ""
@@ -5479,13 +5057,11 @@
 
 #: 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
@@ -5493,10 +5069,7 @@
 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
@@ -5520,15 +5093,12 @@
 
 #: 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
@@ -5579,16 +5149,6 @@
 msgid "Unknown error while creating a new user"
 msgstr "Okänt fel vid skapandet av ny användare"
 
-#~ 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"
-
-#, 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 "Network advertisements disabled by configuration!\n"
 #~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
@@ -5599,8 +5159,7 @@
 #~ 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"
@@ -5684,8 +5243,7 @@
 #~ 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"
@@ -5707,8 +5265,7 @@
 #~ 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"
@@ -5726,16 +5283,10 @@
 #~ 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"
@@ -5871,8 +5422,7 @@
 #~ "\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"
@@ -5893,8 +5443,7 @@
 #~ 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";
@@ -5907,8 +5456,7 @@
 #~ 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";
@@ -5962,12 +5510,8 @@
 #~ 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"
@@ -6011,12 +5555,8 @@
 #~ "%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-02 06:51:04 UTC (rev 4894)
+++ GNUnet/po/vi.po     2007-06-02 06:51:48 UTC (rev 4895)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-27 22:50-0600\n"
+"POT-Creation-Date: 2007-03-25 14:37-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,22 +25,11 @@
 
 #: 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
@@ -48,10 +37,7 @@
 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
@@ -60,10 +46,7 @@
 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
@@ -81,11 +64,7 @@
 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
@@ -109,13 +88,7 @@
 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
@@ -124,21 +97,13 @@
 
 #: 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
@@ -146,9 +111,7 @@
 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
@@ -156,27 +119,15 @@
 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
@@ -203,582 +154,427 @@
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: 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."
+#: 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:306
+#: contrib/config-daemon.scm:307
 msgid "As which user should gnunetd run?"
 msgstr ""
 
-#: 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."
+#: 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:320
+#: contrib/config-daemon.scm:321
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:322
+#: contrib/config-daemon.scm:323
 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:336
+#: contrib/config-daemon.scm:337
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:338
+#: contrib/config-daemon.scm:339
 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:367
+#: contrib/config-daemon.scm:368
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:379
+#: contrib/config-daemon.scm:380
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:380
-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: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 :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:391
+#: contrib/config-daemon.scm:392
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:403
+#: contrib/config-daemon.scm:404
 msgid "Disable automatic establishment of connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:404
-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: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)."
 msgstr ""
 
-#: contrib/config-daemon.scm:415
+#: contrib/config-daemon.scm:416
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:427
+#: contrib/config-daemon.scm:428
 msgid "Client/Server Port"
 msgstr ""
 
-#: contrib/config-daemon.scm:428
-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: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)."
 msgstr ""
 
-#: contrib/config-daemon.scm:439
+#: contrib/config-daemon.scm:440
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:440
-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: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."
 msgstr ""
 
-#: contrib/config-daemon.scm:452
+#: contrib/config-daemon.scm:453
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:453
-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:454
+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:465
 msgid "Run gnunetd as this user."
 msgstr ""
 
-#: contrib/config-daemon.scm:465
-msgid ""
-"When started as root, gnunetd will change permissions to the given user."
+#: contrib/config-daemon.scm:466
+msgid "When started as root, gnunetd will change permissions to the given 
user."
 msgstr ""
 
-#: contrib/config-daemon.scm:476
+#: contrib/config-daemon.scm:477
 msgid "Run gnunetd as this group."
 msgstr ""
 
-#: contrib/config-daemon.scm:477
-msgid ""
-"When started as root, gnunetd will change permissions to the given group."
+#: contrib/config-daemon.scm:478
+msgid "When started as root, gnunetd will change permissions to the given 
group."
 msgstr ""
 
-#: contrib/config-daemon.scm:488
+#: contrib/config-daemon.scm:489
 msgid "Run gnunetd during system startup?"
 msgstr ""
 
-#: contrib/config-daemon.scm:501
+#: contrib/config-daemon.scm:502
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:502
+#: contrib/config-daemon.scm:503
 msgid "If this option is not set, any peer is allowed to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:513
+#: contrib/config-daemon.scm:514
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:533
+#: contrib/config-daemon.scm:534
 #, fuzzy
 msgid "General settings"
 msgstr "Thiết lập khác"
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:535
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:561
+#: contrib/config-daemon.scm:562
 #, fuzzy
 msgid "Path settings"
 msgstr "Thiết lập khác"
 
-#: contrib/config-daemon.scm:562
+#: contrib/config-daemon.scm:563
 msgid "Prefixes for paths used by GNUnet"
 msgstr ""
 
-#: contrib/config-daemon.scm:578
+#: contrib/config-daemon.scm:579
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:580
+#: contrib/config-daemon.scm:581
 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:593
+#: contrib/config-daemon.scm:594
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:595
+#: contrib/config-daemon.scm:596
 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:610
+#: contrib/config-daemon.scm:611
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:612
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:628
+#: contrib/config-daemon.scm:629
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:629
-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: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)."
 msgstr ""
 
-#: contrib/config-daemon.scm:643
+#: contrib/config-daemon.scm:644
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:655
+#: contrib/config-daemon.scm:656
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:667
+#: contrib/config-daemon.scm:668
 msgid "Configuration of the MySQL database"
 msgstr ""
 
-#: contrib/config-daemon.scm:686
+#: contrib/config-daemon.scm:687
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:688
+#: contrib/config-daemon.scm:689
 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:702
+#: contrib/config-daemon.scm:703
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:714
+#: contrib/config-daemon.scm:715
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:727
+#: contrib/config-daemon.scm:728
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:729
+#: contrib/config-daemon.scm:730
 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:743
-msgid ""
-"MB of diskspace GNUnet can use for caching DHT index data (the data will be "
-"stored in /tmp)"
+#: contrib/config-daemon.scm:744
+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:745
 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:758
+#: contrib/config-daemon.scm:759
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:777
+#: contrib/config-daemon.scm:778
 #, fuzzy
 msgid "Applications"
 msgstr "Tùy _chọn"
 
-#: contrib/config-daemon.scm:793
+#: contrib/config-daemon.scm:794
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:794
-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: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."
 msgstr ""
 
-#: contrib/config-daemon.scm:805
+#: contrib/config-daemon.scm:806
 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:818 contrib/config-daemon.scm:911
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:818
-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: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)."
 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:830 contrib/config-daemon.scm:935
+#: contrib/config-daemon.scm:990 contrib/config-daemon.scm:1055
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:841 contrib/config-daemon.scm:946
-msgid ""
-"Which IPs are allowed to connect? Leave empty to allow connections from any "
-"IP."
+#: 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:853
+#: contrib/config-daemon.scm:854
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:871
+#: contrib/config-daemon.scm:872
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:883
+#: contrib/config-daemon.scm:884
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:898
+#: contrib/config-daemon.scm:899
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:911
-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: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)."
 msgstr ""
 
-#: contrib/config-daemon.scm:922
+#: contrib/config-daemon.scm:923
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:958
+#: contrib/config-daemon.scm:959
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:977
+#: contrib/config-daemon.scm:978
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1001 contrib/config-daemon.scm:1066
-msgid ""
-"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
+#: 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:1013
+#: contrib/config-daemon.scm:1014
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1030
+#: contrib/config-daemon.scm:1031
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1042
+#: contrib/config-daemon.scm:1043
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1078
+#: contrib/config-daemon.scm:1079
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1096
+#: contrib/config-daemon.scm:1097
 #, fuzzy
 msgid "Network interface"
 msgstr "Giao diện mạng:"
 
-#: contrib/config-daemon.scm:1108
+#: contrib/config-daemon.scm:1109
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1120
+#: contrib/config-daemon.scm:1121
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1132
+#: contrib/config-daemon.scm:1133
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1155
+#: contrib/config-daemon.scm:1156
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1167
+#: contrib/config-daemon.scm:1168
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1179
+#: contrib/config-daemon.scm:1180
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1181
-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: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."
 msgstr ""
 
-#: contrib/config-daemon.scm:1192
+#: contrib/config-daemon.scm:1193
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1194
-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: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."
 msgstr ""
 
-#: contrib/config-daemon.scm:1205
+#: contrib/config-daemon.scm:1206
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1206
-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: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."
 msgstr ""
 
-#: contrib/config-daemon.scm:1217
+#: contrib/config-daemon.scm:1218
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1218
-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: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."
 msgstr ""
 
-#: contrib/config-daemon.scm:1229
+#: contrib/config-daemon.scm:1230
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1241
+#: contrib/config-daemon.scm:1242
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1243
+#: contrib/config-daemon.scm:1244
 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:1260
+#: contrib/config-daemon.scm:1261
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Giao diện mạng:"
 
-#: contrib/config-daemon.scm:1261
-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: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'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1272
+#: contrib/config-daemon.scm:1273
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1297 contrib/config-client.scm:365
+#: contrib/config-daemon.scm:1298 contrib/config-client.scm:353
 msgid "Root node"
 msgstr ""
 
@@ -818,83 +614,53 @@
 
 #: 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:285
+#: contrib/config-client.scm:273
 msgid "Which plugins should be loaded by gnunet-gtk?"
 msgstr ""
 
-#: 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."
+#: 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."
 msgstr ""
 
-#: contrib/config-client.scm:297
+#: contrib/config-client.scm:285
 msgid "How frequently (in milli-seconds) should the statistics update?"
 msgstr ""
 
-#: contrib/config-client.scm:298
-msgid ""
-"Each pixel in the stats dialog corresponds to the time interval specified "
-"here."
+#: contrib/config-client.scm:286
+msgid "Each pixel in the stats dialog corresponds to the time interval 
specified here."
 msgstr ""
 
-#: contrib/config-client.scm:310
+#: contrib/config-client.scm:298
 msgid "Do not show thumbnail previews from meta-data in search results"
 msgstr ""
 
-#: 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."
+#: 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."
 msgstr ""
 
-#: contrib/config-client.scm:322
+#: contrib/config-client.scm:310
 msgid "To which directory should gnunet-gtk save downloads to?"
 msgstr ""
 
-#: contrib/config-client.scm:334
+#: contrib/config-client.scm:322
 msgid "Options related to gnunet-gtk"
 msgstr ""
 
-#: contrib/config-client.scm:353
+#: contrib/config-client.scm:341
 msgid "Full pathname of GNUnet client HOME directory"
 msgstr ""
 
-#: contrib/config-client.scm:354
+#: contrib/config-client.scm:342
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
@@ -909,8 +675,7 @@
 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";
@@ -949,40 +714,20 @@
 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:"
@@ -1004,21 +749,15 @@
 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):"
@@ -1064,36 +803,20 @@
 #: 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"
@@ -1127,24 +850,17 @@
 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."
 
@@ -1319,8 +1035,7 @@
 "\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"
@@ -1427,8 +1142,7 @@
 "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"
@@ -1444,8 +1158,7 @@
 "  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"
@@ -1490,8 +1203,7 @@
 "\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"
@@ -1500,8 +1212,7 @@
 "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"
@@ -1555,19 +1266,19 @@
 msgid "specify host on which gnunetd is running"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: 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
+#: 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
 #, 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:228 src/include/gnunet_util_error.h:235
-#: src/include/gnunet_util_error.h:242 src/include/gnunet_util_error.h:249
+#: 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
 #, 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:256 src/include/gnunet_util_error.h:263
+#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:225
 #, 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"
@@ -1580,8 +1291,7 @@
 #: 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
@@ -1608,17 +1318,17 @@
 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:535
+#: src/transports/udp6.c:521 src/transports/udp.c:534
 #, 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:448
+#: src/transports/http.c:447
 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:753 src/transports/http.c:826
-#: src/transports/http.c:950 src/transports/http.c:1035
+#: src/transports/http.c:672 src/transports/http.c:750
+#: src/transports/http.c:799 src/transports/http.c:936
 #: 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
@@ -1632,32 +1342,26 @@
 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:1225
-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:1126
+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:1134
 msgid "# bytes received via HTTP"
 msgstr "# byte nhận được qua HTTP"
 
-#: src/transports/http.c:1235
+#: src/transports/http.c:1136
 msgid "# bytes sent via HTTP"
 msgstr "# byte gửi qua HTTP"
 
-#: src/transports/http.c:1237
+#: src/transports/http.c:1138
 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"
@@ -1708,9 +1412,7 @@
 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"
+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
@@ -1732,19 +1434,17 @@
 #: src/transports/udp.c:367
 #, 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:553
+#: src/transports/udp.c:552
 msgid "# bytes received via UDP"
 msgstr "# byte nhận được qua UDP"
 
-#: src/transports/udp.c:555
+#: src/transports/udp.c:554
 msgid "# bytes sent via UDP"
 msgstr "# byte gửi qua UDP"
 
-#: src/transports/udp.c:557
+#: src/transports/udp.c:556
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte loại bỏ bởi UDP (đi ra)"
 
@@ -1800,30 +1500,39 @@
 #: 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
 #, 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: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: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: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."
@@ -1831,8 +1540,7 @@
 
 #: 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
@@ -1889,6 +1597,11 @@
 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"
@@ -1998,8 +1711,7 @@
 
 #: src/applications/advertising/advertising.c:175
 #, fuzzy
-msgid ""
-"hello message received invalid (expiration time over limit). Dropping.\n"
+msgid "hello message received invalid (expiration time over limit). 
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
@@ -2028,11 +1740,8 @@
 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"
+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
@@ -2057,15 +1766,13 @@
 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:877
+#: src/applications/session/connect.c:892
 #, 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"
+msgid "ensures that this peer is known by other peers and discovers other 
peers"
 msgstr ""
 
 #: src/applications/topology_default/topology.c:447
@@ -2090,12 +1797,8 @@
 
 #: 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"
+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
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
@@ -2128,32 +1831,31 @@
 #: src/applications/pingpong/pingpong.c:505
 #, 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: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/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/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
@@ -2173,9 +1875,9 @@
 
 #: src/applications/sqstore_sqlite/sqlite.c:357
 #: src/applications/sqstore_sqlite/sqlite.c:378
-#: src/applications/sqstore_mysql/mysql.c:261
-#: src/applications/sqstore_mysql/mysql.c:875
-#: src/applications/sqstore_mysql/mysql.c:1164
+#: src/applications/sqstore_mysql/mysql.c:260
+#: src/applications/sqstore_mysql/mysql.c:834
+#: src/applications/sqstore_mysql/mysql.c:1123
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
@@ -2185,16 +1887,11 @@
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1369
-#: src/applications/sqstore_mysql/mysql.c:1352
+#: src/applications/sqstore_sqlite/sqlite.c:1342
+#: src/applications/sqstore_mysql/mysql.c:1310
 msgid "# bytes in datastore"
 msgstr ""
 
-#: 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:257
 #: src/applications/session/connect.c:274
 #, fuzzy, c-format
@@ -2204,76 +1901,63 @@
 #: src/applications/session/connect.c:315
 #, 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:572
+#: src/applications/session/connect.c:587
 #, 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:590
+#: src/applications/session/connect.c:605
 #, 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:622
+#: src/applications/session/connect.c:637
 #, 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:632
+#: src/applications/session/connect.c:647
 #, 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:701
+#: src/applications/session/connect.c:716
 #, 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:713
+#: src/applications/session/connect.c:728
 #, 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:881
 msgid "# session keys sent"
 msgstr "# đã gửi các phím buổi làm việc"
 
-#: src/applications/session/connect.c:868
+#: src/applications/session/connect.c:883
 msgid "# session keys rejected"
 msgstr "# đã nhả ra các phím buổi làm việc"
 
-#: src/applications/session/connect.c:870
+#: src/applications/session/connect.c:885
 msgid "# session keys accepted"
 msgstr "# đã chấp nhận các phím buổi làm việc"
 
-#: src/applications/session/connect.c:872
+#: src/applications/session/connect.c:887
 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
@@ -2324,28 +2008,19 @@
 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:262
-#: src/applications/sqstore_mysql/mysql.c:876
-#: src/applications/sqstore_mysql/mysql.c:1165
+#: src/applications/sqstore_mysql/mysql.c:261
+#: src/applications/sqstore_mysql/mysql.c:835
+#: src/applications/sqstore_mysql/mysql.c:1124
 msgid "mysql datastore"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:424
+#: src/applications/sqstore_mysql/mysql.c:1340
 #, 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:1405
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
+#: src/applications/sqstore_mysql/mysql.c:1363
+msgid "Failed to load MySQL database module.  Check that MySQL is running and 
configured properly!\n"
 msgstr ""
 
 #: src/applications/datastore/datastore.c:120
@@ -2363,63 +2038,65 @@
 msgstr ""
 
 #: src/applications/datastore/datastore.c:392
-#: src/applications/datastore/datastore.c:489
+#: src/applications/datastore/datastore.c:501
 #, 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:154
+#: src/applications/identity/hostkey.c:157
 #, 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:162
+#: src/applications/identity/hostkey.c:165
 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:175
+#: src/applications/identity/hostkey.c:178
 msgid "Done creating hostkey.\n"
 msgstr "Đã tạo xong chìa khóa máy.\n"
 
-#: src/applications/identity/identity.c:347
+#: src/applications/identity/identity.c:346
 #, 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:360
+#: src/applications/identity/identity.c:359
 #, 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:397
+#: src/applications/identity/identity.c:396
 #, c-format
 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:686
+#: src/applications/identity/identity.c:706
 #, fuzzy, c-format
 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:760
+#: src/applications/identity/identity.c:759
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:769
+#: src/applications/identity/identity.c:768
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
@@ -2557,8 +2234,7 @@
 
 #: 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!"
@@ -2576,11 +2252,8 @@
 
 #: 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"
@@ -2626,50 +2299,49 @@
 
 #: 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:190
+#: src/applications/transport/transport.c:189
 #, 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:284
 #, 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:372
+#: src/applications/transport/transport.c:373
 #, 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:429
+#: src/applications/transport/transport.c:430
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:630
+#: src/applications/transport/transport.c:631
 #, 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:650
+#: src/applications/transport/transport.c:651
 #, 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:660
+#: src/applications/transport/transport.c:661
 #, 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:687
+#: src/applications/transport/transport.c:688
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "(Các) truyền tải có: %s\n"
 
-#: src/applications/transport/transport.c:700
+#: src/applications/transport/transport.c:701
 #, fuzzy, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là một đầu peer '%s'.\n"
@@ -2939,26 +2611,26 @@
 "\n"
 "Không nhận được thông báo từ gnunetd. gnunetd đang chạy?\n"
 
-#: src/applications/tbench/tbenchtest.c:53
-#: src/applications/tbench/tbenchtest_udp.c:55
+#: src/applications/tbench/tbenchtest.c:51
+#: src/applications/tbench/tbenchtest_udp.c:50
 #, 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:80
-#: src/applications/tbench/tbenchtest_udp.c:82
+#: src/applications/tbench/tbenchtest.c:78
+#: src/applications/tbench/tbenchtest_udp.c:77
 #, 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:85
-#: src/applications/tbench/tbenchtest_udp.c:87
+#: src/applications/tbench/tbenchtest.c:83
+#: src/applications/tbench/tbenchtest_udp.c:82
 #, 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:91
-#: src/applications/tbench/tbenchtest_udp.c:93
+#: src/applications/tbench/tbenchtest.c:89
+#: src/applications/tbench/tbenchtest_udp.c:88
 #, c-format
 msgid ""
 "\n"
@@ -2967,8 +2639,8 @@
 "\n"
 "Không nhận thành công câu trả lời từ gnunetd.\n"
 
-#: src/applications/tbench/tbenchtest.c:148
-#: src/applications/tbench/tbenchtest_udp.c:152
+#: src/applications/tbench/tbenchtest.c:212
+#: src/applications/tbench/tbenchtest_udp.c:211
 #, c-format
 msgid "Running benchmark...\n"
 msgstr "Đang chạy thử mức độ (benchmark)...\n"
@@ -2982,10 +2654,8 @@
 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"
@@ -2997,11 +2667,8 @@
 
 #: 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
@@ -3047,118 +2714,111 @@
 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:1707
+#: src/applications/gap/gap.c:1690
 #, 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:1708
+#: src/applications/gap/gap.c:1691
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1884
-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: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:1896 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1877 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:1903 src/applications/gap/gap.c:1909
-#: src/applications/gap/gap.c:1916
+#: src/applications/gap/gap.c:1884 src/applications/gap/gap.c:1890
+#: src/applications/gap/gap.c:1897
 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:2202
+#: src/applications/gap/gap.c:2181
 #, fuzzy
 msgid "# gap requests total received"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/gap/gap.c:2203
+#: src/applications/gap/gap.c:2182
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2204
+#: src/applications/gap/gap.c:2183
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2205
+#: src/applications/gap/gap.c:2184
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2206
+#: src/applications/gap/gap.c:2185
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2207
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2208
+#: src/applications/gap/gap.c:2187
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2209
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2210
+#: src/applications/gap/gap.c:2189
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2211
+#: src/applications/gap/gap.c:2190
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2212
+#: src/applications/gap/gap.c:2191
 #, 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:2213
+#: src/applications/gap/gap.c:2192
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2193
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2215
+#: src/applications/gap/gap.c:2194
 msgid "# gap spurious replies"
 msgstr ""
 
-#: src/applications/gap/gap.c:2216
+#: src/applications/gap/gap.c:2195
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2217
+#: src/applications/gap/gap.c:2196
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2218
+#: src/applications/gap/gap.c:2197
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2219
+#: src/applications/gap/gap.c:2198
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2220
+#: src/applications/gap/gap.c:2199
 msgid "# gap response weights"
 msgstr ""
 
-#: 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: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:2264
+#: src/applications/gap/gap.c:2243
 #, fuzzy, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d %d\n"
@@ -3209,12 +2869,8 @@
 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
@@ -3222,24 +2878,16 @@
 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"
@@ -3303,8 +2951,7 @@
 #: 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
@@ -3398,10 +3045,10 @@
 msgstr "Dừng tải xuống."
 
 #: src/applications/fs/tools/gnunet-insert.c:251
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
-"Error uploading file: %s"
+"Error uploading file: %s\n"
 msgstr ""
 "\n"
 "Lỗi tải lên tập tin: %s\n"
@@ -3414,77 +3061,48 @@
 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"
@@ -3492,21 +3110,14 @@
 
 #: 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
@@ -3515,8 +3126,7 @@
 
 #: 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
@@ -3565,11 +3175,7 @@
 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
@@ -3602,8 +3208,7 @@
 #: 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"
@@ -3650,12 +3255,8 @@
 
 #: 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
@@ -3696,23 +3297,13 @@
 
 #: 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"
@@ -3720,24 +3311,20 @@
 
 #: 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:1146
+#: src/applications/fs/module/fs.c:1139
 #, 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:1188
+#: src/applications/fs/module/fs.c:1180
 #, 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:1228
+#: src/applications/fs/module/fs.c:1220
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -3760,11 +3347,11 @@
 msgid "AND"
 msgstr "VÀ"
 
-#: src/applications/fs/fsui/search.c:281
+#: src/applications/fs/fsui/search.c:275
 msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:308
+#: src/applications/fs/fsui/download.c:267
 #, 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)."
@@ -3773,7 +3360,7 @@
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:281
+#: src/applications/fs/fsui/upload.c:246
 #, 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"
@@ -3791,28 +3378,23 @@
 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:125
+#: src/applications/fs/ecrs/download.c:124
 #, 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:269
+#: src/applications/fs/ecrs/download.c:255
 #, 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:1042
-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: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:1228
+#: src/applications/fs/ecrs/download.c:1186
 #, 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
@@ -3871,20 +3453,20 @@
 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:421
-#: src/applications/fs/ecrs/namespace.c:578
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:575
 #, 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:432
+#: src/applications/fs/ecrs/namespace.c:431
 #, 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:592
-#: src/applications/fs/ecrs/namespace.c:603
+#: src/applications/fs/ecrs/namespace.c:589
+#: src/applications/fs/ecrs/namespace.c:600
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Định dạng của tập tin '%s' sai.\n"
@@ -3895,9 +3477,7 @@
 
 #: 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
@@ -3911,16 +3491,11 @@
 
 #: src/applications/fs/namespace/namespace_info.c:656
 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"
+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
@@ -3978,7 +3553,7 @@
 msgid "# bytes received of type %d"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/applications/traffic/traffic.c:610
+#: src/applications/traffic/traffic.c:609
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -4082,9 +3657,7 @@
 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
@@ -4243,7 +3816,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:144
+#: src/server/gnunet-update.c:196 src/server/gnunetd.c:124
 #, fuzzy
 msgid "Core initialization failed.\n"
 msgstr " Kết nối không thành công\n"
@@ -4275,80 +3848,80 @@
 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:2631
+#: src/server/connection.c:2630
 #, 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:2709
+#: src/server/connection.c:2708
 #, 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:2726
+#: src/server/connection.c:2725
 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:3167
+#: src/server/connection.c:3166
 msgid "# outgoing messages dropped"
 msgstr "# thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:3171
+#: src/server/connection.c:3170
 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:3173
+#: src/server/connection.c:3172
 msgid "# connections closed (HANGUP sent)"
 msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
-#: src/server/connection.c:3176
+#: src/server/connection.c:3175
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:3180
+#: src/server/connection.c:3179
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte đã truyền của dạng %d"
 
-#: src/server/connection.c:3184
+#: src/server/connection.c:3183
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte nhận được qua TCP"
 
-#: src/server/connection.c:3187
+#: src/server/connection.c:3186
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:3189
+#: src/server/connection.c:3188
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/server/connection.c:3191
+#: src/server/connection.c:3190
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3193
+#: src/server/connection.c:3192
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/server/connection.c:3195
+#: src/server/connection.c:3194
 #, 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:3197
+#: src/server/connection.c:3196
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3199
+#: src/server/connection.c:3198
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3201
+#: src/server/connection.c:3200
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
@@ -4359,64 +3932,49 @@
 
 #: src/server/startup.c:224
 #, c-format
-msgid ""
-"Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
-"address@hidden"
+msgid "Filesystem `%s' of partition `%s' is unknown. Please contact 
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/startup.c:285
-#, c-format
-msgid "Insufficient access permissions for `%s': %s\n"
-msgstr ""
-
-#: src/server/gnunetd.c:84
+#: src/server/gnunetd.c:83
 #, fuzzy, c-format
 msgid "`%s' startup complete.\n"
 msgstr "'%s' khởi động thành công.\n"
 
-#: src/server/gnunetd.c:89
+#: src/server/gnunetd.c:88
 #, fuzzy, c-format
 msgid "`%s' is shutting down.\n"
 msgstr "'%s' đang tắt.\n"
 
-#: 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: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:210
+#: src/server/gnunetd.c:191
 msgid "Starts the gnunetd daemon."
 msgstr "Chạy daemon gnunetd."
 
-#: src/server/gnunetd.c:213
+#: src/server/gnunetd.c:194
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:216
-msgid "print all log messages to the console (only works together with -d)"
+#: src/server/gnunetd.c:197
+msgid "run in quiet mode"
 msgstr ""
 
-#: src/server/gnunetd.c:220
+#: src/server/gnunetd.c:201
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/server/gnunetd.c:270
+#: src/server/gnunetd.c:252
 #, 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
@@ -4485,12 +4043,8 @@
 
 #: 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
@@ -4523,8 +4077,7 @@
 
 #: src/server/gnunet-transport-check.c:363
 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
 msgid "ping peers from HOSTLISTURL that match transports"
@@ -4562,8 +4115,7 @@
 
 #: src/server/gnunet-transport-check.c:514
 #, c-format
-msgid ""
-"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
+msgid "%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
@@ -4576,15 +4128,12 @@
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr ""
 
-#: src/server/tcpserver.c:396
+#: src/server/tcpserver.c:387
 #, 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:448
+#: src/server/tcpserver.c:440
 #, 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"
@@ -4595,8 +4144,7 @@
 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
@@ -4670,10 +4218,8 @@
 
 #: 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
@@ -4702,8 +4248,7 @@
 #: 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"
@@ -4713,12 +4258,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:125 src/util/os/user.c:166
+#: src/util/os/user.c:124
 #, fuzzy, c-format
-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"
+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ó."
 
-#: src/util/os/user.c:140
+#: src/util/os/user.c:138
 #, 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"
@@ -4731,9 +4276,7 @@
 #: src/util/network/select.c:296
 #, 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
 msgid "select listen socket not valid!\n"
@@ -4767,11 +4310,8 @@
 
 #: 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
@@ -4797,111 +4337,106 @@
 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:202
+#: src/util/disk/storage.c:201
 #, 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:519
+#: src/util/disk/storage.c:518
 #, 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:289
+#: src/util/config_impl/impl.c:275
 #, 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:532
+#: src/util/config_impl/impl.c:518
 #, c-format
 msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:578
+#: src/util/config_impl/impl.c:564
 #, 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:590
+#: src/util/config_impl/impl.c:576
 #, 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:680
+#: src/util/config_impl/impl.c:666
 #, 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:93 src/util/error/error.c:95
+#: src/util/error/error.c:78 src/util/error/error.c:80
 #, fuzzy
-msgid "Error log:\n"
+msgid "Error log:"
 msgstr "Lỗi"
 
-#: src/util/error/error.c:140
+#: src/util/error/error.c:130
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:208 src/util/error/error.c:252
+#: src/util/error/error.c:198 src/util/error/error.c:242
 msgid "DEBUG"
 msgstr "TÌMLỖI"
 
-#: src/util/error/error.c:211 src/util/error/error.c:254
+#: src/util/error/error.c:201 src/util/error/error.c:244
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:214 src/util/error/error.c:258
+#: src/util/error/error.c:204 src/util/error/error.c:248
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/error/error.c:217 src/util/error/error.c:260
+#: src/util/error/error.c:207 src/util/error/error.c:250
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/error/error.c:220 src/util/error/error.c:262
+#: src/util/error/error.c:210 src/util/error/error.c:252
 msgid "FATAL"
 msgstr "LỖI NẶNG"
 
-#: src/util/error/error.c:223 src/util/error/error.c:264
+#: src/util/error/error.c:213 src/util/error/error.c:254
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:226 src/util/error/error.c:266
+#: src/util/error/error.c:216 src/util/error/error.c:256
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:229 src/util/error/error.c:268
+#: src/util/error/error.c:219 src/util/error/error.c:258
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:232 src/util/error/error.c:270
+#: src/util/error/error.c:222 src/util/error/error.c:260
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:235 src/util/error/error.c:272
+#: src/util/error/error.c:225 src/util/error/error.c:262
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:238 src/util/error/error.c:274
+#: src/util/error/error.c:228 src/util/error/error.c:264
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:241
+#: src/util/error/error.c:231
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:256
+#: src/util/error/error.c:246
 msgid "INFO"
 msgstr "THÔNGTIN"
 
-#: src/util/error/error.c:275
+#: src/util/error/error.c:265
 msgid "NOTHING"
 msgstr "KHÔNGCÓGÌ"
 
@@ -4992,9 +4527,7 @@
 
 #: 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
@@ -5004,8 +4537,7 @@
 
 #: 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
@@ -5213,8 +4745,7 @@
 #: 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 ""
 
@@ -5257,9 +4788,7 @@
 
 #: 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
@@ -5329,21 +4858,17 @@
 #: 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
@@ -5434,8 +4959,7 @@
 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";
@@ -5460,20 +4984,12 @@
 "độ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
@@ -5481,9 +4997,7 @@
 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
@@ -5495,18 +5009,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 ""
 "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
@@ -5524,22 +5031,13 @@
 #: 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
@@ -5556,18 +5054,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 ""
 "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
@@ -5584,18 +5075,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 ""
 "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
@@ -5608,14 +5092,11 @@
 
 #: 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
@@ -5629,23 +5110,17 @@
 #: 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:"
@@ -5661,23 +5136,19 @@
 #: 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:"
 
@@ -5687,15 +5158,11 @@
 
 #: 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
@@ -5718,15 +5185,12 @@
 
 #: 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
@@ -5777,33 +5241,17 @@
 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"
 
-#~ 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 "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"
-
-#, 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"
@@ -5815,8 +5263,7 @@
 #~ 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"
@@ -5920,19 +5367,11 @@
 #~ 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"
@@ -5949,12 +5388,8 @@
 #~ 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."
@@ -5995,8 +5430,7 @@
 #~ 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"
@@ -6013,50 +5447,29 @@
 #~ 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"
@@ -6065,8 +5478,7 @@
 #~ 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"
@@ -6080,12 +5492,8 @@
 #~ 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"
@@ -6096,9 +5504,7 @@
 #~ 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"
@@ -6114,20 +5520,13 @@
 #~ 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"
@@ -6260,24 +5659,11 @@
 #~ 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 %)?"
@@ -6294,32 +5680,20 @@
 #~ 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?"
 
@@ -6336,15 +5710,13 @@
 #~ 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'."
@@ -6374,19 +5746,14 @@
 #~ 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"
@@ -6394,11 +5761,8 @@
 #~ 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"
@@ -6406,29 +5770,20 @@
 #~ 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"
@@ -6442,22 +5797,14 @@
 #~ 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"
@@ -6489,12 +5836,8 @@
 #~ 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"
@@ -6508,24 +5851,14 @@
 #~ 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/include/gnunet_util_network.h
===================================================================
--- GNUnet/src/include/gnunet_util_network.h    2007-06-02 06:51:04 UTC (rev 
4894)
+++ GNUnet/src/include/gnunet_util_network.h    2007-06-02 06:51:48 UTC (rev 
4895)
@@ -426,20 +426,21 @@
  *        queueing messages (in bytes)
  * @return NULL on error
  */
-struct SelectHandle * select_create(const char * desc,
-                                   int is_udp,
-                                   struct GE_Context * ectx,
-                                   struct LoadMonitor * mon,
-                                   int sock,
-                                   unsigned int max_addr_len,
-                                   cron_t timeout,
-                                   SelectMessageHandler mh,
-                                   void * mh_cls,
-                                   SelectAcceptHandler ah,
-                                   void * ah_cls,
-                                   SelectCloseHandler ch,
-                                   void * ch_cls,
-                                   unsigned int memory_quota);
+struct SelectHandle * 
+select_create(const char * desc,
+             int is_udp,
+             struct GE_Context * ectx,
+             struct LoadMonitor * mon,
+             int sock,
+             unsigned int max_addr_len,
+             cron_t timeout,
+             SelectMessageHandler mh,
+             void * mh_cls,
+             SelectAcceptHandler ah,
+             void * ah_cls,
+             SelectCloseHandler ch,
+             void * ch_cls,
+             unsigned int memory_quota);
 
 /**
  * Terminate the select thread, close the socket and

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2007-06-02 06:51:04 UTC (rev 4894)
+++ GNUnet/todo 2007-06-02 06:51:48 UTC (rev 4895)
@@ -14,15 +14,12 @@
 0.7.2 [5'07]:
 - new features:
   * HTTP transport (libcurl, libmicrohttpd) [#765] [likely 0.7.2a]
-- Testcases:
-  * XFS -- more testing would be good...    [likely 0.7.2a]
 
 
 0.7.3 [7'07] (aka "features"):
-- #747 (sharing stats for gnunet-gtk)
-- insert meta-data under hash (md5? sha1? sha-512? GNUnet-URI?)
-  as keyword (to allow getting meta-data from URI only)
 - Chat support basics [RC]
+- insert meta-data under hash (md5? sha1? sha-512? GNUnet-URI?)
+  as keyword (to allow getting meta-data from URI only) [RC]
 - old/new features:
   * SMTP transport (libesmtp)
   * SMTP logger
@@ -31,14 +28,16 @@
 - Documentation:
   * LJ article
 - Testcases:
+  * more XFS/DHT
   * tracekit
   * RPC
+  * chat
 
 0.8.0 [12'07] (aka "advanced features"):
 - gnunet-chat [ RC ]
 - Insert/Index a "shared directory" automatically [Nils]
-  See also: https://gnunet.org/drupal/?q=node/97
-- guard friendly connection count (#1018)
+  See also: https://gnunet.org/drupal/?q=node/97 [RC]
+- guard friendly connection count (#1018) [RC]
 - power insert [#854?]
 
 1.0.0 (aka "userfriendly"):





reply via email to

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