gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r3717 - in GNUnet: contrib m4 po src/setup/gtk


From: grothoff
Subject: [GNUnet-SVN] r3717 - in GNUnet: contrib m4 po src/setup/gtk
Date: Sun, 12 Nov 2006 00:05:56 -0800 (PST)

Author: grothoff
Date: 2006-11-12 00:05:43 -0800 (Sun, 12 Nov 2006)
New Revision: 3717

Removed:
   GNUnet/contrib/config-client.in
   GNUnet/contrib/config-daemon.in
Modified:
   GNUnet/m4/Makefile.am
   GNUnet/m4/Makefile.in
   GNUnet/po/GNUnet.pot
   GNUnet/po/de.po
   GNUnet/po/es.po
   GNUnet/po/rw.po
   GNUnet/po/sv.po
   GNUnet/po/vi.po
   GNUnet/src/setup/gtk/Makefile.am
Log:
make dist fixes

Deleted: GNUnet/contrib/config-client.in
===================================================================
--- GNUnet/contrib/config-client.in     2006-11-12 07:38:46 UTC (rev 3716)
+++ GNUnet/contrib/config-client.in     2006-11-12 08:05:43 UTC (rev 3717)
@@ -1,292 +0,0 @@
-mainmenu "GNUnet user configuration"
-
-menu "Meta-configuration" "Meta"
-       config EXPERIMENTAL-CLIENT
-       bool "Prompt for development and/or incomplete code"
-       help
-                If EXPERIMENTAL is set to NO, options for experimental code are
-                       not shown.  If in doubt, use NO.
-
-               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).
-
-                       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.
-  
-       config ADVANCED-CLIENT
-       bool "Show options for advanced users"
-       help
-
-               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.
-  
-       config RARE-CLIENT
-       bool "Show rarely used options"  
-       help
-               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.
-endmenu
-
-menu "General settings" "GNUNET"
-       config GNUNET_HOME
-       string "Directory of user specific files"
-       default "~/.gnunet/"
-       help
-               This is the directory where GNUnet is putting
-               user-specific files (such as pseudonyms).  Typically,
-               GNUnet should not put more than a few of MB there.
-
-       config LOGLEVEL
-       string "What kinds of (debug) output should be printed"
-       default "WARNING"
-       depends on Meta::ADVANCED-CLIENT
-       help
-               What kinds of (debug) output should be printed? You can 
-               use NOTHING, FATAL, ERROR, FAILURE, WARNING, MESSAGE, INFO, 
DEBUG, 
-               CRON or EVERYTHING (which print more and more messages in this 
order). 
-               Default is WARNING which is usually enough to let you know if 
there
-               is any problems.
-
-       config LOGFILE
-       string "Where to write the messages"
-       default ""
-       depends on Meta::ADVANCED-CLIENT
-       help
-               Where to write the messages? Leave the entry unspecified (as
-               default) to make the clients print their messages to stderr.
-               Default is unspecified (stderr).
-               
-       config PROCESS-PRIORITY
-       string "Process priority"
-       default "NORMAL"
-       depends on Meta::ADVANCED-CLIENT
-       help
-               At which priority should the client tools run? If you don't 
want the
-               client-tools to interfere with other applications, set this to
-               "BELOW NORMAL" or "IDLE".
-               Acceptable values are "NORMAL", "BELOW NORMAL", "ABOVE NORMAL", 
"HIGH",
-               "IDLE" and nice(1) increments (a numeric value between -20 and 
19, keep
-               in mind that values smaller than 0 require root privileges).
-               Default is "NORMAL".
-endmenu
-
-
-menu "Options for filesharing (FS)" "FS"
-       config INSERT-PRIORITY
-       int "Default priority for locally inserted content"
-       default 50
-       depends on Meta::RARE-CLIENT
-       help
-               Default priority for locally inserted content
-               Default: 50
-
-       config INSERT-EXPIRATION
-       int "Default expiration time for locally inserted content"
-       default 36500
-       depends on Meta::RARE-CLIENT
-       help
-               Default expiration time for locally inserted content, in days
-               Default is 36500 (100 years)
-
-       config SEARCHTIMEOUT
-       int "How long should gnunet-search try to get an answer to a query"
-       default 3000
-       depends on Meta::ADVANCED-CLIENT
-       help
-               How long should gnunet-search try to get an answer to a query 
before
-               timing out (in seconds).  Default is "3000", which should be 
enough
-               for pretty much anything. Use 0 for no timeout.
-
-       config DIRECT-KEYWORDS
-       bool "Generate keywords for files inside of recursively inserted 
directories?"
-       default y
-       help
-               If this option is set to YES, libextractor will be used to 
generate
-               keywords for files inside of directories.  If the option is NO,
-               files in directories can only be found from the directory (or,
-               of course, from the explicit GNUnet URL).
-
-       config TOP-KEYWORDS
-       bool "Generate keywords for the top-level file or directory?"
-       default y
-       help
-               If this option is set to YES, libextractor will be used to 
generate
-               keywords for the file or directory that is inserted.  If the 
option is NO,
-               libextractor will not be used for the top-level file or 
directory
-               (you can still specify keywords manually).
-
-
-       config MAXRESULTS
-       int "Default limit for the number of search results"
-       default 0
-       depends on Meta::ADVANCED-CLIENT
-       help
-               Default limit for the number of search results (0 for unlimited)
-
-
-       config EXTRACTORS
-       string "Specify which additional extractor libraries should be used"
-       default 
"libextractor_filename:-libextractor_split:-libextractor_lower:-libextractor_thumbnail"
-       depends on Meta::ADVANCED-CLIENT
-       help
-               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]*] 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.
-               Default is 
libextractor_filename:-libextractor_split:-libextractor_lower:-libextractor_thumbnail
-
-       config INCOMINGDIR
-       string "Where to safe downloads to"
-       default "~/gnunet-downloads/"
-       help
-               Where to move finished downloads to (by default)?
-               Default is ~/gnunet-downloads/
-               
-       config DISABLE-SYMLINK
-       bool "Disable symlinking"
-       default y
-       depends on Meta::RARE-CLIENT
-       help
-               Disable symlinking.  When set to YES, GNUnet will always make
-               a copy of the file when files are indexed.  The default is to
-               try to use a symbolic link (if possible).
-               Note that you should NEVER, NEVER simply delete the .gnunet 
-               directory if this is set to 'NO', since all inserted files
-               will have been moved into that directory and replaced with
-               symbolic links.  So if you were to remove ~/.gnunet, you will
-               loose those files unless you first run gnunet-delete to undo
-               the symlinking!
-               It is much more (space)-efficient to set this to NO,
-               but you need to know what you're doing.  This is why the
-               default is 'YES'.
-
-       config DOWNLOAD-POOL
-       int "Number of parallel threads per gnunet-download"
-       depends on Meta::ADVANCED-CLIENT
-       default 32
-       help
-               How many (parallel) threads should a given gnunet-download (or
-               gnunet-gtk) process run?  (this limits the amount of parallelism
-               used in the FSUI library).  Smaller values reduce memory and CPU
-               requirements.  Very large values will not be useful since even 
if
-               that much parallelism is theoretically possible, the local node 
may
-               not be able to route that many parallel requests anyway.  
-               Default: 32
-
-
-endmenu
-
-menu "Default options for gnunet-gtk" GNUNET-GTK
-       config GNUNETD-CONFIG
-       string "Path to the gnunet.conf file"
-       depends on Meta::ADVANCED-CLIENT
-       default "/etc/gnunetd.conf"
-       help
-               Path to the gnunet.conf file for gnunetd (for
-               forking gnunetd by gnunet-gtk)
-
-
-        config PLUGINS
-        string "Which plugins should gnunet-gtk load?"
-        default "about daemon fs stats"
-        depends on Meta::ADVANCED-CLIENT
-        help
-               Currently, the available applications are:
-               about: the about dialog
-               daemon: starting and stopping gnunetd           
-               fs: file sharing
-               stats: statistics
-               Default: PLUGINS = "about daemon fs stats"
-
-        config DISABLE-PREVIEWS
-        string "Should showing previews be disabled?"
-        default "NO"
-        help
-               When searching, gnunet-gtk can show previews
-               (if the inserting party generated them).
-               This can be disabled with this option.
-               Default: DISABLE-PREVIEWS = "NO"
-
-endmenu
-
-if Meta::EXPERIMENTAL-CLIENT
-       menu "Defaults for gnunet-chat" GNUNET-CHAT
-               config NICK
-               string "Nickname"
-               default "My nickname"
-               depends on Meta::EXPERIMENTAL-CLIENT
-               help
-                       You can specify your nickname here and thus avoid 
having to pass it
-                       with -n NICK at the command-line.  The default is empty.
-                       Default: "My nickname"
-       endmenu
-endif
-
-if Meta::RARE-CLIENT
-       menu "Defaults for gnunet-tracekit" GNUNET-TRACEKIT
-               config WAIT
-               int "How long to wait for replies"
-               default 30
-               help
-                       How long to wait for replies (in seconds)? (default: 30)
-
-               config HOPS
-               int "How many hops should the trace go"
-               default 5
-               help
-                       How many hops should the trace go? (default: 5)
-
-               config PRIORITY
-               int "How important is the trace message"
-               default 1000
-               help
-                       How important is the trace message? (default: 1000)
-
-               config FORMAT
-               int "Output format"
-               default 2
-               help
-                       Output format, 0 is human readable, 1 is dot,
-                       2 is vcg (default: 2)
-       endmenu
-
-endif
-
-if Meta::RARE-CLIENT && Meta::EXPERIMENTAL-CLIENT
-
-       menu "Defaults for gnunet-testbed" "GNUNET-TESTBED"
-               config PORT
-               int "Internal port"
-               default 2089
-               help
-                       Port used internally by gnunet-testbed
-                       (for the IPC in the gnunet-testbed shell).
-                       The default is 2089.
-
-               config REGISTERURL
-               string "Registration URL"
-               default "http://gnunet.org/testbed/";
-               help
-                       At which URL does the registration software run?
-                       Default is http://gnunet.org/testbed/
-       endmenu
-
-endif
-

Deleted: GNUnet/contrib/config-daemon.in
===================================================================
--- GNUnet/contrib/config-daemon.in     2006-11-12 07:38:46 UTC (rev 3716)
+++ GNUnet/contrib/config-daemon.in     2006-11-12 08:05:43 UTC (rev 3717)
@@ -1,425 +0,0 @@
-mainmenu "GNUnet Server Configuration"
-
-       config HOSTS
-       string "Where should gnunetd keep the list of peers"
-       default "$GNUNETD_HOME/data/hosts/"
-       depends on Meta::ADVANCED
-       help
-               This directory should be made available periodically --- it 
contains
-               information how to join GNUnet that is in no way private to the
-               local node.  This directory can be shared between nodes AND 
should
-               be put on a public web-server (if possible).  You should find a 
list
-               of known hosts under http://gnunet.org/hosts/, you can copy
-               those files into this directory.
-               
-               If you specify a HOSTLISTURL, the directory will be 
automatically
-               populated by gnunetd with an initial set of nodes.
-               Default: HOSTS          = $GNUNETD_HOME/data/hosts/
-
-
-       config TRANSPORTS
-       string "Which transport mechanisms are available?"
-       default "udp tcp http nat"
-       depends on Meta::ADVANCED
-       help
-               Which transport mechanisms are available? Use space-separated 
list
-               of the modules, e.g.  "udp smtp tcp". The order is irrelevant, 
each
-               protocol has a build-in cost-factor and this factor determines 
which
-               protocols are preferred.  
-               
-               The available transports at this point are udp, tcp, http, smtp,
-               tcp6, udp6 and the special 'nat' service.
-               
-               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.
-               
-               Usually, the default is just fine for most people.
-               Choices are: "udp tcp udp6 tcp6 nat http smtp"
-               Default: TRANSPORTS = "udp tcp http nat"
-
-       config PROCESS-PRIORITY
-       string "Process priority"
-       default "NORMAL"
-       depends on Meta::ADVANCED
-       help
-               At which priority should the GNUnet server run? If you don't 
want it
-               to interfere with other applications, set this to "BELOW 
NORMAL" 
-                or "IDLE".  Acceptable values are "NORMAL" (0), "BELOW NORMAL" 
(10), 
-                "ABOVE NORMAL" (-5), "HIGH" (-10), "IDLE" (19) and nice(1) 
increments 
-                (a numeric value between -20 and 19, keep in mind that values 
smaller 
-                than 0 require root privileges).  Default is "NORMAL".
-
-
-       config GROUP
-       string "GNUnet group"
-       default ""
-       depends on Meta::ADVANCED
-       help
-               As which group account should gnunetd run?
-               Empty means current group under Unix. It has no meaning under 
Windows.
-
-       config AUTOSTART
-       bool "Start GNUnet daemon automatically"
-       default n
-       depends on Meta::RARE
-       help
-               This is used by the configuration wizards to remember whether 
to start
-               the GNUnet daemon at computer startup.
-
-endmenu
-
-
-menu "Network" "NETWORK"
-       config INTERFACE
-       string "Interface to probe for external IP"
-       help
-               Set if GNUnet fails to determine your IP.  GNUnet first tries to
-               determine your IP by looking at the IP that matches the 
interface
-               that is given with the option INTERFACE.
-               Under Windows, specify the ID reported by "gnunet-win-tool -n".
-  
-       config IP
-       string "Forced value of external IP or hostname"
-       help
-               If obtaining the external IP from an interface will not result
-               in the right information, use the IP setting.  Setting IP can
-                be used to specify the external IP directly or to make GNUnet
-               lookup the external IP using DNS.
-               
-               This is typically the best option if you are behind a 
router/gateway
-               that performs network address translation (NAT).  If the router 
has
-               a fixed external IP, use that IP.  If the router itself obtains 
its
-               IP dynamically (say via DHCP), use the DNS lookup in 
combination with
-               DynDNS.  In either case make sure that the router forwards 
incoming
-               UDP and TCP messages on the GNUnet port (default: 2086) to the 
-               GNUnet host in the local network.  If this is not possible, read
-               about the LIMITED option for NAT.
-               
-               If in doubt, try without.  Default is empty.
-  
-       config HELLOEXCHANGE
-       bool "Participate in network topology management"
-       default y
-       depends on Meta::ADVANCED
-       help
-               If this host is connected to two networks, a private which is 
not
-               reachable from the Internet and that contains GNUnet clients 
and to
-               a public network, typically the Internet (and is this host is 
thus
-               in the position of a router, typically doing NAT), then this 
option
-               should be set to 'NO'. It prevents the node from forwarding 
HELLOs
-               other than its own. 
-
-                If in doubt, use YES.  Default is YES.
-  
-endmenu
-
-
-menu "Resource limitations" "LOAD"
-
-       config BASICLIMITING
-       bool "Basic bandwidth limiting"
-       default y
-       help
-               
-
-               
-               Default is: BASICLIMITING = YES
-
-       config INTERFACES
-       string "
-       depends on !Meta::BASICLIMITING
-       help
-       
-       config MAXNETDOWNBPSTOTAL
-       int "Maximum download (bytes per second)"
-       default 50000
-       help
-               Bandwidth limit for incoming traffic in bytes per second.  
-               Default is 50000.
-  
-       config MAXNETUPBPSTOTAL
-       int "Maximum upload (bytes per second)"
-       default 50000
-       help
-               Bandwidth limit for outgoing traffic in bytes per second. 
-               Default is 50000.
-
-       config MAXCPULOAD
-       int "Maximum CPU load (percentage)"
-       range 0 100
-       default 50
-       help
-               
-
-               Default is 50.
-    
-endmenu
-
-menu "Transports" "Transports"
-
-    if Meta::ADVANCED
-
-       menu "UDP Transport" "UDP"
-
-               config BLACKLIST
-               string "Disallow connections from"
-               default 
"127.0.0.1/8;172.16.0.0/12;192.168.0.0/16;10.0.0.0/255.0.0.0;"
-               help
-                       With this option, you can specify which networks you do 
NOT want to
-                       connect to. Usually you will want to filter loopback 
(127.0.0.1,
-                       misconfigured GNUnet hosts), virtual private networks, 
[add a class
-                       C network here], 192.168.0.0, 172.16.0.0 and 10.0.0.0 
(RFC
-                       1918). 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.  Notice that if your 
host is on a
-                       private network like the above, you will have to 
configure your NAT
-                       to allow incoming requests and you will want to modify 
this option.
-                       The idea behind this option is not to discriminate 
against NAT users
-                       but to ensure that hosts only attempt to connect to 
machines that
-                       they have a chance to actually reach.  Of course, you 
could also use
-                       it against known adversaries that have a small IP range 
at their
-                       disposal :-) 
-                       
-                       Example (and default):
-                       
127.0.0.1/8;172.16.0.0/12;192.168.0.0/16;10.0.0.0/255.0.0.0;
-         
-               config MTU
-               int "MTU"
-               default 1472
-               depends on Meta::RARE
-               help
-                       The MTU to use. Do not use more than your OS
-                       (and firewall) can support. Typically, your 
-                       network-MTU - 28 is optimal, for ethernet, this
-                       is 1472, the default. Do not use less than 1200.
-               
-                       The default is 1472, which is also used if you specify 
nothing.
-
-       endmenu
-  
-       menu "TCP Transport" "TCP"
-
-               config BLACKLIST
-               string "Disallow connections from"
-               default 
"127.0.0.1/8;172.16.0.0/12;192.168.0.0/16;10.0.0.0/255.0.0.0;"
-               help
-                       With this option, you can specify which networks you do 
NOT want to
-                       connect to. Usually you will want to filter loopback 
(127.0.0.1,
-                       misconfigured GNUnet hosts), virtual private networks, 
[add a class
-                       C network here], 192.168.0.0, 172.16.0.0 and 10.0.0.0 
(RFC
-                       1918). 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.  Notice that if your 
host is on a
-                       private network like the above, you will have to 
configure your NAT
-                       to allow incoming requests and you will want to modify 
this option.
-                       The idea behind this option is not to discriminate 
against NAT users
-                       but to ensure that hosts only attempt to connect to 
machines that
-                       they have a chance to actually reach.  Of course, you 
could also use
-                       it against known adversaries that have a small IP range 
at their
-                       disposal :-)
-                       Example (and default):
-                       BLACKLIST = 
127.0.0.1/8;192.168.0.0/16;10.0.0.0/255.0.0.0; 
-         
-       endmenu
-
-    endif
-
-    if Meta::EXPERIMENTAL && Meta::RARE && Meta::ADVANCED
-  
-       menu "UDP over IPv6" "UDP6"
-                               
-                       config BLACKLIST
-                       string "Disallow connections from"
-       
-                               
-                       config MTU
-                       int "MTU"
-                       default 1440
-                       depends on Meta::RARE
-       endmenu
-
-       menu "TCP over IPv6" "TCP6"
-                       
-                       config BLACKLIST
-                       string "Disallow connections from"
-       
-       endmenu
-  
-    endif
-  
-    if Meta::ADVANCED
-  
-         menu "SMTP" "SMTP"
-
-               config EMAIL
-               string "Receiver address for inbound E-mail"
-               default "address@hidden"
-               help
-                       E-mail address to use to receive messages.  Do not 
specify anything
-                       if you do not want to allow SMTP as a receiver 
protocol; you can
-                       still *send* email to establish connections in that 
case.  Example:
-                       EMAIL = address@hidden
-
-               config MTU
-               int "MTU"
-               default 65528
-               help
-                       MTU for the E-mail. How large should the E-mails be 
that we send
-                       out? Default is 65528 (bytes).
-
-               config PORT
-               int "Port of the SMTP server for outbound mail"
-               range 1 65535
-               default 25
-               help
-                       Port of the SMTP server for outbound mail.  If not 
specified, the
-                       TCP/SMTP entry from /etc/services is consulted.  
Default is 25.
-
-               config SERVER
-               string "Hostname of the SMTP server"
-               default localhost
-               help
-                       Hostname of the SMTP server. Default is "localhost".
-                       
-               config SENDERHOSTNAME
-               string "Hostname of the sender host"
-               default "myhost.example.com"
-               help
-                       Hostname of the sender host to use in the HELLO message 
of the SMTP
-                       protocol (not to be confused with the HELLO in the 
GNUnet p2p
-                       protocol). Pick a hostname that works for your SMTP 
server. This
-                       hostname has nothing to do with the hostname of the 
SMTP server or
-                       your E-mail sender address (though those names should 
work in most
-                       cases). In fact, it often does not even have to exist 
as a real
-                       machine. Example: "myhost.example.com"
-
-               config FILTER
-               string "Filter-line to use in the E-mail header"
-               default "X-mailer: GNUnet"
-               help
-                       Filter-line to use in the E-mail header. This filter 
will be
-                       included in the GNUnet-generated E-mails and should be 
used to
-                       filter out GNUnet traffic from the rest of your E-mail. 
Make sure
-                       that the filter you choose is highly unlikely to occur 
in any other
-                       message.
-                       
-                       Examples:
-                       FILTER = "X-mailer: GNUnet"
-                       FILTER = "Subject: foobar5252"
-
-                       In order to make the SMTP transport work, add the 
following line
-                       to your ~/.procmailrc file:
-
-                       :0:
-                       * ^X-mailer: GNUnet
-                       /tmp/gnunet.smtp
-                       # where do you want your other e-mail delivered to
-                       # (default: /var/spool/mail/)
-                       :0:
-                       /var/spool/mail/
-
-                       You can test your configuration with
-
-                       $ gnunet-transport-check -t smtp -T 60000
-
-                       Make sure to poll your e-mail within the minute that
-                       gnunet-transport-check waits for a response.
-
-
-               config PIPE
-               string "Name of the pipe via which procmail sends filterd 
E-mails"
-               default "/tmp/gnunet.smtp"
-               help
-                       Name of the pipe via which procmail sends the filtered 
E-mails to
-                       the node.  Default is /tmp/gnunet.smtp
-
-         endmenu
-         
-         menu "HTTP" "HTTP"
-         
-               config PORT
-               int "Port"
-               range 0 65535
-               default 1080
-               
-               config BLACKLIST
-               string "Disallow connections from"
-               default 
"127.0.0.1/8;172.16.0.0/12;192.168.0.0/16;10.0.0.0/255.0.0.0;"          
-         
-         endmenu
-  
-    endif
-
-endmenu
-
-menu "Applications" ""
-
-       menu "Anonymous file sharing" "FS"
-
-               config DIR
-               string "Directory for storing FS data"
-               default "$GNUNETD_HOME/data/fs/"
-               depends on Meta::ADVANCED
-               help
-                       Where to store the FS related data (content, etc)?
-               
-               config INDEX-DIRECTORY
-               string "Where to store indexed files"
-               default "$GNUNETD_HOME/data/shared/"
-               depends on Meta::ADVANCED
-               help
-                       Where to store indexed files (NEW!)
-                       Note that you MUST not copy files directly to this
-                       directory.  gnunet-insert (or gnunet-gtk) will copy
-                       the files that you index to this directory.  With the
-                       -l option you instead create a link (if gnunetd and
-                       gnunet-insert run on the same machine) instead.
-                       
-                       The QUOTA option does NOT apply for this directory.
-                       To limit how much can be placed in this directory
-                       set the option INDEX-QUOTA.  Files that are merely
-                       linked do not count towards the quota.
-                       
-                       If you uncomment this option gnunetd will refuse
-                       content indexing requests (insertion will still be
-                       possible).
-                       
-                       Default is $GNUNETD_HOME/data/shared/
-
-               config INDEX-QUOTA
-               int "Indexing quota"
-               default 8192
-               help
-                       Indexing quota.  Default is 8192.
-               
-
-       endmenu
-       
-       menu "DHT" "DHT"
-               config BUCKETCOUNT
-               int "Number of buckets to use"
-               default 160
-               help
-                       Number of buckets to use (determines memory 
requirements)
-                       Default (and maximum) is 160.
-
-               config MASTER-TABLE-SIZE
-               int "Amount of memory (in bytes) to use for the master table"
-               default 65536
-               help
-                       Amount of memory (in bytes) to use for the master table
-                       (table that caches table-to-peer mappings).
-                       Default is 65536.
-       endmenu
-
-    endif
-       
-endmenu
-       
-

Modified: GNUnet/m4/Makefile.am
===================================================================
--- GNUnet/m4/Makefile.am       2006-11-12 07:38:46 UTC (rev 3716)
+++ GNUnet/m4/Makefile.am       2006-11-12 08:05:43 UTC (rev 3717)
@@ -6,7 +6,6 @@
 glibc21.m4\
 glib-gettext.m4\
 gtk-2.0.m4\
-guile.m4\
 iconv.m4\
 intdiv0.m4\
 intmax.m4\

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2006-11-12 07:38:46 UTC (rev 3716)
+++ GNUnet/m4/Makefile.in       2006-11-12 08:05:43 UTC (rev 3717)
@@ -222,7 +222,6 @@
 glibc21.m4\
 glib-gettext.m4\
 gtk-2.0.m4\
-guile.m4\
 iconv.m4\
 intdiv0.m4\
 intmax.m4\

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2006-11-12 07:38:46 UTC (rev 3716)
+++ GNUnet/po/GNUnet.pot        2006-11-12 08:05:43 UTC (rev 3717)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-09-10 22:06-0600\n"
+"POT-Creation-Date: 2006-11-12 01:40-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -87,10 +87,18 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:130
+msgid "Full pathname of GNUnet directory for file-sharing data"
+msgstr ""
+
+#: contrib/config-daemon.scm:142
+msgid "Full pathname of GNUnet directory for indexed files symbolic links"
+msgstr ""
+
+#: contrib/config-daemon.scm:154
 msgid "How many minutes should peer advertisements last?"
 msgstr ""
 
-#: contrib/config-daemon.scm:132
+#: contrib/config-daemon.scm:156
 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 "
@@ -100,52 +108,96 @@
 "than the frequency with which your IP changes."
 msgstr ""
 
-#: contrib/config-daemon.scm:143
-msgid "Log level"
+#: contrib/config-daemon.scm:167
+msgid "Where can GNUnet find an initial list of peers?"
 msgstr ""
 
-#: contrib/config-daemon.scm:144
-msgid "How verbose should the logging of errors be?"
+#: contrib/config-daemon.scm:169
+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"
+"\t\t\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"
+"\t\t\n"
+"If you do not specify a HOSTLISTURL, you must copy valid hostkeys to data/"
+"hosts manually."
 msgstr ""
 
-#: contrib/config-daemon.scm:155
-msgid "Where should logs go?"
+#: contrib/config-daemon.scm:186
+msgid "HTTP Proxy Server"
 msgstr ""
 
-#: contrib/config-daemon.scm:157
+#: contrib/config-daemon.scm:188
 msgid ""
-"In which file should gnunetd write the logs?  If you specify nothing, logs "
-"are written to stderr (and note that if gnunetd runs in the background, "
-"stderr is closed and all logs are discarded)."
+"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:168
+#: contrib/config-daemon.scm:227 contrib/config-client.scm:144
 msgid "How long should logs be kept?"
 msgstr ""
 
-#: contrib/config-daemon.scm:170
+#: contrib/config-daemon.scm:229 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:181
+#: contrib/config-daemon.scm:240 contrib/config-client.scm:157
+msgid "Where should gnunetd write the logs?"
+msgstr ""
+
+#: contrib/config-daemon.scm:252 contrib/config-client.scm:169
+msgid "Configuration of the logging system"
+msgstr ""
+
+#: contrib/config-daemon.scm:253 contrib/config-client.scm:170
+msgid "Specify which system messages should be logged how"
+msgstr ""
+
+#: contrib/config-daemon.scm:257 contrib/config-client.scm:174
+msgid "Logging of events for users"
+msgstr ""
+
+#: contrib/config-daemon.scm:258 contrib/config-client.scm:175
+msgid "Logging of events for the system administrator"
+msgstr ""
+
+#: contrib/config-daemon.scm:270
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:183
+#: contrib/config-daemon.scm:272
 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:195
+#: contrib/config-daemon.scm:284
+msgid "As which user should gnunetd run?"
+msgstr ""
+
+#: contrib/config-daemon.scm:286
+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:298
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:197
+#: contrib/config-daemon.scm:300
 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"
@@ -159,11 +211,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:211
+#: contrib/config-daemon.scm:314
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:213
+#: contrib/config-daemon.scm:316
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -200,19 +252,108 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:244
+#: contrib/config-daemon.scm:345
+msgid "Disable client-server connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:357
+msgid "Disable peer discovery"
+msgstr ""
+
+#: contrib/config-daemon.scm:358
+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:369
+msgid "Disable advertising this peer to other peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:381
+msgid "Disable automatic establishment of connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:382
+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:393
+msgid "Disable advertising of other peers by this peer"
+msgstr ""
+
+#: contrib/config-daemon.scm:405 contrib/config-client.scm:189
+msgid "Client/Server Port"
+msgstr ""
+
+#: contrib/config-daemon.scm:406 contrib/config-client.scm:190
+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:417
+msgid "IPs allowed to use gnunetd server"
+msgstr ""
+
+#: contrib/config-daemon.scm:418
+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:430
+msgid "Limit connections to the specfied set of peers."
+msgstr ""
+
+#: contrib/config-daemon.scm:431
+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:442
+msgid "Prevent the specfied set of peers from connecting."
+msgstr ""
+
+#: contrib/config-daemon.scm:443
+msgid "If this option is not set, any peer is allowed to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:454
+msgid "Rarely used settings for peer advertisements and connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:474
 msgid "General settings"
 msgstr ""
 
-#: contrib/config-daemon.scm:245
+#: contrib/config-daemon.scm:475
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:268
+#: contrib/config-daemon.scm:501
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:270
+#: contrib/config-daemon.scm:503
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -221,11 +362,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:283
+#: contrib/config-daemon.scm:516
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:285
+#: contrib/config-daemon.scm:518
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -238,30 +379,42 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:300
+#: contrib/config-daemon.scm:533
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:301
+#: contrib/config-daemon.scm:534
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:318
+#: contrib/config-daemon.scm:551
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:319
+#: contrib/config-daemon.scm:552
 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:334
+#: contrib/config-daemon.scm:566
+msgid "Name of the MySQL database GNUnet should use"
+msgstr ""
+
+#: contrib/config-daemon.scm:578
+msgid "Configuration file that specifies the MySQL username and password"
+msgstr ""
+
+#: contrib/config-daemon.scm:590
+msgid "Configuration of the MySQL database"
+msgstr ""
+
+#: contrib/config-daemon.scm:609
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:611
 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 "
@@ -272,15 +425,15 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:350
+#: contrib/config-daemon.scm:625
 msgid "Size of the routing table."
 msgstr ""
 
-#: contrib/config-daemon.scm:363
+#: contrib/config-daemon.scm:638
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:365
+#: contrib/config-daemon.scm:640
 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"
@@ -292,19 +445,19 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:379
+#: contrib/config-daemon.scm:654
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:395
+#: contrib/config-daemon.scm:671
 msgid "Applications"
 msgstr ""
 
-#: contrib/config-daemon.scm:411
+#: contrib/config-daemon.scm:687
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:412
+#: contrib/config-daemon.scm:688
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port. Note that if you have configured your NAT box to "
@@ -313,70 +466,256 @@
 "you directly."
 msgstr ""
 
-#: contrib/config-daemon.scm:423
+#: contrib/config-daemon.scm:699
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:435
+#: contrib/config-daemon.scm:711
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:450
+#: contrib/config-daemon.scm:726
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:462
+#: contrib/config-daemon.scm:738
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:477
+#: contrib/config-daemon.scm:753
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:489
+#: contrib/config-daemon.scm:765
+msgid "What is the maximum transfer unit for UDP?"
+msgstr ""
+
+#: contrib/config-daemon.scm:777 contrib/config-daemon.scm:818
+#: contrib/config-daemon.scm:870
+msgid "Which IPs are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:789
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:504
+#: contrib/config-daemon.scm:806
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:516
+#: contrib/config-daemon.scm:830
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:531
+#: contrib/config-daemon.scm:846
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:543
+#: contrib/config-daemon.scm:858
+msgid "What is the maximum transfer unit for UDP 6?"
+msgstr ""
+
+#: contrib/config-daemon.scm:882
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:558
+#: contrib/config-daemon.scm:899
+msgid "Network interface"
+msgstr ""
+
+#: contrib/config-daemon.scm:911
+msgid "External IP address (leave empty to try auto-detection)"
+msgstr ""
+
+#: contrib/config-daemon.scm:923
+msgid "External IPv6 address (leave empty to try auto-detection)"
+msgstr ""
+
+#: contrib/config-daemon.scm:935
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:580 contrib/config-client.scm:121
+#: contrib/config-daemon.scm:958
+msgid "What is the maximum number of bytes per second that we may receive?"
+msgstr ""
+
+#: contrib/config-daemon.scm:970
+msgid "What is the maximum number of bytes per second that we may send?"
+msgstr ""
+
+#: contrib/config-daemon.scm:982
+msgid "What is the maximum CPU load (percentage)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:984
+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:995
+msgid "What is the maximum CPU load (hard limit)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:996
+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:1007
+msgid "What is the maximum upstream bandwidth (hard limit)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1008
+msgid "Use 0 for no limit."
+msgstr ""
+
+#: contrib/config-daemon.scm:1019
+msgid "Should we disable random padding (experimental option)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1031
+msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
+msgstr ""
+
+#: contrib/config-daemon.scm:1033
+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"
+"\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"
+"\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)."
+msgstr ""
+
+#: contrib/config-daemon.scm:1050
+msgid "Network interface to monitor"
+msgstr ""
+
+#: contrib/config-daemon.scm:1052
+msgid ""
+"\tFor which interfaces should we do accounting?  GNUnet will evaluate\n"
+"\t\tthe total traffic (not only the GNUnet related traffic) and adjust\n"
+"\t\tits bandwidth usage accordingly. You can currently only specify a\n"
+"\t\tsingle interface. GNUnet will also use this interface to determine\n"
+"\t\tthe IP to use. Typical values are eth0, ppp0, eth1, wlan0, etc.\n"
+"\t\t'ifconfig' will tell you what you have.  Never use 'lo', that just\n"
+"\t\twon't work.\n"
+"\t\tUnder Windows, specify the index number reported by\n"
+"\t\t \"gnunet-win-tool -n\"."
+msgstr ""
+
+#: contrib/config-daemon.scm:1071
+msgid "Load management"
+msgstr ""
+
+#: contrib/config-daemon.scm:1095 contrib/config-client.scm:286
 msgid "Root node"
 msgstr ""
 
-#: src/transports/ip6.c:65 src/util/network/io.c:74
+#: contrib/config-client.scm:201
+msgid "On which machine runs gnunetd (for clients)"
+msgstr ""
+
+#: contrib/config-client.scm:202
+msgid "This is equivalent to the -H option."
+msgstr ""
+
+#: contrib/config-client.scm:214
+msgid "General options"
+msgstr ""
+
+#: contrib/config-client.scm:231
+msgid "Do not add metadata listing the creation time for inserted content"
+msgstr ""
+
+#: contrib/config-client.scm:243
+msgid "Which non-default extractors should GNUnet use for keyword extractors"
+msgstr ""
+
+#: 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"
+"\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."
+msgstr ""
+
+#: contrib/config-client.scm:257
+msgid "File-Sharing options"
+msgstr ""
+
+#: contrib/config-client.scm:274
+msgid "Full pathname of GNUnet client HOME directory"
+msgstr ""
+
+#: contrib/config-client.scm:275
+msgid "The directory for GNUnet files that belong to the user."
+msgstr ""
+
+#: src/transports/ip6.c:65 src/util/network/io.c:78
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:109
+#: src/transports/ip6.c:110
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:154 src/transports/ip.c:353
+#: src/transports/ip6.c:155 src/transports/ip.c:354
 #, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr ""
 
-#: src/transports/udp6.c:126 src/transports/udp.c:128
+#: src/transports/udp6.c:126 src/transports/udp.c:132
 #, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr ""
@@ -385,7 +724,7 @@
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/udp6.c:443 src/transports/udp.c:443
+#: src/transports/udp6.c:441 src/transports/udp.c:447
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
@@ -431,58 +770,42 @@
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: src/transports/smtp.c:298
+#: src/transports/smtp.c:257
 #, c-format
-msgid "Could not resolve name of SMTP server `%s': %s"
-msgstr ""
-
-#: src/transports/smtp.c:420 src/transports/smtp.c:882
-#, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
 "under `%s'.\n"
 msgstr ""
 
-#: src/transports/smtp.c:493
+#: src/transports/smtp.c:334
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/transports/smtp.c:588
+#: src/transports/smtp.c:433
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 
-#: src/transports/smtp.c:595
+#: src/transports/smtp.c:440
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transports/smtp.c:769
+#: src/transports/smtp.c:546
 #, c-format
-msgid "Sending E-mail to `%s' failed.\n"
+msgid "Failed to initialize libesmtp: %s.\n"
 msgstr ""
 
-#: src/transports/smtp.c:820
+#: src/transports/smtp.c:610
 #, c-format
-msgid "SMTP server send unexpected response at %s:%d.\n"
+msgid "Sending E-mail to `%s' failed.\n"
 msgstr ""
 
-#: src/transports/smtp.c:843
+#: src/transports/smtp.c:678
 #, c-format
-msgid ""
-"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
-msgstr ""
-
-#: src/transports/smtp.c:849
-#, c-format
-msgid "Failed to send `%s' request to SMTP server.\n"
-msgstr ""
-
-#: src/transports/smtp.c:909
-#, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
 
-#: src/transports/smtp.c:938
+#: src/transports/smtp.c:706
 #, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
@@ -496,36 +819,36 @@
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:421
+#: src/transports/tcp.c:423
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:423
+#: src/transports/tcp.c:425
 msgid "# bytes sent via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:425
+#: src/transports/tcp.c:427
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:217
+#: src/transports/udp.c:222
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/udp.c:312
+#: src/transports/udp.c:314
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/transports/udp.c:449
+#: src/transports/udp.c:453
 msgid "# bytes received via UDP"
 msgstr ""
 
-#: src/transports/udp.c:451
+#: src/transports/udp.c:455
 msgid "# bytes sent via UDP"
 msgstr ""
 
-#: src/transports/udp.c:453
+#: src/transports/udp.c:457
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
@@ -576,306 +899,275 @@
 msgid "`%s': unknown service: %s\n"
 msgstr ""
 
-#: src/transports/tcp6.c:430
+#: src/transports/tcp6.c:432
 msgid "# bytes received via TCP6"
 msgstr ""
 
-#: src/transports/tcp6.c:432
+#: src/transports/tcp6.c:434
 msgid "# bytes sent via TCP6"
 msgstr ""
 
-#: src/transports/tcp6.c:434
+#: src/transports/tcp6.c:436
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr ""
 
-#: src/transports/tcp_helper.c:182
+#: src/transports/tcp_helper.c:191
 msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr ""
 
-#: src/transports/tcp_helper.c:193
+#: src/transports/tcp_helper.c:202
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr ""
 
-#: src/transports/udp_helper.c:93
+#: src/transports/udp_helper.c:91
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dhttest2.c:50
+#: src/applications/dht/tools/dhttest2.c:45
 #: src/applications/session/sessiontest.c:42
 #: src/applications/stats/statistics.c:212
 #: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:101
-#: src/applications/gap/gaptest.c:52
+#: src/applications/tbench/tbenchtest_udp.c:100
+#: src/applications/gap/gaptest.c:49
 msgid "# of connected peers"
 msgstr ""
 
-#: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/gap/gaptest.c:318
+#: src/applications/dht/tools/dhttest2.c:160
 #, c-format
 msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 msgstr ""
 
-#: src/applications/dht/tools/dhttest2.c:140
+#: src/applications/dht/tools/dhttest2.c:173
 #: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:117
-#: src/applications/gap/gaptest.c:330
+#: src/applications/tbench/tbenchtest_udp.c:116
 #, c-format
 msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:39
-msgid "query table called NAME"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:41
-msgid "allow TIME ms to process each command"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:46
+#: src/applications/dht/tools/dht-query.c:53
 msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:84
-#: src/applications/dht/tools/dht-join.c:85 src/util/getopt/setoption.c:133
-#: src/util/getopt/setoption.c:149
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
+#: src/applications/dht/tools/dht-query.c:57
+#: src/applications/dht/tools/dht-join.c:59
+msgid "join table called NAME"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:99
-#: src/applications/dht/tools/dht-join.c:108
-#: src/applications/chat/gnunet-chat.c:93
-#: src/applications/testbed/gnunet-testbed.c:125
-#: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/vpn/gnunet-vpn.c:118 src/util/getopt/getopt.c:1066
-#: src/setup/gnunet-setup.c:246
-#, c-format
-msgid "Use --help to get a list of options.\n"
+#: src/applications/dht/tools/dht-query.c:60
+msgid "allow TIME ms to process each command"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:106
-msgid "No commands specified.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:173
-#: src/applications/dht/tools/dht-query.c:204
+#: src/applications/dht/tools/dht-query.c:130
+#: src/applications/dht/tools/dht-query.c:163
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:177
-#: src/applications/dht/tools/dht-query.c:208
+#: src/applications/dht/tools/dht-query.c:134
+#: src/applications/dht/tools/dht-query.c:167
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:231
-#: src/applications/dht/tools/dht-join.c:211
+#: src/applications/dht/tools/dht-query.c:194
+#: src/applications/dht/tools/dht-join.c:165
 #, c-format
 msgid "No table name specified, using `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:246
+#: src/applications/dht/tools/dht-query.c:210
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:253
+#: src/applications/dht/tools/dht-query.c:220
 #, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:261
-#: src/applications/dht/tools/dht-query.c:271
+#: src/applications/dht/tools/dht-query.c:232
+#: src/applications/dht/tools/dht-query.c:246
 #, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:279
+#: src/applications/dht/tools/dht-query.c:258
 #, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:127
-#: src/applications/dht/tools/dht_api.c:236
-#: src/applications/dht/tools/dht_api.c:289
-#: src/applications/dht/tools/dht_api.c:343
-#: src/applications/dht/tools/dht_api.c:377
+#: src/applications/dht/tools/dht_api.c:148
+#: src/applications/dht/tools/dht_api.c:264
+#: src/applications/dht/tools/dht_api.c:321
+#: src/applications/dht/tools/dht_api.c:379
+#: src/applications/dht/tools/dht_api.c:415
 #, c-format
 msgid "Failed to send `%s'.  Closing connection.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:201
-#: src/applications/dht/tools/dht_api.c:253
-#: src/applications/dht/tools/dht_api.c:307
-#: src/applications/dht/tools/dht_api.c:360
+#: src/applications/dht/tools/dht_api.c:226
+#: src/applications/dht/tools/dht_api.c:282
+#: src/applications/dht/tools/dht_api.c:340
+#: src/applications/dht/tools/dht_api.c:397
 #, c-format
 msgid "Received invalid `%s' request (size %d)\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:214
-#: src/applications/dht/tools/dht_api.c:266
-#: src/applications/dht/tools/dht_api.c:320
+#: src/applications/dht/tools/dht_api.c:241
+#: src/applications/dht/tools/dht_api.c:297
+#: src/applications/dht/tools/dht_api.c:355
 #, c-format
 msgid "Received invalid `%s' request (wrong table)\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:390
+#: src/applications/dht/tools/dht_api.c:429
 #, c-format
 msgid "Received unknown request type %d at %s:%d\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:430
+#: src/applications/dht/tools/dht_api.c:473
 msgid "This client already participates in the given DHT!\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:498
+#: src/applications/dht/tools/dht_api.c:548
 msgid "Cannot leave DHT: table not known!\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:520
+#: src/applications/dht/tools/dht_api.c:571
 #, c-format
 msgid "gnunetd signaled error in response to `%s' message\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:525
+#: src/applications/dht/tools/dht_api.c:576
 #, c-format
 msgid "Failed to receive response to `%s' message from gnunetd\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:530
+#: src/applications/dht/tools/dht_api.c:581
 #, c-format
 msgid "Failed to send `%s' message to gnunetd\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:622
+#: src/applications/dht/tools/dht_api.c:677
 #, c-format
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:43
-msgid "allow SIZE bytes of memory for the local table"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:45
-msgid "join table called NAME"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:51
+#: src/applications/dht/tools/dht-join.c:52
 msgid "Join a DHT."
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:115
-msgid "Superflous arguments (ignored).\n"
+#: src/applications/dht/tools/dht-join.c:56
+msgid "allow SIZE bytes of memory for the local table"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:131
+#: src/applications/dht/tools/dht-join.c:78
 #, c-format
 msgid "Call to `%s' returns %d.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:132
+#: src/applications/dht/tools/dht-join.c:79
 #, c-format
 msgid "Call to `%s' with key `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:133
+#: src/applications/dht/tools/dht-join.c:80
 #, c-format
 msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:236
+#: src/applications/dht/tools/dht-join.c:189
 msgid "Error joining DHT.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:243
+#: src/applications/dht/tools/dht-join.c:196
 #, c-format
 msgid "Joined DHT.  Press CTRL-C to leave.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:250
+#: src/applications/dht/tools/dht-join.c:205
 msgid "Error leaving DHT.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:946
+#: src/applications/dht/module/dht.c:952
 #, c-format
 msgid "Malformed optional field `%s' received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:973
+#: src/applications/dht/module/dht.c:979
 #, c-format
 msgid "Could not find peer `%s' in routing table!\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:1120
-#: src/applications/dht/module/dht.c:1135
+#: src/applications/dht/module/dht.c:1126
+#: src/applications/dht/module/dht.c:1141
 #, c-format
 msgid "Received malformed response to `%s' from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:1447
+#: src/applications/dht/module/dht.c:1453
 #, c-format
 msgid "Invalid response to `%s' from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:1603
-#: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1290
+#: src/applications/dht/module/dht.c:1611
+#: src/applications/dht/module/dht.c:2351
+#: src/applications/dht/module/dht.c:2628 src/applications/rpc/rpc.c:1291
 #, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:1793
+#: src/applications/dht/module/dht.c:1803
 #, c-format
 msgid "Invalid response to `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:1993
+#: src/applications/dht/module/dht.c:2003
 #, c-format
 msgid "Malformed response to `%s' on master table.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:2207
-#: src/applications/dht/module/dht.c:2507
+#: src/applications/dht/module/dht.c:2217
+#: src/applications/dht/module/dht.c:2522
 #, c-format
 msgid "Invalid response to `%s' from `%s'\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:2881
-#: src/applications/dht/module/dht.c:3021
-#: src/applications/dht/module/dht.c:3148
-#: src/applications/dht/module/dht.c:3282
+#: src/applications/dht/module/dht.c:2899
+#: src/applications/dht/module/dht.c:3041
+#: src/applications/dht/module/dht.c:3182
+#: src/applications/dht/module/dht.c:3330
 #, c-format
 msgid "Received invalid RPC `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:3160
-#: src/applications/dht/module/dht.c:3296
+#: src/applications/dht/module/dht.c:3201
+#: src/applications/dht/module/dht.c:3351
 #, c-format
 msgid "RPC for `%s' received for table that we do not participate in!\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:446
+#: src/applications/dht/module/cs.c:449
 #, c-format
 msgid "`%s' failed: table not found!\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:466
+#: src/applications/dht/module/cs.c:469
 #, c-format
 msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:542
+#: src/applications/dht/module/cs.c:546
 msgid "sendAck failed.  Terminating connection to client.\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
-#: src/applications/dht/module/cs.c:688
+#: src/applications/dht/module/cs.c:666 src/applications/dht/module/cs.c:684
+#: src/applications/dht/module/cs.c:693
 #, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
+#: src/applications/dht/module/cs.c:814 src/applications/dht/module/cs.c:867
 #, c-format
 msgid "Failed to deliver `%s' message.\n"
 msgstr ""
@@ -914,6 +1206,14 @@
 msgid "Start GNUnet chat client."
 msgstr ""
 
+#: src/applications/chat/gnunet-chat.c:93
+#: src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:546 src/util/getopt/getopt.c:1067
+#: src/setup/gnunet-setup.c:283
+#, c-format
+msgid "Use --help to get a list of options.\n"
+msgstr ""
+
 #: src/applications/chat/gnunet-chat.c:151
 msgid "Could not connect to gnunetd.\n"
 msgstr ""
@@ -931,69 +1231,74 @@
 msgid "Could not send message to gnunetd\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:162
+#: src/applications/advertising/advertising.c:168
 #, c-format
 msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:168
+#: src/applications/advertising/advertising.c:175
 msgid ""
 "hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:177
+#: src/applications/advertising/advertising.c:182
 #, c-format
+msgid "hello transport verification failed (%u).\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:192
+#, c-format
 msgid "hello advertisement for protocol %d received.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:297
+#: src/applications/advertising/advertising.c:325
 msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:310
+#: src/applications/advertising/advertising.c:338
 #, c-format
 msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:467
+#: src/applications/advertising/advertising.c:495
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:474
+#: src/applications/advertising/advertising.c:502
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:580
+#: src/applications/advertising/advertising.c:608
 #, c-format
 msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:760
+#: src/applications/advertising/advertising.c:788
 msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:761
+#: src/applications/advertising/advertising.c:789
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:762
+#: src/applications/advertising/advertising.c:790
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:764
+#: src/applications/advertising/advertising.c:792
 #: src/applications/pingpong/pingpong.c:488
 msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:768
-#: src/applications/session/connect.c:779
+#: src/applications/advertising/advertising.c:796
+#: src/applications/session/connect.c:800
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:785
+#: src/applications/advertising/advertising.c:813
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
@@ -1054,23 +1359,29 @@
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:45
-#: src/applications/sqstore_sqlite/sqlite.c:52
-#: src/applications/sqstore_mysql/mysql.c:137
-#: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:389
-#: src/applications/sqstore_mysql/mysql.c:728
-#: src/applications/sqstore_mysql/mysql.c:743
-#: src/applications/sqstore_mysql/mysql.c:752
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:786
-#: src/applications/sqstore_mysql/mysql.c:840
-#: src/applications/sqstore_mysql/mysql.c:925
-#: src/applications/sqstore_mysql/mysql.c:935
-#: src/applications/sqstore_mysql/mysql.c:1007
-#: src/applications/sqstore_mysql/mysql.c:1016
-#: src/applications/sqstore_mysql/mysql.c:1056
-#: src/applications/sqstore_mysql/mysql.c:1070
+#: src/applications/sqstore_sqlite/sqlite.c:46
+#: src/applications/sqstore_sqlite/sqlite.c:53
+#: src/applications/sqstore_mysql/mysql.c:138
+#: src/applications/sqstore_mysql/mysql.c:145
+#: src/applications/sqstore_mysql/mysql.c:423
+#: src/applications/sqstore_mysql/mysql.c:765
+#: src/applications/sqstore_mysql/mysql.c:781
+#: src/applications/sqstore_mysql/mysql.c:791
+#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:827
+#: src/applications/sqstore_mysql/mysql.c:884
+#: src/applications/sqstore_mysql/mysql.c:971
+#: src/applications/sqstore_mysql/mysql.c:982
+#: src/applications/sqstore_mysql/mysql.c:1046
+#: src/applications/sqstore_mysql/mysql.c:1062
+#: src/applications/sqstore_mysql/mysql.c:1072
+#: src/applications/sqstore_mysql/mysql.c:1096
+#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/sqstore_mysql/mysql.c:1119
+#: src/applications/sqstore_mysql/mysql.c:1182
+#: src/applications/sqstore_mysql/mysql.c:1194
+#: src/applications/sqstore_mysql/mysql.c:1242
+#: src/applications/sqstore_mysql/mysql.c:1257
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
@@ -1079,76 +1390,77 @@
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:158
+#: src/applications/sqstore_sqlite/sqlite.c:195
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:307
-#: src/applications/sqstore_sqlite/sqlite.c:327
-#: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:803
+#: src/applications/sqstore_sqlite/sqlite.c:356
+#: src/applications/sqstore_sqlite/sqlite.c:377
+#: src/applications/sqstore_mysql/mysql.c:260
+#: src/applications/sqstore_mysql/mysql.c:845
+#: src/applications/sqstore_mysql/mysql.c:1134
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:308
-#: src/applications/sqstore_sqlite/sqlite.c:328
+#: src/applications/sqstore_sqlite/sqlite.c:357
+#: src/applications/sqstore_sqlite/sqlite.c:378
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1177
-#: src/applications/sqstore_mysql/mysql.c:1182
+#: src/applications/sqstore_sqlite/sqlite.c:1213
+#: src/applications/sqstore_mysql/mysql.c:1318
 msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/session/connect.c:221
+#: src/applications/session/connect.c:225
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:258
+#: src/applications/session/connect.c:263
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:517
+#: src/applications/session/connect.c:533
 #, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:540
+#: src/applications/session/connect.c:558
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:550
+#: src/applications/session/connect.c:568
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:608
+#: src/applications/session/connect.c:626
 msgid ""
 "Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:619
+#: src/applications/session/connect.c:637
 #, c-format
 msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:768
+#: src/applications/session/connect.c:789
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:770
+#: src/applications/session/connect.c:791
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:772
+#: src/applications/session/connect.c:793
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:774
+#: src/applications/session/connect.c:795
 msgid "# sessions established"
 msgstr ""
 
@@ -1176,56 +1488,52 @@
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:878 src/applications/rpc/rpc.c:1011
-#: src/applications/rpc/rpc.c:1100
+#: src/applications/rpc/rpc.c:879 src/applications/rpc/rpc.c:1012
+#: src/applications/rpc/rpc.c:1101
 #, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:945
+#: src/applications/rpc/rpc.c:946
 #, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/rpc/rpc.c:1415
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1441
+#: src/applications/rpc/rpc.c:1442
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1462
+#: src/applications/rpc/rpc.c:1463
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1519
+#: src/applications/rpc/rpc.c:1520
 msgid "RPC async reply invalid.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1591
+#: src/applications/rpc/rpc.c:1592
 msgid "async RPC reply not received.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:804
+#: src/applications/sqstore_mysql/mysql.c:261
+#: src/applications/sqstore_mysql/mysql.c:846
+#: src/applications/sqstore_mysql/mysql.c:1135
 msgid "mysql datastore"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1110
+#: src/applications/sqstore_mysql/mysql.c:1348
 #, c-format
-msgid "Query `%s' had no results.\n"
-msgstr ""
-
-#: src/applications/sqstore_mysql/mysql.c:1212
-#, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1230
+#: src/applications/sqstore_mysql/mysql.c:1371
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -1236,32 +1544,32 @@
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:143
+#: src/applications/datastore/datastore.c:145
 #, c-format
 msgid "Database failed to delete `%s'.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:358
-#: src/applications/datastore/datastore.c:454
+#: src/applications/datastore/datastore.c:368
+#: src/applications/datastore/datastore.c:465
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:109
+#: src/applications/identity/hostkey.c:121
 #, c-format
 msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:139
+#: src/applications/identity/hostkey.c:155
 #, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:147
+#: src/applications/identity/hostkey.c:163
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:160
+#: src/applications/identity/hostkey.c:176
 msgid "Done creating hostkey.\n"
 msgstr ""
 
@@ -1282,18 +1590,18 @@
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:684
-#: src/applications/identity/identity.c:705
+#: 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:758
+#: src/applications/identity/identity.c:759
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:767
+#: src/applications/identity/identity.c:768
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
@@ -1488,74 +1796,75 @@
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/transport/transport.c:136
+#: src/applications/transport/transport.c:140
 #, c-format
 msgid ""
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:183
+#: src/applications/transport/transport.c:187
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:278
+#: src/applications/transport/transport.c:282
 #, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:366
+#: src/applications/transport/transport.c:370
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:423
+#: src/applications/transport/transport.c:427
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:596
+#: src/applications/transport/transport.c:601
 #, c-format
 msgid "Loading transports `%s'\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:616
+#: src/applications/transport/transport.c:621
 #, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:626
+#: src/applications/transport/transport.c:631
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:643
+#: src/applications/transport/transport.c:658
 #, c-format
 msgid "Loaded transport `%s'\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:654
+#: src/applications/transport/transport.c:671
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:559
+#: src/applications/fragmentation/fragmentation.c:566
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:560
+#: src/applications/fragmentation/fragmentation.c:567
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:561
+#: src/applications/fragmentation/fragmentation.c:568
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:573
+#: src/applications/fragmentation/fragmentation.c:580
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr ""
 
 #: src/applications/stats/gnunet-stats.c:90
+#: src/applications/vpn/gnunet-vpn.c:52
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -1563,15 +1872,16 @@
 msgid "prints supported protocol messages"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:137
-#: src/applications/tbench/gnunet-tbench.c:136
-#: src/applications/tracekit/gnunet-tracekit.c:319
-#: src/applications/template/gnunet-template.c:101
+#: src/applications/stats/gnunet-stats.c:130
+#: src/applications/tbench/gnunet-tbench.c:128
+#: src/applications/tracekit/gnunet-tracekit.c:312
+#: src/applications/template/gnunet-template.c:94
+#: src/applications/vpn/gnunet-vpn.c:145
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:156
+#: src/applications/stats/gnunet-stats.c:149
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr ""
@@ -1608,109 +1918,109 @@
 msgid "keeps statistics about gnunetd's operation"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:65
-#: src/applications/tracekit/gnunet-tracekit.c:54
+#: src/applications/tbench/gnunet-tbench.c:64
+#: src/applications/tracekit/gnunet-tracekit.c:53
 msgid "Start GNUnet transport benchmarking tool."
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:67
+#: src/applications/tbench/gnunet-tbench.c:66
 msgid "output in gnuplot format"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:71
+#: src/applications/tbench/gnunet-tbench.c:70
 msgid "number of iterations"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:75
+#: src/applications/tbench/gnunet-tbench.c:74
 msgid "number of messages to use per iteration"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:78
+#: src/applications/tbench/gnunet-tbench.c:77
 msgid "receiver host identifier (ENC file name)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:81
+#: src/applications/tbench/gnunet-tbench.c:80
 msgid "message size"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:84
+#: src/applications/tbench/gnunet-tbench.c:83
 msgid "sleep for SPACE ms after each a message block"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:87
+#: src/applications/tbench/gnunet-tbench.c:86
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:91
+#: src/applications/tbench/gnunet-tbench.c:90
 msgid "number of messages in a message block"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:153
+#: src/applications/tbench/gnunet-tbench.c:144
 #, c-format
 msgid "You must specify a receiver!\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:162
+#: src/applications/tbench/gnunet-tbench.c:152
 #, c-format
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tbench/gnunet-tbench.c:182
 #, c-format
 msgid "Time:\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:190
+#: src/applications/tbench/gnunet-tbench.c:183
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:192
+#: src/applications/tbench/gnunet-tbench.c:185
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:194
+#: src/applications/tbench/gnunet-tbench.c:187
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:196
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:199
+#: src/applications/tbench/gnunet-tbench.c:192
 #, c-format
 msgid "Loss:\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:200
+#: src/applications/tbench/gnunet-tbench.c:193
 #, c-format
 msgid "\tmax      %u\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:202
+#: src/applications/tbench/gnunet-tbench.c:195
 #, c-format
 msgid "\tmin      %u\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:204
+#: src/applications/tbench/gnunet-tbench.c:197
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:206
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:215
+#: src/applications/tbench/gnunet-tbench.c:208
 #, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:219
+#: src/applications/tbench/gnunet-tbench.c:212
 #, c-format
 msgid ""
 "\n"
@@ -1718,25 +2028,25 @@
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:51
-#: src/applications/tbench/tbenchtest_udp.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:78
-#: src/applications/tbench/tbenchtest_udp.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:83
-#: src/applications/tbench/tbenchtest_udp.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:89
-#: src/applications/tbench/tbenchtest_udp.c:89
+#: src/applications/tbench/tbenchtest_udp.c:88
 #, c-format
 msgid ""
 "\n"
@@ -1744,60 +2054,60 @@
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:211
-#: src/applications/tbench/tbenchtest_udp.c:211
+#: src/applications/tbench/tbenchtest_udp.c:210
 #, c-format
 msgid "Running benchmark...\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:460
+#: src/applications/tbench/tbench.c:420
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:49
+#: src/applications/tracekit/gnunet-tracekit.c:48
 msgid "probe network to the given DEPTH"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:52
+#: src/applications/tracekit/gnunet-tracekit.c:51
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:58
+#: src/applications/tracekit/gnunet-tracekit.c:57
 msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:62
+#: src/applications/tracekit/gnunet-tracekit.c:61
 msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:116
+#: 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 ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:163
+#: src/applications/tracekit/gnunet-tracekit.c:162
 #, c-format
 msgid "`%s' is not connected to any peer.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:197
+#: src/applications/tracekit/gnunet-tracekit.c:196
 #, c-format
 msgid "`%s' connected to `%s'.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:212
+#: src/applications/tracekit/gnunet-tracekit.c:211
 #, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:235
+#: src/applications/tracekit/gnunet-tracekit.c:234
 #, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:350
+#: src/applications/tracekit/gnunet-tracekit.c:342
 msgid "Could not send request to gnunetd.\n"
 msgstr ""
 
@@ -1947,120 +2257,120 @@
 msgid "allows clients to determine gnunetd's configuration"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:71
-#: src/applications/fs/tools/gnunet-insert.c:224
-#: src/applications/fs/tools/gnunet-search.c:129
-#: src/applications/fs/tools/gnunet-download.c:57
+#: src/applications/fs/tools/gnunet-pseudonym.c:70
+#: src/applications/fs/tools/gnunet-insert.c:229
+#: src/applications/fs/tools/gnunet-search.c:140
+#: src/applications/fs/tools/gnunet-download.c:65
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:74
+#: src/applications/fs/tools/gnunet-pseudonym.c:73
 msgid "automate creation of a namespace by starting a collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:78
+#: src/applications/fs/tools/gnunet-pseudonym.c:77
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:81
+#: src/applications/fs/tools/gnunet-pseudonym.c:80
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:84
+#: src/applications/fs/tools/gnunet-pseudonym.c:83
 msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:86
-#: src/applications/fs/tools/gnunet-search.c:132
+#: src/applications/fs/tools/gnunet-pseudonym.c:85
+#: src/applications/fs/tools/gnunet-search.c:143
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:89
+#: src/applications/fs/tools/gnunet-pseudonym.c:88
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:92
+#: src/applications/fs/tools/gnunet-pseudonym.c:91
 msgid "specify metadata describing the namespace or collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:95
+#: src/applications/fs/tools/gnunet-pseudonym.c:94
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:98
+#: src/applications/fs/tools/gnunet-pseudonym.c:97
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:101
+#: src/applications/fs/tools/gnunet-pseudonym.c:100
 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
+#: src/applications/fs/tools/gnunet-pseudonym.c:103
 msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:138
+#: src/applications/fs/tools/gnunet-pseudonym.c:137
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:142
+#: src/applications/fs/tools/gnunet-pseudonym.c:141
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:178
+#: src/applications/fs/tools/gnunet-pseudonym.c:177
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:221
+#: src/applications/fs/tools/gnunet-pseudonym.c:211
 #, c-format
 msgid "Collection stopped.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:223
+#: src/applications/fs/tools/gnunet-pseudonym.c:213
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:231
+#: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:235
+#: src/applications/fs/tools/gnunet-pseudonym.c:225
 #, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:254
+#: src/applications/fs/tools/gnunet-pseudonym.c:244
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:257
+#: src/applications/fs/tools/gnunet-pseudonym.c:247
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:299
+#: src/applications/fs/tools/gnunet-pseudonym.c:289
 #, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:304
+#: src/applications/fs/tools/gnunet-pseudonym.c:294
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:326
+#: src/applications/fs/tools/gnunet-pseudonym.c:314
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr ""
@@ -2101,147 +2411,155 @@
 msgid "start tracking entries for the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:181
+#: src/applications/fs/tools/gnunet-directory.c:174
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:139
+#: src/applications/fs/tools/gnunet-insert.c:137
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:144
+#: src/applications/fs/tools/gnunet-insert.c:142
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:166
+#: src/applications/fs/tools/gnunet-insert.c:168
 #, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:178
+#: src/applications/fs/tools/gnunet-insert.c:180
 #, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:189
+#: src/applications/fs/tools/gnunet-insert.c:191
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:200
+#: src/applications/fs/tools/gnunet-insert.c:202
 #, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:206
+#: src/applications/fs/tools/gnunet-insert.c:207
 #, c-format
 msgid ""
 "\n"
 "Error uploading file: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:216
+#, c-format
 msgid ""
+"\n"
+"Unexpected event: %d\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:233
+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 ""
 
-#: src/applications/fs/tools/gnunet-insert.c:232
+#: src/applications/fs/tools/gnunet-insert.c:237
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:235
+#: src/applications/fs/tools/gnunet-insert.c:240
 msgid ""
-"use libextractor to add additional direct references to directory entries"
+"do not use libextractor to add additional references to directory entries "
+"and/or the published file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:238
+#: src/applications/fs/tools/gnunet-insert.c:243
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:245
 msgid "Make files available to GNUnet for sharing."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:243
+#: src/applications/fs/tools/gnunet-insert.c:248
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:247
+#: src/applications/fs/tools/gnunet-insert.c:252
 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:251
+#: src/applications/fs/tools/gnunet-insert.c:256
 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:256
+#: src/applications/fs/tools/gnunet-insert.c:261
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:259
+#: src/applications/fs/tools/gnunet-insert.c:264
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:263
+#: src/applications/fs/tools/gnunet-insert.c:268
 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:267
+#: src/applications/fs/tools/gnunet-insert.c:272
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:270
+#: src/applications/fs/tools/gnunet-insert.c:275
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:273
+#: src/applications/fs/tools/gnunet-insert.c:278
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:277
+#: src/applications/fs/tools/gnunet-insert.c:282
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:281
+#: src/applications/fs/tools/gnunet-insert.c:286
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:289
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:326
+#: src/applications/fs/tools/gnunet-insert.c:324
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:351
+#: src/applications/fs/tools/gnunet-insert.c:348
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:378
+#: src/applications/fs/tools/gnunet-insert.c:374
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
@@ -2251,54 +2569,53 @@
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:407
-#: src/applications/fs/tools/gnunet-insert.c:412
-#: src/applications/fs/tools/gnunet-insert.c:417
-#: src/applications/fs/tools/gnunet-insert.c:422
+#: src/applications/fs/tools/gnunet-insert.c:403
+#: src/applications/fs/tools/gnunet-insert.c:409
+#: src/applications/fs/tools/gnunet-insert.c:415
+#: src/applications/fs/tools/gnunet-insert.c:421
 #: src/applications/fs/tools/gnunet-insert.c:427
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:136
+#: src/applications/fs/tools/gnunet-search.c:147
 msgid "exit after receiving LIMIT results"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:139
-#: src/applications/fs/tools/gnunet-download.c:64
+#: src/applications/fs/tools/gnunet-search.c:150
+#: src/applications/fs/tools/gnunet-download.c:72
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:142
+#: src/applications/fs/tools/gnunet-search.c:153
 msgid "wait DELAY seconds for search results before aborting"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:189
+#: src/applications/fs/tools/gnunet-search.c:191
 #, c-format
-msgid "Starting search failed. Consult logs.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:277
-#, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:60
+#: src/applications/fs/tools/gnunet-download.c:68
 msgid "Download files from GNUnet."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:67
+#: src/applications/fs/tools/gnunet-download.c:75
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:86
+#: src/applications/fs/tools/gnunet-download.c:93
 #, c-format
 msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:99
-#: src/applications/fs/tools/gnunet-download.c:110
+#: src/applications/fs/tools/gnunet-download.c:106
 #, c-format
+msgid "Download aborted.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-download.c:112
+#, c-format
 msgid "Error downloading: %s\n"
 msgstr ""
 
@@ -2311,31 +2628,31 @@
 msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:195
+#: src/applications/fs/tools/gnunet-download.c:194
 #, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:244
+#: src/applications/fs/tools/gnunet-download.c:262
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/fs/tools/gnunet-unindex.c:57
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
 "completion)                "
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:68
 #, c-format
 msgid ""
 "\n"
 "Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:83
+#: src/applications/fs/tools/gnunet-unindex.c:80
 #, c-format
 msgid ""
 "\n"
@@ -2346,21 +2663,21 @@
 msgid "Unindex files."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:145
+#: src/applications/fs/tools/gnunet-unindex.c:137
 msgid "Not enough arguments. You must specify a filename.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:173
+#: src/applications/fs/tools/gnunet-unindex.c:164
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:317
+#: src/applications/fs/module/ondemand.c:320
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:411
+#: src/applications/fs/module/ondemand.c:418
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2368,32 +2685,32 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:438
+#: src/applications/fs/module/ondemand.c:445
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
 "%s' under `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:655
+#: src/applications/fs/module/ondemand.c:664
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1196
+#: src/applications/fs/module/fs.c:1229
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
 "s'.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1247
+#: src/applications/fs/module/fs.c:1281
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1287
+#: src/applications/fs/module/fs.c:1321
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -2405,50 +2722,32 @@
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/downloadtest.c:239
+#: src/applications/fs/fsui/searchtest.c:156
+#: src/applications/fs/fsui/fsuitest.c:199
+#: src/applications/fs/fsui/downloadtest.c:308
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
 msgid "AND"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:195
-msgid "FSUI persistence: error restoring download\n"
+#: src/applications/fs/fsui/search.c:265
+msgid "Error running search (consult logs)."
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:666
-#, c-format
-msgid "FSUI state file `%s' had syntax error at offset %u.\n"
+#: src/applications/fs/fsui/download.c:263
+msgid "ECRS download failed (see logs)"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:305
-msgid "Download aborted."
-msgstr ""
-
-#: src/applications/fs/fsui/download.c:309
-msgid "ECRS download failed (see logs)."
-msgstr ""
-
-#: src/applications/fs/fsui/download.c:313
-msgid "ECRS download suspending."
-msgstr ""
-
-#: src/applications/fs/fsui/download.c:317
-msgid "Unexpected download state."
-msgstr ""
-
-#: src/applications/fs/fsui/unindex.c:80
+#: src/applications/fs/fsui/unindex.c:99
 msgid "Unindex failed."
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:229 src/applications/fs/fsui/upload.c:374
-#: src/applications/fs/fsui/upload.c:413
-msgid "Upload failed."
+#: src/applications/fs/fsui/upload.c:222
+msgid "Failed to create temporary directory."
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:420
-msgid "Cannot upload directory without using recursion."
+#: src/applications/fs/fsui/upload.c:244
+msgid "Upload failed (consult logs)."
 msgstr ""
 
 #: src/applications/fs/ecrs/search.c:167
@@ -2475,76 +2774,76 @@
 "inserted file. Download aborted.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:1153
+#: src/applications/fs/ecrs/download.c:1157
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:170
+#: src/applications/fs/ecrs/upload.c:161
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/fs/ecrs/upload.c:171
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:188
+#: src/applications/fs/ecrs/upload.c:179
 msgid "Failed to connect to gnunetd."
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:200
+#: src/applications/fs/ecrs/upload.c:191
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:219
+#: src/applications/fs/ecrs/upload.c:210
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:226
+#: src/applications/fs/ecrs/upload.c:217
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:312
+#: src/applications/fs/ecrs/upload.c:303
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:847
+#: src/applications/fs/ecrs/meta.c:849
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:855
+#: src/applications/fs/ecrs/meta.c:857
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:153
+#: src/applications/fs/ecrs/namespace.c:154
 #, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:338
-#: src/applications/fs/ecrs/namespace.c:419
-#: src/applications/fs/ecrs/namespace.c:573
+#: src/applications/fs/ecrs/namespace.c:339
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:574
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:350
-#: src/applications/fs/ecrs/namespace.c:430
+#: src/applications/fs/ecrs/namespace.c:351
+#: src/applications/fs/ecrs/namespace.c:431
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:587
-#: src/applications/fs/ecrs/namespace.c:598
+#: src/applications/fs/ecrs/namespace.c:588
+#: src/applications/fs/ecrs/namespace.c:599
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr ""
@@ -2560,35 +2859,35 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:123
+#: src/applications/fs/uritrack/file_info.c:125
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:355
+#: src/applications/fs/uritrack/file_info.c:367
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:654
+#: src/applications/fs/namespace/namespace_info.c:656
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:675
+#: src/applications/fs/namespace/namespace_info.c:677
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:354
+#: src/applications/topology_f2f/topology.c:359
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:371
+#: src/applications/topology_f2f/topology.c:376
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:384
+#: src/applications/topology_f2f/topology.c:389
 #, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
@@ -2598,20 +2897,37 @@
 msgid "`%s' registering client handler %d and %d\n"
 msgstr ""
 
-#: src/applications/template/gnunet-template.c:44
+#: src/applications/template/gnunet-template.c:43
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:92
+#: src/applications/bootstrap_http/http.c:100
 #, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:144
+#: src/applications/bootstrap_http/http.c:121
+#: src/applications/bootstrap_http/http.c:263
+#: src/applications/bootstrap_http/http.c:283
+#: src/applications/bootstrap_http/http.c:317
+#: src/applications/bootstrap_http/http.c:335
+#: src/applications/bootstrap_http/http.c:349
+#: src/applications/bootstrap_http/http.c:361
+#: src/applications/bootstrap_http/http.c:373
+#, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:173
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:229
+#, c-format
+msgid "Trying to download hostlist from `%s'\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:409
 msgid "# hellos downloaded via http"
 msgstr ""
 
@@ -2629,336 +2945,332 @@
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:98
+#: src/applications/vpn/gnunet-vpn.c:56
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:103
-msgid "VPN over GNUnet."
-msgstr ""
-
-#: src/applications/vpn/vpn.c:351
+#: src/applications/vpn/vpn.c:326
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:359
+#: src/applications/vpn/vpn.c:334
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:387
+#: src/applications/vpn/vpn.c:362
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:436
+#: src/applications/vpn/vpn.c:411
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:440
+#: src/applications/vpn/vpn.c:415
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:450
+#: src/applications/vpn/vpn.c:425
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:510
+#: src/applications/vpn/vpn.c:485
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:514
+#: src/applications/vpn/vpn.c:489
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:541
+#: src/applications/vpn/vpn.c:518
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:549
+#: src/applications/vpn/vpn.c:526
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:553
+#: src/applications/vpn/vpn.c:530
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:591
+#: src/applications/vpn/vpn.c:568
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:595
+#: src/applications/vpn/vpn.c:572
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:602
+#: src/applications/vpn/vpn.c:579
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:607
+#: src/applications/vpn/vpn.c:584
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:615
+#: src/applications/vpn/vpn.c:592
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:627
+#: src/applications/vpn/vpn.c:604
 #, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:638
+#: src/applications/vpn/vpn.c:615
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:650
+#: src/applications/vpn/vpn.c:627
 #, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:683
+#: 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"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:729
+#: src/applications/vpn/vpn.c:706
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:788
+#: src/applications/vpn/vpn.c:769
 #, c-format
 msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:792
+#: src/applications/vpn/vpn.c:773
 #, c-format
 msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:810
+#: src/applications/vpn/vpn.c:791
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:850
+#: src/applications/vpn/vpn.c:831
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:835
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:860
+#: src/applications/vpn/vpn.c:841
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:863
+#: src/applications/vpn/vpn.c:844
 #, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:873
+#: src/applications/vpn/vpn.c:854
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:892
+#: src/applications/vpn/vpn.c:873
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:913
+#: src/applications/vpn/vpn.c:894
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:918
+#: src/applications/vpn/vpn.c:899
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:929
+#: src/applications/vpn/vpn.c:910
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:935
+#: src/applications/vpn/vpn.c:916
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:951
+#: src/applications/vpn/vpn.c:932
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:955
+#: src/applications/vpn/vpn.c:936
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:959
+#: src/applications/vpn/vpn.c:940
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:973
+#: src/applications/vpn/vpn.c:954
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:988
+#: src/applications/vpn/vpn.c:969
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1016
+#: src/applications/vpn/vpn.c:997
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1031
+#: src/applications/vpn/vpn.c:1012
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1076
+#: src/applications/vpn/vpn.c:1057
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1122
+#: src/applications/vpn/vpn.c:1103
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1148
+#: src/applications/vpn/vpn.c:1129
 msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1208
+#: src/applications/vpn/vpn.c:1190
 msgid "Yes"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1208
+#: src/applications/vpn/vpn.c:1190
 msgid "No"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1385
+#: src/applications/vpn/vpn.c:1396
 #, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1386
+#: src/applications/vpn/vpn.c:1397
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1434
+#: src/applications/vpn/vpn.c:1447
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1466
+#: src/applications/vpn/vpn.c:1479
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1477
+#: src/applications/vpn/vpn.c:1492
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1490
+#: src/applications/vpn/vpn.c:1507
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:142
+#: src/server/gnunet-update.c:141
 #, c-format
 msgid "Updating data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:147
+#: src/server/gnunet-update.c:146
 #, c-format
 msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:218 src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-update.c:217 src/server/gnunet-transport-check.c:355
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-update.c:220
+#: src/server/gnunet-update.c:219
 msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/server/gnunet-update.c:224 src/server/gnunet-transport-check.c:369
+#: src/server/gnunet-update.c:223 src/server/gnunet-transport-check.c:370
 msgid "run as user LOGIN"
 msgstr ""
 
-#: src/server/gnunet-update.c:227
+#: src/server/gnunet-update.c:226
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
-#: src/server/connection.c:992
+#: src/server/connection.c:1023
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/server/connection.c:999
+#: src/server/connection.c:1032
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr ""
 
-#: src/server/connection.c:2283
+#: src/server/connection.c:2417
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr ""
 
-#: src/server/connection.c:2355
+#: src/server/connection.c:2489
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2370
+#: src/server/connection.c:2506
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:2774
+#: src/server/connection.c:2929
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2778
+#: src/server/connection.c:2933
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2780
+#: src/server/connection.c:2935
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2783
+#: src/server/connection.c:2938
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/server/connection.c:2787
+#: src/server/connection.c:2942
 msgid "# bytes transmitted"
 msgstr ""
 
-#: src/server/connection.c:2791
+#: src/server/connection.c:2946
 msgid "# bytes received"
 msgstr ""
 
-#: src/server/connection.c:2793
+#: src/server/connection.c:2948
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/server/connection.c:2794
+#: src/server/connection.c:2949
 msgid "# bytes noise sent"
 msgstr ""
 
@@ -2982,15 +3294,15 @@
 msgid "Starts the gnunetd daemon."
 msgstr ""
 
-#: src/server/gnunetd.c:176
+#: src/server/gnunetd.c:175
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:180
+#: src/server/gnunetd.c:179
 msgid "specify username as which gnunetd should run"
 msgstr ""
 
-#: src/server/gnunetd.c:236
+#: src/server/gnunetd.c:228
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -3035,100 +3347,100 @@
 msgid "Could not properly unload service `%s'!\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:115
+#: src/server/gnunet-transport-check.c:116
 #, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:124
+#: src/server/gnunet-transport-check.c:125
 #, c-format
 msgid "`%s': Could not connect.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:158
+#: src/server/gnunet-transport-check.c:159
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:180
+#: src/server/gnunet-transport-check.c:181
 #, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:194
+#: src/server/gnunet-transport-check.c:195
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:201
+#: src/server/gnunet-transport-check.c:202
 #, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
 "each.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:229
+#: src/server/gnunet-transport-check.c:230
 #, c-format
 msgid " Transport %d is not being tested\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:245
+#: src/server/gnunet-transport-check.c:246
 #, c-format
 msgid ""
 "\n"
 "Contacting `%s'."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:266
+#: src/server/gnunet-transport-check.c:267
 #, c-format
 msgid " Connection failed\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:272
+#: src/server/gnunet-transport-check.c:273
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:324
+#: src/server/gnunet-transport-check.c:325
 #, c-format
 msgid "No reply received within %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:351
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:357
+#: src/server/gnunet-transport-check.c:358
 msgid "send COUNT messages"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:360
+#: src/server/gnunet-transport-check.c:361
 msgid "send messages with SIZE bytes payload"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:364
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:366
+#: src/server/gnunet-transport-check.c:367
 msgid "specifies after how many MS to time-out"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:374
+#: src/server/gnunet-transport-check.c:375
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:455
+#: src/server/gnunet-transport-check.c:440
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:458
+#: src/server/gnunet-transport-check.c:443
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:518
+#: src/server/gnunet-transport-check.c:503
 #, c-format
 msgid ""
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
@@ -3144,14 +3456,14 @@
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr ""
 
-#: src/server/tcpserver.c:384
+#: src/server/tcpserver.c:386
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:437
+#: src/server/tcpserver.c:439
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr ""
@@ -3161,50 +3473,50 @@
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr ""
 
-#: src/server/version.c:157
+#: src/server/version.c:152
 msgid ""
 "Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:52
+#: src/server/gnunet-peer-info.c:51
 msgid "Print information about GNUnet peers."
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:79 src/server/gnunet-peer-info.c:94
+#: src/server/gnunet-peer-info.c:78 src/server/gnunet-peer-info.c:93
 #, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:88
+#: src/server/gnunet-peer-info.c:87
 msgid "hello message invalid (signature invalid).\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:99
+#: src/server/gnunet-peer-info.c:98
 #, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr ""
 
-#: src/util/cron/cron.c:355
+#: src/util/cron/cron.c:356
 #, c-format
 msgid ""
 "`%s' called with cron job not in queue, adding.  This may not be what you "
 "want.\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:90
+#: src/util/network_client/tcpio.c:94
 msgid "Could not find valid value for PORT in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:114
+#: src/util/network_client/tcpio.c:118
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:209 src/util/network_client/tcpio.c:237
+#: src/util/network_client/tcpio.c:251 src/util/network_client/tcpio.c:281
 #, c-format
 msgid "Cannot connect to %s:u: %s\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:356
+#: src/util/network_client/tcpio.c:403
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr ""
@@ -3235,17 +3547,17 @@
 msgid "Can't create semaphore: %i"
 msgstr ""
 
-#: src/util/os/dso.c:51
+#: src/util/os/dso.c:56
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/os/dso.c:90
+#: src/util/os/dso.c:110
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/os/dso.c:132
+#: src/util/os/dso.c:152
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
@@ -3263,21 +3575,21 @@
 msgid "Invalid process priority `%s'\n"
 msgstr ""
 
-#: src/util/os/user.c:125
+#: 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:136
+#: src/util/os/user.c:135
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/util/network/select.c:272
+#: src/util/network/select.c:282
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 
-#: src/util/network/select.c:421
+#: src/util/network/select.c:443
 msgid "select listen socket not valid!\n"
 msgstr ""
 
@@ -3312,124 +3624,125 @@
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr ""
 
-#: src/util/disk/storage.c:247
+#: src/util/disk/storage.c:517
 #, c-format
-msgid "Expected `%s' to be a directory\n"
+msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/disk/storage.c:286
+#: src/util/config_impl/impl.c:275
 #, c-format
-msgid "Expected `%s' to be a regular file\n"
+msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr ""
 
-#: src/util/disk/storage.c:493
+#: src/util/config_impl/impl.c:505
 #, c-format
-msgid "expected `%s' to be a directory!\n"
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:260
+#: src/util/config_impl/impl.c:551
 #, c-format
-msgid "Syntax error in configuration file `%s' at line %d.\n"
-msgstr ""
-
-#: src/util/config_impl/impl.c:421
-#, c-format
 msgid ""
 "Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
 "llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:433
+#: src/util/config_impl/impl.c:563
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:513
+#: src/util/config_impl/impl.c:653
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:624
+#: src/util/error/error.c:122
 #, c-format
-msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgid ""
+"\n"
+"Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:156 src/util/error/error.c:200
+#: src/util/error/error.c:190 src/util/error/error.c:234
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/error/error.c:159 src/util/error/error.c:202
+#: src/util/error/error.c:193 src/util/error/error.c:236
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:162 src/util/error/error.c:204
+#: src/util/error/error.c:196 src/util/error/error.c:240
 msgid "WARNING"
 msgstr ""
 
-#: src/util/error/error.c:165 src/util/error/error.c:206
+#: src/util/error/error.c:199 src/util/error/error.c:242
 msgid "ERROR"
 msgstr ""
 
-#: src/util/error/error.c:168 src/util/error/error.c:208
+#: src/util/error/error.c:202 src/util/error/error.c:244
 msgid "FATAL"
 msgstr ""
 
-#: src/util/error/error.c:171 src/util/error/error.c:210
+#: src/util/error/error.c:205 src/util/error/error.c:246
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:174 src/util/error/error.c:212
+#: src/util/error/error.c:208 src/util/error/error.c:248
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:177 src/util/error/error.c:214
+#: src/util/error/error.c:211 src/util/error/error.c:250
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:180 src/util/error/error.c:216
+#: src/util/error/error.c:214 src/util/error/error.c:252
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:183 src/util/error/error.c:218
+#: src/util/error/error.c:217 src/util/error/error.c:254
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:186 src/util/error/error.c:220
+#: src/util/error/error.c:220 src/util/error/error.c:256
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:189
+#: src/util/error/error.c:223
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:221
+#: src/util/error/error.c:238
+msgid "INFO"
+msgstr ""
+
+#: src/util/error/error.c:257
 msgid "NOTHING"
 msgstr ""
 
-#: src/util/threads/mutex.c:131 src/util/threads/mutex.c:151
+#: src/util/threads/mutex.c:145 src/util/threads/mutex.c:165
 #, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:136
+#: src/util/threads/mutex.c:150
 #, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:156
+#: src/util/threads/mutex.c:170
 #, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr ""
 
-#: src/util/threads/pthread.c:139 src/util/threads/pthread.c:147
-#: src/util/threads/pthread.c:154 src/util/threads/pthread.c:245
+#: src/util/threads/pthread.c:158 src/util/threads/pthread.c:166
+#: src/util/threads/pthread.c:173 src/util/threads/pthread.c:266
 #, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr ""
 
-#: src/util/threads/pthread.c:161 src/util/threads/pthread.c:256
+#: src/util/threads/pthread.c:180 src/util/threads/pthread.c:277
 #, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr ""
@@ -3500,8 +3813,13 @@
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/printhelp.c:49
+#: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
 #, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr ""
+
+#: src/util/getopt/printhelp.c:50
+#, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
@@ -3558,21 +3876,21 @@
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:152
+#: src/setup/gnunet-setup.c:185
 #, c-format
 msgid "Too many arguments.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:157
+#: src/setup/gnunet-setup.c:190
 msgid "No interface specified, using default\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:227
+#: src/setup/gnunet-setup.c:264
 #, c-format
 msgid "`%s' is not available."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:243
+#: src/setup/gnunet-setup.c:280
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr ""
@@ -3676,19 +3994,31 @@
 msgid "Configuration changed. Save?"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:429
+#: src/setup/gtk/wizard_gtk.c:137
+msgid "(unknown connection)"
+msgstr ""
+
+#: src/setup/gtk/wizard_gtk.c:390
 #, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:475 src/setup/ncurses/wizard_curs.c:620
+#: src/setup/gtk/wizard_gtk.c:415
+msgid "Do you want to save the new configuration?"
+msgstr ""
+
+#: src/setup/gtk/wizard_gtk.c:442 src/setup/ncurses/wizard_curs.c:620
 msgid "Unable to create user account:"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:482 src/setup/ncurses/wizard_curs.c:623
+#: src/setup/gtk/wizard_gtk.c:449 src/setup/ncurses/wizard_curs.c:623
 msgid "Unable to change startup process:"
 msgstr ""
 
+#: src/setup/gtk/wizard_gtk.c:458
+msgid "gnunet-update failed. Please run gnunet-update manually."
+msgstr ""
+
 #: src/setup/text/conf.c:74
 msgid "yes"
 msgstr ""
@@ -3781,34 +4111,34 @@
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:538
+#: src/setup/text/conf.c:542
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:539
+#: src/setup/text/conf.c:543
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:553 src/setup/ncurses/mconf.c:422
+#: src/setup/text/conf.c:557 src/setup/ncurses/mconf.c:422
 #, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:558
+#: src/setup/text/conf.c:562
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:568
+#: src/setup/text/conf.c:572
 #, c-format
 msgid "Configuration was unchanged, no need to save.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:573
+#: src/setup/text/conf.c:577
 #, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr ""
@@ -4088,43 +4418,43 @@
 "Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:145
+#: src/include/gnunet_util_getopt.h:150
 msgid "print this help"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:154
+#: src/include/gnunet_util_getopt.h:159
 msgid "print the version number"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:160
-msgid "configure logging to use LOGRULES"
+#: src/include/gnunet_util_getopt.h:165
+msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:166
+#: src/include/gnunet_util_getopt.h:171
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:172
+#: src/include/gnunet_util_getopt.h:177
 msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:178
+#: src/include/gnunet_util_getopt.h:183
 msgid "specify host on which gnunetd is running"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:163 src/include/gnunet_util_error.h:165
-#: src/include/gnunet_util_error.h:167 src/include/gnunet_util_error.h:169
+#: src/include/gnunet_util_error.h:175 src/include/gnunet_util_error.h:177
+#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:181
 #, c-format
 msgid "Assertion failed at %s:%d in %s.\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:176 src/include/gnunet_util_error.h:183
-#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#: src/include/gnunet_util_error.h:188 src/include/gnunet_util_error.h:195
+#: src/include/gnunet_util_error.h:202 src/include/gnunet_util_error.h:209
 #, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
+#: src/include/gnunet_util_error.h:216 src/include/gnunet_util_error.h:223
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr ""

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2006-11-12 07:38:46 UTC (rev 3716)
+++ GNUnet/po/de.po     2006-11-12 08:05:43 UTC (rev 3717)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-09-10 22:06-0600\n"
+"POT-Creation-Date: 2006-11-12 01:40-0700\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -90,10 +90,20 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:130
+#, fuzzy
+msgid "Full pathname of GNUnet directory for file-sharing data"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: contrib/config-daemon.scm:142
+#, fuzzy
+msgid "Full pathname of GNUnet directory for indexed files symbolic links"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: contrib/config-daemon.scm:154
 msgid "How many minutes should peer advertisements last?"
 msgstr ""
 
-#: contrib/config-daemon.scm:132
+#: contrib/config-daemon.scm:156
 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 "
@@ -103,52 +113,99 @@
 "than the frequency with which your IP changes."
 msgstr ""
 
-#: contrib/config-daemon.scm:143
-msgid "Log level"
+#: contrib/config-daemon.scm:167
+msgid "Where can GNUnet find an initial list of peers?"
 msgstr ""
 
-#: contrib/config-daemon.scm:144
-msgid "How verbose should the logging of errors be?"
+#: contrib/config-daemon.scm:169
+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"
+"\t\t\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"
+"\t\t\n"
+"If you do not specify a HOSTLISTURL, you must copy valid hostkeys to data/"
+"hosts manually."
 msgstr ""
 
-#: contrib/config-daemon.scm:155
-msgid "Where should logs go?"
+#: contrib/config-daemon.scm:186
+msgid "HTTP Proxy Server"
 msgstr ""
 
-#: contrib/config-daemon.scm:157
+#: contrib/config-daemon.scm:188
 msgid ""
-"In which file should gnunetd write the logs?  If you specify nothing, logs "
-"are written to stderr (and note that if gnunetd runs in the background, "
-"stderr is closed and all logs are discarded)."
+"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:168
+#: contrib/config-daemon.scm:227 contrib/config-client.scm:144
 msgid "How long should logs be kept?"
 msgstr ""
 
-#: contrib/config-daemon.scm:170
+#: contrib/config-daemon.scm:229 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:181
+#: contrib/config-daemon.scm:240 contrib/config-client.scm:157
+msgid "Where should gnunetd write the logs?"
+msgstr ""
+
+#: contrib/config-daemon.scm:252 contrib/config-client.scm:169
+#, fuzzy
+msgid "Configuration of the logging system"
+msgstr ""
+"Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
+"ausführen!\n"
+
+#: contrib/config-daemon.scm:253 contrib/config-client.scm:170
+msgid "Specify which system messages should be logged how"
+msgstr ""
+
+#: contrib/config-daemon.scm:257 contrib/config-client.scm:174
+msgid "Logging of events for users"
+msgstr ""
+
+#: contrib/config-daemon.scm:258 contrib/config-client.scm:175
+msgid "Logging of events for the system administrator"
+msgstr ""
+
+#: contrib/config-daemon.scm:270
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:183
+#: contrib/config-daemon.scm:272
 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:195
+#: contrib/config-daemon.scm:284
+msgid "As which user should gnunetd run?"
+msgstr ""
+
+#: contrib/config-daemon.scm:286
+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:298
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:197
+#: contrib/config-daemon.scm:300
 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"
@@ -162,11 +219,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:211
+#: contrib/config-daemon.scm:314
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:213
+#: contrib/config-daemon.scm:316
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -203,20 +260,109 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:244
+#: contrib/config-daemon.scm:345
+msgid "Disable client-server connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:357
+msgid "Disable peer discovery"
+msgstr ""
+
+#: contrib/config-daemon.scm:358
+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:369
+msgid "Disable advertising this peer to other peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:381
+msgid "Disable automatic establishment of connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:382
+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:393
+msgid "Disable advertising of other peers by this peer"
+msgstr ""
+
+#: contrib/config-daemon.scm:405 contrib/config-client.scm:189
+msgid "Client/Server Port"
+msgstr ""
+
+#: contrib/config-daemon.scm:406 contrib/config-client.scm:190
+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:417
+msgid "IPs allowed to use gnunetd server"
+msgstr ""
+
+#: contrib/config-daemon.scm:418
+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:430
+msgid "Limit connections to the specfied set of peers."
+msgstr ""
+
+#: contrib/config-daemon.scm:431
+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:442
+msgid "Prevent the specfied set of peers from connecting."
+msgstr ""
+
+#: contrib/config-daemon.scm:443
+msgid "If this option is not set, any peer is allowed to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:454
+msgid "Rarely used settings for peer advertisements and connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:474
 #, fuzzy
 msgid "General settings"
 msgstr "Weitere Einstellungen"
 
-#: contrib/config-daemon.scm:245
+#: contrib/config-daemon.scm:475
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:268
+#: contrib/config-daemon.scm:501
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:270
+#: contrib/config-daemon.scm:503
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -225,11 +371,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:283
+#: contrib/config-daemon.scm:516
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:285
+#: contrib/config-daemon.scm:518
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -242,30 +388,45 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:300
+#: contrib/config-daemon.scm:533
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:301
+#: contrib/config-daemon.scm:534
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:318
+#: contrib/config-daemon.scm:551
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:319
+#: contrib/config-daemon.scm:552
 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:334
+#: contrib/config-daemon.scm:566
+msgid "Name of the MySQL database GNUnet should use"
+msgstr ""
+
+#: contrib/config-daemon.scm:578
+msgid "Configuration file that specifies the MySQL username and password"
+msgstr ""
+
+#: contrib/config-daemon.scm:590
+#, fuzzy
+msgid "Configuration of the MySQL database"
+msgstr ""
+"Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
+"ausführen!\n"
+
+#: contrib/config-daemon.scm:609
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:611
 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 "
@@ -276,15 +437,15 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:350
+#: contrib/config-daemon.scm:625
 msgid "Size of the routing table."
 msgstr ""
 
-#: contrib/config-daemon.scm:363
+#: contrib/config-daemon.scm:638
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:365
+#: contrib/config-daemon.scm:640
 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"
@@ -296,21 +457,21 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:379
+#: contrib/config-daemon.scm:654
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
-#: contrib/config-daemon.scm:395
+#: contrib/config-daemon.scm:671
 #, fuzzy
 msgid "Applications"
 msgstr "_Optionen"
 
-#: contrib/config-daemon.scm:411
+#: contrib/config-daemon.scm:687
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:412
+#: contrib/config-daemon.scm:688
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port. Note that if you have configured your NAT box to "
@@ -319,70 +480,263 @@
 "you directly."
 msgstr ""
 
-#: contrib/config-daemon.scm:423
+#: contrib/config-daemon.scm:699
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:435
+#: contrib/config-daemon.scm:711
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:450
+#: contrib/config-daemon.scm:726
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:462
+#: contrib/config-daemon.scm:738
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:477
+#: contrib/config-daemon.scm:753
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:489
+#: contrib/config-daemon.scm:765
+msgid "What is the maximum transfer unit for UDP?"
+msgstr ""
+
+#: contrib/config-daemon.scm:777 contrib/config-daemon.scm:818
+#: contrib/config-daemon.scm:870
+msgid "Which IPs are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:789
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:504
+#: contrib/config-daemon.scm:806
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:516
+#: contrib/config-daemon.scm:830
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:531
+#: contrib/config-daemon.scm:846
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:543
+#: contrib/config-daemon.scm:858
+msgid "What is the maximum transfer unit for UDP 6?"
+msgstr ""
+
+#: contrib/config-daemon.scm:882
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:558
+#: contrib/config-daemon.scm:899
+#, fuzzy
+msgid "Network interface"
+msgstr "Netzwerkgerät:"
+
+#: contrib/config-daemon.scm:911
+msgid "External IP address (leave empty to try auto-detection)"
+msgstr ""
+
+#: contrib/config-daemon.scm:923
+msgid "External IPv6 address (leave empty to try auto-detection)"
+msgstr ""
+
+#: contrib/config-daemon.scm:935
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:580 contrib/config-client.scm:121
+#: contrib/config-daemon.scm:958
+msgid "What is the maximum number of bytes per second that we may receive?"
+msgstr ""
+
+#: contrib/config-daemon.scm:970
+msgid "What is the maximum number of bytes per second that we may send?"
+msgstr ""
+
+#: contrib/config-daemon.scm:982
+msgid "What is the maximum CPU load (percentage)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:984
+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:995
+msgid "What is the maximum CPU load (hard limit)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:996
+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:1007
+msgid "What is the maximum upstream bandwidth (hard limit)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1008
+msgid "Use 0 for no limit."
+msgstr ""
+
+#: contrib/config-daemon.scm:1019
+msgid "Should we disable random padding (experimental option)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1031
+msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
+msgstr ""
+
+#: contrib/config-daemon.scm:1033
+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"
+"\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"
+"\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)."
+msgstr ""
+
+#: contrib/config-daemon.scm:1050
+#, fuzzy
+msgid "Network interface to monitor"
+msgstr "Netzwerkgerät:"
+
+#: contrib/config-daemon.scm:1052
+msgid ""
+"\tFor which interfaces should we do accounting?  GNUnet will evaluate\n"
+"\t\tthe total traffic (not only the GNUnet related traffic) and adjust\n"
+"\t\tits bandwidth usage accordingly. You can currently only specify a\n"
+"\t\tsingle interface. GNUnet will also use this interface to determine\n"
+"\t\tthe IP to use. Typical values are eth0, ppp0, eth1, wlan0, etc.\n"
+"\t\t'ifconfig' will tell you what you have.  Never use 'lo', that just\n"
+"\t\twon't work.\n"
+"\t\tUnder Windows, specify the index number reported by\n"
+"\t\t \"gnunet-win-tool -n\"."
+msgstr ""
+
+#: contrib/config-daemon.scm:1071
+#, fuzzy
+msgid "Load management"
+msgstr "Ungültige Kommandozeilen Parameter.\n"
+
+#: contrib/config-daemon.scm:1095 contrib/config-client.scm:286
 msgid "Root node"
 msgstr ""
 
-#: src/transports/ip6.c:65 src/util/network/io.c:74
+#: contrib/config-client.scm:201
+msgid "On which machine runs gnunetd (for clients)"
+msgstr ""
+
+#: contrib/config-client.scm:202
+#, fuzzy
+msgid "This is equivalent to the -H option."
+msgstr "Wert der Option anzeigen"
+
+#: contrib/config-client.scm:214
+#, fuzzy
+msgid "General options"
+msgstr "Weitere Einstellungen"
+
+#: contrib/config-client.scm:231
+msgid "Do not add metadata listing the creation time for inserted content"
+msgstr ""
+
+#: contrib/config-client.scm:243
+msgid "Which non-default extractors should GNUnet use for keyword extractors"
+msgstr ""
+
+#: 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"
+"\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."
+msgstr ""
+
+#: contrib/config-client.scm:257
+#, fuzzy
+msgid "File-Sharing options"
+msgstr "Alle Optionen anzeigen"
+
+#: contrib/config-client.scm:274
+#, fuzzy
+msgid "Full pathname of GNUnet client HOME directory"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: contrib/config-client.scm:275
+msgid "The directory for GNUnet files that belong to the user."
+msgstr ""
+
+#: src/transports/ip6.c:65 src/util/network/io.c:78
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/transports/ip6.c:109
+#: src/transports/ip6.c:110
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/transports/ip6.c:154 src/transports/ip.c:353
+#: src/transports/ip6.c:155 src/transports/ip.c:354
 #, fuzzy, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr "Fehler beim Bestimmen der (externen) IP-Adresse!\n"
 
-#: src/transports/udp6.c:126 src/transports/udp.c:128
+#: src/transports/udp6.c:126 src/transports/udp.c:132
 #, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
@@ -391,7 +745,7 @@
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "UDP6: Öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/udp6.c:443 src/transports/udp.c:443
+#: src/transports/udp6.c:441 src/transports/udp.c:447
 #, fuzzy, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
@@ -444,13 +798,8 @@
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# Bytes verworfen von HTTP"
 
-#: src/transports/smtp.c:298
+#: src/transports/smtp.c:257
 #, c-format
-msgid "Could not resolve name of SMTP server `%s': %s"
-msgstr "Der Name des SMTP servers `%s' konnte nicht aufgelöst werden: %s"
-
-#: src/transports/smtp.c:420 src/transports/smtp.c:882
-#, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
 "under `%s'.\n"
@@ -458,51 +807,38 @@
 "Für den SMTP Transport müssen Sie den Namen einer Pipe in Sektion `%s', "
 "Eintrag `%s' eintragen.\n"
 
-#: src/transports/smtp.c:493
+#: src/transports/smtp.c:334
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 "Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n"
 
-#: src/transports/smtp.c:588
+#: src/transports/smtp.c:433
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 "Kein Filter für E-Mail angegeben, es kann keine Bekanntmachung erstellt "
 "werden.\n"
 
-#: src/transports/smtp.c:595
+#: src/transports/smtp.c:440
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
 
-#: src/transports/smtp.c:769
+#: src/transports/smtp.c:546
+#, fuzzy, c-format
+msgid "Failed to initialize libesmtp: %s.\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#: src/transports/smtp.c:610
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Das Senden einer E-Mail an `%s' schlug fehl.\n"
 
-#: src/transports/smtp.c:820
+#: src/transports/smtp.c:678
 #, c-format
-msgid "SMTP server send unexpected response at %s:%d.\n"
-msgstr "Der SMTP server sendete eine unerwartete Antwort bei %s:%d.\n"
-
-#: src/transports/smtp.c:843
-#, c-format
-msgid ""
-"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
-msgstr ""
-"SMTP Server antwortete nicht mit einem 250 Bestätigungscode auf eine `%s' "
-"Anfrage.\n"
-
-#: src/transports/smtp.c:849
-#, c-format
-msgid "Failed to send `%s' request to SMTP server.\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/transports/smtp.c:909
-#, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s filter %s (SMTP)"
 
-#: src/transports/smtp.c:938
+#: src/transports/smtp.c:706
 #, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
@@ -518,38 +854,38 @@
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transports/tcp.c:421
+#: src/transports/tcp.c:423
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/tcp.c:423
+#: src/transports/tcp.c:425
 msgid "# bytes sent via TCP"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transports/tcp.c:425
+#: src/transports/tcp.c:427
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transports/udp.c:217
+#: src/transports/udp.c:222
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "UDP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/udp.c:312
+#: src/transports/udp.c:314
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 "Eine Nachricht der Größe %d konnte nicht per UDP an %u.%u.%u.%u:%u versendet "
 "werden: %s\n"
 
-#: src/transports/udp.c:449
+#: src/transports/udp.c:453
 msgid "# bytes received via UDP"
 msgstr "# Bytes empfangen über UDP"
 
-#: src/transports/udp.c:451
+#: src/transports/udp.c:455
 msgid "# bytes sent via UDP"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transports/udp.c:453
+#: src/transports/udp.c:457
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
@@ -609,321 +945,290 @@
 msgid "`%s': unknown service: %s\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/transports/tcp6.c:430
+#: src/transports/tcp6.c:432
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/tcp6.c:432
+#: src/transports/tcp6.c:434
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transports/tcp6.c:434
+#: src/transports/tcp6.c:436
 #, fuzzy
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transports/tcp_helper.c:182
+#: src/transports/tcp_helper.c:191
 #, fuzzy
 msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr ""
 "Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
 "u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/transports/tcp_helper.c:193
+#: src/transports/tcp_helper.c:202
 #, fuzzy
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr ""
 "Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
 "u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/transports/udp_helper.c:93
+#: src/transports/udp_helper.c:91
 #, fuzzy
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr ""
 "Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
 "u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/applications/dht/tools/dhttest2.c:50
+#: src/applications/dht/tools/dhttest2.c:45
 #: src/applications/session/sessiontest.c:42
 #: src/applications/stats/statistics.c:212
 #: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:101
-#: src/applications/gap/gaptest.c:52
+#: src/applications/tbench/tbenchtest_udp.c:100
+#: src/applications/gap/gaptest.c:49
 msgid "# of connected peers"
 msgstr "# verbundener Knoten"
 
-#: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/gap/gaptest.c:318
+#: src/applications/dht/tools/dhttest2.c:160
 #, c-format
 msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 msgstr "Warte auf den Start von gnunetd (%u Iterationen verbleiben)...\n"
 
-#: src/applications/dht/tools/dhttest2.c:140
+#: src/applications/dht/tools/dhttest2.c:173
 #: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:117
-#: src/applications/gap/gaptest.c:330
+#: src/applications/tbench/tbenchtest_udp.c:116
 #, c-format
 msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr ""
 "Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
 "verbleiben)...\n"
 
-#: src/applications/dht/tools/dht-query.c:39
-msgid "query table called NAME"
-msgstr "Frage Tabelle mit dem Namen NAME ab"
-
-#: src/applications/dht/tools/dht-query.c:41
-msgid "allow TIME ms to process each command"
-msgstr "TIME ms erlauben, um jedes Kommando zu bearbeiten"
-
-#: src/applications/dht/tools/dht-query.c:46
+#: src/applications/dht/tools/dht-query.c:53
 msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
 msgstr "Eine DHT Tabelle abfragen (get KEY, put KEY VALUE, remove KEY VALUE)."
 
-#: src/applications/dht/tools/dht-query.c:84
-#: src/applications/dht/tools/dht-join.c:85 src/util/getopt/setoption.c:133
-#: src/util/getopt/setoption.c:149
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
+#: src/applications/dht/tools/dht-query.c:57
+#: src/applications/dht/tools/dht-join.c:59
+msgid "join table called NAME"
+msgstr "Tabelle NAME anschließen"
 
-#: src/applications/dht/tools/dht-query.c:99
-#: src/applications/dht/tools/dht-join.c:108
-#: src/applications/chat/gnunet-chat.c:93
-#: src/applications/testbed/gnunet-testbed.c:125
-#: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/vpn/gnunet-vpn.c:118 src/util/getopt/getopt.c:1066
-#: src/setup/gnunet-setup.c:246
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
+#: src/applications/dht/tools/dht-query.c:60
+msgid "allow TIME ms to process each command"
+msgstr "TIME ms erlauben, um jedes Kommando zu bearbeiten"
 
-#: src/applications/dht/tools/dht-query.c:106
-msgid "No commands specified.\n"
-msgstr "Keine Kommandos angegeben.\n"
-
-#: src/applications/dht/tools/dht-query.c:173
-#: src/applications/dht/tools/dht-query.c:204
+#: src/applications/dht/tools/dht-query.c:130
+#: src/applications/dht/tools/dht-query.c:163
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr "'%s(%s,%s)' erfolgreich abgeschlossen\n"
 
-#: src/applications/dht/tools/dht-query.c:177
-#: src/applications/dht/tools/dht-query.c:208
+#: src/applications/dht/tools/dht-query.c:134
+#: src/applications/dht/tools/dht-query.c:167
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
 
-#: src/applications/dht/tools/dht-query.c:231
-#: src/applications/dht/tools/dht-join.c:211
+#: src/applications/dht/tools/dht-query.c:194
+#: src/applications/dht/tools/dht-join.c:165
 #, c-format
 msgid "No table name specified, using `%s'.\n"
 msgstr "Kein Tabellenname angegeben, verwende `%s'.\n"
 
-#: src/applications/dht/tools/dht-query.c:246
+#: src/applications/dht/tools/dht-query.c:210
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/applications/dht/tools/dht-query.c:253
+#: src/applications/dht/tools/dht-query.c:220
 #, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr "Kommando `%s' benötigt eine zusätzliche Angabe (`%s').\n"
 
-#: src/applications/dht/tools/dht-query.c:261
-#: src/applications/dht/tools/dht-query.c:271
+#: src/applications/dht/tools/dht-query.c:232
+#: src/applications/dht/tools/dht-query.c:246
 #, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr "Kommando `%s' benötigt zwei zusätzliche Angaben (`%s' und `%s').\n"
 
-#: src/applications/dht/tools/dht-query.c:279
+#: src/applications/dht/tools/dht-query.c:258
 #, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/applications/dht/tools/dht_api.c:127
-#: src/applications/dht/tools/dht_api.c:236
-#: src/applications/dht/tools/dht_api.c:289
-#: src/applications/dht/tools/dht_api.c:343
-#: src/applications/dht/tools/dht_api.c:377
+#: src/applications/dht/tools/dht_api.c:148
+#: src/applications/dht/tools/dht_api.c:264
+#: src/applications/dht/tools/dht_api.c:321
+#: src/applications/dht/tools/dht_api.c:379
+#: src/applications/dht/tools/dht_api.c:415
 #, c-format
 msgid "Failed to send `%s'.  Closing connection.\n"
 msgstr "Fehler beim Senden von `%s'. Verbindung wird geschlossen.\n"
 
-#: src/applications/dht/tools/dht_api.c:201
-#: src/applications/dht/tools/dht_api.c:253
-#: src/applications/dht/tools/dht_api.c:307
-#: src/applications/dht/tools/dht_api.c:360
+#: src/applications/dht/tools/dht_api.c:226
+#: src/applications/dht/tools/dht_api.c:282
+#: src/applications/dht/tools/dht_api.c:340
+#: src/applications/dht/tools/dht_api.c:397
 #, c-format
 msgid "Received invalid `%s' request (size %d)\n"
 msgstr "Ungültige Anfrage `%s' empfangen (Größe %d)\n"
 
-#: src/applications/dht/tools/dht_api.c:214
-#: src/applications/dht/tools/dht_api.c:266
-#: src/applications/dht/tools/dht_api.c:320
+#: src/applications/dht/tools/dht_api.c:241
+#: src/applications/dht/tools/dht_api.c:297
+#: src/applications/dht/tools/dht_api.c:355
 #, c-format
 msgid "Received invalid `%s' request (wrong table)\n"
 msgstr "Ungültige Anfrage `%s' empfangen (falsche Tabelle)\n"
 
-#: src/applications/dht/tools/dht_api.c:390
+#: src/applications/dht/tools/dht_api.c:429
 #, c-format
 msgid "Received unknown request type %d at %s:%d\n"
 msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
 
-#: src/applications/dht/tools/dht_api.c:430
+#: src/applications/dht/tools/dht_api.c:473
 msgid "This client already participates in the given DHT!\n"
 msgstr "Dieser Client beteiligt sich bereits an der angegebenen DHT!\n"
 
-#: src/applications/dht/tools/dht_api.c:498
+#: src/applications/dht/tools/dht_api.c:548
 msgid "Cannot leave DHT: table not known!\n"
 msgstr "DHT kann nicht verlassen werden: Tabelle unbekannt!\n"
 
-#: src/applications/dht/tools/dht_api.c:520
+#: src/applications/dht/tools/dht_api.c:571
 #, c-format
 msgid "gnunetd signaled error in response to `%s' message\n"
 msgstr "gnunetd gab in Bezug auf die `%s' Nachricht einen Fehler zurück.\n"
 
-#: src/applications/dht/tools/dht_api.c:525
+#: src/applications/dht/tools/dht_api.c:576
 #, c-format
 msgid "Failed to receive response to `%s' message from gnunetd\n"
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/applications/dht/tools/dht_api.c:530
+#: src/applications/dht/tools/dht_api.c:581
 #, c-format
 msgid "Failed to send `%s' message to gnunetd\n"
 msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n"
 
-#: src/applications/dht/tools/dht_api.c:622
+#: src/applications/dht/tools/dht_api.c:677
 #, c-format
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Unerwartete Antwort zu `%s' Operation.\n"
 
-#: src/applications/dht/tools/dht-join.c:43
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "SIZE bytes an Speicher für die lokale Tabelle erlauben"
-
-#: src/applications/dht/tools/dht-join.c:45
-msgid "join table called NAME"
-msgstr "Tabelle NAME anschließen"
-
-#: src/applications/dht/tools/dht-join.c:51
+#: src/applications/dht/tools/dht-join.c:52
 msgid "Join a DHT."
 msgstr "Einer DHT anschließen."
 
-#: src/applications/dht/tools/dht-join.c:115
-msgid "Superflous arguments (ignored).\n"
-msgstr "überflüssige Parameter (werden ignoriert).\n"
+#: src/applications/dht/tools/dht-join.c:56
+msgid "allow SIZE bytes of memory for the local table"
+msgstr "SIZE bytes an Speicher für die lokale Tabelle erlauben"
 
-#: src/applications/dht/tools/dht-join.c:131
+#: src/applications/dht/tools/dht-join.c:78
 #, c-format
 msgid "Call to `%s' returns %d.\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/applications/dht/tools/dht-join.c:132
+#: src/applications/dht/tools/dht-join.c:79
 #, c-format
 msgid "Call to `%s' with key `%s'.\n"
 msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
 
-#: src/applications/dht/tools/dht-join.c:133
+#: src/applications/dht/tools/dht-join.c:80
 #, c-format
 msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
 msgstr "Aufruf von `%s' mit Wert '%.*s' (%d Bytes).\n"
 
-#: src/applications/dht/tools/dht-join.c:236
+#: src/applications/dht/tools/dht-join.c:189
 msgid "Error joining DHT.\n"
 msgstr "Fehler beim Beitreten zu der DHT.\n"
 
-#: src/applications/dht/tools/dht-join.c:243
+#: src/applications/dht/tools/dht-join.c:196
 #, c-format
 msgid "Joined DHT.  Press CTRL-C to leave.\n"
 msgstr "Der DHT beigetreten. Drücken Sie STRG-C, um sie zu verlassen.\n"
 
-#: src/applications/dht/tools/dht-join.c:250
+#: src/applications/dht/tools/dht-join.c:205
 msgid "Error leaving DHT.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/applications/dht/module/dht.c:946
+#: src/applications/dht/module/dht.c:952
 #, c-format
 msgid "Malformed optional field `%s' received from peer `%s'.\n"
 msgstr "Ungültiges optionales Feld `%s' empfangen von Knoten `%s'.\n"
 
-#: src/applications/dht/module/dht.c:973
+#: src/applications/dht/module/dht.c:979
 #, c-format
 msgid "Could not find peer `%s' in routing table!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/applications/dht/module/dht.c:1120
-#: src/applications/dht/module/dht.c:1135
+#: src/applications/dht/module/dht.c:1126
+#: src/applications/dht/module/dht.c:1141
 #, c-format
 msgid "Received malformed response to `%s' from peer `%s'.\n"
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/applications/dht/module/dht.c:1447
+#: src/applications/dht/module/dht.c:1453
 #, c-format
 msgid "Invalid response to `%s' from peer `%s'.\n"
 msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/applications/dht/module/dht.c:1603
-#: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1290
+#: src/applications/dht/module/dht.c:1611
+#: src/applications/dht/module/dht.c:2351
+#: src/applications/dht/module/dht.c:2628 src/applications/rpc/rpc.c:1291
 #, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr "`%s' mit einem Timeout von über einer Stunde aufgerufen (Fehler?)\n"
 
-#: src/applications/dht/module/dht.c:1793
+#: src/applications/dht/module/dht.c:1803
 #, c-format
 msgid "Invalid response to `%s'.\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/applications/dht/module/dht.c:1993
+#: src/applications/dht/module/dht.c:2003
 #, c-format
 msgid "Malformed response to `%s' on master table.\n"
 msgstr "Beschädigte Antwort auf `%s' in Master Tabelle.\n"
 
-#: src/applications/dht/module/dht.c:2207
-#: src/applications/dht/module/dht.c:2507
+#: src/applications/dht/module/dht.c:2217
+#: src/applications/dht/module/dht.c:2522
 #, c-format
 msgid "Invalid response to `%s' from `%s'\n"
 msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 
-#: src/applications/dht/module/dht.c:2881
-#: src/applications/dht/module/dht.c:3021
-#: src/applications/dht/module/dht.c:3148
-#: src/applications/dht/module/dht.c:3282
+#: src/applications/dht/module/dht.c:2899
+#: src/applications/dht/module/dht.c:3041
+#: src/applications/dht/module/dht.c:3182
+#: src/applications/dht/module/dht.c:3330
 #, c-format
 msgid "Received invalid RPC `%s'.\n"
 msgstr "Ungültiger RPC `%s' empfangen.\n"
 
-#: src/applications/dht/module/dht.c:3160
-#: src/applications/dht/module/dht.c:3296
+#: src/applications/dht/module/dht.c:3201
+#: src/applications/dht/module/dht.c:3351
 #, c-format
 msgid "RPC for `%s' received for table that we do not participate in!\n"
 msgstr ""
 "RPC für `%s' empfangen für eine Tabelle, an der wir nicht beteiligt sind!\n"
 
-#: src/applications/dht/module/cs.c:446
+#: src/applications/dht/module/cs.c:449
 #, c-format
 msgid "`%s' failed: table not found!\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/applications/dht/module/cs.c:466
+#: src/applications/dht/module/cs.c:469
 #, c-format
 msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr "`%s' fehlgeschlagen. Beende Verbindung zu Client.\n"
 
-#: src/applications/dht/module/cs.c:542
+#: src/applications/dht/module/cs.c:546
 msgid "sendAck failed.  Terminating connection to client.\n"
 msgstr "sendAck fehlgeschlagen. Beende Verbindung zu Client.\n"
 
-#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
-#: src/applications/dht/module/cs.c:688
+#: src/applications/dht/module/cs.c:666 src/applications/dht/module/cs.c:684
+#: src/applications/dht/module/cs.c:693
 #, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "`%s' fehlgeschlagen. Beende Verbindung zu Client.\n"
 
-#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
+#: src/applications/dht/module/cs.c:814 src/applications/dht/module/cs.c:867
 #, c-format
 msgid "Failed to deliver `%s' message.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
@@ -962,6 +1267,14 @@
 msgid "Start GNUnet chat client."
 msgstr "GNUnet chat client starten"
 
+#: src/applications/chat/gnunet-chat.c:93
+#: src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:546 src/util/getopt/getopt.c:1067
+#: src/setup/gnunet-setup.c:283
+#, c-format
+msgid "Use --help to get a list of options.\n"
+msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
+
 #: src/applications/chat/gnunet-chat.c:151
 msgid "Could not connect to gnunetd.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -979,75 +1292,80 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/applications/advertising/advertising.c:162
+#: src/applications/advertising/advertising.c:168
 #, c-format
 msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr ""
 "Hello Nachricht von `%s' ist ungültig (Signatur ist ungültig). Nachricht "
 "wurde verworfen.\n"
 
-#: src/applications/advertising/advertising.c:168
+#: src/applications/advertising/advertising.c:175
 msgid ""
 "hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr ""
 "Empfangene Hello Nachricht ist ungültig (Ablaufzeit über Limit). Nachricht "
 "wurde verworfen.\n"
 
-#: src/applications/advertising/advertising.c:177
+#: src/applications/advertising/advertising.c:182
 #, c-format
+msgid "hello transport verification failed (%u).\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:192
+#, c-format
 msgid "hello advertisement for protocol %d received.\n"
 msgstr "Hello Ankündigung für Protokoll %d empfangen.\n"
 
-#: src/applications/advertising/advertising.c:297
+#: src/applications/advertising/advertising.c:325
 msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr "Hellos+PING konnten nicht gesendet werden, Ping Puffer ist voll.\n"
 
-#: src/applications/advertising/advertising.c:310
+#: src/applications/advertising/advertising.c:338
 #, c-format
 msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr "`%s' fehlgeschlagen (%d, %u). PING wird nicht gesendet.\n"
 
-#: src/applications/advertising/advertising.c:467
+#: src/applications/advertising/advertising.c:495
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Transport %d wird ausgewählten anderen Knoten bekannt gegeben.\n"
 
-#: src/applications/advertising/advertising.c:474
+#: src/applications/advertising/advertising.c:502
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 "Bekanntmachung von uns zwecklos: bis jetzt sind uns keine anderen Knoten "
 "bekannt.\n"
 
-#: src/applications/advertising/advertising.c:580
+#: src/applications/advertising/advertising.c:608
 #, c-format
 msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr "Hello von Knoten `%s' wird entfernt (lief vor %ds ab).\n"
 
-#: src/applications/advertising/advertising.c:760
+#: src/applications/advertising/advertising.c:788
 msgid "# Peer advertisements received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/applications/advertising/advertising.c:761
+#: src/applications/advertising/advertising.c:789
 msgid "# Self advertisments transmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/applications/advertising/advertising.c:762
+#: src/applications/advertising/advertising.c:790
 msgid "# Foreign advertisements forwarded"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/applications/advertising/advertising.c:764
+#: src/applications/advertising/advertising.c:792
 #: src/applications/pingpong/pingpong.c:488
 msgid "# plaintext PING messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/applications/advertising/advertising.c:768
-#: src/applications/session/connect.c:779
+#: src/applications/advertising/advertising.c:796
+#: src/applications/session/connect.c:800
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "`%s' registriert Handler %d (Plaintext und Ciphertext)\n"
 
-#: src/applications/advertising/advertising.c:785
+#: src/applications/advertising/advertising.c:813
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
@@ -1114,23 +1432,29 @@
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "`%s' registriert Handler %d %d (Plaintext und Ciphertext)\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:45
-#: src/applications/sqstore_sqlite/sqlite.c:52
-#: src/applications/sqstore_mysql/mysql.c:137
-#: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:389
-#: src/applications/sqstore_mysql/mysql.c:728
-#: src/applications/sqstore_mysql/mysql.c:743
-#: src/applications/sqstore_mysql/mysql.c:752
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:786
-#: src/applications/sqstore_mysql/mysql.c:840
-#: src/applications/sqstore_mysql/mysql.c:925
-#: src/applications/sqstore_mysql/mysql.c:935
-#: src/applications/sqstore_mysql/mysql.c:1007
-#: src/applications/sqstore_mysql/mysql.c:1016
-#: src/applications/sqstore_mysql/mysql.c:1056
-#: src/applications/sqstore_mysql/mysql.c:1070
+#: src/applications/sqstore_sqlite/sqlite.c:46
+#: src/applications/sqstore_sqlite/sqlite.c:53
+#: src/applications/sqstore_mysql/mysql.c:138
+#: src/applications/sqstore_mysql/mysql.c:145
+#: src/applications/sqstore_mysql/mysql.c:423
+#: src/applications/sqstore_mysql/mysql.c:765
+#: src/applications/sqstore_mysql/mysql.c:781
+#: src/applications/sqstore_mysql/mysql.c:791
+#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:827
+#: src/applications/sqstore_mysql/mysql.c:884
+#: src/applications/sqstore_mysql/mysql.c:971
+#: src/applications/sqstore_mysql/mysql.c:982
+#: src/applications/sqstore_mysql/mysql.c:1046
+#: src/applications/sqstore_mysql/mysql.c:1062
+#: src/applications/sqstore_mysql/mysql.c:1072
+#: src/applications/sqstore_mysql/mysql.c:1096
+#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/sqstore_mysql/mysql.c:1119
+#: src/applications/sqstore_mysql/mysql.c:1182
+#: src/applications/sqstore_mysql/mysql.c:1194
+#: src/applications/sqstore_mysql/mysql.c:1242
+#: src/applications/sqstore_mysql/mysql.c:1257
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
@@ -1139,82 +1463,83 @@
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:158
+#: src/applications/sqstore_sqlite/sqlite.c:195
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:307
-#: src/applications/sqstore_sqlite/sqlite.c:327
-#: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:803
+#: src/applications/sqstore_sqlite/sqlite.c:356
+#: src/applications/sqstore_sqlite/sqlite.c:377
+#: src/applications/sqstore_mysql/mysql.c:260
+#: src/applications/sqstore_mysql/mysql.c:845
+#: src/applications/sqstore_mysql/mysql.c:1134
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:308
-#: src/applications/sqstore_sqlite/sqlite.c:328
+#: src/applications/sqstore_sqlite/sqlite.c:357
+#: src/applications/sqstore_sqlite/sqlite.c:378
 msgid "sqlite datastore"
 msgstr "sqlite Datenspeicher"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1177
-#: src/applications/sqstore_mysql/mysql.c:1182
+#: src/applications/sqstore_sqlite/sqlite.c:1213
+#: src/applications/sqstore_mysql/mysql.c:1318
 msgid "# bytes in datastore"
 msgstr "# bytes in der Datenbank"
 
-#: src/applications/session/connect.c:221
+#: src/applications/session/connect.c:225
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/applications/session/connect.c:258
+#: src/applications/session/connect.c:263
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr ""
 "Sitzungsschlüssel kann nicht verschlüsselt werden, der andere Knoten ist uns "
 "nicht bekannt!\n"
 
-#: src/applications/session/connect.c:517
+#: src/applications/session/connect.c:533
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "Empfangene Nachricht ist ungültig.\n"
 
-#: src/applications/session/connect.c:540
+#: src/applications/session/connect.c:558
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/applications/session/connect.c:550
+#: src/applications/session/connect.c:568
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 "setkey `%s' von `%s' hat eine ungültige CRC Prüfsumme (tatsächlich: %u, "
 "erwartet: %u).\n"
 
-#: src/applications/session/connect.c:608
+#: src/applications/session/connect.c:626
 msgid ""
 "Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr ""
 "Fehler beim Parsen des Verschlüsselten Sitzungsschlüssels, gegebene "
 "Nachrichtenteilgröße ist ungültig.\n"
 
-#: src/applications/session/connect.c:619
+#: src/applications/session/connect.c:637
 #, c-format
 msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr "Unbekannter Typ in engebetteter Nachricht: %u (%u bytes)\n"
 
-#: src/applications/session/connect.c:768
+#: src/applications/session/connect.c:789
 msgid "# session keys sent"
 msgstr "# Sitzungsschlüssel gesendet"
 
-#: src/applications/session/connect.c:770
+#: src/applications/session/connect.c:791
 msgid "# session keys rejected"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/applications/session/connect.c:772
+#: src/applications/session/connect.c:793
 msgid "# session keys accepted"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/applications/session/connect.c:774
+#: src/applications/session/connect.c:795
 msgid "# sessions established"
 msgstr "# Sitzungen aufgebaut"
 
@@ -1247,56 +1572,52 @@
 msgstr ""
 "%s::%s - async RPC %s:%p konnte nicht unregistriert werden: nicht gefunden\n"
 
-#: src/applications/rpc/rpc.c:878 src/applications/rpc/rpc.c:1011
-#: src/applications/rpc/rpc.c:1100
+#: src/applications/rpc/rpc.c:879 src/applications/rpc/rpc.c:1012
+#: src/applications/rpc/rpc.c:1101
 #, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/applications/rpc/rpc.c:945
+#: src/applications/rpc/rpc.c:946
 #, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "RPC Anfrage %u wird verworfen: Nachricht ist beschädigt.\n"
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/rpc/rpc.c:1415
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "RPC nicht unregistriert: %s:%p\n"
 
-#: src/applications/rpc/rpc.c:1441
+#: src/applications/rpc/rpc.c:1442
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "`%s' registriert Handler %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1462
+#: src/applications/rpc/rpc.c:1463
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/applications/rpc/rpc.c:1519
+#: src/applications/rpc/rpc.c:1520
 msgid "RPC async reply invalid.\n"
 msgstr "RPC async Antwort ungültig.\n"
 
-#: src/applications/rpc/rpc.c:1591
+#: src/applications/rpc/rpc.c:1592
 msgid "async RPC reply not received.\n"
 msgstr "async RPC Antwort nicht empfangen.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:804
+#: src/applications/sqstore_mysql/mysql.c:261
+#: src/applications/sqstore_mysql/mysql.c:846
+#: src/applications/sqstore_mysql/mysql.c:1135
 msgid "mysql datastore"
 msgstr "mysql Datenspeicher"
 
-#: src/applications/sqstore_mysql/mysql.c:1110
+#: src/applications/sqstore_mysql/mysql.c:1348
 #, c-format
-msgid "Query `%s' had no results.\n"
-msgstr "Abfrage `%s' hatte keine Ergebnisse.\n"
-
-#: src/applications/sqstore_mysql/mysql.c:1212
-#, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1230
+#: src/applications/sqstore_mysql/mysql.c:1371
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -1309,23 +1630,23 @@
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "Verfügbarkeitstest für `%s' fehlgeschlagen bei %s:%d.\n"
 
-#: src/applications/datastore/datastore.c:143
+#: src/applications/datastore/datastore.c:145
 #, c-format
 msgid "Database failed to delete `%s'.\n"
 msgstr "Die Datenbank konnte `%s' nicht löschen.\n"
 
-#: src/applications/datastore/datastore.c:358
-#: src/applications/datastore/datastore.c:454
+#: src/applications/datastore/datastore.c:368
+#: src/applications/datastore/datastore.c:465
 #, fuzzy
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/applications/identity/hostkey.c:109
+#: src/applications/identity/hostkey.c:121
 #, fuzzy, c-format
 msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/applications/identity/hostkey.c:139
+#: src/applications/identity/hostkey.c:155
 #, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
@@ -1333,11 +1654,11 @@
 "Formatüberprüfung schlug für die existierende Hostkeydatei `%s' fehl, es "
 "wird ein neuer Hostkey erzeugt.\n"
 
-#: src/applications/identity/hostkey.c:147
+#: src/applications/identity/hostkey.c:163
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/applications/identity/hostkey.c:160
+#: src/applications/identity/hostkey.c:176
 msgid "Done creating hostkey.\n"
 msgstr "Hostkey wurde erfolgreich erzeugt.\n"
 
@@ -1362,20 +1683,20 @@
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/applications/identity/identity.c:684
-#: src/applications/identity/identity.c:705
+#: src/applications/identity/identity.c:686
+#: src/applications/identity/identity.c:706
 #, c-format
 msgid "Removed file `%s' containing invalid hello data.\n"
 msgstr "Datei `%s' enthielt ungültige Hello Daten und wurde entfernt.\n"
 
-#: src/applications/identity/identity.c:758
+#: src/applications/identity/identity.c:759
 #, fuzzy, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 "Signatur kann nicht verifiziert werden, der andere Knoten ist uns nicht "
 "bekannt!\n"
 
-#: src/applications/identity/identity.c:767
+#: src/applications/identity/identity.c:768
 msgid "Signature failed verification: signature invalid.\n"
 msgstr "Verifikation einer Signatur fehlgeschlagen: Signatur ist ungültig.\n"
 
@@ -1582,76 +1903,77 @@
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr "Ermöglicht die Konstruktion einer P2P-Testumgebung (inkomplett)"
 
-#: src/applications/transport/transport.c:136
+#: src/applications/transport/transport.c:140
 #, c-format
 msgid ""
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:183
+#: src/applications/transport/transport.c:187
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:278
+#: src/applications/transport/transport.c:282
 #, fuzzy, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/applications/transport/transport.c:366
+#: src/applications/transport/transport.c:370
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/applications/transport/transport.c:423
+#: src/applications/transport/transport.c:427
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:596
+#: src/applications/transport/transport.c:601
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/applications/transport/transport.c:616
+#: src/applications/transport/transport.c:621
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/applications/transport/transport.c:626
+#: src/applications/transport/transport.c:631
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 "Transport Bibliothek `%s' stellt nicht die benötigte Funktion '%s%s' zur "
 "Verfügung.\n"
 
-#: src/applications/transport/transport.c:643
+#: src/applications/transport/transport.c:658
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/applications/transport/transport.c:654
+#: src/applications/transport/transport.c:671
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/applications/fragmentation/fragmentation.c:559
+#: src/applications/fragmentation/fragmentation.c:566
 msgid "# messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:560
+#: src/applications/fragmentation/fragmentation.c:567
 msgid "# messages fragmented"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:561
+#: src/applications/fragmentation/fragmentation.c:568
 msgid "# fragments discarded"
 msgstr "# verworfener Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:573
+#: src/applications/fragmentation/fragmentation.c:580
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr "`%s' registriert Handler %d\n"
 
 #: src/applications/stats/gnunet-stats.c:90
+#: src/applications/vpn/gnunet-vpn.c:52
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
@@ -1659,15 +1981,16 @@
 msgid "prints supported protocol messages"
 msgstr "gibt unterstützte Protokollnachrichten aus"
 
-#: src/applications/stats/gnunet-stats.c:137
-#: src/applications/tbench/gnunet-tbench.c:136
-#: src/applications/tracekit/gnunet-tracekit.c:319
-#: src/applications/template/gnunet-template.c:101
+#: src/applications/stats/gnunet-stats.c:130
+#: src/applications/tbench/gnunet-tbench.c:128
+#: src/applications/tracekit/gnunet-tracekit.c:312
+#: src/applications/template/gnunet-template.c:94
+#: src/applications/vpn/gnunet-vpn.c:145
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/applications/stats/gnunet-stats.c:156
+#: src/applications/stats/gnunet-stats.c:149
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
@@ -1704,110 +2027,110 @@
 msgid "keeps statistics about gnunetd's operation"
 msgstr "Hält Statistiken über Betrieb von gnunetd"
 
-#: src/applications/tbench/gnunet-tbench.c:65
-#: src/applications/tracekit/gnunet-tracekit.c:54
+#: src/applications/tbench/gnunet-tbench.c:64
+#: src/applications/tracekit/gnunet-tracekit.c:53
 msgid "Start GNUnet transport benchmarking tool."
 msgstr "GNUnet Transport Benchmarking Werkzeug starten."
 
-#: src/applications/tbench/gnunet-tbench.c:67
+#: src/applications/tbench/gnunet-tbench.c:66
 msgid "output in gnuplot format"
 msgstr "Ausgabe im gnuplot Format"
 
-#: src/applications/tbench/gnunet-tbench.c:71
+#: src/applications/tbench/gnunet-tbench.c:70
 msgid "number of iterations"
 msgstr "Anzahl an Durchläufen"
 
-#: src/applications/tbench/gnunet-tbench.c:75
+#: src/applications/tbench/gnunet-tbench.c:74
 msgid "number of messages to use per iteration"
 msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/applications/tbench/gnunet-tbench.c:78
+#: src/applications/tbench/gnunet-tbench.c:77
 msgid "receiver host identifier (ENC file name)"
 msgstr "Bezeichner des Empfängerhosts (ENC Dateiname)"
 
-#: src/applications/tbench/gnunet-tbench.c:81
+#: src/applications/tbench/gnunet-tbench.c:80
 msgid "message size"
 msgstr "Nachrichtengröße"
 
-#: src/applications/tbench/gnunet-tbench.c:84
+#: src/applications/tbench/gnunet-tbench.c:83
 msgid "sleep for SPACE ms after each a message block"
 msgstr "Für SPACE ms nach jedem Nachrichtenblock pausieren"
 
-#: src/applications/tbench/gnunet-tbench.c:87
+#: src/applications/tbench/gnunet-tbench.c:86
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
 
-#: src/applications/tbench/gnunet-tbench.c:91
+#: src/applications/tbench/gnunet-tbench.c:90
 msgid "number of messages in a message block"
 msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
 
-#: src/applications/tbench/gnunet-tbench.c:153
+#: src/applications/tbench/gnunet-tbench.c:144
 #, c-format
 msgid "You must specify a receiver!\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/applications/tbench/gnunet-tbench.c:162
+#: src/applications/tbench/gnunet-tbench.c:152
 #, c-format
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 "Ungültige Empfängerknoten ID angegeben (`%s' ist kein gültiger Name).\n"
 
-#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tbench/gnunet-tbench.c:182
 #, c-format
 msgid "Time:\n"
 msgstr "Zeit:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:190
+#: src/applications/tbench/gnunet-tbench.c:183
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr "\tMax      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:192
+#: src/applications/tbench/gnunet-tbench.c:185
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr "\tMin      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:194
+#: src/applications/tbench/gnunet-tbench.c:187
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr "\tMittel   %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:196
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr "\tVarianz  %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:199
+#: src/applications/tbench/gnunet-tbench.c:192
 #, c-format
 msgid "Loss:\n"
 msgstr "Verlust:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:200
+#: src/applications/tbench/gnunet-tbench.c:193
 #, c-format
 msgid "\tmax      %u\n"
 msgstr "\tMax      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:202
+#: src/applications/tbench/gnunet-tbench.c:195
 #, c-format
 msgid "\tmin      %u\n"
 msgstr "\tMin      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:204
+#: src/applications/tbench/gnunet-tbench.c:197
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr "\tMittel   %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:206
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr "\tVarianz %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:215
+#: src/applications/tbench/gnunet-tbench.c:208
 #, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:219
+#: src/applications/tbench/gnunet-tbench.c:212
 #, c-format
 msgid ""
 "\n"
@@ -1817,25 +2140,25 @@
 "Es wurde keine Nachricht von gnunetd empfangen. Läuft gnunetd?\n"
 
 #: src/applications/tbench/tbenchtest.c:51
-#: src/applications/tbench/tbenchtest_udp.c:51
+#: src/applications/tbench/tbenchtest_udp.c:50
 #, c-format
 msgid "Using %u messages of size %u for %u times.\n"
 msgstr "Verwende %u Nachrichten der Größe %u %umal.\n"
 
 #: src/applications/tbench/tbenchtest.c:78
-#: src/applications/tbench/tbenchtest_udp.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 "Zeiten:   Max %16llu  Min %16llu  Mittel %12.3f  Varianz %12.3f\n"
 
 #: src/applications/tbench/tbenchtest.c:83
-#: src/applications/tbench/tbenchtest_udp.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 "Verloren:  Max %16u  Min %16u  Mittel %12.3f  Varianz %12.3f\n"
 
 #: src/applications/tbench/tbenchtest.c:89
-#: src/applications/tbench/tbenchtest_udp.c:89
+#: src/applications/tbench/tbenchtest_udp.c:88
 #, c-format
 msgid ""
 "\n"
@@ -1845,33 +2168,33 @@
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
 #: src/applications/tbench/tbenchtest.c:211
-#: src/applications/tbench/tbenchtest_udp.c:211
+#: src/applications/tbench/tbenchtest_udp.c:210
 #, c-format
 msgid "Running benchmark...\n"
 msgstr "Benchmark läuft...\n"
 
-#: src/applications/tbench/tbench.c:460
+#: src/applications/tbench/tbench.c:420
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr "Ermöglicht das Untersuchen direkter Peer-to-Peer Verbindungen"
 
-#: src/applications/tracekit/gnunet-tracekit.c:49
+#: src/applications/tracekit/gnunet-tracekit.c:48
 msgid "probe network to the given DEPTH"
 msgstr "Netzwerk bis zur angegebenen Tiefe DEPTH sondieren"
 
-#: src/applications/tracekit/gnunet-tracekit.c:52
+#: src/applications/tracekit/gnunet-tracekit.c:51
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr "Gibt das Ausgabeformat an: 0 für menschen-lesbar, 1 für dot, 2 für vcg"
 
-#: src/applications/tracekit/gnunet-tracekit.c:58
+#: src/applications/tracekit/gnunet-tracekit.c:57
 msgid "use PRIO for the priority of the trace request"
 msgstr "PRIO als Priorität für die Trace Anfragen verwenden"
 
-#: src/applications/tracekit/gnunet-tracekit.c:62
+#: src/applications/tracekit/gnunet-tracekit.c:61
 msgid "wait DELAY seconds for replies"
 msgstr "DELAY Sekunden auf Antworten warten"
 
-#: src/applications/tracekit/gnunet-tracekit.c:116
+#: src/applications/tracekit/gnunet-tracekit.c:115
 #, c-format
 msgid ""
 "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
@@ -1880,28 +2203,28 @@
 "Formatangabe ungültig. Verwenden Sie 0 für menschen-lesbar, 1 für dot und 2 "
 "für vcg.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:163
+#: src/applications/tracekit/gnunet-tracekit.c:162
 #, c-format
 msgid "`%s' is not connected to any peer.\n"
 msgstr "`%s' ist zu keinem Knoten verbunden.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:197
+#: src/applications/tracekit/gnunet-tracekit.c:196
 #, c-format
 msgid "`%s' connected to `%s'.\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:212
+#: src/applications/tracekit/gnunet-tracekit.c:211
 #, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr ""
 "Formatangabe ungültig. Verwenden Sie 0 für menschen-lesbar und 1 für dot\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:235
+#: src/applications/tracekit/gnunet-tracekit.c:234
 #, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr "Knoten `%s' hat sich nicht zurückgemeldet.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:350
+#: src/applications/tracekit/gnunet-tracekit.c:342
 msgid "Could not send request to gnunetd.\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
@@ -2059,40 +2382,40 @@
 msgid "allows clients to determine gnunetd's configuration"
 msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:71
-#: src/applications/fs/tools/gnunet-insert.c:224
-#: src/applications/fs/tools/gnunet-search.c:129
-#: src/applications/fs/tools/gnunet-download.c:57
+#: src/applications/fs/tools/gnunet-pseudonym.c:70
+#: src/applications/fs/tools/gnunet-insert.c:229
+#: src/applications/fs/tools/gnunet-search.c:140
+#: src/applications/fs/tools/gnunet-download.c:65
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:74
+#: src/applications/fs/tools/gnunet-pseudonym.c:73
 msgid "automate creation of a namespace by starting a collection"
 msgstr ""
 "Erstellung eines Namespaces durch das Anfangen einer Collection "
 "automatisieren"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:78
+#: src/applications/fs/tools/gnunet-pseudonym.c:77
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "Neues Pseudonym unter dem angegebenen NICKNAME erstellen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:81
+#: src/applications/fs/tools/gnunet-pseudonym.c:80
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "Pseudonym mit dem angegeben NICKNAME löschen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:84
+#: src/applications/fs/tools/gnunet-pseudonym.c:83
 msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 "Automatisierte Erstellung eines Namespaces beenden (beendet Collection)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:86
-#: src/applications/fs/tools/gnunet-search.c:132
+#: src/applications/fs/tools/gnunet-pseudonym.c:85
+#: src/applications/fs/tools/gnunet-search.c:143
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
 msgstr ""
 "Erstellen von neuen Pseudonymen, Löschen von Pseudonymen und Auflisten von "
 "bestehenden Pseudonymen."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:89
+#: src/applications/fs/tools/gnunet-pseudonym.c:88
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
@@ -2100,13 +2423,13 @@
 "Das angegebene schlüsselwort verwenden, um den Namespace bekanntzumachen (zu "
 "verwenden, wenn ein neues Pseudonym erstellt wird)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:92
+#: src/applications/fs/tools/gnunet-pseudonym.c:91
 #, fuzzy
 msgid "specify metadata describing the namespace or collection"
 msgstr ""
 "Automatisierte Erstellung eines Namespaces beenden (beendet Collection)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:95
+#: src/applications/fs/tools/gnunet-pseudonym.c:94
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
@@ -2114,11 +2437,11 @@
 "Keine Bekanntmachung für diesen Namespace erstellen (zu verwenden, wenn ein "
 "neues Pseudonym erstellt wird)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:98
+#: src/applications/fs/tools/gnunet-pseudonym.c:97
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr "Keine Ausgabe der Pseudonyme in der Pseudonymdatenbank"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:101
+#: src/applications/fs/tools/gnunet-pseudonym.c:100
 msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
@@ -2126,66 +2449,66 @@
 "IDENTIFIER als Adresse angeben, die der Einsprungspunkt zu den Inhalten im "
 "Namespace ist (zu verwenden, wenn ein neues Pseudonym erstellt wird)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:104
+#: src/applications/fs/tools/gnunet-pseudonym.c:103
 msgid "set the rating of a namespace"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:138
+#: src/applications/fs/tools/gnunet-pseudonym.c:137
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:142
+#: src/applications/fs/tools/gnunet-pseudonym.c:141
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr "Namespace `%s' (%s) hat das Rating %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:178
+#: src/applications/fs/tools/gnunet-pseudonym.c:177
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr "\tRating (nach Update): %d\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:221
+#: src/applications/fs/tools/gnunet-pseudonym.c:211
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Collection beendet.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:223
+#: src/applications/fs/tools/gnunet-pseudonym.c:213
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr "Fehler beim Beenden der Collection (nicht aktiv?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:231
+#: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:235
+#: src/applications/fs/tools/gnunet-pseudonym.c:225
 #, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:254
+#: src/applications/fs/tools/gnunet-pseudonym.c:244
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:257
+#: src/applications/fs/tools/gnunet-pseudonym.c:247
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:299
+#: src/applications/fs/tools/gnunet-pseudonym.c:289
 #, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:304
+#: src/applications/fs/tools/gnunet-pseudonym.c:294
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr "Namespace `%s' wurde erstellt (Root: %s).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:326
+#: src/applications/fs/tools/gnunet-pseudonym.c:314
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -2228,47 +2551,47 @@
 msgid "start tracking entries for the directory database"
 msgstr "Anfangen, Einträge für die Verzeichnis Datenbank zu verfolgen"
 
-#: src/applications/fs/tools/gnunet-directory.c:181
+#: src/applications/fs/tools/gnunet-directory.c:174
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "%d übereinstimmende Einträge aufgelistet.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:139
+#: src/applications/fs/tools/gnunet-insert.c:137
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Eintag `%s' in Namespace `%s' wurde erstellt\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:144
+#: src/applications/fs/tools/gnunet-insert.c:142
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 "Der Eintrag konnte dem Namespace `%s' nicht hinzugefügt werden (existiert "
 "er?)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:166
+#: src/applications/fs/tools/gnunet-insert.c:168
 #, fuzzy, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "%16llu von %16llu Bytes eingefügt (geschätzte %s bis Fertigstellung)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:178
+#: src/applications/fs/tools/gnunet-insert.c:180
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Upload von `%s' komplett, %llu Bytes brauchten %llu Sekunden (%8.3f KB/s).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:189
+#: src/applications/fs/tools/gnunet-insert.c:191
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:200
+#: src/applications/fs/tools/gnunet-insert.c:202
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr "Download abgebrochen."
 
-#: src/applications/fs/tools/gnunet-insert.c:206
+#: src/applications/fs/tools/gnunet-insert.c:207
 #, c-format
 msgid ""
 "\n"
@@ -2277,8 +2600,15 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:216
+#, c-format
 msgid ""
+"\n"
+"Unexpected event: %d\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:233
+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 ""
@@ -2286,18 +2616,20 @@
 "anstelle der Erzeugung eines Links auf das GNUnet Share-Verzeichnis "
 "erzwingen."
 
-#: src/applications/fs/tools/gnunet-insert.c:232
+#: src/applications/fs/tools/gnunet-insert.c:237
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:235
+#: src/applications/fs/tools/gnunet-insert.c:240
+#, fuzzy
 msgid ""
-"use libextractor to add additional direct references to directory entries"
+"do not use libextractor to add additional references to directory entries "
+"and/or the published file"
 msgstr ""
 "benutze libextractor um weitere direkte Referenzen zu Dateien in "
 "Verzeichnissen zu erzeugen"
 
-#: src/applications/fs/tools/gnunet-insert.c:238
+#: src/applications/fs/tools/gnunet-insert.c:243
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2305,11 +2637,11 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:245
 msgid "Make files available to GNUnet for sharing."
 msgstr "Dateien GNUnet zum Filesharing zur Verfügung stellen."
 
-#: src/applications/fs/tools/gnunet-insert.c:243
+#: src/applications/fs/tools/gnunet-insert.c:248
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
@@ -2317,7 +2649,7 @@
 "Intervall der Verfügbarkeit von Updates auf SECONDS setzen (nur für das "
 "Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:247
+#: src/applications/fs/tools/gnunet-insert.c:252
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2325,7 +2657,7 @@
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/applications/fs/tools/gnunet-insert.c:251
+#: src/applications/fs/tools/gnunet-insert.c:256
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -2333,13 +2665,13 @@
 "Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
 "(diese Option kann mehrmals angegeben werden)"
 
-#: src/applications/fs/tools/gnunet-insert.c:256
+#: src/applications/fs/tools/gnunet-insert.c:261
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/applications/fs/tools/gnunet-insert.c:259
+#: src/applications/fs/tools/gnunet-insert.c:264
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2347,7 +2679,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/applications/fs/tools/gnunet-insert.c:263
+#: src/applications/fs/tools/gnunet-insert.c:268
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2355,17 +2687,17 @@
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:267
+#: src/applications/fs/tools/gnunet-insert.c:272
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/applications/fs/tools/gnunet-insert.c:270
+#: src/applications/fs/tools/gnunet-insert.c:275
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namespace)"
 
-#: src/applications/fs/tools/gnunet-insert.c:273
+#: src/applications/fs/tools/gnunet-insert.c:278
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
@@ -2373,33 +2705,33 @@
 "Dies als unregelmäßige aber aktualisierbare Veröffentlichung kennzeichnen "
 "(nur für das Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:277
+#: src/applications/fs/tools/gnunet-insert.c:282
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:281
+#: src/applications/fs/tools/gnunet-insert.c:286
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr "Erstellungszeit für den SBLOCK angeben (s. Manpage zum Format)"
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:289
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 "ID der vorherigen Version des Inhalts (nur für das Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:326
+#: src/applications/fs/tools/gnunet-insert.c:324
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:351
+#: src/applications/fs/tools/gnunet-insert.c:348
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:378
+#: src/applications/fs/tools/gnunet-insert.c:374
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Konnte nicht auf den Namespace `%s' zugreifen (existiert nicht?).\n"
@@ -2409,56 +2741,53 @@
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Das Parsen der Zeit schlug fehl. Verwenden Sie das `%s' Format.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:407
-#: src/applications/fs/tools/gnunet-insert.c:412
-#: src/applications/fs/tools/gnunet-insert.c:417
-#: src/applications/fs/tools/gnunet-insert.c:422
+#: src/applications/fs/tools/gnunet-insert.c:403
+#: src/applications/fs/tools/gnunet-insert.c:409
+#: src/applications/fs/tools/gnunet-insert.c:415
+#: src/applications/fs/tools/gnunet-insert.c:421
 #: src/applications/fs/tools/gnunet-insert.c:427
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/applications/fs/tools/gnunet-search.c:136
+#: src/applications/fs/tools/gnunet-search.c:147
 msgid "exit after receiving LIMIT results"
 msgstr "Abbrechen, nachdem LIMIT Ergebnisse empfangen wurden"
 
-#: src/applications/fs/tools/gnunet-search.c:139
-#: src/applications/fs/tools/gnunet-download.c:64
+#: src/applications/fs/tools/gnunet-search.c:150
+#: src/applications/fs/tools/gnunet-download.c:72
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "Begegnete (entschlüsselte) Suchergebnisse in FILENAME schreiben"
 
-#: src/applications/fs/tools/gnunet-search.c:142
+#: src/applications/fs/tools/gnunet-search.c:153
 #, fuzzy
 msgid "wait DELAY seconds for search results before aborting"
 msgstr "TIMEOUT Sekunden auf Suchergebnisse warten, bevor abgebrochen wird"
 
-#: src/applications/fs/tools/gnunet-search.c:189
+#: src/applications/fs/tools/gnunet-search.c:191
 #, c-format
-msgid "Starting search failed. Consult logs.\n"
-msgstr ""
-"Das Starten der Suche schlug fehl. Bitte ziehen Sie die Protokolldateien zu "
-"Rate.\n"
-
-#: src/applications/fs/tools/gnunet-search.c:277
-#, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
 
-#: src/applications/fs/tools/gnunet-download.c:60
+#: src/applications/fs/tools/gnunet-download.c:68
 msgid "Download files from GNUnet."
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/applications/fs/tools/gnunet-download.c:67
+#: src/applications/fs/tools/gnunet-download.c:75
 msgid "download a GNUnet directory recursively"
 msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
 
-#: src/applications/fs/tools/gnunet-download.c:86
+#: src/applications/fs/tools/gnunet-download.c:93
 #, fuzzy, c-format
 msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr "Download der Datei `%s' bei %16llu von %16llu Bytes (%8.3f kbps)\n"
 
-#: src/applications/fs/tools/gnunet-download.c:99
-#: src/applications/fs/tools/gnunet-download.c:110
+#: src/applications/fs/tools/gnunet-download.c:106
+#, fuzzy, c-format
+msgid "Download aborted.\n"
+msgstr "Download abgebrochen."
+
+#: src/applications/fs/tools/gnunet-download.c:112
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr "Fehler beim Download: %s\n"
@@ -2473,17 +2802,17 @@
 msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 msgstr "Nicht genügend Parameter. Sie müssen eine GNUnet Datei URI angeben\n"
 
-#: src/applications/fs/tools/gnunet-download.c:195
+#: src/applications/fs/tools/gnunet-download.c:194
 #, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr "URI `%s' ist ungültig für gnunet-download.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:244
+#: src/applications/fs/tools/gnunet-download.c:262
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/fs/tools/gnunet-unindex.c:57
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
@@ -2492,7 +2821,7 @@
 "%16llu von %16llu Bytes deindiziert (schätze %llu Sekunden bis "
 "Fertigstellung)            "
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:68
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2502,7 +2831,7 @@
 "Deindizierung von `%s' abgeschlossen, %llu Bytes benötigten %llu Sekunden (%"
 "8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:83
+#: src/applications/fs/tools/gnunet-unindex.c:80
 #, c-format
 msgid ""
 "\n"
@@ -2515,23 +2844,23 @@
 msgid "Unindex files."
 msgstr "Dateien deindizieren."
 
-#: src/applications/fs/tools/gnunet-unindex.c:145
+#: src/applications/fs/tools/gnunet-unindex.c:137
 #, fuzzy
 msgid "Not enough arguments. You must specify a filename.\n"
 msgstr "Nicht genügend Parameter. Sie müssen eine GNUnet Datei URI angeben\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:173
+#: src/applications/fs/tools/gnunet-unindex.c:164
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "`%s' schlug fehl. Ist `%s' eine Datei?\n"
 
-#: src/applications/fs/module/ondemand.c:317
+#: src/applications/fs/module/ondemand.c:320
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 "Indizierte Datei ist verschwunden, Block für Anfrage `%s' wird gelöscht\n"
 
-#: src/applications/fs/module/ondemand.c:411
+#: src/applications/fs/module/ondemand.c:418
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2542,7 +2871,7 @@
 "aus Ihrem Share entfernt. Bitte deindizieren Sie Dateien, bevor Sie sie "
 "löschen, da Ihr Index nun ungültige Referenzen enthält!\n"
 
-#: src/applications/fs/module/ondemand.c:438
+#: src/applications/fs/module/ondemand.c:445
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2551,7 +2880,7 @@
 "Die Konfigurationsdatei muss ein Verzeichnis für die Speicherung von FS "
 "Daten in der Sektion `%s' unter `%s' angeben.\n"
 
-#: src/applications/fs/module/ondemand.c:655
+#: src/applications/fs/module/ondemand.c:664
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -2559,7 +2888,7 @@
 "Deindizierter ODB Block `%s' vom Offset %llu fehlt bereits im "
 "Datenspeicher.\n"
 
-#: src/applications/fs/module/fs.c:1196
+#: src/applications/fs/module/fs.c:1229
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2568,12 +2897,12 @@
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/applications/fs/module/fs.c:1247
+#: src/applications/fs/module/fs.c:1281
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr "`%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/module/fs.c:1287
+#: src/applications/fs/module/fs.c:1321
 msgid "enables (anonymous) file-sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
@@ -2585,52 +2914,39 @@
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/downloadtest.c:239
+#: src/applications/fs/fsui/searchtest.c:156
+#: src/applications/fs/fsui/fsuitest.c:199
+#: src/applications/fs/fsui/downloadtest.c:308
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
 msgid "AND"
 msgstr "UND"
 
-#: src/applications/fs/fsui/fsui.c:195
-msgid "FSUI persistence: error restoring download\n"
-msgstr "FSUI Beständigkeit: Fehler beim Wiederherstellen des Downloads\n"
+#: src/applications/fs/fsui/search.c:265
+#, fuzzy
+msgid "Error running search (consult logs)."
+msgstr ""
+"Das Starten der Suche schlug fehl. Bitte ziehen Sie die Protokolldateien zu "
+"Rate.\n"
 
-#: src/applications/fs/fsui/fsui.c:666
-#, c-format
-msgid "FSUI state file `%s' had syntax error at offset %u.\n"
-msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n"
-
-#: src/applications/fs/fsui/download.c:305
-msgid "Download aborted."
-msgstr "Download abgebrochen."
-
-#: src/applications/fs/fsui/download.c:309
-msgid "ECRS download failed (see logs)."
+#: src/applications/fs/fsui/download.c:263
+#, fuzzy
+msgid "ECRS download failed (see logs)"
 msgstr "ECRS Download schlug fehl (siehe Protokolldateien)."
 
-#: src/applications/fs/fsui/download.c:313
-msgid "ECRS download suspending."
-msgstr "ECRS download wird eingefroren."
-
-#: src/applications/fs/fsui/download.c:317
-msgid "Unexpected download state."
-msgstr ""
-
-#: src/applications/fs/fsui/unindex.c:80
+#: src/applications/fs/fsui/unindex.c:99
 msgid "Unindex failed."
 msgstr "Deindizierung schlug fehl."
 
-#: src/applications/fs/fsui/upload.c:229 src/applications/fs/fsui/upload.c:374
-#: src/applications/fs/fsui/upload.c:413
-msgid "Upload failed."
-msgstr "Upload fehlgeschlagen."
+#: src/applications/fs/fsui/upload.c:222
+#, fuzzy
+msgid "Failed to create temporary directory."
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/applications/fs/fsui/upload.c:420
-msgid "Cannot upload directory without using recursion."
-msgstr ""
-"Verzeichnis kann nicht ohne die Verwendung von Rekursion hochgeladen werden."
+#: src/applications/fs/fsui/upload.c:244
+#, fuzzy
+msgid "Upload failed (consult logs)."
+msgstr "ECRS Download schlug fehl (siehe Protokolldateien)."
 
 #: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
@@ -2659,81 +2975,81 @@
 "Bug oder eine mit bösen Absichten eingefügte Datei. Download wurde "
 "abgebrochen.\n"
 
-#: src/applications/fs/ecrs/download.c:1153
+#: src/applications/fs/ecrs/download.c:1157
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 "Inhalt `%s' scheint im Netzwerk nicht verfügbar zu sein (%u mal versucht).\n"
 
-#: src/applications/fs/ecrs/upload.c:170
+#: src/applications/fs/ecrs/upload.c:161
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/fs/ecrs/upload.c:171
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Die Größe der Datei `%s' konnte nicht ermittelt werden"
 
-#: src/applications/fs/ecrs/upload.c:188
+#: src/applications/fs/ecrs/upload.c:179
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:200
+#: src/applications/fs/ecrs/upload.c:191
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "`%s' konnte nicht gehashed werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:219
+#: src/applications/fs/ecrs/upload.c:210
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Initialisierung der Indizierung der Datei `%s' fehlgeschlagen.\n"
 
-#: src/applications/fs/ecrs/upload.c:226
+#: src/applications/fs/ecrs/upload.c:217
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/applications/fs/ecrs/upload.c:312
+#: src/applications/fs/ecrs/upload.c:303
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
 
-#: src/applications/fs/ecrs/meta.c:847
+#: src/applications/fs/ecrs/meta.c:849
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Umbenennen der Datei `%s' zu `%s' fehlgeschlagen: %s\n"
 
-#: src/applications/fs/ecrs/meta.c:855
+#: src/applications/fs/ecrs/meta.c:857
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr ""
 "Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n"
 
-#: src/applications/fs/ecrs/namespace.c:153
+#: src/applications/fs/ecrs/namespace.c:154
 #, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr ""
 "Pseudonym `%s' kann nicht erstellt werden, da die Datei `%s' bereits "
 "existiert.\n"
 
-#: src/applications/fs/ecrs/namespace.c:338
-#: src/applications/fs/ecrs/namespace.c:419
-#: src/applications/fs/ecrs/namespace.c:573
+#: src/applications/fs/ecrs/namespace.c:339
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:574
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/applications/fs/ecrs/namespace.c:350
-#: src/applications/fs/ecrs/namespace.c:430
+#: src/applications/fs/ecrs/namespace.c:351
+#: src/applications/fs/ecrs/namespace.c:431
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:587
-#: src/applications/fs/ecrs/namespace.c:598
+#: src/applications/fs/ecrs/namespace.c:588
+#: src/applications/fs/ecrs/namespace.c:599
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Format der Datei `%s' ist ungültig.\n"
@@ -2749,21 +3065,21 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:123
+#: src/applications/fs/uritrack/file_info.c:125
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Einsammeln von Dateibezeichnern deaktiviert.\n"
 
-#: src/applications/fs/uritrack/file_info.c:355
+#: src/applications/fs/uritrack/file_info.c:367
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:654
+#: src/applications/fs/namespace/namespace_info.c:656
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 "Veröffentlichungsintervall für periodische Veröffentlichung wurde geändert."
 
-#: src/applications/fs/namespace/namespace_info.c:675
+#: src/applications/fs/namespace/namespace_info.c:677
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -2771,16 +3087,16 @@
 "Veröffentlichungsdatum für periodisch aktualisierten Inhalt ist mehr als "
 "eine Woche früher als geplant.\n"
 
-#: src/applications/topology_f2f/topology.c:354
+#: src/applications/topology_f2f/topology.c:359
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/applications/topology_f2f/topology.c:371
+#: src/applications/topology_f2f/topology.c:376
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/applications/topology_f2f/topology.c:384
+#: src/applications/topology_f2f/topology.c:389
 #, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
@@ -2790,20 +3106,37 @@
 msgid "`%s' registering client handler %d and %d\n"
 msgstr "`%s' registriert Client-Handler %d and %d\n"
 
-#: src/applications/template/gnunet-template.c:44
+#: src/applications/template/gnunet-template.c:43
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:92
+#: src/applications/bootstrap_http/http.c:100
 #, fuzzy, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
-#: src/applications/bootstrap_http/http.c:144
+#: src/applications/bootstrap_http/http.c:121
+#: src/applications/bootstrap_http/http.c:263
+#: src/applications/bootstrap_http/http.c:283
+#: src/applications/bootstrap_http/http.c:317
+#: src/applications/bootstrap_http/http.c:335
+#: src/applications/bootstrap_http/http.c:349
+#: src/applications/bootstrap_http/http.c:361
+#: src/applications/bootstrap_http/http.c:373
+#, fuzzy, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#: src/applications/bootstrap_http/http.c:173
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:229
+#, fuzzy, c-format
+msgid "Trying to download hostlist from `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/applications/bootstrap_http/http.c:409
 msgid "# hellos downloaded via http"
 msgstr "# Hellos per HTTP heruntergeladen"
 
@@ -2821,342 +3154,338 @@
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/applications/vpn/gnunet-vpn.c:98
+#: src/applications/vpn/gnunet-vpn.c:56
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:103
-msgid "VPN over GNUnet."
-msgstr ""
-
-#: src/applications/vpn/vpn.c:351
+#: src/applications/vpn/vpn.c:326
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:359
+#: src/applications/vpn/vpn.c:334
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:387
+#: src/applications/vpn/vpn.c:362
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:436
+#: src/applications/vpn/vpn.c:411
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:440
+#: src/applications/vpn/vpn.c:415
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:450
+#: src/applications/vpn/vpn.c:425
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:510
+#: src/applications/vpn/vpn.c:485
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:514
+#: src/applications/vpn/vpn.c:489
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:541
+#: src/applications/vpn/vpn.c:518
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:549
+#: src/applications/vpn/vpn.c:526
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:553
+#: src/applications/vpn/vpn.c:530
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:591
+#: src/applications/vpn/vpn.c:568
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:595
+#: src/applications/vpn/vpn.c:572
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:602
+#: src/applications/vpn/vpn.c:579
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:607
+#: src/applications/vpn/vpn.c:584
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:615
+#: src/applications/vpn/vpn.c:592
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:627
+#: src/applications/vpn/vpn.c:604
 #, fuzzy, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/applications/vpn/vpn.c:638
+#: src/applications/vpn/vpn.c:615
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:650
+#: src/applications/vpn/vpn.c:627
 #, fuzzy, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/applications/vpn/vpn.c:683
+#: 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"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:729
+#: src/applications/vpn/vpn.c:706
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:788
+#: src/applications/vpn/vpn.c:769
 #, c-format
 msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:792
+#: src/applications/vpn/vpn.c:773
 #, c-format
 msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:810
+#: src/applications/vpn/vpn.c:791
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:850
+#: src/applications/vpn/vpn.c:831
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:835
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:860
+#: src/applications/vpn/vpn.c:841
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:863
+#: src/applications/vpn/vpn.c:844
 #, fuzzy, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
 
-#: src/applications/vpn/vpn.c:873
+#: src/applications/vpn/vpn.c:854
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:892
+#: src/applications/vpn/vpn.c:873
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:913
+#: src/applications/vpn/vpn.c:894
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:918
+#: src/applications/vpn/vpn.c:899
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:929
+#: src/applications/vpn/vpn.c:910
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:935
+#: src/applications/vpn/vpn.c:916
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:951
+#: src/applications/vpn/vpn.c:932
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:955
+#: src/applications/vpn/vpn.c:936
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:959
+#: src/applications/vpn/vpn.c:940
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:973
+#: src/applications/vpn/vpn.c:954
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:988
+#: src/applications/vpn/vpn.c:969
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1016
+#: src/applications/vpn/vpn.c:997
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1031
+#: src/applications/vpn/vpn.c:1012
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1076
+#: src/applications/vpn/vpn.c:1057
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1122
+#: src/applications/vpn/vpn.c:1103
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1148
+#: src/applications/vpn/vpn.c:1129
 msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1208
+#: src/applications/vpn/vpn.c:1190
 msgid "Yes"
 msgstr "Ja"
 
-#: src/applications/vpn/vpn.c:1208
+#: src/applications/vpn/vpn.c:1190
 msgid "No"
 msgstr "Nein"
 
-#: src/applications/vpn/vpn.c:1385
+#: src/applications/vpn/vpn.c:1396
 #, fuzzy, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr "`%s' registriert Handler %d und %d\n"
 
-#: src/applications/vpn/vpn.c:1386
+#: src/applications/vpn/vpn.c:1397
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1434
+#: src/applications/vpn/vpn.c:1447
 #, fuzzy
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr "Ermöglicht P2P-Chat"
 
-#: src/applications/vpn/vpn.c:1466
+#: src/applications/vpn/vpn.c:1479
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1477
+#: src/applications/vpn/vpn.c:1492
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1490
+#: src/applications/vpn/vpn.c:1507
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:142
+#: src/server/gnunet-update.c:141
 #, c-format
 msgid "Updating data for module `%s'\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/server/gnunet-update.c:147
+#: src/server/gnunet-update.c:146
 #, c-format
 msgid "Failed to update data for module `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/server/gnunet-update.c:218 src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-update.c:217 src/server/gnunet-transport-check.c:355
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr "Knoten aus HOSTLISTURL anpingen, deren Transports passen"
 
-#: src/server/gnunet-update.c:220
+#: src/server/gnunet-update.c:219
 msgid "Updates GNUnet datastructures after version change."
 msgstr "GNUnet Datenstrukturen nach einer Versionsänderung aktualisieren."
 
-#: src/server/gnunet-update.c:224 src/server/gnunet-transport-check.c:369
+#: src/server/gnunet-update.c:223 src/server/gnunet-transport-check.c:370
 msgid "run as user LOGIN"
 msgstr "als Benutzer LOGIN ausführen"
 
-#: src/server/gnunet-update.c:227
+#: src/server/gnunet-update.c:226
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 "Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
 "zu holen"
 
-#: src/server/connection.c:992
+#: src/server/connection.c:1023
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "`%s' wählte %d von %d Nachrichten aus (MTU: %d).\n"
 
-#: src/server/connection.c:999
+#: src/server/connection.c:1032
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Nachrichten Details: %u: Länge %d, Priorität: %d\n"
 
-#: src/server/connection.c:2283
+#: src/server/connection.c:2417
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Nachricht von `%s' verworfen: ungültiges Format.\n"
 
-#: src/server/connection.c:2355
+#: src/server/connection.c:2489
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Ungültige Sequenznummer %u <= %u, Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:2370
+#: src/server/connection.c:2506
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 "Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:2774
+#: src/server/connection.c:2929
 msgid "# outgoing messages dropped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:2778
+#: src/server/connection.c:2933
 msgid "# bytes of outgoing messages dropped"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:2780
+#: src/server/connection.c:2935
 msgid "# connections closed (HANGUP sent)"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/server/connection.c:2783
+#: src/server/connection.c:2938
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/server/connection.c:2787
+#: src/server/connection.c:2942
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/server/connection.c:2791
+#: src/server/connection.c:2946
 #, fuzzy
 msgid "# bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/server/connection.c:2793
+#: src/server/connection.c:2948
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/server/connection.c:2794
+#: src/server/connection.c:2949
 msgid "# bytes noise sent"
 msgstr "# Bytes Rauschen gesendet"
 
@@ -3183,16 +3512,16 @@
 msgid "Starts the gnunetd daemon."
 msgstr "Startet den gnunetd Daemonen."
 
-#: src/server/gnunetd.c:176
+#: src/server/gnunetd.c:175
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:180
+#: src/server/gnunetd.c:179
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
-#: src/server/gnunetd.c:236
+#: src/server/gnunetd.c:228
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -3241,32 +3570,32 @@
 msgid "Could not properly unload service `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/server/gnunet-transport-check.c:115
+#: src/server/gnunet-transport-check.c:116
 #, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "`%s': Hello konnte nicht erzeugt werden.\n"
 
-#: src/server/gnunet-transport-check.c:124
+#: src/server/gnunet-transport-check.c:125
 #, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "`%s': Verbindung konnte nicht hergestellt werden.\n"
 
-#: src/server/gnunet-transport-check.c:158
+#: src/server/gnunet-transport-check.c:159
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr "`%s': Kann nicht senden.\n"
 
-#: src/server/gnunet-transport-check.c:180
+#: src/server/gnunet-transport-check.c:181
 #, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
 
-#: src/server/gnunet-transport-check.c:194
+#: src/server/gnunet-transport-check.c:195
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "`%s': Verbindung konnte nicht getrennt werden.\n"
 
-#: src/server/gnunet-transport-check.c:201
+#: src/server/gnunet-transport-check.c:202
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -3275,12 +3604,12 @@
 "`%s' Transport funktioniert. Es dauerte %ums, um %d Nachrichten zu je %d "
 "Bytes zu übertragen.\n"
 
-#: src/server/gnunet-transport-check.c:229
+#: src/server/gnunet-transport-check.c:230
 #, fuzzy, c-format
 msgid " Transport %d is not being tested\n"
 msgstr " Transport %d ist nicht verfügbar\n"
 
-#: src/server/gnunet-transport-check.c:245
+#: src/server/gnunet-transport-check.c:246
 #, c-format
 msgid ""
 "\n"
@@ -3289,58 +3618,58 @@
 "\n"
 "Kontaktiere `%s'."
 
-#: src/server/gnunet-transport-check.c:266
+#: src/server/gnunet-transport-check.c:267
 #, c-format
 msgid " Connection failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/server/gnunet-transport-check.c:272
+#: src/server/gnunet-transport-check.c:273
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
-#: src/server/gnunet-transport-check.c:324
+#: src/server/gnunet-transport-check.c:325
 #, c-format
 msgid "No reply received within %llums.\n"
 msgstr "Keine Antwort innerhalb %llums erhalten.\n"
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:351
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 "Werkzeug, mit dem getestet werden kann, ob die GNUnet Transport Dienste "
 "funktionsfähig sind."
 
-#: src/server/gnunet-transport-check.c:357
+#: src/server/gnunet-transport-check.c:358
 msgid "send COUNT messages"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/server/gnunet-transport-check.c:360
+#: src/server/gnunet-transport-check.c:361
 msgid "send messages with SIZE bytes payload"
 msgstr "Nachrichten mit SIZE Bytes Nutzlast versenden"
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:364
 msgid "specifies which TRANSPORT should be tested"
 msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
 
-#: src/server/gnunet-transport-check.c:366
+#: src/server/gnunet-transport-check.c:367
 msgid "specifies after how many MS to time-out"
 msgstr "Gibt an, nach wievielen MS die Zeit abgelaufen sein soll"
 
-#: src/server/gnunet-transport-check.c:374
+#: src/server/gnunet-transport-check.c:375
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:455
+#: src/server/gnunet-transport-check.c:440
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/server/gnunet-transport-check.c:458
+#: src/server/gnunet-transport-check.c:443
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/server/gnunet-transport-check.c:518
+#: src/server/gnunet-transport-check.c:503
 #, c-format
 msgid ""
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
@@ -3358,7 +3687,7 @@
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/server/tcpserver.c:384
+#: src/server/tcpserver.c:386
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
@@ -3367,7 +3696,7 @@
 "Beschädigte Netzwerkangabe in der Konfigurationsdatei in Sektion `%s' für "
 "Eintrag `%s': %s\n"
 
-#: src/server/tcpserver.c:437
+#: src/server/tcpserver.c:439
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
@@ -3377,30 +3706,30 @@
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"
 
-#: src/server/version.c:157
+#: src/server/version.c:152
 msgid ""
 "Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:52
+#: src/server/gnunet-peer-info.c:51
 msgid "Print information about GNUnet peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/server/gnunet-peer-info.c:79 src/server/gnunet-peer-info.c:94
+#: src/server/gnunet-peer-info.c:78 src/server/gnunet-peer-info.c:93
 #, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/server/gnunet-peer-info.c:88
+#: src/server/gnunet-peer-info.c:87
 msgid "hello message invalid (signature invalid).\n"
 msgstr "Hello Nachricht ist ungültig (Signatur ist ungültig).\n"
 
-#: src/server/gnunet-peer-info.c:99
+#: src/server/gnunet-peer-info.c:98
 #, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/cron/cron.c:355
+#: src/util/cron/cron.c:356
 #, c-format
 msgid ""
 "`%s' called with cron job not in queue, adding.  This may not be what you "
@@ -3409,20 +3738,20 @@
 "`%s' aufgerufen wobei Cron Job nicht Warteschlange ist. Er wird hinzugefügt. "
 "Das ist möglicherweise nicht, was Sie wollen.\n"
 
-#: src/util/network_client/tcpio.c:90
+#: src/util/network_client/tcpio.c:94
 msgid "Could not find valid value for PORT in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:114
+#: src/util/network_client/tcpio.c:118
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:209 src/util/network_client/tcpio.c:237
+#: src/util/network_client/tcpio.c:251 src/util/network_client/tcpio.c:281
 #, fuzzy, c-format
 msgid "Cannot connect to %s:u: %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/util/network_client/tcpio.c:356
+#: src/util/network_client/tcpio.c:403
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "`%s' fehlgeschlagen, Antwort ist ungültig!\n"
@@ -3456,17 +3785,17 @@
 msgid "Can't create semaphore: %i"
 msgstr "Semaphore konnte nicht angelegt werden: %i"
 
-#: src/util/os/dso.c:51
+#: src/util/os/dso.c:56
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
 
-#: src/util/os/dso.c:90
+#: src/util/os/dso.c:110
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/os/dso.c:132
+#: src/util/os/dso.c:152
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
@@ -3485,24 +3814,24 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/util/os/user.c:125
+#: src/util/os/user.c:124
 #, c-format
 msgid "User `%s' not known, cannot change UID to it.\n"
 msgstr "Benutzer `%s' ist nicht bekannt, UID kann nicht gewechselt werden.\n"
 
-#: src/util/os/user.c:136
+#: src/util/os/user.c:135
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/util/network/select.c:272
+#: src/util/network/select.c:282
 #, fuzzy
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 "Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
 "u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/util/network/select.c:421
+#: src/util/network/select.c:443
 msgid "select listen socket not valid!\n"
 msgstr ""
 
@@ -3537,124 +3866,125 @@
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk/storage.c:247
+#: src/util/disk/storage.c:517
 #, fuzzy, c-format
-msgid "Expected `%s' to be a directory\n"
+msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk/storage.c:286
-#, fuzzy, c-format
-msgid "Expected `%s' to be a regular file\n"
-msgstr "`%s' ist keine normale Datei.\n"
-
-#: src/util/disk/storage.c:493
-#, fuzzy, c-format
-msgid "expected `%s' to be a directory!\n"
-msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
-
-#: src/util/config_impl/impl.c:260
+#: src/util/config_impl/impl.c:275
 #, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/config_impl/impl.c:421
+#: src/util/config_impl/impl.c:505
 #, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgstr ""
+
+#: src/util/config_impl/impl.c:551
+#, c-format
 msgid ""
 "Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
 "llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:433
+#: src/util/config_impl/impl.c:563
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:513
+#: src/util/config_impl/impl.c:653
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:624
+#: src/util/error/error.c:122
 #, c-format
-msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgid ""
+"\n"
+"Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:156 src/util/error/error.c:200
+#: src/util/error/error.c:190 src/util/error/error.c:234
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/error/error.c:159 src/util/error/error.c:202
+#: src/util/error/error.c:193 src/util/error/error.c:236
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:162 src/util/error/error.c:204
+#: src/util/error/error.c:196 src/util/error/error.c:240
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/error/error.c:165 src/util/error/error.c:206
+#: src/util/error/error.c:199 src/util/error/error.c:242
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/error/error.c:168 src/util/error/error.c:208
+#: src/util/error/error.c:202 src/util/error/error.c:244
 msgid "FATAL"
 msgstr "SCHWERWIEGEND"
 
-#: src/util/error/error.c:171 src/util/error/error.c:210
+#: src/util/error/error.c:205 src/util/error/error.c:246
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:174 src/util/error/error.c:212
+#: src/util/error/error.c:208 src/util/error/error.c:248
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:177 src/util/error/error.c:214
+#: src/util/error/error.c:211 src/util/error/error.c:250
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:180 src/util/error/error.c:216
+#: src/util/error/error.c:214 src/util/error/error.c:252
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:183 src/util/error/error.c:218
+#: src/util/error/error.c:217 src/util/error/error.c:254
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:186 src/util/error/error.c:220
+#: src/util/error/error.c:220 src/util/error/error.c:256
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:189
+#: src/util/error/error.c:223
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:221
+#: src/util/error/error.c:238
+msgid "INFO"
+msgstr "INFO"
+
+#: src/util/error/error.c:257
 msgid "NOTHING"
 msgstr "NICHTS"
 
-#: src/util/threads/mutex.c:131 src/util/threads/mutex.c:151
+#: src/util/threads/mutex.c:145 src/util/threads/mutex.c:165
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/threads/mutex.c:136
+#: src/util/threads/mutex.c:150
 #, fuzzy, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr "Durch `%s' ist ein Deadlock bei %s:%d entstanden\n"
 
-#: src/util/threads/mutex.c:156
+#: src/util/threads/mutex.c:170
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/util/threads/pthread.c:139 src/util/threads/pthread.c:147
-#: src/util/threads/pthread.c:154 src/util/threads/pthread.c:245
+#: src/util/threads/pthread.c:158 src/util/threads/pthread.c:166
+#: src/util/threads/pthread.c:173 src/util/threads/pthread.c:266
 #, fuzzy, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/util/threads/pthread.c:161 src/util/threads/pthread.c:256
+#: src/util/threads/pthread.c:180 src/util/threads/pthread.c:277
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -3725,8 +4055,13 @@
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/printhelp.c:49
+#: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
 #, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
+
+#: src/util/getopt/printhelp.c:50
+#, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
@@ -3785,21 +4120,21 @@
 msgid "Tool to setup GNUnet."
 msgstr "Werkzeug für die Einrichtung von GNUnet."
 
-#: src/setup/gnunet-setup.c:152
+#: src/setup/gnunet-setup.c:185
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Ungültige Kommandozeilen Parameter.\n"
 
-#: src/setup/gnunet-setup.c:157
+#: src/setup/gnunet-setup.c:190
 msgid "No interface specified, using default\n"
 msgstr "Keine Oberfläche angegeben, verwende Standard\n"
 
-#: src/setup/gnunet-setup.c:227
+#: src/setup/gnunet-setup.c:264
 #, c-format
 msgid "`%s' is not available."
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/setup/gnunet-setup.c:243
+#: src/setup/gnunet-setup.c:280
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
@@ -3911,19 +4246,33 @@
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/setup/gtk/wizard_gtk.c:429
+#: src/setup/gtk/wizard_gtk.c:137
+#, fuzzy
+msgid "(unknown connection)"
+msgstr "Netzwerkverbindung"
+
+#: src/setup/gtk/wizard_gtk.c:390
 #, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/setup/gtk/wizard_gtk.c:475 src/setup/ncurses/wizard_curs.c:620
+#: src/setup/gtk/wizard_gtk.c:415
+#, fuzzy
+msgid "Do you want to save the new configuration?"
+msgstr "Möchten Sie Ihre Einstellungen speichern?"
+
+#: src/setup/gtk/wizard_gtk.c:442 src/setup/ncurses/wizard_curs.c:620
 msgid "Unable to create user account:"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/setup/gtk/wizard_gtk.c:482 src/setup/ncurses/wizard_curs.c:623
+#: src/setup/gtk/wizard_gtk.c:449 src/setup/ncurses/wizard_curs.c:623
 msgid "Unable to change startup process:"
 msgstr "Startprozeß konnte nicht geändert werden:"
 
+#: src/setup/gtk/wizard_gtk.c:458
+msgid "gnunet-update failed. Please run gnunet-update manually."
+msgstr ""
+
 #: src/setup/text/conf.c:74
 #, fuzzy
 msgid "yes"
@@ -4018,38 +4367,38 @@
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:538
+#: src/setup/text/conf.c:542
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:539
+#: src/setup/text/conf.c:543
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:553 src/setup/ncurses/mconf.c:422
+#: src/setup/text/conf.c:557 src/setup/ncurses/mconf.c:422
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/setup/text/conf.c:558
+#: src/setup/text/conf.c:562
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:568
+#: src/setup/text/conf.c:572
 #, fuzzy, c-format
 msgid "Configuration was unchanged, no need to save.\n"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/setup/text/conf.c:573
+#: src/setup/text/conf.c:577
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
@@ -4447,47 +4796,100 @@
 "Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:145
+#: src/include/gnunet_util_getopt.h:150
 msgid "print this help"
 msgstr "Gibt diese Hilfe aus"
 
-#: src/include/gnunet_util_getopt.h:154
+#: src/include/gnunet_util_getopt.h:159
 msgid "print the version number"
 msgstr "Versionsnummer ausgeben"
 
-#: src/include/gnunet_util_getopt.h:160
-msgid "configure logging to use LOGRULES"
+#: src/include/gnunet_util_getopt.h:165
+msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:166
+#: src/include/gnunet_util_getopt.h:171
 msgid "be verbose"
 msgstr "umfangreiche Meldungen ausgeben"
 
-#: src/include/gnunet_util_getopt.h:172
+#: src/include/gnunet_util_getopt.h:177
 msgid "use configuration file FILENAME"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/include/gnunet_util_getopt.h:178
+#: src/include/gnunet_util_getopt.h:183
 msgid "specify host on which gnunetd is running"
 msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
-#: src/include/gnunet_util_error.h:163 src/include/gnunet_util_error.h:165
-#: src/include/gnunet_util_error.h:167 src/include/gnunet_util_error.h:169
+#: src/include/gnunet_util_error.h:175 src/include/gnunet_util_error.h:177
+#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:181
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d in %s.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_util_error.h:176 src/include/gnunet_util_error.h:183
-#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#: src/include/gnunet_util_error.h:188 src/include/gnunet_util_error.h:195
+#: src/include/gnunet_util_error.h:202 src/include/gnunet_util_error.h:209
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
+#: src/include/gnunet_util_error.h:216 src/include/gnunet_util_error.h:223
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
+#~ msgid "Could not resolve name of SMTP server `%s': %s"
+#~ msgstr "Der Name des SMTP servers `%s' konnte nicht aufgelöst werden: %s"
+
+#~ msgid "SMTP server send unexpected response at %s:%d.\n"
+#~ msgstr "Der SMTP server sendete eine unerwartete Antwort bei %s:%d.\n"
+
+#~ msgid ""
+#~ "SMTP server failed to respond with 250 confirmation code to `%s' "
+#~ "request.\n"
+#~ msgstr ""
+#~ "SMTP Server antwortete nicht mit einem 250 Bestätigungscode auf eine `%s' "
+#~ "Anfrage.\n"
+
+#~ msgid "Failed to send `%s' request to SMTP server.\n"
+#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#~ msgid "query table called NAME"
+#~ msgstr "Frage Tabelle mit dem Namen NAME ab"
+
+#~ msgid "No commands specified.\n"
+#~ msgstr "Keine Kommandos angegeben.\n"
+
+#~ msgid "Superflous arguments (ignored).\n"
+#~ msgstr "überflüssige Parameter (werden ignoriert).\n"
+
+#~ msgid "Query `%s' had no results.\n"
+#~ msgstr "Abfrage `%s' hatte keine Ergebnisse.\n"
+
+#~ msgid "FSUI persistence: error restoring download\n"
+#~ msgstr "FSUI Beständigkeit: Fehler beim Wiederherstellen des Downloads\n"
+
+#~ msgid "FSUI state file `%s' had syntax error at offset %u.\n"
+#~ msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n"
+
+#~ msgid "ECRS download suspending."
+#~ msgstr "ECRS download wird eingefroren."
+
+#~ msgid "Upload failed."
+#~ msgstr "Upload fehlgeschlagen."
+
+#~ msgid "Cannot upload directory without using recursion."
+#~ msgstr ""
+#~ "Verzeichnis kann nicht ohne die Verwendung von Rekursion hochgeladen "
+#~ "werden."
+
+#, fuzzy
+#~ msgid "Expected `%s' to be a regular file\n"
+#~ msgstr "`%s' ist keine normale Datei.\n"
+
+#, fuzzy
+#~ msgid "expected `%s' to be a directory!\n"
+#~ msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
+
 #~ msgid "Sorry, no help is available for this option.\n"
 #~ msgstr "Sorry, für diese Option steht keine Hilfe zur Verfügung.\n"
 
@@ -4740,9 +5142,6 @@
 #~ msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
 #~ msgstr "Ungültiger Port \"%s\" in Angabe der Hostlist, versuche Port %d.\n"
 
-#~ msgid "`%s' failed at %s:%d with error: `%s'.\n"
-#~ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
-
 #~ msgid "Could not download list of peer contacts, host `%s' unknown.\n"
 #~ msgstr ""
 #~ "Die Liste mit Knotenkontakten konnte nicht heruntergeladen werden, Host `%"
@@ -4993,9 +5392,6 @@
 #~ "Rechner mit DNAT (auch bekannt als \"Port forwarding\") zum Internet "
 #~ "haben."
 
-#~ msgid "Network interface:"
-#~ msgstr "Netzwerkgerät:"
-
 #~ msgid "IP-Address/Hostname:"
 #~ msgstr "IP-Adresse/Hostname:"
 
@@ -5003,9 +5399,6 @@
 #~ msgstr ""
 #~ "Computer kann keine ankommenden Verbindungen akzeptieren (SNAT/Firewall)"
 
-#~ msgid "Network connection"
-#~ msgstr "Netzwerkverbindung"
-
 #~ msgid ""
 #~ "You can limit GNUnet's ressource usage here.\n"
 #~ "\n"
@@ -5188,15 +5581,9 @@
 #~ msgid "Show _range"
 #~ msgstr "_Bereich anzeigen"
 
-#~ msgid "Show value of the option"
-#~ msgstr "Wert der Option anzeigen"
-
 #~ msgid "Show _data"
 #~ msgstr "_Daten anzeigen"
 
-#~ msgid "Show all options"
-#~ msgstr "Alle Optionen anzeigen"
-
 #~ msgid "Show all _options"
 #~ msgstr "Alle _Optionen anzeigen"
 
@@ -5306,9 +5693,6 @@
 #~ msgid "MESSAGE"
 #~ msgstr "MELDUNG"
 
-#~ msgid "INFO"
-#~ msgstr "INFO"
-
 #~ msgid "CRON"
 #~ msgstr "CRON"
 

Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po     2006-11-12 07:38:46 UTC (rev 3716)
+++ GNUnet/po/es.po     2006-11-12 08:05:43 UTC (rev 3717)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-09-10 22:06-0600\n"
+"POT-Creation-Date: 2006-11-12 01:40-0700\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -93,10 +93,20 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:130
+#, fuzzy
+msgid "Full pathname of GNUnet directory for file-sharing data"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: contrib/config-daemon.scm:142
+#, fuzzy
+msgid "Full pathname of GNUnet directory for indexed files symbolic links"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: contrib/config-daemon.scm:154
 msgid "How many minutes should peer advertisements last?"
 msgstr ""
 
-#: contrib/config-daemon.scm:132
+#: contrib/config-daemon.scm:156
 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 "
@@ -106,52 +116,98 @@
 "than the frequency with which your IP changes."
 msgstr ""
 
-#: contrib/config-daemon.scm:143
-msgid "Log level"
+#: contrib/config-daemon.scm:167
+msgid "Where can GNUnet find an initial list of peers?"
 msgstr ""
 
-#: contrib/config-daemon.scm:144
-msgid "How verbose should the logging of errors be?"
+#: contrib/config-daemon.scm:169
+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"
+"\t\t\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"
+"\t\t\n"
+"If you do not specify a HOSTLISTURL, you must copy valid hostkeys to data/"
+"hosts manually."
 msgstr ""
 
-#: contrib/config-daemon.scm:155
-msgid "Where should logs go?"
+#: contrib/config-daemon.scm:186
+msgid "HTTP Proxy Server"
 msgstr ""
 
-#: contrib/config-daemon.scm:157
+#: contrib/config-daemon.scm:188
 msgid ""
-"In which file should gnunetd write the logs?  If you specify nothing, logs "
-"are written to stderr (and note that if gnunetd runs in the background, "
-"stderr is closed and all logs are discarded)."
+"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:168
+#: contrib/config-daemon.scm:227 contrib/config-client.scm:144
 msgid "How long should logs be kept?"
 msgstr ""
 
-#: contrib/config-daemon.scm:170
+#: contrib/config-daemon.scm:229 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:181
+#: contrib/config-daemon.scm:240 contrib/config-client.scm:157
+msgid "Where should gnunetd write the logs?"
+msgstr ""
+
+#: contrib/config-daemon.scm:252 contrib/config-client.scm:169
+#, fuzzy
+msgid "Configuration of the logging system"
+msgstr ""
+"La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
+
+#: contrib/config-daemon.scm:253 contrib/config-client.scm:170
+msgid "Specify which system messages should be logged how"
+msgstr ""
+
+#: contrib/config-daemon.scm:257 contrib/config-client.scm:174
+msgid "Logging of events for users"
+msgstr ""
+
+#: contrib/config-daemon.scm:258 contrib/config-client.scm:175
+msgid "Logging of events for the system administrator"
+msgstr ""
+
+#: contrib/config-daemon.scm:270
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:183
+#: contrib/config-daemon.scm:272
 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:195
+#: contrib/config-daemon.scm:284
+msgid "As which user should gnunetd run?"
+msgstr ""
+
+#: contrib/config-daemon.scm:286
+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:298
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:197
+#: contrib/config-daemon.scm:300
 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"
@@ -165,11 +221,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:211
+#: contrib/config-daemon.scm:314
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:213
+#: contrib/config-daemon.scm:316
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -206,20 +262,109 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:244
+#: contrib/config-daemon.scm:345
+msgid "Disable client-server connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:357
+msgid "Disable peer discovery"
+msgstr ""
+
+#: contrib/config-daemon.scm:358
+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:369
+msgid "Disable advertising this peer to other peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:381
+msgid "Disable automatic establishment of connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:382
+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:393
+msgid "Disable advertising of other peers by this peer"
+msgstr ""
+
+#: contrib/config-daemon.scm:405 contrib/config-client.scm:189
+msgid "Client/Server Port"
+msgstr ""
+
+#: contrib/config-daemon.scm:406 contrib/config-client.scm:190
+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:417
+msgid "IPs allowed to use gnunetd server"
+msgstr ""
+
+#: contrib/config-daemon.scm:418
+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:430
+msgid "Limit connections to the specfied set of peers."
+msgstr ""
+
+#: contrib/config-daemon.scm:431
+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:442
+msgid "Prevent the specfied set of peers from connecting."
+msgstr ""
+
+#: contrib/config-daemon.scm:443
+msgid "If this option is not set, any peer is allowed to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:454
+msgid "Rarely used settings for peer advertisements and connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:474
 #, fuzzy
 msgid "General settings"
 msgstr "Otras configuraciones"
 
-#: contrib/config-daemon.scm:245
+#: contrib/config-daemon.scm:475
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:268
+#: contrib/config-daemon.scm:501
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:270
+#: contrib/config-daemon.scm:503
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -228,11 +373,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:283
+#: contrib/config-daemon.scm:516
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:285
+#: contrib/config-daemon.scm:518
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -245,30 +390,44 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:300
+#: contrib/config-daemon.scm:533
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:301
+#: contrib/config-daemon.scm:534
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:318
+#: contrib/config-daemon.scm:551
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:319
+#: contrib/config-daemon.scm:552
 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:334
+#: contrib/config-daemon.scm:566
+msgid "Name of the MySQL database GNUnet should use"
+msgstr ""
+
+#: contrib/config-daemon.scm:578
+msgid "Configuration file that specifies the MySQL username and password"
+msgstr ""
+
+#: contrib/config-daemon.scm:590
+#, fuzzy
+msgid "Configuration of the MySQL database"
+msgstr ""
+"La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
+
+#: contrib/config-daemon.scm:609
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:611
 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 "
@@ -279,15 +438,15 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:350
+#: contrib/config-daemon.scm:625
 msgid "Size of the routing table."
 msgstr ""
 
-#: contrib/config-daemon.scm:363
+#: contrib/config-daemon.scm:638
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:365
+#: contrib/config-daemon.scm:640
 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"
@@ -299,21 +458,21 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:379
+#: contrib/config-daemon.scm:654
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "activa la compartición de ficheros anónima"
 
-#: contrib/config-daemon.scm:395
+#: contrib/config-daemon.scm:671
 #, fuzzy
 msgid "Applications"
 msgstr "_Opciones"
 
-#: contrib/config-daemon.scm:411
+#: contrib/config-daemon.scm:687
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:412
+#: contrib/config-daemon.scm:688
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port. Note that if you have configured your NAT box to "
@@ -322,70 +481,262 @@
 "you directly."
 msgstr ""
 
-#: contrib/config-daemon.scm:423
+#: contrib/config-daemon.scm:699
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:435
+#: contrib/config-daemon.scm:711
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:450
+#: contrib/config-daemon.scm:726
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:462
+#: contrib/config-daemon.scm:738
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:477
+#: contrib/config-daemon.scm:753
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:489
+#: contrib/config-daemon.scm:765
+msgid "What is the maximum transfer unit for UDP?"
+msgstr ""
+
+#: contrib/config-daemon.scm:777 contrib/config-daemon.scm:818
+#: contrib/config-daemon.scm:870
+msgid "Which IPs are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:789
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:504
+#: contrib/config-daemon.scm:806
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:516
+#: contrib/config-daemon.scm:830
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:531
+#: contrib/config-daemon.scm:846
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:543
+#: contrib/config-daemon.scm:858
+msgid "What is the maximum transfer unit for UDP 6?"
+msgstr ""
+
+#: contrib/config-daemon.scm:882
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:558
+#: contrib/config-daemon.scm:899
+#, fuzzy
+msgid "Network interface"
+msgstr "Interfaz de red:"
+
+#: contrib/config-daemon.scm:911
+msgid "External IP address (leave empty to try auto-detection)"
+msgstr ""
+
+#: contrib/config-daemon.scm:923
+msgid "External IPv6 address (leave empty to try auto-detection)"
+msgstr ""
+
+#: contrib/config-daemon.scm:935
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:580 contrib/config-client.scm:121
+#: contrib/config-daemon.scm:958
+msgid "What is the maximum number of bytes per second that we may receive?"
+msgstr ""
+
+#: contrib/config-daemon.scm:970
+msgid "What is the maximum number of bytes per second that we may send?"
+msgstr ""
+
+#: contrib/config-daemon.scm:982
+msgid "What is the maximum CPU load (percentage)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:984
+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:995
+msgid "What is the maximum CPU load (hard limit)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:996
+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:1007
+msgid "What is the maximum upstream bandwidth (hard limit)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1008
+msgid "Use 0 for no limit."
+msgstr ""
+
+#: contrib/config-daemon.scm:1019
+msgid "Should we disable random padding (experimental option)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1031
+msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
+msgstr ""
+
+#: contrib/config-daemon.scm:1033
+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"
+"\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"
+"\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)."
+msgstr ""
+
+#: contrib/config-daemon.scm:1050
+#, fuzzy
+msgid "Network interface to monitor"
+msgstr "Interfaz de red:"
+
+#: contrib/config-daemon.scm:1052
+msgid ""
+"\tFor which interfaces should we do accounting?  GNUnet will evaluate\n"
+"\t\tthe total traffic (not only the GNUnet related traffic) and adjust\n"
+"\t\tits bandwidth usage accordingly. You can currently only specify a\n"
+"\t\tsingle interface. GNUnet will also use this interface to determine\n"
+"\t\tthe IP to use. Typical values are eth0, ppp0, eth1, wlan0, etc.\n"
+"\t\t'ifconfig' will tell you what you have.  Never use 'lo', that just\n"
+"\t\twon't work.\n"
+"\t\tUnder Windows, specify the index number reported by\n"
+"\t\t \"gnunet-win-tool -n\"."
+msgstr ""
+
+#: contrib/config-daemon.scm:1071
+#, fuzzy
+msgid "Load management"
+msgstr "Argumentos en la linea de comandos inválidos.\n"
+
+#: contrib/config-daemon.scm:1095 contrib/config-client.scm:286
 msgid "Root node"
 msgstr ""
 
-#: src/transports/ip6.c:65 src/util/network/io.c:74
+#: contrib/config-client.scm:201
+msgid "On which machine runs gnunetd (for clients)"
+msgstr ""
+
+#: contrib/config-client.scm:202
+#, fuzzy
+msgid "This is equivalent to the -H option."
+msgstr "Muestra el valor de la opción"
+
+#: contrib/config-client.scm:214
+#, fuzzy
+msgid "General options"
+msgstr "Otras configuraciones"
+
+#: contrib/config-client.scm:231
+msgid "Do not add metadata listing the creation time for inserted content"
+msgstr ""
+
+#: contrib/config-client.scm:243
+msgid "Which non-default extractors should GNUnet use for keyword extractors"
+msgstr ""
+
+#: 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"
+"\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."
+msgstr ""
+
+#: contrib/config-client.scm:257
+msgid "File-Sharing options"
+msgstr ""
+
+#: contrib/config-client.scm:274
+#, fuzzy
+msgid "Full pathname of GNUnet client HOME directory"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: contrib/config-client.scm:275
+msgid "The directory for GNUnet files that belong to the user."
+msgstr ""
+
+#: src/transports/ip6.c:65 src/util/network/io.c:78
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/transports/ip6.c:109
+#: src/transports/ip6.c:110
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/transports/ip6.c:154 src/transports/ip.c:353
+#: src/transports/ip6.c:155 src/transports/ip.c:354
 #, fuzzy, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr "¡Falló al obtener mi dirección IP (externa)!\n"
 
-#: src/transports/udp6.c:126 src/transports/udp.c:128
+#: src/transports/udp6.c:126 src/transports/udp.c:132
 #, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr ""
@@ -394,7 +745,7 @@
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "UDP6: Imposible determinar mi dirección IPv6 pública.\n"
 
-#: src/transports/udp6.c:443 src/transports/udp.c:443
+#: src/transports/udp6.c:441 src/transports/udp.c:447
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
@@ -443,58 +794,42 @@
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "#bytes omitidos vía HTTP (salientes)"
 
-#: src/transports/smtp.c:298
+#: src/transports/smtp.c:257
 #, c-format
-msgid "Could not resolve name of SMTP server `%s': %s"
-msgstr "Imposible resolver el nombre del servidor de SMTP '%s': %s"
-
-#: src/transports/smtp.c:420 src/transports/smtp.c:882
-#, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
 "under `%s'.\n"
 msgstr ""
 
-#: src/transports/smtp.c:493
+#: src/transports/smtp.c:334
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/transports/smtp.c:588
+#: src/transports/smtp.c:433
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 
-#: src/transports/smtp.c:595
+#: src/transports/smtp.c:440
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transports/smtp.c:769
+#: src/transports/smtp.c:546
+#, fuzzy, c-format
+msgid "Failed to initialize libesmtp: %s.\n"
+msgstr "Imposible inicializar SQLite.\n"
+
+#: src/transports/smtp.c:610
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Enviando un correo electrónico a '%s' se produjo un fallo.\n"
 
-#: src/transports/smtp.c:820
+#: src/transports/smtp.c:678
 #, c-format
-msgid "SMTP server send unexpected response at %s:%d.\n"
-msgstr ""
-
-#: src/transports/smtp.c:843
-#, c-format
-msgid ""
-"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
-msgstr ""
-
-#: src/transports/smtp.c:849
-#, c-format
-msgid "Failed to send `%s' request to SMTP server.\n"
-msgstr ""
-
-#: src/transports/smtp.c:909
-#, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
 
-#: src/transports/smtp.c:938
+#: src/transports/smtp.c:706
 #, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
@@ -508,38 +843,38 @@
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:421
+#: src/transports/tcp.c:423
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/tcp.c:423
+#: src/transports/tcp.c:425
 msgid "# bytes sent via TCP"
 msgstr "# bytes enviados por TCP"
 
-#: src/transports/tcp.c:425
+#: src/transports/tcp.c:427
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transports/udp.c:217
+#: src/transports/udp.c:222
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "UDP: Imposible determinar mi dirección IP pública.\n"
 
-#: src/transports/udp.c:312
+#: src/transports/udp.c:314
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 "Falló al mandar el mensaje de tamaño %d a través de UDP a %u.%u.%u.%u:%u: %"
 "s\n"
 
-#: src/transports/udp.c:449
+#: src/transports/udp.c:453
 msgid "# bytes received via UDP"
 msgstr "# bytes recibidos vía UDP"
 
-#: src/transports/udp.c:451
+#: src/transports/udp.c:455
 msgid "# bytes sent via UDP"
 msgstr "# bytes enviados vía UDP"
 
-#: src/transports/udp.c:453
+#: src/transports/udp.c:457
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
@@ -592,312 +927,281 @@
 msgid "`%s': unknown service: %s\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/transports/tcp6.c:430
+#: src/transports/tcp6.c:432
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/tcp6.c:432
+#: src/transports/tcp6.c:434
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "# bytes enviados por TCP"
 
-#: src/transports/tcp6.c:434
+#: src/transports/tcp6.c:436
 #, fuzzy
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transports/tcp_helper.c:182
+#: src/transports/tcp_helper.c:191
 #, fuzzy
 msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/transports/tcp_helper.c:193
+#: src/transports/tcp_helper.c:202
 #, fuzzy
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/transports/udp_helper.c:93
+#: src/transports/udp_helper.c:91
 #, fuzzy
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/applications/dht/tools/dhttest2.c:50
+#: src/applications/dht/tools/dhttest2.c:45
 #: src/applications/session/sessiontest.c:42
 #: src/applications/stats/statistics.c:212
 #: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:101
-#: src/applications/gap/gaptest.c:52
+#: src/applications/tbench/tbenchtest_udp.c:100
+#: src/applications/gap/gaptest.c:49
 msgid "# of connected peers"
 msgstr "# de pares conectados"
 
-#: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/gap/gaptest.c:318
+#: src/applications/dht/tools/dhttest2.c:160
 #, c-format
 msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 msgstr "Esperando a gnunetd para empezar (%u ciclos restantes)...\n"
 
-#: src/applications/dht/tools/dhttest2.c:140
+#: src/applications/dht/tools/dhttest2.c:173
 #: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:117
-#: src/applications/gap/gaptest.c:330
+#: src/applications/tbench/tbenchtest_udp.c:116
 #, c-format
 msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
 
-#: src/applications/dht/tools/dht-query.c:39
-msgid "query table called NAME"
-msgstr "pregunta a la tabla llamada NAME"
-
-#: src/applications/dht/tools/dht-query.c:41
-msgid "allow TIME ms to process each command"
-msgstr "Reserva TIME ms para procesar cada comando"
-
-#: src/applications/dht/tools/dht-query.c:46
+#: src/applications/dht/tools/dht-query.c:53
 msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
 msgstr "Pregunta (coje KEY, pone KEY VALUE, borra KEY VALUE) a una tabla DHT."
 
-#: src/applications/dht/tools/dht-query.c:84
-#: src/applications/dht/tools/dht-join.c:85 src/util/getopt/setoption.c:133
-#: src/util/getopt/setoption.c:149
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Tienes que introducir un número en la opción '%s'.\n"
+#: src/applications/dht/tools/dht-query.c:57
+#: src/applications/dht/tools/dht-join.c:59
+msgid "join table called NAME"
+msgstr "únete a la tabla llamada NAME"
 
-#: src/applications/dht/tools/dht-query.c:99
-#: src/applications/dht/tools/dht-join.c:108
-#: src/applications/chat/gnunet-chat.c:93
-#: src/applications/testbed/gnunet-testbed.c:125
-#: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/vpn/gnunet-vpn.c:118 src/util/getopt/getopt.c:1066
-#: src/setup/gnunet-setup.c:246
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Usar --help para obtener una lista de opciones.\n"
+#: src/applications/dht/tools/dht-query.c:60
+msgid "allow TIME ms to process each command"
+msgstr "Reserva TIME ms para procesar cada comando"
 
-#: src/applications/dht/tools/dht-query.c:106
-msgid "No commands specified.\n"
-msgstr "Ningún comando fue especificado.\n"
-
-#: src/applications/dht/tools/dht-query.c:173
-#: src/applications/dht/tools/dht-query.c:204
+#: src/applications/dht/tools/dht-query.c:130
+#: src/applications/dht/tools/dht-query.c:163
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr "'%s (%s, %s)' logrado satisfactoriamente\n"
 
-#: src/applications/dht/tools/dht-query.c:177
-#: src/applications/dht/tools/dht-query.c:208
+#: src/applications/dht/tools/dht-query.c:134
+#: src/applications/dht/tools/dht-query.c:167
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s, %s)' falló.\n"
 
-#: src/applications/dht/tools/dht-query.c:231
-#: src/applications/dht/tools/dht-join.c:211
+#: src/applications/dht/tools/dht-query.c:194
+#: src/applications/dht/tools/dht-join.c:165
 #, c-format
 msgid "No table name specified, using `%s'.\n"
 msgstr "Ningún nombre especificado para la tabla, usando '%s'.\n"
 
-#: src/applications/dht/tools/dht-query.c:246
+#: src/applications/dht/tools/dht-query.c:210
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/applications/dht/tools/dht-query.c:253
+#: src/applications/dht/tools/dht-query.c:220
 #, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr "El comando '%s' requiere un argumento ('%s').\n"
 
-#: src/applications/dht/tools/dht-query.c:261
-#: src/applications/dht/tools/dht-query.c:271
+#: src/applications/dht/tools/dht-query.c:232
+#: src/applications/dht/tools/dht-query.c:246
 #, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr "El comando '%s' requiere dos argumentos ('%s' y '%s').\n"
 
-#: src/applications/dht/tools/dht-query.c:279
+#: src/applications/dht/tools/dht-query.c:258
 #, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Comando inesperado '%s'.   Abortando.\n"
 
-#: src/applications/dht/tools/dht_api.c:127
-#: src/applications/dht/tools/dht_api.c:236
-#: src/applications/dht/tools/dht_api.c:289
-#: src/applications/dht/tools/dht_api.c:343
-#: src/applications/dht/tools/dht_api.c:377
+#: src/applications/dht/tools/dht_api.c:148
+#: src/applications/dht/tools/dht_api.c:264
+#: src/applications/dht/tools/dht_api.c:321
+#: src/applications/dht/tools/dht_api.c:379
+#: src/applications/dht/tools/dht_api.c:415
 #, c-format
 msgid "Failed to send `%s'.  Closing connection.\n"
 msgstr "Fallo al mandar '%s'.   Cerrando la conexión.\n"
 
-#: src/applications/dht/tools/dht_api.c:201
-#: src/applications/dht/tools/dht_api.c:253
-#: src/applications/dht/tools/dht_api.c:307
-#: src/applications/dht/tools/dht_api.c:360
+#: src/applications/dht/tools/dht_api.c:226
+#: src/applications/dht/tools/dht_api.c:282
+#: src/applications/dht/tools/dht_api.c:340
+#: src/applications/dht/tools/dht_api.c:397
 #, c-format
 msgid "Received invalid `%s' request (size %d)\n"
 msgstr "Recibida petición '%s' no válida (tamaño %d)\n"
 
-#: src/applications/dht/tools/dht_api.c:214
-#: src/applications/dht/tools/dht_api.c:266
-#: src/applications/dht/tools/dht_api.c:320
+#: src/applications/dht/tools/dht_api.c:241
+#: src/applications/dht/tools/dht_api.c:297
+#: src/applications/dht/tools/dht_api.c:355
 #, c-format
 msgid "Received invalid `%s' request (wrong table)\n"
 msgstr "Recibida petición '%s' no válida (tabla errónea)\n"
 
-#: src/applications/dht/tools/dht_api.c:390
+#: src/applications/dht/tools/dht_api.c:429
 #, c-format
 msgid "Received unknown request type %d at %s:%d\n"
 msgstr "Recibida petición de tipo desconocido %d en %s: %d\n"
 
-#: src/applications/dht/tools/dht_api.c:430
+#: src/applications/dht/tools/dht_api.c:473
 msgid "This client already participates in the given DHT!\n"
 msgstr "Este cliente ya participa en el DHT dado\n"
 
-#: src/applications/dht/tools/dht_api.c:498
+#: src/applications/dht/tools/dht_api.c:548
 msgid "Cannot leave DHT: table not known!\n"
 msgstr "Imposible dejar DHT: ¡tabla no conocida!\n"
 
-#: src/applications/dht/tools/dht_api.c:520
+#: src/applications/dht/tools/dht_api.c:571
 #, c-format
 msgid "gnunetd signaled error in response to `%s' message\n"
 msgstr "gnunetd lanzó una señal de error en respuesta al mensaje '%s'\n"
 
-#: src/applications/dht/tools/dht_api.c:525
+#: src/applications/dht/tools/dht_api.c:576
 #, c-format
 msgid "Failed to receive response to `%s' message from gnunetd\n"
 msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
 
-#: src/applications/dht/tools/dht_api.c:530
+#: src/applications/dht/tools/dht_api.c:581
 #, c-format
 msgid "Failed to send `%s' message to gnunetd\n"
 msgstr "Falló al mandar el mensaje '%s' a gnunetd\n"
 
-#: src/applications/dht/tools/dht_api.c:622
+#: src/applications/dht/tools/dht_api.c:677
 #, c-format
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Respuesta inesperada a la operación '%s'.\n"
 
-#: src/applications/dht/tools/dht-join.c:43
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "Reserva SIZE bytes de memoria para la tabla local"
-
-#: src/applications/dht/tools/dht-join.c:45
-msgid "join table called NAME"
-msgstr "únete a la tabla llamada NAME"
-
-#: src/applications/dht/tools/dht-join.c:51
+#: src/applications/dht/tools/dht-join.c:52
 msgid "Join a DHT."
 msgstr "Únete a DHT"
 
-#: src/applications/dht/tools/dht-join.c:115
-msgid "Superflous arguments (ignored).\n"
-msgstr "Argumentos superfluos (ignorados).\n"
+#: src/applications/dht/tools/dht-join.c:56
+msgid "allow SIZE bytes of memory for the local table"
+msgstr "Reserva SIZE bytes de memoria para la tabla local"
 
-#: src/applications/dht/tools/dht-join.c:131
+#: src/applications/dht/tools/dht-join.c:78
 #, c-format
 msgid "Call to `%s' returns %d.\n"
 msgstr "La llamada a '%s' devuelve %d.\n"
 
-#: src/applications/dht/tools/dht-join.c:132
+#: src/applications/dht/tools/dht-join.c:79
 #, c-format
 msgid "Call to `%s' with key `%s'.\n"
 msgstr "Llamada a '%s' con la clave '%s'.\n"
 
-#: src/applications/dht/tools/dht-join.c:133
+#: src/applications/dht/tools/dht-join.c:80
 #, c-format
 msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
 msgstr "Llama a '%s' con el valor '%.*s' (%d bytes).\n"
 
-#: src/applications/dht/tools/dht-join.c:236
+#: src/applications/dht/tools/dht-join.c:189
 msgid "Error joining DHT.\n"
 msgstr "Error uniéndose a DHT.\n"
 
-#: src/applications/dht/tools/dht-join.c:243
+#: src/applications/dht/tools/dht-join.c:196
 #, c-format
 msgid "Joined DHT.  Press CTRL-C to leave.\n"
 msgstr "Unido a DHT.  Pulsa CTRL-C para abandonarlo.\n"
 
-#: src/applications/dht/tools/dht-join.c:250
+#: src/applications/dht/tools/dht-join.c:205
 msgid "Error leaving DHT.\n"
 msgstr "Error abandonando DHT.\n"
 
-#: src/applications/dht/module/dht.c:946
+#: src/applications/dht/module/dht.c:952
 #, c-format
 msgid "Malformed optional field `%s' received from peer `%s'.\n"
 msgstr "Campo opcional anómalo '%s' recibido del par '%s'.\n"
 
-#: src/applications/dht/module/dht.c:973
+#: src/applications/dht/module/dht.c:979
 #, c-format
 msgid "Could not find peer `%s' in routing table!\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/applications/dht/module/dht.c:1120
-#: src/applications/dht/module/dht.c:1135
+#: src/applications/dht/module/dht.c:1126
+#: src/applications/dht/module/dht.c:1141
 #, c-format
 msgid "Received malformed response to `%s' from peer `%s'.\n"
 msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
 
-#: src/applications/dht/module/dht.c:1447
+#: src/applications/dht/module/dht.c:1453
 #, c-format
 msgid "Invalid response to `%s' from peer `%s'.\n"
 msgstr "Respuesta inválida a '%s' del par '%s'.\n"
 
-#: src/applications/dht/module/dht.c:1603
-#: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1290
+#: src/applications/dht/module/dht.c:1611
+#: src/applications/dht/module/dht.c:2351
+#: src/applications/dht/module/dht.c:2628 src/applications/rpc/rpc.c:1291
 #, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr "'%s' fue llamada con un retraso de una hora(¿bug?)\n"
 
-#: src/applications/dht/module/dht.c:1793
+#: src/applications/dht/module/dht.c:1803
 #, c-format
 msgid "Invalid response to `%s'.\n"
 msgstr "Respuesta inválida a '%s'.\n"
 
-#: src/applications/dht/module/dht.c:1993
+#: src/applications/dht/module/dht.c:2003
 #, c-format
 msgid "Malformed response to `%s' on master table.\n"
 msgstr "Respuesta anómala a '%s' en la tabla maestra.\n"
 
-#: src/applications/dht/module/dht.c:2207
-#: src/applications/dht/module/dht.c:2507
+#: src/applications/dht/module/dht.c:2217
+#: src/applications/dht/module/dht.c:2522
 #, c-format
 msgid "Invalid response to `%s' from `%s'\n"
 msgstr "Respuesta inválida a '%s' de '%s'\n"
 
-#: src/applications/dht/module/dht.c:2881
-#: src/applications/dht/module/dht.c:3021
-#: src/applications/dht/module/dht.c:3148
-#: src/applications/dht/module/dht.c:3282
+#: src/applications/dht/module/dht.c:2899
+#: src/applications/dht/module/dht.c:3041
+#: src/applications/dht/module/dht.c:3182
+#: src/applications/dht/module/dht.c:3330
 #, c-format
 msgid "Received invalid RPC `%s'.\n"
 msgstr "Recibido RPC '%s' inválida.\n"
 
-#: src/applications/dht/module/dht.c:3160
-#: src/applications/dht/module/dht.c:3296
+#: src/applications/dht/module/dht.c:3201
+#: src/applications/dht/module/dht.c:3351
 #, c-format
 msgid "RPC for `%s' received for table that we do not participate in!\n"
 msgstr "¡RPC para '%s' recibida de la tabla en la cual no participamos!\n"
 
-#: src/applications/dht/module/cs.c:446
+#: src/applications/dht/module/cs.c:449
 #, c-format
 msgid "`%s' failed: table not found!\n"
 msgstr "'%s' falló: ¡tabla no encontrada!\n"
 
-#: src/applications/dht/module/cs.c:466
+#: src/applications/dht/module/cs.c:469
 #, c-format
 msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr "'%s' falló.  Finalizando conexión con el cliente.\n"
 
-#: src/applications/dht/module/cs.c:542
+#: src/applications/dht/module/cs.c:546
 msgid "sendAck failed.  Terminating connection to client.\n"
 msgstr "sendAck falló. Finalizando conexión con el cliente.\n"
 
-#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
-#: src/applications/dht/module/cs.c:688
+#: src/applications/dht/module/cs.c:666 src/applications/dht/module/cs.c:684
+#: src/applications/dht/module/cs.c:693
 #, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "'%s' falló. Finalizando conexión con el cleinte.\n"
 
-#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
+#: src/applications/dht/module/cs.c:814 src/applications/dht/module/cs.c:867
 #, c-format
 msgid "Failed to deliver `%s' message.\n"
 msgstr "Falló al entregar el mensaje '%s'.\n"
@@ -936,6 +1240,14 @@
 msgid "Start GNUnet chat client."
 msgstr "Arranca el cliente de chat de GNUnet"
 
+#: src/applications/chat/gnunet-chat.c:93
+#: src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:546 src/util/getopt/getopt.c:1067
+#: src/setup/gnunet-setup.c:283
+#, c-format
+msgid "Use --help to get a list of options.\n"
+msgstr "Usar --help para obtener una lista de opciones.\n"
+
 #: src/applications/chat/gnunet-chat.c:151
 msgid "Could not connect to gnunetd.\n"
 msgstr "Imposible conectar con gnunetd.\n"
@@ -953,70 +1265,75 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/applications/advertising/advertising.c:162
+#: src/applications/advertising/advertising.c:168
 #, c-format
 msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr "mensaje de saludo de '%s' inválido (firma inválida). Omitiendo.\n"
 
-#: src/applications/advertising/advertising.c:168
+#: src/applications/advertising/advertising.c:175
 msgid ""
 "hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr ""
 "mensaje de saludo recibido inválido (tiempo superior al límite). Omitiendo.\n"
 
-#: src/applications/advertising/advertising.c:177
+#: src/applications/advertising/advertising.c:182
 #, c-format
+msgid "hello transport verification failed (%u).\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:192
+#, c-format
 msgid "hello advertisement for protocol %d received.\n"
 msgstr "Inicio de comunicación del protocolo %d recibido.\n"
 
-#: src/applications/advertising/advertising.c:297
+#: src/applications/advertising/advertising.c:325
 msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr "Imposible mandar ahora saludos+PING, buffer del ping lleno.\n"
 
-#: src/applications/advertising/advertising.c:310
+#: src/applications/advertising/advertising.c:338
 #, c-format
 msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr "'%s' falló (%d, %u). No se mandará el PING.\n"
 
-#: src/applications/advertising/advertising.c:467
+#: src/applications/advertising/advertising.c:495
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Anunciando mi transporte %d a los pares seleccionados.\n"
 
-#: src/applications/advertising/advertising.c:474
+#: src/applications/advertising/advertising.c:502
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr "Es inútil anunciarnos: no hay más pares que nos conozcan más allá.\n"
 
-#: src/applications/advertising/advertising.c:580
+#: src/applications/advertising/advertising.c:608
 #, c-format
 msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr "Eliminando saludo del par '%s' (expiró hace %ds).\n"
 
-#: src/applications/advertising/advertising.c:760
+#: src/applications/advertising/advertising.c:788
 msgid "# Peer advertisements received"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/applications/advertising/advertising.c:761
+#: src/applications/advertising/advertising.c:789
 msgid "# Self advertisments transmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/applications/advertising/advertising.c:762
+#: src/applications/advertising/advertising.c:790
 msgid "# Foreign advertisements forwarded"
 msgstr "# Anuncios a extraños mandados"
 
-#: src/applications/advertising/advertising.c:764
+#: src/applications/advertising/advertising.c:792
 #: src/applications/pingpong/pingpong.c:488
 msgid "# plaintext PING messages sent"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/applications/advertising/advertising.c:768
-#: src/applications/session/connect.c:779
+#: src/applications/advertising/advertising.c:796
+#: src/applications/session/connect.c:800
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "'%s' registrando manejador %d (texto plano e hipertexto)\n"
 
-#: src/applications/advertising/advertising.c:785
+#: src/applications/advertising/advertising.c:813
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
@@ -1078,23 +1395,29 @@
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "'%s' registrando manejadores %d %d (texto plano e hipertexto)\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:45
-#: src/applications/sqstore_sqlite/sqlite.c:52
-#: src/applications/sqstore_mysql/mysql.c:137
-#: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:389
-#: src/applications/sqstore_mysql/mysql.c:728
-#: src/applications/sqstore_mysql/mysql.c:743
-#: src/applications/sqstore_mysql/mysql.c:752
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:786
-#: src/applications/sqstore_mysql/mysql.c:840
-#: src/applications/sqstore_mysql/mysql.c:925
-#: src/applications/sqstore_mysql/mysql.c:935
-#: src/applications/sqstore_mysql/mysql.c:1007
-#: src/applications/sqstore_mysql/mysql.c:1016
-#: src/applications/sqstore_mysql/mysql.c:1056
-#: src/applications/sqstore_mysql/mysql.c:1070
+#: src/applications/sqstore_sqlite/sqlite.c:46
+#: src/applications/sqstore_sqlite/sqlite.c:53
+#: src/applications/sqstore_mysql/mysql.c:138
+#: src/applications/sqstore_mysql/mysql.c:145
+#: src/applications/sqstore_mysql/mysql.c:423
+#: src/applications/sqstore_mysql/mysql.c:765
+#: src/applications/sqstore_mysql/mysql.c:781
+#: src/applications/sqstore_mysql/mysql.c:791
+#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:827
+#: src/applications/sqstore_mysql/mysql.c:884
+#: src/applications/sqstore_mysql/mysql.c:971
+#: src/applications/sqstore_mysql/mysql.c:982
+#: src/applications/sqstore_mysql/mysql.c:1046
+#: src/applications/sqstore_mysql/mysql.c:1062
+#: src/applications/sqstore_mysql/mysql.c:1072
+#: src/applications/sqstore_mysql/mysql.c:1096
+#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/sqstore_mysql/mysql.c:1119
+#: src/applications/sqstore_mysql/mysql.c:1182
+#: src/applications/sqstore_mysql/mysql.c:1194
+#: src/applications/sqstore_mysql/mysql.c:1242
+#: src/applications/sqstore_mysql/mysql.c:1257
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
@@ -1103,80 +1426,81 @@
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:158
+#: src/applications/sqstore_sqlite/sqlite.c:195
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:307
-#: src/applications/sqstore_sqlite/sqlite.c:327
-#: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:803
+#: src/applications/sqstore_sqlite/sqlite.c:356
+#: src/applications/sqstore_sqlite/sqlite.c:377
+#: src/applications/sqstore_mysql/mysql.c:260
+#: src/applications/sqstore_mysql/mysql.c:845
+#: src/applications/sqstore_mysql/mysql.c:1134
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:308
-#: src/applications/sqstore_sqlite/sqlite.c:328
+#: src/applications/sqstore_sqlite/sqlite.c:357
+#: src/applications/sqstore_sqlite/sqlite.c:378
 msgid "sqlite datastore"
 msgstr "base de datos sqlite"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1177
-#: src/applications/sqstore_mysql/mysql.c:1182
+#: src/applications/sqstore_sqlite/sqlite.c:1213
+#: src/applications/sqstore_mysql/mysql.c:1318
 msgid "# bytes in datastore"
 msgstr "# bytes en la base de datos"
 
-#: src/applications/session/connect.c:221
+#: src/applications/session/connect.c:225
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
 
-#: src/applications/session/connect.c:258
+#: src/applications/session/connect.c:263
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr "¡Imposible encriptar la clave de sesión, otro par desconocido!\n"
 
-#: src/applications/session/connect.c:517
+#: src/applications/session/connect.c:533
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "El mensaje recibido del par es inválido.\n"
 
-#: src/applications/session/connect.c:540
+#: src/applications/session/connect.c:558
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/applications/session/connect.c:550
+#: src/applications/session/connect.c:568
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 "el cambio de clave '%s' de '%s' falló al comprobar el CRC (dio: %u, esperado "
 "%u).\n"
 
-#: src/applications/session/connect.c:608
+#: src/applications/session/connect.c:626
 msgid ""
 "Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr ""
 "Error pasando la clave de sesión encriptada, el mensaje dado del tamaño de "
 "las partes es inválido.\n"
 
-#: src/applications/session/connect.c:619
+#: src/applications/session/connect.c:637
 #, c-format
 msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr "Tipo desconocido en el mensaje embebido: %u (tamaño: %u)\n"
 
-#: src/applications/session/connect.c:768
+#: src/applications/session/connect.c:789
 msgid "# session keys sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/applications/session/connect.c:770
+#: src/applications/session/connect.c:791
 msgid "# session keys rejected"
 msgstr "# claves de la sesión rechazadas"
 
-#: src/applications/session/connect.c:772
+#: src/applications/session/connect.c:793
 msgid "# session keys accepted"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/applications/session/connect.c:774
+#: src/applications/session/connect.c:795
 msgid "# sessions established"
 msgstr "# sesiones establecidas"
 
@@ -1208,56 +1532,52 @@
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s RPC asíncrona %s:%p no pudo ser desregistrada: no encontrada\n"
 
-#: src/applications/rpc/rpc.c:878 src/applications/rpc/rpc.c:1011
-#: src/applications/rpc/rpc.c:1100
+#: src/applications/rpc/rpc.c:879 src/applications/rpc/rpc.c:1012
+#: src/applications/rpc/rpc.c:1101
 #, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/applications/rpc/rpc.c:945
+#: src/applications/rpc/rpc.c:946
 #, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "Omitiendo la petición RPC %u: mensaje mal formado.\n"
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/rpc/rpc.c:1415
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "No fue desregistrada RPC: %s:%p\n"
 
-#: src/applications/rpc/rpc.c:1441
+#: src/applications/rpc/rpc.c:1442
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "'%s' registrando manejadores %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1462
+#: src/applications/rpc/rpc.c:1463
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/applications/rpc/rpc.c:1519
+#: src/applications/rpc/rpc.c:1520
 msgid "RPC async reply invalid.\n"
 msgstr "RPC respuesta asíncrona no válida.\n"
 
-#: src/applications/rpc/rpc.c:1591
+#: src/applications/rpc/rpc.c:1592
 msgid "async RPC reply not received.\n"
 msgstr "respuesta RPC asíncrona no recibida.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:804
+#: src/applications/sqstore_mysql/mysql.c:261
+#: src/applications/sqstore_mysql/mysql.c:846
+#: src/applications/sqstore_mysql/mysql.c:1135
 msgid "mysql datastore"
 msgstr "base de datos mysql"
 
-#: src/applications/sqstore_mysql/mysql.c:1110
+#: src/applications/sqstore_mysql/mysql.c:1348
 #, c-format
-msgid "Query `%s' had no results.\n"
-msgstr "La pregunta '%s' no tuvo resultados.\n"
-
-#: src/applications/sqstore_mysql/mysql.c:1212
-#, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1230
+#: src/applications/sqstore_mysql/mysql.c:1371
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -1270,22 +1590,22 @@
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "Test de disponibilidad fallido para '%s' en %s:%d.\n"
 
-#: src/applications/datastore/datastore.c:143
+#: src/applications/datastore/datastore.c:145
 #, c-format
 msgid "Database failed to delete `%s'.\n"
 msgstr "Falló al borrar de la base de datos %s.\n"
 
-#: src/applications/datastore/datastore.c:358
-#: src/applications/datastore/datastore.c:454
+#: src/applications/datastore/datastore.c:368
+#: src/applications/datastore/datastore.c:465
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:109
+#: src/applications/identity/hostkey.c:121
 #, fuzzy, c-format
 msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/applications/identity/hostkey.c:139
+#: src/applications/identity/hostkey.c:155
 #, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
@@ -1293,11 +1613,11 @@
 "Se produjo un fallo al comprobar la clave local existente en el fichero '%"
 "s', creando nueva clave local.\n"
 
-#: src/applications/identity/hostkey.c:147
+#: src/applications/identity/hostkey.c:163
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
 
-#: src/applications/identity/hostkey.c:160
+#: src/applications/identity/hostkey.c:176
 msgid "Done creating hostkey.\n"
 msgstr "Correcto al crear la clave local.\n"
 
@@ -1322,18 +1642,18 @@
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/applications/identity/identity.c:684
-#: src/applications/identity/identity.c:705
+#: src/applications/identity/identity.c:686
+#: src/applications/identity/identity.c:706
 #, c-format
 msgid "Removed file `%s' containing invalid hello data.\n"
 msgstr "Borrando el fichero '%s' que contiene datos de saludo no válidos.\n"
 
-#: src/applications/identity/identity.c:758
+#: src/applications/identity/identity.c:759
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr "La verificación de la firma falló: el par '%s' no es conocido.\n"
 
-#: src/applications/identity/identity.c:767
+#: src/applications/identity/identity.c:768
 msgid "Signature failed verification: signature invalid.\n"
 msgstr "Falló la verificación de la firma: firma no válida.\n"
 
@@ -1533,75 +1853,76 @@
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/transport/transport.c:136
+#: src/applications/transport/transport.c:140
 #, c-format
 msgid ""
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:183
+#: src/applications/transport/transport.c:187
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:278
+#: src/applications/transport/transport.c:282
 #, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:366
+#: src/applications/transport/transport.c:370
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:423
+#: src/applications/transport/transport.c:427
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:596
+#: src/applications/transport/transport.c:601
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/applications/transport/transport.c:616
+#: src/applications/transport/transport.c:621
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/applications/transport/transport.c:626
+#: src/applications/transport/transport.c:631
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 "La biblioteca de transporte '%s' no provee la función '%s%s' requerida.\n"
 
-#: src/applications/transport/transport.c:643
+#: src/applications/transport/transport.c:658
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/applications/transport/transport.c:654
+#: src/applications/transport/transport.c:671
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/applications/fragmentation/fragmentation.c:559
+#: src/applications/fragmentation/fragmentation.c:566
 msgid "# messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/applications/fragmentation/fragmentation.c:560
+#: src/applications/fragmentation/fragmentation.c:567
 msgid "# messages fragmented"
 msgstr "# mensajes fragmentados"
 
-#: src/applications/fragmentation/fragmentation.c:561
+#: src/applications/fragmentation/fragmentation.c:568
 msgid "# fragments discarded"
 msgstr "# fragmentos descartados"
 
-#: src/applications/fragmentation/fragmentation.c:573
+#: src/applications/fragmentation/fragmentation.c:580
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr "'%s' registrando manejador %d\n"
 
 #: src/applications/stats/gnunet-stats.c:90
+#: src/applications/vpn/gnunet-vpn.c:52
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
@@ -1609,15 +1930,16 @@
 msgid "prints supported protocol messages"
 msgstr "imprime los mensajes del protocolo"
 
-#: src/applications/stats/gnunet-stats.c:137
-#: src/applications/tbench/gnunet-tbench.c:136
-#: src/applications/tracekit/gnunet-tracekit.c:319
-#: src/applications/template/gnunet-template.c:101
+#: src/applications/stats/gnunet-stats.c:130
+#: src/applications/tbench/gnunet-tbench.c:128
+#: src/applications/tracekit/gnunet-tracekit.c:312
+#: src/applications/template/gnunet-template.c:94
+#: src/applications/vpn/gnunet-vpn.c:145
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
 
-#: src/applications/stats/gnunet-stats.c:156
+#: src/applications/stats/gnunet-stats.c:149
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr "Se produjo un error leyendo información de gnunetd.\n"
@@ -1654,110 +1976,110 @@
 msgid "keeps statistics about gnunetd's operation"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:65
-#: src/applications/tracekit/gnunet-tracekit.c:54
+#: src/applications/tbench/gnunet-tbench.c:64
+#: src/applications/tracekit/gnunet-tracekit.c:53
 msgid "Start GNUnet transport benchmarking tool."
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:67
+#: src/applications/tbench/gnunet-tbench.c:66
 msgid "output in gnuplot format"
 msgstr "salida en formato de gnuplot"
 
-#: src/applications/tbench/gnunet-tbench.c:71
+#: src/applications/tbench/gnunet-tbench.c:70
 msgid "number of iterations"
 msgstr "número de repeticiones"
 
-#: src/applications/tbench/gnunet-tbench.c:75
+#: src/applications/tbench/gnunet-tbench.c:74
 msgid "number of messages to use per iteration"
 msgstr "número de mensajes a usar por iteración"
 
-#: src/applications/tbench/gnunet-tbench.c:78
+#: src/applications/tbench/gnunet-tbench.c:77
 msgid "receiver host identifier (ENC file name)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:81
+#: src/applications/tbench/gnunet-tbench.c:80
 msgid "message size"
 msgstr "tamaño del mensaje"
 
-#: src/applications/tbench/gnunet-tbench.c:84
+#: src/applications/tbench/gnunet-tbench.c:83
 msgid "sleep for SPACE ms after each a message block"
 msgstr "duerme durante SPACE ms después de cada bloque de mensajes"
 
-#: src/applications/tbench/gnunet-tbench.c:87
+#: src/applications/tbench/gnunet-tbench.c:86
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr "tiempo para esperar hasta completar una iteración (en ms)"
 
-#: src/applications/tbench/gnunet-tbench.c:91
+#: src/applications/tbench/gnunet-tbench.c:90
 msgid "number of messages in a message block"
 msgstr "número de mensajes en un bloque de mensajes"
 
-#: src/applications/tbench/gnunet-tbench.c:153
+#: src/applications/tbench/gnunet-tbench.c:144
 #, c-format
 msgid "You must specify a receiver!\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/applications/tbench/gnunet-tbench.c:162
+#: src/applications/tbench/gnunet-tbench.c:152
 #, c-format
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 "ID del par receptor especificada no válida ('%s' no es un nombre válido).\n"
 
-#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tbench/gnunet-tbench.c:182
 #, c-format
 msgid "Time:\n"
 msgstr "Tiempo:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:190
+#: src/applications/tbench/gnunet-tbench.c:183
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr "\tmax      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:192
+#: src/applications/tbench/gnunet-tbench.c:185
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr "\tmin      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:194
+#: src/applications/tbench/gnunet-tbench.c:187
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr "\tmean     %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:196
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr "\tvariance %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:199
+#: src/applications/tbench/gnunet-tbench.c:192
 #, c-format
 msgid "Loss:\n"
 msgstr "Perdido:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:200
+#: src/applications/tbench/gnunet-tbench.c:193
 #, c-format
 msgid "\tmax      %u\n"
 msgstr "\tmax      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:202
+#: src/applications/tbench/gnunet-tbench.c:195
 #, c-format
 msgid "\tmin      %u\n"
 msgstr "\tmin      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:204
+#: src/applications/tbench/gnunet-tbench.c:197
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr "\tmean     %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:206
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr "\tvariance %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:215
+#: src/applications/tbench/gnunet-tbench.c:208
 #, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:219
+#: src/applications/tbench/gnunet-tbench.c:212
 #, c-format
 msgid ""
 "\n"
@@ -1767,25 +2089,25 @@
 "No se recibió el mensaje de gnunetd. ¿Está gnunetd ejecutandose?\n"
 
 #: src/applications/tbench/tbenchtest.c:51
-#: src/applications/tbench/tbenchtest_udp.c:51
+#: src/applications/tbench/tbenchtest_udp.c:50
 #, c-format
 msgid "Using %u messages of size %u for %u times.\n"
 msgstr "Usando %u mensajes de un tamaño de %u durante %u veces.\n"
 
 #: src/applications/tbench/tbenchtest.c:78
-#: src/applications/tbench/tbenchtest_udp.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:83
-#: src/applications/tbench/tbenchtest_udp.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:89
-#: src/applications/tbench/tbenchtest_udp.c:89
+#: src/applications/tbench/tbenchtest_udp.c:88
 #, c-format
 msgid ""
 "\n"
@@ -1795,60 +2117,60 @@
 "Fallo al recibir la respuesta de gnunetd.\n"
 
 #: src/applications/tbench/tbenchtest.c:211
-#: src/applications/tbench/tbenchtest_udp.c:211
+#: src/applications/tbench/tbenchtest_udp.c:210
 #, c-format
 msgid "Running benchmark...\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:460
+#: src/applications/tbench/tbench.c:420
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:49
+#: src/applications/tracekit/gnunet-tracekit.c:48
 msgid "probe network to the given DEPTH"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:52
+#: src/applications/tracekit/gnunet-tracekit.c:51
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:58
+#: src/applications/tracekit/gnunet-tracekit.c:57
 msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:62
+#: src/applications/tracekit/gnunet-tracekit.c:61
 msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:116
+#: 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 ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:163
+#: src/applications/tracekit/gnunet-tracekit.c:162
 #, c-format
 msgid "`%s' is not connected to any peer.\n"
 msgstr "'%s' no esta conectado a ningún par.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:197
+#: src/applications/tracekit/gnunet-tracekit.c:196
 #, c-format
 msgid "`%s' connected to `%s'.\n"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:212
+#: src/applications/tracekit/gnunet-tracekit.c:211
 #, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:235
+#: src/applications/tracekit/gnunet-tracekit.c:234
 #, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:350
+#: src/applications/tracekit/gnunet-tracekit.c:342
 msgid "Could not send request to gnunetd.\n"
 msgstr ""
 
@@ -2001,38 +2323,38 @@
 msgid "allows clients to determine gnunetd's configuration"
 msgstr "permite a los clientes determinar la configuración de gnunetd"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:71
-#: src/applications/fs/tools/gnunet-insert.c:224
-#: src/applications/fs/tools/gnunet-search.c:129
-#: src/applications/fs/tools/gnunet-download.c:57
+#: src/applications/fs/tools/gnunet-pseudonym.c:70
+#: src/applications/fs/tools/gnunet-insert.c:229
+#: src/applications/fs/tools/gnunet-search.c:140
+#: src/applications/fs/tools/gnunet-download.c:65
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimato al enviar"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:74
+#: src/applications/fs/tools/gnunet-pseudonym.c:73
 msgid "automate creation of a namespace by starting a collection"
 msgstr "creación automática de un espacio al empezar una colección"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:78
+#: src/applications/fs/tools/gnunet-pseudonym.c:77
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "crea un nuevo pseudónimo bajo el APODO dado"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:81
+#: src/applications/fs/tools/gnunet-pseudonym.c:80
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "borra el pseudónimo con el APODO dado"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:84
+#: src/applications/fs/tools/gnunet-pseudonym.c:83
 msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 "finaliza la construcción automática de un espacio (finaliza la recolección)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:86
-#: src/applications/fs/tools/gnunet-search.c:132
+#: src/applications/fs/tools/gnunet-pseudonym.c:85
+#: src/applications/fs/tools/gnunet-search.c:143
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
 msgstr ""
 "Crea nuevos pseudónimos, borra pseudónimos o lista los pseudónimos "
 "existentes."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:89
+#: src/applications/fs/tools/gnunet-pseudonym.c:88
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
@@ -2040,13 +2362,13 @@
 "usa la clave dada para anunciar el espacio (úsalo cuando crees un nuevo "
 "pseudónimo)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:92
+#: src/applications/fs/tools/gnunet-pseudonym.c:91
 #, fuzzy
 msgid "specify metadata describing the namespace or collection"
 msgstr ""
 "finaliza la construcción automática de un espacio (finaliza la recolección)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:95
+#: src/applications/fs/tools/gnunet-pseudonym.c:94
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
@@ -2054,11 +2376,11 @@
 "no genera un anuncio para este espacio (úsalo cuando crees un nuevo "
 "pseudónimo)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:98
+#: src/applications/fs/tools/gnunet-pseudonym.c:97
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr "no listar los pseudónimos de la base de datos de pseudónimos"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:101
+#: src/applications/fs/tools/gnunet-pseudonym.c:100
 msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
@@ -2066,66 +2388,66 @@
 "especifica el IDENTIFIER para ser la dirección del punto de entrada al "
 "contenido en el espacio (úsalo cuando crees un nuevo pseudónimo)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:104
+#: src/applications/fs/tools/gnunet-pseudonym.c:103
 msgid "set the rating of a namespace"
 msgstr "cambia la valoración de un espacio"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:138
+#: src/applications/fs/tools/gnunet-pseudonym.c:137
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "El espacio '%s' ha sido valorado con un %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:142
+#: src/applications/fs/tools/gnunet-pseudonym.c:141
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr "El espacio '%s' (%s) ha sido valorado con un %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:178
+#: src/applications/fs/tools/gnunet-pseudonym.c:177
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr "\tValoración (después de la actualización): %d\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:221
+#: src/applications/fs/tools/gnunet-pseudonym.c:211
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Colección detenida.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:223
+#: src/applications/fs/tools/gnunet-pseudonym.c:213
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr "Falló al parar la recolección (¿no está activa?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:231
+#: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:235
+#: src/applications/fs/tools/gnunet-pseudonym.c:225
 #, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr "Error borrando el pseudónimo '%s' (¿no existe?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:254
+#: src/applications/fs/tools/gnunet-pseudonym.c:244
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:257
+#: src/applications/fs/tools/gnunet-pseudonym.c:247
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:299
+#: src/applications/fs/tools/gnunet-pseudonym.c:289
 #, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:304
+#: src/applications/fs/tools/gnunet-pseudonym.c:294
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr "El espacio '%s' fue creado (root: %s).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:326
+#: src/applications/fs/tools/gnunet-pseudonym.c:314
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
@@ -2168,45 +2490,45 @@
 msgid "start tracking entries for the directory database"
 msgstr "comienza a seguir las entradas de la base de datos del directorio"
 
-#: src/applications/fs/tools/gnunet-directory.c:181
+#: src/applications/fs/tools/gnunet-directory.c:174
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "%d entradas encontradas.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:139
+#: src/applications/fs/tools/gnunet-insert.c:137
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Creada la entrada '%s' en el espacio '%s'\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:144
+#: src/applications/fs/tools/gnunet-insert.c:142
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr "Fallo al añadir la entrada al espacio '%s' (¿existe?)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:166
+#: src/applications/fs/tools/gnunet-insert.c:168
 #, fuzzy, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "%16llu de %16llu bytes insertados (%s estimado para completar)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:178
+#: src/applications/fs/tools/gnunet-insert.c:180
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Subida de '%s' completada, %llu bytes tomaron %llu segundos (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:189
+#: src/applications/fs/tools/gnunet-insert.c:191
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "El fichero '%s' tiene la URI: '%s'\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:200
+#: src/applications/fs/tools/gnunet-insert.c:202
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr "Descarga abortada"
 
-#: src/applications/fs/tools/gnunet-insert.c:206
+#: src/applications/fs/tools/gnunet-insert.c:207
 #, c-format
 msgid ""
 "\n"
@@ -2215,26 +2537,35 @@
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:216
+#, c-format
 msgid ""
+"\n"
+"Unexpected event: %d\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:233
+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 ""
 "aunque gnunetd este corriendo en el ordenador local, fuerza la creación de "
 "una copia en vez de hacer un enlace al directorio para compartir de GNUnet"
 
-#: src/applications/fs/tools/gnunet-insert.c:232
+#: src/applications/fs/tools/gnunet-insert.c:237
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:235
+#: src/applications/fs/tools/gnunet-insert.c:240
+#, fuzzy
 msgid ""
-"use libextractor to add additional direct references to directory entries"
+"do not use libextractor to add additional references to directory entries "
+"and/or the published file"
 msgstr ""
 "usa libextractor para añadir referencias directas adicionales a las entradas "
 "del directorio"
 
-#: src/applications/fs/tools/gnunet-insert.c:238
+#: src/applications/fs/tools/gnunet-insert.c:243
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2242,11 +2573,11 @@
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:245
 msgid "Make files available to GNUnet for sharing."
 msgstr "Permite a GNUnet disponer de los ficheros para compartirlos."
 
-#: src/applications/fs/tools/gnunet-insert.c:243
+#: src/applications/fs/tools/gnunet-insert.c:248
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
@@ -2254,7 +2585,7 @@
 "cambia el intervalo de disponibilidad de las actualizaciones a SEGUNDOS "
 "(para inserciones en el espacio solamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:247
+#: src/applications/fs/tools/gnunet-insert.c:252
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2262,7 +2593,7 @@
 "añade una clave adicional para el fichero del nivel más alto o el directorio "
 "(esta opción puede ser especificada varias veces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:251
+#: src/applications/fs/tools/gnunet-insert.c:256
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -2270,11 +2601,11 @@
 "añade una clave adicional para todos los ficheros y directorios (esta opción "
 "puede ser especificada varias veces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:256
+#: src/applications/fs/tools/gnunet-insert.c:261
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "cambia el meta-dato para el TIPO dado al VALOR dado"
 
-#: src/applications/fs/tools/gnunet-insert.c:259
+#: src/applications/fs/tools/gnunet-insert.c:264
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2282,7 +2613,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "encriptada en la base de datos de GNUnet)"
 
-#: src/applications/fs/tools/gnunet-insert.c:263
+#: src/applications/fs/tools/gnunet-insert.c:268
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2290,17 +2621,17 @@
 "especifica la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:267
+#: src/applications/fs/tools/gnunet-insert.c:272
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
-#: src/applications/fs/tools/gnunet-insert.c:270
+#: src/applications/fs/tools/gnunet-insert.c:275
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publica los ficheros bajo el pseudónimo NOMBRE (coloca el fichero en el "
 "espacio)"
 
-#: src/applications/fs/tools/gnunet-insert.c:273
+#: src/applications/fs/tools/gnunet-insert.c:278
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
@@ -2308,36 +2639,36 @@
 "especifica esto como una aperiódica pero actualizada publicación (para "
 "inserciones en el espacio únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:277
+#: src/applications/fs/tools/gnunet-insert.c:282
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "cambia la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:281
+#: src/applications/fs/tools/gnunet-insert.c:286
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 "especifica el tiempo para la creación de un Superbloque (vea la página del "
 "manual para el formato)"
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:289
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 "ID de la versión previa del contenido (para actualizaciones del espacio "
 "únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:326
+#: src/applications/fs/tools/gnunet-insert.c:324
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:351
+#: src/applications/fs/tools/gnunet-insert.c:348
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:378
+#: src/applications/fs/tools/gnunet-insert.c:374
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Imposible acceder al espacio '%s' (¿no existe?).\n"
@@ -2347,54 +2678,53 @@
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Se produjo un fallo al analizar el tiempo. Use el formato '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:407
-#: src/applications/fs/tools/gnunet-insert.c:412
-#: src/applications/fs/tools/gnunet-insert.c:417
-#: src/applications/fs/tools/gnunet-insert.c:422
+#: src/applications/fs/tools/gnunet-insert.c:403
+#: src/applications/fs/tools/gnunet-insert.c:409
+#: src/applications/fs/tools/gnunet-insert.c:415
+#: src/applications/fs/tools/gnunet-insert.c:421
 #: src/applications/fs/tools/gnunet-insert.c:427
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-search.c:136
+#: src/applications/fs/tools/gnunet-search.c:147
 msgid "exit after receiving LIMIT results"
 msgstr "sale después de recibir LIMIT resultados"
 
-#: src/applications/fs/tools/gnunet-search.c:139
-#: src/applications/fs/tools/gnunet-download.c:64
+#: src/applications/fs/tools/gnunet-search.c:150
+#: src/applications/fs/tools/gnunet-download.c:72
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "escribe los resultados encontrados (desencriptados) a FILENAME"
 
-#: src/applications/fs/tools/gnunet-search.c:142
+#: src/applications/fs/tools/gnunet-search.c:153
 #, fuzzy
 msgid "wait DELAY seconds for search results before aborting"
 msgstr "espera TIMEOUT segundos para buscar resultados después de abortar"
 
-#: src/applications/fs/tools/gnunet-search.c:189
+#: src/applications/fs/tools/gnunet-search.c:191
 #, c-format
-msgid "Starting search failed. Consult logs.\n"
-msgstr "Se produjo un fallo al comenzar la búsqueda. Consulte los logs.\n"
-
-#: src/applications/fs/tools/gnunet-search.c:277
-#, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
 
-#: src/applications/fs/tools/gnunet-download.c:60
+#: src/applications/fs/tools/gnunet-download.c:68
 msgid "Download files from GNUnet."
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/applications/fs/tools/gnunet-download.c:67
+#: src/applications/fs/tools/gnunet-download.c:75
 msgid "download a GNUnet directory recursively"
 msgstr "descarga un directorio de GNUnet recursivamente"
 
-#: src/applications/fs/tools/gnunet-download.c:86
+#: src/applications/fs/tools/gnunet-download.c:93
 #, fuzzy, c-format
 msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr "Descargado del fichero '%s' el %16llu de %16llu bytes(%8.3f kbps)\n"
 
-#: src/applications/fs/tools/gnunet-download.c:99
-#: src/applications/fs/tools/gnunet-download.c:110
+#: src/applications/fs/tools/gnunet-download.c:106
+#, fuzzy, c-format
+msgid "Download aborted.\n"
+msgstr "Descarga abortada"
+
+#: src/applications/fs/tools/gnunet-download.c:112
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr "Error descargando: %s\n"
@@ -2411,17 +2741,17 @@
 msgstr ""
 "Argumentos insuficientes. Debes especificar una URI de un fichero de GNUnet\n"
 
-#: src/applications/fs/tools/gnunet-download.c:195
+#: src/applications/fs/tools/gnunet-download.c:194
 #, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr "La URI '%s' no es válida para una descarga-de-gnunet.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:244
+#: src/applications/fs/tools/gnunet-download.c:262
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/fs/tools/gnunet-unindex.c:57
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
@@ -2430,7 +2760,7 @@
 "%16llu de %16llu bytes desindexados (estimados %llu segundos para "
 "completar)          "
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:68
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2440,7 +2770,7 @@
 "El desindexado de '%s' se completó, %llu bytes tomaron %llu segundos (%8.3f "
 "kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:83
+#: src/applications/fs/tools/gnunet-unindex.c:80
 #, c-format
 msgid ""
 "\n"
@@ -2453,24 +2783,24 @@
 msgid "Unindex files."
 msgstr "Desindexar los ficheros."
 
-#: src/applications/fs/tools/gnunet-unindex.c:145
+#: src/applications/fs/tools/gnunet-unindex.c:137
 #, fuzzy
 msgid "Not enough arguments. You must specify a filename.\n"
 msgstr ""
 "Argumentos insuficientes. Debes especificar una URI de un fichero de GNUnet\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:173
+#: src/applications/fs/tools/gnunet-unindex.c:164
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s' falló.  ¿Es '%s' un fichero?\n"
 
-#: src/applications/fs/module/ondemand.c:317
+#: src/applications/fs/module/ondemand.c:320
 #, fuzzy, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 "Fichero indexado desaparecido, borrando el bloque para preguntas '%s'\n"
 
-#: src/applications/fs/module/ondemand.c:411
+#: src/applications/fs/module/ondemand.c:418
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2481,7 +2811,7 @@
 "disponible durante tres días.  Por favor, desindexa los ficheros antes de "
 "borrarlos porque eso causa que el índice tenga referencias no válidas.\n"
 
-#: src/applications/fs/module/ondemand.c:438
+#: src/applications/fs/module/ondemand.c:445
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2490,14 +2820,14 @@
 "El fichero de configuración debe especificar un directorio para el "
 "almacenamiento de los datos de FS en la sección '%s' bajo '%s'.\n"
 
-#: src/applications/fs/module/ondemand.c:655
+#: src/applications/fs/module/ondemand.c:664
 #, fuzzy, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 "Bloque ODB '%s' desindexado del offset %llu perdido de la base de datos.\n"
 
-#: src/applications/fs/module/fs.c:1196
+#: src/applications/fs/module/fs.c:1229
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2506,12 +2836,12 @@
 "Debes especificar un número positivo para '%s' en la configuración en la "
 "sección '%s'.\n"
 
-#: src/applications/fs/module/fs.c:1247
+#: src/applications/fs/module/fs.c:1281
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/module/fs.c:1287
+#: src/applications/fs/module/fs.c:1321
 msgid "enables (anonymous) file-sharing"
 msgstr "activa la compartición de ficheros anónima"
 
@@ -2523,53 +2853,37 @@
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/downloadtest.c:239
+#: src/applications/fs/fsui/searchtest.c:156
+#: src/applications/fs/fsui/fsuitest.c:199
+#: src/applications/fs/fsui/downloadtest.c:308
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
 msgid "AND"
 msgstr "Y"
 
-#: src/applications/fs/fsui/fsui.c:195
-msgid "FSUI persistence: error restoring download\n"
-msgstr "FSUI persistente: error restableciendo la descarga\n"
+#: src/applications/fs/fsui/search.c:265
+#, fuzzy
+msgid "Error running search (consult logs)."
+msgstr "Se produjo un fallo al comenzar la búsqueda. Consulte los logs.\n"
 
-#: src/applications/fs/fsui/fsui.c:666
-#, c-format
-msgid "FSUI state file `%s' had syntax error at offset %u.\n"
-msgstr ""
-"Fichero del estado de FSUI '%s' tiene un error de sintáxis en la asignación %"
-"u.\n"
-
-#: src/applications/fs/fsui/download.c:305
-msgid "Download aborted."
-msgstr "Descarga abortada"
-
-#: src/applications/fs/fsui/download.c:309
-msgid "ECRS download failed (see logs)."
+#: src/applications/fs/fsui/download.c:263
+#, fuzzy
+msgid "ECRS download failed (see logs)"
 msgstr "La descarga del ERCS falló (vea los logs)."
 
-#: src/applications/fs/fsui/download.c:313
-msgid "ECRS download suspending."
-msgstr "La descarga del ERCS fue suspendida."
-
-#: src/applications/fs/fsui/download.c:317
-msgid "Unexpected download state."
-msgstr "Estado de descarga inesperado."
-
-#: src/applications/fs/fsui/unindex.c:80
+#: src/applications/fs/fsui/unindex.c:99
 msgid "Unindex failed."
 msgstr "El desindexado falló"
 
-#: src/applications/fs/fsui/upload.c:229 src/applications/fs/fsui/upload.c:374
-#: src/applications/fs/fsui/upload.c:413
-msgid "Upload failed."
-msgstr "Subida fallida"
+#: src/applications/fs/fsui/upload.c:222
+#, fuzzy
+msgid "Failed to create temporary directory."
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/applications/fs/fsui/upload.c:420
-msgid "Cannot upload directory without using recursion."
-msgstr "Imposible compartir un directorio sin hacerlo recursivamente."
+#: src/applications/fs/fsui/upload.c:244
+#, fuzzy
+msgid "Upload failed (consult logs)."
+msgstr "La descarga del ERCS falló (vea los logs)."
 
 #: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
@@ -2597,7 +2911,7 @@
 "El contenido desencriptado no encuentra una clave. Esto puede ser un bug o "
 "un fichero introducido maliciosamente. Descarga abortada.\n"
 
-#: src/applications/fs/ecrs/download.c:1153
+#: src/applications/fs/ecrs/download.c:1157
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -2605,72 +2919,72 @@
 "El contenido '%s' parece no estar disponible en la red (intentado %u "
 "veces).\n"
 
-#: src/applications/fs/ecrs/upload.c:170
+#: src/applications/fs/ecrs/upload.c:161
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "'%s' no es un fichero.\n"
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/fs/ecrs/upload.c:171
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Imposible determinar el tamaño del fichero '%s'"
 
-#: src/applications/fs/ecrs/upload.c:188
+#: src/applications/fs/ecrs/upload.c:179
 msgid "Failed to connect to gnunetd."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/applications/fs/ecrs/upload.c:200
+#: src/applications/fs/ecrs/upload.c:191
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Imposible hallar el hash de '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:219
+#: src/applications/fs/ecrs/upload.c:210
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr ""
 "Durante la inicialización de la indexación del fichero '%s' se produjo un "
 "fallo.\n"
 
-#: src/applications/fs/ecrs/upload.c:226
+#: src/applications/fs/ecrs/upload.c:217
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
 
-#: src/applications/fs/ecrs/upload.c:312
+#: src/applications/fs/ecrs/upload.c:303
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "La indexación de los datos falló en la posición %i.\n"
 
-#: src/applications/fs/ecrs/meta.c:847
+#: src/applications/fs/ecrs/meta.c:849
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Al renombrar el fichero '%s' a '%s' se produjo un fallo: %s\n"
 
-#: src/applications/fs/ecrs/meta.c:855
+#: src/applications/fs/ecrs/meta.c:857
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "Imposible renombrar el fichero '%s' a '%s': el fichero ya existe\n"
 
-#: src/applications/fs/ecrs/namespace.c:153
+#: src/applications/fs/ecrs/namespace.c:154
 #, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Imposible crear el pseudónimo '%s', el fichero '%s' ya existe.\n"
 
-#: src/applications/fs/ecrs/namespace.c:338
-#: src/applications/fs/ecrs/namespace.c:419
-#: src/applications/fs/ecrs/namespace.c:573
+#: src/applications/fs/ecrs/namespace.c:339
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:574
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/applications/fs/ecrs/namespace.c:350
-#: src/applications/fs/ecrs/namespace.c:430
+#: src/applications/fs/ecrs/namespace.c:351
+#: src/applications/fs/ecrs/namespace.c:431
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
-#: src/applications/fs/ecrs/namespace.c:587
-#: src/applications/fs/ecrs/namespace.c:598
+#: src/applications/fs/ecrs/namespace.c:588
+#: src/applications/fs/ecrs/namespace.c:599
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
@@ -2688,20 +3002,20 @@
 "Tipo de metadatos desconocido en la opción de metadatos '%s'.  Usando el "
 "tipo de metadatos 'desconocido' en su lugar.\n"
 
-#: src/applications/fs/uritrack/file_info.c:123
+#: src/applications/fs/uritrack/file_info.c:125
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Recolección de identificadores de fichero desactivada.\n"
 
-#: src/applications/fs/uritrack/file_info.c:355
+#: src/applications/fs/uritrack/file_info.c:367
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr "Borrada base de datos de URIs corrupta en '%s'."
 
-#: src/applications/fs/namespace/namespace_info.c:654
+#: src/applications/fs/namespace/namespace_info.c:656
 msgid "Publication interval for periodic publication changed."
 msgstr "Intervalo de publicación periódica cambiado."
 
-#: src/applications/fs/namespace/namespace_info.c:675
+#: src/applications/fs/namespace/namespace_info.c:677
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -2709,16 +3023,16 @@
 "publicaciones actualizadas para contenido actualizado periódicamente más de "
 "una semana antes de la tarea planificada.\n"
 
-#: src/applications/topology_f2f/topology.c:354
+#: src/applications/topology_f2f/topology.c:359
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:371
+#: src/applications/topology_f2f/topology.c:376
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:384
+#: src/applications/topology_f2f/topology.c:389
 #, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
@@ -2728,20 +3042,37 @@
 msgid "`%s' registering client handler %d and %d\n"
 msgstr "'%s' registrando manejador de clientes %d y %d\n"
 
-#: src/applications/template/gnunet-template.c:44
+#: src/applications/template/gnunet-template.c:43
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:92
+#: src/applications/bootstrap_http/http.c:100
 #, fuzzy, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
-#: src/applications/bootstrap_http/http.c:144
+#: src/applications/bootstrap_http/http.c:121
+#: src/applications/bootstrap_http/http.c:263
+#: src/applications/bootstrap_http/http.c:283
+#: src/applications/bootstrap_http/http.c:317
+#: src/applications/bootstrap_http/http.c:335
+#: src/applications/bootstrap_http/http.c:349
+#: src/applications/bootstrap_http/http.c:361
+#: src/applications/bootstrap_http/http.c:373
+#, fuzzy, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+
+#: src/applications/bootstrap_http/http.c:173
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:229
+#, c-format
+msgid "Trying to download hostlist from `%s'\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:409
 msgid "# hellos downloaded via http"
 msgstr "# saludos descargados vía HTTP"
 
@@ -2759,339 +3090,335 @@
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:98
+#: src/applications/vpn/gnunet-vpn.c:56
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:103
-msgid "VPN over GNUnet."
-msgstr ""
-
-#: src/applications/vpn/vpn.c:351
+#: src/applications/vpn/vpn.c:326
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:359
+#: src/applications/vpn/vpn.c:334
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:387
+#: src/applications/vpn/vpn.c:362
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:436
+#: src/applications/vpn/vpn.c:411
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:440
+#: src/applications/vpn/vpn.c:415
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:450
+#: src/applications/vpn/vpn.c:425
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:510
+#: src/applications/vpn/vpn.c:485
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:514
+#: src/applications/vpn/vpn.c:489
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:541
+#: src/applications/vpn/vpn.c:518
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:549
+#: src/applications/vpn/vpn.c:526
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:553
+#: src/applications/vpn/vpn.c:530
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:591
+#: src/applications/vpn/vpn.c:568
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:595
+#: src/applications/vpn/vpn.c:572
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:602
+#: src/applications/vpn/vpn.c:579
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:607
+#: src/applications/vpn/vpn.c:584
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:615
+#: src/applications/vpn/vpn.c:592
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:627
+#: src/applications/vpn/vpn.c:604
 #, fuzzy, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr "Imposible obtener la dirección IP para la interfaz '%s'.\n"
 
-#: src/applications/vpn/vpn.c:638
+#: src/applications/vpn/vpn.c:615
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:650
+#: src/applications/vpn/vpn.c:627
 #, fuzzy, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr "Imposible obtener la dirección IP para la interfaz '%s'.\n"
 
-#: src/applications/vpn/vpn.c:683
+#: 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"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:729
+#: src/applications/vpn/vpn.c:706
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:788
+#: src/applications/vpn/vpn.c:769
 #, c-format
 msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:792
+#: src/applications/vpn/vpn.c:773
 #, c-format
 msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:810
+#: src/applications/vpn/vpn.c:791
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:850
+#: src/applications/vpn/vpn.c:831
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:835
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:860
+#: src/applications/vpn/vpn.c:841
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:863
+#: src/applications/vpn/vpn.c:844
 #, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:873
+#: src/applications/vpn/vpn.c:854
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:892
+#: src/applications/vpn/vpn.c:873
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:913
+#: src/applications/vpn/vpn.c:894
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:918
+#: src/applications/vpn/vpn.c:899
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:929
+#: src/applications/vpn/vpn.c:910
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:935
+#: src/applications/vpn/vpn.c:916
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:951
+#: src/applications/vpn/vpn.c:932
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:955
+#: src/applications/vpn/vpn.c:936
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:959
+#: src/applications/vpn/vpn.c:940
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:973
+#: src/applications/vpn/vpn.c:954
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:988
+#: src/applications/vpn/vpn.c:969
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1016
+#: src/applications/vpn/vpn.c:997
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1031
+#: src/applications/vpn/vpn.c:1012
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1076
+#: src/applications/vpn/vpn.c:1057
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1122
+#: src/applications/vpn/vpn.c:1103
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1148
+#: src/applications/vpn/vpn.c:1129
 msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1208
+#: src/applications/vpn/vpn.c:1190
 msgid "Yes"
 msgstr "Sí"
 
-#: src/applications/vpn/vpn.c:1208
+#: src/applications/vpn/vpn.c:1190
 msgid "No"
 msgstr "No"
 
-#: src/applications/vpn/vpn.c:1385
+#: src/applications/vpn/vpn.c:1396
 #, fuzzy, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr "'%s' registrando manejadores %d y %d\n"
 
-#: src/applications/vpn/vpn.c:1386
+#: src/applications/vpn/vpn.c:1397
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1434
+#: src/applications/vpn/vpn.c:1447
 #, fuzzy
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr "Activa el chat P2P (incompleto)"
 
-#: src/applications/vpn/vpn.c:1466
+#: src/applications/vpn/vpn.c:1479
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1477
+#: src/applications/vpn/vpn.c:1492
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1490
+#: src/applications/vpn/vpn.c:1507
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:142
+#: src/server/gnunet-update.c:141
 #, c-format
 msgid "Updating data for module `%s'\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/server/gnunet-update.c:147
+#: src/server/gnunet-update.c:146
 #, c-format
 msgid "Failed to update data for module `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/server/gnunet-update.c:218 src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-update.c:217 src/server/gnunet-transport-check.c:355
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-update.c:220
+#: src/server/gnunet-update.c:219
 msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/server/gnunet-update.c:224 src/server/gnunet-transport-check.c:369
+#: src/server/gnunet-update.c:223 src/server/gnunet-transport-check.c:370
 msgid "run as user LOGIN"
 msgstr "ejecuta como el usuario LOGIN"
 
-#: src/server/gnunet-update.c:227
+#: src/server/gnunet-update.c:226
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
-#: src/server/connection.c:992
+#: src/server/connection.c:1023
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/server/connection.c:999
+#: src/server/connection.c:1032
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Detalles del mensaje: %u: longitud %d, prioridad: %d\n"
 
-#: src/server/connection.c:2283
+#: src/server/connection.c:2417
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Mensaje de '%s' descartado: formato inválido.\n"
 
-#: src/server/connection.c:2355
+#: src/server/connection.c:2489
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Secuencia de números no válida %u <= %u, omitiendo mensaje.\n"
 
-#: src/server/connection.c:2370
+#: src/server/connection.c:2506
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "Mensajes recibidos de mas de un día de antigüedad. Omitidos.\n"
 
-#: src/server/connection.c:2774
+#: src/server/connection.c:2929
 msgid "# outgoing messages dropped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/server/connection.c:2778
+#: src/server/connection.c:2933
 msgid "# bytes of outgoing messages dropped"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/server/connection.c:2780
+#: src/server/connection.c:2935
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2783
+#: src/server/connection.c:2938
 msgid "# bytes encrypted"
 msgstr "# bytes encriptados"
 
-#: src/server/connection.c:2787
+#: src/server/connection.c:2942
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:2791
+#: src/server/connection.c:2946
 #, fuzzy
 msgid "# bytes received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/server/connection.c:2793
+#: src/server/connection.c:2948
 msgid "# bytes decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:2794
+#: src/server/connection.c:2949
 msgid "# bytes noise sent"
 msgstr "# \"bytes-ruido\" mandados"
 
@@ -3117,16 +3444,16 @@
 msgid "Starts the gnunetd daemon."
 msgstr "Arranca el demonio de gnunetd."
 
-#: src/server/gnunetd.c:176
+#: src/server/gnunetd.c:175
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:180
+#: src/server/gnunetd.c:179
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "especifica el host en el que gnunetd esta ejecutandose"
 
-#: src/server/gnunetd.c:236
+#: src/server/gnunetd.c:228
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -3172,32 +3499,32 @@
 msgid "Could not properly unload service `%s'!\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/server/gnunet-transport-check.c:115
+#: src/server/gnunet-transport-check.c:116
 #, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "'%s': Imposible crear saludo.\n"
 
-#: src/server/gnunet-transport-check.c:124
+#: src/server/gnunet-transport-check.c:125
 #, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "'%s': Imposible conectar.\n"
 
-#: src/server/gnunet-transport-check.c:158
+#: src/server/gnunet-transport-check.c:159
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr "'%s': Imposible mandar.\n"
 
-#: src/server/gnunet-transport-check.c:180
+#: src/server/gnunet-transport-check.c:181
 #, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
 
-#: src/server/gnunet-transport-check.c:194
+#: src/server/gnunet-transport-check.c:195
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "'%s': Imposible desconectar.\n"
 
-#: src/server/gnunet-transport-check.c:201
+#: src/server/gnunet-transport-check.c:202
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -3205,12 +3532,12 @@
 msgstr ""
 "Transporte '%s' OK. Tomó %ums transmitir %d mensajes de %d bytes cada uno.\n"
 
-#: src/server/gnunet-transport-check.c:229
+#: src/server/gnunet-transport-check.c:230
 #, c-format
 msgid " Transport %d is not being tested\n"
 msgstr " El transporte %d no esta siendo probado\n"
 
-#: src/server/gnunet-transport-check.c:245
+#: src/server/gnunet-transport-check.c:246
 #, c-format
 msgid ""
 "\n"
@@ -3219,56 +3546,56 @@
 "\n"
 "Contactando '%s'."
 
-#: src/server/gnunet-transport-check.c:266
+#: src/server/gnunet-transport-check.c:267
 #, c-format
 msgid " Connection failed\n"
 msgstr "Conexión fallida\n"
 
-#: src/server/gnunet-transport-check.c:272
+#: src/server/gnunet-transport-check.c:273
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr "Conexión fallida (¿bug?)\n"
 
-#: src/server/gnunet-transport-check.c:324
+#: src/server/gnunet-transport-check.c:325
 #, c-format
 msgid "No reply received within %llums.\n"
 msgstr "No se ha recibido una respuesta en %llums.\n"
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:351
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:357
+#: src/server/gnunet-transport-check.c:358
 msgid "send COUNT messages"
 msgstr "envia COUNT mensajes"
 
-#: src/server/gnunet-transport-check.c:360
+#: src/server/gnunet-transport-check.c:361
 msgid "send messages with SIZE bytes payload"
 msgstr "manda mensajes con SIZE bytes payload"
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:364
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:366
+#: src/server/gnunet-transport-check.c:367
 msgid "specifies after how many MS to time-out"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:374
+#: src/server/gnunet-transport-check.c:375
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:455
+#: src/server/gnunet-transport-check.c:440
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/server/gnunet-transport-check.c:458
+#: src/server/gnunet-transport-check.c:443
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/server/gnunet-transport-check.c:518
+#: src/server/gnunet-transport-check.c:503
 #, c-format
 msgid ""
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
@@ -3285,14 +3612,14 @@
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/server/tcpserver.c:384
+#: src/server/tcpserver.c:386
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:437
+#: src/server/tcpserver.c:439
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%s falló, el mensaje del tipo %d ya está en uso.\n"
@@ -3302,50 +3629,50 @@
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
 
-#: src/server/version.c:157
+#: src/server/version.c:152
 msgid ""
 "Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:52
+#: src/server/gnunet-peer-info.c:51
 msgid "Print information about GNUnet peers."
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/server/gnunet-peer-info.c:79 src/server/gnunet-peer-info.c:94
+#: src/server/gnunet-peer-info.c:78 src/server/gnunet-peer-info.c:93
 #, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr "Imposible obtener la dirección del par '%s'.\n"
 
-#: src/server/gnunet-peer-info.c:88
+#: src/server/gnunet-peer-info.c:87
 msgid "hello message invalid (signature invalid).\n"
 msgstr "mensaje de saludo inválido (firma no válida).\n"
 
-#: src/server/gnunet-peer-info.c:99
+#: src/server/gnunet-peer-info.c:98
 #, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/util/cron/cron.c:355
+#: src/util/cron/cron.c:356
 #, c-format
 msgid ""
 "`%s' called with cron job not in queue, adding.  This may not be what you "
 "want.\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:90
+#: src/util/network_client/tcpio.c:94
 msgid "Could not find valid value for PORT in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:114
+#: src/util/network_client/tcpio.c:118
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:209 src/util/network_client/tcpio.c:237
+#: src/util/network_client/tcpio.c:251 src/util/network_client/tcpio.c:281
 #, fuzzy, c-format
 msgid "Cannot connect to %s:u: %s\n"
 msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/network_client/tcpio.c:356
+#: src/util/network_client/tcpio.c:403
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "¡'%s' falló, respuesta no válida!\n"
@@ -3377,17 +3704,17 @@
 msgid "Can't create semaphore: %i"
 msgstr "Imposible crear un semáforo: %i"
 
-#: src/util/os/dso.c:51
+#: src/util/os/dso.c:56
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "¡El mecanismo de iniciación de los plugins falló: %s!\n"
 
-#: src/util/os/dso.c:90
+#: src/util/os/dso.c:110
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "'%s' falló en la biblioteca '%s' en %s:%d con un error: %s\n"
 
-#: src/util/os/dso.c:132
+#: src/util/os/dso.c:152
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "'%s' falló al resolver el método '%s%s' en %s:%d con un error: %s\n"
@@ -3405,22 +3732,22 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Respuesta inválida a '%s'.\n"
 
-#: src/util/os/user.c:125
+#: src/util/os/user.c:124
 #, c-format
 msgid "User `%s' not known, cannot change UID to it.\n"
 msgstr "Usuario '%s' desconocido, imposible cambiar la UID a él.\n"
 
-#: src/util/os/user.c:136
+#: src/util/os/user.c:135
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/util/network/select.c:272
+#: src/util/network/select.c:282
 #, fuzzy
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
 
-#: src/util/network/select.c:421
+#: src/util/network/select.c:443
 msgid "select listen socket not valid!\n"
 msgstr ""
 
@@ -3455,125 +3782,126 @@
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/disk/storage.c:247
+#: src/util/disk/storage.c:517
 #, fuzzy, c-format
-msgid "Expected `%s' to be a directory\n"
+msgid "Expected `%s' to be a directory!\n"
 msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/util/disk/storage.c:286
-#, fuzzy, c-format
-msgid "Expected `%s' to be a regular file\n"
-msgstr "'%s' no es un fichero regular.\n"
-
-#: src/util/disk/storage.c:493
-#, fuzzy, c-format
-msgid "expected `%s' to be a directory!\n"
-msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
-
-#: src/util/config_impl/impl.c:260
+#: src/util/config_impl/impl.c:275
 #, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/util/config_impl/impl.c:421
+#: src/util/config_impl/impl.c:505
 #, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgstr ""
+
+#: src/util/config_impl/impl.c:551
+#, c-format
 msgid ""
 "Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
 "llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:433
+#: src/util/config_impl/impl.c:563
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:513
+#: src/util/config_impl/impl.c:653
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:624
+#: src/util/error/error.c:122
 #, c-format
-msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgid ""
+"\n"
+"Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:156 src/util/error/error.c:200
+#: src/util/error/error.c:190 src/util/error/error.c:234
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/error/error.c:159 src/util/error/error.c:202
+#: src/util/error/error.c:193 src/util/error/error.c:236
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:162 src/util/error/error.c:204
+#: src/util/error/error.c:196 src/util/error/error.c:240
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/error/error.c:165 src/util/error/error.c:206
+#: src/util/error/error.c:199 src/util/error/error.c:242
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/error/error.c:168 src/util/error/error.c:208
+#: src/util/error/error.c:202 src/util/error/error.c:244
 msgid "FATAL"
 msgstr "FATAL"
 
-#: src/util/error/error.c:171 src/util/error/error.c:210
+#: src/util/error/error.c:205 src/util/error/error.c:246
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:174 src/util/error/error.c:212
+#: src/util/error/error.c:208 src/util/error/error.c:248
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:177 src/util/error/error.c:214
+#: src/util/error/error.c:211 src/util/error/error.c:250
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:180 src/util/error/error.c:216
+#: src/util/error/error.c:214 src/util/error/error.c:252
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:183 src/util/error/error.c:218
+#: src/util/error/error.c:217 src/util/error/error.c:254
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:186 src/util/error/error.c:220
+#: src/util/error/error.c:220 src/util/error/error.c:256
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:189
+#: src/util/error/error.c:223
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:221
+#: src/util/error/error.c:238
+msgid "INFO"
+msgstr "INFORMACIÓN"
+
+#: src/util/error/error.c:257
 msgid "NOTHING"
 msgstr "NADA"
 
-#: src/util/threads/mutex.c:131 src/util/threads/mutex.c:151
+#: src/util/threads/mutex.c:145 src/util/threads/mutex.c:165
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/util/threads/mutex.c:136
+#: src/util/threads/mutex.c:150
 #, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:156
+#: src/util/threads/mutex.c:170
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/util/threads/pthread.c:139 src/util/threads/pthread.c:147
-#: src/util/threads/pthread.c:154 src/util/threads/pthread.c:245
+#: src/util/threads/pthread.c:158 src/util/threads/pthread.c:166
+#: src/util/threads/pthread.c:173 src/util/threads/pthread.c:266
 #, fuzzy, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/util/threads/pthread.c:161 src/util/threads/pthread.c:256
+#: src/util/threads/pthread.c:180 src/util/threads/pthread.c:277
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
@@ -3644,8 +3972,13 @@
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/printhelp.c:49
+#: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
 #, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Tienes que introducir un número en la opción '%s'.\n"
+
+#: src/util/getopt/printhelp.c:50
+#, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
@@ -3703,21 +4036,21 @@
 msgid "Tool to setup GNUnet."
 msgstr "Herramienta de configuración de GNUnet."
 
-#: src/setup/gnunet-setup.c:152
+#: src/setup/gnunet-setup.c:185
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Argumentos en la linea de comandos inválidos.\n"
 
-#: src/setup/gnunet-setup.c:157
+#: src/setup/gnunet-setup.c:190
 msgid "No interface specified, using default\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/setup/gnunet-setup.c:227
+#: src/setup/gnunet-setup.c:264
 #, c-format
 msgid "`%s' is not available."
 msgstr "'%s' no esta disponible."
 
-#: src/setup/gnunet-setup.c:243
+#: src/setup/gnunet-setup.c:280
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Operación desconocida '%s'\n"
@@ -3828,19 +4161,33 @@
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/setup/gtk/wizard_gtk.c:429
+#: src/setup/gtk/wizard_gtk.c:137
+#, fuzzy
+msgid "(unknown connection)"
+msgstr "Conexión de red"
+
+#: src/setup/gtk/wizard_gtk.c:390
 #, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/setup/gtk/wizard_gtk.c:475 src/setup/ncurses/wizard_curs.c:620
+#: src/setup/gtk/wizard_gtk.c:415
+#, fuzzy
+msgid "Do you want to save the new configuration?"
+msgstr "¿Quieres guardar tu configuración?"
+
+#: src/setup/gtk/wizard_gtk.c:442 src/setup/ncurses/wizard_curs.c:620
 msgid "Unable to create user account:"
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/setup/gtk/wizard_gtk.c:482 src/setup/ncurses/wizard_curs.c:623
+#: src/setup/gtk/wizard_gtk.c:449 src/setup/ncurses/wizard_curs.c:623
 msgid "Unable to change startup process:"
 msgstr "Imposible cambiar el proceso de arranque:"
 
+#: src/setup/gtk/wizard_gtk.c:458
+msgid "gnunet-update failed. Please run gnunet-update manually."
+msgstr ""
+
 #: src/setup/text/conf.c:74
 #, fuzzy
 msgid "yes"
@@ -3935,36 +4282,36 @@
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:538
+#: src/setup/text/conf.c:542
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:539
+#: src/setup/text/conf.c:543
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:553 src/setup/ncurses/mconf.c:422
+#: src/setup/text/conf.c:557 src/setup/ncurses/mconf.c:422
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/setup/text/conf.c:558
+#: src/setup/text/conf.c:562
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:568
+#: src/setup/text/conf.c:572
 #, fuzzy, c-format
 msgid "Configuration was unchanged, no need to save.\n"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/setup/text/conf.c:573
+#: src/setup/text/conf.c:577
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Fichero de configuración '%s' creado.\n"
@@ -4359,49 +4706,92 @@
 "Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:145
+#: src/include/gnunet_util_getopt.h:150
 msgid "print this help"
 msgstr "imprime esta ayuda"
 
-#: src/include/gnunet_util_getopt.h:154
+#: src/include/gnunet_util_getopt.h:159
 msgid "print the version number"
 msgstr "imprime el número de versión"
 
-#: src/include/gnunet_util_getopt.h:160
-msgid "configure logging to use LOGRULES"
+#: src/include/gnunet_util_getopt.h:165
+msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:166
+#: src/include/gnunet_util_getopt.h:171
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:172
+#: src/include/gnunet_util_getopt.h:177
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "usa el fichero de configuración FILENAME"
 
-#: src/include/gnunet_util_getopt.h:178
+#: src/include/gnunet_util_getopt.h:183
 #, fuzzy
 msgid "specify host on which gnunetd is running"
 msgstr "especifica el host en el que gnunetd esta ejecutandose"
 
-#: src/include/gnunet_util_error.h:163 src/include/gnunet_util_error.h:165
-#: src/include/gnunet_util_error.h:167 src/include/gnunet_util_error.h:169
+#: src/include/gnunet_util_error.h:175 src/include/gnunet_util_error.h:177
+#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:181
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d in %s.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_util_error.h:176 src/include/gnunet_util_error.h:183
-#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#: src/include/gnunet_util_error.h:188 src/include/gnunet_util_error.h:195
+#: src/include/gnunet_util_error.h:202 src/include/gnunet_util_error.h:209
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
+#: src/include/gnunet_util_error.h:216 src/include/gnunet_util_error.h:223
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 
+#~ msgid "Could not resolve name of SMTP server `%s': %s"
+#~ msgstr "Imposible resolver el nombre del servidor de SMTP '%s': %s"
+
+#~ msgid "query table called NAME"
+#~ msgstr "pregunta a la tabla llamada NAME"
+
+#~ msgid "No commands specified.\n"
+#~ msgstr "Ningún comando fue especificado.\n"
+
+#~ msgid "Superflous arguments (ignored).\n"
+#~ msgstr "Argumentos superfluos (ignorados).\n"
+
+#~ msgid "Query `%s' had no results.\n"
+#~ msgstr "La pregunta '%s' no tuvo resultados.\n"
+
+#~ msgid "FSUI persistence: error restoring download\n"
+#~ msgstr "FSUI persistente: error restableciendo la descarga\n"
+
+#~ msgid "FSUI state file `%s' had syntax error at offset %u.\n"
+#~ msgstr ""
+#~ "Fichero del estado de FSUI '%s' tiene un error de sintáxis en la "
+#~ "asignación %u.\n"
+
+#~ msgid "ECRS download suspending."
+#~ msgstr "La descarga del ERCS fue suspendida."
+
+#~ msgid "Unexpected download state."
+#~ msgstr "Estado de descarga inesperado."
+
+#~ msgid "Upload failed."
+#~ msgstr "Subida fallida"
+
+#~ msgid "Cannot upload directory without using recursion."
+#~ msgstr "Imposible compartir un directorio sin hacerlo recursivamente."
+
+#, fuzzy
+#~ msgid "Expected `%s' to be a regular file\n"
+#~ msgstr "'%s' no es un fichero regular.\n"
+
+#, fuzzy
+#~ msgid "expected `%s' to be a directory!\n"
+#~ msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
+
 #~ msgid "Sorry, no help is available for this option.\n"
 #~ msgstr "Lo siento, no hay ayuda disponible para esta opción.\n"
 
@@ -4571,9 +4961,6 @@
 #~ "Puerto inválido \"%s\" en la especificación de la lista local, probando "
 #~ "el puerto %d.\n"
 
-#~ msgid "`%s' failed at %s:%d with error: `%s'.\n"
-#~ msgstr "'%s' falló en %s: %d con error: '%s'.\n"
-
 #~ msgid "Could not download list of peer contacts, host `%s' unknown.\n"
 #~ msgstr ""
 #~ "Imposible descargar lista de contactos, servidor '%s' desconocido.\n"
@@ -4792,9 +5179,6 @@
 #~ "tarjetas de RDSI y DNAT (también conocido como \"seguimiento de puertos"
 #~ "\")."
 
-#~ msgid "Network interface:"
-#~ msgstr "Interfaz de red:"
-
 #~ msgid "IP-Address/Hostname:"
 #~ msgstr "Dirección IP/Nombre del dominio"
 
@@ -4802,9 +5186,6 @@
 #~ msgstr ""
 #~ "El ordenador no puede recibir conexiones entrantes (SNAT/Cortafuegos)"
 
-#~ msgid "Network connection"
-#~ msgstr "Conexión de red"
-
 #~ msgid ""
 #~ "You can limit GNUnet's ressource usage here.\n"
 #~ "\n"
@@ -4983,9 +5364,6 @@
 #~ msgid "Show _range"
 #~ msgstr "Muestra el _rango"
 
-#~ msgid "Show value of the option"
-#~ msgstr "Muestra el valor de la opción"
-
 #~ msgid "Show _data"
 #~ msgstr "Mostrar los _datos"
 
@@ -5152,9 +5530,6 @@
 #~ msgid "MESSAGE"
 #~ msgstr "MENSAJE"
 
-#~ msgid "INFO"
-#~ msgstr "INFORMACIÓN"
-
 #~ msgid "CRON"
 #~ msgstr "CRON"
 

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2006-11-12 07:38:46 UTC (rev 3716)
+++ GNUnet/po/rw.po     2006-11-12 08:05:43 UTC (rev 3717)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-09-10 22:06-0600\n"
+"POT-Creation-Date: 2006-11-12 01:40-0700\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <address@hidden>\n"
 "Language-Team: Kinyarwanda <address@hidden>\n"
@@ -98,10 +98,20 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:130
+#, fuzzy
+msgid "Full pathname of GNUnet directory for file-sharing data"
+msgstr "Izina: Bya i bushyinguro"
+
+#: contrib/config-daemon.scm:142
+#, fuzzy
+msgid "Full pathname of GNUnet directory for indexed files symbolic links"
+msgstr "Izina: Bya i bushyinguro"
+
+#: contrib/config-daemon.scm:154
 msgid "How many minutes should peer advertisements last?"
 msgstr ""
 
-#: contrib/config-daemon.scm:132
+#: contrib/config-daemon.scm:156
 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 "
@@ -111,52 +121,97 @@
 "than the frequency with which your IP changes."
 msgstr ""
 
-#: contrib/config-daemon.scm:143
-msgid "Log level"
+#: contrib/config-daemon.scm:167
+msgid "Where can GNUnet find an initial list of peers?"
 msgstr ""
 
-#: contrib/config-daemon.scm:144
-msgid "How verbose should the logging of errors be?"
+#: contrib/config-daemon.scm:169
+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"
+"\t\t\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"
+"\t\t\n"
+"If you do not specify a HOSTLISTURL, you must copy valid hostkeys to data/"
+"hosts manually."
 msgstr ""
 
-#: contrib/config-daemon.scm:155
-msgid "Where should logs go?"
+#: contrib/config-daemon.scm:186
+msgid "HTTP Proxy Server"
 msgstr ""
 
-#: contrib/config-daemon.scm:157
+#: contrib/config-daemon.scm:188
 msgid ""
-"In which file should gnunetd write the logs?  If you specify nothing, logs "
-"are written to stderr (and note that if gnunetd runs in the background, "
-"stderr is closed and all logs are discarded)."
+"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:168
+#: contrib/config-daemon.scm:227 contrib/config-client.scm:144
 msgid "How long should logs be kept?"
 msgstr ""
 
-#: contrib/config-daemon.scm:170
+#: contrib/config-daemon.scm:229 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:181
+#: contrib/config-daemon.scm:240 contrib/config-client.scm:157
+msgid "Where should gnunetd write the logs?"
+msgstr ""
+
+#: contrib/config-daemon.scm:252 contrib/config-client.scm:169
+#, fuzzy
+msgid "Configuration of the logging system"
+msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
+
+#: contrib/config-daemon.scm:253 contrib/config-client.scm:170
+msgid "Specify which system messages should be logged how"
+msgstr ""
+
+#: contrib/config-daemon.scm:257 contrib/config-client.scm:174
+msgid "Logging of events for users"
+msgstr ""
+
+#: contrib/config-daemon.scm:258 contrib/config-client.scm:175
+msgid "Logging of events for the system administrator"
+msgstr ""
+
+#: contrib/config-daemon.scm:270
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:183
+#: contrib/config-daemon.scm:272
 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:195
+#: contrib/config-daemon.scm:284
+msgid "As which user should gnunetd run?"
+msgstr ""
+
+#: contrib/config-daemon.scm:286
+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:298
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:197
+#: contrib/config-daemon.scm:300
 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"
@@ -170,11 +225,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:211
+#: contrib/config-daemon.scm:314
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:213
+#: contrib/config-daemon.scm:316
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -211,19 +266,109 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:244
+#: contrib/config-daemon.scm:345
+msgid "Disable client-server connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:357
+msgid "Disable peer discovery"
+msgstr ""
+
+#: contrib/config-daemon.scm:358
+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:369
+msgid "Disable advertising this peer to other peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:381
+#, fuzzy
+msgid "Disable automatic establishment of connections"
+msgstr "Byikoresha"
+
+#: contrib/config-daemon.scm:382
+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:393
+msgid "Disable advertising of other peers by this peer"
+msgstr ""
+
+#: contrib/config-daemon.scm:405 contrib/config-client.scm:189
+msgid "Client/Server Port"
+msgstr ""
+
+#: contrib/config-daemon.scm:406 contrib/config-client.scm:190
+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:417
+msgid "IPs allowed to use gnunetd server"
+msgstr ""
+
+#: contrib/config-daemon.scm:418
+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:430
+msgid "Limit connections to the specfied set of peers."
+msgstr ""
+
+#: contrib/config-daemon.scm:431
+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:442
+msgid "Prevent the specfied set of peers from connecting."
+msgstr ""
+
+#: contrib/config-daemon.scm:443
+msgid "If this option is not set, any peer is allowed to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:454
+msgid "Rarely used settings for peer advertisements and connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:474
 msgid "General settings"
 msgstr ""
 
-#: contrib/config-daemon.scm:245
+#: contrib/config-daemon.scm:475
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:268
+#: contrib/config-daemon.scm:501
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:270
+#: contrib/config-daemon.scm:503
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -232,11 +377,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:283
+#: contrib/config-daemon.scm:516
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:285
+#: contrib/config-daemon.scm:518
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -249,30 +394,43 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:300
+#: contrib/config-daemon.scm:533
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:301
+#: contrib/config-daemon.scm:534
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:318
+#: contrib/config-daemon.scm:551
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:319
+#: contrib/config-daemon.scm:552
 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:334
+#: contrib/config-daemon.scm:566
+msgid "Name of the MySQL database GNUnet should use"
+msgstr ""
+
+#: contrib/config-daemon.scm:578
+msgid "Configuration file that specifies the MySQL username and password"
+msgstr ""
+
+#: contrib/config-daemon.scm:590
+#, fuzzy
+msgid "Configuration of the MySQL database"
+msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
+
+#: contrib/config-daemon.scm:609
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:611
 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 "
@@ -283,16 +441,16 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:350
+#: contrib/config-daemon.scm:625
 #, fuzzy
 msgid "Size of the routing table."
 msgstr "#imbonerahamwe#"
 
-#: contrib/config-daemon.scm:363
+#: contrib/config-daemon.scm:638
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:365
+#: contrib/config-daemon.scm:640
 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"
@@ -304,20 +462,20 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:379
+#: contrib/config-daemon.scm:654
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:395
+#: contrib/config-daemon.scm:671
 #, fuzzy
 msgid "Applications"
 msgstr "ibirindiro"
 
-#: contrib/config-daemon.scm:411
+#: contrib/config-daemon.scm:687
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:412
+#: contrib/config-daemon.scm:688
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port. Note that if you have configured your NAT box to "
@@ -326,70 +484,258 @@
 "you directly."
 msgstr ""
 
-#: contrib/config-daemon.scm:423
+#: contrib/config-daemon.scm:699
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:435
+#: contrib/config-daemon.scm:711
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:450
+#: contrib/config-daemon.scm:726
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:462
+#: contrib/config-daemon.scm:738
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:477
+#: contrib/config-daemon.scm:753
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:489
+#: contrib/config-daemon.scm:765
+msgid "What is the maximum transfer unit for UDP?"
+msgstr ""
+
+#: contrib/config-daemon.scm:777 contrib/config-daemon.scm:818
+#: contrib/config-daemon.scm:870
+msgid "Which IPs are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:789
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:504
+#: contrib/config-daemon.scm:806
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:516
+#: contrib/config-daemon.scm:830
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:531
+#: contrib/config-daemon.scm:846
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:543
+#: contrib/config-daemon.scm:858
+msgid "What is the maximum transfer unit for UDP 6?"
+msgstr ""
+
+#: contrib/config-daemon.scm:882
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:558
+#: contrib/config-daemon.scm:899
+msgid "Network interface"
+msgstr ""
+
+#: contrib/config-daemon.scm:911
+msgid "External IP address (leave empty to try auto-detection)"
+msgstr ""
+
+#: contrib/config-daemon.scm:923
+msgid "External IPv6 address (leave empty to try auto-detection)"
+msgstr ""
+
+#: contrib/config-daemon.scm:935
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:580 contrib/config-client.scm:121
+#: contrib/config-daemon.scm:958
+msgid "What is the maximum number of bytes per second that we may receive?"
+msgstr ""
+
+#: contrib/config-daemon.scm:970
+msgid "What is the maximum number of bytes per second that we may send?"
+msgstr ""
+
+#: contrib/config-daemon.scm:982
+msgid "What is the maximum CPU load (percentage)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:984
+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:995
+msgid "What is the maximum CPU load (hard limit)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:996
+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:1007
+msgid "What is the maximum upstream bandwidth (hard limit)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1008
+msgid "Use 0 for no limit."
+msgstr ""
+
+#: contrib/config-daemon.scm:1019
+msgid "Should we disable random padding (experimental option)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1031
+msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
+msgstr ""
+
+#: contrib/config-daemon.scm:1033
+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"
+"\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"
+"\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)."
+msgstr ""
+
+#: contrib/config-daemon.scm:1050
+msgid "Network interface to monitor"
+msgstr ""
+
+#: contrib/config-daemon.scm:1052
+msgid ""
+"\tFor which interfaces should we do accounting?  GNUnet will evaluate\n"
+"\t\tthe total traffic (not only the GNUnet related traffic) and adjust\n"
+"\t\tits bandwidth usage accordingly. You can currently only specify a\n"
+"\t\tsingle interface. GNUnet will also use this interface to determine\n"
+"\t\tthe IP to use. Typical values are eth0, ppp0, eth1, wlan0, etc.\n"
+"\t\t'ifconfig' will tell you what you have.  Never use 'lo', that just\n"
+"\t\twon't work.\n"
+"\t\tUnder Windows, specify the index number reported by\n"
+"\t\t \"gnunet-win-tool -n\"."
+msgstr ""
+
+#: contrib/config-daemon.scm:1071
+#, fuzzy
+msgid "Load management"
+msgstr "Komandi: Umurongo ingingo"
+
+#: contrib/config-daemon.scm:1095 contrib/config-client.scm:286
 msgid "Root node"
 msgstr ""
 
-#: src/transports/ip6.c:65 src/util/network/io.c:74
+#: contrib/config-client.scm:201
+msgid "On which machine runs gnunetd (for clients)"
+msgstr ""
+
+#: contrib/config-client.scm:202
+msgid "This is equivalent to the -H option."
+msgstr ""
+
+#: contrib/config-client.scm:214
+msgid "General options"
+msgstr ""
+
+#: contrib/config-client.scm:231
+msgid "Do not add metadata listing the creation time for inserted content"
+msgstr ""
+
+#: contrib/config-client.scm:243
+msgid "Which non-default extractors should GNUnet use for keyword extractors"
+msgstr ""
+
+#: 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"
+"\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."
+msgstr ""
+
+#: contrib/config-client.scm:257
+msgid "File-Sharing options"
+msgstr ""
+
+#: contrib/config-client.scm:274
+#, fuzzy
+msgid "Full pathname of GNUnet client HOME directory"
+msgstr "Izina: Bya i bushyinguro"
+
+#: contrib/config-client.scm:275
+msgid "The directory for GNUnet files that belong to the user."
+msgstr ""
+
+#: src/transports/ip6.c:65 src/util/network/io.c:78
 #, fuzzy, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "OYA Gushaka Bya Ubuturo"
 
-#: src/transports/ip6.c:109
+#: src/transports/ip6.c:110
 #, fuzzy, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "OYA"
 
-#: src/transports/ip6.c:154 src/transports/ip.c:353
+#: src/transports/ip6.c:155 src/transports/ip.c:354
 #, fuzzy, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp6.c:126 src/transports/udp.c:128
+#: src/transports/udp6.c:126 src/transports/udp.c:132
 #, fuzzy, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr "Kuri Kuri Umuyoboro"
@@ -399,7 +745,7 @@
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp6.c:443 src/transports/udp.c:443
+#: src/transports/udp6.c:441 src/transports/udp.c:447
 #, fuzzy, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr "kugirango ni Byo hasi OYA"
@@ -486,56 +832,40 @@
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: src/transports/smtp.c:298
+#: src/transports/smtp.c:257
 #, fuzzy, c-format
-msgid "Could not resolve name of SMTP server `%s': %s"
-msgstr "OYA Izina: Bya Seriveri"
-
-#: src/transports/smtp.c:420 src/transports/smtp.c:882
-#, fuzzy, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
 "under `%s'.\n"
 msgstr "i Izina: Bya a kugirango i in Icyiciro"
 
-#: src/transports/smtp.c:493
+#: src/transports/smtp.c:334
 #, fuzzy
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr "Ubutumwa Biturutse Ingano"
 
-#: src/transports/smtp.c:588
+#: src/transports/smtp.c:433
 #, fuzzy
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr "Muyunguruzi... kugirango E Ubutumwa Kurema"
 
-#: src/transports/smtp.c:595
+#: src/transports/smtp.c:440
 #, fuzzy, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "Muyunguruzi... Ikurikiranyanyuguti Kuri Kuri"
 
-#: src/transports/smtp.c:769
+#: src/transports/smtp.c:546
 #, fuzzy, c-format
+msgid "Failed to initialize libesmtp: %s.\n"
+msgstr "Kuri gutangiza"
+
+#: src/transports/smtp.c:610
+#, fuzzy, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "E Ubutumwa Kuri Byanze"
 
-#: src/transports/smtp.c:820
+#: src/transports/smtp.c:678
 #, fuzzy, c-format
-msgid "SMTP server send unexpected response at %s:%d.\n"
-msgstr "Seriveri Kohereza ku"
-
-#: src/transports/smtp.c:843
-#, fuzzy, c-format
-msgid ""
-"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
-msgstr "OYA Kohereza Iyemeza kugirango Kubaza..."
-
-#: src/transports/smtp.c:849
-#, fuzzy, c-format
-msgid "Failed to send `%s' request to SMTP server.\n"
-msgstr "Kuri Kohereza Ubutumwa Kuri"
-
-#: src/transports/smtp.c:909
-#, fuzzy, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
 "%.*Project- Id- Version: basctl\n"
@@ -547,7 +877,7 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/smtp.c:938
+#: src/transports/smtp.c:706
 #, fuzzy, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr "kugirango ni Byo hasi OYA"
@@ -562,26 +892,26 @@
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
 
-#: src/transports/tcp.c:421
+#: src/transports/tcp.c:423
 #, fuzzy
 msgid "# bytes received via TCP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/tcp.c:423
+#: src/transports/tcp.c:425
 #, fuzzy
 msgid "# bytes sent via TCP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/tcp.c:425
+#: src/transports/tcp.c:427
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:217
+#: src/transports/udp.c:222
 #, fuzzy
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp.c:312
+#: src/transports/udp.c:314
 #, fuzzy, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
@@ -601,17 +931,17 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/udp.c:449
+#: src/transports/udp.c:453
 #, fuzzy
 msgid "# bytes received via UDP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/udp.c:451
+#: src/transports/udp.c:455
 #, fuzzy
 msgid "# bytes sent via UDP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/udp.c:453
+#: src/transports/udp.c:457
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
@@ -685,323 +1015,289 @@
 msgid "`%s': unknown service: %s\n"
 msgstr "`%s':Kitazwi Serivisi"
 
-#: src/transports/tcp6.c:430
+#: src/transports/tcp6.c:432
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/tcp6.c:432
+#: src/transports/tcp6.c:434
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/tcp6.c:434
+#: src/transports/tcp6.c:436
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr ""
 
-#: src/transports/tcp_helper.c:182
+#: src/transports/tcp_helper.c:191
 #, fuzzy
 msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr "Ubutumwa Bivuye HTTP Ukwihuza"
 
-#: src/transports/tcp_helper.c:193
+#: src/transports/tcp_helper.c:202
 #, fuzzy
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr "Ubutumwa Bivuye HTTP Ukwihuza"
 
-#: src/transports/udp_helper.c:93
+#: src/transports/udp_helper.c:91
 #, fuzzy
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr "Ubutumwa Bivuye HTTP Ukwihuza"
 
-#: src/applications/dht/tools/dhttest2.c:50
+#: src/applications/dht/tools/dhttest2.c:45
 #: src/applications/session/sessiontest.c:42
 #: src/applications/stats/statistics.c:212
 #: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:101
-#: src/applications/gap/gaptest.c:52
+#: src/applications/tbench/tbenchtest_udp.c:100
+#: src/applications/gap/gaptest.c:49
 #, fuzzy
 msgid "# of connected peers"
 msgstr "#Bya"
 
-#: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/gap/gaptest.c:318
+#: src/applications/dht/tools/dhttest2.c:160
 #, c-format
 msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 msgstr ""
 
-#: src/applications/dht/tools/dhttest2.c:140
+#: src/applications/dht/tools/dhttest2.c:173
 #: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:117
-#: src/applications/gap/gaptest.c:330
+#: src/applications/tbench/tbenchtest_udp.c:116
 #, c-format
 msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:39
+#: src/applications/dht/tools/dht-query.c:53
 #, fuzzy
-msgid "query table called NAME"
-msgstr "Ikibazo# imbonerahamwe#"
-
-#: src/applications/dht/tools/dht-query.c:41
-#, fuzzy
-msgid "allow TIME ms to process each command"
-msgstr "Kwemerera Kuri Komandi:"
-
-#: src/applications/dht/tools/dht-query.c:46
-#, fuzzy
 msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
 msgstr "Kubona Gushyira Gukuraho... a imbonerahamwe#"
 
-#: src/applications/dht/tools/dht-query.c:84
-#: src/applications/dht/tools/dht-join.c:85 src/util/getopt/setoption.c:133
-#: src/util/getopt/setoption.c:149
-#, fuzzy, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "a Umubare Kuri i Ihitamo"
+#: src/applications/dht/tools/dht-query.c:57
+#: src/applications/dht/tools/dht-join.c:59
+#, fuzzy
+msgid "join table called NAME"
+msgstr "imbonerahamwe#"
 
-#: src/applications/dht/tools/dht-query.c:99
-#: src/applications/dht/tools/dht-join.c:108
-#: src/applications/chat/gnunet-chat.c:93
-#: src/applications/testbed/gnunet-testbed.c:125
-#: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/vpn/gnunet-vpn.c:118 src/util/getopt/getopt.c:1066
-#: src/setup/gnunet-setup.c:246
-#, fuzzy, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
-
-#: src/applications/dht/tools/dht-query.c:106
+#: src/applications/dht/tools/dht-query.c:60
 #, fuzzy
-msgid "No commands specified.\n"
-msgstr "Amagambo fatizo"
+msgid "allow TIME ms to process each command"
+msgstr "Kwemerera Kuri Komandi:"
 
-#: src/applications/dht/tools/dht-query.c:173
-#: src/applications/dht/tools/dht-query.c:204
+#: src/applications/dht/tools/dht-query.c:130
+#: src/applications/dht/tools/dht-query.c:163
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:177
-#: src/applications/dht/tools/dht-query.c:208
+#: src/applications/dht/tools/dht-query.c:134
+#: src/applications/dht/tools/dht-query.c:167
 #, fuzzy, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s,%s)'Byanze"
 
-#: src/applications/dht/tools/dht-query.c:231
-#: src/applications/dht/tools/dht-join.c:211
+#: src/applications/dht/tools/dht-query.c:194
+#: src/applications/dht/tools/dht-join.c:165
 #, fuzzy, c-format
 msgid "No table name specified, using `%s'.\n"
 msgstr "imbonerahamwe# Izina: ikoresha"
 
-#: src/applications/dht/tools/dht-query.c:246
+#: src/applications/dht/tools/dht-query.c:210
 #, fuzzy, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/dht/tools/dht-query.c:253
+#: src/applications/dht/tools/dht-query.c:220
 #, fuzzy, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr "Komandi:"
 
-#: src/applications/dht/tools/dht-query.c:261
-#: src/applications/dht/tools/dht-query.c:271
+#: src/applications/dht/tools/dht-query.c:232
+#: src/applications/dht/tools/dht-query.c:246
 #, fuzzy, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr "Komandi: ingingo Na"
 
-#: src/applications/dht/tools/dht-query.c:279
+#: src/applications/dht/tools/dht-query.c:258
 #, fuzzy, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Komandi:"
 
-#: src/applications/dht/tools/dht_api.c:127
-#: src/applications/dht/tools/dht_api.c:236
-#: src/applications/dht/tools/dht_api.c:289
-#: src/applications/dht/tools/dht_api.c:343
-#: src/applications/dht/tools/dht_api.c:377
+#: src/applications/dht/tools/dht_api.c:148
+#: src/applications/dht/tools/dht_api.c:264
+#: src/applications/dht/tools/dht_api.c:321
+#: src/applications/dht/tools/dht_api.c:379
+#: src/applications/dht/tools/dht_api.c:415
 #, fuzzy, c-format
 msgid "Failed to send `%s'.  Closing connection.\n"
 msgstr "Kuri Kohereza Ukwihuza"
 
-#: src/applications/dht/tools/dht_api.c:201
-#: src/applications/dht/tools/dht_api.c:253
-#: src/applications/dht/tools/dht_api.c:307
-#: src/applications/dht/tools/dht_api.c:360
+#: src/applications/dht/tools/dht_api.c:226
+#: src/applications/dht/tools/dht_api.c:282
+#: src/applications/dht/tools/dht_api.c:340
+#: src/applications/dht/tools/dht_api.c:397
 #, fuzzy, c-format
 msgid "Received invalid `%s' request (size %d)\n"
 msgstr "Sibyo Kubaza... Ingano"
 
-#: src/applications/dht/tools/dht_api.c:214
-#: src/applications/dht/tools/dht_api.c:266
-#: src/applications/dht/tools/dht_api.c:320
+#: src/applications/dht/tools/dht_api.c:241
+#: src/applications/dht/tools/dht_api.c:297
+#: src/applications/dht/tools/dht_api.c:355
 #, fuzzy, c-format
 msgid "Received invalid `%s' request (wrong table)\n"
 msgstr "Sibyo Kubaza... imbonerahamwe#"
 
-#: src/applications/dht/tools/dht_api.c:390
+#: src/applications/dht/tools/dht_api.c:429
 #, fuzzy, c-format
 msgid "Received unknown request type %d at %s:%d\n"
 msgstr "Kitazwi Kubaza... Ubwoko ku"
 
-#: src/applications/dht/tools/dht_api.c:430
+#: src/applications/dht/tools/dht_api.c:473
 #, fuzzy
 msgid "This client already participates in the given DHT!\n"
 msgstr "Umukiriya in i"
 
-#: src/applications/dht/tools/dht_api.c:498
+#: src/applications/dht/tools/dht_api.c:548
 #, fuzzy
 msgid "Cannot leave DHT: table not known!\n"
 msgstr "imbonerahamwe# OYA"
 
-#: src/applications/dht/tools/dht_api.c:520
+#: src/applications/dht/tools/dht_api.c:571
 #, fuzzy, c-format
 msgid "gnunetd signaled error in response to `%s' message\n"
 msgstr "Ikosa in Kuri"
 
-#: src/applications/dht/tools/dht_api.c:525
+#: src/applications/dht/tools/dht_api.c:576
 #, fuzzy, c-format
 msgid "Failed to receive response to `%s' message from gnunetd\n"
 msgstr "Kuri Akira Kuri Ubutumwa Bivuye"
 
-#: src/applications/dht/tools/dht_api.c:530
+#: src/applications/dht/tools/dht_api.c:581
 #, fuzzy, c-format
 msgid "Failed to send `%s' message to gnunetd\n"
 msgstr "Kuri Kohereza Ubutumwa Kuri"
 
-#: src/applications/dht/tools/dht_api.c:622
+#: src/applications/dht/tools/dht_api.c:677
 #, fuzzy, c-format
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Subiza Kuri"
 
-#: src/applications/dht/tools/dht-join.c:43
+#: src/applications/dht/tools/dht-join.c:52
 #, fuzzy
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "Kwemerera Bayite Bya Ububiko kugirango i imbonerahamwe#"
-
-#: src/applications/dht/tools/dht-join.c:45
-#, fuzzy
-msgid "join table called NAME"
-msgstr "imbonerahamwe#"
-
-#: src/applications/dht/tools/dht-join.c:51
-#, fuzzy
 msgid "Join a DHT."
 msgstr "a"
 
-#: src/applications/dht/tools/dht-join.c:115
+#: src/applications/dht/tools/dht-join.c:56
 #, fuzzy
-msgid "Superflous arguments (ignored).\n"
-msgstr "ingingo"
+msgid "allow SIZE bytes of memory for the local table"
+msgstr "Kwemerera Bayite Bya Ububiko kugirango i imbonerahamwe#"
 
-#: src/applications/dht/tools/dht-join.c:131
+#: src/applications/dht/tools/dht-join.c:78
 #, fuzzy, c-format
 msgid "Call to `%s' returns %d.\n"
 msgstr "Kuri"
 
-#: src/applications/dht/tools/dht-join.c:132
+#: src/applications/dht/tools/dht-join.c:79
 #, fuzzy, c-format
 msgid "Call to `%s' with key `%s'.\n"
 msgstr "Kuri Na: Urufunguzo"
 
-#: src/applications/dht/tools/dht-join.c:133
+#: src/applications/dht/tools/dht-join.c:80
 #, fuzzy, c-format
 msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
 msgstr "Kuri Na: Agaciro Bayite"
 
-#: src/applications/dht/tools/dht-join.c:236
+#: src/applications/dht/tools/dht-join.c:189
 msgid "Error joining DHT.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:243
+#: src/applications/dht/tools/dht-join.c:196
 #, fuzzy, c-format
 msgid "Joined DHT.  Press CTRL-C to leave.\n"
 msgstr "C Kuri"
 
-#: src/applications/dht/tools/dht-join.c:250
+#: src/applications/dht/tools/dht-join.c:205
 msgid "Error leaving DHT.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:946
+#: src/applications/dht/module/dht.c:952
 #, fuzzy, c-format
 msgid "Malformed optional field `%s' received from peer `%s'.\n"
 msgstr "Bitari ngombwa Umwanya BYAKIRIWE Bivuye"
 
-#: src/applications/dht/module/dht.c:973
+#: src/applications/dht/module/dht.c:979
 #, fuzzy, c-format
 msgid "Could not find peer `%s' in routing table!\n"
 msgstr "OYA Gushaka in imbonerahamwe#"
 
-#: src/applications/dht/module/dht.c:1120
-#: src/applications/dht/module/dht.c:1135
+#: src/applications/dht/module/dht.c:1126
+#: src/applications/dht/module/dht.c:1141
 #, fuzzy, c-format
 msgid "Received malformed response to `%s' from peer `%s'.\n"
 msgstr "Kuri Bivuye"
 
-#: src/applications/dht/module/dht.c:1447
+#: src/applications/dht/module/dht.c:1453
 #, fuzzy, c-format
 msgid "Invalid response to `%s' from peer `%s'.\n"
 msgstr "Kuri Bivuye"
 
-#: src/applications/dht/module/dht.c:1603
-#: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1290
+#: src/applications/dht/module/dht.c:1611
+#: src/applications/dht/module/dht.c:2351
+#: src/applications/dht/module/dht.c:2628 src/applications/rpc/rpc.c:1291
 #, fuzzy, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr "`%s'Na: Igihe cyarenze: hejuru 1. ISAHA"
 
-#: src/applications/dht/module/dht.c:1793
+#: src/applications/dht/module/dht.c:1803
 #, fuzzy, c-format
 msgid "Invalid response to `%s'.\n"
 msgstr "Kuri"
 
-#: src/applications/dht/module/dht.c:1993
+#: src/applications/dht/module/dht.c:2003
 #, fuzzy, c-format
 msgid "Malformed response to `%s' on master table.\n"
 msgstr "Kuri ku Mugenga imbonerahamwe#"
 
-#: src/applications/dht/module/dht.c:2207
-#: src/applications/dht/module/dht.c:2507
+#: src/applications/dht/module/dht.c:2217
+#: src/applications/dht/module/dht.c:2522
 #, fuzzy, c-format
 msgid "Invalid response to `%s' from `%s'\n"
 msgstr "Kuri Bivuye"
 
-#: src/applications/dht/module/dht.c:2881
-#: src/applications/dht/module/dht.c:3021
-#: src/applications/dht/module/dht.c:3148
-#: src/applications/dht/module/dht.c:3282
+#: src/applications/dht/module/dht.c:2899
+#: src/applications/dht/module/dht.c:3041
+#: src/applications/dht/module/dht.c:3182
+#: src/applications/dht/module/dht.c:3330
 #, fuzzy, c-format
 msgid "Received invalid RPC `%s'.\n"
 msgstr "Sibyo"
 
-#: src/applications/dht/module/dht.c:3160
-#: src/applications/dht/module/dht.c:3296
+#: src/applications/dht/module/dht.c:3201
+#: src/applications/dht/module/dht.c:3351
 #, c-format
 msgid "RPC for `%s' received for table that we do not participate in!\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:446
+#: src/applications/dht/module/cs.c:449
 #, fuzzy, c-format
 msgid "`%s' failed: table not found!\n"
 msgstr "`%s'Byanze imbonerahamwe# OYA Byabonetse"
 
-#: src/applications/dht/module/cs.c:466
+#: src/applications/dht/module/cs.c:469
 #, fuzzy, c-format
 msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr "`%s'Byanze."
 
-#: src/applications/dht/module/cs.c:542
+#: src/applications/dht/module/cs.c:546
 #, fuzzy
 msgid "sendAck failed.  Terminating connection to client.\n"
 msgstr "Byanze Ukwihuza Kuri Umukiriya"
 
-#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
-#: src/applications/dht/module/cs.c:688
+#: src/applications/dht/module/cs.c:666 src/applications/dht/module/cs.c:684
+#: src/applications/dht/module/cs.c:693
 #, fuzzy, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "`%s'Byanze."
 
-#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
+#: src/applications/dht/module/cs.c:814 src/applications/dht/module/cs.c:867
 #, fuzzy, c-format
 msgid "Failed to deliver `%s' message.\n"
 msgstr "Kuri Ibikubiyemo"
@@ -1045,6 +1341,14 @@
 msgid "Start GNUnet chat client."
 msgstr "Gutangira Umukiriya"
 
+#: src/applications/chat/gnunet-chat.c:93
+#: src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:546 src/util/getopt/getopt.c:1067
+#: src/setup/gnunet-setup.c:283
+#, fuzzy, c-format
+msgid "Use --help to get a list of options.\n"
+msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
+
 #: src/applications/chat/gnunet-chat.c:151
 #, fuzzy
 msgid "Could not connect to gnunetd.\n"
@@ -1065,73 +1369,78 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "OYA Kohereza Ubutumwa Kuri"
 
-#: src/applications/advertising/advertising.c:162
+#: src/applications/advertising/advertising.c:168
 #, fuzzy, c-format
 msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr "Ubutumwa Bivuye Sibyo Isinya Sibyo"
 
-#: src/applications/advertising/advertising.c:168
+#: src/applications/advertising/advertising.c:175
 #, fuzzy
 msgid ""
 "hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr "Ubutumwa BYAKIRIWE Sibyo Igihe KURI"
 
-#: src/applications/advertising/advertising.c:177
+#: src/applications/advertising/advertising.c:182
+#, c-format
+msgid "hello transport verification failed (%u).\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:192
 #, fuzzy, c-format
 msgid "hello advertisement for protocol %d received.\n"
 msgstr "kugirango Porotokole BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:297
+#: src/applications/advertising/advertising.c:325
 #, fuzzy
 msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr "OYA Kohereza"
 
-#: src/applications/advertising/advertising.c:310
+#: src/applications/advertising/advertising.c:338
 #, fuzzy, c-format
 msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr "`%s'Byanze kugirango Umuyoboro in amasogonda"
 
-#: src/applications/advertising/advertising.c:467
+#: src/applications/advertising/advertising.c:495
 #, fuzzy, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Kuri Byahiswemo"
 
-#: src/applications/advertising/advertising.c:474
+#: src/applications/advertising/advertising.c:502
 #, fuzzy
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr "Oya Ikindi Kuri RW"
 
-#: src/applications/advertising/advertising.c:580
+#: src/applications/advertising/advertising.c:608
 #, fuzzy, c-format
 msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr "Bivuye Byarengeje igihe"
 
-#: src/applications/advertising/advertising.c:760
+#: src/applications/advertising/advertising.c:788
 #, fuzzy
 msgid "# Peer advertisements received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:761
+#: src/applications/advertising/advertising.c:789
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:762
+#: src/applications/advertising/advertising.c:790
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:764
+#: src/applications/advertising/advertising.c:792
 #: src/applications/pingpong/pingpong.c:488
 msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:768
-#: src/applications/session/connect.c:779
+#: src/applications/advertising/advertising.c:796
+#: src/applications/session/connect.c:800
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:785
+#: src/applications/advertising/advertising.c:813
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
@@ -1200,23 +1509,29 @@
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:45
-#: src/applications/sqstore_sqlite/sqlite.c:52
-#: src/applications/sqstore_mysql/mysql.c:137
-#: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:389
-#: src/applications/sqstore_mysql/mysql.c:728
-#: src/applications/sqstore_mysql/mysql.c:743
-#: src/applications/sqstore_mysql/mysql.c:752
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:786
-#: src/applications/sqstore_mysql/mysql.c:840
-#: src/applications/sqstore_mysql/mysql.c:925
-#: src/applications/sqstore_mysql/mysql.c:935
-#: src/applications/sqstore_mysql/mysql.c:1007
-#: src/applications/sqstore_mysql/mysql.c:1016
-#: src/applications/sqstore_mysql/mysql.c:1056
-#: src/applications/sqstore_mysql/mysql.c:1070
+#: src/applications/sqstore_sqlite/sqlite.c:46
+#: src/applications/sqstore_sqlite/sqlite.c:53
+#: src/applications/sqstore_mysql/mysql.c:138
+#: src/applications/sqstore_mysql/mysql.c:145
+#: src/applications/sqstore_mysql/mysql.c:423
+#: src/applications/sqstore_mysql/mysql.c:765
+#: src/applications/sqstore_mysql/mysql.c:781
+#: src/applications/sqstore_mysql/mysql.c:791
+#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:827
+#: src/applications/sqstore_mysql/mysql.c:884
+#: src/applications/sqstore_mysql/mysql.c:971
+#: src/applications/sqstore_mysql/mysql.c:982
+#: src/applications/sqstore_mysql/mysql.c:1046
+#: src/applications/sqstore_mysql/mysql.c:1062
+#: src/applications/sqstore_mysql/mysql.c:1072
+#: src/applications/sqstore_mysql/mysql.c:1096
+#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/sqstore_mysql/mysql.c:1119
+#: src/applications/sqstore_mysql/mysql.c:1182
+#: src/applications/sqstore_mysql/mysql.c:1194
+#: src/applications/sqstore_mysql/mysql.c:1242
+#: src/applications/sqstore_mysql/mysql.c:1257
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
@@ -1225,80 +1540,81 @@
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s'Byanze ku Na: Ikosa"
 
-#: src/applications/sqstore_sqlite/sqlite.c:158
+#: src/applications/sqstore_sqlite/sqlite.c:195
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kuri gutangiza"
 
-#: src/applications/sqstore_sqlite/sqlite.c:307
-#: src/applications/sqstore_sqlite/sqlite.c:327
-#: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:803
+#: src/applications/sqstore_sqlite/sqlite.c:356
+#: src/applications/sqstore_sqlite/sqlite.c:377
+#: src/applications/sqstore_mysql/mysql.c:260
+#: src/applications/sqstore_mysql/mysql.c:845
+#: src/applications/sqstore_mysql/mysql.c:1134
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:308
-#: src/applications/sqstore_sqlite/sqlite.c:328
+#: src/applications/sqstore_sqlite/sqlite.c:357
+#: src/applications/sqstore_sqlite/sqlite.c:378
 #, fuzzy
 msgid "sqlite datastore"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1177
-#: src/applications/sqstore_mysql/mysql.c:1182
+#: src/applications/sqstore_sqlite/sqlite.c:1213
+#: src/applications/sqstore_mysql/mysql.c:1318
 #, fuzzy
 msgid "# bytes in datastore"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/session/connect.c:221
+#: src/applications/session/connect.c:225
 #, fuzzy, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Urufunguzo Bivuye OYA Byagenzuwe"
 
-#: src/applications/session/connect.c:258
+#: src/applications/session/connect.c:263
 #, fuzzy
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr "Shyiraho Umutekano Ikindi OYA"
 
-#: src/applications/session/connect.c:517
+#: src/applications/session/connect.c:533
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "`%s'Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:540
+#: src/applications/session/connect.c:558
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:550
+#: src/applications/session/connect.c:568
 #, fuzzy, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr "Bivuye Kugenzura..."
 
-#: src/applications/session/connect.c:608
+#: src/applications/session/connect.c:626
 #, fuzzy
 msgid ""
 "Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr "Bishunzwe: Umukoro Urufunguzo Ubutumwa Ingano ni Sibyo"
 
-#: src/applications/session/connect.c:619
+#: src/applications/session/connect.c:637
 #, c-format
 msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:768
+#: src/applications/session/connect.c:789
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:770
+#: src/applications/session/connect.c:791
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:772
+#: src/applications/session/connect.c:793
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:774
+#: src/applications/session/connect.c:795
 msgid "# sessions established"
 msgstr ""
 
@@ -1326,59 +1642,55 @@
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s-OYA OYA"
 
-#: src/applications/rpc/rpc.c:878 src/applications/rpc/rpc.c:1011
-#: src/applications/rpc/rpc.c:1100
+#: src/applications/rpc/rpc.c:879 src/applications/rpc/rpc.c:1012
+#: src/applications/rpc/rpc.c:1101
 #, fuzzy, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr "Ubutumwa Bya Ubwoko BYAKIRIWE"
 
-#: src/applications/rpc/rpc.c:945
+#: src/applications/rpc/rpc.c:946
 #, fuzzy, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "Kubaza... Ubutumwa"
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/rpc/rpc.c:1415
 #, fuzzy, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "OYA"
 
-#: src/applications/rpc/rpc.c:1441
+#: src/applications/rpc/rpc.c:1442
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1462
+#: src/applications/rpc/rpc.c:1463
 #, fuzzy, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Kuri gutangiza Serivisi"
 
-#: src/applications/rpc/rpc.c:1519
+#: src/applications/rpc/rpc.c:1520
 #, fuzzy
 msgid "RPC async reply invalid.\n"
 msgstr "Subiza Sibyo"
 
-#: src/applications/rpc/rpc.c:1591
+#: src/applications/rpc/rpc.c:1592
 #, fuzzy
 msgid "async RPC reply not received.\n"
 msgstr "Subiza OYA BYAKIRIWE"
 
-#: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:804
+#: src/applications/sqstore_mysql/mysql.c:261
+#: src/applications/sqstore_mysql/mysql.c:846
+#: src/applications/sqstore_mysql/mysql.c:1135
 #, fuzzy
 msgid "mysql datastore"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/sqstore_mysql/mysql.c:1110
+#: src/applications/sqstore_mysql/mysql.c:1348
 #, fuzzy, c-format
-msgid "Query `%s' had no results.\n"
-msgstr "Oya Ibisubizo ku"
-
-#: src/applications/sqstore_mysql/mysql.c:1212
-#, fuzzy, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Kuri Gukoresha IDOSIYE kugirango Iboneza"
 
-#: src/applications/sqstore_mysql/mysql.c:1230
+#: src/applications/sqstore_mysql/mysql.c:1371
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -1389,34 +1701,34 @@
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "kugirango ku"
 
-#: src/applications/datastore/datastore.c:143
+#: src/applications/datastore/datastore.c:145
 #, fuzzy, c-format
 msgid "Database failed to delete `%s'.\n"
 msgstr "Kuri Ibikubiyemo"
 
-#: src/applications/datastore/datastore.c:358
-#: src/applications/datastore/datastore.c:454
+#: src/applications/datastore/datastore.c:368
+#: src/applications/datastore/datastore.c:465
 #, fuzzy
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
 
-#: src/applications/identity/hostkey.c:109
+#: src/applications/identity/hostkey.c:121
 #, fuzzy, c-format
 msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr "OYA Gufungura bushyinguro"
 
-#: src/applications/identity/hostkey.c:139
+#: src/applications/identity/hostkey.c:155
 #, fuzzy, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr "in IDOSIYE Byanze Imiterere Kugenzura... Gishya"
 
-#: src/applications/identity/hostkey.c:147
+#: src/applications/identity/hostkey.c:163
 #, fuzzy
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Gishya iyi Gicurasi a"
 
-#: src/applications/identity/hostkey.c:160
+#: src/applications/identity/hostkey.c:176
 msgid "Done creating hostkey.\n"
 msgstr ""
 
@@ -1437,18 +1749,18 @@
 msgid "Still no peers found in `%s'!\n"
 msgstr "OYA Kureka gufungura Serivisi"
 
-#: src/applications/identity/identity.c:684
-#: src/applications/identity/identity.c:705
+#: 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 "IDOSIYE Sibyo Ibyatanzwe"
 
-#: src/applications/identity/identity.c:758
+#: src/applications/identity/identity.c:759
 #, fuzzy, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr "Shyiraho Umutekano Ikindi OYA"
 
-#: src/applications/identity/identity.c:767
+#: src/applications/identity/identity.c:768
 #, fuzzy
 msgid "Signature failed verification: signature invalid.\n"
 msgstr "Ubutumwa Sibyo Isinya Sibyo"
@@ -1690,76 +2002,77 @@
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/transport/transport.c:136
+#: src/applications/transport/transport.c:140
 #, c-format
 msgid ""
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:183
+#: src/applications/transport/transport.c:187
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:278
+#: src/applications/transport/transport.c:282
 #, fuzzy, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr "Bya Ubwoko"
 
-#: src/applications/transport/transport.c:366
+#: src/applications/transport/transport.c:370
 #, fuzzy, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Bya Ubwoko"
 
-#: src/applications/transport/transport.c:423
+#: src/applications/transport/transport.c:427
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:596
+#: src/applications/transport/transport.c:601
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "S"
 
-#: src/applications/transport/transport.c:616
+#: src/applications/transport/transport.c:621
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "OYA gutangiza Porogaramu"
 
-#: src/applications/transport/transport.c:626
+#: src/applications/transport/transport.c:631
 #, fuzzy, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr "Isomero OYA Bya ngombwa Umumaro"
 
-#: src/applications/transport/transport.c:643
+#: src/applications/transport/transport.c:658
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "S"
 
-#: src/applications/transport/transport.c:654
+#: src/applications/transport/transport.c:671
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:559
+#: src/applications/fragmentation/fragmentation.c:566
 #, fuzzy
 msgid "# messages defragmented"
 msgstr "#Ubutumwa"
 
-#: src/applications/fragmentation/fragmentation.c:560
+#: src/applications/fragmentation/fragmentation.c:567
 #, fuzzy
 msgid "# messages fragmented"
 msgstr "#Ubutumwa"
 
-#: src/applications/fragmentation/fragmentation.c:561
+#: src/applications/fragmentation/fragmentation.c:568
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:573
+#: src/applications/fragmentation/fragmentation.c:580
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr ""
 
 #: src/applications/stats/gnunet-stats.c:90
+#: src/applications/vpn/gnunet-vpn.c:52
 #, fuzzy
 msgid "Print statistics about GNUnet operations."
 msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
@@ -1769,15 +2082,16 @@
 msgid "prints supported protocol messages"
 msgstr "Porotokole Ubutumwa"
 
-#: src/applications/stats/gnunet-stats.c:137
-#: src/applications/tbench/gnunet-tbench.c:136
-#: src/applications/tracekit/gnunet-tracekit.c:319
-#: src/applications/template/gnunet-template.c:101
+#: src/applications/stats/gnunet-stats.c:130
+#: src/applications/tbench/gnunet-tbench.c:128
+#: src/applications/tracekit/gnunet-tracekit.c:312
+#: src/applications/template/gnunet-template.c:94
+#: src/applications/vpn/gnunet-vpn.c:145
 #, fuzzy, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr "Zimya Iyemeza Bivuye"
 
-#: src/applications/stats/gnunet-stats.c:156
+#: src/applications/stats/gnunet-stats.c:149
 #, fuzzy, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr "Zimya Iyemeza Bivuye"
@@ -1817,81 +2131,81 @@
 msgid "keeps statistics about gnunetd's operation"
 msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
 
-#: src/applications/tbench/gnunet-tbench.c:65
-#: src/applications/tracekit/gnunet-tracekit.c:54
+#: src/applications/tbench/gnunet-tbench.c:64
+#: src/applications/tracekit/gnunet-tracekit.c:53
 #, fuzzy
 msgid "Start GNUnet transport benchmarking tool."
 msgstr "Gutangira"
 
-#: src/applications/tbench/gnunet-tbench.c:67
+#: src/applications/tbench/gnunet-tbench.c:66
 #, fuzzy
 msgid "output in gnuplot format"
 msgstr "Ibisohoka in Imiterere"
 
-#: src/applications/tbench/gnunet-tbench.c:71
+#: src/applications/tbench/gnunet-tbench.c:70
 #, fuzzy
 msgid "number of iterations"
 msgstr "Umubare Bya Amasubiramo"
 
-#: src/applications/tbench/gnunet-tbench.c:75
+#: src/applications/tbench/gnunet-tbench.c:74
 #, fuzzy
 msgid "number of messages to use per iteration"
 msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
 
-#: src/applications/tbench/gnunet-tbench.c:78
+#: src/applications/tbench/gnunet-tbench.c:77
 #, fuzzy
 msgid "receiver host identifier (ENC file name)"
 msgstr "Mwakirizi Ubuturo Ikiranga IDOSIYE Izina:"
 
-#: src/applications/tbench/gnunet-tbench.c:81
+#: src/applications/tbench/gnunet-tbench.c:80
 #, fuzzy
 msgid "message size"
 msgstr "Ubutumwa Ingano"
 
-#: src/applications/tbench/gnunet-tbench.c:84
+#: src/applications/tbench/gnunet-tbench.c:83
 #, fuzzy
 msgid "sleep for SPACE ms after each a message block"
 msgstr "kugirango Nyuma Ubutumwa"
 
-#: src/applications/tbench/gnunet-tbench.c:87
+#: src/applications/tbench/gnunet-tbench.c:86
 #, fuzzy
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr "Igihe Kuri Tegereza kugirango i Bya a"
 
-#: src/applications/tbench/gnunet-tbench.c:91
+#: src/applications/tbench/gnunet-tbench.c:90
 #, fuzzy
 msgid "number of messages in a message block"
 msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
 
-#: src/applications/tbench/gnunet-tbench.c:153
+#: src/applications/tbench/gnunet-tbench.c:144
 #, fuzzy, c-format
 msgid "You must specify a receiver!\n"
 msgstr "a Mwakirizi"
 
-#: src/applications/tbench/gnunet-tbench.c:162
+#: src/applications/tbench/gnunet-tbench.c:152
 #, fuzzy, c-format
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr "Mwakirizi ni OYA Byemewe Izina:"
 
-#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tbench/gnunet-tbench.c:182
 #, fuzzy, c-format
 msgid "Time:\n"
 msgstr "Igihe:"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MAX.text
-#: src/applications/tbench/gnunet-tbench.c:190
+#: src/applications/tbench/gnunet-tbench.c:183
 #, fuzzy, c-format
 msgid "\tmax      %llums\n"
 msgstr "Kinini-"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MIN.text
-#: src/applications/tbench/gnunet-tbench.c:192
+#: src/applications/tbench/gnunet-tbench.c:185
 #, fuzzy, c-format
 msgid "\tmin      %llums\n"
 msgstr "Gito-"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_AVG.text
-#: src/applications/tbench/gnunet-tbench.c:194
+#: src/applications/tbench/gnunet-tbench.c:187
 #, fuzzy, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr "Impuzandengo-"
@@ -1900,30 +2214,30 @@
 # sch/source\ui\dlg\attrib4.src:TP_STAT.RBT_VARIANT.text
 # #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
 # sch/source\ui\dlg\datstat.src:DLG_DATA_STAT.RBT_VARIANT.text
-#: src/applications/tbench/gnunet-tbench.c:196
+#: src/applications/tbench/gnunet-tbench.c:189
 #, fuzzy, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
 
-#: src/applications/tbench/gnunet-tbench.c:199
+#: src/applications/tbench/gnunet-tbench.c:192
 #, c-format
 msgid "Loss:\n"
 msgstr ""
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MAX.text
-#: src/applications/tbench/gnunet-tbench.c:200
+#: src/applications/tbench/gnunet-tbench.c:193
 #, fuzzy, c-format
 msgid "\tmax      %u\n"
 msgstr "Kinini-"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MIN.text
-#: src/applications/tbench/gnunet-tbench.c:202
+#: src/applications/tbench/gnunet-tbench.c:195
 #, fuzzy, c-format
 msgid "\tmin      %u\n"
 msgstr "Gito-"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_AVG.text
-#: src/applications/tbench/gnunet-tbench.c:204
+#: src/applications/tbench/gnunet-tbench.c:197
 #, fuzzy, c-format
 msgid "\tmean     %8.4f\n"
 msgstr "Impuzandengo-"
@@ -1932,17 +2246,17 @@
 # sch/source\ui\dlg\attrib4.src:TP_STAT.RBT_VARIANT.text
 # #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
 # sch/source\ui\dlg\datstat.src:DLG_DATA_STAT.RBT_VARIANT.text
-#: src/applications/tbench/gnunet-tbench.c:206
+#: src/applications/tbench/gnunet-tbench.c:199
 #, fuzzy, c-format
 msgid "\tvariance %8.4f\n"
 msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
 
-#: src/applications/tbench/gnunet-tbench.c:215
+#: src/applications/tbench/gnunet-tbench.c:208
 #, fuzzy, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr "Imiterere OYA iyi OYA"
 
-#: src/applications/tbench/gnunet-tbench.c:219
+#: src/applications/tbench/gnunet-tbench.c:212
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1950,25 +2264,25 @@
 msgstr "OYA Akira i Ubutumwa Bivuye"
 
 #: src/applications/tbench/tbenchtest.c:51
-#: src/applications/tbench/tbenchtest_udp.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:78
-#: src/applications/tbench/tbenchtest_udp.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:83
-#: src/applications/tbench/tbenchtest_udp.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:89
-#: src/applications/tbench/tbenchtest_udp.c:89
+#: src/applications/tbench/tbenchtest_udp.c:88
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1976,65 +2290,65 @@
 msgstr "Kuri Akira Kuri Ubutumwa Bivuye"
 
 #: src/applications/tbench/tbenchtest.c:211
-#: src/applications/tbench/tbenchtest_udp.c:211
+#: src/applications/tbench/tbenchtest_udp.c:210
 #, c-format
 msgid "Running benchmark...\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:460
+#: src/applications/tbench/tbench.c:420
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:49
+#: src/applications/tracekit/gnunet-tracekit.c:48
 #, fuzzy
 msgid "probe network to the given DEPTH"
 msgstr "urusobe Kuri i"
 
-#: src/applications/tracekit/gnunet-tracekit.c:52
+#: src/applications/tracekit/gnunet-tracekit.c:51
 #, fuzzy
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 "Ibisohoka Imiterere 0 kugirango Ibisohoka 1. kugirango Akadomo 2. kugirango"
 
-#: src/applications/tracekit/gnunet-tracekit.c:58
+#: src/applications/tracekit/gnunet-tracekit.c:57
 #, fuzzy
 msgid "use PRIO for the priority of the trace request"
 msgstr "Gukoresha kugirango i By'ibanze Bya i Kubaza..."
 
-#: src/applications/tracekit/gnunet-tracekit.c:62
+#: src/applications/tracekit/gnunet-tracekit.c:61
 #, fuzzy
 msgid "wait DELAY seconds for replies"
 msgstr "Tegereza amasogonda kugirango"
 
-#: src/applications/tracekit/gnunet-tracekit.c:116
+#: src/applications/tracekit/gnunet-tracekit.c:115
 #, fuzzy, c-format
 msgid ""
 "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
 "vcg.\n"
 msgstr "Sibyo 0 kugirango Ukoresha: 1. kugirango Akadomo 2. kugirango"
 
-#: src/applications/tracekit/gnunet-tracekit.c:163
+#: src/applications/tracekit/gnunet-tracekit.c:162
 #, fuzzy, c-format
 msgid "`%s' is not connected to any peer.\n"
 msgstr "`%s'ni OYA Kuri"
 
-#: src/applications/tracekit/gnunet-tracekit.c:197
+#: src/applications/tracekit/gnunet-tracekit.c:196
 #, fuzzy, c-format
 msgid "`%s' connected to `%s'.\n"
 msgstr "`%s'Kuri"
 
-#: src/applications/tracekit/gnunet-tracekit.c:212
+#: src/applications/tracekit/gnunet-tracekit.c:211
 #, fuzzy, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr "Sibyo 0 kugirango Ukoresha: 1. kugirango"
 
-#: src/applications/tracekit/gnunet-tracekit.c:235
+#: src/applications/tracekit/gnunet-tracekit.c:234
 #, fuzzy, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr "OYA Icyegeranyo Inyuma"
 
-#: src/applications/tracekit/gnunet-tracekit.c:350
+#: src/applications/tracekit/gnunet-tracekit.c:342
 #, fuzzy
 msgid "Could not send request to gnunetd.\n"
 msgstr "OYA Kohereza Kubaza... Kuri"
@@ -2193,106 +2507,106 @@
 msgid "allows clients to determine gnunetd's configuration"
 msgstr "Porogaramu in Iboneza"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:71
-#: src/applications/fs/tools/gnunet-insert.c:224
-#: src/applications/fs/tools/gnunet-search.c:129
-#: src/applications/fs/tools/gnunet-download.c:57
+#: src/applications/fs/tools/gnunet-pseudonym.c:70
+#: src/applications/fs/tools/gnunet-insert.c:229
+#: src/applications/fs/tools/gnunet-search.c:140
+#: src/applications/fs/tools/gnunet-download.c:65
 #, fuzzy
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gushyiraho i Bya Mwakirizi"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:74
+#: src/applications/fs/tools/gnunet-pseudonym.c:73
 #, fuzzy
 msgid "automate creation of a namespace by starting a collection"
 msgstr "Bya a ku a"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:78
+#: src/applications/fs/tools/gnunet-pseudonym.c:77
 #, fuzzy
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "Gusiba i Na: i"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:81
+#: src/applications/fs/tools/gnunet-pseudonym.c:80
 #, fuzzy
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "Gusiba i Na: i"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:84
+#: src/applications/fs/tools/gnunet-pseudonym.c:83
 #, fuzzy
 msgid "end automated building of a namespace (ends collection)"
 msgstr "Impera Bya a"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:86
-#: src/applications/fs/tools/gnunet-search.c:132
+#: src/applications/fs/tools/gnunet-pseudonym.c:85
+#: src/applications/fs/tools/gnunet-search.c:143
 #, fuzzy
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
 msgstr "Gishya Gusiba Cyangwa Urutonde"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:89
+#: src/applications/fs/tools/gnunet-pseudonym.c:88
 #, fuzzy
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
 msgstr "Gukoresha i Ijambo- banze Kuri i Gukoresha Ryari: a Gishya"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:92
+#: src/applications/fs/tools/gnunet-pseudonym.c:91
 #, fuzzy
 msgid "specify metadata describing the namespace or collection"
 msgstr "Impera Bya a"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:95
+#: src/applications/fs/tools/gnunet-pseudonym.c:94
 #, fuzzy
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
 msgstr "OYA kugirango iyi Gukoresha Ryari: a Gishya"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:98
+#: src/applications/fs/tools/gnunet-pseudonym.c:97
 #, fuzzy
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr "OYA Urutonde i Bivuye i Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:101
+#: src/applications/fs/tools/gnunet-pseudonym.c:100
 #, fuzzy
 msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
 msgstr "Kuri i Aderesi Bya i Kuri Ibikubiyemo in i Gukoresha Ryari: a Gishya"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:104
+#: src/applications/fs/tools/gnunet-pseudonym.c:103
 msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:138
+#: src/applications/fs/tools/gnunet-pseudonym.c:137
 #, fuzzy, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "Igisubizo ni i"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:142
+#: src/applications/fs/tools/gnunet-pseudonym.c:141
 #, fuzzy, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr "Igisubizo ni i"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:178
+#: src/applications/fs/tools/gnunet-pseudonym.c:177
 #, fuzzy, c-format
 msgid "\tRating (after update): %d\n"
 msgstr "Nyuma"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:221
+#: src/applications/fs/tools/gnunet-pseudonym.c:211
 #, fuzzy, c-format
 msgid "Collection stopped.\n"
 msgstr "Kyahagariswe"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:223
+#: src/applications/fs/tools/gnunet-pseudonym.c:213
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:231
+#: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, fuzzy, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Cyasibwe"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:235
+#: src/applications/fs/tools/gnunet-pseudonym.c:225
 #, fuzzy, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr ""
@@ -2305,17 +2619,17 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:254
+#: src/applications/fs/tools/gnunet-pseudonym.c:244
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:257
+#: src/applications/fs/tools/gnunet-pseudonym.c:247
 #, fuzzy, c-format
 msgid "Failed to start collection.\n"
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:299
+#: src/applications/fs/tools/gnunet-pseudonym.c:289
 #, fuzzy, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr ""
@@ -2328,12 +2642,12 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:304
+#: src/applications/fs/tools/gnunet-pseudonym.c:294
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:326
+#: src/applications/fs/tools/gnunet-pseudonym.c:314
 #, fuzzy, c-format
 msgid "Could not access namespace information.\n"
 msgstr "OYA bushyinguro"
@@ -2378,17 +2692,17 @@
 msgid "start tracking entries for the directory database"
 msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-directory.c:181
+#: src/applications/fs/tools/gnunet-directory.c:174
 #, fuzzy, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "Ibyinjijwe"
 
-#: src/applications/fs/tools/gnunet-insert.c:139
+#: src/applications/fs/tools/gnunet-insert.c:137
 #, fuzzy, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Ikiranga"
 
-#: src/applications/fs/tools/gnunet-insert.c:144
+#: src/applications/fs/tools/gnunet-insert.c:142
 #, fuzzy, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
@@ -2401,52 +2715,60 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-insert.c:166
+#: src/applications/fs/tools/gnunet-insert.c:168
 #, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:178
+#: src/applications/fs/tools/gnunet-insert.c:180
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr "ku Inyuma Bya Bayite"
 
-#: src/applications/fs/tools/gnunet-insert.c:189
+#: src/applications/fs/tools/gnunet-insert.c:191
 #, fuzzy, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Idosiye Nka"
 
-#: src/applications/fs/tools/gnunet-insert.c:200
+#: src/applications/fs/tools/gnunet-insert.c:202
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr "/Byahiswemo"
 
-#: src/applications/fs/tools/gnunet-insert.c:206
+#: src/applications/fs/tools/gnunet-insert.c:207
 #, c-format
 msgid ""
 "\n"
 "Error uploading file: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:216
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Unexpected event: %d\n"
+msgstr "Ibikubiyemo Ubwoko"
+
+#: src/applications/fs/tools/gnunet-insert.c:233
 #, fuzzy
 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 "NIBA ni ku i Kurema a Ihuza Bya a Gukoporora in i bushyinguro"
 
-#: src/applications/fs/tools/gnunet-insert.c:232
+#: src/applications/fs/tools/gnunet-insert.c:237
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:235
+#: src/applications/fs/tools/gnunet-insert.c:240
 msgid ""
-"use libextractor to add additional direct references to directory entries"
+"do not use libextractor to add additional references to directory entries "
+"and/or the published file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:238
+#: src/applications/fs/tools/gnunet-insert.c:243
 #, fuzzy
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
@@ -2455,19 +2777,19 @@
 "Gucapa Urutonde Bya Amagambo fatizo OYA Iyinjizamo Cyangwa gushyiraho "
 "umugereka"
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:245
 #, fuzzy
 msgid "Make files available to GNUnet for sharing."
 msgstr "Idosiye Bihari Kuri kugirango Bisangiwe"
 
-#: src/applications/fs/tools/gnunet-insert.c:243
+#: src/applications/fs/tools/gnunet-insert.c:248
 #, fuzzy
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr "Gushyiraho Intera kugirango Ukuboneka Bya Kuri kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:247
+#: src/applications/fs/tools/gnunet-insert.c:252
 #, fuzzy
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
@@ -2476,7 +2798,7 @@
 "Kongeramo Ijambo- banze kugirango i Hejuru: urwego IDOSIYE Cyangwa "
 "bushyinguro iyi Ihitamo Igikubo Times"
 
-#: src/applications/fs/tools/gnunet-insert.c:251
+#: src/applications/fs/tools/gnunet-insert.c:256
 #, fuzzy
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
@@ -2485,11 +2807,11 @@
 "Kongeramo Ijambo- banze kugirango Byose Idosiye Na ububiko bw'amaderese iyi "
 "Ihitamo Igikubo Times"
 
-#: src/applications/fs/tools/gnunet-insert.c:256
+#: src/applications/fs/tools/gnunet-insert.c:261
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:259
+#: src/applications/fs/tools/gnunet-insert.c:264
 #, fuzzy
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
@@ -2497,59 +2819,59 @@
 msgstr ""
 "OYA Umubarendanga Iyinjizamo IDOSIYE in Bishunzwe: Ifishi in Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-insert.c:263
+#: src/applications/fs/tools/gnunet-insert.c:268
 #, fuzzy
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr "Bya Verisiyo Kuri in i kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:267
+#: src/applications/fs/tools/gnunet-insert.c:272
 #, fuzzy
 msgid "specify the priority of the content"
 msgstr "i By'ibanze Bya i Ibikubiyemo"
 
-#: src/applications/fs/tools/gnunet-insert.c:270
+#: src/applications/fs/tools/gnunet-insert.c:275
 #, fuzzy
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr "Tangaza i Idosiye i IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-insert.c:273
+#: src/applications/fs/tools/gnunet-insert.c:278
 #, fuzzy
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr "iyi Nka kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:277
+#: src/applications/fs/tools/gnunet-insert.c:282
 #, fuzzy
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr "Gushyiraho i Bya iyi Verisiyo Bya i kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:281
+#: src/applications/fs/tools/gnunet-insert.c:286
 #, fuzzy
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr "Igihe kugirango Ipaji kugirango Imiterere"
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:289
 #, fuzzy
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 "Izina ry'idosiye: Bya i Bya a Ibanjirije Verisiyo Bya i Ibikubiyemo "
 "kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:326
+#: src/applications/fs/tools/gnunet-insert.c:324
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:351
+#: src/applications/fs/tools/gnunet-insert.c:348
 #, fuzzy, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "kugirango IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-insert.c:378
+#: src/applications/fs/tools/gnunet-insert.c:374
 #, fuzzy, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
@@ -2567,58 +2889,57 @@
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Igihe Byanze Imiterere"
 
-#: src/applications/fs/tools/gnunet-insert.c:407
-#: src/applications/fs/tools/gnunet-insert.c:412
-#: src/applications/fs/tools/gnunet-insert.c:417
-#: src/applications/fs/tools/gnunet-insert.c:422
+#: src/applications/fs/tools/gnunet-insert.c:403
+#: src/applications/fs/tools/gnunet-insert.c:409
+#: src/applications/fs/tools/gnunet-insert.c:415
+#: src/applications/fs/tools/gnunet-insert.c:421
 #: src/applications/fs/tools/gnunet-insert.c:427
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Oya Ihitamo"
 
-#: src/applications/fs/tools/gnunet-search.c:136
+#: src/applications/fs/tools/gnunet-search.c:147
 #, fuzzy
 msgid "exit after receiving LIMIT results"
 msgstr "Gusohoka Nyuma Ibisubizo ku"
 
-#: src/applications/fs/tools/gnunet-search.c:139
-#: src/applications/fs/tools/gnunet-download.c:64
+#: src/applications/fs/tools/gnunet-search.c:150
+#: src/applications/fs/tools/gnunet-download.c:72
 #, fuzzy
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "Kwandika Gushaka Ibisubizo ku Kuri i IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-search.c:142
+#: src/applications/fs/tools/gnunet-search.c:153
 #, fuzzy
 msgid "wait DELAY seconds for search results before aborting"
 msgstr "Tegereza amasogonda kugirango Gushaka Ibisubizo ku Mbere"
 
-#: src/applications/fs/tools/gnunet-search.c:189
-#, fuzzy, c-format
-msgid "Starting search failed. Consult logs.\n"
-msgstr "Kuri Kongeramo"
-
-#: src/applications/fs/tools/gnunet-search.c:277
+#: src/applications/fs/tools/gnunet-search.c:191
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:60
+#: src/applications/fs/tools/gnunet-download.c:68
 #, fuzzy
 msgid "Download files from GNUnet."
 msgstr "Idosiye Bivuye"
 
-#: src/applications/fs/tools/gnunet-download.c:67
+#: src/applications/fs/tools/gnunet-download.c:75
 #, fuzzy
 msgid "download a GNUnet directory recursively"
 msgstr "Gufungura a bushyinguro"
 
-#: src/applications/fs/tools/gnunet-download.c:86
+#: src/applications/fs/tools/gnunet-download.c:93
 #, fuzzy, c-format
 msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr "ku Inyuma Bya Bayite"
 
-#: src/applications/fs/tools/gnunet-download.c:99
-#: src/applications/fs/tools/gnunet-download.c:110
+#: src/applications/fs/tools/gnunet-download.c:106
+#, fuzzy, c-format
+msgid "Download aborted.\n"
+msgstr "/Byahiswemo"
+
+#: src/applications/fs/tools/gnunet-download.c:112
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr ""
@@ -2633,31 +2954,31 @@
 msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 msgstr "ingingo a"
 
-#: src/applications/fs/tools/gnunet-download.c:195
+#: src/applications/fs/tools/gnunet-download.c:194
 #, fuzzy, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr "Sibyo"
 
-#: src/applications/fs/tools/gnunet-download.c:244
+#: src/applications/fs/tools/gnunet-download.c:262
 #, fuzzy, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Idosiye Nka"
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/fs/tools/gnunet-unindex.c:57
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
 "completion)                "
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:68
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr "ku Inyuma Bya Bayite"
 
-#: src/applications/fs/tools/gnunet-unindex.c:83
+#: src/applications/fs/tools/gnunet-unindex.c:80
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2669,23 +2990,23 @@
 msgid "Unindex files."
 msgstr "#Idosiye"
 
-#: src/applications/fs/tools/gnunet-unindex.c:145
+#: src/applications/fs/tools/gnunet-unindex.c:137
 #, fuzzy
 msgid "Not enough arguments. You must specify a filename.\n"
 msgstr "ingingo a"
 
 # 
uui/source\ids.src:RID_UUI_ERRHDL.(ERRCODE_UUI_IO_NOTAFILE_&_ERRCODE_RES_MASK).text
-#: src/applications/fs/tools/gnunet-unindex.c:173
+#: src/applications/fs/tools/gnunet-unindex.c:164
 #, fuzzy, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "`%s'ntabwo ari idosiye"
 
-#: src/applications/fs/module/ondemand.c:317
+#: src/applications/fs/module/ondemand.c:320
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:411
+#: src/applications/fs/module/ondemand.c:418
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2693,32 +3014,32 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:438
+#: src/applications/fs/module/ondemand.c:445
 #, fuzzy, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
 "%s' under `%s'.\n"
 msgstr "IDOSIYE bushyinguro kugirango Bya Ibyatanzwe in Icyiciro"
 
-#: src/applications/fs/module/ondemand.c:655
+#: src/applications/fs/module/ondemand.c:664
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1196
+#: src/applications/fs/module/fs.c:1229
 #, fuzzy, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
 "s'.\n"
 msgstr "a Umubare kugirango in i Iboneza in Icyiciro"
 
-#: src/applications/fs/module/fs.c:1247
+#: src/applications/fs/module/fs.c:1281
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1287
+#: src/applications/fs/module/fs.c:1321
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -2730,57 +3051,38 @@
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/downloadtest.c:239
+#: src/applications/fs/fsui/searchtest.c:156
+#: src/applications/fs/fsui/fsuitest.c:199
+#: src/applications/fs/fsui/downloadtest.c:308
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
 msgid "AND"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:195
-msgid "FSUI persistence: error restoring download\n"
-msgstr ""
-
-#: src/applications/fs/fsui/fsui.c:666
-#, c-format
-msgid "FSUI state file `%s' had syntax error at offset %u.\n"
-msgstr ""
-
-#: src/applications/fs/fsui/download.c:305
+#: src/applications/fs/fsui/search.c:265
 #, fuzzy
-msgid "Download aborted."
-msgstr "/Byahiswemo"
+msgid "Error running search (consult logs)."
+msgstr "Kuri Kongeramo"
 
-#: src/applications/fs/fsui/download.c:309
+#: src/applications/fs/fsui/download.c:263
 #, fuzzy
-msgid "ECRS download failed (see logs)."
+msgid "ECRS download failed (see logs)"
 msgstr "OYA Gufungura IDOSIYE"
 
-#: src/applications/fs/fsui/download.c:313
+#: src/applications/fs/fsui/unindex.c:99
 #, fuzzy
-msgid "ECRS download suspending."
-msgstr "OYA Gufungura IDOSIYE"
-
-#: src/applications/fs/fsui/download.c:317
-#, fuzzy
-msgid "Unexpected download state."
-msgstr "Ibikubiyemo Ubwoko"
-
-#: src/applications/fs/fsui/unindex.c:80
-#, fuzzy
 msgid "Unindex failed."
 msgstr "/Idosiye IDOSIYE"
 
-#: src/applications/fs/fsui/upload.c:229 src/applications/fs/fsui/upload.c:374
-#: src/applications/fs/fsui/upload.c:413
+#: src/applications/fs/fsui/upload.c:222
 #, fuzzy
-msgid "Upload failed."
-msgstr "/Idosiye IDOSIYE"
+msgid "Failed to create temporary directory."
+msgstr "Kuri Kurema"
 
-#: src/applications/fs/fsui/upload.c:420
-msgid "Cannot upload directory without using recursion."
-msgstr ""
+#: src/applications/fs/fsui/upload.c:244
+#, fuzzy
+msgid "Upload failed (consult logs)."
+msgstr "OYA Gufungura IDOSIYE"
 
 #: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
@@ -2807,77 +3109,77 @@
 "inserted file. Download aborted.\n"
 msgstr "Ibikubiyemo OYA BIHUYE Urufunguzo ni a Cyangwa a Byinjijwemo IDOSIYE"
 
-#: src/applications/fs/ecrs/download.c:1153
+#: src/applications/fs/ecrs/download.c:1157
 #, fuzzy, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr "Kuri OYA Bihari ku i urusobe"
 
-#: src/applications/fs/ecrs/upload.c:170
+#: src/applications/fs/ecrs/upload.c:161
 #, fuzzy, c-format
 msgid "`%s' is not a file.\n"
 msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/fs/ecrs/upload.c:171
 #, fuzzy, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:188
+#: src/applications/fs/ecrs/upload.c:179
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/fs/ecrs/upload.c:200
+#: src/applications/fs/ecrs/upload.c:191
 #, fuzzy, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Ibirimo"
 
-#: src/applications/fs/ecrs/upload.c:219
+#: src/applications/fs/ecrs/upload.c:210
 #, fuzzy, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Bya in IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:226
+#: src/applications/fs/ecrs/upload.c:217
 #, fuzzy, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Itangira... Modire Byanze Umukiriya"
 
-#: src/applications/fs/ecrs/upload.c:312
+#: src/applications/fs/ecrs/upload.c:303
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:847
+#: src/applications/fs/ecrs/meta.c:849
 #, fuzzy, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Bya IDOSIYE Kuri Byanze"
 
-#: src/applications/fs/ecrs/meta.c:855
+#: src/applications/fs/ecrs/meta.c:857
 #, fuzzy, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "OYA Guhindura izina IDOSIYE Kuri IDOSIYE"
 
-#: src/applications/fs/ecrs/namespace.c:153
+#: src/applications/fs/ecrs/namespace.c:154
 #, fuzzy, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Kurema IDOSIYE"
 
-#: src/applications/fs/ecrs/namespace.c:338
-#: src/applications/fs/ecrs/namespace.c:419
-#: src/applications/fs/ecrs/namespace.c:573
+#: src/applications/fs/ecrs/namespace.c:339
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:574
 #, fuzzy, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Idosiye OYA a"
 
-#: src/applications/fs/ecrs/namespace.c:350
-#: src/applications/fs/ecrs/namespace.c:430
+#: src/applications/fs/ecrs/namespace.c:351
+#: src/applications/fs/ecrs/namespace.c:431
 #, fuzzy, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/fs/ecrs/namespace.c:587
-#: src/applications/fs/ecrs/namespace.c:598
+#: src/applications/fs/ecrs/namespace.c:588
+#: src/applications/fs/ecrs/namespace.c:599
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
@@ -2894,35 +3196,35 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:123
+#: src/applications/fs/uritrack/file_info.c:125
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:355
+#: src/applications/fs/uritrack/file_info.c:367
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:654
+#: src/applications/fs/namespace/namespace_info.c:656
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:675
+#: src/applications/fs/namespace/namespace_info.c:677
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:354
+#: src/applications/topology_f2f/topology.c:359
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
 
-#: src/applications/topology_f2f/topology.c:371
+#: src/applications/topology_f2f/topology.c:376
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:384
+#: src/applications/topology_f2f/topology.c:389
 #, fuzzy, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
@@ -2932,21 +3234,38 @@
 msgid "`%s' registering client handler %d and %d\n"
 msgstr ""
 
-#: src/applications/template/gnunet-template.c:44
+#: src/applications/template/gnunet-template.c:43
 #, fuzzy
 msgid "Template description."
 msgstr "/ku Isobanuramiterere"
 
-#: src/applications/bootstrap_http/http.c:92
+#: src/applications/bootstrap_http/http.c:100
 #, fuzzy, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/bootstrap_http/http.c:144
+#: src/applications/bootstrap_http/http.c:121
+#: src/applications/bootstrap_http/http.c:263
+#: src/applications/bootstrap_http/http.c:283
+#: src/applications/bootstrap_http/http.c:317
+#: src/applications/bootstrap_http/http.c:335
+#: src/applications/bootstrap_http/http.c:349
+#: src/applications/bootstrap_http/http.c:361
+#: src/applications/bootstrap_http/http.c:373
+#, fuzzy, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "`%s'Byanze ku Na: Ikosa"
+
+#: src/applications/bootstrap_http/http.c:173
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:229
+#, fuzzy, c-format
+msgid "Trying to download hostlist from `%s'\n"
+msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
+
+#: src/applications/bootstrap_http/http.c:409
 #, fuzzy
 msgid "# hellos downloaded via http"
 msgstr "#KB Yimuwe ku"
@@ -2965,351 +3284,347 @@
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:98
+#: src/applications/vpn/gnunet-vpn.c:56
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:103
-msgid "VPN over GNUnet."
-msgstr ""
-
-#: src/applications/vpn/vpn.c:351
+#: src/applications/vpn/vpn.c:326
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:359
+#: src/applications/vpn/vpn.c:334
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:387
+#: src/applications/vpn/vpn.c:362
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:436
+#: src/applications/vpn/vpn.c:411
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:440
+#: src/applications/vpn/vpn.c:415
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:450
+#: src/applications/vpn/vpn.c:425
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:510
+#: src/applications/vpn/vpn.c:485
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:514
+#: src/applications/vpn/vpn.c:489
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:541
+#: src/applications/vpn/vpn.c:518
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:549
+#: src/applications/vpn/vpn.c:526
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:553
+#: src/applications/vpn/vpn.c:530
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:591
+#: src/applications/vpn/vpn.c:568
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:595
+#: src/applications/vpn/vpn.c:572
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:602
+#: src/applications/vpn/vpn.c:579
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:607
+#: src/applications/vpn/vpn.c:584
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:615
+#: src/applications/vpn/vpn.c:592
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:627
+#: src/applications/vpn/vpn.c:604
 #, fuzzy, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr "OYA Gushaka Aderesi kugirango"
 
-#: src/applications/vpn/vpn.c:638
+#: src/applications/vpn/vpn.c:615
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:650
+#: src/applications/vpn/vpn.c:627
 #, fuzzy, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr "OYA Gushaka Aderesi kugirango"
 
-#: src/applications/vpn/vpn.c:683
+#: 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"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:729
+#: src/applications/vpn/vpn.c:706
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:788
+#: src/applications/vpn/vpn.c:769
 #, c-format
 msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:792
+#: src/applications/vpn/vpn.c:773
 #, c-format
 msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:810
+#: src/applications/vpn/vpn.c:791
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:850
+#: src/applications/vpn/vpn.c:831
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:835
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:860
+#: src/applications/vpn/vpn.c:841
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:863
+#: src/applications/vpn/vpn.c:844
 #, fuzzy, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr "Subiza Bya Kitazwi Ubwoko"
 
-#: src/applications/vpn/vpn.c:873
+#: src/applications/vpn/vpn.c:854
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:892
+#: src/applications/vpn/vpn.c:873
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:913
+#: src/applications/vpn/vpn.c:894
 #, fuzzy
 msgid "Receive route request\n"
 msgstr "Gikora"
 
-#: src/applications/vpn/vpn.c:918
+#: src/applications/vpn/vpn.c:899
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:929
+#: src/applications/vpn/vpn.c:910
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:935
+#: src/applications/vpn/vpn.c:916
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:951
+#: src/applications/vpn/vpn.c:932
 #, fuzzy
 msgid "Receive route announce.\n"
 msgstr "Subiza Bya Kitazwi Ubwoko"
 
-#: src/applications/vpn/vpn.c:955
+#: src/applications/vpn/vpn.c:936
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:959
+#: src/applications/vpn/vpn.c:940
 #, fuzzy, c-format
 msgid "Inserting with hops %d\n"
 msgstr "Uburyo"
 
-#: src/applications/vpn/vpn.c:973
+#: src/applications/vpn/vpn.c:954
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:988
+#: src/applications/vpn/vpn.c:969
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1016
+#: src/applications/vpn/vpn.c:997
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1031
+#: src/applications/vpn/vpn.c:1012
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1076
+#: src/applications/vpn/vpn.c:1057
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1122
+#: src/applications/vpn/vpn.c:1103
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1148
+#: src/applications/vpn/vpn.c:1129
 msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1208
+#: src/applications/vpn/vpn.c:1190
 #, fuzzy
 msgid "Yes"
 msgstr "Yego"
 
-#: src/applications/vpn/vpn.c:1208
+#: src/applications/vpn/vpn.c:1190
 #, fuzzy
 msgid "No"
 msgstr "Oya."
 
-#: src/applications/vpn/vpn.c:1385
+#: src/applications/vpn/vpn.c:1396
 #, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1386
+#: src/applications/vpn/vpn.c:1397
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1434
+#: src/applications/vpn/vpn.c:1447
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1466
+#: src/applications/vpn/vpn.c:1479
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1477
+#: src/applications/vpn/vpn.c:1492
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1490
+#: src/applications/vpn/vpn.c:1507
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:142
+#: src/server/gnunet-update.c:141
 #, fuzzy, c-format
 msgid "Updating data for module `%s'\n"
 msgstr "Ibyatanzwe kugirango Modire"
 
-#: src/server/gnunet-update.c:147
+#: src/server/gnunet-update.c:146
 #, fuzzy, c-format
 msgid "Failed to update data for module `%s'\n"
 msgstr "Kuri Kuvugurura Ibyatanzwe kugirango Modire"
 
-#: src/server/gnunet-update.c:218 src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-update.c:217 src/server/gnunet-transport-check.c:355
 #, fuzzy
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr "Bivuye BIHUYE"
 
-#: src/server/gnunet-update.c:220
+#: src/server/gnunet-update.c:219
 #, fuzzy
 msgid "Updates GNUnet datastructures after version change."
 msgstr "Nyuma Verisiyo Guhindura>>"
 
-#: src/server/gnunet-update.c:224 src/server/gnunet-transport-check.c:369
+#: src/server/gnunet-update.c:223 src/server/gnunet-transport-check.c:370
 #, fuzzy
 msgid "run as user LOGIN"
 msgstr "Gukoresha Nka Ukoresha:"
 
-#: src/server/gnunet-update.c:227
+#: src/server/gnunet-update.c:226
 #, fuzzy
 msgid "run in client mode (for getting client configuration values)"
 msgstr "Gukoresha in Ukoresha: Ubwoko kugirango Ukoresha: Iboneza Uduciro"
 
-#: src/server/connection.c:992
+#: src/server/connection.c:1023
 #, fuzzy, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "`%s'Byahiswemo Inyuma Bya Ubutumwa"
 
-#: src/server/connection.c:999
+#: src/server/connection.c:1032
 #, fuzzy, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Birambuye Uburebure By'ibanze"
 
-#: src/server/connection.c:2283
+#: src/server/connection.c:2417
 #, fuzzy, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bivuye Sibyo Imiterere"
 
-#: src/server/connection.c:2355
+#: src/server/connection.c:2489
 #, fuzzy, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Umubare Bya"
 
-#: src/server/connection.c:2370
+#: src/server/connection.c:2506
 #, fuzzy
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
 
-#: src/server/connection.c:2774
+#: src/server/connection.c:2929
 #, fuzzy
 msgid "# outgoing messages dropped"
 msgstr "#Ubutumwa"
 
-#: src/server/connection.c:2778
+#: src/server/connection.c:2933
 #, fuzzy
 msgid "# bytes of outgoing messages dropped"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:2780
+#: src/server/connection.c:2935
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2783
+#: src/server/connection.c:2938
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:2787
+#: src/server/connection.c:2942
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "#Bayite Bya Ubwoko"
 
-#: src/server/connection.c:2791
+#: src/server/connection.c:2946
 #, fuzzy
 msgid "# bytes received"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/server/connection.c:2793
+#: src/server/connection.c:2948
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:2794
+#: src/server/connection.c:2949
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "#Bayite Bya BYAKIRIWE"
@@ -3336,16 +3651,16 @@
 msgid "Starts the gnunetd daemon."
 msgstr "i"
 
-#: src/server/gnunetd.c:176
+#: src/server/gnunetd.c:175
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:180
+#: src/server/gnunetd.c:179
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "Ubuturo ku ni"
 
-#: src/server/gnunetd.c:236
+#: src/server/gnunetd.c:228
 #, fuzzy, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
@@ -3390,104 +3705,104 @@
 msgid "Could not properly unload service `%s'!\n"
 msgstr "OYA Kureka gufungura Serivisi"
 
-#: src/server/gnunet-transport-check.c:115
+#: src/server/gnunet-transport-check.c:116
 #, fuzzy, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "`%s':OYA Kurema"
 
-#: src/server/gnunet-transport-check.c:124
+#: src/server/gnunet-transport-check.c:125
 #, fuzzy, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "`%s':OYA Kwihuza"
 
-#: src/server/gnunet-transport-check.c:158
+#: src/server/gnunet-transport-check.c:159
 #, fuzzy, c-format
 msgid "`%s': Could not send.\n"
 msgstr "`%s':OYA Kohereza"
 
-#: src/server/gnunet-transport-check.c:180
+#: src/server/gnunet-transport-check.c:181
 #, fuzzy, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr "`%s':OYA Akira Ubutumwa muri"
 
-#: src/server/gnunet-transport-check.c:194
+#: src/server/gnunet-transport-check.c:195
 #, fuzzy, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "`%s':OYA Gucomora"
 
-#: src/server/gnunet-transport-check.c:201
+#: src/server/gnunet-transport-check.c:202
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
 "each.\n"
 msgstr "`%s'Kuri Ubutumwa Bya Bayite"
 
-#: src/server/gnunet-transport-check.c:229
+#: src/server/gnunet-transport-check.c:230
 #, c-format
 msgid " Transport %d is not being tested\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:245
+#: src/server/gnunet-transport-check.c:246
 #, c-format
 msgid ""
 "\n"
 "Contacting `%s'."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:266
+#: src/server/gnunet-transport-check.c:267
 #, fuzzy, c-format
 msgid " Connection failed\n"
 msgstr "OYA Iyinjizamo Byanze"
 
-#: src/server/gnunet-transport-check.c:272
+#: src/server/gnunet-transport-check.c:273
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:324
+#: src/server/gnunet-transport-check.c:325
 #, fuzzy, c-format
 msgid "No reply received within %llums.\n"
 msgstr "Subiza BYAKIRIWE muri"
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:351
 #, fuzzy
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr "Kuri Igerageza NIBA"
 
-#: src/server/gnunet-transport-check.c:357
+#: src/server/gnunet-transport-check.c:358
 #, fuzzy
 msgid "send COUNT messages"
 msgstr "Kohereza Ubutumwa"
 
-#: src/server/gnunet-transport-check.c:360
+#: src/server/gnunet-transport-check.c:361
 #, fuzzy
 msgid "send messages with SIZE bytes payload"
 msgstr "Kohereza Ubutumwa Na: Bayite"
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:364
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:366
+#: src/server/gnunet-transport-check.c:367
 #, fuzzy
 msgid "specifies after how many MS to time-out"
 msgstr "Nyuma Kuri Igihe Inyuma"
 
-#: src/server/gnunet-transport-check.c:374
+#: src/server/gnunet-transport-check.c:375
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:455
+#: src/server/gnunet-transport-check.c:440
 #, fuzzy, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "S"
 
-#: src/server/gnunet-transport-check.c:458
+#: src/server/gnunet-transport-check.c:443
 #, fuzzy, c-format
 msgid "Available transport(s): %s\n"
 msgstr "S"
 
-#: src/server/gnunet-transport-check.c:518
+#: src/server/gnunet-transport-check.c:503
 #, fuzzy, c-format
 msgid ""
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
@@ -3503,14 +3818,14 @@
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr "OYA Kuri Umuyoboro"
 
-#: src/server/tcpserver.c:384
+#: src/server/tcpserver.c:386
 #, fuzzy, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr "urusobe in i Iboneza in Icyiciro kugirango Icyinjijwe"
 
-#: src/server/tcpserver.c:437
+#: src/server/tcpserver.c:439
 #, fuzzy, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%sByanze Ubutumwa Ubwoko in Gukoresha"
@@ -3520,47 +3835,47 @@
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Ubutumwa Bivuye in"
 
-#: src/server/version.c:157
+#: src/server/version.c:152
 msgid ""
 "Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:52
+#: src/server/gnunet-peer-info.c:51
 #, fuzzy
 msgid "Print information about GNUnet peers."
 msgstr "Ibisobanuro Ibyerekeye"
 
-#: src/server/gnunet-peer-info.c:79 src/server/gnunet-peer-info.c:94
+#: src/server/gnunet-peer-info.c:78 src/server/gnunet-peer-info.c:93
 #, fuzzy, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr "OYA Kubona Aderesi Bya"
 
-#: src/server/gnunet-peer-info.c:88
+#: src/server/gnunet-peer-info.c:87
 #, fuzzy
 msgid "hello message invalid (signature invalid).\n"
 msgstr "Ubutumwa Sibyo Isinya Sibyo"
 
-#: src/server/gnunet-peer-info.c:99
+#: src/server/gnunet-peer-info.c:98
 #, fuzzy, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Na: Na Aderesi"
 
-#: src/util/cron/cron.c:355
+#: src/util/cron/cron.c:356
 #, fuzzy, c-format
 msgid ""
 "`%s' called with cron job not in queue, adding.  This may not be what you "
 "want.\n"
 msgstr "`%s'Na: OYA in Umurongo Wongera Gicurasi OYA"
 
-#: src/util/network_client/tcpio.c:90
+#: src/util/network_client/tcpio.c:94
 msgid "Could not find valid value for PORT in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:114
+#: src/util/network_client/tcpio.c:118
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:209 src/util/network_client/tcpio.c:237
+#: src/util/network_client/tcpio.c:251 src/util/network_client/tcpio.c:281
 #, fuzzy, c-format
 msgid "Cannot connect to %s:u: %s\n"
 msgstr ""
@@ -3580,7 +3895,7 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/util/network_client/tcpio.c:356
+#: src/util/network_client/tcpio.c:403
 #, fuzzy, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "`%s'Byanze Subiza Sibyo"
@@ -3611,17 +3926,17 @@
 msgid "Can't create semaphore: %i"
 msgstr ""
 
-#: src/util/os/dso.c:51
+#: src/util/os/dso.c:56
 #, fuzzy, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Bya Byanze"
 
-#: src/util/os/dso.c:90
+#: src/util/os/dso.c:110
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "`%s'Byanze kugirango Isomero ku Na: Ikosa"
 
-#: src/util/os/dso.c:132
+#: src/util/os/dso.c:152
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "`%s'Byanze Kuri Uburyo ku Na: Ikosa"
@@ -3641,22 +3956,22 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Kuri"
 
-#: src/util/os/user.c:125
+#: src/util/os/user.c:124
 #, fuzzy, c-format
 msgid "User `%s' not known, cannot change UID to it.\n"
 msgstr "OYA Guhindura>> Kuri"
 
-#: src/util/os/user.c:136
+#: src/util/os/user.c:135
 #, fuzzy, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Guhindura>> Ukoresha: Itsinda Kuri"
 
-#: src/util/network/select.c:272
+#: src/util/network/select.c:282
 #, fuzzy
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/util/network/select.c:421
+#: src/util/network/select.c:443
 msgid "select listen socket not valid!\n"
 msgstr ""
 
@@ -3691,125 +4006,126 @@
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "`%s'Byanze kugirango Porogaramu- shoboza"
 
-#: src/util/disk/storage.c:247
+#: src/util/disk/storage.c:517
 #, fuzzy, c-format
-msgid "Expected `%s' to be a directory\n"
+msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s'Ikitezwe: Kuri a bushyinguro"
 
-#: src/util/disk/storage.c:286
+#: src/util/config_impl/impl.c:275
 #, fuzzy, c-format
-msgid "Expected `%s' to be a regular file\n"
-msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
-
-#: src/util/disk/storage.c:493
-#, fuzzy, c-format
-msgid "expected `%s' to be a directory!\n"
-msgstr "`%s'Ikitezwe: Kuri a bushyinguro"
-
-#: src/util/config_impl/impl.c:260
-#, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
 
-#: src/util/config_impl/impl.c:421
+#: src/util/config_impl/impl.c:505
 #, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgstr ""
+
+#: src/util/config_impl/impl.c:551
+#, c-format
 msgid ""
 "Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
 "llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:433
+#: src/util/config_impl/impl.c:563
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:513
+#: src/util/config_impl/impl.c:653
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:624
+#: src/util/error/error.c:122
 #, c-format
-msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgid ""
+"\n"
+"Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:156 src/util/error/error.c:200
+#: src/util/error/error.c:190 src/util/error/error.c:234
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/error/error.c:159 src/util/error/error.c:202
+#: src/util/error/error.c:193 src/util/error/error.c:236
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:162 src/util/error/error.c:204
+#: src/util/error/error.c:196 src/util/error/error.c:240
 msgid "WARNING"
 msgstr ""
 
-#: src/util/error/error.c:165 src/util/error/error.c:206
+#: src/util/error/error.c:199 src/util/error/error.c:242
 msgid "ERROR"
 msgstr ""
 
-#: src/util/error/error.c:168 src/util/error/error.c:208
+#: src/util/error/error.c:202 src/util/error/error.c:244
 msgid "FATAL"
 msgstr ""
 
-#: src/util/error/error.c:171 src/util/error/error.c:210
+#: src/util/error/error.c:205 src/util/error/error.c:246
 #, fuzzy
 msgid "USER"
 msgstr "Umubare"
 
-#: src/util/error/error.c:174 src/util/error/error.c:212
+#: src/util/error/error.c:208 src/util/error/error.c:248
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:177 src/util/error/error.c:214
+#: src/util/error/error.c:211 src/util/error/error.c:250
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:180 src/util/error/error.c:216
+#: src/util/error/error.c:214 src/util/error/error.c:252
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:183 src/util/error/error.c:218
+#: src/util/error/error.c:217 src/util/error/error.c:254
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:186 src/util/error/error.c:220
+#: src/util/error/error.c:220 src/util/error/error.c:256
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:189
+#: src/util/error/error.c:223
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:221
+#: src/util/error/error.c:238
+msgid "INFO"
+msgstr ""
+
+#: src/util/error/error.c:257
 msgid "NOTHING"
 msgstr ""
 
-#: src/util/threads/mutex.c:131 src/util/threads/mutex.c:151
+#: src/util/threads/mutex.c:145 src/util/threads/mutex.c:165
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Inkoresha siyo"
 
-#: src/util/threads/mutex.c:136
+#: src/util/threads/mutex.c:150
 #, fuzzy, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr "Kuri ku"
 
-#: src/util/threads/mutex.c:156
+#: src/util/threads/mutex.c:170
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "kugirango ku"
 
-#: src/util/threads/pthread.c:139 src/util/threads/pthread.c:147
-#: src/util/threads/pthread.c:154 src/util/threads/pthread.c:245
+#: src/util/threads/pthread.c:158 src/util/threads/pthread.c:166
+#: src/util/threads/pthread.c:173 src/util/threads/pthread.c:266
 #, fuzzy, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr "`%s'Byanze ku Na: Ikosa"
 
-#: src/util/threads/pthread.c:161 src/util/threads/pthread.c:256
+#: src/util/threads/pthread.c:180 src/util/threads/pthread.c:277
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "`%s'Byanze ku Na: Ikosa"
@@ -3880,8 +4196,13 @@
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/printhelp.c:49
+#: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
 #, fuzzy, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "a Umubare Kuri i Ihitamo"
+
+#: src/util/getopt/printhelp.c:50
+#, fuzzy, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "kugirango Amahitamo kugirango Amahitamo"
@@ -3939,22 +4260,22 @@
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:152
+#: src/setup/gnunet-setup.c:185
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Komandi: Umurongo ingingo"
 
-#: src/setup/gnunet-setup.c:157
+#: src/setup/gnunet-setup.c:190
 #, fuzzy
 msgid "No interface specified, using default\n"
 msgstr "imbonerahamwe# Izina: ikoresha"
 
-#: src/setup/gnunet-setup.c:227
+#: src/setup/gnunet-setup.c:264
 #, fuzzy, c-format
 msgid "`%s' is not available."
 msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
 
-#: src/setup/gnunet-setup.c:243
+#: src/setup/gnunet-setup.c:280
 #, fuzzy, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Imiterere Verisiyo"
@@ -4066,19 +4387,33 @@
 msgid "Configuration changed. Save?"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: src/setup/gtk/wizard_gtk.c:429
+#: src/setup/gtk/wizard_gtk.c:137
+#, fuzzy
+msgid "(unknown connection)"
+msgstr "Imiterere Verisiyo"
+
+#: src/setup/gtk/wizard_gtk.c:390
 #, fuzzy, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "OYA Iboneza IDOSIYE"
 
-#: src/setup/gtk/wizard_gtk.c:475 src/setup/ncurses/wizard_curs.c:620
+#: src/setup/gtk/wizard_gtk.c:415
+#, fuzzy
+msgid "Do you want to save the new configuration?"
+msgstr "OYA Iboneza IDOSIYE"
+
+#: src/setup/gtk/wizard_gtk.c:442 src/setup/ncurses/wizard_curs.c:620
 msgid "Unable to create user account:"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:482 src/setup/ncurses/wizard_curs.c:623
+#: src/setup/gtk/wizard_gtk.c:449 src/setup/ncurses/wizard_curs.c:623
 msgid "Unable to change startup process:"
 msgstr ""
 
+#: src/setup/gtk/wizard_gtk.c:458
+msgid "gnunet-update failed. Please run gnunet-update manually."
+msgstr ""
+
 #: src/setup/text/conf.c:74
 #, fuzzy
 msgid "yes"
@@ -4175,34 +4510,34 @@
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:538
+#: src/setup/text/conf.c:542
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:539
+#: src/setup/text/conf.c:543
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:553 src/setup/ncurses/mconf.c:422
+#: src/setup/text/conf.c:557 src/setup/ncurses/mconf.c:422
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: src/setup/text/conf.c:558
+#: src/setup/text/conf.c:562
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:568
+#: src/setup/text/conf.c:572
 #, fuzzy, c-format
 msgid "Configuration was unchanged, no need to save.\n"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: src/setup/text/conf.c:573
+#: src/setup/text/conf.c:577
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Gufungura Iboneza IDOSIYE"
@@ -4484,52 +4819,106 @@
 "Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:145
+#: src/include/gnunet_util_getopt.h:150
 #, fuzzy
 msgid "print this help"
 msgstr "Gucapa iyi Ifashayobora"
 
-#: src/include/gnunet_util_getopt.h:154
+#: src/include/gnunet_util_getopt.h:159
 #, fuzzy
 msgid "print the version number"
 msgstr "Gucapa i Verisiyo Umubare"
 
-#: src/include/gnunet_util_getopt.h:160
-msgid "configure logging to use LOGRULES"
+#: src/include/gnunet_util_getopt.h:165
+msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:166
+#: src/include/gnunet_util_getopt.h:171
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:172
+#: src/include/gnunet_util_getopt.h:177
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/include/gnunet_util_getopt.h:178
+#: src/include/gnunet_util_getopt.h:183
 #, fuzzy
 msgid "specify host on which gnunetd is running"
 msgstr "Ubuturo ku ni"
 
-#: src/include/gnunet_util_error.h:163 src/include/gnunet_util_error.h:165
-#: src/include/gnunet_util_error.h:167 src/include/gnunet_util_error.h:169
+#: src/include/gnunet_util_error.h:175 src/include/gnunet_util_error.h:177
+#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:181
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d in %s.\n"
 msgstr "Byanze ku"
 
-#: src/include/gnunet_util_error.h:176 src/include/gnunet_util_error.h:183
-#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#: src/include/gnunet_util_error.h:188 src/include/gnunet_util_error.h:195
+#: src/include/gnunet_util_error.h:202 src/include/gnunet_util_error.h:209
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr "`%s'Byanze ku Na: Ikosa"
 
-#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
+#: src/include/gnunet_util_error.h:216 src/include/gnunet_util_error.h:223
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "`%s'Byanze ku IDOSIYE ku Na: Ikosa"
 
 #, fuzzy
+#~ msgid "Could not resolve name of SMTP server `%s': %s"
+#~ msgstr "OYA Izina: Bya Seriveri"
+
+#, fuzzy
+#~ msgid "SMTP server send unexpected response at %s:%d.\n"
+#~ msgstr "Seriveri Kohereza ku"
+
+#, fuzzy
+#~ msgid ""
+#~ "SMTP server failed to respond with 250 confirmation code to `%s' "
+#~ "request.\n"
+#~ msgstr "OYA Kohereza Iyemeza kugirango Kubaza..."
+
+#, fuzzy
+#~ msgid "Failed to send `%s' request to SMTP server.\n"
+#~ msgstr "Kuri Kohereza Ubutumwa Kuri"
+
+#, fuzzy
+#~ msgid "query table called NAME"
+#~ msgstr "Ikibazo# imbonerahamwe#"
+
+#, fuzzy
+#~ msgid "No commands specified.\n"
+#~ msgstr "Amagambo fatizo"
+
+#, fuzzy
+#~ msgid "Superflous arguments (ignored).\n"
+#~ msgstr "ingingo"
+
+#, fuzzy
+#~ msgid "Query `%s' had no results.\n"
+#~ msgstr "Oya Ibisubizo ku"
+
+#, fuzzy
+#~ msgid "ECRS download suspending."
+#~ msgstr "OYA Gufungura IDOSIYE"
+
+#, fuzzy
+#~ msgid "Unexpected download state."
+#~ msgstr "Ibikubiyemo Ubwoko"
+
+#, fuzzy
+#~ msgid "Upload failed."
+#~ msgstr "/Idosiye IDOSIYE"
+
+#, fuzzy
+#~ msgid "Expected `%s' to be a regular file\n"
+#~ msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
+
+#, fuzzy
+#~ msgid "expected `%s' to be a directory!\n"
+#~ msgstr "`%s'Ikitezwe: Kuri a bushyinguro"
+
+#, fuzzy
 #~ msgid "Failed to open `%s'.\n"
 #~ msgstr "Idosiye Nka"
 
@@ -4795,10 +5184,6 @@
 #~ msgstr "kugirango"
 
 #, fuzzy
-#~ msgid "`%s' failed at %s:%d with error: `%s'.\n"
-#~ msgstr "`%s'Byanze ku Na: Ikosa"
-
-#, fuzzy
 #~ msgid "Could not download list of peer contacts, host `%s' unknown.\n"
 #~ msgstr "OYA Gufungura Urutonde Bya Aho kubariza Ubuturo Kitazwi"
 
@@ -5967,10 +6352,6 @@
 #~ msgstr "Gushaka"
 
 #, fuzzy
-#~ msgid "Failed to create pseudonym (see logs).\n"
-#~ msgstr "Kuri Kurema"
-
-#, fuzzy
 #~ msgid "Could not connect to gnunetd, advertisement not published.\n"
 #~ msgstr "OYA Kwihuza Kuri OYA"
 
@@ -6607,10 +6988,6 @@
 #~ msgstr "Kuri Ububikoshingiro"
 
 #, fuzzy
-#~ msgid "Unexpected content type %d.\n"
-#~ msgstr "Ibikubiyemo Ubwoko"
-
-#, fuzzy
 #~ msgid "# kb content pushed out as padding"
 #~ msgstr "#KB Ibikubiyemo Inyuma Nka Wuzuza:"
 
@@ -6714,10 +7091,6 @@
 #~ msgstr "Gucapa i Bya i Byinjijwemo IDOSIYE S"
 
 #, fuzzy
-#~ msgid "disable automatic metadata extraction"
-#~ msgstr "Byikoresha"
-
-#, fuzzy
 #~ msgid "disable generation of RBlocks for keywords extracted from each file"
 #~ msgstr "Bya kugirango Amagambo fatizo Bivuye IDOSIYE"
 

Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po     2006-11-12 07:38:46 UTC (rev 3716)
+++ GNUnet/po/sv.po     2006-11-12 08:05:43 UTC (rev 3717)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-09-10 22:06-0600\n"
+"POT-Creation-Date: 2006-11-12 01:40-0700\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -90,10 +90,20 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:130
+#, fuzzy
+msgid "Full pathname of GNUnet directory for file-sharing data"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: contrib/config-daemon.scm:142
+#, fuzzy
+msgid "Full pathname of GNUnet directory for indexed files symbolic links"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: contrib/config-daemon.scm:154
 msgid "How many minutes should peer advertisements last?"
 msgstr ""
 
-#: contrib/config-daemon.scm:132
+#: contrib/config-daemon.scm:156
 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 "
@@ -103,52 +113,98 @@
 "than the frequency with which your IP changes."
 msgstr ""
 
-#: contrib/config-daemon.scm:143
-msgid "Log level"
+#: contrib/config-daemon.scm:167
+msgid "Where can GNUnet find an initial list of peers?"
 msgstr ""
 
-#: contrib/config-daemon.scm:144
-msgid "How verbose should the logging of errors be?"
+#: contrib/config-daemon.scm:169
+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"
+"\t\t\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"
+"\t\t\n"
+"If you do not specify a HOSTLISTURL, you must copy valid hostkeys to data/"
+"hosts manually."
 msgstr ""
 
-#: contrib/config-daemon.scm:155
-msgid "Where should logs go?"
+#: contrib/config-daemon.scm:186
+msgid "HTTP Proxy Server"
 msgstr ""
 
-#: contrib/config-daemon.scm:157
+#: contrib/config-daemon.scm:188
 msgid ""
-"In which file should gnunetd write the logs?  If you specify nothing, logs "
-"are written to stderr (and note that if gnunetd runs in the background, "
-"stderr is closed and all logs are discarded)."
+"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:168
+#: contrib/config-daemon.scm:227 contrib/config-client.scm:144
 msgid "How long should logs be kept?"
 msgstr ""
 
-#: contrib/config-daemon.scm:170
+#: contrib/config-daemon.scm:229 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:181
+#: contrib/config-daemon.scm:240 contrib/config-client.scm:157
+msgid "Where should gnunetd write the logs?"
+msgstr ""
+
+#: contrib/config-daemon.scm:252 contrib/config-client.scm:169
+#, fuzzy
+msgid "Configuration of the logging system"
+msgstr ""
+"Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
+
+#: contrib/config-daemon.scm:253 contrib/config-client.scm:170
+msgid "Specify which system messages should be logged how"
+msgstr ""
+
+#: contrib/config-daemon.scm:257 contrib/config-client.scm:174
+msgid "Logging of events for users"
+msgstr ""
+
+#: contrib/config-daemon.scm:258 contrib/config-client.scm:175
+msgid "Logging of events for the system administrator"
+msgstr ""
+
+#: contrib/config-daemon.scm:270
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:183
+#: contrib/config-daemon.scm:272
 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:195
+#: contrib/config-daemon.scm:284
+msgid "As which user should gnunetd run?"
+msgstr ""
+
+#: contrib/config-daemon.scm:286
+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:298
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:197
+#: contrib/config-daemon.scm:300
 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"
@@ -162,11 +218,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:211
+#: contrib/config-daemon.scm:314
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:213
+#: contrib/config-daemon.scm:316
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -203,20 +259,109 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:244
+#: contrib/config-daemon.scm:345
+msgid "Disable client-server connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:357
+msgid "Disable peer discovery"
+msgstr ""
+
+#: contrib/config-daemon.scm:358
+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:369
+msgid "Disable advertising this peer to other peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:381
+msgid "Disable automatic establishment of connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:382
+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:393
+msgid "Disable advertising of other peers by this peer"
+msgstr ""
+
+#: contrib/config-daemon.scm:405 contrib/config-client.scm:189
+msgid "Client/Server Port"
+msgstr ""
+
+#: contrib/config-daemon.scm:406 contrib/config-client.scm:190
+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:417
+msgid "IPs allowed to use gnunetd server"
+msgstr ""
+
+#: contrib/config-daemon.scm:418
+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:430
+msgid "Limit connections to the specfied set of peers."
+msgstr ""
+
+#: contrib/config-daemon.scm:431
+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:442
+msgid "Prevent the specfied set of peers from connecting."
+msgstr ""
+
+#: contrib/config-daemon.scm:443
+msgid "If this option is not set, any peer is allowed to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:454
+msgid "Rarely used settings for peer advertisements and connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:474
 #, fuzzy
 msgid "General settings"
 msgstr "Andra inställningar"
 
-#: contrib/config-daemon.scm:245
+#: contrib/config-daemon.scm:475
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:268
+#: contrib/config-daemon.scm:501
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:270
+#: contrib/config-daemon.scm:503
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -225,11 +370,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:283
+#: contrib/config-daemon.scm:516
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:285
+#: contrib/config-daemon.scm:518
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -242,30 +387,44 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:300
+#: contrib/config-daemon.scm:533
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:301
+#: contrib/config-daemon.scm:534
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:318
+#: contrib/config-daemon.scm:551
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:319
+#: contrib/config-daemon.scm:552
 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:334
+#: contrib/config-daemon.scm:566
+msgid "Name of the MySQL database GNUnet should use"
+msgstr ""
+
+#: contrib/config-daemon.scm:578
+msgid "Configuration file that specifies the MySQL username and password"
+msgstr ""
+
+#: contrib/config-daemon.scm:590
+#, fuzzy
+msgid "Configuration of the MySQL database"
+msgstr ""
+"Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
+
+#: contrib/config-daemon.scm:609
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:611
 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 "
@@ -276,15 +435,15 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:350
+#: contrib/config-daemon.scm:625
 msgid "Size of the routing table."
 msgstr ""
 
-#: contrib/config-daemon.scm:363
+#: contrib/config-daemon.scm:638
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:365
+#: contrib/config-daemon.scm:640
 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"
@@ -296,21 +455,21 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:379
+#: contrib/config-daemon.scm:654
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "aktiverar (anonym) fildelning"
 
-#: contrib/config-daemon.scm:395
+#: contrib/config-daemon.scm:671
 #, fuzzy
 msgid "Applications"
 msgstr "_Alternativ"
 
-#: contrib/config-daemon.scm:411
+#: contrib/config-daemon.scm:687
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:412
+#: contrib/config-daemon.scm:688
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port. Note that if you have configured your NAT box to "
@@ -319,70 +478,262 @@
 "you directly."
 msgstr ""
 
-#: contrib/config-daemon.scm:423
+#: contrib/config-daemon.scm:699
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:435
+#: contrib/config-daemon.scm:711
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:450
+#: contrib/config-daemon.scm:726
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:462
+#: contrib/config-daemon.scm:738
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:477
+#: contrib/config-daemon.scm:753
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:489
+#: contrib/config-daemon.scm:765
+msgid "What is the maximum transfer unit for UDP?"
+msgstr ""
+
+#: contrib/config-daemon.scm:777 contrib/config-daemon.scm:818
+#: contrib/config-daemon.scm:870
+msgid "Which IPs are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:789
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:504
+#: contrib/config-daemon.scm:806
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:516
+#: contrib/config-daemon.scm:830
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:531
+#: contrib/config-daemon.scm:846
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:543
+#: contrib/config-daemon.scm:858
+msgid "What is the maximum transfer unit for UDP 6?"
+msgstr ""
+
+#: contrib/config-daemon.scm:882
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:558
+#: contrib/config-daemon.scm:899
+#, fuzzy
+msgid "Network interface"
+msgstr "Nätverksgränssnitt:"
+
+#: contrib/config-daemon.scm:911
+msgid "External IP address (leave empty to try auto-detection)"
+msgstr ""
+
+#: contrib/config-daemon.scm:923
+msgid "External IPv6 address (leave empty to try auto-detection)"
+msgstr ""
+
+#: contrib/config-daemon.scm:935
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:580 contrib/config-client.scm:121
+#: contrib/config-daemon.scm:958
+msgid "What is the maximum number of bytes per second that we may receive?"
+msgstr ""
+
+#: contrib/config-daemon.scm:970
+msgid "What is the maximum number of bytes per second that we may send?"
+msgstr ""
+
+#: contrib/config-daemon.scm:982
+msgid "What is the maximum CPU load (percentage)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:984
+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:995
+msgid "What is the maximum CPU load (hard limit)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:996
+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:1007
+msgid "What is the maximum upstream bandwidth (hard limit)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1008
+msgid "Use 0 for no limit."
+msgstr ""
+
+#: contrib/config-daemon.scm:1019
+msgid "Should we disable random padding (experimental option)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1031
+msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
+msgstr ""
+
+#: contrib/config-daemon.scm:1033
+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"
+"\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"
+"\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)."
+msgstr ""
+
+#: contrib/config-daemon.scm:1050
+#, fuzzy
+msgid "Network interface to monitor"
+msgstr "Nätverksgränssnitt:"
+
+#: contrib/config-daemon.scm:1052
+msgid ""
+"\tFor which interfaces should we do accounting?  GNUnet will evaluate\n"
+"\t\tthe total traffic (not only the GNUnet related traffic) and adjust\n"
+"\t\tits bandwidth usage accordingly. You can currently only specify a\n"
+"\t\tsingle interface. GNUnet will also use this interface to determine\n"
+"\t\tthe IP to use. Typical values are eth0, ppp0, eth1, wlan0, etc.\n"
+"\t\t'ifconfig' will tell you what you have.  Never use 'lo', that just\n"
+"\t\twon't work.\n"
+"\t\tUnder Windows, specify the index number reported by\n"
+"\t\t \"gnunet-win-tool -n\"."
+msgstr ""
+
+#: contrib/config-daemon.scm:1071
+#, fuzzy
+msgid "Load management"
+msgstr "Ogiltiga kommandoradsargument.\n"
+
+#: contrib/config-daemon.scm:1095 contrib/config-client.scm:286
 msgid "Root node"
 msgstr ""
 
-#: src/transports/ip6.c:65 src/util/network/io.c:74
+#: contrib/config-client.scm:201
+msgid "On which machine runs gnunetd (for clients)"
+msgstr ""
+
+#: contrib/config-client.scm:202
+#, fuzzy
+msgid "This is equivalent to the -H option."
+msgstr "Visa värde av alternativet"
+
+#: contrib/config-client.scm:214
+#, fuzzy
+msgid "General options"
+msgstr "Andra inställningar"
+
+#: contrib/config-client.scm:231
+msgid "Do not add metadata listing the creation time for inserted content"
+msgstr ""
+
+#: contrib/config-client.scm:243
+msgid "Which non-default extractors should GNUnet use for keyword extractors"
+msgstr ""
+
+#: 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"
+"\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."
+msgstr ""
+
+#: contrib/config-client.scm:257
+msgid "File-Sharing options"
+msgstr ""
+
+#: contrib/config-client.scm:274
+#, fuzzy
+msgid "Full pathname of GNUnet client HOME directory"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: contrib/config-client.scm:275
+msgid "The directory for GNUnet files that belong to the user."
+msgstr ""
+
+#: src/transports/ip6.c:65 src/util/network/io.c:78
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:109
+#: src/transports/ip6.c:110
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transports/ip6.c:154 src/transports/ip.c:353
+#: src/transports/ip6.c:155 src/transports/ip.c:354
 #, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr ""
 
-#: src/transports/udp6.c:126 src/transports/udp.c:128
+#: src/transports/udp6.c:126 src/transports/udp.c:132
 #, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
@@ -391,7 +742,7 @@
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/udp6.c:443 src/transports/udp.c:443
+#: src/transports/udp6.c:441 src/transports/udp.c:447
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
@@ -437,13 +788,8 @@
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte kastade via HTTP (utgående)"
 
-#: src/transports/smtp.c:298
+#: src/transports/smtp.c:257
 #, c-format
-msgid "Could not resolve name of SMTP server `%s': %s"
-msgstr "Kunde inte slå upp namnet för SMTP-server \"%s\": %s"
-
-#: src/transports/smtp.c:420 src/transports/smtp.c:882
-#, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
 "under `%s'.\n"
@@ -451,47 +797,36 @@
 "Du måste ange ett namn på röret för SMTP-transporten i sektion \"%s\" under "
 "\"%s\".\n"
 
-#: src/transports/smtp.c:493
+#: src/transports/smtp.c:334
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/transports/smtp.c:588
+#: src/transports/smtp.c:433
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 
 # capped är inte ett bra ord IMHO
-#: src/transports/smtp.c:595
+#: src/transports/smtp.c:440
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
-#: src/transports/smtp.c:769
+#: src/transports/smtp.c:546
+#, fuzzy, c-format
+msgid "Failed to initialize libesmtp: %s.\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/transports/smtp.c:610
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Sändning av e-post till \"%s\" misslyckades.\n"
 
-#: src/transports/smtp.c:820
+#: src/transports/smtp.c:678
 #, c-format
-msgid "SMTP server send unexpected response at %s:%d.\n"
-msgstr ""
-
-#: src/transports/smtp.c:843
-#, c-format
-msgid ""
-"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
-msgstr ""
-
-#: src/transports/smtp.c:849
-#, c-format
-msgid "Failed to send `%s' request to SMTP server.\n"
-msgstr ""
-
-#: src/transports/smtp.c:909
-#, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s filter %s (SMTP)"
 
-#: src/transports/smtp.c:938
+#: src/transports/smtp.c:706
 #, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
@@ -505,36 +840,36 @@
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:421
+#: src/transports/tcp.c:423
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transports/tcp.c:423
+#: src/transports/tcp.c:425
 msgid "# bytes sent via TCP"
 msgstr "# byte skickades via TCP"
 
-#: src/transports/tcp.c:425
+#: src/transports/tcp.c:427
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transports/udp.c:217
+#: src/transports/udp.c:222
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/udp.c:312
+#: src/transports/udp.c:314
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/transports/udp.c:449
+#: src/transports/udp.c:453
 msgid "# bytes received via UDP"
 msgstr "# byte mottagna via UDP"
 
-#: src/transports/udp.c:451
+#: src/transports/udp.c:455
 msgid "# bytes sent via UDP"
 msgstr "# byte skickade via UDP"
 
-#: src/transports/udp.c:453
+#: src/transports/udp.c:457
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte kastade via UDP (utgående)"
 
@@ -587,311 +922,280 @@
 msgid "`%s': unknown service: %s\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/transports/tcp6.c:430
+#: src/transports/tcp6.c:432
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "# byte mottogs via TCP"
 
-#: src/transports/tcp6.c:432
+#: src/transports/tcp6.c:434
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "# byte skickades via TCP"
 
-#: src/transports/tcp6.c:434
+#: src/transports/tcp6.c:436
 #, fuzzy
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transports/tcp_helper.c:182
+#: src/transports/tcp_helper.c:191
 msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr ""
 
-#: src/transports/tcp_helper.c:193
+#: src/transports/tcp_helper.c:202
 #, fuzzy
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/transports/udp_helper.c:93
+#: src/transports/udp_helper.c:91
 #, fuzzy
 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:50
+#: src/applications/dht/tools/dhttest2.c:45
 #: src/applications/session/sessiontest.c:42
 #: src/applications/stats/statistics.c:212
 #: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:101
-#: src/applications/gap/gaptest.c:52
+#: 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:128
-#: src/applications/gap/gaptest.c:318
+#: 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:140
+#: src/applications/dht/tools/dhttest2.c:173
 #: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:117
-#: src/applications/gap/gaptest.c:330
+#: 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:39
-msgid "query table called NAME"
-msgstr "fråga tabell kallad NAME"
-
-#: src/applications/dht/tools/dht-query.c:41
-msgid "allow TIME ms to process each command"
-msgstr "tillåt TID ms för behandling av varje kommando"
-
-#: src/applications/dht/tools/dht-query.c:46
+#: src/applications/dht/tools/dht-query.c:53
 msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:84
-#: src/applications/dht/tools/dht-join.c:85 src/util/getopt/setoption.c:133
-#: src/util/getopt/setoption.c:149
-#, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+#: src/applications/dht/tools/dht-query.c:57
+#: src/applications/dht/tools/dht-join.c:59
+msgid "join table called NAME"
+msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:99
-#: src/applications/dht/tools/dht-join.c:108
-#: src/applications/chat/gnunet-chat.c:93
-#: src/applications/testbed/gnunet-testbed.c:125
-#: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/vpn/gnunet-vpn.c:118 src/util/getopt/getopt.c:1066
-#: src/setup/gnunet-setup.c:246
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Använd --help för att få en lista på flaggor.\n"
+#: src/applications/dht/tools/dht-query.c:60
+msgid "allow TIME ms to process each command"
+msgstr "tillåt TID ms för behandling av varje kommando"
 
-#: src/applications/dht/tools/dht-query.c:106
-msgid "No commands specified.\n"
-msgstr "Inga kommandon angivna.\n"
-
-#: src/applications/dht/tools/dht-query.c:173
-#: src/applications/dht/tools/dht-query.c:204
+#: src/applications/dht/tools/dht-query.c:130
+#: src/applications/dht/tools/dht-query.c:163
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr "\"%s(%s,%s)\" lyckades\n"
 
-#: src/applications/dht/tools/dht-query.c:177
-#: src/applications/dht/tools/dht-query.c:208
+#: src/applications/dht/tools/dht-query.c:134
+#: src/applications/dht/tools/dht-query.c:167
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "\"%s(%s,%s)\" misslyckades.\n"
 
-#: src/applications/dht/tools/dht-query.c:231
-#: src/applications/dht/tools/dht-join.c:211
+#: src/applications/dht/tools/dht-query.c:194
+#: src/applications/dht/tools/dht-join.c:165
 #, c-format
 msgid "No table name specified, using `%s'.\n"
 msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
 
-#: src/applications/dht/tools/dht-query.c:246
+#: src/applications/dht/tools/dht-query.c:210
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/applications/dht/tools/dht-query.c:253
+#: src/applications/dht/tools/dht-query.c:220
 #, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/applications/dht/tools/dht-query.c:261
-#: src/applications/dht/tools/dht-query.c:271
+#: src/applications/dht/tools/dht-query.c:232
+#: src/applications/dht/tools/dht-query.c:246
 #, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr "Kommando \"%s\" kräver två argument (\"%s\" och \"%s\").\n"
 
-#: src/applications/dht/tools/dht-query.c:279
+#: src/applications/dht/tools/dht-query.c:258
 #, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/applications/dht/tools/dht_api.c:127
-#: src/applications/dht/tools/dht_api.c:236
-#: src/applications/dht/tools/dht_api.c:289
-#: src/applications/dht/tools/dht_api.c:343
-#: src/applications/dht/tools/dht_api.c:377
+#: src/applications/dht/tools/dht_api.c:148
+#: src/applications/dht/tools/dht_api.c:264
+#: src/applications/dht/tools/dht_api.c:321
+#: src/applications/dht/tools/dht_api.c:379
+#: src/applications/dht/tools/dht_api.c:415
 #, c-format
 msgid "Failed to send `%s'.  Closing connection.\n"
 msgstr "Misslyckades att skicka \"%s\".  Stänger anslutning.\n"
 
-#: src/applications/dht/tools/dht_api.c:201
-#: src/applications/dht/tools/dht_api.c:253
-#: src/applications/dht/tools/dht_api.c:307
-#: src/applications/dht/tools/dht_api.c:360
+#: src/applications/dht/tools/dht_api.c:226
+#: src/applications/dht/tools/dht_api.c:282
+#: src/applications/dht/tools/dht_api.c:340
+#: src/applications/dht/tools/dht_api.c:397
 #, c-format
 msgid "Received invalid `%s' request (size %d)\n"
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/applications/dht/tools/dht_api.c:214
-#: src/applications/dht/tools/dht_api.c:266
-#: src/applications/dht/tools/dht_api.c:320
+#: src/applications/dht/tools/dht_api.c:241
+#: src/applications/dht/tools/dht_api.c:297
+#: src/applications/dht/tools/dht_api.c:355
 #, c-format
 msgid "Received invalid `%s' request (wrong table)\n"
 msgstr "Mottog ogiltig \"%s\" begäran (fel tabell)\n"
 
-#: src/applications/dht/tools/dht_api.c:390
+#: src/applications/dht/tools/dht_api.c:429
 #, c-format
 msgid "Received unknown request type %d at %s:%d\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/applications/dht/tools/dht_api.c:430
+#: src/applications/dht/tools/dht_api.c:473
 msgid "This client already participates in the given DHT!\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:498
+#: src/applications/dht/tools/dht_api.c:548
 msgid "Cannot leave DHT: table not known!\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:520
+#: src/applications/dht/tools/dht_api.c:571
 #, c-format
 msgid "gnunetd signaled error in response to `%s' message\n"
 msgstr "gnunetd signalerade fel i svar till \"%s\" meddelande\n"
 
-#: src/applications/dht/tools/dht_api.c:525
+#: src/applications/dht/tools/dht_api.c:576
 #, c-format
 msgid "Failed to receive response to `%s' message from gnunetd\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/applications/dht/tools/dht_api.c:530
+#: src/applications/dht/tools/dht_api.c:581
 #, c-format
 msgid "Failed to send `%s' message to gnunetd\n"
 msgstr "Misslyckades att skicka \"%s\" meddelande till gnunetd\n"
 
-#: src/applications/dht/tools/dht_api.c:622
+#: src/applications/dht/tools/dht_api.c:677
 #, c-format
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Oväntat svar till \"%s\" operation.\n"
 
-#: src/applications/dht/tools/dht-join.c:43
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "tillåt STORLEK byte av minne för lokaltabellen"
-
-#: src/applications/dht/tools/dht-join.c:45
-msgid "join table called NAME"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:51
+#: src/applications/dht/tools/dht-join.c:52
 msgid "Join a DHT."
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:115
-msgid "Superflous arguments (ignored).\n"
-msgstr "Onödiga argument (ignorerade).\n"
+#: src/applications/dht/tools/dht-join.c:56
+msgid "allow SIZE bytes of memory for the local table"
+msgstr "tillåt STORLEK byte av minne för lokaltabellen"
 
-#: src/applications/dht/tools/dht-join.c:131
+#: src/applications/dht/tools/dht-join.c:78
 #, c-format
 msgid "Call to `%s' returns %d.\n"
 msgstr "Anrop till \"%s\" returnerade %d.\n"
 
-#: src/applications/dht/tools/dht-join.c:132
+#: src/applications/dht/tools/dht-join.c:79
 #, c-format
 msgid "Call to `%s' with key `%s'.\n"
 msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
 
-#: src/applications/dht/tools/dht-join.c:133
+#: src/applications/dht/tools/dht-join.c:80
 #, c-format
 msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
 msgstr "Anrop till \"%s\" med värde \"%.*s\" (%d byte).\n"
 
-#: src/applications/dht/tools/dht-join.c:236
+#: src/applications/dht/tools/dht-join.c:189
 msgid "Error joining DHT.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:243
+#: src/applications/dht/tools/dht-join.c:196
 #, c-format
 msgid "Joined DHT.  Press CTRL-C to leave.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:250
+#: src/applications/dht/tools/dht-join.c:205
 msgid "Error leaving DHT.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/applications/dht/module/dht.c:946
+#: src/applications/dht/module/dht.c:952
 #, c-format
 msgid "Malformed optional field `%s' received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:973
+#: src/applications/dht/module/dht.c:979
 #, c-format
 msgid "Could not find peer `%s' in routing table!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/applications/dht/module/dht.c:1120
-#: src/applications/dht/module/dht.c:1135
+#: src/applications/dht/module/dht.c:1126
+#: src/applications/dht/module/dht.c:1141
 #, c-format
 msgid "Received malformed response to `%s' from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:1447
+#: src/applications/dht/module/dht.c:1453
 #, c-format
 msgid "Invalid response to `%s' from peer `%s'.\n"
 msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
 
-#: src/applications/dht/module/dht.c:1603
-#: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1290
+#: src/applications/dht/module/dht.c:1611
+#: src/applications/dht/module/dht.c:2351
+#: src/applications/dht/module/dht.c:2628 src/applications/rpc/rpc.c:1291
 #, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr "\"%s\" anropad med timeout över 1 timma (fel?)\n"
 
-#: src/applications/dht/module/dht.c:1793
+#: src/applications/dht/module/dht.c:1803
 #, c-format
 msgid "Invalid response to `%s'.\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/applications/dht/module/dht.c:1993
+#: src/applications/dht/module/dht.c:2003
 #, c-format
 msgid "Malformed response to `%s' on master table.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:2207
-#: src/applications/dht/module/dht.c:2507
+#: src/applications/dht/module/dht.c:2217
+#: src/applications/dht/module/dht.c:2522
 #, c-format
 msgid "Invalid response to `%s' from `%s'\n"
 msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
 
-#: src/applications/dht/module/dht.c:2881
-#: src/applications/dht/module/dht.c:3021
-#: src/applications/dht/module/dht.c:3148
-#: src/applications/dht/module/dht.c:3282
+#: src/applications/dht/module/dht.c:2899
+#: src/applications/dht/module/dht.c:3041
+#: src/applications/dht/module/dht.c:3182
+#: src/applications/dht/module/dht.c:3330
 #, c-format
 msgid "Received invalid RPC `%s'.\n"
 msgstr "Mottog ogiltig RPC \"%s\".\n"
 
-#: src/applications/dht/module/dht.c:3160
-#: src/applications/dht/module/dht.c:3296
+#: src/applications/dht/module/dht.c:3201
+#: src/applications/dht/module/dht.c:3351
 #, c-format
 msgid "RPC for `%s' received for table that we do not participate in!\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:446
+#: src/applications/dht/module/cs.c:449
 #, c-format
 msgid "`%s' failed: table not found!\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/applications/dht/module/cs.c:466
+#: src/applications/dht/module/cs.c:469
 #, c-format
 msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr "\"%s\" misslyckades.  Terminerar anslutning till klient.\n"
 
-#: src/applications/dht/module/cs.c:542
+#: src/applications/dht/module/cs.c:546
 msgid "sendAck failed.  Terminating connection to client.\n"
 msgstr "sendAck misslyckades.  Terminerar anslutning till klient.\n"
 
-#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
-#: src/applications/dht/module/cs.c:688
+#: src/applications/dht/module/cs.c:666 src/applications/dht/module/cs.c:684
+#: src/applications/dht/module/cs.c:693
 #, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "\"%s\" misslyckades. Terminerar anslutning till klient.\n"
 
-#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
+#: src/applications/dht/module/cs.c:814 src/applications/dht/module/cs.c:867
 #, c-format
 msgid "Failed to deliver `%s' message.\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -930,6 +1234,14 @@
 msgid "Start GNUnet chat client."
 msgstr "Starta GNUnets chattklient."
 
+#: src/applications/chat/gnunet-chat.c:93
+#: src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:546 src/util/getopt/getopt.c:1067
+#: src/setup/gnunet-setup.c:283
+#, c-format
+msgid "Use --help to get a list of options.\n"
+msgstr "Använd --help för att få en lista på flaggor.\n"
+
 #: src/applications/chat/gnunet-chat.c:151
 msgid "Could not connect to gnunetd.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -947,69 +1259,74 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
 
-#: src/applications/advertising/advertising.c:162
+#: src/applications/advertising/advertising.c:168
 #, c-format
 msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:168
+#: src/applications/advertising/advertising.c:175
 msgid ""
 "hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:177
+#: src/applications/advertising/advertising.c:182
 #, c-format
+msgid "hello transport verification failed (%u).\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:192
+#, c-format
 msgid "hello advertisement for protocol %d received.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:297
+#: src/applications/advertising/advertising.c:325
 msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:310
+#: src/applications/advertising/advertising.c:338
 #, c-format
 msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr "\"%s\" misslyckades (%d, %u). Kommer inte skicka PING.\n"
 
-#: src/applications/advertising/advertising.c:467
+#: src/applications/advertising/advertising.c:495
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Annonserar min transport %d till valda ändpunkter.\n"
 
-#: src/applications/advertising/advertising.c:474
+#: src/applications/advertising/advertising.c:502
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:580
+#: src/applications/advertising/advertising.c:608
 #, c-format
 msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:760
+#: src/applications/advertising/advertising.c:788
 msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:761
+#: src/applications/advertising/advertising.c:789
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:762
+#: src/applications/advertising/advertising.c:790
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:764
+#: src/applications/advertising/advertising.c:792
 #: src/applications/pingpong/pingpong.c:488
 msgid "# plaintext PING messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/applications/advertising/advertising.c:768
-#: src/applications/session/connect.c:779
+#: src/applications/advertising/advertising.c:796
+#: src/applications/session/connect.c:800
 #, 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:785
+#: src/applications/advertising/advertising.c:813
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
@@ -1070,23 +1387,29 @@
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "\"%s\" registrerar handtag %d %d (klartext och kryptotext)\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:45
-#: src/applications/sqstore_sqlite/sqlite.c:52
-#: src/applications/sqstore_mysql/mysql.c:137
-#: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:389
-#: src/applications/sqstore_mysql/mysql.c:728
-#: src/applications/sqstore_mysql/mysql.c:743
-#: src/applications/sqstore_mysql/mysql.c:752
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:786
-#: src/applications/sqstore_mysql/mysql.c:840
-#: src/applications/sqstore_mysql/mysql.c:925
-#: src/applications/sqstore_mysql/mysql.c:935
-#: src/applications/sqstore_mysql/mysql.c:1007
-#: src/applications/sqstore_mysql/mysql.c:1016
-#: src/applications/sqstore_mysql/mysql.c:1056
-#: src/applications/sqstore_mysql/mysql.c:1070
+#: src/applications/sqstore_sqlite/sqlite.c:46
+#: src/applications/sqstore_sqlite/sqlite.c:53
+#: src/applications/sqstore_mysql/mysql.c:138
+#: src/applications/sqstore_mysql/mysql.c:145
+#: src/applications/sqstore_mysql/mysql.c:423
+#: src/applications/sqstore_mysql/mysql.c:765
+#: src/applications/sqstore_mysql/mysql.c:781
+#: src/applications/sqstore_mysql/mysql.c:791
+#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:827
+#: src/applications/sqstore_mysql/mysql.c:884
+#: src/applications/sqstore_mysql/mysql.c:971
+#: src/applications/sqstore_mysql/mysql.c:982
+#: src/applications/sqstore_mysql/mysql.c:1046
+#: src/applications/sqstore_mysql/mysql.c:1062
+#: src/applications/sqstore_mysql/mysql.c:1072
+#: src/applications/sqstore_mysql/mysql.c:1096
+#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/sqstore_mysql/mysql.c:1119
+#: src/applications/sqstore_mysql/mysql.c:1182
+#: src/applications/sqstore_mysql/mysql.c:1194
+#: src/applications/sqstore_mysql/mysql.c:1242
+#: src/applications/sqstore_mysql/mysql.c:1257
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
@@ -1095,76 +1418,77 @@
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:158
+#: src/applications/sqstore_sqlite/sqlite.c:195
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:307
-#: src/applications/sqstore_sqlite/sqlite.c:327
-#: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:803
+#: src/applications/sqstore_sqlite/sqlite.c:356
+#: src/applications/sqstore_sqlite/sqlite.c:377
+#: src/applications/sqstore_mysql/mysql.c:260
+#: src/applications/sqstore_mysql/mysql.c:845
+#: src/applications/sqstore_mysql/mysql.c:1134
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:308
-#: src/applications/sqstore_sqlite/sqlite.c:328
+#: src/applications/sqstore_sqlite/sqlite.c:357
+#: src/applications/sqstore_sqlite/sqlite.c:378
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1177
-#: src/applications/sqstore_mysql/mysql.c:1182
+#: src/applications/sqstore_sqlite/sqlite.c:1213
+#: src/applications/sqstore_mysql/mysql.c:1318
 msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/session/connect.c:221
+#: src/applications/session/connect.c:225
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:258
+#: src/applications/session/connect.c:263
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
 
-#: src/applications/session/connect.c:517
+#: src/applications/session/connect.c:533
 #, 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:540
+#: src/applications/session/connect.c:558
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:550
+#: src/applications/session/connect.c:568
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:608
+#: src/applications/session/connect.c:626
 msgid ""
 "Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:619
+#: src/applications/session/connect.c:637
 #, c-format
 msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:768
+#: src/applications/session/connect.c:789
 msgid "# session keys sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/applications/session/connect.c:770
+#: src/applications/session/connect.c:791
 msgid "# session keys rejected"
 msgstr "# sessionnycklar vägrade"
 
-#: src/applications/session/connect.c:772
+#: src/applications/session/connect.c:793
 msgid "# session keys accepted"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/applications/session/connect.c:774
+#: src/applications/session/connect.c:795
 msgid "# sessions established"
 msgstr "# sessioner etablerade"
 
@@ -1192,56 +1516,52 @@
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:878 src/applications/rpc/rpc.c:1011
-#: src/applications/rpc/rpc.c:1100
+#: src/applications/rpc/rpc.c:879 src/applications/rpc/rpc.c:1012
+#: src/applications/rpc/rpc.c:1101
 #, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:945
+#: src/applications/rpc/rpc.c:946
 #, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/rpc/rpc.c:1415
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1441
+#: src/applications/rpc/rpc.c:1442
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "\"%s\" registrerar handtag %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1462
+#: src/applications/rpc/rpc.c:1463
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/applications/rpc/rpc.c:1519
+#: src/applications/rpc/rpc.c:1520
 msgid "RPC async reply invalid.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1591
+#: src/applications/rpc/rpc.c:1592
 msgid "async RPC reply not received.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:804
+#: src/applications/sqstore_mysql/mysql.c:261
+#: src/applications/sqstore_mysql/mysql.c:846
+#: src/applications/sqstore_mysql/mysql.c:1135
 msgid "mysql datastore"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1110
+#: src/applications/sqstore_mysql/mysql.c:1348
 #, c-format
-msgid "Query `%s' had no results.\n"
-msgstr ""
-
-#: src/applications/sqstore_mysql/mysql.c:1212
-#, 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:1230
+#: src/applications/sqstore_mysql/mysql.c:1371
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -1252,22 +1572,22 @@
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "Tillgänglighetstest misslyckades för \"%s\" vid %s:%d.\n"
 
-#: src/applications/datastore/datastore.c:143
+#: src/applications/datastore/datastore.c:145
 #, c-format
 msgid "Database failed to delete `%s'.\n"
 msgstr "Databas misslyckades att ta bort \"%s\".\n"
 
-#: src/applications/datastore/datastore.c:358
-#: src/applications/datastore/datastore.c:454
+#: src/applications/datastore/datastore.c:368
+#: src/applications/datastore/datastore.c:465
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:109
+#: src/applications/identity/hostkey.c:121
 #, fuzzy, c-format
 msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/applications/identity/hostkey.c:139
+#: src/applications/identity/hostkey.c:155
 #, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
@@ -1275,11 +1595,11 @@
 "Existerande värdnyckel i filen \"%s\" felade vid formatkontroll, skapar en "
 "ny värdnyckel.\n"
 
-#: src/applications/identity/hostkey.c:147
+#: src/applications/identity/hostkey.c:163
 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:160
+#: src/applications/identity/hostkey.c:176
 msgid "Done creating hostkey.\n"
 msgstr "Klar med skapandet av värdnyckel.\n"
 
@@ -1300,18 +1620,18 @@
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:684
-#: src/applications/identity/identity.c:705
+#: 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:758
+#: src/applications/identity/identity.c:759
 #, fuzzy, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
 
-#: src/applications/identity/identity.c:767
+#: src/applications/identity/identity.c:768
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
@@ -1506,74 +1826,75 @@
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/transport/transport.c:136
+#: src/applications/transport/transport.c:140
 #, c-format
 msgid ""
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:183
+#: src/applications/transport/transport.c:187
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:278
+#: src/applications/transport/transport.c:282
 #, 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:366
+#: src/applications/transport/transport.c:370
 #, 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:423
+#: src/applications/transport/transport.c:427
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:596
+#: src/applications/transport/transport.c:601
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/applications/transport/transport.c:616
+#: src/applications/transport/transport.c:621
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/applications/transport/transport.c:626
+#: src/applications/transport/transport.c:631
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:643
+#: src/applications/transport/transport.c:658
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/applications/transport/transport.c:654
+#: src/applications/transport/transport.c:671
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/applications/fragmentation/fragmentation.c:559
+#: src/applications/fragmentation/fragmentation.c:566
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:560
+#: src/applications/fragmentation/fragmentation.c:567
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:561
+#: src/applications/fragmentation/fragmentation.c:568
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:573
+#: src/applications/fragmentation/fragmentation.c:580
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr "\"%s\" registrerar handtag %d\n"
 
 #: src/applications/stats/gnunet-stats.c:90
+#: src/applications/vpn/gnunet-vpn.c:52
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
@@ -1581,15 +1902,16 @@
 msgid "prints supported protocol messages"
 msgstr "skriver ut stödda protokollmeddelanden"
 
-#: src/applications/stats/gnunet-stats.c:137
-#: src/applications/tbench/gnunet-tbench.c:136
-#: src/applications/tracekit/gnunet-tracekit.c:319
-#: src/applications/template/gnunet-template.c:101
+#: src/applications/stats/gnunet-stats.c:130
+#: src/applications/tbench/gnunet-tbench.c:128
+#: src/applications/tracekit/gnunet-tracekit.c:312
+#: src/applications/template/gnunet-template.c:94
+#: src/applications/vpn/gnunet-vpn.c:145
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:156
+#: src/applications/stats/gnunet-stats.c:149
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr ""
@@ -1626,109 +1948,109 @@
 msgid "keeps statistics about gnunetd's operation"
 msgstr "behåller statistik om gnunetds operation"
 
-#: src/applications/tbench/gnunet-tbench.c:65
-#: src/applications/tracekit/gnunet-tracekit.c:54
+#: src/applications/tbench/gnunet-tbench.c:64
+#: src/applications/tracekit/gnunet-tracekit.c:53
 msgid "Start GNUnet transport benchmarking tool."
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:67
+#: src/applications/tbench/gnunet-tbench.c:66
 msgid "output in gnuplot format"
 msgstr "utdata i gnuplot-format"
 
-#: src/applications/tbench/gnunet-tbench.c:71
+#: src/applications/tbench/gnunet-tbench.c:70
 msgid "number of iterations"
 msgstr "antal iterationer"
 
-#: src/applications/tbench/gnunet-tbench.c:75
+#: src/applications/tbench/gnunet-tbench.c:74
 msgid "number of messages to use per iteration"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/applications/tbench/gnunet-tbench.c:78
+#: src/applications/tbench/gnunet-tbench.c:77
 msgid "receiver host identifier (ENC file name)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:81
+#: src/applications/tbench/gnunet-tbench.c:80
 msgid "message size"
 msgstr "meddelandestorlek"
 
-#: src/applications/tbench/gnunet-tbench.c:84
+#: src/applications/tbench/gnunet-tbench.c:83
 msgid "sleep for SPACE ms after each a message block"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:87
+#: src/applications/tbench/gnunet-tbench.c:86
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:91
+#: src/applications/tbench/gnunet-tbench.c:90
 msgid "number of messages in a message block"
 msgstr "antal meddelanden i ett meddelandeblock"
 
-#: src/applications/tbench/gnunet-tbench.c:153
+#: src/applications/tbench/gnunet-tbench.c:144
 #, c-format
 msgid "You must specify a receiver!\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/applications/tbench/gnunet-tbench.c:162
+#: src/applications/tbench/gnunet-tbench.c:152
 #, c-format
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tbench/gnunet-tbench.c:182
 #, c-format
 msgid "Time:\n"
 msgstr "Tid:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:190
+#: src/applications/tbench/gnunet-tbench.c:183
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr "\tmax      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:192
+#: src/applications/tbench/gnunet-tbench.c:185
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr "\tmin      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:194
+#: src/applications/tbench/gnunet-tbench.c:187
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:196
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:199
+#: src/applications/tbench/gnunet-tbench.c:192
 #, c-format
 msgid "Loss:\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:200
+#: src/applications/tbench/gnunet-tbench.c:193
 #, c-format
 msgid "\tmax      %u\n"
 msgstr "\tmax      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:202
+#: src/applications/tbench/gnunet-tbench.c:195
 #, c-format
 msgid "\tmin      %u\n"
 msgstr "\tmin      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:204
+#: src/applications/tbench/gnunet-tbench.c:197
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:206
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:215
+#: src/applications/tbench/gnunet-tbench.c:208
 #, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:219
+#: src/applications/tbench/gnunet-tbench.c:212
 #, c-format
 msgid ""
 "\n"
@@ -1736,25 +2058,25 @@
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:51
-#: src/applications/tbench/tbenchtest_udp.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:78
-#: src/applications/tbench/tbenchtest_udp.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:83
-#: src/applications/tbench/tbenchtest_udp.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:89
-#: src/applications/tbench/tbenchtest_udp.c:89
+#: src/applications/tbench/tbenchtest_udp.c:88
 #, c-format
 msgid ""
 "\n"
@@ -1762,60 +2084,60 @@
 msgstr ""
 
 #: src/applications/tbench/tbenchtest.c:211
-#: src/applications/tbench/tbenchtest_udp.c:211
+#: src/applications/tbench/tbenchtest_udp.c:210
 #, c-format
 msgid "Running benchmark...\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:460
+#: src/applications/tbench/tbench.c:420
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:49
+#: src/applications/tracekit/gnunet-tracekit.c:48
 msgid "probe network to the given DEPTH"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:52
+#: src/applications/tracekit/gnunet-tracekit.c:51
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:58
+#: src/applications/tracekit/gnunet-tracekit.c:57
 msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:62
+#: src/applications/tracekit/gnunet-tracekit.c:61
 msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:116
+#: 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 ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:163
+#: src/applications/tracekit/gnunet-tracekit.c:162
 #, c-format
 msgid "`%s' is not connected to any peer.\n"
 msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:197
+#: src/applications/tracekit/gnunet-tracekit.c:196
 #, c-format
 msgid "`%s' connected to `%s'.\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:212
+#: src/applications/tracekit/gnunet-tracekit.c:211
 #, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:235
+#: src/applications/tracekit/gnunet-tracekit.c:234
 #, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr "Motpart \"%s\" rapporterade inte tillbaka.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:350
+#: src/applications/tracekit/gnunet-tracekit.c:342
 msgid "Could not send request to gnunetd.\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
@@ -1965,122 +2287,122 @@
 msgid "allows clients to determine gnunetd's configuration"
 msgstr "tillåter klienter att fastställa gnunetds konfiguration"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:71
-#: src/applications/fs/tools/gnunet-insert.c:224
-#: src/applications/fs/tools/gnunet-search.c:129
-#: src/applications/fs/tools/gnunet-download.c:57
+#: src/applications/fs/tools/gnunet-pseudonym.c:70
+#: src/applications/fs/tools/gnunet-insert.c:229
+#: src/applications/fs/tools/gnunet-search.c:140
+#: src/applications/fs/tools/gnunet-download.c:65
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:74
+#: src/applications/fs/tools/gnunet-pseudonym.c:73
 msgid "automate creation of a namespace by starting a collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:78
+#: src/applications/fs/tools/gnunet-pseudonym.c:77
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "skapa en ny pseudonym under angivet SMEKNAMN"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:81
+#: src/applications/fs/tools/gnunet-pseudonym.c:80
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "ta bort pseudonymen med angivet SMEKNAMN"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:84
+#: src/applications/fs/tools/gnunet-pseudonym.c:83
 msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:86
-#: src/applications/fs/tools/gnunet-search.c:132
+#: src/applications/fs/tools/gnunet-pseudonym.c:85
+#: src/applications/fs/tools/gnunet-search.c:143
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
 msgstr ""
 "Skapa nya pseudonymer, ta bort pseudonymer eller lista existerande "
 "pseudonymer."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:89
+#: src/applications/fs/tools/gnunet-pseudonym.c:88
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:92
+#: src/applications/fs/tools/gnunet-pseudonym.c:91
 msgid "specify metadata describing the namespace or collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:95
+#: src/applications/fs/tools/gnunet-pseudonym.c:94
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:98
+#: src/applications/fs/tools/gnunet-pseudonym.c:97
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:101
+#: src/applications/fs/tools/gnunet-pseudonym.c:100
 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
+#: src/applications/fs/tools/gnunet-pseudonym.c:103
 msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:138
+#: src/applications/fs/tools/gnunet-pseudonym.c:137
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:142
+#: src/applications/fs/tools/gnunet-pseudonym.c:141
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:178
+#: src/applications/fs/tools/gnunet-pseudonym.c:177
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:221
+#: src/applications/fs/tools/gnunet-pseudonym.c:211
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Samling stoppad.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:223
+#: src/applications/fs/tools/gnunet-pseudonym.c:213
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr "Misslyckades att stoppa samling (inte aktiv?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:231
+#: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:235
+#: src/applications/fs/tools/gnunet-pseudonym.c:225
 #, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr "Fel vid borttagning av pseudonym \"%s\" (existerar den?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:254
+#: src/applications/fs/tools/gnunet-pseudonym.c:244
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:257
+#: src/applications/fs/tools/gnunet-pseudonym.c:247
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:299
+#: src/applications/fs/tools/gnunet-pseudonym.c:289
 #, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:304
+#: src/applications/fs/tools/gnunet-pseudonym.c:294
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:326
+#: src/applications/fs/tools/gnunet-pseudonym.c:314
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -2121,45 +2443,45 @@
 msgid "start tracking entries for the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:181
+#: src/applications/fs/tools/gnunet-directory.c:174
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "Listade %d matchande poster.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:139
+#: src/applications/fs/tools/gnunet-insert.c:137
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Skapade post \"%s\" i namnrymd \"%s\"\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:144
+#: src/applications/fs/tools/gnunet-insert.c:142
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:166
+#: src/applications/fs/tools/gnunet-insert.c:168
 #, fuzzy, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "%16llu av %16llu byte inlagda (uppskattar %s till färdigställd)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:178
+#: src/applications/fs/tools/gnunet-insert.c:180
 #, 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"
 
-#: src/applications/fs/tools/gnunet-insert.c:189
+#: src/applications/fs/tools/gnunet-insert.c:191
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:200
+#: src/applications/fs/tools/gnunet-insert.c:202
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr "Nedladdning avbruten."
 
-#: src/applications/fs/tools/gnunet-insert.c:206
+#: src/applications/fs/tools/gnunet-insert.c:207
 #, c-format
 msgid ""
 "\n"
@@ -2168,107 +2490,116 @@
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:216
+#, c-format
 msgid ""
+"\n"
+"Unexpected event: %d\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:233
+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:232
+#: src/applications/fs/tools/gnunet-insert.c:237
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:235
+#: src/applications/fs/tools/gnunet-insert.c:240
+#, fuzzy
 msgid ""
-"use libextractor to add additional direct references to directory entries"
+"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:238
+#: src/applications/fs/tools/gnunet-insert.c:243
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:245
 msgid "Make files available to GNUnet for sharing."
 msgstr "Gör filer tillgängliga via utdelning till GNUnet."
 
-#: src/applications/fs/tools/gnunet-insert.c:243
+#: src/applications/fs/tools/gnunet-insert.c:248
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:247
+#: src/applications/fs/tools/gnunet-insert.c:252
 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:251
+#: src/applications/fs/tools/gnunet-insert.c:256
 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:256
+#: src/applications/fs/tools/gnunet-insert.c:261
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:259
+#: src/applications/fs/tools/gnunet-insert.c:264
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:263
+#: src/applications/fs/tools/gnunet-insert.c:268
 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:267
+#: src/applications/fs/tools/gnunet-insert.c:272
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/applications/fs/tools/gnunet-insert.c:270
+#: src/applications/fs/tools/gnunet-insert.c:275
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:273
+#: src/applications/fs/tools/gnunet-insert.c:278
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:277
+#: src/applications/fs/tools/gnunet-insert.c:282
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:281
+#: src/applications/fs/tools/gnunet-insert.c:286
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:289
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:326
+#: src/applications/fs/tools/gnunet-insert.c:324
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:351
+#: src/applications/fs/tools/gnunet-insert.c:348
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:378
+#: src/applications/fs/tools/gnunet-insert.c:374
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
@@ -2278,53 +2609,52 @@
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:407
-#: src/applications/fs/tools/gnunet-insert.c:412
-#: src/applications/fs/tools/gnunet-insert.c:417
-#: src/applications/fs/tools/gnunet-insert.c:422
+#: src/applications/fs/tools/gnunet-insert.c:403
+#: src/applications/fs/tools/gnunet-insert.c:409
+#: src/applications/fs/tools/gnunet-insert.c:415
+#: src/applications/fs/tools/gnunet-insert.c:421
 #: src/applications/fs/tools/gnunet-insert.c:427
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:136
+#: src/applications/fs/tools/gnunet-search.c:147
 msgid "exit after receiving LIMIT results"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:139
-#: src/applications/fs/tools/gnunet-download.c:64
+#: src/applications/fs/tools/gnunet-search.c:150
+#: src/applications/fs/tools/gnunet-download.c:72
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:142
+#: src/applications/fs/tools/gnunet-search.c:153
 msgid "wait DELAY seconds for search results before aborting"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:189
+#: src/applications/fs/tools/gnunet-search.c:191
 #, c-format
-msgid "Starting search failed. Consult logs.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:277
-#, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:60
+#: src/applications/fs/tools/gnunet-download.c:68
 msgid "Download files from GNUnet."
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/applications/fs/tools/gnunet-download.c:67
+#: src/applications/fs/tools/gnunet-download.c:75
 msgid "download a GNUnet directory recursively"
 msgstr "hämta en GNUnet-katalog rekursivt"
 
-#: src/applications/fs/tools/gnunet-download.c:86
+#: src/applications/fs/tools/gnunet-download.c:93
 #, fuzzy, c-format
 msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr "Hämtning av fil \"%s\" vid %16llu av %16llu byte (%8.3f kbps)\n"
 
-#: src/applications/fs/tools/gnunet-download.c:99
-#: src/applications/fs/tools/gnunet-download.c:110
+#: src/applications/fs/tools/gnunet-download.c:106
+#, fuzzy, c-format
+msgid "Download aborted.\n"
+msgstr "Nedladdning avbruten."
+
+#: src/applications/fs/tools/gnunet-download.c:112
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr "Fel vid nedladdning: %s\n"
@@ -2340,17 +2670,17 @@
 msgstr ""
 "Inte tillräckligt med argument. Du måste ange en URI till en GNUnet-fil\n"
 
-#: src/applications/fs/tools/gnunet-download.c:195
+#: src/applications/fs/tools/gnunet-download.c:194
 #, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr "URI \"%s\" ogiltig för gnunet-download.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:244
+#: src/applications/fs/tools/gnunet-download.c:262
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Fil lagrad som \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/fs/tools/gnunet-unindex.c:57
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
@@ -2359,7 +2689,7 @@
 "%16llu av %16llu byte avindexerat (uppskattar %llu sekunder till "
 "färdigställd)                "
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:68
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2368,7 +2698,7 @@
 "\n"
 "Avindexering av \"%s\" klar, %llu byte tog %llu sekunder (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:83
+#: src/applications/fs/tools/gnunet-unindex.c:80
 #, c-format
 msgid ""
 "\n"
@@ -2381,23 +2711,23 @@
 msgid "Unindex files."
 msgstr "Avindexera filer."
 
-#: src/applications/fs/tools/gnunet-unindex.c:145
+#: 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"
 
-#: src/applications/fs/tools/gnunet-unindex.c:173
+#: src/applications/fs/tools/gnunet-unindex.c:164
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "\"%s\" misslyckades.  Är \"%s\" en fil?\n"
 
-#: src/applications/fs/module/ondemand.c:317
+#: src/applications/fs/module/ondemand.c:320
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr "Indexerad fil försvann, tar bort block för fråga \"%s\"\n"
 
-#: src/applications/fs/module/ondemand.c:411
+#: src/applications/fs/module/ondemand.c:418
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2405,20 +2735,20 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:438
+#: src/applications/fs/module/ondemand.c:445
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
 "%s' under `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:655
+#: src/applications/fs/module/ondemand.c:664
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1196
+#: src/applications/fs/module/fs.c:1229
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2427,12 +2757,12 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/applications/fs/module/fs.c:1247
+#: src/applications/fs/module/fs.c:1281
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1287
+#: src/applications/fs/module/fs.c:1321
 msgid "enables (anonymous) file-sharing"
 msgstr "aktiverar (anonym) fildelning"
 
@@ -2444,53 +2774,36 @@
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/downloadtest.c:239
+#: src/applications/fs/fsui/searchtest.c:156
+#: src/applications/fs/fsui/fsuitest.c:199
+#: src/applications/fs/fsui/downloadtest.c:308
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
 msgid "AND"
 msgstr "OCH"
 
-#: src/applications/fs/fsui/fsui.c:195
-msgid "FSUI persistence: error restoring download\n"
+#: src/applications/fs/fsui/search.c:265
+msgid "Error running search (consult logs)."
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:666
-#, c-format
-msgid "FSUI state file `%s' had syntax error at offset %u.\n"
+#: src/applications/fs/fsui/download.c:263
+msgid "ECRS download failed (see logs)"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:305
-msgid "Download aborted."
-msgstr "Nedladdning avbruten."
-
-#: src/applications/fs/fsui/download.c:309
-msgid "ECRS download failed (see logs)."
-msgstr ""
-
-#: src/applications/fs/fsui/download.c:313
-msgid "ECRS download suspending."
-msgstr ""
-
-#: src/applications/fs/fsui/download.c:317
-msgid "Unexpected download state."
-msgstr ""
-
-#: src/applications/fs/fsui/unindex.c:80
+#: src/applications/fs/fsui/unindex.c:99
 msgid "Unindex failed."
 msgstr "Avindexering misslyckades."
 
-#: src/applications/fs/fsui/upload.c:229 src/applications/fs/fsui/upload.c:374
-#: src/applications/fs/fsui/upload.c:413
+#: src/applications/fs/fsui/upload.c:222
 #, fuzzy
-msgid "Upload failed."
+msgid "Failed to create temporary directory."
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/applications/fs/fsui/upload.c:244
+#, fuzzy
+msgid "Upload failed (consult logs)."
 msgstr "Uppladdning misslyckades.\n"
 
-#: src/applications/fs/fsui/upload.c:420
-msgid "Cannot upload directory without using recursion."
-msgstr ""
-
 #: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
 msgstr "CHK URI tillåts inte för sökning.\n"
@@ -2517,77 +2830,77 @@
 "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:1153
+#: src/applications/fs/ecrs/download.c:1157
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:170
+#: src/applications/fs/ecrs/upload.c:161
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/fs/ecrs/upload.c:171
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Kan inte hämta storlek på fil \"%s\""
 
-#: src/applications/fs/ecrs/upload.c:188
+#: src/applications/fs/ecrs/upload.c:179
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/applications/fs/ecrs/upload.c:200
+#: src/applications/fs/ecrs/upload.c:191
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:219
+#: src/applications/fs/ecrs/upload.c:210
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Initiering av indexering av fil \"%s\" misslyckades.\n"
 
-#: src/applications/fs/ecrs/upload.c:226
+#: src/applications/fs/ecrs/upload.c:217
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/applications/fs/ecrs/upload.c:312
+#: src/applications/fs/ecrs/upload.c:303
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/applications/fs/ecrs/meta.c:847
+#: src/applications/fs/ecrs/meta.c:849
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Namnbyte på fil \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: src/applications/fs/ecrs/meta.c:855
+#: src/applications/fs/ecrs/meta.c:857
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "Kunde inte byta namn på fil \"%s\" till \"%s\": filen existerar\n"
 
-#: src/applications/fs/ecrs/namespace.c:153
+#: src/applications/fs/ecrs/namespace.c:154
 #, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Kan inte skapa pseudonym \"%s\", filen \"%s\" existerar.\n"
 
-#: src/applications/fs/ecrs/namespace.c:338
-#: src/applications/fs/ecrs/namespace.c:419
-#: src/applications/fs/ecrs/namespace.c:573
+#: src/applications/fs/ecrs/namespace.c:339
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:574
 #, 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:350
-#: src/applications/fs/ecrs/namespace.c:430
+#: src/applications/fs/ecrs/namespace.c:351
+#: 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:587
-#: src/applications/fs/ecrs/namespace.c:598
+#: src/applications/fs/ecrs/namespace.c:588
+#: src/applications/fs/ecrs/namespace.c:599
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Formatet på filen \"%s\" är ogiltig.\n"
@@ -2603,35 +2916,35 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:123
+#: src/applications/fs/uritrack/file_info.c:125
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:355
+#: src/applications/fs/uritrack/file_info.c:367
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:654
+#: src/applications/fs/namespace/namespace_info.c:656
 msgid "Publication interval for periodic publication changed."
 msgstr "Publiseringsintervall för periodisk publisering har ändrats."
 
-#: src/applications/fs/namespace/namespace_info.c:675
+#: src/applications/fs/namespace/namespace_info.c:677
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:354
+#: src/applications/topology_f2f/topology.c:359
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/applications/topology_f2f/topology.c:371
+#: src/applications/topology_f2f/topology.c:376
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:384
+#: src/applications/topology_f2f/topology.c:389
 #, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
@@ -2641,20 +2954,37 @@
 msgid "`%s' registering client handler %d and %d\n"
 msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
 
-#: src/applications/template/gnunet-template.c:44
+#: src/applications/template/gnunet-template.c:43
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:92
+#: src/applications/bootstrap_http/http.c:100
 #, fuzzy, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/applications/bootstrap_http/http.c:144
+#: src/applications/bootstrap_http/http.c:121
+#: src/applications/bootstrap_http/http.c:263
+#: src/applications/bootstrap_http/http.c:283
+#: src/applications/bootstrap_http/http.c:317
+#: src/applications/bootstrap_http/http.c:335
+#: src/applications/bootstrap_http/http.c:349
+#: src/applications/bootstrap_http/http.c:361
+#: src/applications/bootstrap_http/http.c:373
+#, fuzzy, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/applications/bootstrap_http/http.c:173
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:229
+#, fuzzy, c-format
+msgid "Trying to download hostlist from `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/applications/bootstrap_http/http.c:409
 msgid "# hellos downloaded via http"
 msgstr ""
 
@@ -2672,339 +3002,335 @@
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:98
+#: src/applications/vpn/gnunet-vpn.c:56
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:103
-msgid "VPN over GNUnet."
-msgstr ""
-
-#: src/applications/vpn/vpn.c:351
+#: src/applications/vpn/vpn.c:326
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:359
+#: src/applications/vpn/vpn.c:334
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:387
+#: src/applications/vpn/vpn.c:362
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:436
+#: src/applications/vpn/vpn.c:411
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:440
+#: src/applications/vpn/vpn.c:415
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:450
+#: src/applications/vpn/vpn.c:425
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:510
+#: src/applications/vpn/vpn.c:485
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:514
+#: src/applications/vpn/vpn.c:489
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:541
+#: src/applications/vpn/vpn.c:518
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:549
+#: src/applications/vpn/vpn.c:526
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:553
+#: src/applications/vpn/vpn.c:530
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:591
+#: src/applications/vpn/vpn.c:568
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:595
+#: src/applications/vpn/vpn.c:572
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:602
+#: src/applications/vpn/vpn.c:579
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:607
+#: src/applications/vpn/vpn.c:584
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:615
+#: src/applications/vpn/vpn.c:592
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:627
+#: src/applications/vpn/vpn.c:604
 #, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:638
+#: src/applications/vpn/vpn.c:615
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:650
+#: src/applications/vpn/vpn.c:627
 #, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:683
+#: 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"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:729
+#: src/applications/vpn/vpn.c:706
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:788
+#: src/applications/vpn/vpn.c:769
 #, c-format
 msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:792
+#: src/applications/vpn/vpn.c:773
 #, c-format
 msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:810
+#: src/applications/vpn/vpn.c:791
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:850
+#: src/applications/vpn/vpn.c:831
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:835
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:860
+#: src/applications/vpn/vpn.c:841
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:863
+#: src/applications/vpn/vpn.c:844
 #, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:873
+#: src/applications/vpn/vpn.c:854
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:892
+#: src/applications/vpn/vpn.c:873
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:913
+#: src/applications/vpn/vpn.c:894
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:918
+#: src/applications/vpn/vpn.c:899
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:929
+#: src/applications/vpn/vpn.c:910
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:935
+#: src/applications/vpn/vpn.c:916
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:951
+#: src/applications/vpn/vpn.c:932
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:955
+#: src/applications/vpn/vpn.c:936
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:959
+#: src/applications/vpn/vpn.c:940
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:973
+#: src/applications/vpn/vpn.c:954
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:988
+#: src/applications/vpn/vpn.c:969
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1016
+#: src/applications/vpn/vpn.c:997
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1031
+#: src/applications/vpn/vpn.c:1012
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1076
+#: src/applications/vpn/vpn.c:1057
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1122
+#: src/applications/vpn/vpn.c:1103
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1148
+#: src/applications/vpn/vpn.c:1129
 msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1208
+#: src/applications/vpn/vpn.c:1190
 msgid "Yes"
 msgstr "Ja"
 
-#: src/applications/vpn/vpn.c:1208
+#: src/applications/vpn/vpn.c:1190
 msgid "No"
 msgstr "Nej"
 
-#: src/applications/vpn/vpn.c:1385
+#: src/applications/vpn/vpn.c:1396
 #, fuzzy, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr "\"%s\" registrerar handtagen %d och %d\n"
 
-#: src/applications/vpn/vpn.c:1386
+#: src/applications/vpn/vpn.c:1397
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1434
+#: src/applications/vpn/vpn.c:1447
 #, fuzzy
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr "aktiverar P2P-chatt (ej komplett)"
 
-#: src/applications/vpn/vpn.c:1466
+#: src/applications/vpn/vpn.c:1479
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1477
+#: src/applications/vpn/vpn.c:1492
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1490
+#: src/applications/vpn/vpn.c:1507
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:142
+#: src/server/gnunet-update.c:141
 #, c-format
 msgid "Updating data for module `%s'\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/server/gnunet-update.c:147
+#: src/server/gnunet-update.c:146
 #, c-format
 msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:218 src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-update.c:217 src/server/gnunet-transport-check.c:355
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-update.c:220
+#: src/server/gnunet-update.c:219
 msgid "Updates GNUnet datastructures after version change."
 msgstr "Uppdaterar GNUnets datastruktur efter versionsändring."
 
-#: src/server/gnunet-update.c:224 src/server/gnunet-transport-check.c:369
+#: src/server/gnunet-update.c:223 src/server/gnunet-transport-check.c:370
 msgid "run as user LOGIN"
 msgstr "kör som användare LOGIN"
 
-#: src/server/gnunet-update.c:227
+#: src/server/gnunet-update.c:226
 msgid "run in client mode (for getting client configuration values)"
 msgstr "kör i klientläge (för att hämta värden från klientkonfiguration)"
 
-#: src/server/connection.c:992
+#: src/server/connection.c:1023
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "\"%s\" valda %d av %d meddelanden (MTU: %d).\n"
 
-#: src/server/connection.c:999
+#: src/server/connection.c:1032
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Detaljer om meddelande: %u: längd %d, prioritet: %d\n"
 
-#: src/server/connection.c:2283
+#: src/server/connection.c:2417
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
 
-#: src/server/connection.c:2355
+#: src/server/connection.c:2489
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2370
+#: src/server/connection.c:2506
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:2774
+#: src/server/connection.c:2929
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2778
+#: src/server/connection.c:2933
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2780
+#: src/server/connection.c:2935
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2783
+#: src/server/connection.c:2938
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/server/connection.c:2787
+#: src/server/connection.c:2942
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/server/connection.c:2791
+#: src/server/connection.c:2946
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/server/connection.c:2793
+#: src/server/connection.c:2948
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/server/connection.c:2794
+#: src/server/connection.c:2949
 msgid "# bytes noise sent"
 msgstr ""
 
@@ -3028,16 +3354,16 @@
 msgid "Starts the gnunetd daemon."
 msgstr "Startar gnunetd-demonen."
 
-#: src/server/gnunetd.c:176
+#: src/server/gnunetd.c:175
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:180
+#: src/server/gnunetd.c:179
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: src/server/gnunetd.c:236
+#: src/server/gnunetd.c:228
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -3083,32 +3409,32 @@
 msgid "Could not properly unload service `%s'!\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:115
+#: src/server/gnunet-transport-check.c:116
 #, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:124
+#: src/server/gnunet-transport-check.c:125
 #, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "\"%s\": Kunde inte ansluta.\n"
 
-#: src/server/gnunet-transport-check.c:158
+#: src/server/gnunet-transport-check.c:159
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr "\"%s\": Kunde inte skicka.\n"
 
-#: src/server/gnunet-transport-check.c:180
+#: src/server/gnunet-transport-check.c:181
 #, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
 
-#: src/server/gnunet-transport-check.c:194
+#: src/server/gnunet-transport-check.c:195
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "\"%s\": Kunde inte koppla ned.\n"
 
-#: src/server/gnunet-transport-check.c:201
+#: src/server/gnunet-transport-check.c:202
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -3117,12 +3443,12 @@
 "\"%s\" transport OK.  Det tog %ums att överföra %d meddelanden på %d byte "
 "styck.\n"
 
-#: src/server/gnunet-transport-check.c:229
+#: src/server/gnunet-transport-check.c:230
 #, fuzzy, c-format
 msgid " Transport %d is not being tested\n"
 msgstr " Transport %d ej tillgänglig\n"
 
-#: src/server/gnunet-transport-check.c:245
+#: src/server/gnunet-transport-check.c:246
 #, c-format
 msgid ""
 "\n"
@@ -3131,56 +3457,56 @@
 "\n"
 "Kontaktar \"%s\"."
 
-#: src/server/gnunet-transport-check.c:266
+#: src/server/gnunet-transport-check.c:267
 #, c-format
 msgid " Connection failed\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/server/gnunet-transport-check.c:272
+#: src/server/gnunet-transport-check.c:273
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/server/gnunet-transport-check.c:324
+#: src/server/gnunet-transport-check.c:325
 #, c-format
 msgid "No reply received within %llums.\n"
 msgstr "Inget svar mottaget inom %llums.\n"
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:351
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:357
+#: src/server/gnunet-transport-check.c:358
 msgid "send COUNT messages"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/server/gnunet-transport-check.c:360
+#: src/server/gnunet-transport-check.c:361
 msgid "send messages with SIZE bytes payload"
 msgstr "skicka meddelanden med STORLEK bytes nyttolast"
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:364
 msgid "specifies which TRANSPORT should be tested"
 msgstr "anger vilken TRANSPORT som ska testas"
 
-#: src/server/gnunet-transport-check.c:366
+#: src/server/gnunet-transport-check.c:367
 msgid "specifies after how many MS to time-out"
 msgstr "anger timeout efter antal MS"
 
-#: src/server/gnunet-transport-check.c:374
+#: src/server/gnunet-transport-check.c:375
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:455
+#: src/server/gnunet-transport-check.c:440
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/server/gnunet-transport-check.c:458
+#: src/server/gnunet-transport-check.c:443
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/server/gnunet-transport-check.c:518
+#: src/server/gnunet-transport-check.c:503
 #, c-format
 msgid ""
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
@@ -3196,14 +3522,14 @@
 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:384
+#: src/server/tcpserver.c:386
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:437
+#: src/server/tcpserver.c:439
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr ""
@@ -3213,50 +3539,50 @@
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/server/version.c:157
+#: src/server/version.c:152
 msgid ""
 "Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:52
+#: src/server/gnunet-peer-info.c:51
 msgid "Print information about GNUnet peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/server/gnunet-peer-info.c:79 src/server/gnunet-peer-info.c:94
+#: src/server/gnunet-peer-info.c:78 src/server/gnunet-peer-info.c:93
 #, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:88
+#: src/server/gnunet-peer-info.c:87
 msgid "hello message invalid (signature invalid).\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:99
+#: src/server/gnunet-peer-info.c:98
 #, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/util/cron/cron.c:355
+#: src/util/cron/cron.c:356
 #, c-format
 msgid ""
 "`%s' called with cron job not in queue, adding.  This may not be what you "
 "want.\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:90
+#: src/util/network_client/tcpio.c:94
 msgid "Could not find valid value for PORT in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:114
+#: src/util/network_client/tcpio.c:118
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:209 src/util/network_client/tcpio.c:237
+#: src/util/network_client/tcpio.c:251 src/util/network_client/tcpio.c:281
 #, fuzzy, c-format
 msgid "Cannot connect to %s:u: %s\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/network_client/tcpio.c:356
+#: src/util/network_client/tcpio.c:403
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "\"%s\" misslyckades, svar ogiltigt!\n"
@@ -3289,17 +3615,17 @@
 msgid "Can't create semaphore: %i"
 msgstr "Kan inte skapa semafor: %i"
 
-#: src/util/os/dso.c:51
+#: src/util/os/dso.c:56
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/util/os/dso.c:90
+#: src/util/os/dso.c:110
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/os/dso.c:132
+#: src/util/os/dso.c:152
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
@@ -3317,21 +3643,21 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/os/user.c:125
+#: 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:136
+#: src/util/os/user.c:135
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/network/select.c:272
+#: src/util/network/select.c:282
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 
-#: src/util/network/select.c:421
+#: src/util/network/select.c:443
 msgid "select listen socket not valid!\n"
 msgstr ""
 
@@ -3367,124 +3693,125 @@
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk/storage.c:247
+#: src/util/disk/storage.c:517
 #, fuzzy, c-format
-msgid "Expected `%s' to be a directory\n"
+msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk/storage.c:286
-#, fuzzy, c-format
-msgid "Expected `%s' to be a regular file\n"
-msgstr "\"%s\" är inte en vanlig fil.\n"
-
-#: src/util/disk/storage.c:493
-#, 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:260
+#: 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:421
+#: src/util/config_impl/impl.c:505
 #, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgstr ""
+
+#: src/util/config_impl/impl.c:551
+#, c-format
 msgid ""
 "Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
 "llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:433
+#: src/util/config_impl/impl.c:563
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:513
+#: src/util/config_impl/impl.c:653
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:624
+#: src/util/error/error.c:122
 #, c-format
-msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgid ""
+"\n"
+"Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:156 src/util/error/error.c:200
+#: src/util/error/error.c:190 src/util/error/error.c:234
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/error/error.c:159 src/util/error/error.c:202
+#: src/util/error/error.c:193 src/util/error/error.c:236
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:162 src/util/error/error.c:204
+#: src/util/error/error.c:196 src/util/error/error.c:240
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/error/error.c:165 src/util/error/error.c:206
+#: src/util/error/error.c:199 src/util/error/error.c:242
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/error/error.c:168 src/util/error/error.c:208
+#: src/util/error/error.c:202 src/util/error/error.c:244
 msgid "FATAL"
 msgstr "ÖDESDIGER"
 
-#: src/util/error/error.c:171 src/util/error/error.c:210
+#: src/util/error/error.c:205 src/util/error/error.c:246
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:174 src/util/error/error.c:212
+#: src/util/error/error.c:208 src/util/error/error.c:248
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:177 src/util/error/error.c:214
+#: src/util/error/error.c:211 src/util/error/error.c:250
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:180 src/util/error/error.c:216
+#: src/util/error/error.c:214 src/util/error/error.c:252
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:183 src/util/error/error.c:218
+#: src/util/error/error.c:217 src/util/error/error.c:254
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:186 src/util/error/error.c:220
+#: src/util/error/error.c:220 src/util/error/error.c:256
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:189
+#: src/util/error/error.c:223
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:221
+#: src/util/error/error.c:238
+msgid "INFO"
+msgstr "INFO"
+
+#: src/util/error/error.c:257
 msgid "NOTHING"
 msgstr "INGET"
 
-#: src/util/threads/mutex.c:131 src/util/threads/mutex.c:151
+#: src/util/threads/mutex.c:145 src/util/threads/mutex.c:165
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/util/threads/mutex.c:136
+#: src/util/threads/mutex.c:150
 #, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:156
+#: src/util/threads/mutex.c:170
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/threads/pthread.c:139 src/util/threads/pthread.c:147
-#: src/util/threads/pthread.c:154 src/util/threads/pthread.c:245
+#: src/util/threads/pthread.c:158 src/util/threads/pthread.c:166
+#: src/util/threads/pthread.c:173 src/util/threads/pthread.c:266
 #, fuzzy, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/threads/pthread.c:161 src/util/threads/pthread.c:256
+#: src/util/threads/pthread.c:180 src/util/threads/pthread.c:277
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -3555,8 +3882,13 @@
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/printhelp.c:49
+#: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
 #, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/util/getopt/printhelp.c:50
+#, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
@@ -3615,21 +3947,21 @@
 msgid "Tool to setup GNUnet."
 msgstr "Verktyg för att ställa in GNUnet."
 
-#: src/setup/gnunet-setup.c:152
+#: src/setup/gnunet-setup.c:185
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Ogiltiga kommandoradsargument.\n"
 
-#: src/setup/gnunet-setup.c:157
+#: src/setup/gnunet-setup.c:190
 msgid "No interface specified, using default\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:227
+#: src/setup/gnunet-setup.c:264
 #, c-format
 msgid "`%s' is not available."
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/setup/gnunet-setup.c:243
+#: src/setup/gnunet-setup.c:280
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
@@ -3740,19 +4072,33 @@
 msgstr ""
 "Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
 
-#: src/setup/gtk/wizard_gtk.c:429
+#: src/setup/gtk/wizard_gtk.c:137
+#, fuzzy
+msgid "(unknown connection)"
+msgstr "Nätverksanslutning"
+
+#: src/setup/gtk/wizard_gtk.c:390
 #, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/setup/gtk/wizard_gtk.c:475 src/setup/ncurses/wizard_curs.c:620
+#: src/setup/gtk/wizard_gtk.c:415
+#, fuzzy
+msgid "Do you want to save the new configuration?"
+msgstr "Vill du spara dina inställningar?"
+
+#: src/setup/gtk/wizard_gtk.c:442 src/setup/ncurses/wizard_curs.c:620
 msgid "Unable to create user account:"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/setup/gtk/wizard_gtk.c:482 src/setup/ncurses/wizard_curs.c:623
+#: src/setup/gtk/wizard_gtk.c:449 src/setup/ncurses/wizard_curs.c:623
 msgid "Unable to change startup process:"
 msgstr ""
 
+#: src/setup/gtk/wizard_gtk.c:458
+msgid "gnunet-update failed. Please run gnunet-update manually."
+msgstr ""
+
 #: src/setup/text/conf.c:74
 #, fuzzy
 msgid "yes"
@@ -3847,36 +4193,36 @@
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:538
+#: src/setup/text/conf.c:542
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:539
+#: src/setup/text/conf.c:543
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:553 src/setup/ncurses/mconf.c:422
+#: src/setup/text/conf.c:557 src/setup/ncurses/mconf.c:422
 #, 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"
 
-#: src/setup/text/conf.c:558
+#: src/setup/text/conf.c:562
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:568
+#: src/setup/text/conf.c:572
 #, 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"
 
-#: src/setup/text/conf.c:573
+#: src/setup/text/conf.c:577
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
@@ -4176,47 +4522,67 @@
 "Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:145
+#: src/include/gnunet_util_getopt.h:150
 msgid "print this help"
 msgstr "skriv ut denna hjälp"
 
-#: src/include/gnunet_util_getopt.h:154
+#: src/include/gnunet_util_getopt.h:159
 msgid "print the version number"
 msgstr "skriv ut versionsnummer"
 
-#: src/include/gnunet_util_getopt.h:160
-msgid "configure logging to use LOGRULES"
+#: src/include/gnunet_util_getopt.h:165
+msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:166
+#: src/include/gnunet_util_getopt.h:171
 msgid "be verbose"
 msgstr "var informativ"
 
-#: src/include/gnunet_util_getopt.h:172
+#: src/include/gnunet_util_getopt.h:177
 msgid "use configuration file FILENAME"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/include/gnunet_util_getopt.h:178
+#: src/include/gnunet_util_getopt.h:183
 msgid "specify host on which gnunetd is running"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: src/include/gnunet_util_error.h:163 src/include/gnunet_util_error.h:165
-#: src/include/gnunet_util_error.h:167 src/include/gnunet_util_error.h:169
+#: src/include/gnunet_util_error.h:175 src/include/gnunet_util_error.h:177
+#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:181
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d in %s.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/include/gnunet_util_error.h:176 src/include/gnunet_util_error.h:183
-#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#: src/include/gnunet_util_error.h:188 src/include/gnunet_util_error.h:195
+#: src/include/gnunet_util_error.h:202 src/include/gnunet_util_error.h:209
 #, 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:204 src/include/gnunet_util_error.h:211
+#: src/include/gnunet_util_error.h:216 src/include/gnunet_util_error.h:223
 #, 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"
 
+#~ msgid "Could not resolve name of SMTP server `%s': %s"
+#~ msgstr "Kunde inte slå upp namnet för SMTP-server \"%s\": %s"
+
+#~ msgid "query table called NAME"
+#~ msgstr "fråga tabell kallad NAME"
+
+#~ msgid "No commands specified.\n"
+#~ msgstr "Inga kommandon angivna.\n"
+
+#~ msgid "Superflous arguments (ignored).\n"
+#~ msgstr "Onödiga argument (ignorerade).\n"
+
+#, fuzzy
+#~ msgid "Expected `%s' to be a regular file\n"
+#~ msgstr "\"%s\" är inte en vanlig fil.\n"
+
+#, fuzzy
+#~ msgid "expected `%s' to be a directory!\n"
+#~ msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
+
 #~ msgid "Sorry, no help is available for this option.\n"
 #~ msgstr "Tyvärr, ingen hjälp är tillgänglig för den här flaggan.\n"
 
@@ -4315,9 +4681,6 @@
 #~ msgid "Template for gnunet-clients."
 #~ msgstr "Mall för gnunet-clients."
 
-#~ msgid "`%s' failed at %s:%d with error: `%s'.\n"
-#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-
 #~ msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
 #~ msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
@@ -4475,15 +4838,9 @@
 #~ msgid "Next"
 #~ msgstr "Nästa"
 
-#~ msgid "Network interface:"
-#~ msgstr "Nätverksgränssnitt:"
-
 #~ msgid "IP-Address/Hostname:"
 #~ msgstr "IP-adress/Värdnamn:"
 
-#~ msgid "Network connection"
-#~ msgstr "Nätverksanslutning"
-
 #~ msgid "Bandwidth limitation"
 #~ msgstr "Bandbreddsbegränsning"
 
@@ -4547,9 +4904,6 @@
 #~ msgid "Show _range"
 #~ msgstr "Visa _omfång"
 
-#~ msgid "Show value of the option"
-#~ msgstr "Visa värde av alternativet"
-
 #~ msgid "Show _data"
 #~ msgstr "Visa _data"
 
@@ -4646,9 +5000,6 @@
 #~ msgid "MESSAGE"
 #~ msgstr "MEDDELANDE"
 
-#~ msgid "INFO"
-#~ msgstr "INFO"
-
 #~ msgid "CRON"
 #~ msgstr "CRON"
 

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2006-11-12 07:38:46 UTC (rev 3716)
+++ GNUnet/po/vi.po     2006-11-12 08:05:43 UTC (rev 3717)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-09-10 22:06-0600\n"
+"POT-Creation-Date: 2006-11-12 01:40-0700\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"
@@ -90,10 +90,20 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:130
+#, fuzzy
+msgid "Full pathname of GNUnet directory for file-sharing data"
+msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
+
+#: contrib/config-daemon.scm:142
+#, fuzzy
+msgid "Full pathname of GNUnet directory for indexed files symbolic links"
+msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
+
+#: contrib/config-daemon.scm:154
 msgid "How many minutes should peer advertisements last?"
 msgstr ""
 
-#: contrib/config-daemon.scm:132
+#: contrib/config-daemon.scm:156
 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 "
@@ -103,52 +113,98 @@
 "than the frequency with which your IP changes."
 msgstr ""
 
-#: contrib/config-daemon.scm:143
-msgid "Log level"
+#: contrib/config-daemon.scm:167
+msgid "Where can GNUnet find an initial list of peers?"
 msgstr ""
 
-#: contrib/config-daemon.scm:144
-msgid "How verbose should the logging of errors be?"
+#: contrib/config-daemon.scm:169
+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"
+"\t\t\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"
+"\t\t\n"
+"If you do not specify a HOSTLISTURL, you must copy valid hostkeys to data/"
+"hosts manually."
 msgstr ""
 
-#: contrib/config-daemon.scm:155
-msgid "Where should logs go?"
+#: contrib/config-daemon.scm:186
+msgid "HTTP Proxy Server"
 msgstr ""
 
-#: contrib/config-daemon.scm:157
+#: contrib/config-daemon.scm:188
 msgid ""
-"In which file should gnunetd write the logs?  If you specify nothing, logs "
-"are written to stderr (and note that if gnunetd runs in the background, "
-"stderr is closed and all logs are discarded)."
+"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:168
+#: contrib/config-daemon.scm:227 contrib/config-client.scm:144
 msgid "How long should logs be kept?"
 msgstr ""
 
-#: contrib/config-daemon.scm:170
+#: contrib/config-daemon.scm:229 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."
 msgstr ""
 
-#: contrib/config-daemon.scm:181
+#: contrib/config-daemon.scm:240 contrib/config-client.scm:157
+msgid "Where should gnunetd write the logs?"
+msgstr ""
+
+#: contrib/config-daemon.scm:252 contrib/config-client.scm:169
+#, fuzzy
+msgid "Configuration of the logging system"
+msgstr ""
+"Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
+
+#: contrib/config-daemon.scm:253 contrib/config-client.scm:170
+msgid "Specify which system messages should be logged how"
+msgstr ""
+
+#: contrib/config-daemon.scm:257 contrib/config-client.scm:174
+msgid "Logging of events for users"
+msgstr ""
+
+#: contrib/config-daemon.scm:258 contrib/config-client.scm:175
+msgid "Logging of events for the system administrator"
+msgstr ""
+
+#: contrib/config-daemon.scm:270
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:183
+#: contrib/config-daemon.scm:272
 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:195
+#: contrib/config-daemon.scm:284
+msgid "As which user should gnunetd run?"
+msgstr ""
+
+#: contrib/config-daemon.scm:286
+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:298
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:197
+#: contrib/config-daemon.scm:300
 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"
@@ -162,11 +218,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:211
+#: contrib/config-daemon.scm:314
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:213
+#: contrib/config-daemon.scm:316
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -203,20 +259,109 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:244
+#: contrib/config-daemon.scm:345
+msgid "Disable client-server connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:357
+msgid "Disable peer discovery"
+msgstr ""
+
+#: contrib/config-daemon.scm:358
+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:369
+msgid "Disable advertising this peer to other peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:381
+msgid "Disable automatic establishment of connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:382
+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:393
+msgid "Disable advertising of other peers by this peer"
+msgstr ""
+
+#: contrib/config-daemon.scm:405 contrib/config-client.scm:189
+msgid "Client/Server Port"
+msgstr ""
+
+#: contrib/config-daemon.scm:406 contrib/config-client.scm:190
+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:417
+msgid "IPs allowed to use gnunetd server"
+msgstr ""
+
+#: contrib/config-daemon.scm:418
+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:430
+msgid "Limit connections to the specfied set of peers."
+msgstr ""
+
+#: contrib/config-daemon.scm:431
+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:442
+msgid "Prevent the specfied set of peers from connecting."
+msgstr ""
+
+#: contrib/config-daemon.scm:443
+msgid "If this option is not set, any peer is allowed to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:454
+msgid "Rarely used settings for peer advertisements and connections"
+msgstr ""
+
+#: contrib/config-daemon.scm:474
 #, fuzzy
 msgid "General settings"
 msgstr "Thiết lập khác"
 
-#: contrib/config-daemon.scm:245
+#: contrib/config-daemon.scm:475
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:268
+#: contrib/config-daemon.scm:501
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:270
+#: contrib/config-daemon.scm:503
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -225,11 +370,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:283
+#: contrib/config-daemon.scm:516
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:285
+#: contrib/config-daemon.scm:518
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -242,30 +387,44 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:300
+#: contrib/config-daemon.scm:533
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:301
+#: contrib/config-daemon.scm:534
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:318
+#: contrib/config-daemon.scm:551
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:319
+#: contrib/config-daemon.scm:552
 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:334
+#: contrib/config-daemon.scm:566
+msgid "Name of the MySQL database GNUnet should use"
+msgstr ""
+
+#: contrib/config-daemon.scm:578
+msgid "Configuration file that specifies the MySQL username and password"
+msgstr ""
+
+#: contrib/config-daemon.scm:590
+#, fuzzy
+msgid "Configuration of the MySQL database"
+msgstr ""
+"Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
+
+#: contrib/config-daemon.scm:609
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:336
+#: contrib/config-daemon.scm:611
 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 "
@@ -276,15 +435,15 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:350
+#: contrib/config-daemon.scm:625
 msgid "Size of the routing table."
 msgstr ""
 
-#: contrib/config-daemon.scm:363
+#: contrib/config-daemon.scm:638
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:365
+#: contrib/config-daemon.scm:640
 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"
@@ -296,20 +455,20 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:379
+#: contrib/config-daemon.scm:654
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:395
+#: contrib/config-daemon.scm:671
 #, fuzzy
 msgid "Applications"
 msgstr "Tùy _chọn"
 
-#: contrib/config-daemon.scm:411
+#: contrib/config-daemon.scm:687
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:412
+#: contrib/config-daemon.scm:688
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port. Note that if you have configured your NAT box to "
@@ -318,70 +477,263 @@
 "you directly."
 msgstr ""
 
-#: contrib/config-daemon.scm:423
+#: contrib/config-daemon.scm:699
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:435
+#: contrib/config-daemon.scm:711
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:450
+#: contrib/config-daemon.scm:726
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:462
+#: contrib/config-daemon.scm:738
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:477
+#: contrib/config-daemon.scm:753
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:489
+#: contrib/config-daemon.scm:765
+msgid "What is the maximum transfer unit for UDP?"
+msgstr ""
+
+#: contrib/config-daemon.scm:777 contrib/config-daemon.scm:818
+#: contrib/config-daemon.scm:870
+msgid "Which IPs are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:789
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:504
+#: contrib/config-daemon.scm:806
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:516
+#: contrib/config-daemon.scm:830
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:531
+#: contrib/config-daemon.scm:846
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:543
+#: contrib/config-daemon.scm:858
+msgid "What is the maximum transfer unit for UDP 6?"
+msgstr ""
+
+#: contrib/config-daemon.scm:882
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:558
+#: contrib/config-daemon.scm:899
+#, fuzzy
+msgid "Network interface"
+msgstr "Giao diện mạng:"
+
+#: contrib/config-daemon.scm:911
+msgid "External IP address (leave empty to try auto-detection)"
+msgstr ""
+
+#: contrib/config-daemon.scm:923
+msgid "External IPv6 address (leave empty to try auto-detection)"
+msgstr ""
+
+#: contrib/config-daemon.scm:935
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:580 contrib/config-client.scm:121
+#: contrib/config-daemon.scm:958
+msgid "What is the maximum number of bytes per second that we may receive?"
+msgstr ""
+
+#: contrib/config-daemon.scm:970
+msgid "What is the maximum number of bytes per second that we may send?"
+msgstr ""
+
+#: contrib/config-daemon.scm:982
+msgid "What is the maximum CPU load (percentage)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:984
+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:995
+msgid "What is the maximum CPU load (hard limit)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:996
+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:1007
+msgid "What is the maximum upstream bandwidth (hard limit)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1008
+msgid "Use 0 for no limit."
+msgstr ""
+
+#: contrib/config-daemon.scm:1019
+msgid "Should we disable random padding (experimental option)?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1031
+msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
+msgstr ""
+
+#: contrib/config-daemon.scm:1033
+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"
+"\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"
+"\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)."
+msgstr ""
+
+#: contrib/config-daemon.scm:1050
+#, fuzzy
+msgid "Network interface to monitor"
+msgstr "Giao diện mạng:"
+
+#: contrib/config-daemon.scm:1052
+msgid ""
+"\tFor which interfaces should we do accounting?  GNUnet will evaluate\n"
+"\t\tthe total traffic (not only the GNUnet related traffic) and adjust\n"
+"\t\tits bandwidth usage accordingly. You can currently only specify a\n"
+"\t\tsingle interface. GNUnet will also use this interface to determine\n"
+"\t\tthe IP to use. Typical values are eth0, ppp0, eth1, wlan0, etc.\n"
+"\t\t'ifconfig' will tell you what you have.  Never use 'lo', that just\n"
+"\t\twon't work.\n"
+"\t\tUnder Windows, specify the index number reported by\n"
+"\t\t \"gnunet-win-tool -n\"."
+msgstr ""
+
+#: contrib/config-daemon.scm:1071
+#, fuzzy
+msgid "Load management"
+msgstr "Sai tham số dòng lệnh.\n"
+
+#: contrib/config-daemon.scm:1095 contrib/config-client.scm:286
 msgid "Root node"
 msgstr ""
 
-#: src/transports/ip6.c:65 src/util/network/io.c:74
+#: contrib/config-client.scm:201
+msgid "On which machine runs gnunetd (for clients)"
+msgstr ""
+
+#: contrib/config-client.scm:202
+#, fuzzy
+msgid "This is equivalent to the -H option."
+msgstr "Hiển thị giá trị của tùy chọn"
+
+#: contrib/config-client.scm:214
+#, fuzzy
+msgid "General options"
+msgstr "Thiết lập khác"
+
+#: contrib/config-client.scm:231
+msgid "Do not add metadata listing the creation time for inserted content"
+msgstr ""
+
+#: contrib/config-client.scm:243
+msgid "Which non-default extractors should GNUnet use for keyword extractors"
+msgstr ""
+
+#: 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"
+"\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."
+msgstr ""
+
+#: contrib/config-client.scm:257
+#, fuzzy
+msgid "File-Sharing options"
+msgstr "Hiển thị mọi tùy chọn"
+
+#: contrib/config-client.scm:274
+#, fuzzy
+msgid "Full pathname of GNUnet client HOME directory"
+msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
+
+#: contrib/config-client.scm:275
+msgid "The directory for GNUnet files that belong to the user."
+msgstr ""
+
+#: src/transports/ip6.c:65 src/util/network/io.c:78
 #, fuzzy, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Không tìm thấy IP của máy '%s': %s\n"
 
-#: src/transports/ip6.c:109
+#: src/transports/ip6.c:110
 #, fuzzy, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Không tìm thấy '%s': %s\n"
 
-#: src/transports/ip6.c:154 src/transports/ip.c:353
+#: src/transports/ip6.c:155 src/transports/ip.c:354
 #, fuzzy, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr "Lấy địa chỉ IP (ngoài) của tôi không thành công!\n"
 
-#: src/transports/udp6.c:126 src/transports/udp.c:128
+#: src/transports/udp6.c:126 src/transports/udp.c:132
 #, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr "Không kết gắn được tới cổng UDP %d.\n"
@@ -390,7 +742,7 @@
 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:443 src/transports/udp.c:443
+#: src/transports/udp6.c:441 src/transports/udp.c:447
 #, 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"
@@ -438,13 +790,8 @@
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte loại bỏ bởi HTTP (đi ra)"
 
-#: src/transports/smtp.c:298
+#: src/transports/smtp.c:257
 #, fuzzy, c-format
-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"
-
-#: src/transports/smtp.c:420 src/transports/smtp.c:882
-#, fuzzy, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
 "under `%s'.\n"
@@ -452,46 +799,35 @@
 "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:493
+#: src/transports/smtp.c:334
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr "Nhận được thông báo bị hỏng qua SMTP (kích thước không tương ứng).\n"
 
-#: src/transports/smtp.c:588
+#: src/transports/smtp.c:433
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr "Không chỉ ra đầu lọc cho E-mail, không tạo được quảng cáo SMTP.\n"
 
-#: src/transports/smtp.c:595
+#: src/transports/smtp.c:440
 #, fuzzy, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "Đầu lọc SMTP quá dài, đổi thành '%s'\n"
 
-#: src/transports/smtp.c:769
+#: src/transports/smtp.c:546
 #, fuzzy, c-format
+msgid "Failed to initialize libesmtp: %s.\n"
+msgstr "Không chạy được SQLite.\n"
+
+#: src/transports/smtp.c:610
+#, fuzzy, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Gửi E-mail tới '%s' thất bại.\n"
 
-#: src/transports/smtp.c:820
+#: src/transports/smtp.c:678
 #, c-format
-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"
-
-#: src/transports/smtp.c:843
-#, c-format
-msgid ""
-"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
-msgstr ""
-
-#: src/transports/smtp.c:849
-#, fuzzy, c-format
-msgid "Failed to send `%s' request to SMTP server.\n"
-msgstr "Gửi yêu cầu HTTP tới máy '%s' không thành công: %s\n"
-
-#: src/transports/smtp.c:909
-#, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s đầu lọc %s (SMTP)"
 
-#: src/transports/smtp.c:938
+#: src/transports/smtp.c:706
 #, fuzzy, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
@@ -505,38 +841,38 @@
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Chạy dịch vụ truyền tải trên cổng %d thất bại.\n"
 
-#: src/transports/tcp.c:421
+#: src/transports/tcp.c:423
 msgid "# bytes received via TCP"
 msgstr "# byte nhận được qua TCP"
 
-#: src/transports/tcp.c:423
+#: src/transports/tcp.c:425
 msgid "# bytes sent via TCP"
 msgstr "# Byte gửi qua TCP"
 
-#: src/transports/tcp.c:425
+#: src/transports/tcp.c:427
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte loại đi bởi TCP (đi ra)"
 
-#: src/transports/udp.c:217
+#: src/transports/udp.c:222
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "UDP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/transports/udp.c:312
+#: src/transports/udp.c:314
 #, 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"
 
-#: src/transports/udp.c:449
+#: src/transports/udp.c:453
 msgid "# bytes received via UDP"
 msgstr "# byte nhận được qua UDP"
 
-#: src/transports/udp.c:451
+#: src/transports/udp.c:455
 msgid "# bytes sent via UDP"
 msgstr "# byte gửi qua UDP"
 
-#: src/transports/udp.c:453
+#: src/transports/udp.c:457
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte loại bỏ bởi UDP (đi ra)"
 
@@ -592,318 +928,287 @@
 msgid "`%s': unknown service: %s\n"
 msgstr "'%s': không rõ dịch vụ: %s\n"
 
-#: src/transports/tcp6.c:430
+#: src/transports/tcp6.c:432
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "# byte nhận được qua TCP"
 
-#: src/transports/tcp6.c:432
+#: src/transports/tcp6.c:434
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "# Byte gửi qua TCP"
 
-#: src/transports/tcp6.c:434
+#: src/transports/tcp6.c:436
 #, fuzzy
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr "# byte loại đi bởi TCP (đi ra)"
 
-#: src/transports/tcp_helper.c:182
+#: src/transports/tcp_helper.c:191
 #, 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"
 
-#: src/transports/tcp_helper.c:193
+#: src/transports/tcp_helper.c:202
 #, 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"
 
-#: src/transports/udp_helper.c:93
+#: 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"
 
-#: src/applications/dht/tools/dhttest2.c:50
+#: src/applications/dht/tools/dhttest2.c:45
 #: src/applications/session/sessiontest.c:42
 #: src/applications/stats/statistics.c:212
 #: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:101
-#: src/applications/gap/gaptest.c:52
+#: 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:128
-#: src/applications/gap/gaptest.c:318
+#: 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:140
+#: src/applications/dht/tools/dhttest2.c:173
 #: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:117
-#: src/applications/gap/gaptest.c:330
+#: 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:39
-msgid "query table called NAME"
-msgstr "hỏi bảng có tên NAME"
-
-#: src/applications/dht/tools/dht-query.c:41
-msgid "allow TIME ms to process each command"
-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:46
+#: src/applications/dht/tools/dht-query.c:53
 msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
 msgstr "Hỏi (nhận KEY, đặt KEY VALUE, xoá bỏ KEY VALUE) một bảng DHT."
 
-#: src/applications/dht/tools/dht-query.c:84
-#: src/applications/dht/tools/dht-join.c:85 src/util/getopt/setoption.c:133
-#: src/util/getopt/setoption.c:149
-#, fuzzy, c-format
-msgid "You must pass a number to the `%s' option.\n"
-msgstr "Người dùng phải đưa một số vào tùy chọn '%s'.\n"
+#: src/applications/dht/tools/dht-query.c:57
+#: src/applications/dht/tools/dht-join.c:59
+msgid "join table called NAME"
+msgstr "nhập bảng có tên TÊN"
 
-#: src/applications/dht/tools/dht-query.c:99
-#: src/applications/dht/tools/dht-join.c:108
-#: src/applications/chat/gnunet-chat.c:93
-#: src/applications/testbed/gnunet-testbed.c:125
-#: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/vpn/gnunet-vpn.c:118 src/util/getopt/getopt.c:1066
-#: src/setup/gnunet-setup.c:246
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Dùng --help để xem danh sách các tùy chọn.\n"
+#: src/applications/dht/tools/dht-query.c:60
+msgid "allow TIME ms to process each command"
+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:106
-msgid "No commands specified.\n"
-msgstr "Chưa chỉ ra câu lệnh.\n"
-
-#: src/applications/dht/tools/dht-query.c:173
-#: src/applications/dht/tools/dht-query.c:204
+#: src/applications/dht/tools/dht-query.c:130
+#: src/applications/dht/tools/dht-query.c:163
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr "'%s(%s,%s)' đã thành công\n"
 
-#: src/applications/dht/tools/dht-query.c:177
-#: src/applications/dht/tools/dht-query.c:208
+#: src/applications/dht/tools/dht-query.c:134
+#: src/applications/dht/tools/dht-query.c:167
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s,%s)' thất bại.\n"
 
-#: src/applications/dht/tools/dht-query.c:231
-#: src/applications/dht/tools/dht-join.c:211
+#: src/applications/dht/tools/dht-query.c:194
+#: src/applications/dht/tools/dht-join.c:165
 #, fuzzy, c-format
 msgid "No table name specified, using `%s'.\n"
 msgstr "Chưa chỉ ra tên bảng, đang dùng '%s'.\n"
 
-#: src/applications/dht/tools/dht-query.c:246
+#: src/applications/dht/tools/dht-query.c:210
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Kết nối tới gnunetd không thành công.\n"
 
-#: src/applications/dht/tools/dht-query.c:253
+#: src/applications/dht/tools/dht-query.c:220
 #, fuzzy, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr "Câu lệnh '%s' yêu cầu một tham số ('%s')\n"
 
-#: src/applications/dht/tools/dht-query.c:261
-#: src/applications/dht/tools/dht-query.c:271
+#: src/applications/dht/tools/dht-query.c:232
+#: src/applications/dht/tools/dht-query.c:246
 #, fuzzy, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr "Câu lệnh '%s' yêu cầu hai tham số ('%s' và '%s')\n"
 
-#: src/applications/dht/tools/dht-query.c:279
+#: src/applications/dht/tools/dht-query.c:258
 #, fuzzy, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Câu lệnh không hỗ trợ '%s'.  Đang thoát.\n"
 
-#: src/applications/dht/tools/dht_api.c:127
-#: src/applications/dht/tools/dht_api.c:236
-#: src/applications/dht/tools/dht_api.c:289
-#: src/applications/dht/tools/dht_api.c:343
-#: src/applications/dht/tools/dht_api.c:377
+#: src/applications/dht/tools/dht_api.c:148
+#: src/applications/dht/tools/dht_api.c:264
+#: src/applications/dht/tools/dht_api.c:321
+#: src/applications/dht/tools/dht_api.c:379
+#: src/applications/dht/tools/dht_api.c:415
 #, fuzzy, c-format
 msgid "Failed to send `%s'.  Closing connection.\n"
 msgstr "Gửi '%s' không thành công.  Đang đóng kết nối.\n"
 
-#: src/applications/dht/tools/dht_api.c:201
-#: src/applications/dht/tools/dht_api.c:253
-#: src/applications/dht/tools/dht_api.c:307
-#: src/applications/dht/tools/dht_api.c:360
+#: src/applications/dht/tools/dht_api.c:226
+#: src/applications/dht/tools/dht_api.c:282
+#: src/applications/dht/tools/dht_api.c:340
+#: src/applications/dht/tools/dht_api.c:397
 #, fuzzy, c-format
 msgid "Received invalid `%s' request (size %d)\n"
 msgstr "Nhận được yêu cầu '%s' sai (kích thước %d)\n"
 
-#: src/applications/dht/tools/dht_api.c:214
-#: src/applications/dht/tools/dht_api.c:266
-#: src/applications/dht/tools/dht_api.c:320
+#: src/applications/dht/tools/dht_api.c:241
+#: src/applications/dht/tools/dht_api.c:297
+#: src/applications/dht/tools/dht_api.c:355
 #, fuzzy, c-format
 msgid "Received invalid `%s' request (wrong table)\n"
 msgstr "Nhận được yêu cầu '%s' sai (sai bảng)\n"
 
-#: src/applications/dht/tools/dht_api.c:390
+#: src/applications/dht/tools/dht_api.c:429
 #, c-format
 msgid "Received unknown request type %d at %s:%d\n"
 msgstr "Nhận được yêu cầu không rõ dạng %d tại %s:%d\n"
 
-#: src/applications/dht/tools/dht_api.c:430
+#: src/applications/dht/tools/dht_api.c:473
 msgid "This client already participates in the given DHT!\n"
 msgstr "Máy khách này đã tham gia trong DHT đưa ra!\n"
 
-#: src/applications/dht/tools/dht_api.c:498
+#: src/applications/dht/tools/dht_api.c:548
 msgid "Cannot leave DHT: table not known!\n"
 msgstr "Không rời bỏ được DHT: bảng không biết!\n"
 
-#: src/applications/dht/tools/dht_api.c:520
+#: src/applications/dht/tools/dht_api.c:571
 #, fuzzy, c-format
 msgid "gnunetd signaled error in response to `%s' message\n"
 msgstr "gnunetd đưa tín hiệu lỗi trong câu trả lời tới thông báo '%s'\n"
 
-#: src/applications/dht/tools/dht_api.c:525
+#: src/applications/dht/tools/dht_api.c:576
 #, fuzzy, c-format
 msgid "Failed to receive response to `%s' message from gnunetd\n"
 msgstr "Nhận câu trả lời tới thông báo '%s' không thành công từ gnunetd\n"
 
-#: src/applications/dht/tools/dht_api.c:530
+#: src/applications/dht/tools/dht_api.c:581
 #, fuzzy, c-format
 msgid "Failed to send `%s' message to gnunetd\n"
 msgstr "Gửi thông báo '%s' tới gnunetd không thành công\n"
 
-#: src/applications/dht/tools/dht_api.c:622
+#: src/applications/dht/tools/dht_api.c:677
 #, fuzzy, c-format
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Câu trả lời không mong đợi tới thao tác '%s'.\n"
 
-#: src/applications/dht/tools/dht-join.c:43
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "cho phép SIZE byte bộ nhớ cho bảng nội bộ"
-
-#: src/applications/dht/tools/dht-join.c:45
-msgid "join table called NAME"
-msgstr "nhập bảng có tên TÊN"
-
-#: src/applications/dht/tools/dht-join.c:51
+#: src/applications/dht/tools/dht-join.c:52
 msgid "Join a DHT."
 msgstr "Nhập một DHT."
 
-#: src/applications/dht/tools/dht-join.c:115
-msgid "Superflous arguments (ignored).\n"
-msgstr "Tham số thừa (lờ đi).\n"
+#: src/applications/dht/tools/dht-join.c:56
+msgid "allow SIZE bytes of memory for the local table"
+msgstr "cho phép SIZE byte bộ nhớ cho bảng nội bộ"
 
-#: src/applications/dht/tools/dht-join.c:131
+#: src/applications/dht/tools/dht-join.c:78
 #, fuzzy, c-format
 msgid "Call to `%s' returns %d.\n"
 msgstr "Gọi tới '%s' trả lại %d.\n"
 
-#: src/applications/dht/tools/dht-join.c:132
+#: src/applications/dht/tools/dht-join.c:79
 #, fuzzy, c-format
 msgid "Call to `%s' with key `%s'.\n"
 msgstr "Gọi tới '%s' với chìa khóa '%s'.\n"
 
-#: src/applications/dht/tools/dht-join.c:133
+#: src/applications/dht/tools/dht-join.c:80
 #, fuzzy, c-format
 msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
 msgstr "Gọi tới '%s' với giá trị '%.*s' (%d byte).\n"
 
-#: src/applications/dht/tools/dht-join.c:236
+#: src/applications/dht/tools/dht-join.c:189
 msgid "Error joining DHT.\n"
 msgstr "Lỗi nhập DHT.\n"
 
-#: src/applications/dht/tools/dht-join.c:243
+#: src/applications/dht/tools/dht-join.c:196
 #, c-format
 msgid "Joined DHT.  Press CTRL-C to leave.\n"
 msgstr "Đã nhập DHT.  Nhấn CTRL-C để dời khỏi.\n"
 
-#: src/applications/dht/tools/dht-join.c:250
+#: src/applications/dht/tools/dht-join.c:205
 msgid "Error leaving DHT.\n"
 msgstr "Lỗi dời khỏi DHT.\n"
 
-#: src/applications/dht/module/dht.c:946
+#: src/applications/dht/module/dht.c:952
 #, fuzzy, c-format
 msgid "Malformed optional field `%s' received from peer `%s'.\n"
 msgstr "Nhận được vùng không bắt buộc '%s' bị hỏng từ dầu peer '%s'.\n"
 
-#: src/applications/dht/module/dht.c:973
+#: src/applications/dht/module/dht.c:979
 #, fuzzy, c-format
 msgid "Could not find peer `%s' in routing table!\n"
 msgstr "Không tìm thấy đầu peer '%s' trong bảng định tuyến!\n"
 
-#: src/applications/dht/module/dht.c:1120
-#: src/applications/dht/module/dht.c:1135
+#: src/applications/dht/module/dht.c:1126
+#: src/applications/dht/module/dht.c:1141
 #, fuzzy, c-format
 msgid "Received malformed response to `%s' from peer `%s'.\n"
 msgstr "Nhận được câu trả lời không đúng tới '%s' từ đầu peer '%s'.\n"
 
-#: src/applications/dht/module/dht.c:1447
+#: src/applications/dht/module/dht.c:1453
 #, fuzzy, c-format
 msgid "Invalid response to `%s' from peer `%s'.\n"
 msgstr "Câu trả lời không đúng tới '%s' từ đầu peer '%s'.\n"
 
-#: src/applications/dht/module/dht.c:1603
-#: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1290
+#: src/applications/dht/module/dht.c:1611
+#: src/applications/dht/module/dht.c:2351
+#: src/applications/dht/module/dht.c:2628 src/applications/rpc/rpc.c:1291
 #, fuzzy, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr "đã gọi '%s' với thời gian chờ lớn hơn 1 giờ (lỗi bug?)\n"
 
-#: src/applications/dht/module/dht.c:1793
+#: src/applications/dht/module/dht.c:1803
 #, fuzzy, c-format
 msgid "Invalid response to `%s'.\n"
 msgstr "Câu trả lời không đúng tới '%s'.\n"
 
-#: src/applications/dht/module/dht.c:1993
+#: src/applications/dht/module/dht.c:2003
 #, fuzzy, c-format
 msgid "Malformed response to `%s' on master table.\n"
 msgstr "Câu trả lời bị hỏng tới '%s' trên bảng chính.\n"
 
-#: src/applications/dht/module/dht.c:2207
-#: src/applications/dht/module/dht.c:2507
+#: src/applications/dht/module/dht.c:2217
+#: src/applications/dht/module/dht.c:2522
 #, fuzzy, c-format
 msgid "Invalid response to `%s' from `%s'\n"
 msgstr "Câu trả lời không đúng tới '%s' từ '%s'\n"
 
-#: src/applications/dht/module/dht.c:2881
-#: src/applications/dht/module/dht.c:3021
-#: src/applications/dht/module/dht.c:3148
-#: src/applications/dht/module/dht.c:3282
+#: src/applications/dht/module/dht.c:2899
+#: src/applications/dht/module/dht.c:3041
+#: src/applications/dht/module/dht.c:3182
+#: src/applications/dht/module/dht.c:3330
 #, fuzzy, c-format
 msgid "Received invalid RPC `%s'.\n"
 msgstr "Nhận được RPC sai '%s'.\n"
 
-#: src/applications/dht/module/dht.c:3160
-#: src/applications/dht/module/dht.c:3296
+#: src/applications/dht/module/dht.c:3201
+#: src/applications/dht/module/dht.c:3351
 #, fuzzy, c-format
 msgid "RPC for `%s' received for table that we do not participate in!\n"
 msgstr "Nhận được RPC cho '%s' cho bảng chúng ta không có phần trong đó!\n"
 
-#: src/applications/dht/module/cs.c:446
+#: src/applications/dht/module/cs.c:449
 #, fuzzy, c-format
 msgid "`%s' failed: table not found!\n"
 msgstr "'%s' không thành công: không tìm thấy bảng!\n"
 
-#: src/applications/dht/module/cs.c:466
+#: src/applications/dht/module/cs.c:469
 #, fuzzy, c-format
 msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr "'%s' không thành công.  Đang ngắt kết nối tới máy khách.\n"
 
-#: src/applications/dht/module/cs.c:542
+#: src/applications/dht/module/cs.c:546
 msgid "sendAck failed.  Terminating connection to client.\n"
 msgstr "Gửi sendAck không thành công.  Ngắt kết nối tới máy khách.\n"
 
-#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
-#: src/applications/dht/module/cs.c:688
+#: src/applications/dht/module/cs.c:666 src/applications/dht/module/cs.c:684
+#: src/applications/dht/module/cs.c:693
 #, fuzzy, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "'%s' không thành công. Ngắt kết nối tới máy khách.\n"
 
-#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
+#: src/applications/dht/module/cs.c:814 src/applications/dht/module/cs.c:867
 #, fuzzy, c-format
 msgid "Failed to deliver `%s' message.\n"
 msgstr "Phân phát tin nhắn '%s' không thành công.\n"
@@ -942,6 +1247,14 @@
 msgid "Start GNUnet chat client."
 msgstr "Chạy máy khách chát của GNUnet."
 
+#: src/applications/chat/gnunet-chat.c:93
+#: src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:546 src/util/getopt/getopt.c:1067
+#: src/setup/gnunet-setup.c:283
+#, c-format
+msgid "Use --help to get a list of options.\n"
+msgstr "Dùng --help để xem danh sách các tùy chọn.\n"
+
 #: src/applications/chat/gnunet-chat.c:151
 msgid "Could not connect to gnunetd.\n"
 msgstr "Không kết nối được tới gnunetd.\n"
@@ -959,74 +1272,79 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "Không gửi được thông báo tới gnunetd\n"
 
-#: src/applications/advertising/advertising.c:162
+#: src/applications/advertising/advertising.c:168
 #, fuzzy, c-format
 msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr "Thông báo HELO từ '%s' bị sai (sai chữ ký). Đang bỏ đi.\n"
 
-#: src/applications/advertising/advertising.c:168
+#: src/applications/advertising/advertising.c:175
 #, fuzzy
 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:177
+#: src/applications/advertising/advertising.c:182
+#, c-format
+msgid "hello transport verification failed (%u).\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:192
 #, fuzzy, c-format
 msgid "hello advertisement for protocol %d received.\n"
 msgstr "Nhận được quảng cáo HELO cho giao thức %d.\n"
 
-#: src/applications/advertising/advertising.c:297
+#: src/applications/advertising/advertising.c:325
 #, fuzzy
 msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr "Không gửi được các HELO+PING, đầy bộ đệm ping.\n"
 
-#: src/applications/advertising/advertising.c:310
+#: src/applications/advertising/advertising.c:338
 #, fuzzy, c-format
 msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr "'%s' thất bại (%d, %u). Sẽ không gửi PING.\n"
 
-#: src/applications/advertising/advertising.c:467
+#: src/applications/advertising/advertising.c:495
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Đang quảng cáo giao thông %d tới các đầu peer đã chọn.\n"
 
-#: src/applications/advertising/advertising.c:474
+#: src/applications/advertising/advertising.c:502
 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:580
+#: src/applications/advertising/advertising.c:608
 #, fuzzy, c-format
 msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr "Đang xóa bỏ HELO từ đầu peer '%s' (đã hết hạn %dgiây).\n"
 
-#: src/applications/advertising/advertising.c:760
+#: src/applications/advertising/advertising.c:788
 msgid "# Peer advertisements received"
 msgstr "# Nhận được quảng cáo của đầu peer"
 
-#: src/applications/advertising/advertising.c:761
+#: src/applications/advertising/advertising.c:789
 msgid "# Self advertisments transmitted"
 msgstr "# Đã truyền tải tự quảng cáo"
 
-#: src/applications/advertising/advertising.c:762
+#: src/applications/advertising/advertising.c:790
 msgid "# Foreign advertisements forwarded"
 msgstr "# Đã chuyển tiếp quàng cáo ngoài"
 
-#: src/applications/advertising/advertising.c:764
+#: src/applications/advertising/advertising.c:792
 #: src/applications/pingpong/pingpong.c:488
 msgid "# plaintext PING messages sent"
 msgstr "# đã gửi các thông báo PING dạng văn bản thông thường"
 
-#: src/applications/advertising/advertising.c:768
-#: src/applications/session/connect.c:779
+#: src/applications/advertising/advertising.c:796
+#: src/applications/session/connect.c:800
 #, 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"
 
-#: src/applications/advertising/advertising.c:785
+#: src/applications/advertising/advertising.c:813
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
@@ -1091,23 +1409,29 @@
 "'%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:45
-#: src/applications/sqstore_sqlite/sqlite.c:52
-#: src/applications/sqstore_mysql/mysql.c:137
-#: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:389
-#: src/applications/sqstore_mysql/mysql.c:728
-#: src/applications/sqstore_mysql/mysql.c:743
-#: src/applications/sqstore_mysql/mysql.c:752
-#: src/applications/sqstore_mysql/mysql.c:776
-#: src/applications/sqstore_mysql/mysql.c:786
-#: src/applications/sqstore_mysql/mysql.c:840
-#: src/applications/sqstore_mysql/mysql.c:925
-#: src/applications/sqstore_mysql/mysql.c:935
-#: src/applications/sqstore_mysql/mysql.c:1007
-#: src/applications/sqstore_mysql/mysql.c:1016
-#: src/applications/sqstore_mysql/mysql.c:1056
-#: src/applications/sqstore_mysql/mysql.c:1070
+#: src/applications/sqstore_sqlite/sqlite.c:46
+#: src/applications/sqstore_sqlite/sqlite.c:53
+#: src/applications/sqstore_mysql/mysql.c:138
+#: src/applications/sqstore_mysql/mysql.c:145
+#: src/applications/sqstore_mysql/mysql.c:423
+#: src/applications/sqstore_mysql/mysql.c:765
+#: src/applications/sqstore_mysql/mysql.c:781
+#: src/applications/sqstore_mysql/mysql.c:791
+#: src/applications/sqstore_mysql/mysql.c:816
+#: src/applications/sqstore_mysql/mysql.c:827
+#: src/applications/sqstore_mysql/mysql.c:884
+#: src/applications/sqstore_mysql/mysql.c:971
+#: src/applications/sqstore_mysql/mysql.c:982
+#: src/applications/sqstore_mysql/mysql.c:1046
+#: src/applications/sqstore_mysql/mysql.c:1062
+#: src/applications/sqstore_mysql/mysql.c:1072
+#: src/applications/sqstore_mysql/mysql.c:1096
+#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/sqstore_mysql/mysql.c:1119
+#: src/applications/sqstore_mysql/mysql.c:1182
+#: src/applications/sqstore_mysql/mysql.c:1194
+#: src/applications/sqstore_mysql/mysql.c:1242
+#: src/applications/sqstore_mysql/mysql.c:1257
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
@@ -1116,80 +1440,81 @@
 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"
 
-#: src/applications/sqstore_sqlite/sqlite.c:158
+#: src/applications/sqstore_sqlite/sqlite.c:195
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không chạy được SQLite.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:307
-#: src/applications/sqstore_sqlite/sqlite.c:327
-#: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:803
+#: src/applications/sqstore_sqlite/sqlite.c:356
+#: src/applications/sqstore_sqlite/sqlite.c:377
+#: src/applications/sqstore_mysql/mysql.c:260
+#: src/applications/sqstore_mysql/mysql.c:845
+#: src/applications/sqstore_mysql/mysql.c:1134
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:308
-#: src/applications/sqstore_sqlite/sqlite.c:328
+#: src/applications/sqstore_sqlite/sqlite.c:357
+#: src/applications/sqstore_sqlite/sqlite.c:378
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1177
-#: src/applications/sqstore_mysql/mysql.c:1182
+#: src/applications/sqstore_sqlite/sqlite.c:1213
+#: src/applications/sqstore_mysql/mysql.c:1318
 #, fuzzy
 msgid "# bytes in datastore"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/applications/session/connect.c:221
+#: src/applications/session/connect.c:225
 #, fuzzy, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Không kiểm tra được chìa khóa buổi làm việc từ đầu peer '%s'.\n"
 
-#: src/applications/session/connect.c:258
+#: src/applications/session/connect.c:263
 msgid "Cannot encrypt sessionkey, other peer 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"
 
-#: src/applications/session/connect.c:517
+#: src/applications/session/connect.c:533
 #, 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:540
+#: src/applications/session/connect.c:558
 #, 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:550
+#: src/applications/session/connect.c:568
 #, 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:608
+#: src/applications/session/connect.c:626
 msgid ""
 "Error parsing encrypted session key, 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:619
+#: src/applications/session/connect.c:637
 #, c-format
 msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:768
+#: src/applications/session/connect.c:789
 msgid "# session keys sent"
 msgstr "# đã gửi các phím buổi làm việc"
 
-#: src/applications/session/connect.c:770
+#: src/applications/session/connect.c:791
 msgid "# session keys rejected"
 msgstr "# đã nhả ra các phím buổi làm việc"
 
-#: src/applications/session/connect.c:772
+#: src/applications/session/connect.c:793
 msgid "# session keys accepted"
 msgstr "# đã chấp nhận các phím buổi làm việc"
 
-#: src/applications/session/connect.c:774
+#: src/applications/session/connect.c:795
 msgid "# sessions established"
 msgstr "# đã thiết lập buổi làm việc"
 
@@ -1221,56 +1546,52 @@
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s - async RPC %s:%p không đăng ký được: không tìm thấy\n"
 
-#: src/applications/rpc/rpc.c:878 src/applications/rpc/rpc.c:1011
-#: src/applications/rpc/rpc.c:1100
+#: src/applications/rpc/rpc.c:879 src/applications/rpc/rpc.c:1012
+#: src/applications/rpc/rpc.c:1101
 #, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr "Nhận được thông báo sai của dạng %u.  Đang bỏ đi.\n"
 
-#: src/applications/rpc/rpc.c:945
+#: src/applications/rpc/rpc.c:946
 #, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "Đang bỏ đi yêu cầu RPC %u: thông báo hỏng.\n"
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/rpc/rpc.c:1415
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "Chưa bỏ đăng ký RPC: %s: %p\n"
 
-#: src/applications/rpc/rpc.c:1441
+#: src/applications/rpc/rpc.c:1442
 #, fuzzy, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1462
+#: src/applications/rpc/rpc.c:1463
 #, fuzzy, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Chạy dịch vụ '%s' không thành công.\n"
 
-#: src/applications/rpc/rpc.c:1519
+#: src/applications/rpc/rpc.c:1520
 msgid "RPC async reply invalid.\n"
 msgstr "Câu trả lời async của RPC sai.\n"
 
-#: src/applications/rpc/rpc.c:1591
+#: src/applications/rpc/rpc.c:1592
 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:224
-#: src/applications/sqstore_mysql/mysql.c:804
+#: src/applications/sqstore_mysql/mysql.c:261
+#: src/applications/sqstore_mysql/mysql.c:846
+#: src/applications/sqstore_mysql/mysql.c:1135
 msgid "mysql datastore"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1110
+#: src/applications/sqstore_mysql/mysql.c:1348
 #, fuzzy, c-format
-msgid "Query `%s' had no results.\n"
-msgstr "Câu hỏi '%s' không có kết quả.\n"
-
-#: src/applications/sqstore_mysql/mysql.c:1212
-#, 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:1230
+#: src/applications/sqstore_mysql/mysql.c:1371
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -1281,23 +1602,23 @@
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "Thử khả năng cho '%s' không thành công tại %s: %d.\n"
 
-#: src/applications/datastore/datastore.c:143
+#: src/applications/datastore/datastore.c:145
 #, fuzzy, c-format
 msgid "Database failed to delete `%s'.\n"
 msgstr "Cơ sở dữ liệu xóa %s không thành công.\n"
 
-#: src/applications/datastore/datastore.c:358
-#: src/applications/datastore/datastore.c:454
+#: src/applications/datastore/datastore.c:368
+#: src/applications/datastore/datastore.c:465
 #, 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/identity/hostkey.c:109
+#: src/applications/identity/hostkey.c:121
 #, 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:139
+#: src/applications/identity/hostkey.c:155
 #, fuzzy, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
@@ -1305,11 +1626,11 @@
 "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:147
+#: src/applications/identity/hostkey.c:163
 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:160
+#: src/applications/identity/hostkey.c:176
 msgid "Done creating hostkey.\n"
 msgstr "Đã tạo xong chìa khóa máy.\n"
 
@@ -1332,19 +1653,19 @@
 msgid "Still no peers found in `%s'!\n"
 msgstr "Không hủy nạp đúng được dịch vụ '%s'!\n"
 
-#: src/applications/identity/identity.c:684
-#: src/applications/identity/identity.c:705
+#: 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:758
+#: src/applications/identity/identity.c:759
 #, fuzzy, c-format
 msgid "Signature failed verification: 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"
 
-#: src/applications/identity/identity.c:767
+#: src/applications/identity/identity.c:768
 #, fuzzy
 msgid "Signature failed verification: signature invalid.\n"
 msgstr "Thông báo HELO sai (sai chữ ký).\n"
@@ -1545,74 +1866,75 @@
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/transport/transport.c:136
+#: src/applications/transport/transport.c:140
 #, c-format
 msgid ""
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:183
+#: src/applications/transport/transport.c:187
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:278
+#: src/applications/transport/transport.c:282
 #, 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:366
+#: src/applications/transport/transport.c:370
 #, 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:423
+#: src/applications/transport/transport.c:427
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:596
+#: src/applications/transport/transport.c:601
 #, 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:616
+#: src/applications/transport/transport.c:621
 #, 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:626
+#: src/applications/transport/transport.c:631
 #, 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:643
+#: src/applications/transport/transport.c:658
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "(Các) truyền tải có: %s\n"
 
-#: src/applications/transport/transport.c:654
+#: src/applications/transport/transport.c:671
 #, fuzzy, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là một đầu peer '%s'.\n"
 
-#: src/applications/fragmentation/fragmentation.c:559
+#: src/applications/fragmentation/fragmentation.c:566
 msgid "# messages defragmented"
 msgstr "# thông báo đã gom lại"
 
-#: src/applications/fragmentation/fragmentation.c:560
+#: src/applications/fragmentation/fragmentation.c:567
 msgid "# messages fragmented"
 msgstr "# thông báo đã phân mảnh"
 
-#: src/applications/fragmentation/fragmentation.c:561
+#: src/applications/fragmentation/fragmentation.c:568
 msgid "# fragments discarded"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/applications/fragmentation/fragmentation.c:573
+#: src/applications/fragmentation/fragmentation.c:580
 #, fuzzy, c-format
 msgid "`%s' registering handler %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d\n"
 
 #: src/applications/stats/gnunet-stats.c:90
+#: src/applications/vpn/gnunet-vpn.c:52
 msgid "Print statistics about GNUnet operations."
 msgstr "In thống kê về các thao tác của GNUnet."
 
@@ -1620,15 +1942,16 @@
 msgid "prints supported protocol messages"
 msgstr "in các thông báo giao thức hỗ trợ"
 
-#: src/applications/stats/gnunet-stats.c:137
-#: src/applications/tbench/gnunet-tbench.c:136
-#: src/applications/tracekit/gnunet-tracekit.c:319
-#: src/applications/template/gnunet-template.c:101
+#: src/applications/stats/gnunet-stats.c:130
+#: src/applications/tbench/gnunet-tbench.c:128
+#: src/applications/tracekit/gnunet-tracekit.c:312
+#: src/applications/template/gnunet-template.c:94
+#: src/applications/vpn/gnunet-vpn.c:145
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr "Lỗi thiết lập kết nối với gnunetd.\n"
 
-#: src/applications/stats/gnunet-stats.c:156
+#: src/applications/stats/gnunet-stats.c:149
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr "Lỗi đọc thông tin từ gnunetd.\n"
@@ -1666,109 +1989,109 @@
 msgid "keeps statistics about gnunetd's operation"
 msgstr "In thống kê về các thao tác của GNUnet."
 
-#: src/applications/tbench/gnunet-tbench.c:65
-#: src/applications/tracekit/gnunet-tracekit.c:54
+#: src/applications/tbench/gnunet-tbench.c:64
+#: src/applications/tracekit/gnunet-tracekit.c:53
 msgid "Start GNUnet transport benchmarking tool."
 msgstr "Chạy công cụ kiểm tra truyền tải của GNUnet."
 
-#: src/applications/tbench/gnunet-tbench.c:67
+#: src/applications/tbench/gnunet-tbench.c:66
 msgid "output in gnuplot format"
 msgstr "kết quả ở dạng gnuplot"
 
-#: src/applications/tbench/gnunet-tbench.c:71
+#: src/applications/tbench/gnunet-tbench.c:70
 msgid "number of iterations"
 msgstr "số lần làm lại"
 
-#: src/applications/tbench/gnunet-tbench.c:75
+#: src/applications/tbench/gnunet-tbench.c:74
 msgid "number of messages to use per iteration"
 msgstr "số thông báo dùng cho mỗi lần làm lại"
 
-#: src/applications/tbench/gnunet-tbench.c:78
+#: src/applications/tbench/gnunet-tbench.c:77
 msgid "receiver host identifier (ENC file name)"
 msgstr "trình nhận tên máy (tên tập tin ENC)"
 
-#: src/applications/tbench/gnunet-tbench.c:81
+#: src/applications/tbench/gnunet-tbench.c:80
 msgid "message size"
 msgstr "kích thước thông báo"
 
-#: src/applications/tbench/gnunet-tbench.c:84
+#: src/applications/tbench/gnunet-tbench.c:83
 msgid "sleep for SPACE ms after each a message block"
 msgstr "ngủ SPACE miligiây sau mỗi khối tin nhắn"
 
-#: src/applications/tbench/gnunet-tbench.c:87
+#: src/applications/tbench/gnunet-tbench.c:86
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
 
-#: src/applications/tbench/gnunet-tbench.c:91
+#: src/applications/tbench/gnunet-tbench.c:90
 msgid "number of messages in a message block"
 msgstr "số thông báo trong một khối tin nhắn"
 
-#: src/applications/tbench/gnunet-tbench.c:153
+#: src/applications/tbench/gnunet-tbench.c:144
 #, c-format
 msgid "You must specify a receiver!\n"
 msgstr "Người dùng phải chỉ ra một trình nhận!\n"
 
-#: src/applications/tbench/gnunet-tbench.c:162
+#: src/applications/tbench/gnunet-tbench.c:152
 #, fuzzy, c-format
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr "Chỉ ra ID của trình nhận sai ('%s' không phải là một tên đúng).\n"
 
-#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tbench/gnunet-tbench.c:182
 #, c-format
 msgid "Time:\n"
 msgstr "Thời gian:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:190
+#: src/applications/tbench/gnunet-tbench.c:183
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr "\tmax      %llu miligiây\n"
 
-#: src/applications/tbench/gnunet-tbench.c:192
+#: src/applications/tbench/gnunet-tbench.c:185
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr "\tmin      %llu miligiây\n"
 
-#: src/applications/tbench/gnunet-tbench.c:194
+#: src/applications/tbench/gnunet-tbench.c:187
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr "\tý nghĩa   %8.4f miligiây\n"
 
-#: src/applications/tbench/gnunet-tbench.c:196
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr "\tkhác nhau %8.4f miligiây\n"
 
-#: src/applications/tbench/gnunet-tbench.c:199
+#: src/applications/tbench/gnunet-tbench.c:192
 #, c-format
 msgid "Loss:\n"
 msgstr "Mất:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:200
+#: src/applications/tbench/gnunet-tbench.c:193
 #, c-format
 msgid "\tmax      %u\n"
 msgstr "\tmax      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:202
+#: src/applications/tbench/gnunet-tbench.c:195
 #, c-format
 msgid "\tmin      %u\n"
 msgstr "\tmin      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:204
+#: src/applications/tbench/gnunet-tbench.c:197
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr "\tý nghĩa   %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:206
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr "\tkhác nhau %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:215
+#: src/applications/tbench/gnunet-tbench.c:208
 #, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr "Định dạng kết quả không rõ, điều này không nên xảy ra.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:219
+#: src/applications/tbench/gnunet-tbench.c:212
 #, c-format
 msgid ""
 "\n"
@@ -1778,25 +2101,25 @@
 "Không nhận được thông báo từ gnunetd. gnunetd đang chạy?\n"
 
 #: src/applications/tbench/tbenchtest.c:51
-#: src/applications/tbench/tbenchtest_udp.c: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:78
-#: src/applications/tbench/tbenchtest_udp.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:83
-#: src/applications/tbench/tbenchtest_udp.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:89
-#: src/applications/tbench/tbenchtest_udp.c:89
+#: src/applications/tbench/tbenchtest_udp.c:88
 #, c-format
 msgid ""
 "\n"
@@ -1806,34 +2129,34 @@
 "Không nhận thành công câu trả lời từ gnunetd.\n"
 
 #: src/applications/tbench/tbenchtest.c:211
-#: src/applications/tbench/tbenchtest_udp.c:211
+#: src/applications/tbench/tbenchtest_udp.c:210
 #, c-format
 msgid "Running benchmark...\n"
 msgstr "Đang chạy thử mức độ (benchmark)...\n"
 
-#: src/applications/tbench/tbench.c:460
+#: src/applications/tbench/tbench.c:420
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:49
+#: src/applications/tracekit/gnunet-tracekit.c:48
 msgid "probe network to the given DEPTH"
 msgstr "thử mạng tới độ sâu DEPTH đưa ra"
 
-#: src/applications/tracekit/gnunet-tracekit.c:52
+#: 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"
 
-#: src/applications/tracekit/gnunet-tracekit.c:58
+#: src/applications/tracekit/gnunet-tracekit.c:57
 msgid "use PRIO for the priority of the trace request"
 msgstr "dùng PRIO làm ưu tiên của yêu cầu theo dấu vết trace"
 
-#: src/applications/tracekit/gnunet-tracekit.c:62
+#: src/applications/tracekit/gnunet-tracekit.c:61
 msgid "wait DELAY seconds for replies"
 msgstr "chờ các câu trả lời DELAY giây"
 
-#: src/applications/tracekit/gnunet-tracekit.c:116
+#: src/applications/tracekit/gnunet-tracekit.c:115
 #, c-format
 msgid ""
 "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
@@ -1841,27 +2164,27 @@
 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
+#: src/applications/tracekit/gnunet-tracekit.c:162
 #, fuzzy, c-format
 msgid "`%s' is not connected to any peer.\n"
 msgstr "'%s' chưa kết nối tới bất kỳ đầu peer nào.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:197
+#: src/applications/tracekit/gnunet-tracekit.c:196
 #, fuzzy, c-format
 msgid "`%s' connected to `%s'.\n"
 msgstr "'%s' kết nối tới '%s'.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:212
+#: src/applications/tracekit/gnunet-tracekit.c:211
 #, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr "Định dạng sai. Dùng 0 cho người dùng dễ đọc, 1 cho chấm\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:235
+#: src/applications/tracekit/gnunet-tracekit.c:234
 #, fuzzy, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr "Đầu peer '%s' chưa báo cáo lại.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:350
+#: src/applications/tracekit/gnunet-tracekit.c:342
 msgid "Could not send request to gnunetd.\n"
 msgstr "Không gửi được yêu cầu tới gnunetd.\n"
 
@@ -2019,35 +2342,35 @@
 msgid "allows clients to determine gnunetd's configuration"
 msgstr "Không có ứng dụng định nghĩa trong cấu hình!\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:71
-#: src/applications/fs/tools/gnunet-insert.c:224
-#: src/applications/fs/tools/gnunet-search.c:129
-#: src/applications/fs/tools/gnunet-download.c:57
+#: src/applications/fs/tools/gnunet-pseudonym.c:70
+#: src/applications/fs/tools/gnunet-insert.c:229
+#: src/applications/fs/tools/gnunet-search.c:140
+#: src/applications/fs/tools/gnunet-download.c:65
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt LEVEL (CẤPĐỘ) mong muốn của người gửi giấu tên"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:74
+#: src/applications/fs/tools/gnunet-pseudonym.c:73
 msgid "automate creation of a namespace by starting a collection"
 msgstr "tự động tạo một không gian tên bằng cách bắt đầu một thu thập"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:78
+#: src/applications/fs/tools/gnunet-pseudonym.c:77
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "tạo một tên hiệu mới dưới NICKNAME đưa ra"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:81
+#: src/applications/fs/tools/gnunet-pseudonym.c:80
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "xóa tên hiệu với TÊNNICK đưa ra"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:84
+#: src/applications/fs/tools/gnunet-pseudonym.c:83
 msgid "end automated building of a namespace (ends collection)"
 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:86
-#: src/applications/fs/tools/gnunet-search.c:132
+#: src/applications/fs/tools/gnunet-pseudonym.c:85
+#: src/applications/fs/tools/gnunet-search.c:143
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
 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
+#: src/applications/fs/tools/gnunet-pseudonym.c:88
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
@@ -2055,12 +2378,12 @@
 "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
+#: src/applications/fs/tools/gnunet-pseudonym.c:91
 #, fuzzy
 msgid "specify metadata describing the namespace or collection"
 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
+#: src/applications/fs/tools/gnunet-pseudonym.c:94
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
@@ -2068,11 +2391,11 @@
 "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
+#: src/applications/fs/tools/gnunet-pseudonym.c:97
 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
+#: src/applications/fs/tools/gnunet-pseudonym.c:100
 msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
@@ -2080,66 +2403,66 @@
 "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
+#: src/applications/fs/tools/gnunet-pseudonym.c:103
 msgid "set the rating of a namespace"
 msgstr "đặt xếp hạng của một không gian tên"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:138
+#: src/applications/fs/tools/gnunet-pseudonym.c:137
 #, fuzzy, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "Không gian tên '%s' có xếp hạng %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:142
+#: src/applications/fs/tools/gnunet-pseudonym.c:141
 #, fuzzy, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr "Không gian tên '%s' (%s) có xếp hạng %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:178
+#: src/applications/fs/tools/gnunet-pseudonym.c:177
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr "\tXếp hạng (sau cập nhật): %d\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:221
+#: src/applications/fs/tools/gnunet-pseudonym.c:211
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Dừng thu thập.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:223
+#: src/applications/fs/tools/gnunet-pseudonym.c:213
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr "Dừng thu thập không thành công (không hoạt động?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:231
+#: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, fuzzy, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Đã xóa tên hiệu '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:235
+#: src/applications/fs/tools/gnunet-pseudonym.c:225
 #, fuzzy, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr "Lỗi xóa tên hiệu '%s' (không tồn tại?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:254
+#: src/applications/fs/tools/gnunet-pseudonym.c:244
 #, fuzzy, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Bắt đầu thu thập '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:257
+#: src/applications/fs/tools/gnunet-pseudonym.c:247
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Bắt đầu thu thập không thành công.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:299
+#: src/applications/fs/tools/gnunet-pseudonym.c:289
 #, fuzzy, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr "Không tạo được không gian tên '%s' (đã có?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:304
+#: src/applications/fs/tools/gnunet-pseudonym.c:294
 #, fuzzy, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr "Đã tạo không gian tên '%s' (gốc: %s).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:326
+#: src/applications/fs/tools/gnunet-pseudonym.c:314
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Không truy cập được thông tin của không gian tên.\n"
@@ -2180,44 +2503,44 @@
 msgid "start tracking entries for the directory database"
 msgstr "bắt đầu theo dõi các mục cho cơ sở dữ liệu thư mục"
 
-#: src/applications/fs/tools/gnunet-directory.c:181
+#: src/applications/fs/tools/gnunet-directory.c:174
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "Đã liệt kê %d mục tương ứng.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:139
+#: src/applications/fs/tools/gnunet-insert.c:137
 #, fuzzy, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Đã tạo mục không gian tên '%s'\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:144
+#: src/applications/fs/tools/gnunet-insert.c:142
 #, fuzzy, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr "Không truy cập được không gian tên '%s' (đã có rồi?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:166
+#: src/applications/fs/tools/gnunet-insert.c:168
 #, fuzzy, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "đã chèn %16llu từ %16llu byte (sẽ hoàn thành trong %llu%s giây)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:178
+#: src/applications/fs/tools/gnunet-insert.c:180
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr "Hoàn thành tải lên '%s', %llu byte trong %llu giây (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:189
+#: src/applications/fs/tools/gnunet-insert.c:191
 #, fuzzy, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Tập tin '%s' có URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:200
+#: src/applications/fs/tools/gnunet-insert.c:202
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr "Dừng tải xuống."
 
-#: src/applications/fs/tools/gnunet-insert.c:206
+#: src/applications/fs/tools/gnunet-insert.c:207
 #, c-format
 msgid ""
 "\n"
@@ -2226,24 +2549,32 @@
 "\n"
 "Lỗi tải lên tập tin: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:216
+#, c-format
 msgid ""
+"\n"
+"Unexpected event: %d\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:233
+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:232
+#: src/applications/fs/tools/gnunet-insert.c:237
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:235
+#: src/applications/fs/tools/gnunet-insert.c:240
 msgid ""
-"use libextractor to add additional direct references to directory entries"
+"do not use libextractor to add additional references to directory entries "
+"and/or the published file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:238
+#: src/applications/fs/tools/gnunet-insert.c:243
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2251,18 +2582,18 @@
 "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:240
+#: src/applications/fs/tools/gnunet-insert.c:245
 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:243
+#: src/applications/fs/tools/gnunet-insert.c:248
 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:247
+#: src/applications/fs/tools/gnunet-insert.c:252
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2270,7 +2601,7 @@
 "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:251
+#: src/applications/fs/tools/gnunet-insert.c:256
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -2278,11 +2609,11 @@
 "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:256
+#: src/applications/fs/tools/gnunet-insert.c:261
 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:259
+#: src/applications/fs/tools/gnunet-insert.c:264
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2290,7 +2621,7 @@
 "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:263
+#: src/applications/fs/tools/gnunet-insert.c:268
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2298,17 +2629,17 @@
 "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:267
+#: src/applications/fs/tools/gnunet-insert.c:272
 msgid "specify the priority of the content"
 msgstr "chỉ ra ưu tiên của nội dung"
 
-#: src/applications/fs/tools/gnunet-insert.c:270
+#: src/applications/fs/tools/gnunet-insert.c:275
 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)"
 
-#: src/applications/fs/tools/gnunet-insert.c:273
+#: src/applications/fs/tools/gnunet-insert.c:278
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
@@ -2316,31 +2647,31 @@
 "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:277
+#: src/applications/fs/tools/gnunet-insert.c:282
 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:281
+#: src/applications/fs/tools/gnunet-insert.c:286
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr "chỉ ra thời gian tạo SBlock (xem trang man để biết định dạng)"
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:289
 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)"
 
-#: src/applications/fs/tools/gnunet-insert.c:326
+#: src/applications/fs/tools/gnunet-insert.c:324
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Người dùng phải chỉ ra một  và chỉ một tập tin để bỏ đánh chỉ mục.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:351
+#: src/applications/fs/tools/gnunet-insert.c:348
 #, fuzzy, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Từ khóa cho tập tin '%s':\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:378
+#: src/applications/fs/tools/gnunet-insert.c:374
 #, fuzzy, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Không truy cập được không gian tên '%s' (đã có rồi?).\n"
@@ -2350,54 +2681,53 @@
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Phân tích thời gian thất bại. Hãy dùng định dạng '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:407
-#: src/applications/fs/tools/gnunet-insert.c:412
-#: src/applications/fs/tools/gnunet-insert.c:417
-#: src/applications/fs/tools/gnunet-insert.c:422
+#: src/applications/fs/tools/gnunet-insert.c:403
+#: src/applications/fs/tools/gnunet-insert.c:409
+#: src/applications/fs/tools/gnunet-insert.c:415
+#: src/applications/fs/tools/gnunet-insert.c:421
 #: src/applications/fs/tools/gnunet-insert.c:427
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn '%s' không có ý nghĩa khi không có tùy chọn '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-search.c:136
+#: src/applications/fs/tools/gnunet-search.c:147
 msgid "exit after receiving LIMIT results"
 msgstr "thoát sau khi nhận được kết quả GIỚIHẠN"
 
-#: src/applications/fs/tools/gnunet-search.c:139
-#: src/applications/fs/tools/gnunet-download.c:64
+#: src/applications/fs/tools/gnunet-search.c:150
+#: src/applications/fs/tools/gnunet-download.c:72
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "ghi kết quả tìm kiếm tìm thấy (đã giải mã) vào tập tin FILENAME"
 
-#: src/applications/fs/tools/gnunet-search.c:142
+#: src/applications/fs/tools/gnunet-search.c:153
 #, fuzzy
 msgid "wait DELAY seconds for search results before aborting"
 msgstr "chờ kết quả tìm kiếm TIMEOUT giây trước khi thoát"
 
-#: src/applications/fs/tools/gnunet-search.c:189
+#: src/applications/fs/tools/gnunet-search.c:191
 #, c-format
-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"
-
-#: src/applications/fs/tools/gnunet-search.c:277
-#, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr "Lỗi chuyển đổi tham số tới URI!\n"
 
-#: src/applications/fs/tools/gnunet-download.c:60
+#: src/applications/fs/tools/gnunet-download.c:68
 msgid "Download files from GNUnet."
 msgstr "Tải tập tin từ GNUnet."
 
-#: src/applications/fs/tools/gnunet-download.c:67
+#: src/applications/fs/tools/gnunet-download.c:75
 msgid "download a GNUnet directory recursively"
 msgstr "tải xuống đệ quy một thư mục GNUnet"
 
-#: src/applications/fs/tools/gnunet-download.c:86
+#: src/applications/fs/tools/gnunet-download.c:93
 #, fuzzy, c-format
 msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr "Tải xuống tập tin '%s' tại %16llu vượt quá %16llu byte (%8.3f kbps)\n"
 
-#: src/applications/fs/tools/gnunet-download.c:99
-#: src/applications/fs/tools/gnunet-download.c:110
+#: src/applications/fs/tools/gnunet-download.c:106
+#, fuzzy, c-format
+msgid "Download aborted.\n"
+msgstr "Dừng tải xuống."
+
+#: src/applications/fs/tools/gnunet-download.c:112
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr "Lỗi tải xuống: %s\n"
@@ -2412,17 +2742,17 @@
 msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 msgstr "Không đủ tham số. Người dùng phải chỉ ra một URI tập tin của GNUnet\n"
 
-#: src/applications/fs/tools/gnunet-download.c:195
+#: src/applications/fs/tools/gnunet-download.c:194
 #, fuzzy, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr "Sai URI '%s' cho gnunet-download.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:244
+#: src/applications/fs/tools/gnunet-download.c:262
 #, fuzzy, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Tập tin chứa với tên '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/fs/tools/gnunet-unindex.c:57
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
@@ -2431,7 +2761,7 @@
 "Đã bỏ chỉ mục %16llu từ %16llu byte (sẽ hoàn thành sau %llu "
 "giây)                "
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:68
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2440,7 +2770,7 @@
 "\n"
 "Hoàn thành bỏ chỉ mục của '%s', %llu byte sau %llu giây (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:83
+#: src/applications/fs/tools/gnunet-unindex.c:80
 #, c-format
 msgid ""
 "\n"
@@ -2453,22 +2783,22 @@
 msgid "Unindex files."
 msgstr "Tập tin đã bỏ đánh chỉ mục."
 
-#: src/applications/fs/tools/gnunet-unindex.c:145
+#: src/applications/fs/tools/gnunet-unindex.c:137
 #, fuzzy
 msgid "Not enough arguments. You must specify a filename.\n"
 msgstr "Không đủ tham số. Người dùng phải chỉ ra một URI tập tin của GNUnet\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:173
+#: src/applications/fs/tools/gnunet-unindex.c:164
 #, fuzzy, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s' thất bại.  '%s' là một tập tin?\n"
 
-#: src/applications/fs/module/ondemand.c:317
+#: src/applications/fs/module/ondemand.c:320
 #, fuzzy, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr "Tập tin đã đánh chỉ mục biến mất, đang xóa khối cho yêu cầu '%s'\n"
 
-#: src/applications/fs/module/ondemand.c:411
+#: src/applications/fs/module/ondemand.c:418
 #, fuzzy, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2479,7 +2809,7 @@
 "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:438
+#: src/applications/fs/module/ondemand.c:445
 #, fuzzy, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2488,13 +2818,13 @@
 "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:655
+#: src/applications/fs/module/ondemand.c:664
 #, fuzzy, c-format
 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:1196
+#: src/applications/fs/module/fs.c:1229
 #, fuzzy, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2502,12 +2832,12 @@
 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:1247
+#: src/applications/fs/module/fs.c:1281
 #, 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:1287
+#: src/applications/fs/module/fs.c:1321
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -2519,55 +2849,38 @@
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/downloadtest.c:239
+#: src/applications/fs/fsui/searchtest.c:156
+#: src/applications/fs/fsui/fsuitest.c:199
+#: src/applications/fs/fsui/downloadtest.c:308
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
 msgid "AND"
 msgstr "VÀ"
 
-#: src/applications/fs/fsui/fsui.c:195
-msgid "FSUI persistence: error restoring download\n"
-msgstr "FSUI: lỗi phục hồi tải xuống\n"
+#: src/applications/fs/fsui/search.c:265
+#, fuzzy
+msgid "Error running search (consult logs)."
+msgstr "Bắt đầu tìm kiếm thất bại. Hãy xem các bản ghi log.\n"
 
-#: src/applications/fs/fsui/fsui.c:666
-#, fuzzy, c-format
-msgid "FSUI state file `%s' had syntax error at offset %u.\n"
-msgstr "Tập tin trạng thái FSUI '%s' có lỗi cú pháp tại vùng %u.\n"
-
-#: src/applications/fs/fsui/download.c:305
-msgid "Download aborted."
-msgstr "Dừng tải xuống."
-
-#: src/applications/fs/fsui/download.c:309
-msgid "ECRS download failed (see logs)."
-msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
-
-#: src/applications/fs/fsui/download.c:313
+#: src/applications/fs/fsui/download.c:263
 #, fuzzy
-msgid "ECRS download suspending."
+msgid "ECRS download failed (see logs)"
 msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
 
-#: src/applications/fs/fsui/download.c:317
-msgid "Unexpected download state."
-msgstr ""
-
-#: src/applications/fs/fsui/unindex.c:80
+#: src/applications/fs/fsui/unindex.c:99
 #, fuzzy
 msgid "Unindex failed."
 msgstr "Bỏ đánh chỉ mục thất bại.\n"
 
-#: src/applications/fs/fsui/upload.c:229 src/applications/fs/fsui/upload.c:374
-#: src/applications/fs/fsui/upload.c:413
+#: src/applications/fs/fsui/upload.c:222
 #, fuzzy
-msgid "Upload failed."
-msgstr "Tải lên thất bại.\n"
+msgid "Failed to create temporary directory."
+msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
 
-#: src/applications/fs/fsui/upload.c:420
+#: src/applications/fs/fsui/upload.c:244
 #, fuzzy
-msgid "Cannot upload directory without using recursion."
-msgstr "Không tải lên được thư mục khi không dùng đệ quy.\n"
+msgid "Upload failed (consult logs)."
+msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
 
 #: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
@@ -2595,77 +2908,77 @@
 "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:1153
+#: src/applications/fs/ecrs/download.c:1157
 #, fuzzy, c-format
 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:170
+#: src/applications/fs/ecrs/upload.c:161
 #, fuzzy, c-format
 msgid "`%s' is not a file.\n"
 msgstr "'%s' không phải là một tập tin thông thường.\n"
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/fs/ecrs/upload.c:171
 #, fuzzy, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Không mở được tập tin cấu hình '%s'\n"
 
-#: src/applications/fs/ecrs/upload.c:188
+#: src/applications/fs/ecrs/upload.c:179
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Kết nối tới gnunetd không thành công.\n"
 
-#: src/applications/fs/ecrs/upload.c:200
+#: src/applications/fs/ecrs/upload.c:191
 #, fuzzy, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Không hash được '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:219
+#: src/applications/fs/ecrs/upload.c:210
 #, fuzzy, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Nạp để đánh chỉ mục tập tin '%s' thất bại.\n"
 
-#: src/applications/fs/ecrs/upload.c:226
+#: src/applications/fs/ecrs/upload.c:217
 #, fuzzy, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "nạp môđun '%s' không thành công.  Đang cho máy khách biết.\n"
 
-#: src/applications/fs/ecrs/upload.c:312
+#: src/applications/fs/ecrs/upload.c:303
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Đánh chỉ mục dữ liệu thất bại tại vị trí %i.\n"
 
-#: src/applications/fs/ecrs/meta.c:847
+#: src/applications/fs/ecrs/meta.c:849
 #, fuzzy, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Đổi tên tập tin '%s' thành '%s' thất bại: %s\n"
 
-#: src/applications/fs/ecrs/meta.c:855
+#: src/applications/fs/ecrs/meta.c:857
 #, fuzzy, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "Không đổi tên được tập tin '%s' thành '%s': tập tin tồn tại\n"
 
-#: src/applications/fs/ecrs/namespace.c:153
+#: src/applications/fs/ecrs/namespace.c:154
 #, fuzzy, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Không tạo được tên hiệu '%s', tập tin '%s' tồn tại.\n"
 
-#: src/applications/fs/ecrs/namespace.c:338
-#: src/applications/fs/ecrs/namespace.c:419
-#: src/applications/fs/ecrs/namespace.c:573
+#: src/applications/fs/ecrs/namespace.c:339
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:574
 #, 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:350
-#: src/applications/fs/ecrs/namespace.c:430
+#: src/applications/fs/ecrs/namespace.c:351
+#: 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:587
-#: src/applications/fs/ecrs/namespace.c:598
+#: src/applications/fs/ecrs/namespace.c:588
+#: src/applications/fs/ecrs/namespace.c:599
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Định dạng của tập tin '%s' sai.\n"
@@ -2681,21 +2994,21 @@
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:123
+#: src/applications/fs/uritrack/file_info.c:125
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Tắt bỏ thu thập tên tập tin.\n"
 
-#: src/applications/fs/uritrack/file_info.c:355
+#: src/applications/fs/uritrack/file_info.c:367
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:654
+#: 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ỳ."
 
-#: src/applications/fs/namespace/namespace_info.c:675
+#: src/applications/fs/namespace/namespace_info.c:677
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -2703,16 +3016,16 @@
 "Đ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:354
+#: src/applications/topology_f2f/topology.c:359
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Đọc danh sách bạn bè từ '%s' không thành công\n"
 
-#: src/applications/topology_f2f/topology.c:371
+#: src/applications/topology_f2f/topology.c:376
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, bỏ qua byte.\n"
 
-#: src/applications/topology_f2f/topology.c:384
+#: src/applications/topology_f2f/topology.c:389
 #, fuzzy, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình, bỏ qua các byte '%s'.\n"
@@ -2722,20 +3035,37 @@
 msgid "`%s' registering client handler %d and %d\n"
 msgstr "'%s' đang đăng ký trình điều khiển máy khách %d và %d\n"
 
-#: src/applications/template/gnunet-template.c:44
+#: src/applications/template/gnunet-template.c:43
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:92
+#: src/applications/bootstrap_http/http.c:100
 #, fuzzy, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr "Định dạng của tên hiệu '%s' sai.\n"
 
-#: src/applications/bootstrap_http/http.c:144
+#: src/applications/bootstrap_http/http.c:121
+#: src/applications/bootstrap_http/http.c:263
+#: src/applications/bootstrap_http/http.c:283
+#: src/applications/bootstrap_http/http.c:317
+#: src/applications/bootstrap_http/http.c:335
+#: src/applications/bootstrap_http/http.c:349
+#: src/applications/bootstrap_http/http.c:361
+#: src/applications/bootstrap_http/http.c:373
+#, fuzzy, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "'%s' thất bại tại %s:%d với lỗi: '%s'.\n"
+
+#: src/applications/bootstrap_http/http.c:173
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:229
+#, fuzzy, c-format
+msgid "Trying to download hostlist from `%s'\n"
+msgstr "Đọc danh sách bạn bè từ '%s' không thành công\n"
+
+#: src/applications/bootstrap_http/http.c:409
 #, fuzzy
 msgid "# hellos downloaded via http"
 msgstr "# đã tải xuống HELO qua http"
@@ -2754,341 +3084,337 @@
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:98
+#: src/applications/vpn/gnunet-vpn.c:56
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:103
-msgid "VPN over GNUnet."
-msgstr ""
-
-#: src/applications/vpn/vpn.c:351
+#: src/applications/vpn/vpn.c:326
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:359
+#: src/applications/vpn/vpn.c:334
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:387
+#: src/applications/vpn/vpn.c:362
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:436
+#: src/applications/vpn/vpn.c:411
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:440
+#: src/applications/vpn/vpn.c:415
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:450
+#: src/applications/vpn/vpn.c:425
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:510
+#: src/applications/vpn/vpn.c:485
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:514
+#: src/applications/vpn/vpn.c:489
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:541
+#: src/applications/vpn/vpn.c:518
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:549
+#: src/applications/vpn/vpn.c:526
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:553
+#: src/applications/vpn/vpn.c:530
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:591
+#: src/applications/vpn/vpn.c:568
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:595
+#: src/applications/vpn/vpn.c:572
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:602
+#: src/applications/vpn/vpn.c:579
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:607
+#: src/applications/vpn/vpn.c:584
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:615
+#: src/applications/vpn/vpn.c:592
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:627
+#: src/applications/vpn/vpn.c:604
 #, fuzzy, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr "Không tìm thấy một địa chỉ IP cho giao diện '%s'.\n"
 
-#: src/applications/vpn/vpn.c:638
+#: src/applications/vpn/vpn.c:615
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:650
+#: src/applications/vpn/vpn.c:627
 #, fuzzy, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr "Không tìm thấy một địa chỉ IP cho giao diện '%s'.\n"
 
-#: src/applications/vpn/vpn.c:683
+#: 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"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:729
+#: src/applications/vpn/vpn.c:706
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:788
+#: src/applications/vpn/vpn.c:769
 #, c-format
 msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:792
+#: src/applications/vpn/vpn.c:773
 #, c-format
 msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:810
+#: src/applications/vpn/vpn.c:791
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:850
+#: src/applications/vpn/vpn.c:831
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:835
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:860
+#: src/applications/vpn/vpn.c:841
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:863
+#: src/applications/vpn/vpn.c:844
 #, fuzzy, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr "Nhận được thông báo testbed không rõ dạng %u.\n"
 
-#: src/applications/vpn/vpn.c:873
+#: src/applications/vpn/vpn.c:854
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:892
+#: src/applications/vpn/vpn.c:873
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:913
+#: src/applications/vpn/vpn.c:894
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:918
+#: src/applications/vpn/vpn.c:899
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:929
+#: src/applications/vpn/vpn.c:910
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:935
+#: src/applications/vpn/vpn.c:916
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:951
+#: src/applications/vpn/vpn.c:932
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:955
+#: src/applications/vpn/vpn.c:936
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:959
+#: src/applications/vpn/vpn.c:940
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:973
+#: src/applications/vpn/vpn.c:954
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:988
+#: src/applications/vpn/vpn.c:969
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1016
+#: src/applications/vpn/vpn.c:997
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1031
+#: src/applications/vpn/vpn.c:1012
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1076
+#: src/applications/vpn/vpn.c:1057
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1122
+#: src/applications/vpn/vpn.c:1103
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1148
+#: src/applications/vpn/vpn.c:1129
 msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1208
+#: src/applications/vpn/vpn.c:1190
 msgid "Yes"
 msgstr "Có"
 
-#: src/applications/vpn/vpn.c:1208
+#: src/applications/vpn/vpn.c:1190
 msgid "No"
 msgstr "Không"
 
-#: src/applications/vpn/vpn.c:1385
+#: src/applications/vpn/vpn.c:1396
 #, fuzzy, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d và %d\n"
 
-#: src/applications/vpn/vpn.c:1386
+#: src/applications/vpn/vpn.c:1397
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1434
+#: src/applications/vpn/vpn.c:1447
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1466
+#: src/applications/vpn/vpn.c:1479
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1477
+#: src/applications/vpn/vpn.c:1492
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1490
+#: src/applications/vpn/vpn.c:1507
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:142
+#: src/server/gnunet-update.c:141
 #, fuzzy, c-format
 msgid "Updating data for module `%s'\n"
 msgstr "Đang cập nhật dữ liệu cho môđun '%s'\n"
 
-#: src/server/gnunet-update.c:147
+#: src/server/gnunet-update.c:146
 #, fuzzy, c-format
 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:218 src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-update.c:217 src/server/gnunet-transport-check.c:355
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr "ping các đầu peer từ HOSTLISTURL tương ứng với truyền tải"
 
-#: src/server/gnunet-update.c:220
+#: src/server/gnunet-update.c:219
 msgid "Updates GNUnet datastructures after version change."
 msgstr "Cập nhật cấu trúc dữ liệu GNUnet sau khi thay đổi phiên bản."
 
-#: src/server/gnunet-update.c:224 src/server/gnunet-transport-check.c:369
+#: src/server/gnunet-update.c:223 src/server/gnunet-transport-check.c:370
 msgid "run as user LOGIN"
 msgstr "chạy dưới người dùng LOGIN"
 
-#: src/server/gnunet-update.c:227
+#: src/server/gnunet-update.c:226
 #, fuzzy
 msgid "run in client mode (for getting client configuration values)"
 msgstr "chạy trong chế độ người dùng (để lấy giá trị cấu hình của người dùng)"
 
-#: src/server/connection.c:992
+#: src/server/connection.c:1023
 #, fuzzy, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "'%s' đã chọn %d vượt quá %d thông báo (MTU: %d).\n"
 
-#: src/server/connection.c:999
+#: src/server/connection.c:1032
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Chi tiết về thông báo: %u: dài %d, ưu tiên: %d\n"
 
-#: src/server/connection.c:2283
+#: src/server/connection.c:2417
 #, 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:2355
+#: src/server/connection.c:2489
 #, 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:2370
+#: src/server/connection.c:2506
 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:2774
+#: src/server/connection.c:2929
 msgid "# outgoing messages dropped"
 msgstr "# thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:2778
+#: src/server/connection.c:2933
 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:2780
+#: src/server/connection.c:2935
 msgid "# connections closed (HANGUP sent)"
 msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
-#: src/server/connection.c:2783
+#: src/server/connection.c:2938
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:2787
+#: src/server/connection.c:2942
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte đã truyền của dạng %d"
 
-#: src/server/connection.c:2791
+#: src/server/connection.c:2946
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte nhận được qua TCP"
 
-#: src/server/connection.c:2793
+#: src/server/connection.c:2948
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:2794
+#: src/server/connection.c:2949
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "# byte nhận được do nhiễu đường truyền"
@@ -3115,16 +3441,16 @@
 msgid "Starts the gnunetd daemon."
 msgstr "Chạy daemon gnunetd."
 
-#: src/server/gnunetd.c:176
+#: src/server/gnunetd.c:175
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:180
+#: src/server/gnunetd.c:179
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/server/gnunetd.c:236
+#: src/server/gnunetd.c:228
 #, fuzzy, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -3170,32 +3496,32 @@
 msgid "Could not properly unload service `%s'!\n"
 msgstr "Không hủy nạp đúng được dịch vụ '%s'!\n"
 
-#: src/server/gnunet-transport-check.c:115
+#: src/server/gnunet-transport-check.c:116
 #, fuzzy, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "'%s': Không tạo được HELO.\n"
 
-#: src/server/gnunet-transport-check.c:124
+#: src/server/gnunet-transport-check.c:125
 #, fuzzy, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "'%s': Không kết nối được.\n"
 
-#: src/server/gnunet-transport-check.c:158
+#: src/server/gnunet-transport-check.c:159
 #, fuzzy, c-format
 msgid "`%s': Could not send.\n"
 msgstr "'%s': Không gửi được.\n"
 
-#: src/server/gnunet-transport-check.c:180
+#: src/server/gnunet-transport-check.c:181
 #, fuzzy, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr "'%s': Không nhận được thông báo trong %llu mili giây.\n"
 
-#: src/server/gnunet-transport-check.c:194
+#: src/server/gnunet-transport-check.c:195
 #, fuzzy, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "'%s': Không ngắt kết nối được.\n"
 
-#: src/server/gnunet-transport-check.c:201
+#: src/server/gnunet-transport-check.c:202
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -3204,12 +3530,12 @@
 "'%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:229
+#: src/server/gnunet-transport-check.c:230
 #, fuzzy, c-format
 msgid " Transport %d is not being tested\n"
 msgstr " Giao thông %d là không thể\n"
 
-#: src/server/gnunet-transport-check.c:245
+#: src/server/gnunet-transport-check.c:246
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3218,57 +3544,57 @@
 "\n"
 "Đang liên hệ '%s'."
 
-#: src/server/gnunet-transport-check.c:266
+#: src/server/gnunet-transport-check.c:267
 #, c-format
 msgid " Connection failed\n"
 msgstr " Kết nối không thành công\n"
 
-#: src/server/gnunet-transport-check.c:272
+#: src/server/gnunet-transport-check.c:273
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Kết nối thất bại (lỗi bug?)\n"
 
-#: src/server/gnunet-transport-check.c:324
+#: src/server/gnunet-transport-check.c:325
 #, c-format
 msgid "No reply received within %llums.\n"
 msgstr "Không nhận được trả lời trong %llu miligiây.\n"
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:351
 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."
 
-#: src/server/gnunet-transport-check.c:357
+#: src/server/gnunet-transport-check.c:358
 msgid "send COUNT messages"
 msgstr "gửi COUNT thông báo"
 
-#: src/server/gnunet-transport-check.c:360
+#: src/server/gnunet-transport-check.c:361
 msgid "send messages with SIZE bytes payload"
 msgstr "gửi các thông báo với SIZE byte nạp trả"
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:364
 msgid "specifies which TRANSPORT should be tested"
 msgstr "chỉ ra TRANSPORT cần được thử nghiệm"
 
-#: src/server/gnunet-transport-check.c:366
+#: src/server/gnunet-transport-check.c:367
 msgid "specifies after how many MS to time-out"
 msgstr "chỉ ra hết thời gian chờ sau bao nhiên MS"
 
-#: src/server/gnunet-transport-check.c:374
+#: src/server/gnunet-transport-check.c:375
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:455
+#: src/server/gnunet-transport-check.c:440
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/server/gnunet-transport-check.c:458
+#: src/server/gnunet-transport-check.c:443
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "(Các) truyền tải có: %s\n"
 
-#: src/server/gnunet-transport-check.c:518
+#: src/server/gnunet-transport-check.c:503
 #, c-format
 msgid ""
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
@@ -3284,7 +3610,7 @@
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr "'%s' thất bại cho cổng %d: %s. Sẽ thử lại trong %d giây.\n"
 
-#: src/server/tcpserver.c:384
+#: src/server/tcpserver.c:386
 #, fuzzy, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
@@ -3292,7 +3618,7 @@
 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:437
+#: src/server/tcpserver.c:439
 #, 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"
@@ -3302,31 +3628,31 @@
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Nhận được thông báo không đúng từ đầu peer '%s' trong '%s': %d.\n"
 
-#: src/server/version.c:157
+#: src/server/version.c:152
 msgid ""
 "Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:52
+#: src/server/gnunet-peer-info.c:51
 msgid "Print information about GNUnet peers."
 msgstr "In thông tin về các đầu peer của GNUnet."
 
-#: src/server/gnunet-peer-info.c:79 src/server/gnunet-peer-info.c:94
+#: src/server/gnunet-peer-info.c:78 src/server/gnunet-peer-info.c:93
 #, fuzzy, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr "Không nhận được địa chỉ của đầu peer '%s'.\n"
 
-#: src/server/gnunet-peer-info.c:88
+#: src/server/gnunet-peer-info.c:87
 #, fuzzy
 msgid "hello message invalid (signature invalid).\n"
 msgstr "Thông báo HELO sai (sai chữ ký).\n"
 
-#: src/server/gnunet-peer-info.c:99
+#: src/server/gnunet-peer-info.c:98
 #, fuzzy, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Đầu peer '%s' với tin tưởng %8u và địa chỉ '%s'\n"
 
-#: src/util/cron/cron.c:355
+#: src/util/cron/cron.c:356
 #, fuzzy, c-format
 msgid ""
 "`%s' called with cron job not in queue, adding.  This may not be what you "
@@ -3335,20 +3661,20 @@
 "'%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"
 
-#: src/util/network_client/tcpio.c:90
+#: src/util/network_client/tcpio.c:94
 msgid "Could not find valid value for PORT in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:114
+#: src/util/network_client/tcpio.c:118
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:209 src/util/network_client/tcpio.c:237
+#: src/util/network_client/tcpio.c:251 src/util/network_client/tcpio.c:281
 #, fuzzy, c-format
 msgid "Cannot connect to %s:u: %s\n"
 msgstr "Không kết nối được tới %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/network_client/tcpio.c:356
+#: src/util/network_client/tcpio.c:403
 #, fuzzy, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "'%s' thất bại, câu trả lời sai!\n"
@@ -3380,17 +3706,17 @@
 msgid "Can't create semaphore: %i"
 msgstr "Không tạo được đèn tín hiệu: %i"
 
-#: src/util/os/dso.c:51
+#: src/util/os/dso.c:56
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Chạy cơ chế plugin không thành công: %s!\n"
 
-#: src/util/os/dso.c:90
+#: src/util/os/dso.c:110
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "'%s' thất bại cho thư viện '%s' tại %s:%d với lỗi: %s\n"
 
-#: src/util/os/dso.c:132
+#: src/util/os/dso.c:152
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
@@ -3409,24 +3735,24 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Câu trả lời không đúng tới '%s'.\n"
 
-#: src/util/os/user.c:125
+#: src/util/os/user.c:124
 #, fuzzy, c-format
 msgid "User `%s' not known, cannot change UID to it.\n"
 msgstr "Người dùng '%s' không rõ, không thay đổi được UID thành nó."
 
-#: src/util/os/user.c:136
+#: src/util/os/user.c:135
 #, 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"
 
-#: src/util/network/select.c:272
+#: src/util/network/select.c:282
 #, 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"
 
-#: src/util/network/select.c:421
+#: src/util/network/select.c:443
 msgid "select listen socket not valid!\n"
 msgstr ""
 
@@ -3461,124 +3787,125 @@
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "'%s' thất bại cho ổ %s: %u\n"
 
-#: src/util/disk/storage.c:247
+#: src/util/disk/storage.c:517
 #, fuzzy, c-format
-msgid "Expected `%s' to be a directory\n"
+msgid "Expected `%s' to be a directory!\n"
 msgstr "'%s' mong đợi '%s' là một thư mục!\n"
 
-#: src/util/disk/storage.c:286
+#: src/util/config_impl/impl.c:275
 #, fuzzy, c-format
-msgid "Expected `%s' to be a regular file\n"
-msgstr "'%s' không phải là một tập tin thông thường.\n"
-
-#: src/util/disk/storage.c:493
-#, 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:260
-#, 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:421
+#: src/util/config_impl/impl.c:505
 #, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgstr ""
+
+#: src/util/config_impl/impl.c:551
+#, c-format
 msgid ""
 "Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
 "llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:433
+#: src/util/config_impl/impl.c:563
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:513
+#: src/util/config_impl/impl.c:653
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:624
+#: src/util/error/error.c:122
 #, c-format
-msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgid ""
+"\n"
+"Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:156 src/util/error/error.c:200
+#: src/util/error/error.c:190 src/util/error/error.c:234
 msgid "DEBUG"
 msgstr "TÌMLỖI"
 
-#: src/util/error/error.c:159 src/util/error/error.c:202
+#: src/util/error/error.c:193 src/util/error/error.c:236
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:162 src/util/error/error.c:204
+#: src/util/error/error.c:196 src/util/error/error.c:240
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/error/error.c:165 src/util/error/error.c:206
+#: src/util/error/error.c:199 src/util/error/error.c:242
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/error/error.c:168 src/util/error/error.c:208
+#: src/util/error/error.c:202 src/util/error/error.c:244
 msgid "FATAL"
 msgstr "LỖI NẶNG"
 
-#: src/util/error/error.c:171 src/util/error/error.c:210
+#: src/util/error/error.c:205 src/util/error/error.c:246
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:174 src/util/error/error.c:212
+#: src/util/error/error.c:208 src/util/error/error.c:248
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:177 src/util/error/error.c:214
+#: src/util/error/error.c:211 src/util/error/error.c:250
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:180 src/util/error/error.c:216
+#: src/util/error/error.c:214 src/util/error/error.c:252
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:183 src/util/error/error.c:218
+#: src/util/error/error.c:217 src/util/error/error.c:254
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:186 src/util/error/error.c:220
+#: src/util/error/error.c:220 src/util/error/error.c:256
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:189
+#: src/util/error/error.c:223
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:221
+#: src/util/error/error.c:238
+msgid "INFO"
+msgstr "THÔNGTIN"
+
+#: src/util/error/error.c:257
 msgid "NOTHING"
 msgstr "KHÔNGCÓGÌ"
 
-#: src/util/threads/mutex.c:131 src/util/threads/mutex.c:151
+#: src/util/threads/mutex.c:145 src/util/threads/mutex.c:165
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Tham số sai: '%s'\n"
 
-#: src/util/threads/mutex.c:136
+#: src/util/threads/mutex.c:150
 #, fuzzy, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr "Khóa chết theo '%s' tại %s: %d.\n"
 
-#: src/util/threads/mutex.c:156
+#: src/util/threads/mutex.c:170
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "Không đủ quyền hạn cho '%s' tại %s:%d.\n"
 
-#: src/util/threads/pthread.c:139 src/util/threads/pthread.c:147
-#: src/util/threads/pthread.c:154 src/util/threads/pthread.c:245
+#: src/util/threads/pthread.c:158 src/util/threads/pthread.c:166
+#: src/util/threads/pthread.c:173 src/util/threads/pthread.c:266
 #, fuzzy, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/util/threads/pthread.c:161 src/util/threads/pthread.c:256
+#: src/util/threads/pthread.c:180 src/util/threads/pthread.c:277
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
@@ -3649,7 +3976,12 @@
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/printhelp.c:49
+#: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
+#, fuzzy, c-format
+msgid "You must pass a number to the `%s' option.\n"
+msgstr "Người dùng phải đưa một số vào tùy chọn '%s'.\n"
+
+#: src/util/getopt/printhelp.c:50
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -3707,22 +4039,22 @@
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:152
+#: src/setup/gnunet-setup.c:185
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Sai tham số dòng lệnh.\n"
 
-#: src/setup/gnunet-setup.c:157
+#: src/setup/gnunet-setup.c:190
 #, fuzzy
 msgid "No interface specified, using default\n"
 msgstr "Chưa chỉ ra tên bảng, đang dùng '%s'.\n"
 
-#: src/setup/gnunet-setup.c:227
+#: src/setup/gnunet-setup.c:264
 #, fuzzy, c-format
 msgid "`%s' is not available."
 msgstr "'%s' không phải là một tập tin thông thường.\n"
 
-#: src/setup/gnunet-setup.c:243
+#: src/setup/gnunet-setup.c:280
 #, fuzzy, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Lỗi không rõ.\n"
@@ -3833,19 +4165,33 @@
 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/gtk/wizard_gtk.c:429
+#: src/setup/gtk/wizard_gtk.c:137
+#, fuzzy
+msgid "(unknown connection)"
+msgstr "Kết nối mạng"
+
+#: src/setup/gtk/wizard_gtk.c:390
 #, fuzzy, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "Không ghi được tập tin cấu hình %s:"
 
-#: src/setup/gtk/wizard_gtk.c:475 src/setup/ncurses/wizard_curs.c:620
+#: src/setup/gtk/wizard_gtk.c:415
+#, fuzzy
+msgid "Do you want to save the new configuration?"
+msgstr "Ghi thiết lập?"
+
+#: src/setup/gtk/wizard_gtk.c:442 src/setup/ncurses/wizard_curs.c:620
 msgid "Unable to create user account:"
 msgstr "Không tạo được tài khoản người dùng:"
 
-#: src/setup/gtk/wizard_gtk.c:482 src/setup/ncurses/wizard_curs.c:623
+#: src/setup/gtk/wizard_gtk.c:449 src/setup/ncurses/wizard_curs.c:623
 msgid "Unable to change startup process:"
 msgstr "Không thay đổi được tiến trình khởi động:"
 
+#: src/setup/gtk/wizard_gtk.c:458
+msgid "gnunet-update failed. Please run gnunet-update manually."
+msgstr ""
+
 #: src/setup/text/conf.c:74
 #, fuzzy
 msgid "yes"
@@ -3940,36 +4286,36 @@
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:538
+#: src/setup/text/conf.c:542
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:539
+#: src/setup/text/conf.c:543
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:553 src/setup/ncurses/mconf.c:422
+#: src/setup/text/conf.c:557 src/setup/ncurses/mconf.c:422
 #, 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"
 
-#: src/setup/text/conf.c:558
+#: src/setup/text/conf.c:562
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:568
+#: src/setup/text/conf.c:572
 #, 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"
 
-#: src/setup/text/conf.c:573
+#: src/setup/text/conf.c:577
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
@@ -4354,48 +4700,99 @@
 "Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:145
+#: src/include/gnunet_util_getopt.h:150
 msgid "print this help"
 msgstr "in trợ giúp này"
 
-#: src/include/gnunet_util_getopt.h:154
+#: src/include/gnunet_util_getopt.h:159
 msgid "print the version number"
 msgstr "in số của phiên bản"
 
-#: src/include/gnunet_util_getopt.h:160
-msgid "configure logging to use LOGRULES"
+#: src/include/gnunet_util_getopt.h:165
+msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:166
+#: src/include/gnunet_util_getopt.h:171
 msgid "be verbose"
 msgstr "thông báo chi tiết"
 
-#: src/include/gnunet_util_getopt.h:172
+#: src/include/gnunet_util_getopt.h:177
 msgid "use configuration file FILENAME"
 msgstr "dùng tập tin cấu hình FILENAME"
 
-#: src/include/gnunet_util_getopt.h:178
+#: src/include/gnunet_util_getopt.h:183
 msgid "specify host on which gnunetd is running"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/include/gnunet_util_error.h:163 src/include/gnunet_util_error.h:165
-#: src/include/gnunet_util_error.h:167 src/include/gnunet_util_error.h:169
+#: src/include/gnunet_util_error.h:175 src/include/gnunet_util_error.h:177
+#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:181
 #, fuzzy, c-format
 msgid "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:176 src/include/gnunet_util_error.h:183
-#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#: src/include/gnunet_util_error.h:188 src/include/gnunet_util_error.h:195
+#: src/include/gnunet_util_error.h:202 src/include/gnunet_util_error.h:209
 #, 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:204 src/include/gnunet_util_error.h:211
+#: src/include/gnunet_util_error.h:216 src/include/gnunet_util_error.h:223
 #, 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"
 
 #, fuzzy
+#~ 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"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Failed to send `%s' request to SMTP server.\n"
+#~ msgstr "Gửi yêu cầu HTTP tới máy '%s' không thành công: %s\n"
+
+#~ msgid "query table called NAME"
+#~ msgstr "hỏi bảng có tên NAME"
+
+#~ msgid "No commands specified.\n"
+#~ msgstr "Chưa chỉ ra câu lệnh.\n"
+
+#~ msgid "Superflous arguments (ignored).\n"
+#~ msgstr "Tham số thừa (lờ đi).\n"
+
+#, fuzzy
+#~ msgid "Query `%s' had no results.\n"
+#~ msgstr "Câu hỏi '%s' không có kết quả.\n"
+
+#~ msgid "FSUI persistence: error restoring download\n"
+#~ msgstr "FSUI: lỗi phục hồi tải xuống\n"
+
+#, fuzzy
+#~ msgid "FSUI state file `%s' had syntax error at offset %u.\n"
+#~ msgstr "Tập tin trạng thái FSUI '%s' có lỗi cú pháp tại vùng %u.\n"
+
+#, fuzzy
+#~ msgid "ECRS download suspending."
+#~ msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
+
+#, fuzzy
+#~ msgid "Upload failed."
+#~ msgstr "Tải lên thất bại.\n"
+
+#, fuzzy
+#~ msgid "Cannot upload directory without using recursion."
+#~ msgstr "Không tải lên được thư mục khi không dùng đệ quy.\n"
+
+#, fuzzy
+#~ msgid "Expected `%s' to be a regular file\n"
+#~ msgstr "'%s' không phải là một tập tin thông thường.\n"
+
+#, fuzzy
+#~ msgid "expected `%s' to be a directory!\n"
+#~ msgstr "'%s' mong đợi '%s' là một thư mục!\n"
+
+#, fuzzy
 #~ msgid "Sorry, no help is available for this option.\n"
 #~ msgstr "Rất tiếc, chưa có trợ giúp cho tùy chọn này."
 
@@ -4626,10 +5023,6 @@
 #~ "Cổng sai \"%s\" nằm trong xác định danh sách máy, đang thử cổng %d.\n"
 
 #, fuzzy
-#~ 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"
-
-#, fuzzy
 #~ 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"
@@ -4851,18 +5244,12 @@
 #~ "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\")."
 
-#~ msgid "Network interface:"
-#~ msgstr "Giao diện mạng:"
-
 #~ msgid "IP-Address/Hostname:"
 #~ msgstr "Địa chỉ IP/Tên máy:"
 
 #~ msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
 #~ msgstr "Máy không thể nhận được kết nối đi vào (SNAT/Firewall)"
 
-#~ msgid "Network connection"
-#~ msgstr "Kết nối mạng"
-
 #~ msgid ""
 #~ "You can limit GNUnet's ressource usage here.\n"
 #~ "\n"
@@ -5026,15 +5413,9 @@
 #~ msgid "Show _range"
 #~ msgstr "Hiện _xếp hạng"
 
-#~ msgid "Show value of the option"
-#~ msgstr "Hiển thị giá trị của tùy chọn"
-
 #~ msgid "Show _data"
 #~ msgstr "Hiển thị _dữ liệu"
 
-#~ msgid "Show all options"
-#~ msgstr "Hiển thị mọi tùy chọn"
-
 #~ msgid "Show all _options"
 #~ msgstr "Hiển thị mọi _tùy chọn"
 
@@ -5132,9 +5513,6 @@
 #~ msgid "MESSAGE"
 #~ msgstr "TIN NHẮN"
 
-#~ msgid "INFO"
-#~ msgstr "THÔNGTIN"
-
 #~ msgid "CRON"
 #~ msgstr "CRON"
 

Modified: GNUnet/src/setup/gtk/Makefile.am
===================================================================
--- GNUnet/src/setup/gtk/Makefile.am    2006-11-12 07:38:46 UTC (rev 3716)
+++ GNUnet/src/setup/gtk/Makefile.am    2006-11-12 08:05:43 UTC (rev 3717)
@@ -11,7 +11,7 @@
   libgnunetsetup_gtk.la
 
 EXTRA_DIST = \
- wizard.glade 
+ gnunet-setup.glade 
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)





reply via email to

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