gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r5387 - in GNUnet: debian debian/po po


From: gnunet
Subject: [GNUnet-SVN] r5387 - in GNUnet: debian debian/po po
Date: Mon, 30 Jul 2007 00:22:04 -0600 (MDT)

Author: grothoff
Date: 2007-07-30 00:21:56 -0600 (Mon, 30 Jul 2007)
New Revision: 5387

Modified:
   GNUnet/debian/changelog
   GNUnet/debian/control
   GNUnet/debian/copyright
   GNUnet/debian/gnunet-client.install
   GNUnet/debian/gnunet-common.install
   GNUnet/debian/gnunet-daemon.config
   GNUnet/debian/gnunet-daemon.dirs
   GNUnet/debian/gnunet-daemon.init
   GNUnet/debian/gnunet-daemon.install
   GNUnet/debian/gnunet-daemon.logrotate
   GNUnet/debian/gnunet-daemon.manpages
   GNUnet/debian/gnunet-daemon.postinst
   GNUnet/debian/gnunet-daemon.postrm
   GNUnet/debian/gnunet-daemon.prerm
   GNUnet/debian/gnunet-daemon.templates
   GNUnet/debian/gnunet-dev.install
   GNUnet/debian/gnunet-tools.install
   GNUnet/debian/po/cs.po
   GNUnet/debian/po/de.po
   GNUnet/debian/po/es.po
   GNUnet/debian/po/fr.po
   GNUnet/debian/po/pt.po
   GNUnet/debian/po/pt_BR.po
   GNUnet/debian/po/sv.po
   GNUnet/debian/po/templates.pot
   GNUnet/debian/po/vi.po
   GNUnet/debian/rules
   GNUnet/po/GNUnet.pot
   GNUnet/po/de.po
   GNUnet/po/es.po
   GNUnet/po/rw.po
   GNUnet/po/sv.po
   GNUnet/po/vi.po
Log:
elmargol update to debian for ubuntu feisty

Modified: GNUnet/debian/changelog
===================================================================
--- GNUnet/debian/changelog     2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/changelog     2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,3 +1,44 @@
+gnunet (0.7.2-2) feisty; urgency=low
+
+  * Fixed the debian directory
+
+ -- elmargol <address@hidden>  Mon, 30 Jul 2007 08:03:17 +0200
+
+gnunet (0.7.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #429478).
+  * Rewritten/edited all debian/* files; now using plain debhelper again.
+  * Removed no longer needed update mechanism from 0.6 to 0.7.
+  * Updated reviewed debconf templates from debian-l10n-english team
+    <address@hidden>
+    (Closes: #427877, #425211, #425310, #429845).
+  * Added Vietnamese debconf translation from Clytie Siddall
+    <address@hidden> (Closes: #428547).
+  * Added updated Spanish debconf translation from Rudy Godoy Guillen
+    <address@hidden> (Closes: #426078).
+  * Added updated Swedish debconf translation from Daniel Nylander
+    <address@hidden> (Closes: #428356).
+  * Added updated Portuguese debconf translation from Portuguese Translation
+    Team <address@hidden> (Closes: #428357).
+  * Added Galician debconf translation from Jacobo Tarrio <address@hidden>
+    (Closes: #428387).
+  * Added updated German debconf translation from Helge Kreutzmann
+    <address@hidden> (Closes: 425309, #429843).
+  * Added Russian debconf translation from Yuri Kozlov
+    <address@hidden> (Closes: #429853).
+  * Added updated Czech debconf translation from Miroslav Kure
+    <address@hidden> (Closes: #430343).
+
+ -- Daniel Baumann <address@hidden>  Wed, 27 Jun 2007 09:53:00 +0200
+
+gnunet (0.7.1c-2) unstable; urgency=low
+
+  * Rebuild against new curl (Closes: #423573).
+  * Added Dutch debconf translation from Bart Cornelis <address@hidden>
+    (Closes: #423048).
+
+ -- Daniel Baumann <address@hidden>  Sun, 13 May 2007 21:28:00 +0200
+
 gnunet (0.7.1c-1) unstable; urgency=low
 
   * New upstream release (Closes: #420538).
@@ -121,12 +162,10 @@
   * debian/control: Set libextractor required instead of recommended (Closes: 
#305138)
   * debian/README.Debian: Changed filename UPGRADING to UPDATING (Closes:
     #305136).
-  
+
   * debian/po/pt_BR.po: Added new Brazilian Portuguese translation, thanks to
     Rodrigo Tadeu Claro (Closes: #306350).
 
-  
-
  -- Arnaud Kyheng <address@hidden>  Sun,  1 May 2005 12:31:50 +0200
 
 gnunet (0.6.6b-1) unstable; urgency=low
@@ -134,7 +173,7 @@
   * New Upstream release.
   * debian/control: Added libextractor dependency.
   * debian/rules: Added libextractor support.
-  
+
   * debian/gnunet.postinst: Improved default configuration file building
     process.
 
@@ -188,7 +227,7 @@
 
 gnunet (0.6.5-3) unstable; urgency=low
 
-  * debian/control: Fixed dependencies. (Closes: #291776, #291857). 
+  * debian/control: Fixed dependencies. (Closes: #291776, #291857).
   * Fixed a typo in previous changelog (Closes: #289496).
 
  -- Arnaud Kyheng <address@hidden>  Mon, 24 Jan 2005 00:41:29 +0100
@@ -201,14 +240,14 @@
       build-dep: debhelper (>= 4.1.16) which depends on po-debconf.
       depend: debconf (>= 1.2.0) since old versions have problems with
       templates specifying the encoding of their content.
-    - debian/rules: Add 'debconf-updatepo' to the clean target   
+    - debian/rules: Add 'debconf-updatepo' to the clean target
       (to make sure that the relevant files are ready for translation in the
       distributed source packages, and thus help translators).
-    - execute "debconf-gettextize debian/*templates*". 
+    - execute "debconf-gettextize debian/*templates*".
     - update the style to the best current practice.
 
   * Applied Andreas Jochens patch to fix build process on AMD64 with gcc 4.0
-    (Closes: #289496). 
+    (Closes: #289496).
 
   * debian/control: Fixed dependencies.
 
@@ -232,7 +271,7 @@
     Fixed possible error in restart command.
 
   * debian/gnunet.config: Changed compared version for the upgrade to
-    0.6.4a-7. 
+    0.6.4a-7.
 
  -- Arnaud Kyheng <address@hidden>  Tue,  9 Nov 2004 14:47:21 +0100
 
@@ -245,7 +284,7 @@
   * debian/gnunet.postinst: use new gnunet-update instead of complex shell
     script.
     Changed compared version for the upgrade to 0.6.4a-6.
-    
+
   * debian/gnunet.config: use new gnunet-update instead of complex shell
     script.
     Changed compared version for the upgrade to 0.6.4a-6.
@@ -266,7 +305,7 @@
     Changed compared version for the upgrade to 0.6.4a-5 since some people
     should have gnunet not yet configured with 0.6.4a-4.
     Lowered the warning note priority to medium.
-    Removed reset of the warning note. 
+    Removed reset of the warning note.
     Removed unneeded comments.
     Only warn user if configuration values are not yet compliant.
 
@@ -342,7 +381,7 @@
 
 gnunet (0.6.4-2) unstable; urgency=low
 
-  * Bumb revision number so ftp-master will accept it. 
+  * Bumb revision number so ftp-master will accept it.
 
  -- Glenn McGrath <address@hidden>  Fri, 10 Sep 2004 12:13:54 +1000
 
@@ -352,14 +391,14 @@
   * New maintainer (Closes: #225690)
   * contrib/gnu_in_net.xpm: Modified the application's icon to make the
     background transparent.
-    
+
   * debian/gnunet.postinst: Perform gnunet-check -a instead of gnunet-check
     -u. This is needed to migrate data from 0.6.2b or earlier.
 
   * debian/control: Updated build dependency from libgtk1.2-dev to
     libgtk2.0-dev as required.
 
-  * debian/control: Added build dependency libgmp3-dev (>= 4.0.0) as required. 
+  * debian/control: Added build dependency libgmp3-dev (>= 4.0.0) as required.
 
  -- Arnaud Kyheng <address@hidden>  Sun, 29 Aug 2004 23:07:45 +0200
 
@@ -380,7 +419,7 @@
 gnunet (0.6.2a-1) unstable; urgency=low
 
   * New upstream release
-  * Build depends on guile 
+  * Build depends on guile
 
  -- Glenn McGrath <address@hidden>  Thu,  6 May 2004 20:31:51 +1000
 
@@ -399,7 +438,7 @@
 
 gnunet (0.6.1d-3) unstable; urgency=low
 
-  * Disable STAT_MALLOC to fix hostkey generatation bug. 
+  * Disable STAT_MALLOC to fix hostkey generatation bug.
 
  -- Glenn McGrath <address@hidden>  Tue, 13 Apr 2004 17:51:07 +1000
 
@@ -451,7 +490,7 @@
 gnunet (0.6.0-1) unstable; urgency=low
 
   * New upstream release
-  * Undefined symbols problem fixed by upstream (Closes: #201002)  
+  * Undefined symbols problem fixed by upstream (Closes: #201002)
   * Remove gnunet-convert in this release as its broken.
   * Regenerate build files with autoreconf -if
   * Dont mention internal shared libraries in .shlibs file
@@ -463,8 +502,8 @@
   * Fix internal key generation bug iwhen using internal crypto with
     patch from upstream, patch-gnunet-0.5.5-rndlinux.c[.diff]
     (Closes: #207677)
-  * Rephrase gnunet-gtk description (Closes: #209643) 
-  * Update standards version to 3.6.1.0 
+  * Rephrase gnunet-gtk description (Closes: #209643)
+  * Update standards version to 3.6.1.0
 
  -- Glenn McGrath <address@hidden>  Tue,  9 Sep 2003 23:41:50 +0000
 
@@ -490,13 +529,13 @@
 
 gnunet (0.5.4a-3) unstable; urgency=low
 
-  * Declare build dependency on automake1.7 
+  * Declare build dependency on automake1.7
 
  -- Glenn McGrath <address@hidden>  Mon, 21 Jul 2003 13:30:07 +0000
 
 gnunet (0.5.4a-2) unstable; urgency=low
 
-  * Fix removal of package when daemon not running (Closes: #201647) 
+  * Fix removal of package when daemon not running (Closes: #201647)
   * Build depends on libltdl3-dev (Closes: #201316)
   * Run autoreconf to avoid libtool problem
   * Bump standards version to 3.6.0
@@ -565,4 +604,3 @@
   * Initial Release.
 
  -- Glenn McGrath <address@hidden>  Thu,  6 Feb 2003 23:32:06 +1100
-

Modified: GNUnet/debian/control
===================================================================
--- GNUnet/debian/control       2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/control       2007-07-30 06:21:56 UTC (rev 5387)
@@ -3,88 +3,87 @@
 Priority: optional
 Maintainer: Arnaud Kyheng <address@hidden>
 Uploaders: Daniel Baumann <address@hidden>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5.0.0), libltdl3-dev, 
libsqlite3-dev, libmysqlclient15-dev, libgcrypt11-dev, guile-1.8, 
guile-1.8-dev, libgmp3-dev (>= 4.0.0), libextractor-dev (>= 0.5.16-1), 
libgtk2.0-dev (>= 2.6.0-1), libncurses5-dev, gettext (>=0.14.1-1), 
libglade2-dev, zlib1g-dev, libcurl3-dev, dialog (>=1.0-200602), libxml2-dev, 
libadns1-dev (>=1.4)
+Build-Depends: debhelper (>= 5), autotools-dev, dialog, gettext, 
guile-1.8-dev, libcurl3-dev, libextractor-dev, libgcrypt11-dev, libglade2-dev, 
libgmp3-dev, libgtk2.0-dev, libltdl3-dev, libmysqlclient15-dev, 
libncurses5-dev, libsqlite3-dev, libxml2-dev, po-debconf, zlib1g-dev
 Standards-Version: 3.7.2
 
-Package: gnunet-common
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Secure, trust-based peer-to-peer framework
- GNUnet is a peer-to-peer framework which focuses on providing security.
- All link-to-link messages in the network are confidential and authenticated.
- The framework provides a transport abstraction layer and can currently
- encapsulate the peer-to-peer traffic in UDP, TCP, or SMTP messages.
+Package: gnunet
+Architecture: all
+Depends: gnunet-client (>= ${binary:Version}), gnunet-daemon (>= 
${binary:Version}), gnunet-tools (>= ${binary:Version})
+Description: secure, trust-based peer-to-peer framework (meta)
+ GNUnet is a peer-to-peer framework which focuses on providing security. All
+ link-to-link messages in the network are confidential and authenticated. The
+ framework provides a transport abstraction layer and can currently encapsulate
+ the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
- This package contains base files for the GNUnet packages.
+  Homepage: <http://www.gnunet.org/>
  .
-  Homepage: <http://gnunet.org/>
+ This package is a meta-package depending on gnunet-client, gnunet-daemon and
+ gnunet-tools.
 
-Package: gnunet-daemon
+Package: gnunet-client
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, gettext (>=0.14.1-1)
-Description: Secure, trust-based peer-to-peer framework
- GNUnet is a peer-to-peer framework which focuses on providing security.
- All link-to-link messages in the network are confidential and authenticated.
- The framework provides a transport abstraction layer and can currently
- encapsulate the peer-to-peer traffic in UDP, TCP, or SMTP messages.
+Depends: ${shlibs:Depends}, ${misc:Depends}, gettext
+Suggests: libextractor-plugins
+Description: secure, trust-based peer-to-peer framework (client)
+ GNUnet is a peer-to-peer framework which focuses on providing security. All
+ link-to-link messages in the network are confidential and authenticated. The
+ framework provides a transport abstraction layer and can currently encapsulate
+ the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
- This package contains the GNUnet Daemon necessary to run a GNUnet node.
+  Homepage: <http://www.gnunet.org/>
  .
-  Homepage: <http://gnunet.org/>
+ This package contains the command line client applications, such as
+ gnunet-search and gnunet-download.
 
-Package: gnunet-client
+Package: gnunet-common
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gettext (>=0.14.1-1)
-Suggests: libextractor-plugins (>= 0.5.16-1)
-Description: Secure, trust-based peer-to-peer framework
- GNUnet is a peer-to-peer framework which focuses on providing security.
- All link-to-link messages in the network are confidential and authenticated.
- The framework provides a transport abstraction layer and can currently
- encapsulate the peer-to-peer traffic in UDP, TCP, or SMTP messages.
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: secure, trust-based peer-to-peer framework (common)
+ GNUnet is a peer-to-peer framework which focuses on providing security. All
+ link-to-link messages in the network are confidential and authenticated. The
+ framework provides a transport abstraction layer and can currently encapsulate
+ the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
- This package contains the GNUnet command line client applications as
- gnunet-search and gnunet-download.
+  Homepage: <http://www.gnunet.org/>
  .
-  Homepage: <http://gnunet.org/>
+ This package contains the common files.
 
-Package: gnunet-tools
+Package: gnunet-daemon
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gettext (>=0.14.1-1)
-Description: Secure, trust-based peer-to-peer framework
- GNUnet is a peer-to-peer framework which focuses on providing security.
- All link-to-link messages in the network are confidential and authenticated.
- The framework provides a transport abstraction layer and can currently
- encapsulate the peer-to-peer traffic in UDP, TCP, or SMTP messages.
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, gettext
+Description: secure, trust-based peer-to-peer framework (daemon)
+ GNUnet is a peer-to-peer framework which focuses on providing security. All
+ link-to-link messages in the network are confidential and authenticated. The
+ framework provides a transport abstraction layer and can currently encapsulate
+ the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
- This package contains the gnunet additional tools for GNUnet like the
- gnunet-setup graphical tool.
+  Homepage: <http://www.gnunet.org/>
  .
-  Homepage: <http://gnunet.org/>
+ This package contains the daemon, needed to run a GNUnet node.
 
-Package: gnunet
-Architecture: all
-Depends: gnunet-daemon (>= ${Source-Version}), gnunet-client (>= 
${Source-Version}), gnunet-tools (>= ${Source-Version})
-Description: Secure, trust-based peer-to-peer framework
- GNUnet is a peer-to-peer framework which focuses on providing security.
- All link-to-link messages in the network are confidential and authenticated.
- The framework provides a transport abstraction layer and can currently
- encapsulate the peer-to-peer traffic in UDP, TCP, or SMTP messages.
+Package: gnunet-dev
+Section: libdevel
+Architecture: any
+Depends: gnunet-daemon (>= ${binary:Version}), gnunet-client (>= 
${binary:Version}), gnunet-tools (>= ${binary:Version})
+Description: secure, trust-based peer-to-peer framework (development)
+ GNUnet is a peer-to-peer framework which focuses on providing security. All
+ link-to-link messages in the network are confidential and authenticated. The
+ framework provides a transport abstraction layer and can currently encapsulate
+ the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
- This package is a meta package for GNUnet and depends upon gnunet-daemon,
- gnunet-client and gnunet-tools.
+  Homepage: <http://www.gnunet.org/>
  .
-  Homepage: <http://gnunet.org/>
+ This package contains the development files.
 
-Package: gnunet-dev
-Section: libdevel
+Package: gnunet-tools
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnunet-daemon (>= 
${Source-Version}), gnunet-client (>= ${Source-Version}), gnunet-tools (>= 
${Source-Version})
-Description: Secure, trust-based peer-to-peer framework
- GNUnet is a peer-to-peer framework which focuses on providing security.
- All link-to-link messages in the network are confidential and authenticated.
- The framework provides a transport abstraction layer and can currently
- encapsulate the peer-to-peer traffic in UDP, TCP, or SMTP messages.
+Depends: ${shlibs:Depends}, ${misc:Depends}, gettext
+Description: secure, trust-based peer-to-peer framework (tools)
+ GNUnet is a peer-to-peer framework which focuses on providing security. All
+ link-to-link messages in the network are confidential and authenticated. The
+ framework provides a transport abstraction layer and can currently encapsulate
+ the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
- This package contains the development files of GNUnet.
+  Homepage: <http://www.gnunet.org/>
  .
-  Homepage: <http://gnunet.org/>
+ This package contains additional tools such as the gnunet-setup graphical 
tool.

Modified: GNUnet/debian/copyright
===================================================================
--- GNUnet/debian/copyright     2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/copyright     2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,30 +1,34 @@
-This package was debianized by Arnaud Kyheng <address@hidden> on
-Sun, 29 Aug 2004 23:07:45 +0200.
+This package was debianized by Daniel Baumann <address@hidden> on
+Mon, 14 May 2007 11:00:00 +0200.
 
-It was downloaded from http://gnunet.org/download.php3 
+It was downloaded from:
 
-Upstream Author:  
- Primary developers:
-  Blake Matheny <address@hidden>
-  Christian Grothoff <address@hidden>
-  Igor Wronsky <address@hidden>
-  Krista Bennett <address@hidden>
- For other contributors refer to the AUTHORS file in the source code.
+       <http://www.gnunet.org/>
 
-Copyright: GPL
-  This package is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 dated June, 1991.
+Upstream Authors:
 
-  This package is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+       Christian Grothoff <address@hidden>
+       Nils Durner <address@hidden>
 
-  You should have received a copy of the GNU General Public License
-  along with this package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301  USA
+License:
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+       Copyright (C) 2001-2007 Christian Grothoff <address@hidden>
+       Copyright (C) 2005-2007 Nils Durner <address@hidden>
+       Copyright (C) Michael John Wensley <address@hidden>
+
+       This program is free software; you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation; either version 2 of the License, or
+       (at your option) any later version.
+
+       This program is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with this program; if not, write to the Free Software
+       Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL file.

Modified: GNUnet/debian/gnunet-client.install
===================================================================
--- GNUnet/debian/gnunet-client.install 2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/gnunet-client.install 2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,22 +1,23 @@
-debian/tmp/usr/bin/gnunet-dht-query
-debian/tmp/usr/bin/gnunet-directory
-debian/tmp/usr/bin/gnunet-download
-debian/tmp/usr/bin/gnunet-download-manager.scm
-debian/tmp/usr/bin/gnunet-insert
-debian/tmp/usr/bin/gnunet-pseudonym
-debian/tmp/usr/bin/gnunet-search
-debian/tmp/usr/bin/gnunet-stats
-debian/tmp/usr/bin/gnunet-tbench
-debian/tmp/usr/bin/gnunet-template
-debian/tmp/usr/bin/gnunet-tracekit
-debian/tmp/usr/bin/gnunet-vpn
-debian/tmp/usr/lib/libgnunetidentity_api.so.*
-debian/tmp/usr/lib/libgnunetdht_api.so.*
-debian/tmp/usr/lib/libgnuneturitrack.so.*
-debian/tmp/usr/lib/libgnunetfsui.so.*
-debian/tmp/usr/lib/libgnunetecrs.so.*
-debian/tmp/usr/lib/libgnunetnamespace.so.*
-debian/tmp/usr/lib/libgnunetcollection.so.*
-debian/tmp/usr/lib/libgnunetstats_api.so.*
-debian/tmp/usr/lib/libgnunetfs.so.*
-debian/tmp/usr/lib/libgnunetgetoption_api.so.*
+/usr/bin/gnunet-dht-query
+/usr/bin/gnunet-directory
+/usr/bin/gnunet-download
+/usr/bin/gnunet-download-manager.scm
+/usr/bin/gnunet-insert
+/usr/bin/gnunet-pseudonym
+/usr/bin/gnunet-search
+/usr/bin/gnunet-stats
+/usr/bin/gnunet-tbench
+/usr/bin/gnunet-template
+/usr/bin/gnunet-tracekit
+/usr/bin/gnunet-vpn
+/usr/lib/libgnunetcollection.so.*
+/usr/lib/libgnunetdht_api.so.*
+/usr/lib/libgnunetecrs.so.*
+/usr/lib/libgnunetfs.so.*
+/usr/lib/libgnunetfsui.so.*
+/usr/lib/libgnunetgetoption_api.so.*
+/usr/lib/libgnunetnamespace.so.*
+/usr/lib/libgnunetstats_api.so.*
+/usr/lib/libgnuneturitrack.so.*
+/usr/lib/libgnunetidentity_api.so.*
+/usr/lib/libgnunetrpc_util.so.*

Modified: GNUnet/debian/gnunet-common.install
===================================================================
--- GNUnet/debian/gnunet-common.install 2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/gnunet-common.install 2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libgnunetutil.so.*
-debian/tmp/usr/lib/libgnunetutil_*.so.*
-debian/tmp/usr/share/locale/*/LC_MESSAGES/GNUnet.mo
+/usr/lib/libgnunetutil.so.*
+/usr/lib/libgnunetutil_*.so.*
+/usr/share/locale/*/LC_MESSAGES/GNUnet.mo

Modified: GNUnet/debian/gnunet-daemon.config
===================================================================
--- GNUnet/debian/gnunet-daemon.config  2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/gnunet-daemon.config  2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,20 +1,11 @@
-#!/bin/sh -e
-# Config script for gnunet
-#
+#!/bin/sh
 # Author: Arnaud Kyheng <address@hidden>
 
+set -e
+
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-# Check for post 0.7 type of GNUnet package
-if dpkg --compare-versions "$2" lt "0.7.0-1" && \
-       [ -e /etc/gnunet.conf.prior07 ]; then
-       # Warn the user for the database storage move.
-       db_reset gnunet-daemon/prior_07 || true
-       db_input critical gnunet-daemon/prior_07 || true
-       db_go
-fi
-
 # Ask for GNUnet daemon user
 db_input medium gnunet-daemon/gnunet_user || true
 db_go
@@ -26,4 +17,3 @@
 # Ask for GNUnet autostart
 db_input high gnunet-daemon/launch_at_startup || true
 db_go
-

Modified: GNUnet/debian/gnunet-daemon.dirs
===================================================================
--- GNUnet/debian/gnunet-daemon.dirs    2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/gnunet-daemon.dirs    2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,4 +1,3 @@
-var/lib/GNUnet
-var/run/gnunetd
-var/log/gnunetd
-usr/lib/GNUnet
+/var/lib/GNUnet
+/var/run/gnunetd
+/var/log/gnunetd

Modified: GNUnet/debian/gnunet-daemon.init
===================================================================
--- GNUnet/debian/gnunet-daemon.init    2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/gnunet-daemon.init    2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,24 +1,15 @@
-#! /bin/sh
-#
-# skeleton     example file to build /etc/init.d/ scripts.
-#              This file should be used to construct scripts for /etc/init.d.
-#
-#              Written by Miquel van Smoorenburg <address@hidden>.
-#              Modified for Debian GNU/Linux
-#              by Ian Murdock <address@hidden>.
-#
-# Version:     @(#)skeleton  1.9  26-Feb-2001  address@hidden
-#
-# Additions:   Modified for Debian GNUnet package
-#                      by Arnaud Kyheng <address@hidden>
+#!/bin/sh
 
 ### BEGIN INIT INFO
-# Provides:          gnunet-daemon
-# Required-Start:    $syslog $network $local_fs
-# Required-Stop:     $syslog $network $local_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Launch the GNUnet daemon at boot time
+# Provides:            gnunet-daemon
+# Required-Start:      $syslog $network $local_fs
+# Required-Stop:       $syslog $network $local_fs
+# Should-Start:
+# Should-Stop:
+# Default-Start:       2 3 4 5
+# Default-Stop:                0 1 6
+# Short-Description:   Starts the GNUnet daemon at boot time.
+# Description:         GNUnet is a secure, trust-based peer-to-peer framework.
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
@@ -26,62 +17,49 @@
 NAME=gnunetd
 DESC=GNUnet
 # Assuming default value for PIDFILE. This should not be changed
-PIDFILE=/var/run/gnunetd/$NAME.pid
+PIDFILE=/var/run/gnunetd/"${NAME}".pid
 
-test -x $DAEMON || exit 0
+test -x "${DAEMON}" || exit 0
 
 set -e
 
 # Get configuration
-if [ -r /etc/default/gnunet-daemon ]; then
+if [ -r /etc/default/gnunet-daemon ]
+then
        . /etc/default/gnunet-daemon
 fi
 
-case "$1" in
-  start)
-       # We should not need --background, but if not here, the invoke-rc.d 
hangs
-       # when using debconf
-       # --quiet removed: For some unknown reason, with gnunet 0.7.0, adding 
--quiet brake the pidfile creation...
-       #
-       echo -n "Starting $DESC: "
-       start-stop-daemon --start --background --chuid  $GNUNET_USER --pidfile 
$PIDFILE \
-               --exec $DAEMON -- -c /etc/gnunetd.conf
-       echo "$NAME."
-       ;;
-  stop)
-       echo -n "Stopping $DESC: "
-       start-stop-daemon --stop --pidfile $PIDFILE \
-               --exec $DAEMON --retry 15 --oknodo
-       echo "$NAME."
-       ;;
-  #reload)
-       #
-       #       If the daemon can reload its config files on the fly
-       #       for example by sending it SIGHUP, do it here.
-       #
-       #       If the daemon responds to changes in its config file
-       #       directly anyway, make this a do-nothing entry.
-       #
-       # echo "Reloading $DESC configuration files."
-       # start-stop-daemon --stop --signal 1 --quiet --pidfile \
-       #       /var/run/$NAME.pid --exec $DAEMON
-  #;;
-  restart|force-reload)
-       #
-       #       If the "reload" option is implemented, move the "force-reload"
-       #       option to the "reload" entry above. If not, "force-reload" is
-       #       just the same as "restart".
-       #
-       echo "Restarting $DESC: $NAME..."
-       $0 stop
-        sleep 1
-        $0 start
-       ;;
-  *)
-       N=/etc/init.d/$NAME
-       echo "Usage: $N {start|stop|restart|force-reload}" >&2
-       exit 1
-       ;;
+case "${1}" in
+       start)
+               # We should not need --background, but if not here, the
+               # invoke-rc.d hangs when using debconf --quiet removed: For some
+               # unknown reason, with gnunet 0.7.0, adding --quiet brake the
+               # pidfile creation...
+
+               echo -n "Starting ${DESC}: "
+               start-stop-daemon --start --background --chuid ${GNUNET_USER} \
+                       --pidfile "${PIDFILE}" --exec ${DAEMON} -- -c \
+                       /etc/gnunetd.conf
+               echo "${NAME}."
+               ;;
+
+       stop)
+               echo -n "Stopping ${DESC}: "
+               start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${DAEMON} \
+                       --retry 15 --oknodo
+               echo "${NAME}."
+               ;;
+
+       restart|force-reload)
+               ${0} stop
+               sleep 1
+               ${0} start
+               ;;
+
+       *)
+               echo "Usage: ${0} {start|stop|restart|force-reload}" >&2
+               exit 1
+               ;;
 esac
 
 exit 0

Modified: GNUnet/debian/gnunet-daemon.install
===================================================================
--- GNUnet/debian/gnunet-daemon.install 2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/gnunet-daemon.install 2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,8 +1,8 @@
-debian/tmp/usr/bin/gnunetd
-debian/tmp/usr/bin/gnunet-update
-debian/tmp/usr/bin/gnunet-transport-check
-debian/tmp/usr/bin/gnunet-peer-info
-debian/tmp/usr/lib/libgnunetcore.so.*
-debian/tmp/usr/lib/libgnunetmodule_*.so.*
-debian/tmp/usr/lib/GNUnet/libgnunetmodule_*.so
-debian/tmp/usr/lib/GNUnet/libgnunettransport_*.so
+/usr/bin/gnunetd
+/usr/bin/gnunet-transport-check
+/usr/bin/gnunet-peer-info
+/usr/bin/gnunet-update
+/usr/lib/libgnunetcore.so.*
+/usr/lib/GNUnet/libgnunetmodule_*.so
+/usr/lib/GNUnet/libgnunettransport_*.so
+/usr/lib/libgnunetip.so.*

Modified: GNUnet/debian/gnunet-daemon.logrotate
===================================================================
--- GNUnet/debian/gnunet-daemon.logrotate       2007-07-30 06:19:49 UTC (rev 
5386)
+++ GNUnet/debian/gnunet-daemon.logrotate       2007-07-30 06:21:56 UTC (rev 
5387)
@@ -1,11 +1,7 @@
-#
-#      Logrotate fragment for frox.
-#
-
 /var/log/gnunetd/gnunetd.log {
        weekly
        size=100k
-       rotate 7 
+       rotate 7
        compress
        copytruncate
        delaycompress

Modified: GNUnet/debian/gnunet-daemon.manpages
===================================================================
--- GNUnet/debian/gnunet-daemon.manpages        2007-07-30 06:19:49 UTC (rev 
5386)
+++ GNUnet/debian/gnunet-daemon.manpages        2007-07-30 06:21:56 UTC (rev 
5387)
@@ -1,4 +1,4 @@
 doc/man/gnunetd.1
+doc/man/gnunet-peer-info.1
+doc/man/gnunet-transport-check.1
 doc/man/gnunet-update.1
-doc/man/gnunet-transport-check.1
-doc/man/gnunet-peer-info.1

Modified: GNUnet/debian/gnunet-daemon.postinst
===================================================================
--- GNUnet/debian/gnunet-daemon.postinst        2007-07-30 06:19:49 UTC (rev 
5386)
+++ GNUnet/debian/gnunet-daemon.postinst        2007-07-30 06:21:56 UTC (rev 
5387)
@@ -1,123 +1,115 @@
-#! /bin/sh
-# postinst script for gnunet
-#
+#!/bin/sh
 # Author: Arnaud Kyheng <address@hidden>
 
 set -e
 
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
+case "${1}" in
+       configure)
+               # Source debconf library.
+               . /usr/share/debconf/confmodule
 
+               # Read default values
+               CONFIG_FILE=/etc/default/gnunet-daemon
 
-case "$1" in
-    configure)
-       # Source debconf library.
-       . /usr/share/debconf/confmodule
-       
-       # Read default values
-       CONFIG_FILE=/etc/default/gnunet-daemon
+               # This is need to migrate data from 0.6.1b or later
+               echo "Migrating previous GNUnet data (gnunet-update)"
+               gnunet-update
 
-       # This is need to migrate data from 0.6.1b or later
-       echo "Migrating previous GNUnet data (gnunet-update)"
-       gnunet-update
+               # Read debconf values
+               db_get gnunet-daemon/gnunet_user
+               gnunet_user="${RET}"
+               db_get gnunet-daemon/gnunet_group
+               gnunet_group="${RET}"
+               db_get gnunet-daemon/launch_at_startup
+               launch_at_startup="${RET}"
 
-       # Read debconf values
-       db_get gnunet-daemon/gnunet_user
-       gnunet_user="$RET"
-       db_get gnunet-daemon/gnunet_group
-       gnunet_group="$RET"
-       db_get gnunet-daemon/launch_at_startup
-       launch_at_startup="$RET"
-       # Creating gnunet group if needed
-       if ! getent group $gnunet_group > /dev/null ; then
-               echo -n "Creating new GNUnet group $gnunet_group"
-               addgroup --quiet --system $gnunet_group
-               echo " [done]"
-       fi
-       # Creating gnunet user if needed
-       if ! getent passwd $gnunet_user > /dev/null ; then
-               echo -n "Creating new GNUnet user $gnunet_user"
-               adduser --quiet --system --ingroup $gnunet_group 
--no-create-home $gnunet_user
-               echo " [done]"
-       fi
-       # Update files and directories permissions
-       # Assuming default values, this *should* not be changed
-       echo -n "Updating files and directories permissions"
-       /bin/chown -R $gnunet_user:$gnunet_group /var/run/gnunetd
-       /bin/chown -R $gnunet_user:$gnunet_group /var/log/gnunetd
-       # Use the new "gnunet-update -g"
-       GNUNETD_HOME=`gnunet-update --get=GNUNETD:GNUNETD_HOME`
-       /bin/chown -R $gnunet_user:$gnunet_group $GNUNETD_HOME
-       echo  " [done]"
-       # Writing new values to configuration file
-       echo -n "Writing new configuration file"
-       CONFIG_NEW=`/bin/tempfile`
-       cat > $CONFIG_NEW <<EOF
-# This file controls the behaviour of the GNUnet init script. 
+               # Creating gnunet group if needed
+               if ! getent group ${gnunet_group} > /dev/null
+               then
+                       echo -n "Creating new GNUnet group ${gnunet_group}: "
+                       addgroup --quiet --system ${gnunet_group}
+                       echo "done."
+               fi
+
+               # Creating gnunet user if needed
+               if ! getent passwd $gnunet_user > /dev/null
+               then
+                       echo -n "Creating new GNUnet user ${gnunet_user}: "
+                       adduser --quiet --system --ingroup ${gnunet_group} 
--no-create-home ${gnunet_user}
+                       echo "done."
+               fi
+
+               # Update files and directories permissions.
+               # Assuming default values, this *should* not be changed.
+               echo -n "Updating files and directories permissions: "
+               chown -R ${gnunet_user}:${gnunet_group} /var/run/gnunetd
+               chown -R ${gnunet_user}:${gnunet_group} /var/log/gnunetd
+               # Use the new "gnunet-update -g"
+               GNUNETD_HOME=`gnunet-update --get=GNUNETD:GNUNETD_HOME`
+               chown -R ${gnunet_user}:${gnunet_group} ${GNUNETD_HOME}
+               echo  "done."
+
+               # Writing new values to configuration file
+               echo -n "Writing new configuration file: "
+               CONFIG_NEW=`/bin/tempfile`
+
+cat > "${CONFIG_NEW}" <<EOF
+# This file controls the behaviour of the GNUnet init script.
 # It will be parsed as a shell script.
-# please do not edit by hand but
-# use dpkg-reconfigure gnunet-daemon
+# please do not edit by hand, use 'dpkg-reconfigure gnunet-daemon'.
 
-GNUNET_USER=$gnunet_user
-GNUNET_GROUP=$gnunet_group
+GNUNET_USER=${gnunet_user}
+GNUNET_GROUP=${gnunet_group}
 EOF
 
-       cp -f $CONFIG_NEW $CONFIG_FILE
-       echo " [done]"
-       
-       # Secure access to the data directory
-       /bin/chmod 0700 $GNUNETD_HOME || true
-       
-       # Cleaning
-       rm -f $CONFIG_NEW
-       echo "All done."
-       if [ "$launch_at_startup" = 'true' ]; then
-               if [ -x "/etc/init.d/gnunet-daemon" ]; then
-                   update-rc.d gnunet-daemon defaults > /dev/null 2>&1 || true
-                   if [ -x /usr/sbin/invoke-rc.d ]; then
-                     invoke-rc.d gnunet-daemon start || true
-                   else
-                     /etc/init.d/gnunet-daemon start || true
-                   fi
-               fi
-       else
-               if [ -x "/etc/init.d/gnunet-daemon" ]; then
-                   if [ -x /usr/sbin/invoke-rc.d ] ; then
-                       invoke-rc.d gnunet-daemon stop || true
-                   else
-                       /etc/init.d/gnunet-daemon stop || true
-                   fi
-               fi
-               update-rc.d -f gnunet-daemon remove > /dev/null 2>&1 || true
-       fi
+               cp -f "${CONFIG_NEW}" "${CONFIG_FILE}"
+               echo "done."
 
+               # Secure access to the data directory
+               chmod 0700 "${GNUNETD_HOME}" || true
 
-    ;;
+               # Cleaning
+               rm -f "${CONFIG_NEW}"
+               echo "All done."
 
-    abort-upgrade|abort-remove|abort-deconfigure)
+               if [ "${launch_at_startup}" = "true" ]
+               then
+                       if [ -x /etc/init.d/gnunet-daemon ]
+                       then
+                               update-rc.d gnunet-daemon defaults > /dev/null 
2>&1 || true
 
-    ;;
+                               if [ -x /usr/sbin/invoke-rc.d ]
+                               then
+                                       invoke-rc.d gnunet-daemon start || true
+                               else
+                                       /etc/init.d/gnunet-daemon start || true
+                               fi
+                       fi
+               else
+                       if [ -x /etc/init.d/gnunet-daemon ]
+                       then
+                               if [ -x /usr/sbin/invoke-rc.d ]
+                               then
+                                       invoke-rc.d gnunet-daemon stop || true
+                               else
+                                       /etc/init.d/gnunet-daemon stop || true
+                               fi
+                       fi
 
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
+                       update-rc.d -f gnunet-daemon remove > /dev/null 2>&1 || 
true
+               fi
+               ;;
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
+       abort-upgrade|abort-remove|abort-deconfigure)
 
-#DEBHELPER#
+               ;;
 
-exit 0
+       *)
+               echo "postinst called with unknown argument \`${1}'" >&2
+               exit 1
+               ;;
+esac
 
+#DEBHELPER#
 
+exit 0

Modified: GNUnet/debian/gnunet-daemon.postrm
===================================================================
--- GNUnet/debian/gnunet-daemon.postrm  2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/gnunet-daemon.postrm  2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,12 +1,25 @@
-#!/bin/sh -e
-if [ "$1" = "purge" ] ; then
-       update-rc.d -f gnunet-daemon remove > /dev/null 2>&1 || exit 0
-fi
+#!/bin/sh
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
+set -e
 
+case "${1}" in
+       purge)
+               update-rc.d -f gnunet-daemon remove > /dev/null 2>&1 || exit 0
+
+               rm -rf /var/log/gnunetd
+               rm -rf /var/run/gnunetd
+               ;;
+
+       remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+               ;;
+
+       *)
+               echo "postrm called with unknown argument \`${1}'" >&2
+               exit 1
+               ;;
+esac
+
 #DEBHELPER#
 
 exit 0
-

Modified: GNUnet/debian/gnunet-daemon.prerm
===================================================================
--- GNUnet/debian/gnunet-daemon.prerm   2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/gnunet-daemon.prerm   2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,18 +1,17 @@
 #!/bin/sh
+
 set -e
 
-if [ -x "/etc/init.d/gnunet-daemon" ]; then
-       if [ -x /usr/sbin/invoke-rc.d ] ; then
+if [ -x /etc/init.d/gnunet-daemon ]
+then
+       if [ -x /usr/sbin/invoke-rc.d ]
+       then
                invoke-rc.d gnunet-daemon stop || exit 0
        else
                /etc/init.d/gnunet-daemon stop || exit 0
        fi
 fi
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
 
 exit 0
-

Modified: GNUnet/debian/gnunet-daemon.templates
===================================================================
--- GNUnet/debian/gnunet-daemon.templates       2007-07-30 06:19:49 UTC (rev 
5386)
+++ GNUnet/debian/gnunet-daemon.templates       2007-07-30 06:21:56 UTC (rev 
5387)
@@ -1,74 +1,35 @@
-Template: gnunet-daemon/warning
-Type: note
-_Description: Former installation of GNUnet detected
- Since there are important changes in this version, the installer
- will need to modify the GNUnet configuration file (/etc/gnunet.conf).
- .
- The installation process will backup /etc/gnunet.conf to
- /etc/gnunet.conf.old, and will automatically build a new configuration
- file.
- .
- Every personal settings will be preserved as much as possible.
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# for an advice to address@hidden
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
 
-Template: gnunet-daemon/failed
-Type: note
-_Description: Warning
- For some obscure reason, the installer have failed to discover
- the configuration settings in /etc/gnunet.conf.
- .
- The old configuration file will be moved to /etc/gnunet.conf.old.
- .
- Since some changes are *mandatory* in this file, a
- fresh default configuration file will now be installed
- .
- Please take a look and make necessary changes in it if needed after
- installation.
-
-Template: gnunet-daemon/prior_07
-Type: note
-_Description: Upgrade from a version prior to 0.7.0
- It seems that you are upgrading GNUnet from a version prior to 0.7.x.
- GNUnet 0.7.x introduced new configuration files and a new database
- storage format which is not compatible with versions prior to 0.7.x.
- .
- GNUnet cannot convert your database format to the new format.
- .
- Your database storage will be automatically moved to /var/lib/GNUnet.prior07,
- and the gnunet package will build a new empty storage for you.
- .
- Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07
- and replaced by /etc/gnunetd.conf which you can modify later by running
- "gnunet-setup -d -c /etc/gnunetd.conf", as root.
-
 Template: gnunet-daemon/launch_at_startup
 Type: boolean
 Default: true
-_Description: Launch at startup?
- Setup GNUnet as a system service. 
- .
- If you accept here, a GNUnet server will be started each time your machine
- starts.  If you decline this option, you need to launch GNUnet each time
- you want to use it.
+_Description: Should the GNUnet daemon be launched on boot?
+ If you choose this option, a GNUnet server will be started each time
+ the system is launched. Otherwise, you will need to launch
+ GNUnet each time you want to use it.
 
 Template: gnunet-daemon/gnunet_user
 Type: string
 Default: gnunet
 _Description: GNUnet user:
- Define the user owning the GNUnet daemon process.
+ Please choose the user that the GNUnet daemon process will run as.
  .
- For security reasons, it's best to create a new user exclusively for  GNUnet.
- .
- If you choose this option, that user will automatically be created  as a 
system user,
- for whom no login will be allowed.
+ This should be a dedicated account. If the specified account does not
+ already exist, it will automatically be created, with no login shell.
 
 Template: gnunet-daemon/gnunet_group
 Type: string
 Default: gnunet
 _Description: GNUnet group:
- Define the group owning the GNUnet daemon process.
+ Please choose the group that the GNUnet daemon process will run as.
  .
- For security reason, the best is to create a new group for this, and make
- sure that it owns no data beside GNUnet's ones.
- .
- Only the members of this group are allowed to start and stop the GNUnet 
server and 
- have access to GNUnet data.
+ This should be a dedicated group, not one that already owns data.
+ Only the members of this group will have access to GNUnet data, and
+ be allowed to start and stop the GNUnet server.

Modified: GNUnet/debian/gnunet-dev.install
===================================================================
--- GNUnet/debian/gnunet-dev.install    2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/gnunet-dev.install    2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/GNUnet/*.la
-debian/tmp/usr/include/*
+/usr/include/*
+/usr/lib/*.so
+/usr/lib/*.la
+/usr/lib/GNUnet/*.la

Modified: GNUnet/debian/gnunet-tools.install
===================================================================
--- GNUnet/debian/gnunet-tools.install  2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/gnunet-tools.install  2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,7 +1,7 @@
-debian/tmp/usr/bin/gnunet-setup
-debian/tmp/usr/lib/libgnunetsetup.so.*
-debian/tmp/usr/lib/GNUnet/libgnunetsetup_*.so
-debian/tmp/usr/share/GNUnet/gnunet-setup.glade
-debian/tmp/usr/share/GNUnet/config-client.scm
-debian/tmp/usr/share/GNUnet/config-daemon.scm
-debian/tmp/usr/share/GNUnet/gnunet-logo-color.png
+/usr/bin/gnunet-setup
+/usr/lib/libgnunetsetup.so.*
+/usr/lib/GNUnet/libgnunetsetup_*.so
+/usr/share/GNUnet/config-client.scm
+/usr/share/GNUnet/config-daemon.scm
+/usr/share/GNUnet/gnunet-logo-color.png
+/usr/share/GNUnet/gnunet-setup.glade

Modified: GNUnet/debian/po/cs.po
===================================================================
--- GNUnet/debian/po/cs.po      2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/po/cs.po      2007-07-30 06:21:56 UTC (rev 5387)
@@ -15,224 +15,74 @@
 msgstr ""
 "Project-Id-Version: gnunet\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-03 23:33+0200\n"
-"PO-Revision-Date: 2006-09-25 21:51+0200\n"
+"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"PO-Revision-Date: 2007-06-23 12:42+0200\n"
 "Last-Translator: Miroslav Kure <address@hidden>\n"
 "Language-Team: Czech <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:1001
-msgid "Former installation of GNUnet detected"
-msgstr "Byla rozpoznána předchozí instalace GNUnet"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid ""
-"Since there are important changes in this version, the installer will need "
-"to modify the GNUnet configuration file (/etc/gnunet.conf)."
-msgstr ""
-"Protože se v této verzi udály významné změny, je nutné upravit váš "
-"konfigurační soubor /etc/gnunet.conf."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-msgid ""
-"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
-"old, and will automatically build a new configuration file."
-msgstr ""
-"Instalační proces zazálohuje /etc/gnunet.conf do /etc/gnunet.conf.old a "
-"automaticky vytvoří nový konfigurační soubor."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid "Every personal settings will be preserved as much as possible."
-msgstr "Vaše osobní nastavení bylo pokud možno zachováno."
-
-#. Type: note
-#. Description
 #: ../gnunet-daemon.templates:2001
-msgid "Warning"
-msgstr "Varování"
+msgid "Should the GNUnet daemon be launched on boot?"
+msgstr "Má se daemon GNUnet spouštět při zavádění systému?"
 
-#. Type: note
+#. Type: boolean
 #. Description
 #: ../gnunet-daemon.templates:2001
-#, fuzzy
 msgid ""
-"For some obscure reason, the installer have failed to discover the "
-"configuration settings in /etc/gnunet.conf."
-msgstr ""
-"Z nějakého obskurního důvodu jsem nemohl v /etc/gnunet.conf objevit žádné "
-"nastavení."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-#, fuzzy
-msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
-msgstr "Váš starý konfigurační soubor bude přesunut do /etc/gnunet.conf.old."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Since some changes are *mandatory* in this file, a fresh default "
-"configuration file will now be installed"
-msgstr ""
-"Protože jsou některé změny v tomto souboru *povinné*, nainstaluje se nyní "
-"výchozí konfigurační soubor."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Please take a look and make necessary changes in it if needed after "
-"installation."
-msgstr "Po instalaci jej projděte a případně proveďte nezbytné změny."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Upgrade from a version prior to 0.7.0"
-msgstr "Přechod z dřívější verze než 0.7.0"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
-"0.7.x introduced new configuration files and a new database storage format "
-"which is not compatible with versions prior to 0.7.x."
-msgstr ""
-"Zdá se, že aktualizujete GNUnet z dřívější verze než 0.7.x. GNUnet 0.7.x "
-"zavedl nový formát konfiguračních souborů a nový formát uložení databáze, "
-"které nejsou kompatibilní s verzemi před 0.7.x."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "GNUnet cannot convert your database format to the new format."
-msgstr "GNUnet nemůže převést váš formát databáze do nového formátu."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your database storage will be automatically moved to /var/lib/GNUnet."
-"prior07, and the gnunet package will build a new empty storage for you."
-msgstr ""
-"Vaše databáze bude automaticky přesunuta do /var/lib/GNUnet.prior07 a balík "
-"gnunet vám automaticky vytvoří novou, prázdnou databázi."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
-"and replaced by /etc/gnunetd.conf which you can modify later by running "
-"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
-msgstr ""
-"Také váš konfigurační soubor /etc/gnunet.conf bude přesunut do /etc/gnunet."
-"conf.prior07 a bude nahrazen novějším /etc/gnunet.conf, který můžete později "
-"upravit spuštěním příkazu \"gnunet-setup -d -c /etc/gnunet.conf\" jako "
-"uživatel root."
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Launch at startup?"
-msgstr "Spustit při startu?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Setup GNUnet as a system service."
-msgstr "Chcete spustit GNUnet jako systémovou službu při zavádění systému?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-msgid ""
-"If you accept here, a GNUnet server will be started each time your machine "
-"starts.  If you decline this option, you need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be started each time the "
+"system is launched. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
-"Pokud budete souhlasit, bude se server GNUnet spouštět při každém startu "
-"počítače. Zamítnete-li, budete muset GNUnet spouštět ručně pokaždé, kdy ho "
-"budete chtít použít."
+"Zvolíte-li tuto možnost, bude se server GNUnet spouštět při každém zavádění "
+"systému. V opačném případě budete muset GNUnet spouštět ručně pokaždé, kdy "
+"ho budete chtít použít."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-#, fuzzy
+#: ../gnunet-daemon.templates:3001
 msgid "GNUnet user:"
 msgstr "Uživatel GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid "Define the user owning the GNUnet daemon process."
-msgstr "Zadejte uživatele vlastnícího daemon GNUnet."
+#: ../gnunet-daemon.templates:3001
+msgid "Please choose the user that the GNUnet daemon process will run as."
+msgstr "Zadejte prosím uživatele, pod kterým se bude daemon GNUnet spouštět."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
+#: ../gnunet-daemon.templates:3001
 msgid ""
-"For security reasons, it's best to create a new user exclusively for  GNUnet."
+"This should be a dedicated account. If the specified account does not "
+"already exist, it will automatically be created, with no login shell."
 msgstr ""
-"Z bezpečnostních důvodů je nejlepší vytvořit pro GNUnet nového dedikovaného "
-"uživatele."
+"Mělo by jít o dedikovaný účet. Pokud zadaný účet neexistuje, bude "
+"automaticky vytvořen (bez přihlašovacího shellu)."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid ""
-"If you choose this option, that user will automatically be created  as a "
-"system user, for whom no login will be allowed."
-msgstr ""
-"Zvolíte-li tuto možnost, bude tento uživatel automaticky vytvořen jako "
-"systémový a bude mu zakázáno přihlášení."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
-#, fuzzy
+#: ../gnunet-daemon.templates:4001
 msgid "GNUnet group:"
 msgstr "Skupina GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-msgid "Define the group owning the GNUnet daemon process."
-msgstr "Zadejte skupinu vlastnící daemon GNUnet."
+#: ../gnunet-daemon.templates:4001
+msgid "Please choose the group that the GNUnet daemon process will run as."
+msgstr "Zadejte prosím skupinu, pod kterou se bude daemon GNUnet spouštět."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
+#: ../gnunet-daemon.templates:4001
 msgid ""
-"For security reason, the best is to create a new group for this, and make "
-"sure that it owns no data beside GNUnet's ones."
+"This should be a dedicated group, not one that already owns data. Only the "
+"members of this group will have access to GNUnet data, and be allowed to "
+"start and stop the GNUnet server."
 msgstr ""
-"Z bezpečnostních důvodů je nejlepší vytvořit novou skupinu, která nevlastní "
-"kromě GNUnetu žádná jiná data."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
-msgid ""
-"Only the members of this group are allowed to start and stop the GNUnet "
-"server and  have access to GNUnet data."
-msgstr ""
-"Pouze uživatelé této skupiny mohou spouštět a zastavovat server GNUnet a "
-"mají přístup k datům GNUnetu."
+"Mělo by jít o dedikovanou skupinu různou od té, která již vlastní data. "
+"Pouze členové této skupiny budou mít přístup k datům GNUnetu a budou moci "
+"spouštět a zastavovat server GNUnet."

Modified: GNUnet/debian/po/de.po
===================================================================
--- GNUnet/debian/po/de.po      2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/po/de.po      2007-07-30 06:21:56 UTC (rev 5387)
@@ -4,232 +4,81 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnunet 0.7.0e-4\n"
+"Project-Id-Version: gnunet 0.7.1c-2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-03 23:33+0200\n"
-"PO-Revision-Date: 2007-03-06 21:26+0100\n"
+"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"PO-Revision-Date: 2007-06-20 17:29+0200\n"
 "Last-Translator: Helge Kreutzmann <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:1001
-msgid "Former installation of GNUnet detected"
-msgstr "�ltere Installation von GNUnet erkannt"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid ""
-"Since there are important changes in this version, the installer will need "
-"to modify the GNUnet configuration file (/etc/gnunet.conf)."
-msgstr ""
-"Da es wichtige �nderungen in dieser Version gibt, muss Ihre GNUnet-"
-"Konfigurationsdatei (/etc/gnunet.conf) angepasst werden."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-msgid ""
-"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
-"old, and will automatically build a new configuration file."
-msgstr ""
-"Der Installationsprozess wird eine Sicherungskopie von /etc/gnunet.conf als /"
-"etc/gnunet.conf.old anlegen und automatisch eine neue Konfigurationsdatei "
-"aufbauen."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid "Every personal settings will be preserved as much as possible."
-msgstr "Soweit wie m�glich bleibt Ihre pers�nliche Konfiguration erhalten."
-
-#. Type: note
-#. Description
 #: ../gnunet-daemon.templates:2001
-msgid "Warning"
-msgstr "Warnung"
+msgid "Should the GNUnet daemon be launched on boot?"
+msgstr "Soll der GNUnet-Daemon beim Systemstart aktiviert werden?"
 
-#. Type: note
+#. Type: boolean
 #. Description
 #: ../gnunet-daemon.templates:2001
-#, fuzzy
 msgid ""
-"For some obscure reason, the installer have failed to discover the "
-"configuration settings in /etc/gnunet.conf."
-msgstr ""
-"Aus irgendwelchen obskuren Gr�nden ist es nicht gelungen, Ihre "
-"Konfigurationseinstellungen aus /etc/gnunet.conf zu erkennen."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-#, fuzzy
-msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
-msgstr "Ihre alte Konfiguration wird in /etc/gnunet.conf.old umbenannt."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Since some changes are *mandatory* in this file, a fresh default "
-"configuration file will now be installed"
-msgstr ""
-"Da einige �nderungen an dieser Datei *zwingend* sind, wird jetzt eine "
-"frische Standardkonfigurationsdatei installiert."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Please take a look and make necessary changes in it if needed after "
-"installation."
-msgstr ""
-"Bitte �berpr�fen Sie diese und nehmen Sie bei Bedarf nach der Installation "
-"die notwendigen �nderungen vor."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Upgrade from a version prior to 0.7.0"
-msgstr "Upgrade von einer Version vor 0.7.0"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
-"0.7.x introduced new configuration files and a new database storage format "
-"which is not compatible with versions prior to 0.7.x."
-msgstr ""
-"Es scheint, dass Sie ein Upgrade von GNUnet von einer Version vor 0.7.x "
-"durchf�hren. GNUnet 0.7.x f�hrte neue Konfigurationsdateien und ein neues "
-"Datenbankspeicherformat ein, die nicht mit denen von Versionen vor 0.7.x "
-"kompatibel sind."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "GNUnet cannot convert your database format to the new format."
-msgstr "GNUnet kann Ihr Datenbankformat nicht in das neue Format konvertieren."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your database storage will be automatically moved to /var/lib/GNUnet."
-"prior07, and the gnunet package will build a new empty storage for you."
-msgstr ""
-"Ihre Datenbankspeicherung wird automatisch nach /var/lib/GNUnet.prior07 "
-"verschoben und das GNUnet-Paket wird eine neue, leere Speicherung f�r Sie "
-"erstellen."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
-"and replaced by /etc/gnunetd.conf which you can modify later by running "
-"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
-msgstr ""
-"Auch Ihre /etc/gnunet.conf-Datei wird nach /etc/gnunet.conf.prior07 "
-"verschoben und durch /etc/gnunetd.conf ersetzt, die Sie sp�ter als Root "
-"mittels Ausf�hrung von �gnunet-setup -d -c /etc/gnunetd.conf� ver�ndern "
-"k�nnen."
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Launch at startup?"
-msgstr "Beim Systemstart starten?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Setup GNUnet as a system service."
-msgstr "M�chten Sie GNUnet als Systemdienst starten?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-msgid ""
-"If you accept here, a GNUnet server will be started each time your machine "
-"starts.  If you decline this option, you need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be started each time the "
+"system is launched. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
-"Falls Sie hier zustimmen, wird ein GNUnet-Server jedes Mal gestartet, wenn "
-"Ihre Maschine startet. Falls Sie diese Option ablehnen, m�ssen Sie GNUnet "
-"jedes Mal starten, wenn Sie es benutzen wollen."
+"Falls Sie diese Option ausw�hlen, wird ein GNUnet-Server jedes Mal "
+"gestartet, wenn Ihre Maschine startet. Andernfalls, m�ssen Sie GNUnet jedes "
+"Mal starten, wenn Sie es benutzen wollen."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-#, fuzzy
+#: ../gnunet-daemon.templates:3001
 msgid "GNUnet user:"
 msgstr "GNUnet-Benutzer:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid "Define the user owning the GNUnet daemon process."
-msgstr "Definieren Sie den Benutzer, der den GNUnet-Daemonprozess besitzt."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:5001
-msgid ""
-"For security reasons, it's best to create a new user exclusively for  GNUnet."
+#: ../gnunet-daemon.templates:3001
+msgid "Please choose the user that the GNUnet daemon process will run as."
 msgstr ""
-"Aus Sicherheitsgr�nden ist es am besten, einen neuen Benutzer exklusiv f�r "
-"GNUnet zu erstellen."
+"Bitte w�hlen Sie den Benutzer aus, unter dessen Kennung der GNUnet-"
+"Daemonprozess laufen wird."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
+#: ../gnunet-daemon.templates:3001
 msgid ""
-"If you choose this option, that user will automatically be created  as a "
-"system user, for whom no login will be allowed."
+"This should be a dedicated account. If the specified account does not "
+"already exist, it will automatically be created, with no login shell."
 msgstr ""
-"Falls Sie diese Option w�hlen, wird dieser Benutzer automatisch als "
-"Systembenutzer erstellt, f�r den keine Login erlaubt wird."
+"Dies sollte ein dediziertes Konto sein. Falls das angegebene Konto nicht "
+"bereits existiert wird es automatisch (ohne Login-Shell) erstellt."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-#, fuzzy
+#: ../gnunet-daemon.templates:4001
 msgid "GNUnet group:"
 msgstr "GNUnet-Gruppe:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-msgid "Define the group owning the GNUnet daemon process."
-msgstr "Definiert die Gruppe, die den GNUnet-Daemonprozess besitzt."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
-msgid ""
-"For security reason, the best is to create a new group for this, and make "
-"sure that it owns no data beside GNUnet's ones."
+#: ../gnunet-daemon.templates:4001
+msgid "Please choose the group that the GNUnet daemon process will run as."
 msgstr ""
-"Aus Sicherheitsgr�nden ist es am besten, eine neue Gruppe hierf�r zu "
-"erstellen und sicherzustellen, dass sie keine Daten au�er denen f�r GNUnet "
-"besitzt."
+"Bitte w�hlen Sie die Gruppe, unter deren Kennung der GNUnet-Daemonprozess "
+"laufen wird."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
+#: ../gnunet-daemon.templates:4001
 msgid ""
-"Only the members of this group are allowed to start and stop the GNUnet "
-"server and  have access to GNUnet data."
+"This should be a dedicated group, not one that already owns data. Only the "
+"members of this group will have access to GNUnet data, and be allowed to "
+"start and stop the GNUnet server."
 msgstr ""
-"Nur die Mitglieder dieser Gruppe d�rfen den GNUnet-Server starten und "
-"stoppen und haben Zugriff auf die GNUnet-Daten."
+"Dies sollte eine dedizierte Gruppe sein, und keine, die bereits Daten "
+"besitzt. Nur die Mitglieder dieser Gruppe werden Zugriff auf GNUnet-Daten "
+"haben und nur ihnen wird es erlaubt, den GNUnet-Server zu starten und zu "
+"beenden."

Modified: GNUnet/debian/po/es.po
===================================================================
--- GNUnet/debian/po/es.po      2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/po/es.po      2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,262 +1,110 @@
-# GNUnet translation to spanish
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the package.
+# gnunet po-debconf translation to Spanish
+# Copyright (C) 2005 Software in the Public Interest
+# This file is distributed under the same license as the gnunet package.
 #
 # Changes:
-# - Initial translation
-#     Javier Ruano Ruano , 2007
+#  - Initial translation
+#         César Gómez Martín <address@hidden>
 #
+#  - Revision and updates
+#         Rudy Godoy Guillén <address@hidden, 2007
 #
-#  Traductores, si no conoce el formato PO, merece la pena leer la
-#  documentación de gettext, especialmente las secciones dedicadas a este
-#  formato, por ejemplo ejecutando:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-# Equipo de traducción al español, por favor lean antes de traducir
+#   Traductores, si no conoce el formato PO, merece la pena leer la
+#   documentación de gettext, especialmente las secciones dedicadas a este
+#   formato, por ejemplo ejecutando:
+#          info -n '(gettext)PO Files'
+#          info -n '(gettext)Header Entry'
+# Equipo de traducción al español, por favor, lean antes de traducir
 # los siguientes documentos:
 #
-# - El proyecto de traducción de Debian al español
-#   http://www.debian.org/intl/spanish/
-#   especialmente las notas y normas de traducción en
-#   http://www.debian.org/intl/spanish/notas
+#  - El proyecto de traducción de Debian al español
+#    http://www.debian.org/intl/spanish/
+#    especialmente las notas de traducción en
+#    http://www.debian.org/intl/spanish/notas
 #
-# - La guía de traducción de po's de debconf:
-#   /usr/share/doc/po-debconf/README-trans
-#   o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#  - La guía de traducción de po's de debconf:
+#    /usr/share/doc/po-debconf/README-trans
+#    o http://www.debian.org/intl/l10n/po-debconf/README-trans
 #
-# Si tiene dudas o consultas sobre esta traducción consulte con el último
-# traductor (campo Last-Translator) y ponga en copia a la lista de
-# traducción de Debian al español (<address@hidden>)
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: GNUnet\n"
+"Project-Id-Version: gnunet 0.7.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-03 23:33+0200\n"
-"PO-Revision-Date: 2007-01-11 01:17+0100\n"
-"Last-Translator: Javier Ruano Ruano <address@hidden>\n"
-"Language-Team: Debian L10n Spanish <address@hidden>\n"
+"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"PO-Revision-Date: 2007-05-26 00:47-0500\n"
+"Last-Translator: César Gómez Martín <address@hidden>\n"
+"Language-Team: Debian l10n spanish <address@hidden>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: SPAIN\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:1001
-msgid "Former installation of GNUnet detected"
-msgstr "Se ha encontrado una instalación previa de GNUnet."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid ""
-"Since there are important changes in this version, the installer will need "
-"to modify the GNUnet configuration file (/etc/gnunet.conf)."
-msgstr ""
-"Es necesario modificar el fichero de configuración de GNUnet (/etc/gnunet."
-"conf) ya que hay cambios importantes en esta versión."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-msgid ""
-"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
-"old, and will automatically build a new configuration file."
-msgstr ""
-"El proceso de instalación hará un copia de seguridad de /etc/gnunet.conf en /"
-"etc/gnunet.conf.old y creará un nuevo fichero de configuración."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid "Every personal settings will be preserved as much as possible."
-msgstr "Se mantendrán sus cambios personales en la medida de lo posible."
-
-#. Type: note
-#. Description
 #: ../gnunet-daemon.templates:2001
-msgid "Warning"
-msgstr "Advertencia"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-#, fuzzy
-msgid ""
-"For some obscure reason, the installer have failed to discover the "
-"configuration settings in /etc/gnunet.conf."
+msgid "Should the GNUnet daemon be launched on boot?"
 msgstr ""
-"No hemos encontrado su fichero de opciones en /etc/gnunet.conf, por alguna "
-"razón desconocida."
 
-#. Type: note
+#. Type: boolean
 #. Description
 #: ../gnunet-daemon.templates:2001
 #, fuzzy
-msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
-msgstr ""
-"Se guardará su fichero de configuración anterior como /etc/gnunet.conf.old."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
+#| msgid ""
+#| "If you accept here, a GNUnet server will be started each time your "
+#| "machine starts.  If you decline this option, you need to launch GNUnet "
+#| "each time you want to use it."
 msgid ""
-"Since some changes are *mandatory* in this file, a fresh default "
-"configuration file will now be installed"
-msgstr ""
-"Se instalará un nuevo fichero nuevo de configuración, dado que algunos "
-"cambios son *obligatorios* en este fichero."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Please take a look and make necessary changes in it if needed after "
-"installation."
-msgstr ""
-"Consulte el fichero y haga los cambios pertinentes, si fuera necesario, "
-"después de la instalación."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Upgrade from a version prior to 0.7.0"
-msgstr "Actualizar desde una versión anterior a 0.7.0"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
-"0.7.x introduced new configuration files and a new database storage format "
-"which is not compatible with versions prior to 0.7.x."
-msgstr ""
-"Parece que está actualizando GNUnet desde una versión anterior a 0.7.x. "
-"GNUnet 0.7.x introdujo nuevos ficheros de configuración y un nuevo formato "
-"en la base de datos que son incompatibles con las versiones anteriores a la "
-"0.7.x."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "GNUnet cannot convert your database format to the new format."
-msgstr ""
-"GNUnet no puede transformar el formato de su base de datos al nuevo formato."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your database storage will be automatically moved to /var/lib/GNUnet."
-"prior07, and the gnunet package will build a new empty storage for you."
-msgstr ""
-"Su base de datos se trasladará automáticamente a /var/lib/GNUnet.prior07, y "
-"el paquete gnunet le construirá una nueva base de datos."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
-"and replaced by /etc/gnunetd.conf which you can modify later by running "
-"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
-msgstr ""
-"Su fichero /etc/gnunet.conf será también trasladado a /etc/gnunet.conf."
-"prior07 y remplazado por /etc/gnunetd.conf, que podrá modificar más tarde "
-"ejecutando , como root, «gnunet-setup -d -c /etc/gnunetd.conf»."
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Launch at startup?"
-msgstr "¿Desea ejecutarlo en el arranque?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Setup GNUnet as a system service."
-msgstr "¿Desea ejecutar GNUnet como un servicio del sistema?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-msgid ""
-"If you accept here, a GNUnet server will be started each time your machine "
-"starts.  If you decline this option, you need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be started each time the "
+"system is launched. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
-"Si responde afirmativamente aquí, se iniciará un servidor GNUnet cada vez "
-"que su máquina arranque. Si rechaza esta opción, deberá ejecutar GNUnet "
-"usted mismo cada vez."
+"Si aquí responde afirmativamente se iniciará un servidor GNUnet cada vez que "
+"su máquina arranque. Si rechaza esta opción necesitará lanzar GNUnet cada "
+"vez que quiera usarlo."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-#, fuzzy
+#: ../gnunet-daemon.templates:3001
 msgid "GNUnet user:"
-msgstr "Usuario para GNUnet:"
+msgstr "Usuario GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid "Define the user owning the GNUnet daemon process."
-msgstr "Especifique el usuario al que pertenecerá el proceso demonio GNUnet"
+#: ../gnunet-daemon.templates:3001
+#, fuzzy
+#| msgid "Define the user owning the GNUnet daemon process."
+msgid "Please choose the user that the GNUnet daemon process will run as."
+msgstr "Indique el usuario al que pertenecerá el proceso demonio GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
+#: ../gnunet-daemon.templates:3001
 msgid ""
-"For security reasons, it's best to create a new user exclusively for  GNUnet."
+"This should be a dedicated account. If the specified account does not "
+"already exist, it will automatically be created, with no login shell."
 msgstr ""
-"Por razones de seguridad, lo mejor sería crear un nuevo usurio sólo para "
-"GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid ""
-"If you choose this option, that user will automatically be created  as a "
-"system user, for whom no login will be allowed."
-msgstr ""
-"Si elige esta opción, se creará el usuario automáticamente como un usuario "
-"del sistema. Este usuario no tendrá permisos para acceder de forma "
-"interactiva al sistema."
+#: ../gnunet-daemon.templates:4001
+msgid "GNUnet group:"
+msgstr "Grupo GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
+#: ../gnunet-daemon.templates:4001
 #, fuzzy
-msgid "GNUnet group:"
-msgstr "Grupo de GNUnet:"
+#| msgid "Define the group owning the GNUnet daemon process."
+msgid "Please choose the group that the GNUnet daemon process will run as."
+msgstr "Indique el grupo al que pertenecerá el proceso demonio GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-msgid "Define the group owning the GNUnet daemon process."
-msgstr "Especifique el grupo al que pertenecerá el proceso demonio GNUnet."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
+#: ../gnunet-daemon.templates:4001
 msgid ""
-"For security reason, the best is to create a new group for this, and make "
-"sure that it owns no data beside GNUnet's ones."
+"This should be a dedicated group, not one that already owns data. Only the "
+"members of this group will have access to GNUnet data, and be allowed to "
+"start and stop the GNUnet server."
 msgstr ""
-"Por razones de seguridad, lo mejor sería crear un nuevo grupo sólo para "
-"esto, y estar seguros que este no posee más datos de los que a GNUnet le "
-"corresponden."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
-msgid ""
-"Only the members of this group are allowed to start and stop the GNUnet "
-"server and  have access to GNUnet data."
-msgstr ""
-"Sólo los miembros de este grupo podrán iniciar o parar el servidor GNUnet y "
-"tendrán acceso a los datos de GNUnet."

Modified: GNUnet/debian/po/fr.po
===================================================================
--- GNUnet/debian/po/fr.po      2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/po/fr.po      2007-07-30 06:21:56 UTC (rev 5387)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: gnunet\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-03 23:33+0200\n"
+"POT-Creation-Date: 2007-06-27 09:09+0000\n"
 "PO-Revision-Date: 2005-10-18 18:27+0100\n"
 "Last-Translator: Eric Madesclair <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
@@ -23,156 +23,23 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:1001
-msgid "Former installation of GNUnet detected"
-msgstr "Ancienne installation de GNUnet d�tect�e"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid ""
-"Since there are important changes in this version, the installer will need "
-"to modify the GNUnet configuration file (/etc/gnunet.conf)."
-msgstr ""
-"La nouvelle version de GNUnet comporte beaucoup de modifications et le "
-"fichier de configuration (/etc/gnunet.conf) doit donc �tre modifi� en "
-"cons�quence."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-msgid ""
-"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
-"old, and will automatically build a new configuration file."
-msgstr ""
-"Le processus d'installation sauvegardera le fichier /etc/gnunet.conf dans /"
-"etc/gnunet.conf.old et cr�era un nouveau fichier de configuration."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid "Every personal settings will be preserved as much as possible."
-msgstr "Vos param�tres de configuration seront pr�serv�s autant que possible."
-
-#. Type: note
-#. Description
 #: ../gnunet-daemon.templates:2001
-msgid "Warning"
-msgstr "Impossible de d�terminer les param�tres de configuration"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-#, fuzzy
-msgid ""
-"For some obscure reason, the installer have failed to discover the "
-"configuration settings in /etc/gnunet.conf."
+msgid "Should the GNUnet daemon be launched on boot?"
 msgstr ""
-"Le processus d'installation n'a pas pu d�terminer vos param�tres de "
-"configuration dans /etc/gnunet.conf."
 
-#. Type: note
+#. Type: boolean
 #. Description
 #: ../gnunet-daemon.templates:2001
 #, fuzzy
-msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
-msgstr ""
-"Votre ancien fichier de configuration sera d�plac� dans /etc/gnunet.conf.old."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
+#| msgid ""
+#| "If you accept here, a GNUnet server will be started each time your "
+#| "machine starts.  If you decline this option, you need to launch GNUnet "
+#| "each time you want to use it."
 msgid ""
-"Since some changes are *mandatory* in this file, a fresh default "
-"configuration file will now be installed"
-msgstr ""
-"Certains r�glages sont devenus *obligatoires* et un nouveau fichier de "
-"configuration va donc �tre install�."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Please take a look and make necessary changes in it if needed after "
-"installation."
-msgstr ""
-"Veuillez v�rifier ce fichier de configuration et faire les modifcations "
-"n�cessaires si besoin apr�s l'installation."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Upgrade from a version prior to 0.7.0"
-msgstr "Mise � jour depuis une version ant�rieure � la 0.7.0"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
-"0.7.x introduced new configuration files and a new database storage format "
-"which is not compatible with versions prior to 0.7.x."
-msgstr ""
-"Il semble que vous mettiez � jour GNUnet depuis une version ant�rieure � la "
-"0.7.x. Avec GNUnet 0.7.x, de nouveaux fichiers de configuration ont �t� "
-"ajout�s et le format des donn�es de la base a �t� modifi�. Ces modifications "
-"ne sont pas compatible avec les versions ant�rieures � la 0.7.x."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "GNUnet cannot convert your database format to the new format."
-msgstr ""
-"GNUnet ne peut pas convertir le format de votre base de donn�es dans le "
-"nouveau format."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your database storage will be automatically moved to /var/lib/GNUnet."
-"prior07, and the gnunet package will build a new empty storage for you."
-msgstr ""
-"Votre base de donn�es sera d�plac�e automatiquement dans /var/lib/GNUnet."
-"prior07 et une nouvelle base vide sera cr��e pour vous."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
-"and replaced by /etc/gnunetd.conf which you can modify later by running "
-"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
-msgstr ""
-"Le fichier /etc/gnunet.conf a �t� renomm� en /etc/gnunet.conf.prior07 et "
-"remplac� par un nouveau fichier /etc/gnunetd.conf que vous pourrez modifier "
-"plus tard en lan�ant la commande ��gnunet-setup -d -c /etc/gnunetd.conf�� en "
-"tant que superutilisateur (��root��)."
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Launch at startup?"
-msgstr "Faut-il lancer GNUnet au d�marrage du syst�me�?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Setup GNUnet as a system service."
-msgstr "GNUnet peut �tre lanc� comme un service syst�me."
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-msgid ""
-"If you accept here, a GNUnet server will be started each time your machine "
-"starts.  If you decline this option, you need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be started each time the "
+"system is launched. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
 "Si vous choisissez cette option, le serveur GNUnet sera lanc� � chaque "
@@ -181,71 +48,51 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
+#: ../gnunet-daemon.templates:3001
 #, fuzzy
 msgid "GNUnet user:"
 msgstr "Utilisateur GNUnet�:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid "Define the user owning the GNUnet daemon process."
+#: ../gnunet-daemon.templates:3001
+#, fuzzy
+#| msgid "Define the user owning the GNUnet daemon process."
+msgid "Please choose the user that the GNUnet daemon process will run as."
 msgstr ""
 "Veuillez indiquer l'utilisateur sous l'identit� duquel s'ex�cutera le d�mon "
 "GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
+#: ../gnunet-daemon.templates:3001
 msgid ""
-"For security reasons, it's best to create a new user exclusively for  GNUnet."
+"This should be a dedicated account. If the specified account does not "
+"already exist, it will automatically be created, with no login shell."
 msgstr ""
-"Pour des raisons de s�curit�, il est conseill� de cr�er un nouvel "
-"utilisateur exclusivement pour GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid ""
-"If you choose this option, that user will automatically be created  as a "
-"system user, for whom no login will be allowed."
-msgstr ""
-"Si vous choisissez cette possibilit�, un utilisateur syst�me sera cr�� "
-"automatiquement. Il ne sera pas capable de se connecter interactivement au "
-"syst�me."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
+#: ../gnunet-daemon.templates:4001
 #, fuzzy
 msgid "GNUnet group:"
 msgstr "Groupe de GNUnet�:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-msgid "Define the group owning the GNUnet daemon process."
+#: ../gnunet-daemon.templates:4001
+#, fuzzy
+#| msgid "Define the group owning the GNUnet daemon process."
+msgid "Please choose the group that the GNUnet daemon process will run as."
 msgstr ""
 "Veuillez indiquer le groupe sous l'identit� duquel s'ex�cutera le d�mon "
 "GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
+#: ../gnunet-daemon.templates:4001
 msgid ""
-"For security reason, the best is to create a new group for this, and make "
-"sure that it owns no data beside GNUnet's ones."
+"This should be a dedicated group, not one that already owns data. Only the "
+"members of this group will have access to GNUnet data, and be allowed to "
+"start and stop the GNUnet server."
 msgstr ""
-"Pour des raisons de s�curit�, il est conseill� de cr�er un nouveau groupe et "
-"de s'assurer qu'il ne pourra pas acc�der � d'autre donn�es que celles "
-"appartenant � GNUnet."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
-msgid ""
-"Only the members of this group are allowed to start and stop the GNUnet "
-"server and  have access to GNUnet data."
-msgstr ""
-"Seuls les membres de ce groupe pourront d�marrer et arr�ter le serveur "
-"GNUnet et acc�der aux donn�es de GNUnet."

Modified: GNUnet/debian/po/pt.po
===================================================================
--- GNUnet/debian/po/pt.po      2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/po/pt.po      2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,238 +1,82 @@
-# Portuguese translation of gnunet.
+# Portuguese translation of gnunet debconf messages.
 # Copyright (C) 2006 THE gnunet'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnunet package.
 # Rui Branco <address@hidden>, 2006.
+# 2007-06-11 - Rui Branco <address@hidden> - 3u8f
 #
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.7.0e-1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-03 23:33+0200\n"
-"PO-Revision-Date: 2006-06-17 00:21+0100\n"
+"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"PO-Revision-Date: 2007-06-11 08:26+0100\n"
 "Last-Translator: Rui Branco <address@hidden>\n"
 "Language-Team: Portuguese <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:1001
-msgid "Former installation of GNUnet detected"
-msgstr "Detectada uma instalação actual do GNUnet"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid ""
-"Since there are important changes in this version, the installer will need "
-"to modify the GNUnet configuration file (/etc/gnunet.conf)."
-msgstr ""
-"Pelo facto de existirem alterações importantes nesta versão, irá ser "
-"necessário modificar o ficheiro de configuração do GNUnet (/etc/gnunet.conf)."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-msgid ""
-"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
-"old, and will automatically build a new configuration file."
-msgstr ""
-"O processo de instalação irá salvaguardar o ficheiro /etc/gnunet.conf para /"
-"etc/gnunet.conf.old e automaticamente construir um novo ficheiro de "
-"configuração."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid "Every personal settings will be preserved as much as possible."
-msgstr ""
-"As suas configurações pessoais serão preservadas na medida do possível."
-
-#. Type: note
-#. Description
 #: ../gnunet-daemon.templates:2001
-msgid "Warning"
-msgstr "Aviso"
+msgid "Should the GNUnet daemon be launched on boot?"
+msgstr "Deverá o daemon GNUnet ser lanchado durante o arranque?"
 
-#. Type: note
+#. Type: boolean
 #. Description
 #: ../gnunet-daemon.templates:2001
-#, fuzzy
 msgid ""
-"For some obscure reason, the installer have failed to discover the "
-"configuration settings in /etc/gnunet.conf."
-msgstr ""
-"Por alguma razão obscura, foi fracassada a tentativa de detectar as suas "
-"configurações em /etc/gnunet.conf."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-#, fuzzy
-msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
-msgstr "A sua antiga configuração será movida para /etc/gnunet.conf.old."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Since some changes are *mandatory* in this file, a fresh default "
-"configuration file will now be installed"
-msgstr ""
-"Como algumas alterações neste ficheiro são *mandatórias*, uma nova "
-"configuração por omissão será instalada"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Please take a look and make necessary changes in it if needed after "
-"installation."
-msgstr ""
-"Perca um pouco de tempo e faça as alterações necessárias nele se for "
-"necessário depois da instalação."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Upgrade from a version prior to 0.7.0"
-msgstr "Actualização a partir de uma versão anterior a 0.7.0"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
-"0.7.x introduced new configuration files and a new database storage format "
-"which is not compatible with versions prior to 0.7.x."
-msgstr ""
-"Pareçe que está a actualizar o GNUnet a partir de uma versão anterior a 0.7."
-"x. O GNUnet 0.7.x introduziu novos ficheiros de configuração e um novo "
-"formato de base de dados que não é compatível com as versões anteriores a "
-"0.7.x."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "GNUnet cannot convert your database format to the new format."
-msgstr ""
-"O GNUnet não pode converter o formato da sua base de dados para o novo "
-"formato."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your database storage will be automatically moved to /var/lib/GNUnet."
-"prior07, and the gnunet package will build a new empty storage for you."
-msgstr ""
-"O local da base de dados será automaticamente movido para /var/lib/GNUnet."
-"prior07, o pacote gnunet criará um novo local vazio para si."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
-"and replaced by /etc/gnunetd.conf which you can modify later by running "
-"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
-msgstr ""
-"O seu ficheiro /etc/gnunet.conf será também movido para /etc/gnunet.conf."
-"prior07 e substituído por /etc/gnunetd.conf o qual poderá alterar mais tarde "
-"correndo \"gnunet-setup·-d·-c·/etc/gnunetd.conf\" como root."
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Launch at startup?"
-msgstr "Lançar durante o arranque?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Setup GNUnet as a system service."
-msgstr "Pretende lançar o GNUnet como um serviço de sistema ?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-msgid ""
-"If you accept here, a GNUnet server will be started each time your machine "
-"starts.  If you decline this option, you need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be started each time the "
+"system is launched. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
-"Se aceitar nesta fase, um servidor GNUnet será iniciado cada vez que a sua "
-"máquina arranca. Se não aceitar esta opção terá que lançar o GNUnet cada vez "
-"que o quiser usar."
+"Se aceitar esta opção, um servidor GNUnet será iniciado cada vez que o "
+"sistema é iniciado. De outro modo, terá que lançar o GNUnet cada vez que o "
+"quiser usar."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-#, fuzzy
+#: ../gnunet-daemon.templates:3001
 msgid "GNUnet user:"
 msgstr "Utilizador GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid "Define the user owning the GNUnet daemon process."
-msgstr "Defina o utilizador dono do processo 'daemon' GNUnet."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:5001
-msgid ""
-"For security reasons, it's best to create a new user exclusively for  GNUnet."
+#: ../gnunet-daemon.templates:3001
+msgid "Please choose the user that the GNUnet daemon process will run as."
 msgstr ""
-"Por razões de segurança é conveniente criar um novo utilizador "
-"exclusivamente para o GNUnet."
+"Por favor escolha o utilizador através do qual o daemon GNUnet irá correr."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
+#: ../gnunet-daemon.templates:3001
 msgid ""
-"If you choose this option, that user will automatically be created  as a "
-"system user, for whom no login will be allowed."
+"This should be a dedicated account. If the specified account does not "
+"already exist, it will automatically be created, with no login shell."
 msgstr ""
-"Se escolher esta opção o utilizador será automaticamente criado como um "
-"utilizador de sistema, para quem o login não será permitido."
+"Esta deverá ser uma conta dedicada. Se a conta especificada não existir, ela "
+"será automaticamente criada, sem acesso de login por consola."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-#, fuzzy
+#: ../gnunet-daemon.templates:4001
 msgid "GNUnet group:"
 msgstr "Grupo GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-msgid "Define the group owning the GNUnet daemon process."
-msgstr "Defina o grupo dono do processo 'daemon' GNUnet."
+#: ../gnunet-daemon.templates:4001
+msgid "Please choose the group that the GNUnet daemon process will run as."
+msgstr "Por favor escolha o frupo através do qual o daemon GNUnet irá correr.."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
+#: ../gnunet-daemon.templates:4001
 msgid ""
-"For security reason, the best is to create a new group for this, and make "
-"sure that it owns no data beside GNUnet's ones."
+"This should be a dedicated group, not one that already owns data. Only the "
+"members of this group will have access to GNUnet data, and be allowed to "
+"start and stop the GNUnet server."
 msgstr ""
-"Por razões de segurança é conveniente criar um novo grupo para esta função e "
-"certificar-se que não é detentor de mais informação que não a relacionada "
-"com o GNUnet."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
-msgid ""
-"Only the members of this group are allowed to start and stop the GNUnet "
-"server and  have access to GNUnet data."
-msgstr ""
-"Apenas os membros deste grupo estão autorizados a iniciar e a parar o "
-"servidor GNUnet e a ter acesso à informação GNUnet."
+"Este grupo deverá ser um grupo dedicado, não um que já contenha a sua "
+"própria informação. Apenas os membros deste grupo terão accesso à informação "
+"do GNUnet, e poderão iniciar e parar o servidor GNUnet."

Modified: GNUnet/debian/po/pt_BR.po
===================================================================
--- GNUnet/debian/po/pt_BR.po   2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/po/pt_BR.po   2007-07-30 06:21:56 UTC (rev 5387)
@@ -7,13 +7,13 @@
 # /usr/share/doc/po-debconf/README-trans
 # or http://www.debian.org/intl/l10n/po-debconf/README-trans
 # Developers do not need to manually edit POT or PO files.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.6.6b-1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-03 23:33+0200\n"
+"POT-Creation-Date: 2007-06-27 09:09+0000\n"
 "PO-Revision-Date: 2005-05-26 10:42-0300\n"
 "Last-Translator: Guilherme de S. Pastore <address@hidden>\n"
 "Language-Team: Debian-BR <address@hidden>\n"
@@ -21,143 +21,23 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:1001
-msgid "Former installation of GNUnet detected"
-msgstr "Instala��o anterior do GNUnet detectada"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid ""
-"Since there are important changes in this version, the installer will need "
-"to modify the GNUnet configuration file (/etc/gnunet.conf)."
-msgstr ""
-"Como h� mudan�as importantes nesta vers�o, n�s precisaremos modificar o seu "
-"arquivo de configura��o do GNUnet (/etc/gnunet.conf)."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-msgid ""
-"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
-"old, and will automatically build a new configuration file."
-msgstr ""
-"O processo de instala��o far� uma c�pia de /etc/gnunet.conf em /etc/gnunet."
-"conf.old, e automaticamente construir� um novo arquivo de configura��o."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid "Every personal settings will be preserved as much as possible."
-msgstr "Suas configura��es pessoais ser�o preservadas o m�ximo poss�vel."
-
-#. Type: note
-#. Description
 #: ../gnunet-daemon.templates:2001
-msgid "Warning"
-msgstr "Aviso"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-#, fuzzy
-msgid ""
-"For some obscure reason, the installer have failed to discover the "
-"configuration settings in /etc/gnunet.conf."
+msgid "Should the GNUnet daemon be launched on boot?"
 msgstr ""
-"Por alguma raz�o desconhecida, n�s n�o conseguimos descobrir suas "
-"configura��es em /etc/gnunet.conf"
 
-#. Type: note
+#. Type: boolean
 #. Description
 #: ../gnunet-daemon.templates:2001
 #, fuzzy
-msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
-msgstr ""
-"Seu arquivo de configura��o anterior ser� movido para /etc/gnunet.conf.old."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
+#| msgid ""
+#| "If you accept here, a GNUnet server will be started each time your "
+#| "machine starts.  If you decline this option, you need to launch GNUnet "
+#| "each time you want to use it."
 msgid ""
-"Since some changes are *mandatory* in this file, a fresh default "
-"configuration file will now be installed"
-msgstr ""
-"J� que algumas mudan�as s�o *obrigat�rias* nesse arquivo, um novo arquivo de "
-"configura��o padr�o ser� instalado agora"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Please take a look and make necessary changes in it if needed after "
-"installation."
-msgstr ""
-"Por favor, verifique e, se preciso, fa�a as mudan�as necess�rias ap�s a "
-"instala��o."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Upgrade from a version prior to 0.7.0"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
-"0.7.x introduced new configuration files and a new database storage format "
-"which is not compatible with versions prior to 0.7.x."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "GNUnet cannot convert your database format to the new format."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your database storage will be automatically moved to /var/lib/GNUnet."
-"prior07, and the gnunet package will build a new empty storage for you."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
-"and replaced by /etc/gnunetd.conf which you can modify later by running "
-"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Launch at startup?"
-msgstr "Rodar na inicializa��o?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Setup GNUnet as a system service."
-msgstr "Voc� deseja rodar o GNUnet como um servi�o do sistema?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-msgid ""
-"If you accept here, a GNUnet server will be started each time your machine "
-"starts.  If you decline this option, you need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be started each time the "
+"system is launched. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
 "Se voc� aceitar, um servidor GNUnet ser� iniciado cada vez que o seu "
@@ -166,68 +46,47 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
+#: ../gnunet-daemon.templates:3001
 #, fuzzy
 msgid "GNUnet user:"
 msgstr "Usu�rio do GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid "Define the user owning the GNUnet daemon process."
+#: ../gnunet-daemon.templates:3001
+#, fuzzy
+#| msgid "Define the user owning the GNUnet daemon process."
+msgid "Please choose the user that the GNUnet daemon process will run as."
 msgstr "Defina o usu�rio que ser� dono do processo do daemon do GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-#, fuzzy
+#: ../gnunet-daemon.templates:3001
 msgid ""
-"For security reasons, it's best to create a new user exclusively for  GNUnet."
+"This should be a dedicated account. If the specified account does not "
+"already exist, it will automatically be created, with no login shell."
 msgstr ""
-"Por raz�es de seguran�a, o melhor � criar um novo usu�rio para isso, e ter "
-"certeza de que ele n�o � dono de informa��o alguma que n�o as do GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
+#: ../gnunet-daemon.templates:4001
 #, fuzzy
-msgid ""
-"If you choose this option, that user will automatically be created  as a "
-"system user, for whom no login will be allowed."
-msgstr ""
-"Se voc� escolher essa op��o, o usu�rio ser� criado automaticamente (como uma "
-"conta de sistema) e n�o ser� autorizado a se logar."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
-#, fuzzy
 msgid "GNUnet group:"
 msgstr "Grupo do GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-msgid "Define the group owning the GNUnet daemon process."
+#: ../gnunet-daemon.templates:4001
+#, fuzzy
+#| msgid "Define the group owning the GNUnet daemon process."
+msgid "Please choose the group that the GNUnet daemon process will run as."
 msgstr "Defina o grupo que ser� respons�vel pelo processo de daemon do GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
+#: ../gnunet-daemon.templates:4001
 msgid ""
-"For security reason, the best is to create a new group for this, and make "
-"sure that it owns no data beside GNUnet's ones."
+"This should be a dedicated group, not one that already owns data. Only the "
+"members of this group will have access to GNUnet data, and be allowed to "
+"start and stop the GNUnet server."
 msgstr ""
-"Por raz�es de seguran�a, o melhor � criar um novo grupo para isto, e ter "
-"certeza de que ele n�o � dono de nenhuma informa��o, com exce��o das do "
-"GNUnet."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
-msgid ""
-"Only the members of this group are allowed to start and stop the GNUnet "
-"server and  have access to GNUnet data."
-msgstr ""
-"Somente os membros deste grupo t�m permiss�o para iniciar e parar o servidor "
-"GNUnet e t�m acesso aos dados do GNUnet."

Modified: GNUnet/debian/po/sv.po
===================================================================
--- GNUnet/debian/po/sv.po      2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/po/sv.po      2007-07-30 06:21:56 UTC (rev 5387)
@@ -13,228 +13,66 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnunet 0.7.0b-1\n"
+"Project-Id-Version: gnunet\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-03 23:33+0200\n"
-"PO-Revision-Date: 2006-01-11 23:46+0100\n"
+"POT-Creation-Date: 2007-06-11 07:59+0200\n"
+"PO-Revision-Date: 2007-06-11 09:30+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
-"Language-Team: Swedish <address@hidden>\n"
+"Language-Team: Swedish <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-msgid "Former installation of GNUnet detected"
-msgstr "Tidigare installation av GNUnet hittades"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid ""
-"Since there are important changes in this version, the installer will need "
-"to modify the GNUnet configuration file (/etc/gnunet.conf)."
-msgstr ""
-"Eftersom det är viktiga ändringar i denna version behöver vi modifiera din "
-"konfigurationsfil för GNUnet (/etc/gnunet.conf)."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-msgid ""
-"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
-"old, and will automatically build a new configuration file."
-msgstr ""
-"Installationsprocessen kommer att säkerhetskopiera /etc/gnunet.conf till /"
-"etc/gnunet.conf.old och automatiskt bygga en ny konfigurationsfil."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid "Every personal settings will be preserved as much as possible."
-msgstr ""
-"Dina personliga inställningar kommer att behållas som mycket som möjligt."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid "Warning"
-msgstr "Varning"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-#, fuzzy
-msgid ""
-"For some obscure reason, the installer have failed to discover the "
-"configuration settings in /etc/gnunet.conf."
-msgstr ""
-"Av någon underlig anledning misslyckades vi att identifiera dina "
-"inställningar i /etc/gnunet.conf."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-#, fuzzy
-msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
-msgstr ""
-"Din gamla konfigurationsfil kommer att flyttas till /etc/gnunet.conf.old."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Since some changes are *mandatory* in this file, a fresh default "
-"configuration file will now be installed"
-msgstr ""
-"Eftersom vissa ändringar är *obligatoriska* i denna fil kommer en färsk "
-"standardkonfigurationsfil nu att installeras"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Please take a look and make necessary changes in it if needed after "
-"installation."
-msgstr ""
-"Vänligen ta en titt på den och gör nödvändiga ändringar vid behov efter "
-"installationen."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Upgrade from a version prior to 0.7.0"
-msgstr "Uppgradering från en version före 0.7.0"
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
-"0.7.x introduced new configuration files and a new database storage format "
-"which is not compatible with versions prior to 0.7.x."
-msgstr ""
-"Det verkar som om du uppgraderar GNUnet från en version före 0.7.x. GNUnet "
-"0.7.x introducerade nya konfigurationsfiler och ett nytt lagringsformat för "
-"databasen som inte är kompatibel med versioner före 0.7.x."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "GNUnet cannot convert your database format to the new format."
-msgstr "GNUnet kan inte konvertera din databas till det nya formatet."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your database storage will be automatically moved to /var/lib/GNUnet."
-"prior07, and the gnunet package will build a new empty storage for you."
-msgstr ""
-"Din databas kommer att automatiskt flyttas till /var/lib/GNUnet.prior07 och "
-"gnunet-paketet kommer att bygga en ny tom lagringsplats åt dig."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
-"and replaced by /etc/gnunetd.conf which you can modify later by running "
-"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
-msgstr ""
-"Din fil /etc/gnunet.conf kommer också att flyttas till /etc/gnunet.conf."
-"prior07 och ersättas av /etc/gnunetd.conf som du kan modifiera senare genom "
-"att köra \"gnunet-setup -d -c /etc/gnunetd.conf\", som root."
-
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Launch at startup?"
-msgstr "Starta vid systemets uppstart?"
+#: ../gnunet-daemon.templates:5001
+msgid "Should the GNUnet daemon be launched on boot?"
+msgstr "Ska GNUnet-demonen startas vid systemets uppstart?"
 
+#| msgid ""
+#| "If you accept here, a GNUnet server will be started each time your "
+#| "machine starts.  If you decline this option, you need to launch GNUnet "
+#| "each time you want to use it."
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Setup GNUnet as a system service."
-msgstr "Vill du starta GNUnet som en systemtjänst ?"
+#: ../gnunet-daemon.templates:5001
+msgid "If you choose this option, a GNUnet server will be started each time 
the system is launched. Otherwise, you will need to launch GNUnet each time you 
want to use it."
+msgstr "Om du väljer det här alternativet kommer en GNUnet-server att startas 
varje gång som systemet startar upp. Om inte behöver du starta GNUnet varje 
gång du vill använda det."
 
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-msgid ""
-"If you accept here, a GNUnet server will be started each time your machine "
-"starts.  If you decline this option, you need to launch GNUnet each time you "
-"want to use it."
-msgstr ""
-"Om du accepterar här kommer en GNUnet-server att startas varje gång din "
-"dator startar.  Om du vägrar behöver du starta GNUnet varje gång du vill "
-"använda det."
-
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-#, fuzzy
+#: ../gnunet-daemon.templates:6001
 msgid "GNUnet user:"
 msgstr "GNUnet-användare:"
 
+#| msgid "Define the user owning the GNUnet daemon process."
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid "Define the user owning the GNUnet daemon process."
-msgstr "Definiera användaren som äger GNUnet-demonens process."
+#: ../gnunet-daemon.templates:6001
+msgid "Please choose the user that the GNUnet daemon process will run as."
+msgstr "Välj den användare som GNUnet-demonens process ska köra som."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid ""
-"For security reasons, it's best to create a new user exclusively for  GNUnet."
-msgstr ""
-"Av säkerhetsskäl är det bäst att skapa en ny användare exklusivt för GNUnet."
+#: ../gnunet-daemon.templates:6001
+msgid "This should be a dedicated account. If the specified account does not 
already exist, it will automatically be created, with no login shell."
+msgstr "Det här bör vara ett dedicerat konto. Om det angivna kontot inte finns 
kommer det automatiskt att skapas, utan något inloggningsskal."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid ""
-"If you choose this option, that user will automatically be created  as a "
-"system user, for whom no login will be allowed."
-msgstr ""
-"Om du väljer detta alternativ kommer användaren att automatiskt skapas som "
-"en systemanvändare, som inte tillåts logga in."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
-#, fuzzy
+#: ../gnunet-daemon.templates:7001
 msgid "GNUnet group:"
 msgstr "GNUnet-grupp:"
 
+#| msgid "Define the group owning the GNUnet daemon process."
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-msgid "Define the group owning the GNUnet daemon process."
-msgstr "Definiera gruppen som äger GNUnet-demonens process."
+#: ../gnunet-daemon.templates:7001
+msgid "Please choose the group that the GNUnet daemon process will run as."
+msgstr "Välj den grupp som GNUnet-demonens process ska köra som."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-msgid ""
-"For security reason, the best is to create a new group for this, and make "
-"sure that it owns no data beside GNUnet's ones."
-msgstr ""
-"Av säkerhetsskäl är det bäst att skapa en ny grupp för detta och se till att "
-"den inte äger något data förrutom det i GNUnet."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
-msgid ""
-"Only the members of this group are allowed to start and stop the GNUnet "
-"server and  have access to GNUnet data."
-msgstr ""
-"Endast medlemmar av denna grupp tillåts att starta och stoppa GNUnet-servern "
-"och har tillgång till GNUnets data."
+#: ../gnunet-daemon.templates:7001
+msgid "This should be a dedicated group, not one that already owns data. Only 
the members of this group will have access to GNUnet data, and be allowed to 
start and stop the GNUnet server."
+msgstr "Det här bör vara en dedicerat grupp, inte en grupp som redan äger 
data. Endast medlemmar av den här gruppen kommer att få åtkomst till GNUnets 
data och kommer att tillåtas att starta och stoppa GNUnet-servern."

Modified: GNUnet/debian/po/templates.pot
===================================================================
--- GNUnet/debian/po/templates.pot      2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/po/templates.pot      2007-07-30 06:21:56 UTC (rev 5387)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-03 23:33+0200\n"
+"POT-Creation-Date: 2007-06-27 09:09+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -16,180 +16,58 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:1001
-msgid "Former installation of GNUnet detected"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-msgid ""
-"Since there are important changes in this version, the installer will need "
-"to modify the GNUnet configuration file (/etc/gnunet.conf)."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-msgid ""
-"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
-"old, and will automatically build a new configuration file."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-msgid "Every personal settings will be preserved as much as possible."
-msgstr ""
-
-#. Type: note
-#. Description
 #: ../gnunet-daemon.templates:2001
-msgid "Warning"
+msgid "Should the GNUnet daemon be launched on boot?"
 msgstr ""
 
-#. Type: note
+#. Type: boolean
 #. Description
 #: ../gnunet-daemon.templates:2001
 msgid ""
-"For some obscure reason, the installer have failed to discover the "
-"configuration settings in /etc/gnunet.conf."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Since some changes are *mandatory* in this file, a fresh default "
-"configuration file will now be installed"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Please take a look and make necessary changes in it if needed after "
-"installation."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Upgrade from a version prior to 0.7.0"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
-"0.7.x introduced new configuration files and a new database storage format "
-"which is not compatible with versions prior to 0.7.x."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "GNUnet cannot convert your database format to the new format."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your database storage will be automatically moved to /var/lib/GNUnet."
-"prior07, and the gnunet package will build a new empty storage for you."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
-"and replaced by /etc/gnunetd.conf which you can modify later by running "
-"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-msgid "Launch at startup?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-msgid "Setup GNUnet as a system service."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-msgid ""
-"If you accept here, a GNUnet server will be started each time your machine "
-"starts.  If you decline this option, you need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be started each time the "
+"system is launched. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
+#: ../gnunet-daemon.templates:3001
 msgid "GNUnet user:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid "Define the user owning the GNUnet daemon process."
+#: ../gnunet-daemon.templates:3001
+msgid "Please choose the user that the GNUnet daemon process will run as."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
+#: ../gnunet-daemon.templates:3001
 msgid ""
-"For security reasons, it's best to create a new user exclusively for  GNUnet."
+"This should be a dedicated account. If the specified account does not "
+"already exist, it will automatically be created, with no login shell."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid ""
-"If you choose this option, that user will automatically be created  as a "
-"system user, for whom no login will be allowed."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
+#: ../gnunet-daemon.templates:4001
 msgid "GNUnet group:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-msgid "Define the group owning the GNUnet daemon process."
+#: ../gnunet-daemon.templates:4001
+msgid "Please choose the group that the GNUnet daemon process will run as."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
+#: ../gnunet-daemon.templates:4001
 msgid ""
-"For security reason, the best is to create a new group for this, and make "
-"sure that it owns no data beside GNUnet's ones."
+"This should be a dedicated group, not one that already owns data. Only the "
+"members of this group will have access to GNUnet data, and be allowed to "
+"start and stop the GNUnet server."
 msgstr ""
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
-msgid ""
-"Only the members of this group are allowed to start and stop the GNUnet "
-"server and  have access to GNUnet data."
-msgstr ""

Modified: GNUnet/debian/po/vi.po
===================================================================
--- GNUnet/debian/po/vi.po      2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/po/vi.po      2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,221 +1,86 @@
 # Vietnamese translation for gnunet.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <address@hidden>, 2005.
+# Copyright © 2007 Free Software Foundation, Inc.
+# Clytie Siddall <address@hidden>, 2005-2007.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: gnunet 0.6.6b-4\n"
+"Project-Id-Version: gnunet 0.7.1c-2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-05-03 23:33+0200\n"
-"PO-Revision-Date: 2005-06-15 15:29+0930\n"
+"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"PO-Revision-Date: 2007-06-12 23:28+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
-"Language-Team: Vietnamese <address@hidden>\n"
+"Language-Team: Vietnamese <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.6.3b1\n"
 
-#. Type: note
+#. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:1001
-msgid "Former installation of GNUnet detected"
-msgstr "Mới phát hiện một bản cài đặt GNUnet trước."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid ""
-"Since there are important changes in this version, the installer will need "
-"to modify the GNUnet configuration file (/etc/gnunet.conf)."
-msgstr ""
-"Vì phiên bản này thực hiện một số thay đổi quan trọng, bạn cần phải sử dụng "
-"trình này sẽ sửa đổi tập tin cấu hình GNUnet «/etc/gnunet.conf»."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-msgid ""
-"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
-"old, and will automatically build a new configuration file."
-msgstr ""
-"Tiến trình cài đặt này sẽ lưu trữ tập tin «/etc/gnunet.conf» vào «/etc/"
-"gnunet.conf.old», và sẽ cũng tự động xây dụng một tập tin cấu hình mới."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:1001
-#, fuzzy
-msgid "Every personal settings will be preserved as much as possible."
-msgstr "Sẽ bảo quản các thiết lập cá nhân của bạn càng nhiều cành có thể."
-
-#. Type: note
-#. Description
 #: ../gnunet-daemon.templates:2001
-msgid "Warning"
-msgstr "Cảnh báo"
+msgid "Should the GNUnet daemon be launched on boot?"
+msgstr "Có nên khởi chạy trình nền GNUnet khi hệ thống khởi động không?"
 
-#. Type: note
+# msgid ""
+# If you accept here, a GNUnet server will be started each time your 
+# machine starts.  If you decline this option, you need to launch GNUnet 
+# each time you want to use it.
+#. Type: boolean
 #. Description
 #: ../gnunet-daemon.templates:2001
-#, fuzzy
 msgid ""
-"For some obscure reason, the installer have failed to discover the "
-"configuration settings in /etc/gnunet.conf."
-msgstr ""
-"Vì lý do lạ nào, trình này chưa phát hiện thiết lập cấu hình bạn trong «/etc/"
-"gnunet.conf»."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-#, fuzzy
-msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
-msgstr "Sẽ di chuyển tập tin cấu hình cũ vào «/etc/gnunet.conf.old»."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Since some changes are *mandatory* in this file, a fresh default "
-"configuration file will now be installed"
-msgstr ""
-"Vì • phải • sử dụng một số thay đổi có trong tập tin này, lúc bây giờ sẽ cài "
-"đặt một tập tin cấu hình mới."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:2001
-msgid ""
-"Please take a look and make necessary changes in it if needed after "
-"installation."
-msgstr ""
-"Sau khi cài đặt, bạn hãy kiểm tra xem các điều là đúng, và sửa đổi điều nào "
-"có cần thiết, nếu có."
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Upgrade from a version prior to 0.7.0"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
-"0.7.x introduced new configuration files and a new database storage format "
-"which is not compatible with versions prior to 0.7.x."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid "GNUnet cannot convert your database format to the new format."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your database storage will be automatically moved to /var/lib/GNUnet."
-"prior07, and the gnunet package will build a new empty storage for you."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
-"and replaced by /etc/gnunetd.conf which you can modify later by running "
-"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Launch at startup?"
-msgstr "Khởi chạy vào lúc khởi động máy không?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-msgid "Setup GNUnet as a system service."
-msgstr "Bạn có muốn khởi chạy trình GNUnet là một dịch vụ hệ thống không?"
-
-#. Type: boolean
-#. Description
-#: ../gnunet-daemon.templates:4001
-msgid ""
-"If you accept here, a GNUnet server will be started each time your machine "
-"starts.  If you decline this option, you need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be started each time the "
+"system is launched. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
-"Nếu bạn chấp nhận tùy chọn này, sẽ khởi chạy một trình phục vụ GNUnet vào "
-"mỗi lúc khởi động máy này. Còn nếu bạn từ chối tùy chọn này, sẽ cần phải tự "
-"khởi chạy GNUnet vào mỗi lúc muốn sử dụng nó."
+"Bật tùy chọn này thì trình GNUnet được khởi chạy mỗi lần khởi động hệ thống. "
+"Không thì bạn cần phải tự khởi chạy GNUnet để sử dụng nó."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-#, fuzzy
+#: ../gnunet-daemon.templates:3001
 msgid "GNUnet user:"
 msgstr "Người dùng GNUnet:"
 
+# msgid "Define the user owning the GNUnet daemon process."
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid "Define the user owning the GNUnet daemon process."
-msgstr "Hãy định nghĩa người dùng sở hữu tiến trình nền GNUnet."
+#: ../gnunet-daemon.templates:3001
+msgid "Please choose the user that the GNUnet daemon process will run as."
+msgstr "Hãy chọn người dùng dưới đó tiến trình nền GNUnet sẽ chạy:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:5001
-#, fuzzy
+#: ../gnunet-daemon.templates:3001
 msgid ""
-"For security reasons, it's best to create a new user exclusively for  GNUnet."
-msgstr "Vì lý do bảo mật, tốt nhất để tạo một người dùng mới dành cho GNUnet."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:5001
-#, fuzzy
-msgid ""
-"If you choose this option, that user will automatically be created  as a "
-"system user, for whom no login will be allowed."
+"This should be a dedicated account. If the specified account does not "
+"already exist, it will automatically be created, with no login shell."
 msgstr ""
-"Nếu bạn làm như thế, trình này sẽ tự động tạo người dùng GNUnet là một người "
-"dùng hệ thống, và sẽ không cho phép nó đăng nhập."
+"Đây nên là một tài khoản chuyên dụng. Nếu tài khoản đã ghi rõ chưa tồn tại, "
+"nó tự động được tạo, không có trình bao đăng nhập."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-#, fuzzy
+#: ../gnunet-daemon.templates:4001
 msgid "GNUnet group:"
 msgstr "Nhóm GNUnet:"
 
+# msgid "Define the group owning the GNUnet daemon process."
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-msgid "Define the group owning the GNUnet daemon process."
-msgstr "Hãy định nghĩa nhớm sở hữu tiến trình nền GNUnet."
+#: ../gnunet-daemon.templates:4001
+msgid "Please choose the group that the GNUnet daemon process will run as."
+msgstr "Hãy chọn nhớm dưới đó tiến trình nền GNUnet sẽ chạy:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
+#: ../gnunet-daemon.templates:4001
 msgid ""
-"For security reason, the best is to create a new group for this, and make "
-"sure that it owns no data beside GNUnet's ones."
-msgstr "Vì lý do bảo mật, tốt nhất để tạo một người dùng mới dành cho GNUnet."
-
-#. Type: string
-#. Description
-#: ../gnunet-daemon.templates:6001
-msgid ""
-"Only the members of this group are allowed to start and stop the GNUnet "
-"server and  have access to GNUnet data."
+"This should be a dedicated group, not one that already owns data. Only the "
+"members of this group will have access to GNUnet data, and be allowed to "
+"start and stop the GNUnet server."
 msgstr ""
-"Hệ thống sẽ cho phép chỉ những thành viên của nhóm này có khởi chạy và ngừng "
-"trình phục vụ GNUnet, và có truy cập dữ liệu GNUnet."
+"Đây nên là một nhóm chuyên dụng, không phải nhóm sở hữu dữ liệu nào. Chỉ "
+"những thành viên của nhóm này có quyền truy cập dữ liệu GNUnet thì có khả "
+"năng khởi chạy và ngừng chạy trình phục vụ GNUnet."

Modified: GNUnet/debian/rules
===================================================================
--- GNUnet/debian/rules 2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/debian/rules 2007-07-30 06:21:56 UTC (rev 5387)
@@ -1,26 +1,104 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath \
-       --enable-ipv6 \
-       --enable-guile \
-       --with-libcurl=/usr \
-       --with-guile=/usr \
-       --with-libgcrypt=/usr \
-       --with-libcurl=/usr \
-       --with-sqlite=/usr \
-       --with-mysql=/usr \
-       --with-extractor=/usr
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-DEB_DH_INSTALLINIT_ARGS := --noscripts
+CFLAGS = -Wall -g
 
-DEB_DH_MAKESHLIBS_ARGS_ALL := --version-info
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -O0
+else
+       CFLAGS += -O2
+endif
 
-install/gnunet-daemon::
-       mkdir -p $(CURDIR)/debian/gnunet-daemon/etc
-       cp $(CURDIR)/debian/gnunetd.conf 
$(CURDIR)/debian/gnunet-daemon/etc/gnunetd.conf
+config.status: configure
+       dh_testdir
 
-clean::
+       # Configuring package
+       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) 
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man 
--enable-guile --enable-ipv6 disable-rpath --with-extractor=/usr 
--with-guile=/usr --with-libcurl=/usr --with-libgcrypt=/usr --with-mysql=/usr 
--with-sqlite=/usr
+
+build: build-stamp
+build-stamp: config.status
+       dh_testdir
+
+       # Building package
+       $(MAKE)
+
+       touch build-stamp
+
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp
+
+       # Cleaning package
+       -$(MAKE) distclean
        debconf-updatepo
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+       cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+       cp -f /usr/share/misc/config.guess config.guess
+endif
+
+       dh_clean
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+
+       # Installing package
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+       install -D -m 0644 debian/config/gnunetd.conf 
debian/gnunet-daemon/etc/gnunetd.conf
+
+       # Installing lintian overrides
+       for LINTIAN in debian/lintian/*; \
+       do \
+               install -D -m 0644 $$LINTIAN debian/`basename 
$$LINTIAN`/usr/share/lintian/overrides/`basename $$LINTIAN` || exit 1; \
+       done
+
+binary-arch: build install
+       dh_testdir -a
+       dh_testroot -a
+       dh_installchangelogs -a ChangeLog
+       dh_installdocs -a
+       dh_install -a --sourcedir=debian/tmp
+       dh_installman -a
+       dh_installdebconf -a
+       dh_installlogrotate -a
+       dh_installinit -a
+       dh_link -a
+       dh_strip -a
+       dh_compress -a
+       dh_fixperms -a
+       dh_makeshlibs -a
+       dh_installdeb -a
+       dh_shlibdeps -a
+       dh_gencontrol -a
+       dh_md5sums -a
+       dh_builddeb -a
+
+binary-indep: build install
+       dh_testdir -i
+       dh_testroot -i
+       dh_installchangelogs -i ChangeLog
+       dh_installdocs -i
+       dh_install -i
+       dh_link -i
+       dh_compress -i
+       dh_fixperms -i
+       dh_installdeb -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/po/GNUnet.pot        2007-07-30 06:21:56 UTC (rev 5387)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-07 02:38-0600\n"
+"POT-Creation-Date: 2007-07-30 00:16-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -16,216 +16,216 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/transports/ip6.c:72 src/util/network/io.c:80
+#: src/transports/ip6.c:75 src/util/network/io.c:85
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:104 src/util/network/ip.c:83 src/util/network/ip.c:144
+#: src/transports/ip6.c:104 src/util/network/ip.c:84 src/util/network/ip.c:146
 #, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr ""
 
-#: src/transports/ip6.c:134 src/util/network/ip.c:113
-#: src/util/network/ip.c:234
+#: src/transports/ip6.c:135 src/util/network/ip.c:115
+#: src/util/network/ip.c:221
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 
-#: src/transports/ip6.c:169
+#: src/transports/ip6.c:167
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:222 src/transports/ip.c:59
+#: src/transports/ip6.c:219 src/transports/ip.c:60
 #, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr ""
 
-#: src/transports/udp6.c:129 src/transports/udp.c:137
+#: src/transports/udp6.c:123 src/transports/udp.c:129
 #, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr ""
 
-#: src/transports/udp6.c:268
+#: src/transports/udp6.c:264
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/udp6.c:500 src/transports/udp.c:547
+#: src/transports/udp6.c:471 src/transports/udp.c:514
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/http.c:504
+#: src/transports/http.c:522
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/http.c:793 src/transports/http.c:892
-#: src/transports/http.c:1030 src/transports/http.c:1163
-#: src/transports/upnp/upnp.c:335 src/transports/upnp/upnp.c:591
-#: src/applications/bootstrap_http/http.c:124
-#: src/applications/bootstrap_http/http.c:269
-#: src/applications/bootstrap_http/http.c:290
-#: src/applications/bootstrap_http/http.c:324
-#: src/applications/bootstrap_http/http.c:342
-#: src/applications/bootstrap_http/http.c:356
-#: src/applications/bootstrap_http/http.c:368
-#: src/applications/bootstrap_http/http.c:380
+#: src/transports/http.c:813 src/transports/http.c:892
+#: src/transports/http.c:1007 src/transports/http.c:1147
+#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:540
+#: src/applications/bootstrap_http/http.c:115
+#: src/applications/bootstrap_http/http.c:247
+#: src/applications/bootstrap_http/http.c:263
+#: src/applications/bootstrap_http/http.c:294
+#: src/applications/bootstrap_http/http.c:313
+#: src/applications/bootstrap_http/http.c:326
+#: src/applications/bootstrap_http/http.c:336
+#: src/applications/bootstrap_http/http.c:346
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/transports/http.c:1344
+#: src/transports/http.c:1307
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:1352
+#: src/transports/http.c:1316
 msgid "# bytes received via HTTP"
 msgstr ""
 
-#: src/transports/http.c:1354
+#: src/transports/http.c:1317
 msgid "# bytes sent via HTTP"
 msgstr ""
 
-#: src/transports/http.c:1356
+#: src/transports/http.c:1319
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: src/transports/smtp.c:257
+#: src/transports/smtp.c:271
 #, 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:334
+#: src/transports/smtp.c:358
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/transports/smtp.c:433
+#: src/transports/smtp.c:463
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 
-#: src/transports/smtp.c:440
+#: src/transports/smtp.c:471
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transports/smtp.c:547
+#: src/transports/smtp.c:571
 #, c-format
 msgid "Failed to initialize libesmtp: %s.\n"
 msgstr ""
 
-#: src/transports/smtp.c:611
+#: src/transports/smtp.c:630
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr ""
 
-#: src/transports/smtp.c:679
+#: src/transports/smtp.c:702
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
 
-#: src/transports/smtp.c:707
+#: src/transports/smtp.c:730
 #, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 
-#: src/transports/tcp.c:283
+#: src/transports/tcp.c:289
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/tcp.c:387
+#: src/transports/tcp.c:384
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/transports/tcp.c:454 src/transports/tcp6.c:414
+#: src/transports/tcp.c:437 src/transports/tcp6.c:404
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:584
+#: src/transports/tcp.c:556
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:592
+#: src/transports/tcp.c:565
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:594
+#: src/transports/tcp.c:566
 msgid "# bytes sent via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:596
+#: src/transports/tcp.c:568
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:293
+#: src/transports/udp.c:287
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/udp.c:388
+#: src/transports/udp.c:378
 #, 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:565
+#: src/transports/udp.c:529
 msgid "# bytes received via UDP"
 msgstr ""
 
-#: src/transports/udp.c:567
+#: src/transports/udp.c:530
 msgid "# bytes sent via UDP"
 msgstr ""
 
-#: src/transports/udp.c:569
+#: src/transports/udp.c:532
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
-#: src/transports/tcp6.c:238
+#: src/transports/tcp6.c:245
 msgid "Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/tcp6.c:300
+#: src/transports/tcp6.c:312
 #, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr ""
 
-#: src/transports/tcp6.c:532
+#: src/transports/tcp6.c:512
 msgid "# bytes received via TCP6"
 msgstr ""
 
-#: src/transports/tcp6.c:534
+#: src/transports/tcp6.c:513
 msgid "# bytes sent via TCP6"
 msgstr ""
 
-#: src/transports/tcp6.c:536
+#: src/transports/tcp6.c:515
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr ""
 
-#: src/transports/tcp_helper.c:248
+#: src/transports/tcp_helper.c:257
 msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr ""
 
-#: src/transports/tcp_helper.c:314
+#: src/transports/tcp_helper.c:276
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr ""
 
-#: src/transports/upnp/upnp.c:443
+#: src/transports/upnp/upnp.c:429
 #, c-format
 msgid "%s failed for url `%s' and post-data `%s' at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/transports/upnp/upnp.c:504
+#: src/transports/upnp/upnp.c:475
 #, c-format
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/udp_helper.c:91
+#: src/transports/udp_helper.c:94
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr ""
 
@@ -233,115 +233,115 @@
 msgid "Query (get KEY, put KEY VALUE) DHT table."
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:59
+#: src/applications/dht/tools/dht-query.c:60
 msgid ""
 "allow TIME ms to process a GET command or expire PUT content after ms TIME"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:103
+#: src/applications/dht/tools/dht-query.c:98
 #, c-format
 msgid "%s(%s) operation returned no results.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:125
+#: src/applications/dht/tools/dht-query.c:115
 #, c-format
 msgid "Issuing '%s(%s,%s)' command.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:138
+#: src/applications/dht/tools/dht-query.c:122
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:143
+#: src/applications/dht/tools/dht-query.c:126
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:171
+#: src/applications/dht/tools/dht-query.c:150
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:181
+#: src/applications/dht/tools/dht-query.c:163
 #, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:194
+#: src/applications/dht/tools/dht-query.c:180
 #, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:206
+#: src/applications/dht/tools/dht-query.c:191
 #, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr ""
 
-#: src/applications/dht/module/table.c:701
+#: src/applications/dht/module/table.c:716
 msgid "# dht connections"
 msgstr ""
 
-#: src/applications/dht/module/table.c:702
+#: src/applications/dht/module/table.c:718
 msgid "# dht discovery messages received"
 msgstr ""
 
-#: src/applications/dht/module/table.c:703
+#: src/applications/dht/module/table.c:720
 msgid "# dht route host lookups performed"
 msgstr ""
 
-#: src/applications/dht/module/table.c:704
+#: src/applications/dht/module/table.c:722
 msgid "# dht discovery messages sent"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:135
+#: src/applications/dht/module/cs.c:128
 #, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:240
+#: src/applications/dht/module/cs.c:233
 #, c-format
 msgid "`%s' registering client handlers: %d %d\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:259
+#: src/applications/dht/module/cs.c:251
 msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:752
+#: src/applications/dht/module/routing.c:736
 msgid "# dht replies routed"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:753
+#: src/applications/dht/module/routing.c:738
 msgid "# dht requests routed"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:754
+#: src/applications/dht/module/routing.c:740
 msgid "# dht get requests received"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:755
+#: src/applications/dht/module/routing.c:742
 msgid "# dht put requests received"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:756
+#: src/applications/dht/module/routing.c:744
 msgid "# dht results received"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:760
+#: src/applications/dht/module/routing.c:748
 #, c-format
 msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:87
+#: src/applications/chat/chat.c:88
 msgid "Message received from peer is invalid.\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:134
+#: src/applications/chat/chat.c:135
 msgid "Message received from client is invalid\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:156
+#: src/applications/chat/chat.c:155
 msgid "Maximum number of chat clients reached.\n"
 msgstr ""
 
@@ -350,102 +350,98 @@
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:197
+#: src/applications/chat/chat.c:202
 #, c-format
 msgid "`%s' registering handlers %d and %d\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:216
+#: src/applications/chat/chat.c:219
 msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:82
-msgid "specify nickname"
+#: src/applications/chat/gnunet-chat.c:45
+msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:87
-msgid "Start GNUnet chat client."
+#: src/applications/chat/gnunet-chat.c:49
+msgid "set the nickname to use (requred)"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:93 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:287
-#, c-format
-msgid "Use --help to get a list of options.\n"
+#: src/applications/chat/gnunet-chat.c:52
+msgid "set the chat room to join (requred)"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:151
-msgid "Could not connect to gnunetd.\n"
+#: src/applications/chat/gnunet-chat.c:134
+#, c-format
+msgid "You must specify a nickname\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:155
+#: src/applications/chat/gnunet-chat.c:144
 #, c-format
-msgid "You must specify a nickname (use option `%s').\n"
+msgid "Failed to join the room\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:182
-msgid "Could not send join message to gnunetd\n"
+#: src/applications/chat/gnunet-chat.c:160
+#, c-format
+msgid "Failed to send message.\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:191
-msgid "Could not send message to gnunetd\n"
-msgstr ""
-
-#: src/applications/advertising/advertising.c:188
+#: src/applications/advertising/advertising.c:193
 #, c-format
 msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:196
+#: src/applications/advertising/advertising.c:203
 msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:367
+#: src/applications/advertising/advertising.c:374
 msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:385
+#: src/applications/advertising/advertising.c:396
 msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:553
+#: src/applications/advertising/advertising.c:544
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:561
+#: src/applications/advertising/advertising.c:553
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:838
+#: src/applications/advertising/advertising.c:817
 msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:839
+#: src/applications/advertising/advertising.c:820
 msgid "# Peer advertisements of type NAT received"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:840
+#: src/applications/advertising/advertising.c:823
 msgid "# Peer advertisements confirmed via PONG"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:841
+#: src/applications/advertising/advertising.c:827
 msgid "# Peer advertisements updating earlier HELLOs"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:842
+#: src/applications/advertising/advertising.c:830
 msgid "# Peer advertisements discarded due to load"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:843
+#: src/applications/advertising/advertising.c:834
 msgid "# Peer advertisements for unsupported transport"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:844
+#: src/applications/advertising/advertising.c:838
 msgid "# Peer advertisements not confirmed due to ping busy"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:845
+#: src/applications/advertising/advertising.c:842
 msgid "# Peer advertisements not confirmed due to lack of self ad"
 msgstr ""
 
@@ -453,281 +449,279 @@
 msgid "# Peer advertisements not confirmed due to send error"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:847
+#: src/applications/advertising/advertising.c:848
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:848
+#: src/applications/advertising/advertising.c:850
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:850
-#: src/applications/pingpong/pingpong.c:520
+#: src/applications/advertising/advertising.c:852
+#: src/applications/pingpong/pingpong.c:509
 msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:855
-#: src/applications/session/connect.c:936
+#: src/applications/advertising/advertising.c:857
+#: src/applications/session/connect.c:901
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:873
+#: src/applications/advertising/advertising.c:872
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:471
+#: src/applications/topology_default/topology.c:467
 msgid "maintains GNUnet default mesh topology"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:128
+#: src/applications/pingpong/pingpong.c:132
 #: src/applications/pingpong/pingpong.c:199
 #: src/applications/pingpong/pingpong.c:264
-#: src/applications/pingpong/pingpong.c:337
+#: src/applications/pingpong/pingpong.c:331
 #, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:140
+#: src/applications/pingpong/pingpong.c:143
 msgid "Received ping for another peer. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:210
+#: src/applications/pingpong/pingpong.c:209
 msgid "Received PING not destined for us!\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:309
-#: src/applications/pingpong/pingpong.c:374
+#: src/applications/pingpong/pingpong.c:303
+#: src/applications/pingpong/pingpong.c:365
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:418
+#: src/applications/pingpong/pingpong.c:409
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:510
+#: src/applications/pingpong/pingpong.c:499
 msgid "# encrypted PONG messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:512
+#: src/applications/pingpong/pingpong.c:501
 msgid "# plaintext PONG messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:514
+#: src/applications/pingpong/pingpong.c:503
 msgid "# encrypted PING messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:516
+#: src/applications/pingpong/pingpong.c:505
 msgid "# PING messages created"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:518
-#: src/applications/session/connect.c:931
+#: src/applications/pingpong/pingpong.c:507
+#: src/applications/session/connect.c:896
 msgid "# encrypted PONG messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:522
-#: src/applications/session/connect.c:929
+#: src/applications/pingpong/pingpong.c:511
+#: src/applications/session/connect.c:894
 msgid "# encrypted PING messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:524
+#: src/applications/pingpong/pingpong.c:513
 msgid "# plaintext PONG messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:526
+#: src/applications/pingpong/pingpong.c:517
 msgid "# plaintext PONG transmissions failed"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:536
+#: src/applications/pingpong/pingpong.c:526
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:46
-#: src/applications/sqstore_sqlite/sqlite.c:53
-#: src/applications/sqstore_mysql/mysql.c:139
-#: src/applications/sqstore_mysql/mysql.c:146
-#: src/applications/sqstore_mysql/mysql.c:825
-#: src/applications/sqstore_mysql/mysql.c:846
-#: src/applications/sqstore_mysql/mysql.c:858
-#: src/applications/sqstore_mysql/mysql.c:891
-#: src/applications/sqstore_mysql/mysql.c:904
-#: src/applications/sqstore_mysql/mysql.c:965
-#: src/applications/sqstore_mysql/mysql.c:1065
-#: src/applications/sqstore_mysql/mysql.c:1078
-#: src/applications/sqstore_mysql/mysql.c:1149
-#: src/applications/sqstore_mysql/mysql.c:1169
-#: src/applications/sqstore_mysql/mysql.c:1181
-#: src/applications/sqstore_mysql/mysql.c:1207
-#: src/applications/sqstore_mysql/mysql.c:1220
-#: src/applications/sqstore_mysql/mysql.c:1234
-#: src/applications/sqstore_mysql/mysql.c:1301
-#: src/applications/sqstore_mysql/mysql.c:1315
-#: src/applications/sqstore_mysql/mysql.c:1374
-#: src/applications/sqstore_mysql/mysql.c:1391
+#: src/applications/sqstore_sqlite/sqlite.c:47
+#: src/applications/sqstore_sqlite/sqlite.c:54
+#: src/applications/sqstore_mysql/mysql.c:145
+#: src/applications/sqstore_mysql/mysql.c:152
+#: src/applications/sqstore_mysql/mysql.c:428
+#: src/applications/sqstore_mysql/mysql.c:438
+#: src/applications/sqstore_mysql/mysql.c:476
+#: src/applications/sqstore_mysql/mysql.c:486
+#: src/applications/sqstore_mysql/mysql.c:518
+#: src/applications/sqstore_mysql/mysql.c:529
+#: src/applications/sqstore_mysql/mysql.c:627
+#: src/applications/sqstore_mysql/mysql.c:639
+#: src/applications/sqstore_mysql/mysql.c:651
+#: src/applications/sqstore_mysql/mysql.c:665
+#: src/applications/sqstore_mysql/mysql.c:762
+#: src/applications/sqstore_mysql/mysql.c:776
+#: src/applications/sqstore_mysql/mysql.c:917
+#: src/applications/sqstore_mysql/mysql.c:929
+#: src/applications/sqstore_mysql/mysql.c:941
+#: src/applications/sqstore_mysql/mysql.c:1184
+#: src/applications/sqstore_mysql/mysql.c:1196
+#: src/applications/sqstore_mysql/mysql.c:1208
+#: src/applications/sqstore_mysql/mysql.c:1293
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:93 src/applications/dstore/dstore.c:180
-#: src/applications/dstore/dstore.c:240 src/applications/dstore/dstore.c:263
-#: src/applications/dstore/dstore.c:323 src/applications/dstore/dstore.c:378
-#: src/applications/dstore/dstore.c:474 src/util/crypto/symcipher_gcrypt.c:46
-#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:63
-#: src/util/crypto/hostkey_gcrypt.c:70
+#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:180
+#: src/applications/dstore/dstore.c:219 src/applications/dstore/dstore.c:238
+#: src/applications/dstore/dstore.c:293 src/applications/dstore/dstore.c:330
+#: src/applications/dstore/dstore.c:403 src/util/crypto/symcipher_gcrypt.c:46
+#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:64
+#: src/util/crypto/hostkey_gcrypt.c:71
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:207
+#: src/applications/sqstore_sqlite/sqlite.c:193
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:379
+#: src/applications/sqstore_sqlite/sqlite.c:393
 #, c-format
 msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:380
-#: src/applications/sqstore_sqlite/sqlite.c:401
+#: src/applications/sqstore_sqlite/sqlite.c:394
+#: src/applications/sqstore_sqlite/sqlite.c:416
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:400
-#: src/applications/sqstore_mysql/mysql.c:262
-#: src/applications/sqstore_mysql/mysql.c:924
-#: src/applications/sqstore_mysql/mysql.c:1251
+#: src/applications/sqstore_sqlite/sqlite.c:415
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1395
-#: src/applications/sqstore_mysql/mysql.c:1466
+#: src/applications/sqstore_sqlite/sqlite.c:1206
+#: src/applications/sqstore_mysql/mysql.c:1401
 msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/session/connect.c:261
-#: src/applications/session/connect.c:278
+#: src/applications/session/connect.c:256
+#: src/applications/session/connect.c:272
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:321
+#: src/applications/session/connect.c:313
 #, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:520
+#: src/applications/session/connect.c:492
 msgid "Could not create any HELLO for myself!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:621
+#: src/applications/session/connect.c:592
 #, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:639
+#: src/applications/session/connect.c:614
 #, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:673
+#: src/applications/session/connect.c:646
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:683
+#: src/applications/session/connect.c:656
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:752
+#: src/applications/session/connect.c:719
 #, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
 "invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:764
+#: src/applications/session/connect.c:731
 #, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:921
+#: src/applications/session/connect.c:886
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:923
+#: src/applications/session/connect.c:888
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:925
+#: src/applications/session/connect.c:890
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:927
+#: src/applications/session/connect.c:892
 msgid "# sessions established"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
+#: src/applications/rpc/rpc.c:134 src/applications/rpc/rpc.c:175
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
 "using this name (%p)\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
+#: src/applications/rpc/rpc.c:218 src/applications/rpc/rpc.c:265
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
 "under that name: %p\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:233
+#: src/applications/rpc/rpc.c:237
 #, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:280
+#: src/applications/rpc/rpc.c:285
 #, c-format
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:879 src/applications/rpc/rpc.c:1012
-#: src/applications/rpc/rpc.c:1101
+#: src/applications/rpc/rpc.c:909 src/applications/rpc/rpc.c:1043
+#: src/applications/rpc/rpc.c:1129
 #, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:946
+#: src/applications/rpc/rpc.c:975
 #, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1291
+#: src/applications/rpc/rpc.c:1307
 #, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1415
+#: src/applications/rpc/rpc.c:1421
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1442
+#: src/applications/rpc/rpc.c:1450
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1463
+#: src/applications/rpc/rpc.c:1466
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1520
+#: src/applications/rpc/rpc.c:1524
 msgid "RPC async reply invalid.\n"
 msgstr ""
 
@@ -735,266 +729,260 @@
 msgid "async RPC reply not received.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:263
-#: src/applications/sqstore_mysql/mysql.c:925
-#: src/applications/sqstore_mysql/mysql.c:1252
-msgid "mysql datastore"
+#: src/applications/sqstore_mysql/mysql.c:379
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:441
+#: src/applications/sqstore_mysql/mysql.c:1311
 #, c-format
-msgid ""
-"`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s DG/%"
-"s\n"
+msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1496
+#: src/applications/sqstore_mysql/mysql.c:1423
+#: src/applications/sqstore_mysql/mysql.c:1570
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1518
+#: src/applications/sqstore_mysql/mysql.c:1448
+#: src/applications/sqstore_mysql/mysql.c:1593
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:133
+#: src/applications/datastore/datastore.c:146
 #, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:159
-#, c-format
-msgid "Database failed to delete `%s'.\n"
-msgstr ""
-
-#: src/applications/datastore/datastore.c:389
+#: src/applications/datastore/datastore.c:368
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:390
+#: src/applications/datastore/datastore.c:370
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:392
+#: src/applications/datastore/datastore.c:373
 msgid "# bytes allowed in datastore"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:406
+#: src/applications/datastore/datastore.c:388
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:528
+#: src/applications/datastore/datastore.c:513
 msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:123
+#: src/applications/identity/hostkey.c:116
 #, c-format
 msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:154
+#: src/applications/identity/hostkey.c:143
 #, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:162
+#: src/applications/identity/hostkey.c:152
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:175
+#: src/applications/identity/hostkey.c:162
 msgid "Done creating hostkey.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:347
+#: src/applications/identity/identity.c:345
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:360
+#: src/applications/identity/identity.c:358
 #, c-format
 msgid ""
 "Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:397
+#: src/applications/identity/identity.c:393
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:730
-#: src/applications/identity/identity.c:758
+#: src/applications/identity/identity.c:708
+#: src/applications/identity/identity.c:729
 #, c-format
 msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:812
+#: src/applications/identity/identity.c:776
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:822
+#: src/applications/identity/identity.c:785
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:928
-#: src/applications/identity/identity.c:1044
+#: src/applications/identity/identity.c:894
+#: src/applications/identity/identity.c:1014
 #, c-format
 msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:1045
+#: src/applications/identity/identity.c:1017
 #, c-format
 msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:148
+#: src/applications/transport/transport.c:190
 #, c-format
 msgid ""
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:196
+#: src/applications/transport/transport.c:244
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:246
+#: src/applications/transport/transport.c:297
 #, c-format
 msgid ""
 "Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:307
+#: src/applications/transport/transport.c:373
 #, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:395
+#: src/applications/transport/transport.c:494
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:452
+#: src/applications/transport/transport.c:553
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:653
+#: src/applications/transport/transport.c:752
 #, c-format
 msgid "Loading transports `%s'\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:673
+#: src/applications/transport/transport.c:771
 #, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:683
+#: src/applications/transport/transport.c:781
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:710
+#: src/applications/transport/transport.c:808
 #, c-format
 msgid "Loaded transport `%s'\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:723
+#: src/applications/transport/transport.c:819
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:566
+#: src/applications/fragmentation/fragmentation.c:575
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:567
+#: src/applications/fragmentation/fragmentation.c:577
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:568
+#: src/applications/fragmentation/fragmentation.c:578
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:580
+#: src/applications/fragmentation/fragmentation.c:588
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:65
+#: src/applications/stats/gnunet-stats.c:62
 #, c-format
 msgid "Supported peer-to-peer messages:\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:69
+#: src/applications/stats/gnunet-stats.c:65
 #, c-format
 msgid "Supported client-server messages:\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:93
+#: src/applications/stats/gnunet-stats.c:84
 #: src/applications/vpn/gnunet-vpn.c:52
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:97
+#: src/applications/stats/gnunet-stats.c:88
 msgid "prints supported protocol messages"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:133
-#: src/applications/tbench/gnunet-tbench.c:128
-#: src/applications/tracekit/gnunet-tracekit.c:313
+#: src/applications/stats/gnunet-stats.c:122
+#: src/applications/tbench/gnunet-tbench.c:127
+#: src/applications/tracekit/gnunet-tracekit.c:315
 #: src/applications/template/gnunet-template.c:94
-#: src/applications/vpn/gnunet-vpn.c:145
+#: src/applications/vpn/gnunet-vpn.c:148
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:152
+#: src/applications/stats/gnunet-stats.c:134
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr ""
 
-#: src/applications/stats/clientapi.c:328
+#: src/applications/stats/clientapi.c:330
 msgid "Uptime (seconds)"
 msgstr ""
 
-#: src/applications/stats/statistics.c:214
+#: src/applications/stats/statistics.c:223
 #, c-format
 msgid "% of allowed network load (up)"
 msgstr ""
 
-#: src/applications/stats/statistics.c:216
+#: src/applications/stats/statistics.c:225
 #, c-format
 msgid "% of allowed network load (down)"
 msgstr ""
 
-#: src/applications/stats/statistics.c:218
+#: src/applications/stats/statistics.c:226
 #, c-format
 msgid "% of allowed cpu load"
 msgstr ""
 
-#: src/applications/stats/statistics.c:220
+#: src/applications/stats/statistics.c:227
 #, c-format
 msgid "% of allowed io load"
 msgstr ""
 
-#: src/applications/stats/statistics.c:222
+#: src/applications/stats/statistics.c:228
 msgid "# of connected peers"
 msgstr ""
 
-#: src/applications/stats/statistics.c:224
+#: src/applications/stats/statistics.c:230
 msgid "# bytes of noise received"
 msgstr ""
 
-#: src/applications/stats/statistics.c:392
+#: src/applications/stats/statistics.c:401
 #, c-format
 msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:413
+#: src/applications/stats/statistics.c:421
 msgid "keeps statistics about gnunetd's operation"
 msgstr ""
 
@@ -1002,80 +990,80 @@
 msgid "# Any-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:152
+#: src/applications/stats/sqstats.c:151
 msgid "# DBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:154
+#: src/applications/stats/sqstats.c:152
 msgid "# SBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:156
+#: src/applications/stats/sqstats.c:153
 msgid "# KBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:158
+#: src/applications/stats/sqstats.c:154
 msgid "# NBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:160
+#: src/applications/stats/sqstats.c:155
 msgid "# KNBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:162
+#: src/applications/stats/sqstats.c:156
 msgid "# OnDemand-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:164
+#: src/applications/stats/sqstats.c:157
 msgid "# Unknown-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:166
+#: src/applications/stats/sqstats.c:158
 msgid "# expired"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:168
+#: src/applications/stats/sqstats.c:159
 msgid "# expire in 1h"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:170
+#: src/applications/stats/sqstats.c:160
 msgid "# expire in 24h"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:172
+#: src/applications/stats/sqstats.c:161
 msgid "# expire in 1 week"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:174
+#: src/applications/stats/sqstats.c:162
 msgid "# expire in 1 month"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:176
+#: src/applications/stats/sqstats.c:163
 msgid "# zero priority"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:178
+#: src/applications/stats/sqstats.c:164
 msgid "# priority one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:180
+#: src/applications/stats/sqstats.c:165
 msgid "# priority larger than one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:182
+#: src/applications/stats/sqstats.c:166
 msgid "# no anonymity"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:184
+#: src/applications/stats/sqstats.c:167
 msgid "# anonymity one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:186
+#: src/applications/stats/sqstats.c:168
 msgid "# anonymity larger than one"
 msgstr ""
 
 #: src/applications/tbench/gnunet-tbench.c:64
-#: src/applications/tracekit/gnunet-tracekit.c:53
+#: src/applications/tracekit/gnunet-tracekit.c:55
 msgid "Start GNUnet transport benchmarking tool."
 msgstr ""
 
@@ -1107,11 +1095,11 @@
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:90
+#: src/applications/tbench/gnunet-tbench.c:91
 msgid "number of messages in a message block"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:144
+#: src/applications/tbench/gnunet-tbench.c:143
 #, c-format
 msgid "You must specify a receiver!\n"
 msgstr ""
@@ -1121,37 +1109,37 @@
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:182
+#: src/applications/tbench/gnunet-tbench.c:187
 #, c-format
 msgid "Time:\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:183
+#: src/applications/tbench/gnunet-tbench.c:188
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:185
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:187
+#: src/applications/tbench/gnunet-tbench.c:190
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tbench/gnunet-tbench.c:191
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:192
+#: src/applications/tbench/gnunet-tbench.c:193
 #, c-format
 msgid "Loss:\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:193
+#: src/applications/tbench/gnunet-tbench.c:194
 #, c-format
 msgid "\tmax      %u\n"
 msgstr ""
@@ -1161,29 +1149,29 @@
 msgid "\tmin      %u\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:197
+#: src/applications/tbench/gnunet-tbench.c:196
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:199
+#: src/applications/tbench/gnunet-tbench.c:197
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:208
+#: src/applications/tbench/gnunet-tbench.c:203
 #, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:212
+#: src/applications/tbench/gnunet-tbench.c:209
 #, c-format
 msgid ""
 "\n"
 "Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:421
+#: src/applications/tbench/tbench.c:412
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
@@ -1191,27 +1179,27 @@
 msgid "probe network to the given DEPTH"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:51
+#: src/applications/tracekit/gnunet-tracekit.c:52
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:57
+#: src/applications/tracekit/gnunet-tracekit.c:59
 msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:61
+#: src/applications/tracekit/gnunet-tracekit.c:63
 msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:115
+#: src/applications/tracekit/gnunet-tracekit.c:111
 #, 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:160
 #, c-format
 msgid "`%s' is not connected to any peer.\n"
 msgstr ""
@@ -1221,169 +1209,169 @@
 msgid "`%s' connected to `%s'.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:212
+#: src/applications/tracekit/gnunet-tracekit.c:210
 #, 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:236
 #, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:343
+#: src/applications/tracekit/gnunet-tracekit.c:336
 msgid "Could not send request to gnunetd.\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:68
-#: src/applications/tracekit/tracekit.c:201
+#: src/applications/tracekit/tracekit.c:72
+#: src/applications/tracekit/tracekit.c:206
 #, c-format
 msgid "Received invalid `%s' message from `%s'.\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:263
+#: src/applications/tracekit/tracekit.c:269
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:354
+#: src/applications/tracekit/tracekit.c:346
 #, c-format
 msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:461
+#: src/applications/tracekit/tracekit.c:443
 msgid "allows mapping of the network topology"
 msgstr ""
 
-#: src/applications/gap/gap.c:1661
+#: src/applications/gap/gap.c:1695
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1662
+#: src/applications/gap/gap.c:1696
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1844
+#: src/applications/gap/gap.c:1883
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1856 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1892 src/applications/fs/module/anonymity.c:65
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1863 src/applications/gap/gap.c:1869
-#: src/applications/gap/gap.c:1876
+#: src/applications/gap/gap.c:1902 src/applications/gap/gap.c:1910
+#: src/applications/gap/gap.c:1921
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2155
+#: src/applications/gap/gap.c:2183
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2156
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2157
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2158
+#: src/applications/gap/gap.c:2190
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2159
+#: src/applications/gap/gap.c:2194
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2160
+#: src/applications/gap/gap.c:2197
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2161
+#: src/applications/gap/gap.c:2199
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2162
+#: src/applications/gap/gap.c:2202
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2163
+#: src/applications/gap/gap.c:2206
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2164
+#: src/applications/gap/gap.c:2208
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2165
+#: src/applications/gap/gap.c:2211
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2166
+#: src/applications/gap/gap.c:2214
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2167
+#: src/applications/gap/gap.c:2216
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2168
+#: src/applications/gap/gap.c:2218
 msgid "# gap spurious replies (dropped)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2169
+#: src/applications/gap/gap.c:2220
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2170
+#: src/applications/gap/gap.c:2223
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2171
+#: src/applications/gap/gap.c:2227
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2172
+#: src/applications/gap/gap.c:2229
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2173
+#: src/applications/gap/gap.c:2231
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2189
+#: src/applications/gap/gap.c:2246
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2217
+#: src/applications/gap/gap.c:2269
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:161
+#: src/applications/gap/pid_table.c:177
 msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:163
+#: src/applications/gap/pid_table.c:181
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:78
+#: src/applications/getoption/getoption.c:75
 #, c-format
 msgid "`%s' registering client handler %d\n"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:88
+#: src/applications/getoption/getoption.c:84
 msgid "allows clients to determine gnunetd's configuration"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:71
-#: src/applications/fs/tools/gnunet-insert.c:273
-#: src/applications/fs/tools/gnunet-search.c:140
+#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-search.c:135
 #: src/applications/fs/tools/gnunet-download.c:69
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
@@ -1408,37 +1396,37 @@
 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:90
 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:93
 msgid "specify metadata describing the namespace or collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:95
+#: src/applications/fs/tools/gnunet-pseudonym.c:97
 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:100
 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:104
 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:107
 msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:138
+#: src/applications/fs/tools/gnunet-pseudonym.c:140
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr ""
@@ -1448,210 +1436,210 @@
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:178
+#: src/applications/fs/tools/gnunet-pseudonym.c:171
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:212
+#: src/applications/fs/tools/gnunet-pseudonym.c:204
 #, c-format
 msgid "Collection stopped.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:214
+#: src/applications/fs/tools/gnunet-pseudonym.c:206
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:222
+#: src/applications/fs/tools/gnunet-pseudonym.c:214
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:226
+#: src/applications/fs/tools/gnunet-pseudonym.c:219
 #, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:243
+#: src/applications/fs/tools/gnunet-pseudonym.c:234
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:246
+#: src/applications/fs/tools/gnunet-pseudonym.c:238
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:279
 #, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:291
+#: src/applications/fs/tools/gnunet-pseudonym.c:286
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:304
+#: src/applications/fs/tools/gnunet-pseudonym.c:301
 #, c-format
 msgid "You must specify a name for the collection (`%s' option).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:314
+#: src/applications/fs/tools/gnunet-pseudonym.c:309
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:83
+#: src/applications/fs/tools/gnunet-directory.c:84
 #, c-format
 msgid "==> Directory `%s':\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:90
+#: src/applications/fs/tools/gnunet-directory.c:87
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:125
+#: src/applications/fs/tools/gnunet-directory.c:114
 #, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:127
+#: src/applications/fs/tools/gnunet-directory.c:116
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:142
+#: src/applications/fs/tools/gnunet-directory.c:131
 msgid "Perform directory related operations."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:144
+#: src/applications/fs/tools/gnunet-directory.c:134
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:148
+#: src/applications/fs/tools/gnunet-directory.c:138
 msgid "list entries from the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:151
+#: src/applications/fs/tools/gnunet-directory.c:141
 msgid "start tracking entries for the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:175
+#: src/applications/fs/tools/gnunet-directory.c:164
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:136
+#: src/applications/fs/tools/gnunet-insert.c:132
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:141
+#: src/applications/fs/tools/gnunet-insert.c:137
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:161
+#: src/applications/fs/tools/gnunet-insert.c:157
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:170
+#: src/applications/fs/tools/gnunet-insert.c:165
 msgid "filename"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:173
+#: src/applications/fs/tools/gnunet-insert.c:167
 msgid "mimetype"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:208
 #, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-insert.c:220
 #, 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:235
+#: src/applications/fs/tools/gnunet-insert.c:231
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:246
+#: src/applications/fs/tools/gnunet-insert.c:242
 #, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:251
+#: src/applications/fs/tools/gnunet-insert.c:247
 #, c-format
 msgid ""
 "\n"
 "Error uploading file: %s"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:260
+#: src/applications/fs/tools/gnunet-insert.c:256
 #, c-format
 msgid ""
 "\n"
 "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:277
+#: src/applications/fs/tools/gnunet-insert.c:272
 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:281
+#: src/applications/fs/tools/gnunet-insert.c:277
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:281
 msgid ""
 "do not use libextractor to add additional references to directory entries "
 "and/or the published file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:287
+#: src/applications/fs/tools/gnunet-insert.c:285
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:287
 msgid "Make files available to GNUnet for sharing."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:292
+#: src/applications/fs/tools/gnunet-insert.c:290
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:296
+#: src/applications/fs/tools/gnunet-insert.c:295
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:300
+#: src/applications/fs/tools/gnunet-insert.c:299
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:305
+#: src/applications/fs/tools/gnunet-insert.c:304
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:308
+#: src/applications/fs/tools/gnunet-insert.c:307
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -1667,75 +1655,75 @@
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:319
+#: src/applications/fs/tools/gnunet-insert.c:320
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:322
+#: src/applications/fs/tools/gnunet-insert.c:323
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:326
+#: src/applications/fs/tools/gnunet-insert.c:327
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:330
+#: src/applications/fs/tools/gnunet-insert.c:332
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:333
+#: src/applications/fs/tools/gnunet-insert.c:335
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:368
+#: src/applications/fs/tools/gnunet-insert.c:371
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:427
+#: src/applications/fs/tools/gnunet-insert.c:418
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:447
+#: src/applications/fs/tools/gnunet-insert.c:437
 #, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr ""
 
+#: src/applications/fs/tools/gnunet-insert.c:448
 #: src/applications/fs/tools/gnunet-insert.c:456
-#: src/applications/fs/tools/gnunet-insert.c:462
-#: src/applications/fs/tools/gnunet-insert.c:468
-#: src/applications/fs/tools/gnunet-insert.c:474
+#: src/applications/fs/tools/gnunet-insert.c:464
+#: src/applications/fs/tools/gnunet-insert.c:472
 #: src/applications/fs/tools/gnunet-insert.c:480
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:143
+#: src/applications/fs/tools/gnunet-search.c:138
 msgid "Search GNUnet for files."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:147
+#: src/applications/fs/tools/gnunet-search.c:142
 msgid "exit after receiving LIMIT results"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:150
+#: src/applications/fs/tools/gnunet-search.c:145
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:153
+#: src/applications/fs/tools/gnunet-search.c:148
 msgid "wait DELAY seconds for search results before aborting"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:191
+#: src/applications/fs/tools/gnunet-search.c:183
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:73
+#: src/applications/fs/tools/gnunet-download.c:74
 msgid ""
 "download a GNUnet directory that has already been downloaded.  Requires that "
 "a filename of an existing file is specified instead of the URI.  The "
@@ -1743,133 +1731,133 @@
 "`-R' option is also specified."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:75
+#: src/applications/fs/tools/gnunet-download.c:76
 msgid "Download files from GNUnet."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:79
+#: src/applications/fs/tools/gnunet-download.c:80
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:82
+#: src/applications/fs/tools/gnunet-download.c:84
 msgid "set the maximum number of parallel downloads that are allowed"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:85
+#: src/applications/fs/tools/gnunet-download.c:87
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:103
+#: src/applications/fs/tools/gnunet-download.c:108
 #, 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:116
+#: src/applications/fs/tools/gnunet-download.c:122
 #, c-format
 msgid "Download aborted.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:122
+#: src/applications/fs/tools/gnunet-download.c:128
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:128
+#: src/applications/fs/tools/gnunet-download.c:134
 #, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:176
+#: src/applications/fs/tools/gnunet-download.c:178
 msgid "no name given"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:182
+#: src/applications/fs/tools/gnunet-download.c:184
 #, c-format
 msgid "Starting download `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:230
+#: src/applications/fs/tools/gnunet-download.c:225
 msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:251
+#: src/applications/fs/tools/gnunet-download.c:242
 #, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:281
+#: src/applications/fs/tools/gnunet-download.c:279
 #, c-format
 msgid "No filename specified, using `%s' instead (for now).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:325
+#: src/applications/fs/tools/gnunet-download.c:320
 #, c-format
 msgid "Could not access gnunet-directory file `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:345
+#: src/applications/fs/tools/gnunet-download.c:338
 #, c-format
 msgid "Downloading %d files from directory `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:349
+#: src/applications/fs/tools/gnunet-download.c:341
 #, c-format
 msgid "Did not find any files in directory `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:390
+#: src/applications/fs/tools/gnunet-download.c:377
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:57
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
 "completion)                "
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:68
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, 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:80
+#: src/applications/fs/tools/gnunet-unindex.c:85
 #, c-format
 msgid ""
 "\n"
 "Error unindexing file: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:100
+#: src/applications/fs/tools/gnunet-unindex.c:105
 msgid "Unindex files."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:137
+#: src/applications/fs/tools/gnunet-unindex.c:142
 msgid "Not enough arguments. You must specify a filename.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:164
+#: src/applications/fs/tools/gnunet-unindex.c:158
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr ""
 
-#: src/applications/fs/module/querymanager.c:225
+#: src/applications/fs/module/querymanager.c:228
 msgid "# FS currently tracked queries from clients"
 msgstr ""
 
-#: src/applications/fs/module/querymanager.c:227
+#: src/applications/fs/module/querymanager.c:230
 msgid "# FS replies passed to clients"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:336
+#: src/applications/fs/module/ondemand.c:323
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:434
+#: src/applications/fs/module/ondemand.c:418
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -1877,68 +1865,68 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:461
+#: src/applications/fs/module/ondemand.c:444
 #, 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:518
+#: src/applications/fs/module/ondemand.c:495
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:681
+#: src/applications/fs/module/ondemand.c:647
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1211
+#: src/applications/fs/module/fs.c:1170
 #, 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:1224
+#: src/applications/fs/module/fs.c:1185
 msgid "# FS expired replies dropped"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1226
+#: src/applications/fs/module/fs.c:1187
 msgid "# FS valid replies received"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1263
+#: src/applications/fs/module/fs.c:1220
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1303
+#: src/applications/fs/module/fs.c:1266
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:304
+#: src/applications/fs/module/migration.c:312
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:306
+#: src/applications/fs/module/migration.c:314
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:308
+#: src/applications/fs/module/migration.c:317
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/module/dht_push.c:137
+#: src/applications/fs/module/dht_push.c:138
 msgid "# blocks pushed into DHT"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:238
+#: src/applications/fs/fsui/search.c:234
 msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:308
+#: src/applications/fs/fsui/download.c:294
 msgid "Download failed (no reason given)"
 msgstr ""
 
@@ -1946,90 +1934,90 @@
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:281
+#: src/applications/fs/fsui/upload.c:278
 msgid "Failed to create temporary directory."
 msgstr ""
 
-#: src/applications/fs/fsui/deserialize.c:754
+#: src/applications/fs/fsui/deserialize.c:757
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:167
+#: src/applications/fs/ecrs/search.c:168
 msgid "CHK URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:226
+#: src/applications/fs/ecrs/search.c:214
 msgid "LOC URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/fs/ecrs/download.c:131
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:270
+#: src/applications/fs/ecrs/download.c:271
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:1043
+#: src/applications/fs/ecrs/download.c:1001
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:1229
+#: src/applications/fs/ecrs/download.c:1184
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:164
+#: src/applications/fs/ecrs/upload.c:155
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:174
+#: src/applications/fs/ecrs/upload.c:162
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:183
+#: src/applications/fs/ecrs/upload.c:171
 msgid "Failed to connect to gnunetd."
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:195
+#: src/applications/fs/ecrs/upload.c:183
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:214
+#: src/applications/fs/ecrs/upload.c:202
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/fs/ecrs/upload.c:209
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:236
+#: src/applications/fs/ecrs/upload.c:223
 #, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:316
+#: src/applications/fs/ecrs/upload.c:296
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:854
+#: src/applications/fs/ecrs/meta.c:876
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:862
+#: src/applications/fs/ecrs/meta.c:884
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr ""
@@ -2039,79 +2027,79 @@
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:343
-#: src/applications/fs/ecrs/namespace.c:426
-#: src/applications/fs/ecrs/namespace.c:585
+#: src/applications/fs/ecrs/namespace.c:325
+#: src/applications/fs/ecrs/namespace.c:404
+#: src/applications/fs/ecrs/namespace.c:545
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:355
-#: src/applications/fs/ecrs/namespace.c:437
+#: src/applications/fs/ecrs/namespace.c:337
+#: src/applications/fs/ecrs/namespace.c:415
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:599
-#: src/applications/fs/ecrs/namespace.c:610
+#: src/applications/fs/ecrs/namespace.c:556
+#: src/applications/fs/ecrs/namespace.c:567
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/helper.c:67
+#: src/applications/fs/ecrs/helper.c:74
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: 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
+#: src/applications/fs/ecrs/helper.c:127 src/applications/fs/ecrs/helper.c:129
+#: src/applications/fs/ecrs/helper.c:133 src/applications/fs/ecrs/helper.c:138
 msgid "AND"
 msgstr ""
 
-#: src/applications/fs/ecrs/parser.c:122
+#: src/applications/fs/ecrs/parser.c:120
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:131
+#: src/applications/fs/uritrack/file_info.c:126
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:402
+#: src/applications/fs/uritrack/file_info.c:395
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:727
+#: src/applications/fs/namespace/namespace_info.c:655
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:748
+#: src/applications/fs/namespace/namespace_info.c:675
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:382
+#: src/applications/topology_f2f/topology.c:373
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:400
+#: src/applications/topology_f2f/topology.c:390
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:413
+#: src/applications/topology_f2f/topology.c:404
 #, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:519
+#: src/applications/topology_f2f/topology.c:511
 msgid "maintains a friend-to-friend restricted topology"
 msgstr ""
 
-#: src/applications/template/template.c:62
+#: src/applications/template/template.c:68
 #, c-format
 msgid "`%s' registering client handler %d and %d\n"
 msgstr ""
@@ -2120,50 +2108,50 @@
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:105
+#: src/applications/bootstrap_http/http.c:102
 #, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:176
+#: src/applications/bootstrap_http/http.c:170
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:211
+#: src/applications/bootstrap_http/http.c:210
 #, c-format
 msgid "Bootstrapping using `%s'.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:237
+#: src/applications/bootstrap_http/http.c:224
 #, c-format
 msgid "Trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:388
+#: src/applications/bootstrap_http/http.c:352
 #, c-format
 msgid "Downloaded %llu bytes from `%s'.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:421
+#: src/applications/bootstrap_http/http.c:385
 msgid "# HELLOs downloaded via http"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:441
+#: src/applications/traffic/traffic.c:454
 #, c-format
 msgid "# bytes transmitted of type %d"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:459
+#: src/applications/traffic/traffic.c:470
 #, c-format
 msgid "# bytes received of type %d"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:478
+#: src/applications/traffic/traffic.c:489
 #, c-format
 msgid "# bytes received in plaintext of type %d"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:639
+#: src/applications/traffic/traffic.c:644
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -2171,376 +2159,376 @@
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:326
+#: src/applications/vpn/vpn.c:366
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:334
+#: src/applications/vpn/vpn.c:377
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:362
+#: src/applications/vpn/vpn.c:410
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:411
+#: src/applications/vpn/vpn.c:466
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:415
+#: src/applications/vpn/vpn.c:472
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:425
+#: src/applications/vpn/vpn.c:488
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:485
+#: src/applications/vpn/vpn.c:556
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:489
+#: src/applications/vpn/vpn.c:562
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:518
+#: src/applications/vpn/vpn.c:594
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:526
+#: src/applications/vpn/vpn.c:606
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:530
+#: src/applications/vpn/vpn.c:614
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:568
+#: src/applications/vpn/vpn.c:655
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:572
+#: src/applications/vpn/vpn.c:664
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:579
+#: src/applications/vpn/vpn.c:674
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:584
+#: src/applications/vpn/vpn.c:682
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:592
+#: src/applications/vpn/vpn.c:694
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:604
+#: src/applications/vpn/vpn.c:707
 #, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:615
+#: src/applications/vpn/vpn.c:721
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:627
+#: src/applications/vpn/vpn.c:733
 #, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:660
+#: src/applications/vpn/vpn.c:774
 msgid ""
 "RFC4193 We have run out of memory and so I can't store a tunnel for this "
 "peer.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:706
+#: src/applications/vpn/vpn.c:822
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:769
+#: src/applications/vpn/vpn.c:895
 #, c-format
 msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:773
+#: src/applications/vpn/vpn.c:902
 #, c-format
 msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:791
+#: src/applications/vpn/vpn.c:921
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:831
+#: src/applications/vpn/vpn.c:968
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:835
+#: src/applications/vpn/vpn.c:974
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:841
+#: src/applications/vpn/vpn.c:981
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:844
+#: src/applications/vpn/vpn.c:985
 #, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:996
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:873
+#: src/applications/vpn/vpn.c:1022
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:894
+#: src/applications/vpn/vpn.c:1043
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:899
+#: src/applications/vpn/vpn.c:1050
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:910
+#: src/applications/vpn/vpn.c:1065
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:916
+#: src/applications/vpn/vpn.c:1071
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:932
+#: src/applications/vpn/vpn.c:1088
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:936
+#: src/applications/vpn/vpn.c:1094
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:940
+#: src/applications/vpn/vpn.c:1100
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:954
+#: src/applications/vpn/vpn.c:1119
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:969
+#: src/applications/vpn/vpn.c:1137
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:997
+#: src/applications/vpn/vpn.c:1168
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1012
+#: src/applications/vpn/vpn.c:1188
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1057
+#: src/applications/vpn/vpn.c:1239
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1103
+#: src/applications/vpn/vpn.c:1292
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1129
+#: src/applications/vpn/vpn.c:1324
 msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1190 src/setup/ncurses/wizard_curs.c:105
+#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:95
 msgid "Yes"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1190 src/setup/ncurses/wizard_curs.c:104
+#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:94
 msgid "No"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1398
+#: src/applications/vpn/vpn.c:1647
 #, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1399
+#: src/applications/vpn/vpn.c:1650
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1449
+#: src/applications/vpn/vpn.c:1723
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1481
+#: src/applications/vpn/vpn.c:1757
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1494
+#: src/applications/vpn/vpn.c:1771
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1509
+#: src/applications/vpn/vpn.c:1788
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/dstore/dstore.c:555
+#: src/applications/dstore/dstore.c:466
 msgid "# bytes in dstore"
 msgstr ""
 
-#: src/server/gnunet-update.c:143
+#: src/server/gnunet-update.c:147
 #, c-format
 msgid "Updating data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:148
+#: src/server/gnunet-update.c:151
 #, c-format
 msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:196 src/server/gnunetd.c:144
+#: src/server/gnunet-update.c:198 src/server/gnunetd.c:136
 msgid "Core initialization failed.\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:237
+#: src/server/gnunet-update.c:239
 msgid "print a value from the configuration file to stdout"
 msgstr ""
 
-#: src/server/gnunet-update.c:239
+#: src/server/gnunet-update.c:241
 msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:401
+#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:365
 msgid "run as user LOGIN"
 msgstr ""
 
-#: src/server/gnunet-update.c:246
+#: src/server/gnunet-update.c:249
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
-#: src/server/connection.c:1116
+#: src/server/connection.c:1188
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/server/connection.c:1125
+#: src/server/connection.c:1197
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr ""
 
-#: src/server/connection.c:2594
+#: src/server/connection.c:2744
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr ""
 
-#: src/server/connection.c:2679
+#: src/server/connection.c:2829
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2698
+#: src/server/connection.c:2851
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:3154
+#: src/server/connection.c:3337
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3158
+#: src/server/connection.c:3340
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3160
+#: src/server/connection.c:3342
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3163
+#: src/server/connection.c:3345
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/server/connection.c:3167
+#: src/server/connection.c:3349
 msgid "# bytes transmitted"
 msgstr ""
 
-#: src/server/connection.c:3171
+#: src/server/connection.c:3353
 msgid "# bytes received"
 msgstr ""
 
-#: src/server/connection.c:3174
+#: src/server/connection.c:3355
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/server/connection.c:3176
+#: src/server/connection.c:3356
 msgid "# bytes noise sent"
 msgstr ""
 
-#: src/server/connection.c:3178
+#: src/server/connection.c:3359
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3180
+#: src/server/connection.c:3362
 msgid "# total bytes per second receive limit"
 msgstr ""
 
-#: src/server/connection.c:3182
+#: src/server/connection.c:3365
 msgid "# total number of messages in send buffers"
 msgstr ""
 
-#: src/server/connection.c:3184
+#: src/server/connection.c:3369
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3186
+#: src/server/connection.c:3373
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3188
+#: src/server/connection.c:3377
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
-#: src/server/startup.c:207
+#: src/server/startup.c:206
 #, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
 msgstr ""
 
-#: src/server/startup.c:224
+#: src/server/startup.c:223
 #, c-format
 msgid ""
 "Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
 "address@hidden"
 msgstr ""
 
-#: src/server/startup.c:238
+#: src/server/startup.c:237
 #, c-format
 msgid ""
 "Limiting datastore size to %llu GB, because the `%s' filesystem does not "
@@ -2548,12 +2536,12 @@
 "partition!\n"
 msgstr ""
 
-#: src/server/startup.c:285
+#: src/server/startup.c:274
 #, c-format
 msgid "Insufficient access permissions for `%s': %s\n"
 msgstr ""
 
-#: src/server/gnunetd.c:84
+#: src/server/gnunetd.c:85
 #, c-format
 msgid "`%s' startup complete.\n"
 msgstr ""
@@ -2563,210 +2551,210 @@
 msgid "`%s' is shutting down.\n"
 msgstr ""
 
-#: src/server/gnunetd.c:206
+#: src/server/gnunetd.c:192
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
 msgstr ""
 
-#: src/server/gnunetd.c:210
+#: src/server/gnunetd.c:196
 msgid "Starts the gnunetd daemon."
 msgstr ""
 
-#: src/server/gnunetd.c:213
+#: src/server/gnunetd.c:199
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:216
+#: src/server/gnunetd.c:203
 msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:220
+#: src/server/gnunetd.c:207
 msgid "specify username as which gnunetd should run"
 msgstr ""
 
-#: src/server/gnunetd.c:288
+#: src/server/gnunetd.c:271
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
 
-#: src/server/core.c:124
+#: src/server/core.c:126
 #, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr ""
 
-#: src/server/core.c:174
+#: src/server/core.c:177
 #, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr ""
 
-#: src/server/core.c:217
+#: src/server/core.c:226
 #, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr ""
 
-#: src/server/core.c:225
+#: src/server/core.c:234
 #, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr ""
 
-#: src/server/core.c:235
+#: src/server/core.c:243
 #, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:374
+#: src/server/core.c:386
 #, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr ""
 
-#: src/server/core.c:470
+#: src/server/core.c:492
 #, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:598
+#: src/server/core.c:628
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:118
+#: src/server/gnunet-transport-check.c:121
 #, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:127
+#: src/server/gnunet-transport-check.c:128
 #, c-format
 msgid "`%s': Could not connect.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:161
+#: src/server/gnunet-transport-check.c:157
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:183
+#: src/server/gnunet-transport-check.c:172
 #, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:197
+#: src/server/gnunet-transport-check.c:185
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:204
+#: src/server/gnunet-transport-check.c:192
 #, 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:232
+#: src/server/gnunet-transport-check.c:222
 #, c-format
 msgid " Transport %d is not being tested\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:265
+#: src/server/gnunet-transport-check.c:251
 #, c-format
 msgid ""
 "\n"
 "Contacting `%s'."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:291
+#: src/server/gnunet-transport-check.c:276
 #, c-format
 msgid " Connection failed\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:297
+#: src/server/gnunet-transport-check.c:282
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:319
 #, c-format
 msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-transport-check.c:321
 #, c-format
 msgid "OK!\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:382
+#: src/server/gnunet-transport-check.c:346
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:386
+#: src/server/gnunet-transport-check.c:350
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:389
+#: src/server/gnunet-transport-check.c:353
 msgid "send COUNT messages"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:392
+#: src/server/gnunet-transport-check.c:356
 msgid "send messages with SIZE bytes payload"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:395
+#: src/server/gnunet-transport-check.c:359
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:398
+#: src/server/gnunet-transport-check.c:362
 msgid "specifies after how many MS to time-out"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:406
+#: src/server/gnunet-transport-check.c:370
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:471
+#: src/server/gnunet-transport-check.c:431
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:474
+#: src/server/gnunet-transport-check.c:433
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:539
+#: src/server/gnunet-transport-check.c:474
 #, c-format
 msgid ""
 "\n"
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
-#: src/server/tcpserver.c:105
+#: src/server/tcpserver.c:109
 #, c-format
 msgid "The `%s' request received from client is malformed.\n"
 msgstr ""
 
-#: src/server/tcpserver.c:333
+#: src/server/tcpserver.c:324
 #, c-format
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr ""
 
-#: src/server/tcpserver.c:414
+#: src/server/tcpserver.c:398
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:466
+#: src/server/tcpserver.c:454
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr ""
 
-#: src/server/handler.c:401
+#: src/server/handler.c:428
 #, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr ""
 
-#: src/server/version.c:152
+#: src/server/version.c:141
 msgid ""
 "Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
@@ -2779,127 +2767,127 @@
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:129 src/server/gnunet-peer-info.c:159
+#: src/server/gnunet-peer-info.c:122 src/server/gnunet-peer-info.c:153
 #, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:139
+#: src/server/gnunet-peer-info.c:133
 msgid "hello message invalid (signature invalid).\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:161
+#: src/server/gnunet-peer-info.c:154
 #, c-format
 msgid "Peer `%s' with trust %8u\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:166
+#: src/server/gnunet-peer-info.c:158
 #, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr ""
 
-#: src/util/boot/startup.c:212
+#: src/util/boot/startup.c:199
 #, c-format
 msgid "Failed to run %s: %s %d\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:94 src/util/network_client/tcpio.c:135
+#: src/util/network_client/tcpio.c:96 src/util/network_client/tcpio.c:140
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:106
+#: src/util/network_client/tcpio.c:111
 #, c-format
 msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:280
+#: src/util/network_client/tcpio.c:290
 #, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:323
+#: src/util/network_client/tcpio.c:327
 #, c-format
 msgid "Error connecting to %s:%u\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:336
+#: src/util/network_client/tcpio.c:338
 #, c-format
 msgid "Failed to connect to %s:%u in %ds\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:492
+#: src/util/network_client/tcpio.c:494
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr ""
 
-#: src/util/crypto/hostkey_gcrypt.c:1036
+#: src/util/crypto/hostkey_gcrypt.c:898
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto/locking_gcrypt.c:74
+#: src/util/crypto/locking_gcrypt.c:80
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/os/statuscalls.c:186 src/util/os/statuscalls.c:323
+#: src/util/os/statuscalls.c:196 src/util/os/statuscalls.c:337
 #, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr ""
 
-#: src/util/os/statuscalls.c:368 src/util/os/statuscalls.c:377
+#: src/util/os/statuscalls.c:380 src/util/os/statuscalls.c:390
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
 msgstr ""
 
-#: src/util/os/semaphore.c:219
+#: src/util/os/semaphore.c:218
 #, c-format
 msgid "Can't create semaphore: %i"
 msgstr ""
 
-#: src/util/os/osconfig.c:121
+#: src/util/os/osconfig.c:124
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:379
+#: src/util/os/osconfig.c:391
 #, c-format
 msgid "Command `%s' failed with error code %u\n"
 msgstr ""
 
-#: src/util/os/dso.c:56
+#: src/util/os/dso.c:59
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/os/dso.c:110
+#: src/util/os/dso.c:119
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/os/dso.c:152
+#: src/util/os/dso.c:159
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/os/cpustatus.c:426
+#: src/util/os/cpustatus.c:461
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr ""
 
-#: src/util/os/cpustatus.c:446
+#: src/util/os/cpustatus.c:483
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr ""
 
-#: src/util/os/user.c:128 src/util/os/user.c:169
+#: src/util/os/user.c:134 src/util/os/user.c:176
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/util/os/user.c:130
+#: src/util/os/user.c:135
 msgid "No such user"
 msgstr ""
 
-#: src/util/os/user.c:143
+#: src/util/os/user.c:149
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
@@ -2909,182 +2897,184 @@
 msgid "Invalid process priority `%s'\n"
 msgstr ""
 
-#: src/util/network/select.c:315
+#: src/util/network/select.c:304
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 
-#: src/util/network/select.c:482
-msgid "select listen socket not valid!\n"
+#: src/util/network/select.c:473
+#, c-format
+msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
-#: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
+#: src/util/network/ipcheck.c:105 src/util/network/ipcheck.c:133
+#: src/util/network/ipcheck.c:180 src/util/network/ipcheck.c:204
+#: src/util/network/ipcheck.c:212
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:156
+#: src/util/network/ipcheck.c:162
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/network/ipcheck.c:217
+#: src/util/network/ipcheck.c:259
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:250
+#: src/util/network/ipcheck.c:291
 #, c-format
 msgid "Wrong format `%s' for netmask: %s\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:265
+#: src/util/network/ipcheck.c:304
 #, c-format
 msgid "Wrong format `%s' for network: %s\n"
 msgstr ""
 
-#: src/util/network/ip.c:202
+#: src/util/network/ip.c:195
 #, c-format
 msgid ""
 "Could not find interface `%s' using `%s', trying to find another interface.\n"
 msgstr ""
 
-#: src/util/network/ip.c:278
+#: src/util/network/ip.c:268
 #, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr ""
 
-#: src/util/network/ip.c:288
+#: src/util/network/ip.c:277
 #, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
 "GNUnet will use %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/util/network/ip.c:309
+#: src/util/network/ip.c:297
 #, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr ""
 
-#: src/util/network/ip.c:341
+#: src/util/network/ip.c:326
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/util/disk/storage.c:202
+#: src/util/disk/storage.c:198
 #, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr ""
 
-#: src/util/disk/storage.c:531
+#: src/util/disk/storage.c:526
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:289
+#: src/util/config_impl/impl.c:290
 #, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:532
+#: src/util/config_impl/impl.c:533
 #, c-format
 msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:578
+#: src/util/config_impl/impl.c:579
 #, 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:590
+#: src/util/config_impl/impl.c:589
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:680
+#: src/util/config_impl/impl.c:672
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:122
+#: src/util/error/error.c:115
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:190 src/util/error/error.c:234
+#: src/util/error/error.c:187 src/util/error/error.c:222
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/error/error.c:193 src/util/error/error.c:236
+#: src/util/error/error.c:189 src/util/error/error.c:224
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:196 src/util/error/error.c:240
+#: src/util/error/error.c:191 src/util/error/error.c:228
 msgid "WARNING"
 msgstr ""
 
-#: src/util/error/error.c:199 src/util/error/error.c:242
+#: src/util/error/error.c:193 src/util/error/error.c:230
 msgid "ERROR"
 msgstr ""
 
-#: src/util/error/error.c:202 src/util/error/error.c:244
+#: src/util/error/error.c:195 src/util/error/error.c:232
 msgid "FATAL"
 msgstr ""
 
-#: src/util/error/error.c:205 src/util/error/error.c:246
+#: src/util/error/error.c:197 src/util/error/error.c:234
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:208 src/util/error/error.c:248
+#: src/util/error/error.c:199 src/util/error/error.c:236
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:211 src/util/error/error.c:250
+#: src/util/error/error.c:201 src/util/error/error.c:238
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:214 src/util/error/error.c:252
+#: src/util/error/error.c:203 src/util/error/error.c:240
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:217 src/util/error/error.c:254
+#: src/util/error/error.c:205 src/util/error/error.c:242
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:220 src/util/error/error.c:256
+#: src/util/error/error.c:207 src/util/error/error.c:244
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:223
+#: src/util/error/error.c:209
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:238
+#: src/util/error/error.c:226
 msgid "INFO"
 msgstr ""
 
-#: src/util/error/error.c:257
+#: src/util/error/error.c:245
 msgid "NOTHING"
 msgstr ""
 
-#: src/util/threads/mutex.c:145 src/util/threads/semaphore.c:174
-#: src/util/threads/pthread.c:150
+#: src/util/threads/mutex.c:144 src/util/threads/semaphore.c:166
+#: src/util/threads/pthread.c:154
 #, c-format
 msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:154 src/util/threads/mutex.c:194
+#: src/util/threads/mutex.c:152 src/util/threads/mutex.c:194
 #, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:159
+#: src/util/threads/mutex.c:156
 #, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr ""
@@ -3094,90 +3084,102 @@
 msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:199
+#: src/util/threads/mutex.c:198
 #, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr ""
 
-#: src/util/threads/pthread.c:162 src/util/threads/pthread.c:170
-#: src/util/threads/pthread.c:177 src/util/threads/pthread.c:270
+#: src/util/threads/pthread.c:165 src/util/threads/pthread.c:171
+#: src/util/threads/pthread.c:176 src/util/threads/pthread.c:264
 #, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr ""
 
-#: src/util/threads/pthread.c:184 src/util/threads/pthread.c:281
+#: src/util/threads/pthread.c:181 src/util/threads/pthread.c:273
 #, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr ""
 
-#: src/util/loggers/file.c:231
+#: src/util/loggers/file.c:229
 #, c-format
 msgid "Failed to open log-file `%s': %s\n"
 msgstr ""
 
-#: src/util/loggers/file.c:256
+#: src/util/loggers/file.c:248
 msgid "GNUnet error log"
 msgstr ""
 
-#: src/util/loggers/memory.c:71
+#: src/util/loggers/file.c:265 src/util/loggers/file.c:282
+#: src/include/gnunet_util_error.h:243 src/include/gnunet_util_error.h:250
+#: src/include/gnunet_util_error.h:257 src/include/gnunet_util_error.h:264
+#, c-format
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
+msgstr ""
+
+#: src/util/loggers/memory.c:70
 msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:681
+#: src/util/getopt/getopt.c:684
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:705
+#: src/util/getopt/getopt.c:710
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:710
+#: src/util/getopt/getopt.c:716
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:727 src/util/getopt/getopt.c:901
+#: src/util/getopt/getopt.c:737 src/util/getopt/getopt.c:909
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:757
+#: src/util/getopt/getopt.c:767
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:761
+#: src/util/getopt/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:787
+#: src/util/getopt/getopt.c:797
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:790
+#: src/util/getopt/getopt.c:799
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:820 src/util/getopt/getopt.c:950
+#: src/util/getopt/getopt.c:828 src/util/getopt/getopt.c:958
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:867
+#: src/util/getopt/getopt.c:876
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:885
+#: src/util/getopt/getopt.c:894
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
+#: src/util/getopt/getopt.c:1071 src/setup/gnunet-setup.c:273
+#, c-format
+msgid "Use --help to get a list of options.\n"
+msgstr ""
+
 #: src/util/getopt/setoption.c:58
 #, c-format
 msgid ""
@@ -3185,18 +3187,18 @@
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
+#: src/util/getopt/setoption.c:136 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
+#: src/util/getopt/printhelp.c:49
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/string/string.c:121
+#: src/util/string/string.c:120
 msgid "ms"
 msgstr ""
 
@@ -3204,191 +3206,191 @@
 msgid "s"
 msgstr ""
 
-#: src/util/string/string.c:129
+#: src/util/string/string.c:130
 msgid "m"
 msgstr ""
 
-#: src/util/string/string.c:132
+#: src/util/string/string.c:134
 msgid "h"
 msgstr ""
 
-#: src/util/string/string.c:135
+#: src/util/string/string.c:138
 msgid " days"
 msgstr ""
 
-#: src/util/string/string.c:153
+#: src/util/string/string.c:154
 msgid "b"
 msgstr ""
 
-#: src/util/string/string.c:158
+#: src/util/string/string.c:160
 msgid "KiB"
 msgstr ""
 
-#: src/util/string/string.c:161
+#: src/util/string/string.c:164
 msgid "MiB"
 msgstr ""
 
-#: src/util/string/string.c:164
+#: src/util/string/string.c:168
 msgid "GiB"
 msgstr ""
 
-#: src/util/string/string.c:167
+#: src/util/string/string.c:172
 msgid "TiB"
 msgstr ""
 
-#: src/util/string/string.c:287
+#: src/util/string/string.c:284
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:60
+#: src/setup/gnunet-setup.c:59
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:62
+#: src/setup/gnunet-setup.c:61
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:188
+#: src/setup/gnunet-setup.c:176
 #, c-format
 msgid "Too many arguments.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:193
+#: src/setup/gnunet-setup.c:181
 msgid "No interface specified, using default\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:268
+#: src/setup/gnunet-setup.c:255
 #, c-format
 msgid "`%s' is not available."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:284
+#: src/setup/gnunet-setup.c:272
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:54
+#: src/setup/gnunet-win-tool.c:55
 msgid "list all network adapters"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:57
+#: src/setup/gnunet-win-tool.c:58
 msgid "install GNUnet as Windows service"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:60
+#: src/setup/gnunet-win-tool.c:61
 msgid "uninstall GNUnet service"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:63
+#: src/setup/gnunet-win-tool.c:64
 msgid "increase the maximum number of TCP/IP connections"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:66
+#: src/setup/gnunet-win-tool.c:67
 msgid "display a file's hash value"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:121
+#: src/setup/gnunet-win-tool.c:126
 #, c-format
 msgid "GNUnet service installed successfully.\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:151
+#: src/setup/gnunet-win-tool.c:129 src/setup/gnunet-win-tool.c:157
 #, c-format
 msgid "This version of Windows doesn't support services.\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:128 src/setup/gnunet-win-tool.c:155
+#: src/setup/gnunet-win-tool.c:133 src/setup/gnunet-win-tool.c:161
 #, c-format
 msgid "Error: can't open Service Control Manager: %s\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:133
+#: src/setup/gnunet-win-tool.c:138
 #, c-format
 msgid "Error: can't create service: %s\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:136 src/setup/gnunet-win-tool.c:167
+#: src/setup/gnunet-win-tool.c:141 src/setup/gnunet-win-tool.c:173
 #, c-format
 msgid "Unknown error.\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:148
+#: src/setup/gnunet-win-tool.c:154
 #, c-format
 msgid "Service deleted.\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:160
+#: src/setup/gnunet-win-tool.c:166
 #, c-format
 msgid "Error: can't access service: %s\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:164
+#: src/setup/gnunet-win-tool.c:170
 #, c-format
 msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:430
+#: src/setup/gtk/gconf.c:387
 msgid "Description"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:448
+#: src/setup/gtk/gconf.c:403
 msgid "Value"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:469
+#: src/setup/gtk/gconf.c:427
 msgid "Default"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:483 src/setup/ncurses/wizard_curs.c:77
+#: src/setup/gtk/gconf.c:442 src/setup/ncurses/wizard_curs.c:73
 msgid "Help"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:497
+#: src/setup/gtk/gconf.c:456
 msgid "Section"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:509
+#: src/setup/gtk/gconf.c:467
 msgid "Option"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:531
+#: src/setup/gtk/gconf.c:490
 msgid "Configuration saved."
 msgstr ""
 
-#: src/setup/gtk/gconf.c:539
+#: src/setup/gtk/gconf.c:500
 msgid "Failed to save configuration."
 msgstr ""
 
-#: src/setup/gtk/gconf.c:562
+#: src/setup/gtk/gconf.c:526
 msgid "Configuration changed. Save?"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:573
+#: src/setup/gtk/gconf.c:539
 msgid "Error saving configuration."
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:145
+#: src/setup/gtk/wizard_gtk.c:144
 msgid "(unknown connection)"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:428 src/setup/ncurses/wizard_curs.c:466
+#: src/setup/gtk/wizard_gtk.c:413 src/setup/ncurses/wizard_curs.c:453
 #, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:450
+#: src/setup/gtk/wizard_gtk.c:437
 msgid "Do you want to save the new configuration?"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:480
+#: src/setup/gtk/wizard_gtk.c:469
 msgid "Unable to create user account:"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:490
+#: src/setup/gtk/wizard_gtk.c:477
 msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:505
+#: src/setup/gtk/wizard_gtk.c:492
 msgid ""
 "Running gnunet-update failed.\n"
 "This maybe due to insufficient permissions, please check your "
@@ -3396,130 +3398,130 @@
 "Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/setup/text/conf.c:75
+#: src/setup/text/conf.c:79
 msgid "yes"
 msgstr ""
 
-#: src/setup/text/conf.c:76
+#: src/setup/text/conf.c:80
 msgid "no"
 msgstr ""
 
-#: src/setup/text/conf.c:104
+#: src/setup/text/conf.c:105
 #, c-format
 msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/text/conf.c:116
+#: src/setup/text/conf.c:114
 msgid "\tPossible choices:\n"
 msgstr ""
 
-#: src/setup/text/conf.c:124
+#: src/setup/text/conf.c:122
 msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:126
+#: src/setup/text/conf.c:124
 #, c-format
 msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/text/conf.c:147
+#: src/setup/text/conf.c:142
 #, c-format
 msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/text/conf.c:152
+#: src/setup/text/conf.c:146
 #, c-format
 msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/text/conf.c:158
+#: src/setup/text/conf.c:152
 #, c-format
 msgid ""
 "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
 "value %llu): "
 msgstr ""
 
-#: src/setup/text/conf.c:191
+#: src/setup/text/conf.c:186
 #, c-format
 msgid "Yes\n"
 msgstr ""
 
-#: src/setup/text/conf.c:196
+#: src/setup/text/conf.c:191
 #, c-format
 msgid "No\n"
 msgstr ""
 
-#: src/setup/text/conf.c:199 src/setup/text/conf.c:235
-#: src/setup/text/conf.c:261 src/setup/text/conf.c:318
-#: src/setup/text/conf.c:370
+#: src/setup/text/conf.c:194 src/setup/text/conf.c:235
+#: src/setup/text/conf.c:265 src/setup/text/conf.c:328
+#: src/setup/text/conf.c:386
 #, c-format
 msgid "Help\n"
 msgstr ""
 
-#: src/setup/text/conf.c:202 src/setup/text/conf.c:215
-#: src/setup/text/conf.c:270 src/setup/text/conf.c:299
-#: src/setup/text/conf.c:351
+#: src/setup/text/conf.c:197 src/setup/text/conf.c:212
+#: src/setup/text/conf.c:275 src/setup/text/conf.c:306
+#: src/setup/text/conf.c:364
 #, c-format
 msgid "Abort\n"
 msgstr ""
 
-#: src/setup/text/conf.c:342 src/setup/text/conf.c:397
+#: src/setup/text/conf.c:353 src/setup/text/conf.c:415
 #, c-format
 msgid ""
 "\n"
 "Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/text/conf.c:403
+#: src/setup/text/conf.c:421
 #, c-format
 msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:477
+#: src/setup/text/conf.c:482
 msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/setup/text/conf.c:488
+#: src/setup/text/conf.c:491
 msgid "Aborted.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:510
+#: src/setup/text/conf.c:504
 msgid "Invalid entry.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:529
+#: src/setup/text/conf.c:521
 #, c-format
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:560
+#: src/setup/text/conf.c:552
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:561
+#: src/setup/text/conf.c:553
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:575 src/setup/ncurses/mconf.c:519
+#: src/setup/text/conf.c:565 src/setup/ncurses/mconf.c:511
 #, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:580
+#: src/setup/text/conf.c:571
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:592
+#: src/setup/text/conf.c:586
 #, c-format
 msgid "Configuration was unchanged, no need to save.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:597
+#: src/setup/text/conf.c:595
 #, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr ""
@@ -3536,74 +3538,74 @@
 msgid "Cancel"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:175 src/setup/ncurses/mconf.c:278
-#: src/setup/ncurses/mconf.c:356 src/setup/ncurses/mconf.c:462
-#: src/setup/ncurses/wizard_curs.c:121 src/setup/ncurses/wizard_curs.c:191
-#: src/setup/ncurses/wizard_curs.c:307
+#: src/setup/ncurses/mconf.c:179 src/setup/ncurses/mconf.c:278
+#: src/setup/ncurses/mconf.c:359 src/setup/ncurses/mconf.c:455
+#: src/setup/ncurses/wizard_curs.c:110 src/setup/ncurses/wizard_curs.c:174
+#: src/setup/ncurses/wizard_curs.c:290
 msgid "Internal error! (Choice invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:213 src/setup/ncurses/mconf.c:408
+#: src/setup/ncurses/mconf.c:212 src/setup/ncurses/mconf.c:403
 msgid "Internal error! (Value invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:399
+#: src/setup/ncurses/mconf.c:392
 msgid "Invalid input, expecting floating point value."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:447
+#: src/setup/ncurses/mconf.c:435
 msgid "Invalid input, expecting integer."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:453
+#: src/setup/ncurses/mconf.c:443
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:505 src/setup/ncurses/wizard_curs.c:562
+#: src/setup/ncurses/mconf.c:499 src/setup/ncurses/wizard_curs.c:534
 msgid "GNUnet Configuration"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:523
+#: src/setup/ncurses/mconf.c:517
 msgid "Do you wish to save your new configuration?"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:534
+#: src/setup/ncurses/mconf.c:531
 #, c-format
 msgid ""
 "\n"
 "End of configuration.\n"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:537
+#: src/setup/ncurses/mconf.c:536
 #, c-format
 msgid ""
 "\n"
 "Your configuration changes were NOT saved.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:67 src/setup/lib/wizard_util.c:131
-#: src/setup/lib/wizard_util.c:176
+#: src/setup/ncurses/wizard_curs.c:65 src/setup/lib/wizard_util.c:139
+#: src/setup/lib/wizard_util.c:194
 msgid "Error"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:86
+#: src/setup/ncurses/wizard_curs.c:80
 msgid "Error!"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:153
+#: src/setup/ncurses/wizard_curs.c:142
 msgid "Abort"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:154
+#: src/setup/ncurses/wizard_curs.c:143
 msgid "Ok"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:222 src/setup/ncurses/wizard_curs.c:290
-#: src/setup/ncurses/wizard_curs.c:443
+#: src/setup/ncurses/wizard_curs.c:209 src/setup/ncurses/wizard_curs.c:275
+#: src/setup/ncurses/wizard_curs.c:426
 msgid "GNUnet configuration"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:223
+#: src/setup/ncurses/wizard_curs.c:211
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -3620,34 +3622,34 @@
 "the GNUnet team"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:291
+#: src/setup/ncurses/wizard_curs.c:277
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:312 src/setup/ncurses/wizard_curs.c:325
+#: src/setup/ncurses/wizard_curs.c:295 src/setup/ncurses/wizard_curs.c:309
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
 "you are using DSL."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:323
+#: src/setup/ncurses/wizard_curs.c:306
 msgid "Network configuration: interface"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:324
+#: src/setup/ncurses/wizard_curs.c:308
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:335
+#: src/setup/ncurses/wizard_curs.c:319
 msgid "Network configuration: NAT"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:336
+#: src/setup/ncurses/wizard_curs.c:320
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3658,15 +3660,15 @@
 "forwarding\")."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:349
+#: src/setup/ncurses/wizard_curs.c:333
 msgid "Network configuration: IP"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:350
+#: src/setup/ncurses/wizard_curs.c:335
 msgid "What is this computer's public IP address or hostname?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:351
+#: src/setup/ncurses/wizard_curs.c:336
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -3678,15 +3680,15 @@
 "If in doubt, leave this empty."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:366
+#: src/setup/ncurses/wizard_curs.c:351
 msgid "Bandwidth configuration: upload"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:367
+#: src/setup/ncurses/wizard_curs.c:353
 msgid "How much upstream bandwidth (in bytes/s) may be used?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:368
+#: src/setup/ncurses/wizard_curs.c:354
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3697,15 +3699,15 @@
 "connection allows."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:380
+#: src/setup/ncurses/wizard_curs.c:366
 msgid "Bandwidth configuration: download"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:381
+#: src/setup/ncurses/wizard_curs.c:368
 msgid "How much downstream bandwidth (in bytes/s) may be used?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:382
+#: src/setup/ncurses/wizard_curs.c:369
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3716,29 +3718,29 @@
 "connection allows."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:394
+#: src/setup/ncurses/wizard_curs.c:381
 msgid "Quota configuration"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:395
+#: src/setup/ncurses/wizard_curs.c:382
 msgid "What is the maximum size of the datastore in MB?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:396
+#: src/setup/ncurses/wizard_curs.c:383
 msgid ""
 "The GNUnet datastore contains all content that GNUnet needs to store "
 "(indexed, inserted and migrated content)."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:409
+#: src/setup/ncurses/wizard_curs.c:393
 msgid "Daemon configuration: user account"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:410
+#: src/setup/ncurses/wizard_curs.c:394
 msgid "As which user should gnunetd be run?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:411
+#: src/setup/ncurses/wizard_curs.c:396
 msgid ""
 "For security reasons, it is a good idea to let this setup create a new user "
 "account under which the GNUnet service is started at system startup.\n"
@@ -3750,15 +3752,15 @@
 "Leave the field empty to run GNUnet with system privileges.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:429
+#: src/setup/ncurses/wizard_curs.c:411
 msgid "Daemon configuration: group account"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:430
+#: src/setup/ncurses/wizard_curs.c:412
 msgid "As which group should gnunetd be run?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:431
+#: src/setup/ncurses/wizard_curs.c:414
 msgid ""
 "For security reasons, it is a good idea to let this setup create a new group "
 "for the chosen user account.\n"
@@ -3769,137 +3771,131 @@
 "server and have access to GNUnet server data.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:444
+#: src/setup/ncurses/wizard_curs.c:428
 msgid "Do you want to automatically launch GNUnet as a system service?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:445
+#: src/setup/ncurses/wizard_curs.c:430
 msgid ""
 "If you say \"yes\" here, the GNUnet background process will be automatically "
 "started when you turn on your computer. If you say \"no\" here, you have to "
 "launch GNUnet yourself each time you want to use it."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:493
+#: src/setup/ncurses/wizard_curs.c:471
 msgid "Unable to create user account for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:507
+#: src/setup/ncurses/wizard_curs.c:478
 msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:521
+#: src/setup/ncurses/wizard_curs.c:493
 msgid "Save configuration?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:522
+#: src/setup/ncurses/wizard_curs.c:494
 msgid "Save configuration now?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:566
+#: src/setup/ncurses/wizard_curs.c:538
 msgid "Back"
 msgstr ""
 
-#: src/setup/lib/gns.c:278
+#: src/setup/lib/gns.c:294
 #, c-format
 msgid ""
 "Configuration does not satisfy constraints of configuration specification "
 "file `%s'!\n"
 msgstr ""
 
-#: src/setup/lib/tree.c:189
+#: src/setup/lib/tree.c:190
 #, c-format
 msgid ""
 "Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:101
+#: src/setup/lib/wizard_util.c:110
 msgid "Can't open Service Control Manager"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:106
+#: src/setup/lib/wizard_util.c:116
 msgid "Can't create service"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:111
+#: src/setup/lib/wizard_util.c:120
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:115
+#: src/setup/lib/wizard_util.c:125
 msgid "Cannot write to the regisitry"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:118
+#: src/setup/lib/wizard_util.c:128
 msgid "Can't access the service"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:122
+#: src/setup/lib/wizard_util.c:131
 msgid "Can't delete the service"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:126
+#: src/setup/lib/wizard_util.c:134
 msgid "Unknown error"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:159
+#: src/setup/lib/wizard_util.c:170
 msgid "This version of Windows does not support multiple users."
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:163
+#: src/setup/lib/wizard_util.c:174
 msgid "Error creating user"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:166
+#: src/setup/lib/wizard_util.c:178
 msgid "Error accessing local security policy"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:169
+#: src/setup/lib/wizard_util.c:183
 msgid "Error granting service right to user"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:172
+#: src/setup/lib/wizard_util.c:188
 msgid "Unknown error while creating a new user"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:150
+#: src/include/gnunet_util_getopt.h:153
 msgid "print this help"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:159
+#: src/include/gnunet_util_getopt.h:162
 msgid "print the version number"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:165
+#: src/include/gnunet_util_getopt.h:168
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:171
+#: src/include/gnunet_util_getopt.h:174
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:177
+#: src/include/gnunet_util_getopt.h:180
 msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:183
+#: src/include/gnunet_util_getopt.h:186
 msgid "specify host on which gnunetd is running"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:220
-#: src/include/gnunet_util_error.h:226 src/include/gnunet_util_error.h:236
-#: src/include/gnunet_util_error.h:242
+#: src/include/gnunet_util_error.h:212 src/include/gnunet_util_error.h:214
+#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:230
+#: src/include/gnunet_util_error.h:236
 #, c-format
 msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:249 src/include/gnunet_util_error.h:256
-#: src/include/gnunet_util_error.h:263 src/include/gnunet_util_error.h:270
+#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
 #, c-format
-msgid "`%s' failed at %s:%d in %s with error: %s\n"
-msgstr ""
-
-#: src/include/gnunet_util_error.h:277 src/include/gnunet_util_error.h:284
-#, 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     2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/po/de.po     2007-07-30 06:21:56 UTC (rev 5387)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-07 02:38-0600\n"
+"POT-Creation-Date: 2007-07-30 00:16-0600\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -16,90 +16,90 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/transports/ip6.c:72 src/util/network/io.c:80
+#: src/transports/ip6.c:75 src/util/network/io.c:85
 #, 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:104 src/util/network/ip.c:83 src/util/network/ip.c:144
+#: src/transports/ip6.c:104 src/util/network/ip.c:84 src/util/network/ip.c:146
 #, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr ""
 "Es sind keine Netzwerkgeräte in der Konfigurationsdatei in der Sektion `%s' "
 "unter `%s' definiert!\n"
 
-#: src/transports/ip6.c:134 src/util/network/ip.c:113
-#: src/util/network/ip.c:234
+#: src/transports/ip6.c:135 src/util/network/ip.c:115
+#: src/util/network/ip.c:221
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 "Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
 "werden.\n"
 
-#: src/transports/ip6.c:169
+#: src/transports/ip6.c:167
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/transports/ip6.c:222 src/transports/ip.c:59
+#: src/transports/ip6.c:219 src/transports/ip.c:60
 #, 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:129 src/transports/udp.c:137
+#: src/transports/udp6.c:123 src/transports/udp.c:129
 #, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transports/udp6.c:268
+#: src/transports/udp6.c:264
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "UDP6: Öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/udp6.c:500 src/transports/udp.c:547
+#: src/transports/udp6.c:471 src/transports/udp.c:514
 #, fuzzy, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 "MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
 "implementiert!)\n"
 
-#: src/transports/http.c:504
+#: src/transports/http.c:522
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/http.c:793 src/transports/http.c:892
-#: src/transports/http.c:1030 src/transports/http.c:1163
-#: src/transports/upnp/upnp.c:335 src/transports/upnp/upnp.c:591
-#: src/applications/bootstrap_http/http.c:124
-#: src/applications/bootstrap_http/http.c:269
-#: src/applications/bootstrap_http/http.c:290
-#: src/applications/bootstrap_http/http.c:324
-#: src/applications/bootstrap_http/http.c:342
-#: src/applications/bootstrap_http/http.c:356
-#: src/applications/bootstrap_http/http.c:368
-#: src/applications/bootstrap_http/http.c:380
+#: src/transports/http.c:813 src/transports/http.c:892
+#: src/transports/http.c:1007 src/transports/http.c:1147
+#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:540
+#: src/applications/bootstrap_http/http.c:115
+#: src/applications/bootstrap_http/http.c:247
+#: src/applications/bootstrap_http/http.c:263
+#: src/applications/bootstrap_http/http.c:294
+#: src/applications/bootstrap_http/http.c:313
+#: src/applications/bootstrap_http/http.c:326
+#: src/applications/bootstrap_http/http.c:336
+#: src/applications/bootstrap_http/http.c:346
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/transports/http.c:1344
+#: src/transports/http.c:1307
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:1352
+#: src/transports/http.c:1316
 msgid "# bytes received via HTTP"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/transports/http.c:1354
+#: src/transports/http.c:1317
 msgid "# bytes sent via HTTP"
 msgstr "# Bytes gesendet über HTTP"
 
-#: src/transports/http.c:1356
+#: src/transports/http.c:1319
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# Bytes verworfen von HTTP"
 
-#: src/transports/smtp.c:257
+#: src/transports/smtp.c:271
 #, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
@@ -108,149 +108,149 @@
 "Für den SMTP Transport müssen Sie den Namen einer Pipe in Sektion `%s', "
 "Eintrag `%s' eintragen.\n"
 
-#: src/transports/smtp.c:334
+#: src/transports/smtp.c:358
 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:433
+#: src/transports/smtp.c:463
 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:440
+#: src/transports/smtp.c:471
 #, 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:547
+#: src/transports/smtp.c:571
 #, fuzzy, c-format
 msgid "Failed to initialize libesmtp: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/transports/smtp.c:611
+#: src/transports/smtp.c:630
 #, 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:679
+#: src/transports/smtp.c:702
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s filter %s (SMTP)"
 
-#: src/transports/smtp.c:707
+#: src/transports/smtp.c:730
 #, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 "MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
 "implementiert!)\n"
 
-#: src/transports/tcp.c:283
+#: src/transports/tcp.c:289
 #, fuzzy
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/tcp.c:387
+#: src/transports/tcp.c:384
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/transports/tcp.c:454 src/transports/tcp6.c:414
+#: src/transports/tcp.c:437 src/transports/tcp6.c:404
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transports/tcp.c:584
+#: src/transports/tcp.c:556
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:592
+#: src/transports/tcp.c:565
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/tcp.c:594
+#: src/transports/tcp.c:566
 msgid "# bytes sent via TCP"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transports/tcp.c:596
+#: src/transports/tcp.c:568
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transports/udp.c:293
+#: src/transports/udp.c:287
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "UDP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/udp.c:388
+#: src/transports/udp.c:378
 #, 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:565
+#: src/transports/udp.c:529
 msgid "# bytes received via UDP"
 msgstr "# Bytes empfangen über UDP"
 
-#: src/transports/udp.c:567
+#: src/transports/udp.c:530
 msgid "# bytes sent via UDP"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transports/udp.c:569
+#: src/transports/udp.c:532
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/transports/tcp6.c:238
+#: src/transports/tcp6.c:245
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/tcp6.c:300
+#: src/transports/tcp6.c:312
 #, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/transports/tcp6.c:532
+#: src/transports/tcp6.c:512
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/tcp6.c:534
+#: src/transports/tcp6.c:513
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transports/tcp6.c:536
+#: src/transports/tcp6.c:515
 #, fuzzy
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transports/tcp_helper.c:248
+#: src/transports/tcp_helper.c:257
 #, 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:314
+#: src/transports/tcp_helper.c:276
 #, 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/upnp/upnp.c:443
+#: src/transports/upnp/upnp.c:429
 #, fuzzy, c-format
 msgid "%s failed for url `%s' and post-data `%s' at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/transports/upnp/upnp.c:504
+#: src/transports/upnp/upnp.c:475
 #, c-format
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/udp_helper.c:91
+#: src/transports/udp_helper.c:94
 #, fuzzy
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr ""
@@ -262,121 +262,121 @@
 msgid "Query (get KEY, put KEY VALUE) DHT table."
 msgstr "Eine DHT Tabelle abfragen (get KEY, put KEY VALUE, remove KEY VALUE)."
 
-#: src/applications/dht/tools/dht-query.c:59
+#: src/applications/dht/tools/dht-query.c:60
 #, fuzzy
 msgid ""
 "allow TIME ms to process a GET command or expire PUT content after ms TIME"
 msgstr "TIME ms erlauben, um jedes Kommando zu bearbeiten"
 
-#: src/applications/dht/tools/dht-query.c:103
+#: src/applications/dht/tools/dht-query.c:98
 #, c-format
 msgid "%s(%s) operation returned no results.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:125
+#: src/applications/dht/tools/dht-query.c:115
 #, fuzzy, c-format
 msgid "Issuing '%s(%s,%s)' command.\n"
 msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
 
-#: src/applications/dht/tools/dht-query.c:138
+#: src/applications/dht/tools/dht-query.c:122
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr "'%s(%s,%s)' erfolgreich abgeschlossen\n"
 
-#: src/applications/dht/tools/dht-query.c:143
+#: src/applications/dht/tools/dht-query.c:126
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
 
-#: src/applications/dht/tools/dht-query.c:171
+#: src/applications/dht/tools/dht-query.c:150
 #, 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:181
+#: src/applications/dht/tools/dht-query.c:163
 #, 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:194
+#: src/applications/dht/tools/dht-query.c:180
 #, 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:206
+#: src/applications/dht/tools/dht-query.c:191
 #, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/applications/dht/module/table.c:701
+#: src/applications/dht/module/table.c:716
 msgid "# dht connections"
 msgstr ""
 
-#: src/applications/dht/module/table.c:702
+#: src/applications/dht/module/table.c:718
 #, fuzzy
 msgid "# dht discovery messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/applications/dht/module/table.c:703
+#: src/applications/dht/module/table.c:720
 msgid "# dht route host lookups performed"
 msgstr ""
 
-#: src/applications/dht/module/table.c:704
+#: src/applications/dht/module/table.c:722
 #, fuzzy
 msgid "# dht discovery messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/applications/dht/module/cs.c:135
+#: src/applications/dht/module/cs.c:128
 #, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "`%s' fehlgeschlagen. Beende Verbindung zu Client.\n"
 
-#: src/applications/dht/module/cs.c:240
+#: src/applications/dht/module/cs.c:233
 #, fuzzy, c-format
 msgid "`%s' registering client handlers: %d %d\n"
 msgstr "`%s' registriert Client-Handler %d\n"
 
-#: src/applications/dht/module/cs.c:259
+#: src/applications/dht/module/cs.c:251
 msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:752
+#: src/applications/dht/module/routing.c:736
 msgid "# dht replies routed"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:753
+#: src/applications/dht/module/routing.c:738
 msgid "# dht requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/applications/dht/module/routing.c:754
+#: src/applications/dht/module/routing.c:740
 #, fuzzy
 msgid "# dht get requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/applications/dht/module/routing.c:755
+#: src/applications/dht/module/routing.c:742
 #, fuzzy
 msgid "# dht put requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/applications/dht/module/routing.c:756
+#: src/applications/dht/module/routing.c:744
 #, fuzzy
 msgid "# dht results received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/applications/dht/module/routing.c:760
+#: src/applications/dht/module/routing.c:748
 #, fuzzy, c-format
 msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr "`%s' registriert Handler %d %d %d\n"
 
-#: src/applications/chat/chat.c:87
+#: src/applications/chat/chat.c:88
 msgid "Message received from peer is invalid.\n"
 msgstr "Empfangene Nachricht ist ungültig.\n"
 
-#: src/applications/chat/chat.c:134
+#: src/applications/chat/chat.c:135
 msgid "Message received from client is invalid\n"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/applications/chat/chat.c:156
+#: src/applications/chat/chat.c:155
 msgid "Maximum number of chat clients reached.\n"
 msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
 
@@ -385,116 +385,112 @@
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr "Jetzt sind %d von %d auf diesem Knoten.\n"
 
-#: src/applications/chat/chat.c:197
+#: src/applications/chat/chat.c:202
 #, c-format
 msgid "`%s' registering handlers %d and %d\n"
 msgstr "`%s' registriert Handler %d und %d\n"
 
-#: src/applications/chat/chat.c:216
+#: src/applications/chat/chat.c:219
 msgid "enables P2P-chat (incomplete)"
 msgstr "Ermöglicht P2P-Chat"
 
-#: src/applications/chat/gnunet-chat.c:82
-msgid "specify nickname"
-msgstr "Spitznamen angeben"
+#: src/applications/chat/gnunet-chat.c:45
+msgid "Join a chat on GNUnet."
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:87
-msgid "Start GNUnet chat client."
-msgstr "GNUnet chat client starten"
+#: src/applications/chat/gnunet-chat.c:49
+msgid "set the nickname to use (requred)"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:93 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:287
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
+#: src/applications/chat/gnunet-chat.c:52
+msgid "set the chat room to join (requred)"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:151
-msgid "Could not connect to gnunetd.\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+#: src/applications/chat/gnunet-chat.c:134
+#, fuzzy, c-format
+msgid "You must specify a nickname\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/applications/chat/gnunet-chat.c:155
-#, c-format
-msgid "You must specify a nickname (use option `%s').\n"
-msgstr "Sie müssen einen Spitznamen angeben (verwenden Sie die Option `%s').\n"
+#: src/applications/chat/gnunet-chat.c:144
+#, fuzzy, c-format
+msgid "Failed to join the room\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/applications/chat/gnunet-chat.c:182
-msgid "Could not send join message to gnunetd\n"
-msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
+#: src/applications/chat/gnunet-chat.c:160
+#, fuzzy, c-format
+msgid "Failed to send message.\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/applications/chat/gnunet-chat.c:191
-msgid "Could not send message to gnunetd\n"
-msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
-
-#: src/applications/advertising/advertising.c:188
+#: src/applications/advertising/advertising.c:193
 #, fuzzy, c-format
 msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 msgstr ""
 "Hello Nachricht von `%s' ist ungültig (Signatur ist ungültig). Nachricht "
 "wurde verworfen.\n"
 
-#: src/applications/advertising/advertising.c:196
+#: src/applications/advertising/advertising.c:203
 #, fuzzy
 msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr ""
 "Empfangene Hello Nachricht ist ungültig (Ablaufzeit über Limit). Nachricht "
 "wurde verworfen.\n"
 
-#: src/applications/advertising/advertising.c:367
+#: src/applications/advertising/advertising.c:374
 #, fuzzy
 msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr "Hellos+PING konnten nicht gesendet werden, Ping Puffer ist voll.\n"
 
-#: src/applications/advertising/advertising.c:385
+#: src/applications/advertising/advertising.c:396
 msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:553
+#: src/applications/advertising/advertising.c:544
 #, 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:561
+#: src/applications/advertising/advertising.c:553
 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:838
+#: src/applications/advertising/advertising.c:817
 msgid "# Peer advertisements received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/applications/advertising/advertising.c:839
+#: src/applications/advertising/advertising.c:820
 #, fuzzy
 msgid "# Peer advertisements of type NAT received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/applications/advertising/advertising.c:840
+#: src/applications/advertising/advertising.c:823
 #, fuzzy
 msgid "# Peer advertisements confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/applications/advertising/advertising.c:841
+#: src/applications/advertising/advertising.c:827
 #, fuzzy
 msgid "# Peer advertisements updating earlier HELLOs"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/applications/advertising/advertising.c:842
+#: src/applications/advertising/advertising.c:830
 #, fuzzy
 msgid "# Peer advertisements discarded due to load"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/applications/advertising/advertising.c:843
+#: src/applications/advertising/advertising.c:834
 #, fuzzy
 msgid "# Peer advertisements for unsupported transport"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/applications/advertising/advertising.c:844
+#: src/applications/advertising/advertising.c:838
 #, fuzzy
 msgid "# Peer advertisements not confirmed due to ping busy"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/applications/advertising/advertising.c:845
+#: src/applications/advertising/advertising.c:842
 #, fuzzy
 msgid "# Peer advertisements not confirmed due to lack of self ad"
 msgstr "# Knotenankündigungen empfangen"
@@ -504,54 +500,54 @@
 msgid "# Peer advertisements not confirmed due to send error"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/applications/advertising/advertising.c:847
+#: src/applications/advertising/advertising.c:848
 msgid "# Self advertisments transmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/applications/advertising/advertising.c:848
+#: src/applications/advertising/advertising.c:850
 msgid "# Foreign advertisements forwarded"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/applications/advertising/advertising.c:850
-#: src/applications/pingpong/pingpong.c:520
+#: src/applications/advertising/advertising.c:852
+#: src/applications/pingpong/pingpong.c:509
 msgid "# plaintext PING messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/applications/advertising/advertising.c:855
-#: src/applications/session/connect.c:936
+#: src/applications/advertising/advertising.c:857
+#: src/applications/session/connect.c:901
 #, 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:873
+#: src/applications/advertising/advertising.c:872
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 "Stellt sicher, dass dieser Knoten anderen Knoten bekannt ist und entdeckt "
 "andere Knoten"
 
-#: src/applications/topology_default/topology.c:471
+#: src/applications/topology_default/topology.c:467
 msgid "maintains GNUnet default mesh topology"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:128
+#: src/applications/pingpong/pingpong.c:132
 #: src/applications/pingpong/pingpong.c:199
 #: src/applications/pingpong/pingpong.c:264
-#: src/applications/pingpong/pingpong.c:337
+#: src/applications/pingpong/pingpong.c:331
 #, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr "Beschädigte `%s' Nachricht empfangen. Nachricht wird verworfen.\n"
 
-#: src/applications/pingpong/pingpong.c:140
+#: src/applications/pingpong/pingpong.c:143
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "Ping für einen anderen Knoten empfangen. Ping wird verworfen.\n"
 
-#: src/applications/pingpong/pingpong.c:210
+#: src/applications/pingpong/pingpong.c:209
 msgid "Received PING not destined for us!\n"
 msgstr "Empfangener PING ist nicht an uns gerichtet!\n"
 
-#: src/applications/pingpong/pingpong.c:309
-#: src/applications/pingpong/pingpong.c:374
+#: src/applications/pingpong/pingpong.c:303
+#: src/applications/pingpong/pingpong.c:365
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
@@ -559,156 +555,154 @@
 "PONG konnte keinem PING zugeordnet werden. Versuchen Sie die Konstante "
 "MAX_PING_PONG hochzusetzen.\n"
 
-#: src/applications/pingpong/pingpong.c:418
+#: src/applications/pingpong/pingpong.c:409
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 "PING konnte nicht erstellt werden, da die Tabelle voll ist. Versuchen Sie, "
 "die Konstante MAX_PING_PONG hochzusetzen.\n"
 
-#: src/applications/pingpong/pingpong.c:510
+#: src/applications/pingpong/pingpong.c:499
 msgid "# encrypted PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:512
+#: src/applications/pingpong/pingpong.c:501
 msgid "# plaintext PONG messages received"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:514
+#: src/applications/pingpong/pingpong.c:503
 msgid "# encrypted PING messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:516
+#: src/applications/pingpong/pingpong.c:505
 msgid "# PING messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/applications/pingpong/pingpong.c:518
-#: src/applications/session/connect.c:931
+#: src/applications/pingpong/pingpong.c:507
+#: src/applications/session/connect.c:896
 msgid "# encrypted PONG messages sent"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/applications/pingpong/pingpong.c:522
-#: src/applications/session/connect.c:929
+#: src/applications/pingpong/pingpong.c:511
+#: src/applications/session/connect.c:894
 msgid "# encrypted PING messages sent"
 msgstr "# verschlüsselter PING Nachrichten gesendet"
 
-#: src/applications/pingpong/pingpong.c:524
+#: src/applications/pingpong/pingpong.c:513
 #, fuzzy
 msgid "# plaintext PONG messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/applications/pingpong/pingpong.c:526
+#: src/applications/pingpong/pingpong.c:517
 #, fuzzy
 msgid "# plaintext PONG transmissions failed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:536
+#: src/applications/pingpong/pingpong.c:526
 #, c-format
 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:46
-#: src/applications/sqstore_sqlite/sqlite.c:53
-#: src/applications/sqstore_mysql/mysql.c:139
-#: src/applications/sqstore_mysql/mysql.c:146
-#: src/applications/sqstore_mysql/mysql.c:825
-#: src/applications/sqstore_mysql/mysql.c:846
-#: src/applications/sqstore_mysql/mysql.c:858
-#: src/applications/sqstore_mysql/mysql.c:891
-#: src/applications/sqstore_mysql/mysql.c:904
-#: src/applications/sqstore_mysql/mysql.c:965
-#: src/applications/sqstore_mysql/mysql.c:1065
-#: src/applications/sqstore_mysql/mysql.c:1078
-#: src/applications/sqstore_mysql/mysql.c:1149
-#: src/applications/sqstore_mysql/mysql.c:1169
-#: src/applications/sqstore_mysql/mysql.c:1181
-#: src/applications/sqstore_mysql/mysql.c:1207
-#: src/applications/sqstore_mysql/mysql.c:1220
-#: src/applications/sqstore_mysql/mysql.c:1234
-#: src/applications/sqstore_mysql/mysql.c:1301
-#: src/applications/sqstore_mysql/mysql.c:1315
-#: src/applications/sqstore_mysql/mysql.c:1374
-#: src/applications/sqstore_mysql/mysql.c:1391
+#: src/applications/sqstore_sqlite/sqlite.c:47
+#: src/applications/sqstore_sqlite/sqlite.c:54
+#: src/applications/sqstore_mysql/mysql.c:145
+#: src/applications/sqstore_mysql/mysql.c:152
+#: src/applications/sqstore_mysql/mysql.c:428
+#: src/applications/sqstore_mysql/mysql.c:438
+#: src/applications/sqstore_mysql/mysql.c:476
+#: src/applications/sqstore_mysql/mysql.c:486
+#: src/applications/sqstore_mysql/mysql.c:518
+#: src/applications/sqstore_mysql/mysql.c:529
+#: src/applications/sqstore_mysql/mysql.c:627
+#: src/applications/sqstore_mysql/mysql.c:639
+#: src/applications/sqstore_mysql/mysql.c:651
+#: src/applications/sqstore_mysql/mysql.c:665
+#: src/applications/sqstore_mysql/mysql.c:762
+#: src/applications/sqstore_mysql/mysql.c:776
+#: src/applications/sqstore_mysql/mysql.c:917
+#: src/applications/sqstore_mysql/mysql.c:929
+#: src/applications/sqstore_mysql/mysql.c:941
+#: src/applications/sqstore_mysql/mysql.c:1184
+#: src/applications/sqstore_mysql/mysql.c:1196
+#: src/applications/sqstore_mysql/mysql.c:1208
+#: src/applications/sqstore_mysql/mysql.c:1293
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:93 src/applications/dstore/dstore.c:180
-#: src/applications/dstore/dstore.c:240 src/applications/dstore/dstore.c:263
-#: src/applications/dstore/dstore.c:323 src/applications/dstore/dstore.c:378
-#: src/applications/dstore/dstore.c:474 src/util/crypto/symcipher_gcrypt.c:46
-#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:63
-#: src/util/crypto/hostkey_gcrypt.c:70
+#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:180
+#: src/applications/dstore/dstore.c:219 src/applications/dstore/dstore.c:238
+#: src/applications/dstore/dstore.c:293 src/applications/dstore/dstore.c:330
+#: src/applications/dstore/dstore.c:403 src/util/crypto/symcipher_gcrypt.c:46
+#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:64
+#: src/util/crypto/hostkey_gcrypt.c:71
 #, c-format
 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:207
+#: src/applications/sqstore_sqlite/sqlite.c:193
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:379
+#: src/applications/sqstore_sqlite/sqlite.c:393
 #, fuzzy, c-format
 msgid "Invalid data in %s (NCS).  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:380
-#: src/applications/sqstore_sqlite/sqlite.c:401
+#: src/applications/sqstore_sqlite/sqlite.c:394
+#: src/applications/sqstore_sqlite/sqlite.c:416
 msgid "sqlite datastore"
 msgstr "sqlite Datenspeicher"
 
-#: src/applications/sqstore_sqlite/sqlite.c:400
-#: src/applications/sqstore_mysql/mysql.c:262
-#: src/applications/sqstore_mysql/mysql.c:924
-#: src/applications/sqstore_mysql/mysql.c:1251
+#: src/applications/sqstore_sqlite/sqlite.c:415
 #, 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:1395
-#: src/applications/sqstore_mysql/mysql.c:1466
+#: src/applications/sqstore_sqlite/sqlite.c:1206
+#: src/applications/sqstore_mysql/mysql.c:1401
 msgid "# bytes in datastore"
 msgstr "# bytes in der Datenbank"
 
-#: src/applications/session/connect.c:261
-#: src/applications/session/connect.c:278
+#: src/applications/session/connect.c:256
+#: src/applications/session/connect.c:272
 #, 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:321
+#: src/applications/session/connect.c:313
 #, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr ""
 "Sitzungsschlüssel kann nicht verschlüsselt werden, Knoten `%s' ist uns nicht "
 "bekannt!\n"
 
-#: src/applications/session/connect.c:520
+#: src/applications/session/connect.c:492
 #, fuzzy
 msgid "Could not create any HELLO for myself!\n"
 msgstr "Hostkey konnte nicht erzeugt werden!\n"
 
-#: src/applications/session/connect.c:621
+#: src/applications/session/connect.c:592
 #, 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:639
+#: src/applications/session/connect.c:614
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr "Empfangene Nachricht ist ungültig.\n"
 
-#: src/applications/session/connect.c:673
+#: src/applications/session/connect.c:646
 #, 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:683
+#: src/applications/session/connect.c:656
 #, 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:752
+#: src/applications/session/connect.c:719
 #, fuzzy, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
@@ -717,28 +711,28 @@
 "Fehler beim Parsen des Verschlüsselten Sitzungsschlüssels, gegebene "
 "Nachrichtenteilgröße ist ungültig.\n"
 
-#: src/applications/session/connect.c:764
+#: src/applications/session/connect.c:731
 #, fuzzy, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr "Unbekannter Typ in engebetteter Nachricht: %u (%u bytes)\n"
 
-#: src/applications/session/connect.c:921
+#: src/applications/session/connect.c:886
 msgid "# session keys sent"
 msgstr "# Sitzungsschlüssel gesendet"
 
-#: src/applications/session/connect.c:923
+#: src/applications/session/connect.c:888
 msgid "# session keys rejected"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/applications/session/connect.c:925
+#: src/applications/session/connect.c:890
 msgid "# session keys accepted"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/applications/session/connect.c:927
+#: src/applications/session/connect.c:892
 msgid "# sessions established"
 msgstr "# Sitzungen aufgebaut"
 
-#: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
+#: src/applications/rpc/rpc.c:134 src/applications/rpc/rpc.c:175
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
@@ -747,7 +741,7 @@
 "%s::%s - RPC %s:%p konnte nicht registriert werden: ein anderer Callback "
 "verwendet bereits diesen Namen (%p)\n"
 
-#: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
+#: src/applications/rpc/rpc.c:218 src/applications/rpc/rpc.c:265
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
@@ -756,49 +750,49 @@
 "%s::%s - RPC %s:%p konnte nicht unregistriert werden: ein anderer Callback "
 "ist unter diesem Namen registiert: %p\n"
 
-#: src/applications/rpc/rpc.c:233
+#: src/applications/rpc/rpc.c:237
 #, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s - RPC %s:%p konnte nicht unregistriert werden: nicht gefunden\n"
 
-#: src/applications/rpc/rpc.c:280
+#: src/applications/rpc/rpc.c:285
 #, c-format
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 "%s::%s - async RPC %s:%p konnte nicht unregistriert werden: nicht gefunden\n"
 
-#: src/applications/rpc/rpc.c:879 src/applications/rpc/rpc.c:1012
-#: src/applications/rpc/rpc.c:1101
+#: src/applications/rpc/rpc.c:909 src/applications/rpc/rpc.c:1043
+#: src/applications/rpc/rpc.c:1129
 #, 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:946
+#: src/applications/rpc/rpc.c:975
 #, 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:1291
+#: src/applications/rpc/rpc.c:1307
 #, 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/rpc/rpc.c:1415
+#: src/applications/rpc/rpc.c:1421
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "RPC nicht unregistriert: %s:%p\n"
 
-#: src/applications/rpc/rpc.c:1442
+#: src/applications/rpc/rpc.c:1450
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "`%s' registriert Handler %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1463
+#: src/applications/rpc/rpc.c:1466
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/applications/rpc/rpc.c:1520
+#: src/applications/rpc/rpc.c:1524
 msgid "RPC async reply invalid.\n"
 msgstr "RPC async Antwort ungültig.\n"
 
@@ -806,25 +800,24 @@
 msgid "async RPC reply not received.\n"
 msgstr "async RPC Antwort nicht empfangen.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:263
-#: src/applications/sqstore_mysql/mysql.c:925
-#: src/applications/sqstore_mysql/mysql.c:1252
-msgid "mysql datastore"
-msgstr "mysql Datenspeicher"
+#: src/applications/sqstore_mysql/mysql.c:379
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/applications/sqstore_mysql/mysql.c:441
+#: src/applications/sqstore_mysql/mysql.c:1311
 #, fuzzy, c-format
-msgid ""
-"`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s DG/%"
-"s\n"
+msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1496
+#: src/applications/sqstore_mysql/mysql.c:1423
+#: src/applications/sqstore_mysql/mysql.c:1570
 #, 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:1518
+#: src/applications/sqstore_mysql/mysql.c:1448
+#: src/applications/sqstore_mysql/mysql.c:1593
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -832,44 +825,39 @@
 "Fehler beim Laden des MySQL Datenbankmoduls. Prüfen Sie, ob MySQL läuft und "
 "richtig eingerichtet ist!\n"
 
-#: src/applications/datastore/datastore.c:133
+#: src/applications/datastore/datastore.c:146
 #, c-format
 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:159
-#, c-format
-msgid "Database failed to delete `%s'.\n"
-msgstr "Die Datenbank konnte `%s' nicht löschen.\n"
-
-#: src/applications/datastore/datastore.c:389
+#: src/applications/datastore/datastore.c:368
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:390
+#: src/applications/datastore/datastore.c:370
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:392
+#: src/applications/datastore/datastore.c:373
 msgid "# bytes allowed in datastore"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/applications/datastore/datastore.c:406
+#: src/applications/datastore/datastore.c:388
 #, 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/datastore/datastore.c:528
+#: src/applications/datastore/datastore.c:513
 #, fuzzy
 msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/applications/identity/hostkey.c:123
+#: src/applications/identity/hostkey.c:116
 #, fuzzy, c-format
 msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/applications/identity/hostkey.c:154
+#: src/applications/identity/hostkey.c:143
 #, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
@@ -877,15 +865,15 @@
 "Formatüberprüfung schlug für die existierende Hostkeydatei `%s' fehl, es "
 "wird ein neuer Hostkey erzeugt.\n"
 
-#: src/applications/identity/hostkey.c:162
+#: src/applications/identity/hostkey.c:152
 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:175
+#: src/applications/identity/hostkey.c:162
 msgid "Done creating hostkey.\n"
 msgstr "Hostkey wurde erfolgreich erzeugt.\n"
 
-#: src/applications/identity/identity.c:347
+#: src/applications/identity/identity.c:345
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -893,7 +881,7 @@
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/applications/identity/identity.c:360
+#: src/applications/identity/identity.c:358
 #, c-format
 msgid ""
 "Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -901,185 +889,185 @@
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/applications/identity/identity.c:397
+#: src/applications/identity/identity.c:393
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/applications/identity/identity.c:730
-#: src/applications/identity/identity.c:758
+#: src/applications/identity/identity.c:708
+#: src/applications/identity/identity.c:729
 #, fuzzy, c-format
 msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr "Datei `%s' enthielt ungültige Hello Daten und wurde entfernt.\n"
 
-#: src/applications/identity/identity.c:812
+#: src/applications/identity/identity.c:776
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 "Signatur kann nicht verifiziert werden, der Knoten `%s' ist uns nicht "
 "bekannt!\n"
 
-#: src/applications/identity/identity.c:822
+#: src/applications/identity/identity.c:785
 msgid "Signature failed verification: signature invalid.\n"
 msgstr "Verifikation einer Signatur fehlgeschlagen: Signatur ist ungültig.\n"
 
-#: src/applications/identity/identity.c:928
-#: src/applications/identity/identity.c:1044
+#: src/applications/identity/identity.c:894
+#: src/applications/identity/identity.c:1014
 #, c-format
 msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:1045
+#: src/applications/identity/identity.c:1017
 #, c-format
 msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:148
+#: src/applications/transport/transport.c:190
 #, c-format
 msgid ""
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:196
+#: src/applications/transport/transport.c:244
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:246
+#: src/applications/transport/transport.c:297
 #, c-format
 msgid ""
 "Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:307
+#: src/applications/transport/transport.c:373
 #, 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:395
+#: src/applications/transport/transport.c:494
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/applications/transport/transport.c:452
+#: src/applications/transport/transport.c:553
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:653
+#: src/applications/transport/transport.c:752
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/applications/transport/transport.c:673
+#: src/applications/transport/transport.c:771
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/applications/transport/transport.c:683
+#: src/applications/transport/transport.c:781
 #, 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:710
+#: src/applications/transport/transport.c:808
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/applications/transport/transport.c:723
+#: src/applications/transport/transport.c:819
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/applications/fragmentation/fragmentation.c:566
+#: src/applications/fragmentation/fragmentation.c:575
 msgid "# messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:567
+#: src/applications/fragmentation/fragmentation.c:577
 msgid "# messages fragmented"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:568
+#: src/applications/fragmentation/fragmentation.c:578
 msgid "# fragments discarded"
 msgstr "# verworfener Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:580
+#: src/applications/fragmentation/fragmentation.c:588
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr "`%s' registriert Handler %d\n"
 
-#: src/applications/stats/gnunet-stats.c:65
+#: src/applications/stats/gnunet-stats.c:62
 #, c-format
 msgid "Supported peer-to-peer messages:\n"
 msgstr "unterstützte Peer-to-Peer Nachrichten:\n"
 
-#: src/applications/stats/gnunet-stats.c:69
+#: src/applications/stats/gnunet-stats.c:65
 #, c-format
 msgid "Supported client-server messages:\n"
 msgstr "unterstützte Client-Server Nachrichten:\n"
 
-#: src/applications/stats/gnunet-stats.c:93
+#: src/applications/stats/gnunet-stats.c:84
 #: src/applications/vpn/gnunet-vpn.c:52
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
-#: src/applications/stats/gnunet-stats.c:97
+#: src/applications/stats/gnunet-stats.c:88
 msgid "prints supported protocol messages"
 msgstr "gibt unterstützte Protokollnachrichten aus"
 
-#: src/applications/stats/gnunet-stats.c:133
-#: src/applications/tbench/gnunet-tbench.c:128
-#: src/applications/tracekit/gnunet-tracekit.c:313
+#: src/applications/stats/gnunet-stats.c:122
+#: src/applications/tbench/gnunet-tbench.c:127
+#: src/applications/tracekit/gnunet-tracekit.c:315
 #: src/applications/template/gnunet-template.c:94
-#: src/applications/vpn/gnunet-vpn.c:145
+#: src/applications/vpn/gnunet-vpn.c:148
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/applications/stats/gnunet-stats.c:152
+#: src/applications/stats/gnunet-stats.c:134
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
 
-#: src/applications/stats/clientapi.c:328
+#: src/applications/stats/clientapi.c:330
 msgid "Uptime (seconds)"
 msgstr "Laufzeit (Sekunden)"
 
-#: src/applications/stats/statistics.c:214
+#: src/applications/stats/statistics.c:223
 #, c-format
 msgid "% of allowed network load (up)"
 msgstr "% of allowed network load (up)"
 
-#: src/applications/stats/statistics.c:216
+#: src/applications/stats/statistics.c:225
 #, c-format
 msgid "% of allowed network load (down)"
 msgstr "% of allowed network load (down)"
 
-#: src/applications/stats/statistics.c:218
+#: src/applications/stats/statistics.c:226
 #, c-format
 msgid "% of allowed cpu load"
 msgstr "% of allowed cpu load"
 
-#: src/applications/stats/statistics.c:220
+#: src/applications/stats/statistics.c:227
 #, fuzzy, c-format
 msgid "% of allowed io load"
 msgstr "% of allowed cpu load"
 
-#: src/applications/stats/statistics.c:222
+#: src/applications/stats/statistics.c:228
 msgid "# of connected peers"
 msgstr "# verbundener Knoten"
 
-#: src/applications/stats/statistics.c:224
+#: src/applications/stats/statistics.c:230
 msgid "# bytes of noise received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/applications/stats/statistics.c:392
+#: src/applications/stats/statistics.c:401
 #, fuzzy, c-format
 msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr "`%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/stats/statistics.c:413
+#: src/applications/stats/statistics.c:421
 msgid "keeps statistics about gnunetd's operation"
 msgstr "Hält Statistiken über Betrieb von gnunetd"
 
@@ -1087,80 +1075,80 @@
 msgid "# Any-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:152
+#: src/applications/stats/sqstats.c:151
 msgid "# DBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:154
+#: src/applications/stats/sqstats.c:152
 msgid "# SBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:156
+#: src/applications/stats/sqstats.c:153
 msgid "# KBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:158
+#: src/applications/stats/sqstats.c:154
 msgid "# NBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:160
+#: src/applications/stats/sqstats.c:155
 msgid "# KNBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:162
+#: src/applications/stats/sqstats.c:156
 msgid "# OnDemand-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:164
+#: src/applications/stats/sqstats.c:157
 msgid "# Unknown-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:166
+#: src/applications/stats/sqstats.c:158
 msgid "# expired"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:168
+#: src/applications/stats/sqstats.c:159
 msgid "# expire in 1h"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:170
+#: src/applications/stats/sqstats.c:160
 msgid "# expire in 24h"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:172
+#: src/applications/stats/sqstats.c:161
 msgid "# expire in 1 week"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:174
+#: src/applications/stats/sqstats.c:162
 msgid "# expire in 1 month"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:176
+#: src/applications/stats/sqstats.c:163
 msgid "# zero priority"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:178
+#: src/applications/stats/sqstats.c:164
 msgid "# priority one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:180
+#: src/applications/stats/sqstats.c:165
 msgid "# priority larger than one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:182
+#: src/applications/stats/sqstats.c:166
 msgid "# no anonymity"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:184
+#: src/applications/stats/sqstats.c:167
 msgid "# anonymity one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:186
+#: src/applications/stats/sqstats.c:168
 msgid "# anonymity larger than one"
 msgstr ""
 
 #: src/applications/tbench/gnunet-tbench.c:64
-#: src/applications/tracekit/gnunet-tracekit.c:53
+#: src/applications/tracekit/gnunet-tracekit.c:55
 msgid "Start GNUnet transport benchmarking tool."
 msgstr "GNUnet Transport Benchmarking Werkzeug starten."
 
@@ -1192,11 +1180,11 @@
 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:90
+#: src/applications/tbench/gnunet-tbench.c:91
 msgid "number of messages in a message block"
 msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
 
-#: src/applications/tbench/gnunet-tbench.c:144
+#: src/applications/tbench/gnunet-tbench.c:143
 #, c-format
 msgid "You must specify a receiver!\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
@@ -1207,37 +1195,37 @@
 msgstr ""
 "Ungültige Empfängerknoten ID angegeben (`%s' ist kein gültiger Name).\n"
 
-#: src/applications/tbench/gnunet-tbench.c:182
+#: src/applications/tbench/gnunet-tbench.c:187
 #, c-format
 msgid "Time:\n"
 msgstr "Zeit:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:183
+#: src/applications/tbench/gnunet-tbench.c:188
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr "\tMax      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:185
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr "\tMin      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:187
+#: src/applications/tbench/gnunet-tbench.c:190
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr "\tMittel   %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tbench/gnunet-tbench.c:191
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr "\tVarianz  %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:192
+#: src/applications/tbench/gnunet-tbench.c:193
 #, c-format
 msgid "Loss:\n"
 msgstr "Verlust:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:193
+#: src/applications/tbench/gnunet-tbench.c:194
 #, c-format
 msgid "\tmax      %u\n"
 msgstr "\tMax      %u\n"
@@ -1247,22 +1235,22 @@
 msgid "\tmin      %u\n"
 msgstr "\tMin      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:197
+#: src/applications/tbench/gnunet-tbench.c:196
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr "\tMittel   %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:199
+#: src/applications/tbench/gnunet-tbench.c:197
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr "\tVarianz %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:208
+#: src/applications/tbench/gnunet-tbench.c:203
 #, 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:212
+#: src/applications/tbench/gnunet-tbench.c:209
 #, c-format
 msgid ""
 "\n"
@@ -1271,7 +1259,7 @@
 "\n"
 "Es wurde keine Nachricht von gnunetd empfangen. Läuft gnunetd?\n"
 
-#: src/applications/tbench/tbench.c:421
+#: src/applications/tbench/tbench.c:412
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr "Ermöglicht das Untersuchen direkter Peer-to-Peer Verbindungen"
 
@@ -1279,20 +1267,20 @@
 msgid "probe network to the given DEPTH"
 msgstr "Netzwerk bis zur angegebenen Tiefe DEPTH sondieren"
 
-#: src/applications/tracekit/gnunet-tracekit.c:51
+#: src/applications/tracekit/gnunet-tracekit.c:52
 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:57
+#: src/applications/tracekit/gnunet-tracekit.c:59
 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:61
+#: src/applications/tracekit/gnunet-tracekit.c:63
 msgid "wait DELAY seconds for replies"
 msgstr "DELAY Sekunden auf Antworten warten"
 
-#: src/applications/tracekit/gnunet-tracekit.c:115
+#: src/applications/tracekit/gnunet-tracekit.c:111
 #, c-format
 msgid ""
 "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
@@ -1301,7 +1289,7 @@
 "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:160
 #, c-format
 msgid "`%s' is not connected to any peer.\n"
 msgstr "`%s' ist zu keinem Knoten verbunden.\n"
@@ -1311,147 +1299,147 @@
 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:210
 #, 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:236
 #, 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:343
+#: src/applications/tracekit/gnunet-tracekit.c:336
 msgid "Could not send request to gnunetd.\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/applications/tracekit/tracekit.c:68
-#: src/applications/tracekit/tracekit.c:201
+#: src/applications/tracekit/tracekit.c:72
+#: src/applications/tracekit/tracekit.c:206
 #, c-format
 msgid "Received invalid `%s' message from `%s'.\n"
 msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
 
-#: src/applications/tracekit/tracekit.c:263
+#: src/applications/tracekit/tracekit.c:269
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr "TRACEKIT: Routing-Tabelle ist voll, Trace-Anfrage wird verworfen\n"
 
-#: src/applications/tracekit/tracekit.c:354
+#: src/applications/tracekit/tracekit.c:346
 #, c-format
 msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr "TRACEKIT: ungültige `%s' Nachricht empfangen\n"
 
-#: src/applications/tracekit/tracekit.c:461
+#: src/applications/tracekit/tracekit.c:443
 msgid "allows mapping of the network topology"
 msgstr "Erlaubt die Kartographierung der Netzwerktopologie"
 
-#: src/applications/gap/gap.c:1661
+#: src/applications/gap/gap.c:1695
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/applications/gap/gap.c:1662
+#: src/applications/gap/gap.c:1696
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1844
+#: src/applications/gap/gap.c:1883
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 "Verdeckender Netzwerkverkehr angefordert, aber der Verkehrsdienst wurde "
 "nicht geladen. Anfrage wird abgelehnt.\n"
 
-#: src/applications/gap/gap.c:1856 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1892 src/applications/fs/module/anonymity.c:65
 msgid "Failed to get traffic stats.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/applications/gap/gap.c:1863 src/applications/gap/gap.c:1869
-#: src/applications/gap/gap.c:1876
+#: src/applications/gap/gap.c:1902 src/applications/gap/gap.c:1910
+#: src/applications/gap/gap.c:1921
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 "Gewünschter Grad an Anonymität kann nicht erreicht werden, Anfrage wird "
 "ignoriert.\n"
 
-#: src/applications/gap/gap.c:2155
+#: src/applications/gap/gap.c:2183
 msgid "# gap requests total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/applications/gap/gap.c:2156
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests policy: immediate drop"
 msgstr "# gap Anfragen mit taktischer Entscheidung: sofortiges Verwerfen"
 
-#: src/applications/gap/gap.c:2157
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests policy: not routed"
 msgstr "# gap Anfragen mit taktischer Entscheidung: kein Routing"
 
-#: src/applications/gap/gap.c:2158
+#: src/applications/gap/gap.c:2190
 msgid "# gap requests policy: not answered"
 msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten"
 
-#: src/applications/gap/gap.c:2159
+#: src/applications/gap/gap.c:2194
 msgid "# gap requests processed: attempted add to RT"
 msgstr "# gap Anfragen verarbeitet: versucht, der RT hinzuzufügen"
 
-#: src/applications/gap/gap.c:2160
+#: src/applications/gap/gap.c:2197
 msgid "# gap requests processed: local result"
 msgstr "# gap Anfragen verarbeitet: lokales Ergebnis"
 
-#: src/applications/gap/gap.c:2161
+#: src/applications/gap/gap.c:2199
 msgid "# gap routing successes (total)"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/applications/gap/gap.c:2162
+#: src/applications/gap/gap.c:2202
 msgid "# gap requests dropped: collision in RT"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/applications/gap/gap.c:2163
+#: src/applications/gap/gap.c:2206
 msgid "# gap requests forwarded (counting each peer)"
 msgstr "#gap Anfragen weitergeleitet (jeder Knoten gezählt)"
 
-#: src/applications/gap/gap.c:2164
+#: src/applications/gap/gap.c:2208
 msgid "# gap duplicate requests (pending)"
 msgstr "# gap doppelte Anfragen (unfertig)"
 
-#: src/applications/gap/gap.c:2165
+#: src/applications/gap/gap.c:2211
 msgid "# gap duplicate requests that were re-tried"
 msgstr "# gap doppelte Anfragen, die wiederholt wurden"
 
-#: src/applications/gap/gap.c:2166
+#: src/applications/gap/gap.c:2214
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr "# gap Wiederholungs-TTL-Differenz (kummulativ)"
 
-#: src/applications/gap/gap.c:2167
+#: src/applications/gap/gap.c:2216
 msgid "# gap reply duplicates"
 msgstr "#gap doppelte Antworten"
 
-#: src/applications/gap/gap.c:2168
+#: src/applications/gap/gap.c:2218
 #, fuzzy
 msgid "# gap spurious replies (dropped)"
 msgstr "# gap falsche Antworten"
 
-#: src/applications/gap/gap.c:2169
+#: src/applications/gap/gap.c:2220
 msgid "# gap routing slots currently in use"
 msgstr "# gap Routingschächte im Moment in Verwendung"
 
-#: src/applications/gap/gap.c:2170
+#: src/applications/gap/gap.c:2223
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2171
+#: src/applications/gap/gap.c:2227
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2172
+#: src/applications/gap/gap.c:2229
 #, fuzzy
 msgid "# gap rewards pending"
 msgstr "# gap doppelte Anfragen (unfertig)"
 
-#: src/applications/gap/gap.c:2173
+#: src/applications/gap/gap.c:2231
 #, fuzzy
 msgid "# gap response weights"
 msgstr "# gap falsche Antworten"
 
-#: src/applications/gap/gap.c:2189
+#: src/applications/gap/gap.c:2246
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
@@ -1459,31 +1447,31 @@
 "Verkehrsdienst konnte nicht geladen werden, GAP kann keinen verdeckenden "
 "Netzwerkverkehr sicherstellen.\n"
 
-#: src/applications/gap/gap.c:2217
+#: src/applications/gap/gap.c:2269
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "`%s' registriert Handler %d %d\n"
 
-#: src/applications/gap/pid_table.c:161
+#: src/applications/gap/pid_table.c:177
 msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:163
+#: src/applications/gap/pid_table.c:181
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:78
+#: src/applications/getoption/getoption.c:75
 #, c-format
 msgid "`%s' registering client handler %d\n"
 msgstr "`%s' registriert Client-Handler %d\n"
 
-#: src/applications/getoption/getoption.c:88
+#: src/applications/getoption/getoption.c:84
 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:273
-#: src/applications/fs/tools/gnunet-search.c:140
+#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-search.c:135
 #: src/applications/fs/tools/gnunet-download.c:69
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
@@ -1513,7 +1501,7 @@
 "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:90
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
@@ -1521,13 +1509,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:93
 #, 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:97
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
@@ -1535,11 +1523,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:100
 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:104
 msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
@@ -1547,11 +1535,11 @@
 "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:107
 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:140
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
@@ -1561,149 +1549,149 @@
 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:171
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr "\tRating (nach Update): %d\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:212
+#: src/applications/fs/tools/gnunet-pseudonym.c:204
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Collection beendet.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:214
+#: src/applications/fs/tools/gnunet-pseudonym.c:206
 #, 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:222
+#: src/applications/fs/tools/gnunet-pseudonym.c:214
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:226
+#: src/applications/fs/tools/gnunet-pseudonym.c:219
 #, 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:243
+#: src/applications/fs/tools/gnunet-pseudonym.c:234
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:246
+#: src/applications/fs/tools/gnunet-pseudonym.c:238
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:279
 #, 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:291
+#: src/applications/fs/tools/gnunet-pseudonym.c:286
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr "Namespace `%s' wurde erstellt (Root: %s).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:304
+#: src/applications/fs/tools/gnunet-pseudonym.c:301
 #, fuzzy, c-format
 msgid "You must specify a name for the collection (`%s' option).\n"
 msgstr ""
 "Sie müssen einen Namen für die PID Datei in Sektion `%s' unter `%s' "
 "angeben.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:314
+#: src/applications/fs/tools/gnunet-pseudonym.c:309
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:83
+#: src/applications/fs/tools/gnunet-directory.c:84
 #, c-format
 msgid "==> Directory `%s':\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:90
+#: src/applications/fs/tools/gnunet-directory.c:87
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:125
+#: src/applications/fs/tools/gnunet-directory.c:114
 #, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:127
+#: src/applications/fs/tools/gnunet-directory.c:116
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr "%d Dateien im Verzeichnis gefunden.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:142
+#: src/applications/fs/tools/gnunet-directory.c:131
 msgid "Perform directory related operations."
 msgstr "Verzeichnisbezogene Operationen durchführen."
 
-#: src/applications/fs/tools/gnunet-directory.c:144
+#: src/applications/fs/tools/gnunet-directory.c:134
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr ""
 "Alle Einträge aus der Verzeichnis Datenbank löschen und das Verfolgen von "
 "URIs abbrechen"
 
-#: src/applications/fs/tools/gnunet-directory.c:148
+#: src/applications/fs/tools/gnunet-directory.c:138
 msgid "list entries from the directory database"
 msgstr "Einträge aus der Verzeichnis Datenbank auflisten"
 
-#: src/applications/fs/tools/gnunet-directory.c:151
+#: src/applications/fs/tools/gnunet-directory.c:141
 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:175
+#: src/applications/fs/tools/gnunet-directory.c:164
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "%d übereinstimmende Einträge aufgelistet.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:136
+#: src/applications/fs/tools/gnunet-insert.c:132
 #, 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:141
+#: src/applications/fs/tools/gnunet-insert.c:137
 #, 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:161
+#: src/applications/fs/tools/gnunet-insert.c:157
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:170
+#: src/applications/fs/tools/gnunet-insert.c:165
 msgid "filename"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:173
+#: src/applications/fs/tools/gnunet-insert.c:167
 msgid "mimetype"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:208
 #, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 "%16llu von %16llu Bytes eingefügt (geschätzte %6s bis Fertigstellung) - %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-insert.c:220
 #, 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:235
+#: src/applications/fs/tools/gnunet-insert.c:231
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:246
+#: src/applications/fs/tools/gnunet-insert.c:242
 #, c-format
 msgid ""
 "\n"
@@ -1712,7 +1700,7 @@
 "\n"
 "Upload abgebrochen.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:251
+#: src/applications/fs/tools/gnunet-insert.c:247
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1721,14 +1709,14 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:260
+#: src/applications/fs/tools/gnunet-insert.c:256
 #, c-format
 msgid ""
 "\n"
 "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:277
+#: src/applications/fs/tools/gnunet-insert.c:272
 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"
@@ -1737,11 +1725,11 @@
 "anstelle der Erzeugung eines Links auf das GNUnet Share-Verzeichnis "
 "erzwingen."
 
-#: src/applications/fs/tools/gnunet-insert.c:281
+#: src/applications/fs/tools/gnunet-insert.c:277
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:281
 #, fuzzy
 msgid ""
 "do not use libextractor to add additional references to directory entries "
@@ -1750,7 +1738,7 @@
 "benutze libextractor um weitere direkte Referenzen zu Dateien in "
 "Verzeichnissen zu erzeugen"
 
-#: src/applications/fs/tools/gnunet-insert.c:287
+#: src/applications/fs/tools/gnunet-insert.c:285
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -1758,11 +1746,11 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:287
 msgid "Make files available to GNUnet for sharing."
 msgstr "Dateien GNUnet zum Filesharing zur Verfügung stellen."
 
-#: src/applications/fs/tools/gnunet-insert.c:292
+#: src/applications/fs/tools/gnunet-insert.c:290
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
@@ -1770,7 +1758,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:296
+#: src/applications/fs/tools/gnunet-insert.c:295
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -1778,7 +1766,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:300
+#: src/applications/fs/tools/gnunet-insert.c:299
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -1786,13 +1774,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:305
+#: src/applications/fs/tools/gnunet-insert.c:304
 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:308
+#: src/applications/fs/tools/gnunet-insert.c:307
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -1812,13 +1800,13 @@
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/applications/fs/tools/gnunet-insert.c:319
+#: src/applications/fs/tools/gnunet-insert.c:320
 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:322
+#: src/applications/fs/tools/gnunet-insert.c:323
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
@@ -1826,68 +1814,68 @@
 "Dies als unregelmäßige aber aktualisierbare Veröffentlichung kennzeichnen "
 "(nur für das Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:326
+#: src/applications/fs/tools/gnunet-insert.c:327
 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:330
+#: src/applications/fs/tools/gnunet-insert.c:332
 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:333
+#: src/applications/fs/tools/gnunet-insert.c:335
 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:368
+#: src/applications/fs/tools/gnunet-insert.c:371
 #, 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:427
+#: src/applications/fs/tools/gnunet-insert.c:418
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Konnte nicht auf den Namespace `%s' zugreifen (existiert nicht?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:447
+#: src/applications/fs/tools/gnunet-insert.c:437
 #, c-format
 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:448
 #: src/applications/fs/tools/gnunet-insert.c:456
-#: src/applications/fs/tools/gnunet-insert.c:462
-#: src/applications/fs/tools/gnunet-insert.c:468
-#: src/applications/fs/tools/gnunet-insert.c:474
+#: src/applications/fs/tools/gnunet-insert.c:464
+#: src/applications/fs/tools/gnunet-insert.c:472
 #: src/applications/fs/tools/gnunet-insert.c:480
 #, 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:143
+#: src/applications/fs/tools/gnunet-search.c:138
 msgid "Search GNUnet for files."
 msgstr "Das GNUnet nach Dateien durchsuchen."
 
-#: src/applications/fs/tools/gnunet-search.c:147
+#: src/applications/fs/tools/gnunet-search.c:142
 msgid "exit after receiving LIMIT results"
 msgstr "Abbrechen, nachdem LIMIT Ergebnisse empfangen wurden"
 
-#: src/applications/fs/tools/gnunet-search.c:150
+#: src/applications/fs/tools/gnunet-search.c:145
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "Begegnete (entschlüsselte) Suchergebnisse in FILENAME schreiben"
 
-#: src/applications/fs/tools/gnunet-search.c:153
+#: src/applications/fs/tools/gnunet-search.c:148
 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:191
+#: src/applications/fs/tools/gnunet-search.c:183
 #, 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:73
+#: src/applications/fs/tools/gnunet-download.c:74
 msgid ""
 "download a GNUnet directory that has already been downloaded.  Requires that "
 "a filename of an existing file is specified instead of the URI.  The "
@@ -1895,87 +1883,87 @@
 "`-R' option is also specified."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:75
+#: src/applications/fs/tools/gnunet-download.c:76
 msgid "Download files from GNUnet."
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/applications/fs/tools/gnunet-download.c:79
+#: src/applications/fs/tools/gnunet-download.c:80
 msgid "write the file to FILENAME"
 msgstr "Schreibe die Datei in DATEINAME"
 
-#: src/applications/fs/tools/gnunet-download.c:82
+#: src/applications/fs/tools/gnunet-download.c:84
 msgid "set the maximum number of parallel downloads that are allowed"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:85
+#: src/applications/fs/tools/gnunet-download.c:87
 msgid "download a GNUnet directory recursively"
 msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
 
-#: src/applications/fs/tools/gnunet-download.c:103
+#: src/applications/fs/tools/gnunet-download.c:108
 #, 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:116
+#: src/applications/fs/tools/gnunet-download.c:122
 #, c-format
 msgid "Download aborted.\n"
 msgstr "Download abgebrochen.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:122
+#: src/applications/fs/tools/gnunet-download.c:128
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/applications/fs/tools/gnunet-download.c:128
+#: src/applications/fs/tools/gnunet-download.c:134
 #, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr ""
 "Download der Datei `%s' abgeschlossen. Geschwindigkeit war %8.3f KB/s.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:176
+#: src/applications/fs/tools/gnunet-download.c:178
 msgid "no name given"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:182
+#: src/applications/fs/tools/gnunet-download.c:184
 #, fuzzy, c-format
 msgid "Starting download `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:230
+#: src/applications/fs/tools/gnunet-download.c:225
 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:251
+#: src/applications/fs/tools/gnunet-download.c:242
 #, 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:281
+#: src/applications/fs/tools/gnunet-download.c:279
 #, fuzzy, c-format
 msgid "No filename specified, using `%s' instead (for now).\n"
 msgstr "Kein Tabellenname angegeben, verwende `%s'.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:325
+#: src/applications/fs/tools/gnunet-download.c:320
 #, fuzzy, c-format
 msgid "Could not access gnunet-directory file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:345
+#: src/applications/fs/tools/gnunet-download.c:338
 #, fuzzy, c-format
 msgid "Downloading %d files from directory `%s'.\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/applications/fs/tools/gnunet-download.c:349
+#: src/applications/fs/tools/gnunet-download.c:341
 #, fuzzy, c-format
 msgid "Did not find any files in directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/applications/fs/tools/gnunet-download.c:390
+#: src/applications/fs/tools/gnunet-download.c:377
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:57
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
@@ -1984,7 +1972,7 @@
 "%16llu von %16llu Bytes deindiziert (schätze %llu Sekunden bis "
 "Fertigstellung)            "
 
-#: src/applications/fs/tools/gnunet-unindex.c:68
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, c-format
 msgid ""
 "\n"
@@ -1994,7 +1982,7 @@
 "Deindizierung von `%s' abgeschlossen, %llu Bytes benötigten %llu Sekunden (%"
 "8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:80
+#: src/applications/fs/tools/gnunet-unindex.c:85
 #, c-format
 msgid ""
 "\n"
@@ -2003,36 +1991,36 @@
 "\n"
 "Fehler beim Deindizieren der Datei: %s\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:100
+#: src/applications/fs/tools/gnunet-unindex.c:105
 msgid "Unindex files."
 msgstr "Dateien deindizieren."
 
-#: src/applications/fs/tools/gnunet-unindex.c:137
+#: src/applications/fs/tools/gnunet-unindex.c:142
 #, 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:164
+#: src/applications/fs/tools/gnunet-unindex.c:158
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "`%s' schlug fehl. Ist `%s' eine Datei?\n"
 
-#: src/applications/fs/module/querymanager.c:225
+#: src/applications/fs/module/querymanager.c:228
 #, fuzzy
 msgid "# FS currently tracked queries from clients"
 msgstr "# Client Trace-Antworten gesendet"
 
-#: src/applications/fs/module/querymanager.c:227
+#: src/applications/fs/module/querymanager.c:230
 msgid "# FS replies passed to clients"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:336
+#: src/applications/fs/module/ondemand.c:323
 #, 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:434
+#: src/applications/fs/module/ondemand.c:418
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2043,7 +2031,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:461
+#: src/applications/fs/module/ondemand.c:444
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2052,11 +2040,11 @@
 "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:518
+#: src/applications/fs/module/ondemand.c:495
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:681
+#: src/applications/fs/module/ondemand.c:647
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -2064,7 +2052,7 @@
 "Deindizierter ODB Block `%s' vom Offset %llu fehlt bereits im "
 "Datenspeicher.\n"
 
-#: src/applications/fs/module/fs.c:1211
+#: src/applications/fs/module/fs.c:1170
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2073,46 +2061,46 @@
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/applications/fs/module/fs.c:1224
+#: src/applications/fs/module/fs.c:1185
 msgid "# FS expired replies dropped"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1226
+#: src/applications/fs/module/fs.c:1187
 #, fuzzy
 msgid "# FS valid replies received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/applications/fs/module/fs.c:1263
+#: src/applications/fs/module/fs.c:1220
 #, 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:1303
+#: src/applications/fs/module/fs.c:1266
 msgid "enables (anonymous) file-sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
-#: src/applications/fs/module/migration.c:304
+#: src/applications/fs/module/migration.c:312
 msgid "# blocks migrated"
 msgstr "# Blöcke migriert"
 
-#: src/applications/fs/module/migration.c:306
+#: src/applications/fs/module/migration.c:314
 #, fuzzy
 msgid "# blocks fetched for migration"
 msgstr "# Blöcke migriert"
 
-#: src/applications/fs/module/migration.c:308
+#: src/applications/fs/module/migration.c:317
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/module/dht_push.c:137
+#: src/applications/fs/module/dht_push.c:138
 msgid "# blocks pushed into DHT"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:238
+#: src/applications/fs/fsui/search.c:234
 msgid "Error running search (no reason given)."
 msgstr "Das Starten der Suche schlug fehl (Ursache unbekannt)."
 
-#: src/applications/fs/fsui/download.c:308
+#: src/applications/fs/fsui/download.c:294
 msgid "Download failed (no reason given)"
 msgstr "ECRS Download schlug fehl (Ursache unbekannt)."
 
@@ -2120,35 +2108,35 @@
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:281
+#: src/applications/fs/fsui/upload.c:278
 #, fuzzy
 msgid "Failed to create temporary directory."
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/applications/fs/fsui/deserialize.c:754
+#: src/applications/fs/fsui/deserialize.c:757
 #, 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/ecrs/search.c:167
+#: src/applications/fs/ecrs/search.c:168
 msgid "CHK URI not allowed for search.\n"
 msgstr "CHK URI ist nicht erlaubt für Suchen.\n"
 
-#: src/applications/fs/ecrs/search.c:226
+#: src/applications/fs/ecrs/search.c:214
 msgid "LOC URI not allowed for search.\n"
 msgstr "LOC URI ist nicht erlaubt für Suchen.\n"
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/fs/ecrs/download.c:131
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "Temporäre Datei `%s' konnte nicht gelöscht werden: %s\n"
 
-#: src/applications/fs/ecrs/download.c:270
+#: src/applications/fs/ecrs/download.c:271
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Write(%d, %p, %d) schlug fehl: %s\n"
 
-#: src/applications/fs/ecrs/download.c:1043
+#: src/applications/fs/ecrs/download.c:1001
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2157,58 +2145,58 @@
 "Bug oder eine mit bösen Absichten eingefügte Datei. Download wurde "
 "abgebrochen.\n"
 
-#: src/applications/fs/ecrs/download.c:1229
+#: src/applications/fs/ecrs/download.c:1184
 #, 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:164
+#: src/applications/fs/ecrs/upload.c:155
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/applications/fs/ecrs/upload.c:174
+#: src/applications/fs/ecrs/upload.c:162
 #, 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:183
+#: src/applications/fs/ecrs/upload.c:171
 msgid "Failed to connect to gnunetd."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/applications/fs/ecrs/upload.c:195
+#: src/applications/fs/ecrs/upload.c:183
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "`%s' konnte nicht gehashed werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:214
+#: src/applications/fs/ecrs/upload.c:202
 #, 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:221
+#: src/applications/fs/ecrs/upload.c:209
 #, 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:236
+#: src/applications/fs/ecrs/upload.c:223
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:316
+#: src/applications/fs/ecrs/upload.c:296
 #, 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:854
+#: src/applications/fs/ecrs/meta.c:876
 #, 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:862
+#: src/applications/fs/ecrs/meta.c:884
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr ""
@@ -2221,56 +2209,56 @@
 "Pseudonym `%s' kann nicht erstellt werden, da die Datei `%s' bereits "
 "existiert.\n"
 
-#: src/applications/fs/ecrs/namespace.c:343
-#: src/applications/fs/ecrs/namespace.c:426
-#: src/applications/fs/ecrs/namespace.c:585
+#: src/applications/fs/ecrs/namespace.c:325
+#: src/applications/fs/ecrs/namespace.c:404
+#: src/applications/fs/ecrs/namespace.c:545
 #, 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:355
-#: src/applications/fs/ecrs/namespace.c:437
+#: src/applications/fs/ecrs/namespace.c:337
+#: src/applications/fs/ecrs/namespace.c:415
 #, 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:599
-#: src/applications/fs/ecrs/namespace.c:610
+#: src/applications/fs/ecrs/namespace.c:556
+#: src/applications/fs/ecrs/namespace.c:567
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Format der Datei `%s' ist ungültig.\n"
 
-#: src/applications/fs/ecrs/helper.c:67
+#: src/applications/fs/ecrs/helper.c:74
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: 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
+#: src/applications/fs/ecrs/helper.c:127 src/applications/fs/ecrs/helper.c:129
+#: src/applications/fs/ecrs/helper.c:133 src/applications/fs/ecrs/helper.c:138
 msgid "AND"
 msgstr "UND"
 
-#: src/applications/fs/ecrs/parser.c:122
+#: src/applications/fs/ecrs/parser.c:120
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:131
+#: src/applications/fs/uritrack/file_info.c:126
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Einsammeln von Dateibezeichnern deaktiviert.\n"
 
-#: src/applications/fs/uritrack/file_info.c:402
+#: src/applications/fs/uritrack/file_info.c:395
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:727
+#: src/applications/fs/namespace/namespace_info.c:655
 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:748
+#: src/applications/fs/namespace/namespace_info.c:675
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -2278,25 +2266,25 @@
 "Veröffentlichungsdatum für periodisch aktualisierten Inhalt ist mehr als "
 "eine Woche früher als geplant.\n"
 
-#: src/applications/topology_f2f/topology.c:382
+#: src/applications/topology_f2f/topology.c:373
 #, 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:400
+#: src/applications/topology_f2f/topology.c:390
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/applications/topology_f2f/topology.c:413
+#: src/applications/topology_f2f/topology.c:404
 #, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/applications/topology_f2f/topology.c:519
+#: src/applications/topology_f2f/topology.c:511
 msgid "maintains a friend-to-friend restricted topology"
 msgstr ""
 
-#: src/applications/template/template.c:62
+#: src/applications/template/template.c:68
 #, c-format
 msgid "`%s' registering client handler %d and %d\n"
 msgstr "`%s' registriert Client-Handler %d and %d\n"
@@ -2305,51 +2293,51 @@
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:105
+#: src/applications/bootstrap_http/http.c:102
 #, 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:176
+#: src/applications/bootstrap_http/http.c:170
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:211
+#: src/applications/bootstrap_http/http.c:210
 #, c-format
 msgid "Bootstrapping using `%s'.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:237
+#: src/applications/bootstrap_http/http.c:224
 #, 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:388
+#: src/applications/bootstrap_http/http.c:352
 #, fuzzy, c-format
 msgid "Downloaded %llu bytes from `%s'.\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/applications/bootstrap_http/http.c:421
+#: src/applications/bootstrap_http/http.c:385
 #, fuzzy
 msgid "# HELLOs downloaded via http"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/applications/traffic/traffic.c:441
+#: src/applications/traffic/traffic.c:454
 #, c-format
 msgid "# bytes transmitted of type %d"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/applications/traffic/traffic.c:459
+#: src/applications/traffic/traffic.c:470
 #, c-format
 msgid "# bytes received of type %d"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/applications/traffic/traffic.c:478
+#: src/applications/traffic/traffic.c:489
 #, fuzzy, c-format
 msgid "# bytes received in plaintext of type %d"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/applications/traffic/traffic.c:639
+#: src/applications/traffic/traffic.c:644
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
@@ -2357,388 +2345,388 @@
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:326
+#: src/applications/vpn/vpn.c:366
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:334
+#: src/applications/vpn/vpn.c:377
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:362
+#: src/applications/vpn/vpn.c:410
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:411
+#: src/applications/vpn/vpn.c:466
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:415
+#: src/applications/vpn/vpn.c:472
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:425
+#: src/applications/vpn/vpn.c:488
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:485
+#: src/applications/vpn/vpn.c:556
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:489
+#: src/applications/vpn/vpn.c:562
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:518
+#: src/applications/vpn/vpn.c:594
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:526
+#: src/applications/vpn/vpn.c:606
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:530
+#: src/applications/vpn/vpn.c:614
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:568
+#: src/applications/vpn/vpn.c:655
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:572
+#: src/applications/vpn/vpn.c:664
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:579
+#: src/applications/vpn/vpn.c:674
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:584
+#: src/applications/vpn/vpn.c:682
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:592
+#: src/applications/vpn/vpn.c:694
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:604
+#: src/applications/vpn/vpn.c:707
 #, 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:615
+#: src/applications/vpn/vpn.c:721
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:627
+#: src/applications/vpn/vpn.c:733
 #, 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:660
+#: src/applications/vpn/vpn.c:774
 msgid ""
 "RFC4193 We have run out of memory and so I can't store a tunnel for this "
 "peer.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:706
+#: src/applications/vpn/vpn.c:822
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:769
+#: src/applications/vpn/vpn.c:895
 #, c-format
 msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:773
+#: src/applications/vpn/vpn.c:902
 #, c-format
 msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:791
+#: src/applications/vpn/vpn.c:921
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:831
+#: src/applications/vpn/vpn.c:968
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:835
+#: src/applications/vpn/vpn.c:974
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:841
+#: src/applications/vpn/vpn.c:981
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:844
+#: src/applications/vpn/vpn.c:985
 #, 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:854
+#: src/applications/vpn/vpn.c:996
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:873
+#: src/applications/vpn/vpn.c:1022
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:894
+#: src/applications/vpn/vpn.c:1043
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:899
+#: src/applications/vpn/vpn.c:1050
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:910
+#: src/applications/vpn/vpn.c:1065
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:916
+#: src/applications/vpn/vpn.c:1071
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:932
+#: src/applications/vpn/vpn.c:1088
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:936
+#: src/applications/vpn/vpn.c:1094
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:940
+#: src/applications/vpn/vpn.c:1100
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:954
+#: src/applications/vpn/vpn.c:1119
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:969
+#: src/applications/vpn/vpn.c:1137
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:997
+#: src/applications/vpn/vpn.c:1168
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1012
+#: src/applications/vpn/vpn.c:1188
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1057
+#: src/applications/vpn/vpn.c:1239
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1103
+#: src/applications/vpn/vpn.c:1292
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1129
+#: src/applications/vpn/vpn.c:1324
 msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1190 src/setup/ncurses/wizard_curs.c:105
+#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:95
 msgid "Yes"
 msgstr "Ja"
 
-#: src/applications/vpn/vpn.c:1190 src/setup/ncurses/wizard_curs.c:104
+#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:94
 msgid "No"
 msgstr "Nein"
 
-#: src/applications/vpn/vpn.c:1398
+#: src/applications/vpn/vpn.c:1647
 #, 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:1399
+#: src/applications/vpn/vpn.c:1650
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1449
+#: src/applications/vpn/vpn.c:1723
 #, fuzzy
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr "Ermöglicht P2P-Chat"
 
-#: src/applications/vpn/vpn.c:1481
+#: src/applications/vpn/vpn.c:1757
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1494
+#: src/applications/vpn/vpn.c:1771
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1509
+#: src/applications/vpn/vpn.c:1788
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/dstore/dstore.c:555
+#: src/applications/dstore/dstore.c:466
 #, fuzzy
 msgid "# bytes in dstore"
 msgstr "# bytes in der Datenbank"
 
-#: src/server/gnunet-update.c:143
+#: src/server/gnunet-update.c:147
 #, c-format
 msgid "Updating data for module `%s'\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/server/gnunet-update.c:148
+#: src/server/gnunet-update.c:151
 #, 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:196 src/server/gnunetd.c:144
+#: src/server/gnunet-update.c:198 src/server/gnunetd.c:136
 #, fuzzy
 msgid "Core initialization failed.\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/server/gnunet-update.c:237
+#: src/server/gnunet-update.c:239
 msgid "print a value from the configuration file to stdout"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/server/gnunet-update.c:239
+#: src/server/gnunet-update.c:241
 msgid "Updates GNUnet datastructures after version change."
 msgstr "GNUnet Datenstrukturen nach einer Versionsänderung aktualisieren."
 
-#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:401
+#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:365
 msgid "run as user LOGIN"
 msgstr "als Benutzer LOGIN ausführen"
 
-#: src/server/gnunet-update.c:246
+#: src/server/gnunet-update.c:249
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 "Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
 "zu holen"
 
-#: src/server/connection.c:1116
+#: src/server/connection.c:1188
 #, 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:1125
+#: src/server/connection.c:1197
 #, 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:2594
+#: src/server/connection.c:2744
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Nachricht von `%s' verworfen: ungültiges Format.\n"
 
-#: src/server/connection.c:2679
+#: src/server/connection.c:2829
 #, 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:2698
+#: src/server/connection.c:2851
 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:3154
+#: src/server/connection.c:3337
 msgid "# outgoing messages dropped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:3158
+#: src/server/connection.c:3340
 msgid "# bytes of outgoing messages dropped"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:3160
+#: src/server/connection.c:3342
 msgid "# connections closed (HANGUP sent)"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/server/connection.c:3163
+#: src/server/connection.c:3345
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/server/connection.c:3167
+#: src/server/connection.c:3349
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/server/connection.c:3171
+#: src/server/connection.c:3353
 #, fuzzy
 msgid "# bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/server/connection.c:3174
+#: src/server/connection.c:3355
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/server/connection.c:3176
+#: src/server/connection.c:3356
 msgid "# bytes noise sent"
 msgstr "# Bytes Rauschen gesendet"
 
-#: src/server/connection.c:3178
+#: src/server/connection.c:3359
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3180
+#: src/server/connection.c:3362
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/server/connection.c:3182
+#: src/server/connection.c:3365
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
 
-#: src/server/connection.c:3184
+#: src/server/connection.c:3369
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3186
+#: src/server/connection.c:3373
 #, fuzzy
 msgid "# total number of bytes we were allowed to sent"
 msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
 
-#: src/server/connection.c:3188
+#: src/server/connection.c:3377
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
-#: src/server/startup.c:207
+#: src/server/startup.c:206
 #, fuzzy, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/server/startup.c:224
+#: src/server/startup.c:223
 #, c-format
 msgid ""
 "Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
 "address@hidden"
 msgstr ""
 
-#: src/server/startup.c:238
+#: src/server/startup.c:237
 #, c-format
 msgid ""
 "Limiting datastore size to %llu GB, because the `%s' filesystem does not "
@@ -2746,12 +2734,12 @@
 "partition!\n"
 msgstr ""
 
-#: src/server/startup.c:285
+#: src/server/startup.c:274
 #, c-format
 msgid "Insufficient access permissions for `%s': %s\n"
 msgstr ""
 
-#: src/server/gnunetd.c:84
+#: src/server/gnunetd.c:85
 #, c-format
 msgid "`%s' startup complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
@@ -2761,7 +2749,7 @@
 msgid "`%s' is shutting down.\n"
 msgstr "`%s' fährt herunter.\n"
 
-#: src/server/gnunetd.c:206
+#: src/server/gnunetd.c:192
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
@@ -2770,98 +2758,98 @@
 "Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die "
 "Standardfehlerausgabe (stderr) geschrieben."
 
-#: src/server/gnunetd.c:210
+#: src/server/gnunetd.c:196
 msgid "Starts the gnunetd daemon."
 msgstr "Startet den gnunetd Daemonen."
 
-#: src/server/gnunetd.c:213
+#: src/server/gnunetd.c:199
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:216
+#: src/server/gnunetd.c:203
 msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:220
+#: src/server/gnunetd.c:207
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
-#: src/server/gnunetd.c:288
+#: src/server/gnunetd.c:271
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/server/core.c:124
+#: src/server/core.c:126
 #, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr "Anwendungsmodul `%s' ist bereits initialisiert!\n"
 
-#: src/server/core.c:174
+#: src/server/core.c:177
 #, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
 
-#: src/server/core.c:217
+#: src/server/core.c:226
 #, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr "`%s' kann nicht heruntergefahren werden: Anwendung ist nicht geladen\n"
 
-#: src/server/core.c:225
+#: src/server/core.c:234
 #, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr ""
 "Anwendung `%s' kann nicht heruntergefahren werden: sie ist nicht "
 "initialisiert\n"
 
-#: src/server/core.c:235
+#: src/server/core.c:243
 #, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr "Methode '%s%s' kann in Bibliothek `%s' nicht gefunden werden.\n"
 
-#: src/server/core.c:374
+#: src/server/core.c:386
 #, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr "%p kann nicht freigegeben werden: Dienst ist nicht geladen\n"
 
-#: src/server/core.c:470
+#: src/server/core.c:492
 #, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "Anwendung `%s' konnte nicht ordentlich heruntergefahren werden.\n"
 
-#: src/server/core.c:598
+#: src/server/core.c:628
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/server/gnunet-transport-check.c:118
+#: src/server/gnunet-transport-check.c:121
 #, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "`%s': Hello konnte nicht erzeugt werden.\n"
 
-#: src/server/gnunet-transport-check.c:127
+#: src/server/gnunet-transport-check.c:128
 #, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "`%s': Verbindung konnte nicht hergestellt werden.\n"
 
-#: src/server/gnunet-transport-check.c:161
+#: src/server/gnunet-transport-check.c:157
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr "`%s': Kann nicht senden.\n"
 
-#: src/server/gnunet-transport-check.c:183
+#: src/server/gnunet-transport-check.c:172
 #, 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:197
+#: src/server/gnunet-transport-check.c:185
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "`%s': Verbindung konnte nicht getrennt werden.\n"
 
-#: src/server/gnunet-transport-check.c:204
+#: src/server/gnunet-transport-check.c:192
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -2870,12 +2858,12 @@
 "`%s' Transport funktioniert. Es dauerte %ums, um %d Nachrichten zu je %d "
 "Bytes zu übertragen.\n"
 
-#: src/server/gnunet-transport-check.c:232
+#: src/server/gnunet-transport-check.c:222
 #, 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:265
+#: src/server/gnunet-transport-check.c:251
 #, c-format
 msgid ""
 "\n"
@@ -2884,67 +2872,67 @@
 "\n"
 "Kontaktiere `%s'."
 
-#: src/server/gnunet-transport-check.c:291
+#: src/server/gnunet-transport-check.c:276
 #, c-format
 msgid " Connection failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/server/gnunet-transport-check.c:297
+#: src/server/gnunet-transport-check.c:282
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:319
 #, c-format
 msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-transport-check.c:321
 #, fuzzy, c-format
 msgid "OK!\n"
 msgstr "OK"
 
-#: src/server/gnunet-transport-check.c:382
+#: src/server/gnunet-transport-check.c:346
 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:386
+#: src/server/gnunet-transport-check.c:350
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr "Knoten aus HOSTLISTURL anpingen, deren Transports passen"
 
-#: src/server/gnunet-transport-check.c:389
+#: src/server/gnunet-transport-check.c:353
 msgid "send COUNT messages"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/server/gnunet-transport-check.c:392
+#: src/server/gnunet-transport-check.c:356
 msgid "send messages with SIZE bytes payload"
 msgstr "Nachrichten mit SIZE Bytes Nutzlast versenden"
 
-#: src/server/gnunet-transport-check.c:395
+#: src/server/gnunet-transport-check.c:359
 msgid "specifies which TRANSPORT should be tested"
 msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
 
-#: src/server/gnunet-transport-check.c:398
+#: src/server/gnunet-transport-check.c:362
 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:406
+#: src/server/gnunet-transport-check.c:370
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:471
+#: src/server/gnunet-transport-check.c:431
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/server/gnunet-transport-check.c:474
+#: src/server/gnunet-transport-check.c:433
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/server/gnunet-transport-check.c:539
+#: src/server/gnunet-transport-check.c:474
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2953,17 +2941,17 @@
 "%d von %d Knoten erfolgreich kontaktiert (%d mal war der Transport nicht "
 "verfügbar).\n"
 
-#: src/server/tcpserver.c:105
+#: src/server/tcpserver.c:109
 #, c-format
 msgid "The `%s' request received from client is malformed.\n"
 msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
 
-#: src/server/tcpserver.c:333
+#: src/server/tcpserver.c:324
 #, fuzzy, c-format
 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:414
+#: src/server/tcpserver.c:398
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
@@ -2972,17 +2960,17 @@
 "Beschädigte Netzwerkangabe in der Konfigurationsdatei in Sektion `%s' für "
 "Eintrag `%s': %s\n"
 
-#: src/server/tcpserver.c:466
+#: src/server/tcpserver.c:454
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
 
-#: src/server/handler.c:401
+#: src/server/handler.c:428
 #, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"
 
-#: src/server/version.c:152
+#: src/server/version.c:141
 msgid ""
 "Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
@@ -2995,76 +2983,76 @@
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:129 src/server/gnunet-peer-info.c:159
+#: src/server/gnunet-peer-info.c:122 src/server/gnunet-peer-info.c:153
 #, 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:139
+#: src/server/gnunet-peer-info.c:133
 msgid "hello message invalid (signature invalid).\n"
 msgstr "Hello Nachricht ist ungültig (Signatur ist ungültig).\n"
 
-#: src/server/gnunet-peer-info.c:161
+#: src/server/gnunet-peer-info.c:154
 #, fuzzy, c-format
 msgid "Peer `%s' with trust %8u\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/server/gnunet-peer-info.c:166
+#: src/server/gnunet-peer-info.c:158
 #, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/boot/startup.c:212
+#: src/util/boot/startup.c:199
 #, fuzzy, c-format
 msgid "Failed to run %s: %s %d\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/network_client/tcpio.c:94 src/util/network_client/tcpio.c:135
+#: src/util/network_client/tcpio.c:96 src/util/network_client/tcpio.c:140
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:106
+#: src/util/network_client/tcpio.c:111
 #, fuzzy, c-format
 msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/network_client/tcpio.c:280
+#: src/util/network_client/tcpio.c:290
 #, 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:323
+#: src/util/network_client/tcpio.c:327
 #, fuzzy, c-format
 msgid "Error connecting to %s:%u\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/util/network_client/tcpio.c:336
+#: src/util/network_client/tcpio.c:338
 #, fuzzy, c-format
 msgid "Failed to connect to %s:%u in %ds\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/network_client/tcpio.c:492
+#: src/util/network_client/tcpio.c:494
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "`%s' fehlgeschlagen, Antwort ist ungültig!\n"
 
-#: src/util/crypto/hostkey_gcrypt.c:1036
+#: src/util/crypto/hostkey_gcrypt.c:898
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto/locking_gcrypt.c:74
+#: src/util/crypto/locking_gcrypt.c:80
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/os/statuscalls.c:186 src/util/os/statuscalls.c:323
+#: src/util/os/statuscalls.c:196 src/util/os/statuscalls.c:337
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/util/os/statuscalls.c:368 src/util/os/statuscalls.c:377
+#: src/util/os/statuscalls.c:380 src/util/os/statuscalls.c:390
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -3072,54 +3060,54 @@
 "Es sind keine Netzwerkgeräte in der Konfigurationsdatei in der Sektion `%s' "
 "unter `%s' definiert!\n"
 
-#: src/util/os/semaphore.c:219
+#: src/util/os/semaphore.c:218
 #, c-format
 msgid "Can't create semaphore: %i"
 msgstr "Semaphore konnte nicht angelegt werden: %i"
 
-#: src/util/os/osconfig.c:121
+#: src/util/os/osconfig.c:124
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:379
+#: src/util/os/osconfig.c:391
 #, fuzzy, c-format
 msgid "Command `%s' failed with error code %u\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/util/os/dso.c:56
+#: src/util/os/dso.c:59
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
 
-#: src/util/os/dso.c:110
+#: src/util/os/dso.c:119
 #, 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:152
+#: src/util/os/dso.c:159
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 "`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/os/cpustatus.c:426
+#: src/util/os/cpustatus.c:461
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "CPU Nutzung kann nicht ermittelt werden (Windows NT).\n"
 
-#: src/util/os/cpustatus.c:446
+#: src/util/os/cpustatus.c:483
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "CPU Nutzung kann nicht ermittelt werden (Win 9x).\n"
 
-#: src/util/os/user.c:128 src/util/os/user.c:169
+#: src/util/os/user.c:134 src/util/os/user.c:176
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/util/os/user.c:130
+#: src/util/os/user.c:135
 msgid "No such user"
 msgstr ""
 
-#: src/util/os/user.c:143
+#: src/util/os/user.c:149
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
@@ -3129,44 +3117,46 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/util/network/select.c:315
+#: src/util/network/select.c:304
 #, 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:482
-msgid "select listen socket not valid!\n"
+#: src/util/network/select.c:473
+#, c-format
+msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
-#: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
+#: src/util/network/ipcheck.c:105 src/util/network/ipcheck.c:133
+#: src/util/network/ipcheck.c:180 src/util/network/ipcheck.c:204
+#: src/util/network/ipcheck.c:212
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/network/ipcheck.c:156
+#: src/util/network/ipcheck.c:162
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/network/ipcheck.c:217
+#: src/util/network/ipcheck.c:259
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
 
-#: src/util/network/ipcheck.c:250
+#: src/util/network/ipcheck.c:291
 #, c-format
 msgid "Wrong format `%s' for netmask: %s\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/network/ipcheck.c:265
+#: src/util/network/ipcheck.c:304
 #, c-format
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
-#: src/util/network/ip.c:202
+#: src/util/network/ip.c:195
 #, fuzzy, c-format
 msgid ""
 "Could not find interface `%s' using `%s', trying to find another interface.\n"
@@ -3174,12 +3164,12 @@
 "Gerät `%s' konnte in `%s' nicht gefunden werden, es wird versucht, ein "
 "anderes Gerät zu finden.\n"
 
-#: src/util/network/ip.c:278
+#: src/util/network/ip.c:268
 #, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/util/network/ip.c:288
+#: src/util/network/ip.c:277
 #, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
@@ -3188,131 +3178,131 @@
 "Es ist mehr als eine IP-Adresse für das Gerät `%s' angegeben.\n"
 "GNUnet wird %u.%u.%u.%u. verwenden.\n"
 
-#: src/util/network/ip.c:309
+#: src/util/network/ip.c:297
 #, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr ""
 "`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n"
 
-#: src/util/network/ip.c:341
+#: src/util/network/ip.c:326
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/util/disk/storage.c:202
+#: src/util/disk/storage.c:198
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk/storage.c:531
+#: src/util/disk/storage.c:526
 #, 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:289
+#: src/util/config_impl/impl.c:290
 #, 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:532
+#: src/util/config_impl/impl.c:533
 #, c-format
 msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:578
+#: src/util/config_impl/impl.c:579
 #, 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:590
+#: src/util/config_impl/impl.c:589
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:680
+#: src/util/config_impl/impl.c:672
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:122
+#: src/util/error/error.c:115
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:190 src/util/error/error.c:234
+#: src/util/error/error.c:187 src/util/error/error.c:222
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/error/error.c:193 src/util/error/error.c:236
+#: src/util/error/error.c:189 src/util/error/error.c:224
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:196 src/util/error/error.c:240
+#: src/util/error/error.c:191 src/util/error/error.c:228
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/error/error.c:199 src/util/error/error.c:242
+#: src/util/error/error.c:193 src/util/error/error.c:230
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/error/error.c:202 src/util/error/error.c:244
+#: src/util/error/error.c:195 src/util/error/error.c:232
 msgid "FATAL"
 msgstr "SCHWERWIEGEND"
 
-#: src/util/error/error.c:205 src/util/error/error.c:246
+#: src/util/error/error.c:197 src/util/error/error.c:234
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:208 src/util/error/error.c:248
+#: src/util/error/error.c:199 src/util/error/error.c:236
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:211 src/util/error/error.c:250
+#: src/util/error/error.c:201 src/util/error/error.c:238
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:214 src/util/error/error.c:252
+#: src/util/error/error.c:203 src/util/error/error.c:240
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:217 src/util/error/error.c:254
+#: src/util/error/error.c:205 src/util/error/error.c:242
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:220 src/util/error/error.c:256
+#: src/util/error/error.c:207 src/util/error/error.c:244
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:223
+#: src/util/error/error.c:209
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:238
+#: src/util/error/error.c:226
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/error/error.c:257
+#: src/util/error/error.c:245
 msgid "NOTHING"
 msgstr "NICHTS"
 
-#: src/util/threads/mutex.c:145 src/util/threads/semaphore.c:174
-#: src/util/threads/pthread.c:150
+#: src/util/threads/mutex.c:144 src/util/threads/semaphore.c:166
+#: src/util/threads/pthread.c:154
 #, fuzzy, c-format
 msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 msgstr "Unerwartete sehr große Allokierung (%u Bytes) bei %s:%d!\n"
 
-#: src/util/threads/mutex.c:154 src/util/threads/mutex.c:194
+#: src/util/threads/mutex.c:152 src/util/threads/mutex.c:194
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/threads/mutex.c:159
+#: src/util/threads/mutex.c:156
 #, fuzzy, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr "Durch `%s' ist ein Deadlock bei %s:%d entstanden\n"
@@ -3322,91 +3312,103 @@
 msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:199
+#: src/util/threads/mutex.c:198
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/util/threads/pthread.c:162 src/util/threads/pthread.c:170
-#: src/util/threads/pthread.c:177 src/util/threads/pthread.c:270
+#: src/util/threads/pthread.c:165 src/util/threads/pthread.c:171
+#: src/util/threads/pthread.c:176 src/util/threads/pthread.c:264
 #, 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:184 src/util/threads/pthread.c:281
+#: src/util/threads/pthread.c:181 src/util/threads/pthread.c:273
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/util/loggers/file.c:231
+#: src/util/loggers/file.c:229
 #, fuzzy, c-format
 msgid "Failed to open log-file `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/loggers/file.c:256
+#: src/util/loggers/file.c:248
 #, fuzzy
 msgid "GNUnet error log"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/util/loggers/memory.c:71
+#: src/util/loggers/file.c:265 src/util/loggers/file.c:282
+#: src/include/gnunet_util_error.h:243 src/include/gnunet_util_error.h:250
+#: src/include/gnunet_util_error.h:257 src/include/gnunet_util_error.h:264
+#, 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/util/loggers/memory.c:70
 msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:681
+#: src/util/getopt/getopt.c:684
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/util/getopt/getopt.c:705
+#: src/util/getopt/getopt.c:710
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt/getopt.c:710
+#: src/util/getopt/getopt.c:716
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: Option '%c%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt/getopt.c:727 src/util/getopt/getopt.c:901
+#: src/util/getopt/getopt.c:737 src/util/getopt/getopt.c:909
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: Option `%s' benötigt einen Parameter\n"
 
-#: src/util/getopt/getopt.c:757
+#: src/util/getopt/getopt.c:767
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option '--%s'\n"
 
-#: src/util/getopt/getopt.c:761
+#: src/util/getopt/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option '%c%s'\n"
 
-#: src/util/getopt/getopt.c:787
+#: src/util/getopt/getopt.c:797
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: unerlaubte Option -- %c\n"
 
-#: src/util/getopt/getopt.c:790
+#: src/util/getopt/getopt.c:799
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: src/util/getopt/getopt.c:820 src/util/getopt/getopt.c:950
+#: src/util/getopt/getopt.c:828 src/util/getopt/getopt.c:958
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: Option benötigt einen Parameter -- %c\n"
 
-#: src/util/getopt/getopt.c:867
+#: src/util/getopt/getopt.c:876
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: Option '-W %s' ist mehrdeutig\n"
 
-#: src/util/getopt/getopt.c:885
+#: src/util/getopt/getopt.c:894
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
 
+#: src/util/getopt/getopt.c:1071 src/setup/gnunet-setup.c:273
+#, 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/util/getopt/setoption.c:58
 #, c-format
 msgid ""
@@ -3414,12 +3416,12 @@
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
+#: src/util/getopt/setoption.c:136 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
+#: src/util/getopt/printhelp.c:49
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -3427,7 +3429,7 @@
 "Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/string/string.c:121
+#: src/util/string/string.c:120
 msgid "ms"
 msgstr "ms"
 
@@ -3435,202 +3437,202 @@
 msgid "s"
 msgstr "s"
 
-#: src/util/string/string.c:129
+#: src/util/string/string.c:130
 msgid "m"
 msgstr "m"
 
-#: src/util/string/string.c:132
+#: src/util/string/string.c:134
 msgid "h"
 msgstr "h"
 
-#: src/util/string/string.c:135
+#: src/util/string/string.c:138
 msgid " days"
 msgstr " Tage"
 
-#: src/util/string/string.c:153
+#: src/util/string/string.c:154
 msgid "b"
 msgstr "b"
 
-#: src/util/string/string.c:158
+#: src/util/string/string.c:160
 msgid "KiB"
 msgstr ""
 
-#: src/util/string/string.c:161
+#: src/util/string/string.c:164
 msgid "MiB"
 msgstr ""
 
-#: src/util/string/string.c:164
+#: src/util/string/string.c:168
 msgid "GiB"
 msgstr ""
 
-#: src/util/string/string.c:167
+#: src/util/string/string.c:172
 msgid "TiB"
 msgstr ""
 
-#: src/util/string/string.c:287
+#: src/util/string/string.c:284
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:60
+#: src/setup/gnunet-setup.c:59
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr "Generiere Konfiguration für gnunetd, den GNUnet Daemon"
 
-#: src/setup/gnunet-setup.c:62
+#: src/setup/gnunet-setup.c:61
 msgid "Tool to setup GNUnet."
 msgstr "Werkzeug für die Einrichtung von GNUnet."
 
-#: src/setup/gnunet-setup.c:188
+#: src/setup/gnunet-setup.c:176
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Ungültige Kommandozeilen Parameter.\n"
 
-#: src/setup/gnunet-setup.c:193
+#: src/setup/gnunet-setup.c:181
 msgid "No interface specified, using default\n"
 msgstr "Keine Oberfläche angegeben, verwende Standard\n"
 
-#: src/setup/gnunet-setup.c:268
+#: src/setup/gnunet-setup.c:255
 #, c-format
 msgid "`%s' is not available."
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/setup/gnunet-setup.c:284
+#: src/setup/gnunet-setup.c:272
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/setup/gnunet-win-tool.c:54
+#: src/setup/gnunet-win-tool.c:55
 msgid "list all network adapters"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:57
+#: src/setup/gnunet-win-tool.c:58
 msgid "install GNUnet as Windows service"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:60
+#: src/setup/gnunet-win-tool.c:61
 msgid "uninstall GNUnet service"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:63
+#: src/setup/gnunet-win-tool.c:64
 msgid "increase the maximum number of TCP/IP connections"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:66
+#: src/setup/gnunet-win-tool.c:67
 msgid "display a file's hash value"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:121
+#: src/setup/gnunet-win-tool.c:126
 #, c-format
 msgid "GNUnet service installed successfully.\n"
 msgstr "Der GNUnet Dienst wurde erfolgreich installiert.\n"
 
-#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:151
+#: src/setup/gnunet-win-tool.c:129 src/setup/gnunet-win-tool.c:157
 #, c-format
 msgid "This version of Windows doesn't support services.\n"
 msgstr "Diese Version von Windows unterstützt keine Dienste.\n"
 
-#: src/setup/gnunet-win-tool.c:128 src/setup/gnunet-win-tool.c:155
+#: src/setup/gnunet-win-tool.c:133 src/setup/gnunet-win-tool.c:161
 #, c-format
 msgid "Error: can't open Service Control Manager: %s\n"
 msgstr "Fehler: der Dienstemanager konnte nicht geöffnet werden: %s\n"
 
-#: src/setup/gnunet-win-tool.c:133
+#: src/setup/gnunet-win-tool.c:138
 #, c-format
 msgid "Error: can't create service: %s\n"
 msgstr "Fehler: Dienst konnte nicht angelegt werden: %s\n"
 
-#: src/setup/gnunet-win-tool.c:136 src/setup/gnunet-win-tool.c:167
+#: src/setup/gnunet-win-tool.c:141 src/setup/gnunet-win-tool.c:173
 #, c-format
 msgid "Unknown error.\n"
 msgstr "Unbekannter Fehler.\n"
 
-#: src/setup/gnunet-win-tool.c:148
+#: src/setup/gnunet-win-tool.c:154
 #, c-format
 msgid "Service deleted.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/setup/gnunet-win-tool.c:160
+#: src/setup/gnunet-win-tool.c:166
 #, c-format
 msgid "Error: can't access service: %s\n"
 msgstr "Fehler: auf den Dienst konnte nicht zugegriffen werden: %s\n"
 
-#: src/setup/gnunet-win-tool.c:164
+#: src/setup/gnunet-win-tool.c:170
 #, c-format
 msgid "Error: can't delete service: %s\n"
 msgstr "Fehler: Dienst konnte nicht gelöscht werden: %s\n"
 
-#: src/setup/gtk/gconf.c:430
+#: src/setup/gtk/gconf.c:387
 #, fuzzy
 msgid "Description"
 msgstr "Frage"
 
-#: src/setup/gtk/gconf.c:448
+#: src/setup/gtk/gconf.c:403
 msgid "Value"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:469
+#: src/setup/gtk/gconf.c:427
 msgid "Default"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:483 src/setup/ncurses/wizard_curs.c:77
+#: src/setup/gtk/gconf.c:442 src/setup/ncurses/wizard_curs.c:73
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/setup/gtk/gconf.c:497
+#: src/setup/gtk/gconf.c:456
 #, fuzzy
 msgid "Section"
 msgstr "Frage"
 
-#: src/setup/gtk/gconf.c:509
+#: src/setup/gtk/gconf.c:467
 #, fuzzy
 msgid "Option"
 msgstr "_Optionen"
 
-#: src/setup/gtk/gconf.c:531
+#: src/setup/gtk/gconf.c:490
 #, fuzzy
 msgid "Configuration saved."
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/gtk/gconf.c:539
+#: src/setup/gtk/gconf.c:500
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/setup/gtk/gconf.c:562
+#: src/setup/gtk/gconf.c:526
 #, fuzzy
 msgid "Configuration changed. Save?"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/setup/gtk/gconf.c:573
+#: src/setup/gtk/gconf.c:539
 #, fuzzy
 msgid "Error saving configuration."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/setup/gtk/wizard_gtk.c:145
+#: src/setup/gtk/wizard_gtk.c:144
 #, fuzzy
 msgid "(unknown connection)"
 msgstr "Netzwerkverbindung"
 
-#: src/setup/gtk/wizard_gtk.c:428 src/setup/ncurses/wizard_curs.c:466
+#: src/setup/gtk/wizard_gtk.c:413 src/setup/ncurses/wizard_curs.c:453
 #, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/setup/gtk/wizard_gtk.c:450
+#: src/setup/gtk/wizard_gtk.c:437
 #, fuzzy
 msgid "Do you want to save the new configuration?"
 msgstr "Möchten Sie Ihre Einstellungen speichern?"
 
-#: src/setup/gtk/wizard_gtk.c:480
+#: src/setup/gtk/wizard_gtk.c:469
 msgid "Unable to create user account:"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/setup/gtk/wizard_gtk.c:490
+#: src/setup/gtk/wizard_gtk.c:477
 msgid "Unable to change startup process:"
 msgstr "Startprozeß konnte nicht geändert werden:"
 
-#: src/setup/gtk/wizard_gtk.c:505
+#: src/setup/gtk/wizard_gtk.c:492
 msgid ""
 "Running gnunet-update failed.\n"
 "This maybe due to insufficient permissions, please check your "
@@ -3638,136 +3640,136 @@
 "Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/setup/text/conf.c:75
+#: src/setup/text/conf.c:79
 #, fuzzy
 msgid "yes"
 msgstr "Ja"
 
-#: src/setup/text/conf.c:76
+#: src/setup/text/conf.c:80
 msgid "no"
 msgstr ""
 
-#: src/setup/text/conf.c:104
+#: src/setup/text/conf.c:105
 #, c-format
 msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/text/conf.c:116
+#: src/setup/text/conf.c:114
 msgid "\tPossible choices:\n"
 msgstr ""
 
-#: src/setup/text/conf.c:124
+#: src/setup/text/conf.c:122
 msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:126
+#: src/setup/text/conf.c:124
 #, c-format
 msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/text/conf.c:147
+#: src/setup/text/conf.c:142
 #, c-format
 msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/text/conf.c:152
+#: src/setup/text/conf.c:146
 #, c-format
 msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/text/conf.c:158
+#: src/setup/text/conf.c:152
 #, c-format
 msgid ""
 "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
 "value %llu): "
 msgstr ""
 
-#: src/setup/text/conf.c:191
+#: src/setup/text/conf.c:186
 #, fuzzy, c-format
 msgid "Yes\n"
 msgstr "Ja"
 
-#: src/setup/text/conf.c:196
+#: src/setup/text/conf.c:191
 #, fuzzy, c-format
 msgid "No\n"
 msgstr "Nein"
 
-#: src/setup/text/conf.c:199 src/setup/text/conf.c:235
-#: src/setup/text/conf.c:261 src/setup/text/conf.c:318
-#: src/setup/text/conf.c:370
+#: src/setup/text/conf.c:194 src/setup/text/conf.c:235
+#: src/setup/text/conf.c:265 src/setup/text/conf.c:328
+#: src/setup/text/conf.c:386
 #, fuzzy, c-format
 msgid "Help\n"
 msgstr "Hilfe"
 
-#: src/setup/text/conf.c:202 src/setup/text/conf.c:215
-#: src/setup/text/conf.c:270 src/setup/text/conf.c:299
-#: src/setup/text/conf.c:351
+#: src/setup/text/conf.c:197 src/setup/text/conf.c:212
+#: src/setup/text/conf.c:275 src/setup/text/conf.c:306
+#: src/setup/text/conf.c:364
 #, fuzzy, c-format
 msgid "Abort\n"
 msgstr "_über"
 
-#: src/setup/text/conf.c:342 src/setup/text/conf.c:397
+#: src/setup/text/conf.c:353 src/setup/text/conf.c:415
 #, c-format
 msgid ""
 "\n"
 "Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/text/conf.c:403
+#: src/setup/text/conf.c:421
 #, c-format
 msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:477
+#: src/setup/text/conf.c:482
 msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/setup/text/conf.c:488
+#: src/setup/text/conf.c:491
 msgid "Aborted.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:510
+#: src/setup/text/conf.c:504
 #, fuzzy
 msgid "Invalid entry.\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/setup/text/conf.c:529
+#: src/setup/text/conf.c:521
 #, c-format
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:560
+#: src/setup/text/conf.c:552
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:561
+#: src/setup/text/conf.c:553
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:575 src/setup/ncurses/mconf.c:519
+#: src/setup/text/conf.c:565 src/setup/ncurses/mconf.c:511
 #, 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:580
+#: src/setup/text/conf.c:571
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:592
+#: src/setup/text/conf.c:586
 #, 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:597
+#: src/setup/text/conf.c:595
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
@@ -3784,79 +3786,79 @@
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/setup/ncurses/mconf.c:175 src/setup/ncurses/mconf.c:278
-#: src/setup/ncurses/mconf.c:356 src/setup/ncurses/mconf.c:462
-#: src/setup/ncurses/wizard_curs.c:121 src/setup/ncurses/wizard_curs.c:191
-#: src/setup/ncurses/wizard_curs.c:307
+#: src/setup/ncurses/mconf.c:179 src/setup/ncurses/mconf.c:278
+#: src/setup/ncurses/mconf.c:359 src/setup/ncurses/mconf.c:455
+#: src/setup/ncurses/wizard_curs.c:110 src/setup/ncurses/wizard_curs.c:174
+#: src/setup/ncurses/wizard_curs.c:290
 msgid "Internal error! (Choice invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:213 src/setup/ncurses/mconf.c:408
+#: src/setup/ncurses/mconf.c:212 src/setup/ncurses/mconf.c:403
 msgid "Internal error! (Value invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:399
+#: src/setup/ncurses/mconf.c:392
 msgid "Invalid input, expecting floating point value."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:447
+#: src/setup/ncurses/mconf.c:435
 msgid "Invalid input, expecting integer."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:453
+#: src/setup/ncurses/mconf.c:443
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:505 src/setup/ncurses/wizard_curs.c:562
+#: src/setup/ncurses/mconf.c:499 src/setup/ncurses/wizard_curs.c:534
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/ncurses/mconf.c:523
+#: src/setup/ncurses/mconf.c:517
 #, fuzzy
 msgid "Do you wish to save your new configuration?"
 msgstr "Möchten Sie Ihre Einstellungen speichern?"
 
-#: src/setup/ncurses/mconf.c:534
+#: src/setup/ncurses/mconf.c:531
 #, fuzzy, c-format
 msgid ""
 "\n"
 "End of configuration.\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/setup/ncurses/mconf.c:537
+#: src/setup/ncurses/mconf.c:536
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Your configuration changes were NOT saved.\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/setup/ncurses/wizard_curs.c:67 src/setup/lib/wizard_util.c:131
-#: src/setup/lib/wizard_util.c:176
+#: src/setup/ncurses/wizard_curs.c:65 src/setup/lib/wizard_util.c:139
+#: src/setup/lib/wizard_util.c:194
 msgid "Error"
 msgstr "Fehler"
 
-#: src/setup/ncurses/wizard_curs.c:86
+#: src/setup/ncurses/wizard_curs.c:80
 #, fuzzy
 msgid "Error!"
 msgstr "Fehler"
 
-#: src/setup/ncurses/wizard_curs.c:153
+#: src/setup/ncurses/wizard_curs.c:142
 #, fuzzy
 msgid "Abort"
 msgstr "_über"
 
-#: src/setup/ncurses/wizard_curs.c:154
+#: src/setup/ncurses/wizard_curs.c:143
 #, fuzzy
 msgid "Ok"
 msgstr "k"
 
-#: src/setup/ncurses/wizard_curs.c:222 src/setup/ncurses/wizard_curs.c:290
-#: src/setup/ncurses/wizard_curs.c:443
+#: src/setup/ncurses/wizard_curs.c:209 src/setup/ncurses/wizard_curs.c:275
+#: src/setup/ncurses/wizard_curs.c:426
 msgid "GNUnet configuration"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:223
+#: src/setup/ncurses/wizard_curs.c:211
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -3886,7 +3888,7 @@
 "\n"
 "das GNUnet-Team"
 
-#: src/setup/ncurses/wizard_curs.c:291
+#: src/setup/ncurses/wizard_curs.c:277
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
@@ -3894,7 +3896,7 @@
 "Wählen Sie das Netzwerkgerät, das Ihren Computer mit dem Internet verbindet, "
 "aus unten stehender Liste."
 
-#: src/setup/ncurses/wizard_curs.c:312 src/setup/ncurses/wizard_curs.c:325
+#: src/setup/ncurses/wizard_curs.c:295 src/setup/ncurses/wizard_curs.c:309
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
@@ -3904,12 +3906,12 @@
 "verbindet. Dies ist üblicherweise ein Modem, eine ISDN-Karte oder eine "
 "Netzwerkkarte falls Sie DSL nutzen."
 
-#: src/setup/ncurses/wizard_curs.c:323
+#: src/setup/ncurses/wizard_curs.c:306
 #, fuzzy
 msgid "Network configuration: interface"
 msgstr "Netzwerkgerät:"
 
-#: src/setup/ncurses/wizard_curs.c:324
+#: src/setup/ncurses/wizard_curs.c:308
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
@@ -3917,12 +3919,12 @@
 "Was ist der Name des Netzwerkgerätes, das Ihren Computer mit dem Internet "
 "verbindet?"
 
-#: src/setup/ncurses/wizard_curs.c:335
+#: src/setup/ncurses/wizard_curs.c:319
 #, fuzzy
 msgid "Network configuration: NAT"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:336
+#: src/setup/ncurses/wizard_curs.c:320
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3940,12 +3942,12 @@
 "hier \"Ja\". Antworten Sie \"Nein\" bei direkten Verbindungen über Modem, "
 "ISDN-Karten und DNAT (auch bekannt als \"Port forwarding\")."
 
-#: src/setup/ncurses/wizard_curs.c:349
+#: src/setup/ncurses/wizard_curs.c:333
 #, fuzzy
 msgid "Network configuration: IP"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:350
+#: src/setup/ncurses/wizard_curs.c:335
 #, fuzzy
 msgid "What is this computer's public IP address or hostname?"
 msgstr ""
@@ -3953,7 +3955,7 @@
 "Computers?\n"
 "Wenn Sie nicht sicher sind, lassen Sie dieses Feld leer."
 
-#: src/setup/ncurses/wizard_curs.c:351
+#: src/setup/ncurses/wizard_curs.c:336
 #, fuzzy
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
@@ -3973,17 +3975,17 @@
 "Wenn Sie nicht sicher sind, so können Sie das Feld leer lassen. GNUnet wird "
 "dann versuchen, Ihre IP-Adresse automatisch zu bestimmen."
 
-#: src/setup/ncurses/wizard_curs.c:366
+#: src/setup/ncurses/wizard_curs.c:351
 #, fuzzy
 msgid "Bandwidth configuration: upload"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:367
+#: src/setup/ncurses/wizard_curs.c:353
 #, fuzzy
 msgid "How much upstream bandwidth (in bytes/s) may be used?"
 msgstr "Wieviel Upstream (Bytes/s) darf verwendet werden?"
 
-#: src/setup/ncurses/wizard_curs.c:368
+#: src/setup/ncurses/wizard_curs.c:354
 #, fuzzy
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
@@ -4002,17 +4004,17 @@
 "festlegen. Wenn Sie eine Flatrate haben, können Sie die maximale "
 "Geschwindigkeit Ihrer Internetverbindung angeben."
 
-#: src/setup/ncurses/wizard_curs.c:380
+#: src/setup/ncurses/wizard_curs.c:366
 #, fuzzy
 msgid "Bandwidth configuration: download"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:381
+#: src/setup/ncurses/wizard_curs.c:368
 #, fuzzy
 msgid "How much downstream bandwidth (in bytes/s) may be used?"
 msgstr "Wieviel Downstream (Bytes/s) darf verwendet werden?"
 
-#: src/setup/ncurses/wizard_curs.c:382
+#: src/setup/ncurses/wizard_curs.c:369
 #, fuzzy
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
@@ -4031,16 +4033,16 @@
 "festlegen. Wenn Sie eine Flatrate haben, können Sie die maximale "
 "Geschwindigkeit Ihrer Internetverbindung angeben."
 
-#: src/setup/ncurses/wizard_curs.c:394
+#: src/setup/ncurses/wizard_curs.c:381
 #, fuzzy
 msgid "Quota configuration"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:395
+#: src/setup/ncurses/wizard_curs.c:382
 msgid "What is the maximum size of the datastore in MB?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:396
+#: src/setup/ncurses/wizard_curs.c:383
 #, fuzzy
 msgid ""
 "The GNUnet datastore contains all content that GNUnet needs to store "
@@ -4050,16 +4052,16 @@
 "Der GNUnet Datenspeicher enthält alle Daten, die GNUnet erzeugt (Indexdaten, "
 "eingefügte und migrierte Inhalte)."
 
-#: src/setup/ncurses/wizard_curs.c:409
+#: src/setup/ncurses/wizard_curs.c:393
 #, fuzzy
 msgid "Daemon configuration: user account"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/setup/ncurses/wizard_curs.c:410
+#: src/setup/ncurses/wizard_curs.c:394
 msgid "As which user should gnunetd be run?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:411
+#: src/setup/ncurses/wizard_curs.c:396
 #, fuzzy
 msgid ""
 "For security reasons, it is a good idea to let this setup create a new user "
@@ -4086,15 +4088,15 @@
 "\n"
 "GNUnet Benutzer:"
 
-#: src/setup/ncurses/wizard_curs.c:429
+#: src/setup/ncurses/wizard_curs.c:411
 msgid "Daemon configuration: group account"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:430
+#: src/setup/ncurses/wizard_curs.c:412
 msgid "As which group should gnunetd be run?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:431
+#: src/setup/ncurses/wizard_curs.c:414
 #, fuzzy
 msgid ""
 "For security reasons, it is a good idea to let this setup create a new group "
@@ -4117,11 +4119,11 @@
 "\n"
 "GNUnet Gruppe:"
 
-#: src/setup/ncurses/wizard_curs.c:444
+#: src/setup/ncurses/wizard_curs.c:428
 msgid "Do you want to automatically launch GNUnet as a system service?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:445
+#: src/setup/ncurses/wizard_curs.c:430
 #, fuzzy
 msgid ""
 "If you say \"yes\" here, the GNUnet background process will be automatically "
@@ -4135,30 +4137,30 @@
 "\"Nein\" sagen, so müssen Sie GNUnet jedesmal selbst starten, wenn Sie es "
 "verwenden möchten."
 
-#: src/setup/ncurses/wizard_curs.c:493
+#: src/setup/ncurses/wizard_curs.c:471
 #, fuzzy
 msgid "Unable to create user account for daemon."
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/setup/ncurses/wizard_curs.c:507
+#: src/setup/ncurses/wizard_curs.c:478
 msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:521
+#: src/setup/ncurses/wizard_curs.c:493
 #, fuzzy
 msgid "Save configuration?"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:522
+#: src/setup/ncurses/wizard_curs.c:494
 #, fuzzy
 msgid "Save configuration now?"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:566
+#: src/setup/ncurses/wizard_curs.c:538
 msgid "Back"
 msgstr "Zurück"
 
-#: src/setup/lib/gns.c:278
+#: src/setup/lib/gns.c:294
 #, fuzzy, c-format
 msgid ""
 "Configuration does not satisfy constraints of configuration specification "
@@ -4167,99 +4169,93 @@
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "für FS Daten angeben.\n"
 
-#: src/setup/lib/tree.c:189
+#: src/setup/lib/tree.c:190
 #, c-format
 msgid ""
 "Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:101
+#: src/setup/lib/wizard_util.c:110
 msgid "Can't open Service Control Manager"
 msgstr "Der Dienstemanager konnte nicht geöffnet werden"
 
-#: src/setup/lib/wizard_util.c:106
+#: src/setup/lib/wizard_util.c:116
 msgid "Can't create service"
 msgstr "Der Dienst konnte nicht angelegt werden"
 
-#: src/setup/lib/wizard_util.c:111
+#: src/setup/lib/wizard_util.c:120
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr "Fehler beim Ändern der Berechtigungen des GNUnet Verzeichnisses"
 
-#: src/setup/lib/wizard_util.c:115
+#: src/setup/lib/wizard_util.c:125
 msgid "Cannot write to the regisitry"
 msgstr "Konnte nicht in die Registry schreiben"
 
-#: src/setup/lib/wizard_util.c:118
+#: src/setup/lib/wizard_util.c:128
 msgid "Can't access the service"
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/setup/lib/wizard_util.c:122
+#: src/setup/lib/wizard_util.c:131
 msgid "Can't delete the service"
 msgstr "Dienst konnte nicht gelöscht werden"
 
-#: src/setup/lib/wizard_util.c:126
+#: src/setup/lib/wizard_util.c:134
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/setup/lib/wizard_util.c:159
+#: src/setup/lib/wizard_util.c:170
 msgid "This version of Windows does not support multiple users."
 msgstr "Diese Version von Windows ist nicht Mehrbenutzerfähig."
 
-#: src/setup/lib/wizard_util.c:163
+#: src/setup/lib/wizard_util.c:174
 msgid "Error creating user"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/setup/lib/wizard_util.c:166
+#: src/setup/lib/wizard_util.c:178
 msgid "Error accessing local security policy"
 msgstr "Fehler beim Zugriff auf die lokale Sicherheitsrichtlinie"
 
-#: src/setup/lib/wizard_util.c:169
+#: src/setup/lib/wizard_util.c:183
 msgid "Error granting service right to user"
 msgstr "Fehler beim Zuweisen des Dienstrechtes dem Benutzer"
 
-#: src/setup/lib/wizard_util.c:172
+#: src/setup/lib/wizard_util.c:188
 msgid "Unknown error while creating a new user"
 msgstr "Unbekannter Fehler beim Anlegen des neuen Benutzers"
 
-#: src/include/gnunet_util_getopt.h:150
+#: src/include/gnunet_util_getopt.h:153
 msgid "print this help"
 msgstr "Gibt diese Hilfe aus"
 
-#: src/include/gnunet_util_getopt.h:159
+#: src/include/gnunet_util_getopt.h:162
 msgid "print the version number"
 msgstr "Versionsnummer ausgeben"
 
-#: src/include/gnunet_util_getopt.h:165
+#: src/include/gnunet_util_getopt.h:168
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:171
+#: src/include/gnunet_util_getopt.h:174
 msgid "be verbose"
 msgstr "umfangreiche Meldungen ausgeben"
 
-#: src/include/gnunet_util_getopt.h:177
+#: src/include/gnunet_util_getopt.h:180
 msgid "use configuration file FILENAME"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/include/gnunet_util_getopt.h:183
+#: src/include/gnunet_util_getopt.h:186
 msgid "specify host on which gnunetd is running"
 msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
-#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:220
-#: src/include/gnunet_util_error.h:226 src/include/gnunet_util_error.h:236
-#: src/include/gnunet_util_error.h:242
+#: src/include/gnunet_util_error.h:212 src/include/gnunet_util_error.h:214
+#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:230
+#: src/include/gnunet_util_error.h:236
 #, fuzzy, c-format
 msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_util_error.h:249 src/include/gnunet_util_error.h:256
-#: src/include/gnunet_util_error.h:263 src/include/gnunet_util_error.h:270
+#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
 #, 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:277 src/include/gnunet_util_error.h:284
-#, 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"
 
@@ -5205,6 +5201,37 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
+#~ msgid "specify nickname"
+#~ msgstr "Spitznamen angeben"
+
+#~ msgid "Start GNUnet chat client."
+#~ msgstr "GNUnet chat client starten"
+
+#~ msgid "Could not connect to gnunetd.\n"
+#~ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#~ msgid "You must specify a nickname (use option `%s').\n"
+#~ msgstr ""
+#~ "Sie müssen einen Spitznamen angeben (verwenden Sie die Option `%s').\n"
+
+#~ msgid "Could not send join message to gnunetd\n"
+#~ msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#~ msgid "Could not send message to gnunetd\n"
+#~ msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#~ msgid "mysql datastore"
+#~ msgstr "mysql Datenspeicher"
+
+#, fuzzy
+#~ msgid ""
+#~ "`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s "
+#~ "DG/%s\n"
+#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#~ msgid "Database failed to delete `%s'.\n"
+#~ msgstr "Die Datenbank konnte `%s' nicht löschen.\n"
+
 #~ msgid "GNUnet configuration assistant"
 #~ msgstr "GNUnet Konfigurationsassistent"
 
@@ -5852,9 +5879,6 @@
 #~ msgid "sendAck failed.  Terminating connection to client.\n"
 #~ msgstr "sendAck fehlgeschlagen. Beende Verbindung zu Client.\n"
 
-#~ msgid "Failed to deliver `%s' message.\n"
-#~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
 #~ msgid "Unindex failed."
 #~ msgstr "Deindizierung schlug fehl."
 

Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po     2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/po/es.po     2007-07-30 06:21:56 UTC (rev 5387)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-07 02:38-0600\n"
+"POT-Creation-Date: 2007-07-30 00:16-0600\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -18,224 +18,224 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/transports/ip6.c:72 src/util/network/io.c:80
+#: src/transports/ip6.c:75 src/util/network/io.c:85
 #, 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:104 src/util/network/ip.c:83 src/util/network/ip.c:144
+#: src/transports/ip6.c:104 src/util/network/ip.c:84 src/util/network/ip.c:146
 #, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/transports/ip6.c:134 src/util/network/ip.c:113
-#: src/util/network/ip.c:234
+#: src/transports/ip6.c:135 src/util/network/ip.c:115
+#: src/util/network/ip.c:221
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
 
-#: src/transports/ip6.c:169
+#: src/transports/ip6.c:167
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/transports/ip6.c:222 src/transports/ip.c:59
+#: src/transports/ip6.c:219 src/transports/ip.c:60
 #, 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:129 src/transports/udp.c:137
+#: src/transports/udp6.c:123 src/transports/udp.c:129
 #, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr ""
 
-#: src/transports/udp6.c:268
+#: src/transports/udp6.c:264
 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:500 src/transports/udp.c:547
+#: src/transports/udp6.c:471 src/transports/udp.c:514
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/http.c:504
+#: src/transports/http.c:522
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
 
-#: src/transports/http.c:793 src/transports/http.c:892
-#: src/transports/http.c:1030 src/transports/http.c:1163
-#: src/transports/upnp/upnp.c:335 src/transports/upnp/upnp.c:591
-#: src/applications/bootstrap_http/http.c:124
-#: src/applications/bootstrap_http/http.c:269
-#: src/applications/bootstrap_http/http.c:290
-#: src/applications/bootstrap_http/http.c:324
-#: src/applications/bootstrap_http/http.c:342
-#: src/applications/bootstrap_http/http.c:356
-#: src/applications/bootstrap_http/http.c:368
-#: src/applications/bootstrap_http/http.c:380
+#: src/transports/http.c:813 src/transports/http.c:892
+#: src/transports/http.c:1007 src/transports/http.c:1147
+#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:540
+#: src/applications/bootstrap_http/http.c:115
+#: src/applications/bootstrap_http/http.c:247
+#: src/applications/bootstrap_http/http.c:263
+#: src/applications/bootstrap_http/http.c:294
+#: src/applications/bootstrap_http/http.c:313
+#: src/applications/bootstrap_http/http.c:326
+#: src/applications/bootstrap_http/http.c:336
+#: src/applications/bootstrap_http/http.c:346
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/transports/http.c:1344
+#: src/transports/http.c:1307
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:1352
+#: src/transports/http.c:1316
 msgid "# bytes received via HTTP"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/transports/http.c:1354
+#: src/transports/http.c:1317
 msgid "# bytes sent via HTTP"
 msgstr "# bytes mandados vía HTTP"
 
-#: src/transports/http.c:1356
+#: src/transports/http.c:1319
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "#bytes omitidos vía HTTP (salientes)"
 
-#: src/transports/smtp.c:257
+#: src/transports/smtp.c:271
 #, 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:334
+#: src/transports/smtp.c:358
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/transports/smtp.c:433
+#: src/transports/smtp.c:463
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 
-#: src/transports/smtp.c:440
+#: src/transports/smtp.c:471
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transports/smtp.c:547
+#: src/transports/smtp.c:571
 #, fuzzy, c-format
 msgid "Failed to initialize libesmtp: %s.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/transports/smtp.c:611
+#: src/transports/smtp.c:630
 #, 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:679
+#: src/transports/smtp.c:702
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
 
-#: src/transports/smtp.c:707
+#: src/transports/smtp.c:730
 #, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 
-#: src/transports/tcp.c:283
+#: src/transports/tcp.c:289
 #, fuzzy
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
 
-#: src/transports/tcp.c:387
+#: src/transports/tcp.c:384
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/transports/tcp.c:454 src/transports/tcp6.c:414
+#: src/transports/tcp.c:437 src/transports/tcp6.c:404
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:584
+#: src/transports/tcp.c:556
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:592
+#: src/transports/tcp.c:565
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/tcp.c:594
+#: src/transports/tcp.c:566
 msgid "# bytes sent via TCP"
 msgstr "# bytes enviados por TCP"
 
-#: src/transports/tcp.c:596
+#: src/transports/tcp.c:568
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transports/udp.c:293
+#: src/transports/udp.c:287
 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:388
+#: src/transports/udp.c:378
 #, 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:565
+#: src/transports/udp.c:529
 msgid "# bytes received via UDP"
 msgstr "# bytes recibidos vía UDP"
 
-#: src/transports/udp.c:567
+#: src/transports/udp.c:530
 msgid "# bytes sent via UDP"
 msgstr "# bytes enviados vía UDP"
 
-#: src/transports/udp.c:569
+#: src/transports/udp.c:532
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/transports/tcp6.c:238
+#: src/transports/tcp6.c:245
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Imposible determinar mi dirección IPv6 pública.\n"
 
-#: src/transports/tcp6.c:300
+#: src/transports/tcp6.c:312
 #, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/transports/tcp6.c:532
+#: src/transports/tcp6.c:512
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/tcp6.c:534
+#: src/transports/tcp6.c:513
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "# bytes enviados por TCP"
 
-#: src/transports/tcp6.c:536
+#: src/transports/tcp6.c:515
 #, fuzzy
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transports/tcp_helper.c:248
+#: src/transports/tcp_helper.c:257
 #, 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:314
+#: src/transports/tcp_helper.c:276
 #, fuzzy
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/transports/upnp/upnp.c:443
+#: src/transports/upnp/upnp.c:429
 #, fuzzy, c-format
 msgid "%s failed for url `%s' and post-data `%s' at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/transports/upnp/upnp.c:504
+#: src/transports/upnp/upnp.c:475
 #, c-format
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/udp_helper.c:91
+#: src/transports/udp_helper.c:94
 #, fuzzy
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
@@ -245,121 +245,121 @@
 msgid "Query (get KEY, put KEY VALUE) DHT table."
 msgstr "Pregunta (coje KEY, pone KEY VALUE, borra KEY VALUE) a una tabla DHT."
 
-#: src/applications/dht/tools/dht-query.c:59
+#: src/applications/dht/tools/dht-query.c:60
 #, fuzzy
 msgid ""
 "allow TIME ms to process a GET command or expire PUT content after ms TIME"
 msgstr "Reserva TIME ms para procesar cada comando"
 
-#: src/applications/dht/tools/dht-query.c:103
+#: src/applications/dht/tools/dht-query.c:98
 #, c-format
 msgid "%s(%s) operation returned no results.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:125
+#: src/applications/dht/tools/dht-query.c:115
 #, fuzzy, c-format
 msgid "Issuing '%s(%s,%s)' command.\n"
 msgstr "'%s(%s, %s)' falló.\n"
 
-#: src/applications/dht/tools/dht-query.c:138
+#: src/applications/dht/tools/dht-query.c:122
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr "'%s (%s, %s)' logrado satisfactoriamente\n"
 
-#: src/applications/dht/tools/dht-query.c:143
+#: src/applications/dht/tools/dht-query.c:126
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s, %s)' falló.\n"
 
-#: src/applications/dht/tools/dht-query.c:171
+#: src/applications/dht/tools/dht-query.c:150
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/applications/dht/tools/dht-query.c:181
+#: src/applications/dht/tools/dht-query.c:163
 #, 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:194
+#: src/applications/dht/tools/dht-query.c:180
 #, 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:206
+#: src/applications/dht/tools/dht-query.c:191
 #, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Comando inesperado '%s'.   Abortando.\n"
 
-#: src/applications/dht/module/table.c:701
+#: src/applications/dht/module/table.c:716
 msgid "# dht connections"
 msgstr ""
 
-#: src/applications/dht/module/table.c:702
+#: src/applications/dht/module/table.c:718
 #, fuzzy
 msgid "# dht discovery messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/applications/dht/module/table.c:703
+#: src/applications/dht/module/table.c:720
 msgid "# dht route host lookups performed"
 msgstr ""
 
-#: src/applications/dht/module/table.c:704
+#: src/applications/dht/module/table.c:722
 #, fuzzy
 msgid "# dht discovery messages sent"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/applications/dht/module/cs.c:135
+#: src/applications/dht/module/cs.c:128
 #, 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:240
+#: src/applications/dht/module/cs.c:233
 #, fuzzy, c-format
 msgid "`%s' registering client handlers: %d %d\n"
 msgstr "'%s' registrando un manejador de clientes %d\n"
 
-#: src/applications/dht/module/cs.c:259
+#: src/applications/dht/module/cs.c:251
 msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:752
+#: src/applications/dht/module/routing.c:736
 msgid "# dht replies routed"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:753
+#: src/applications/dht/module/routing.c:738
 msgid "# dht requests routed"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:754
+#: src/applications/dht/module/routing.c:740
 #, fuzzy
 msgid "# dht get requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/applications/dht/module/routing.c:755
+#: src/applications/dht/module/routing.c:742
 #, fuzzy
 msgid "# dht put requests received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/applications/dht/module/routing.c:756
+#: src/applications/dht/module/routing.c:744
 #, fuzzy
 msgid "# dht results received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/applications/dht/module/routing.c:760
+#: src/applications/dht/module/routing.c:748
 #, fuzzy, c-format
 msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr "'%s' registrando manejadores %d %d %d\n"
 
-#: src/applications/chat/chat.c:87
+#: src/applications/chat/chat.c:88
 msgid "Message received from peer is invalid.\n"
 msgstr "El mensaje recibido del par es inválido.\n"
 
-#: src/applications/chat/chat.c:134
+#: src/applications/chat/chat.c:135
 msgid "Message received from client is invalid\n"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/applications/chat/chat.c:156
+#: src/applications/chat/chat.c:155
 msgid "Maximum number of chat clients reached.\n"
 msgstr "Número máximo de clientes en el chat alcanzado.\n"
 
@@ -368,111 +368,107 @@
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr "Ahora hay %d de %d clientes de chat en este nodo.\n"
 
-#: src/applications/chat/chat.c:197
+#: src/applications/chat/chat.c:202
 #, c-format
 msgid "`%s' registering handlers %d and %d\n"
 msgstr "'%s' registrando manejadores %d y %d\n"
 
-#: src/applications/chat/chat.c:216
+#: src/applications/chat/chat.c:219
 msgid "enables P2P-chat (incomplete)"
 msgstr "Activa el chat P2P (incompleto)"
 
-#: src/applications/chat/gnunet-chat.c:82
-msgid "specify nickname"
-msgstr "especifica el apodo"
+#: src/applications/chat/gnunet-chat.c:45
+msgid "Join a chat on GNUnet."
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:87
-msgid "Start GNUnet chat client."
-msgstr "Arranca el cliente de chat de GNUnet"
+#: src/applications/chat/gnunet-chat.c:49
+msgid "set the nickname to use (requred)"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:93 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:287
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Usar --help para obtener una lista de opciones.\n"
+#: src/applications/chat/gnunet-chat.c:52
+msgid "set the chat room to join (requred)"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:151
-msgid "Could not connect to gnunetd.\n"
-msgstr "Imposible conectar con gnunetd.\n"
+#: src/applications/chat/gnunet-chat.c:134
+#, fuzzy, c-format
+msgid "You must specify a nickname\n"
+msgstr "¡Debes especificar un receptor!\n"
 
-#: src/applications/chat/gnunet-chat.c:155
+#: src/applications/chat/gnunet-chat.c:144
 #, c-format
-msgid "You must specify a nickname (use option `%s').\n"
-msgstr "Debes especificar un apodo (use la opción '%s').\n"
+msgid "Failed to join the room\n"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:182
-msgid "Could not send join message to gnunetd\n"
-msgstr "Imposible mandar el mensaje a gnunetd\n"
+#: src/applications/chat/gnunet-chat.c:160
+#, fuzzy, c-format
+msgid "Failed to send message.\n"
+msgstr "Falló al entregar el mensaje '%s'.\n"
 
-#: src/applications/chat/gnunet-chat.c:191
-msgid "Could not send message to gnunetd\n"
-msgstr "Imposible mandar el mensaje a gnunetd\n"
-
-#: src/applications/advertising/advertising.c:188
+#: src/applications/advertising/advertising.c:193
 #, fuzzy, c-format
 msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 msgstr "mensaje de saludo de '%s' inválido (firma inválida). Omitiendo.\n"
 
-#: src/applications/advertising/advertising.c:196
+#: src/applications/advertising/advertising.c:203
 #, fuzzy
 msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr ""
 "mensaje de saludo recibido inválido (tiempo superior al límite). Omitiendo.\n"
 
-#: src/applications/advertising/advertising.c:367
+#: src/applications/advertising/advertising.c:374
 #, fuzzy
 msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr "Imposible mandar ahora saludos+PING, buffer del ping lleno.\n"
 
-#: src/applications/advertising/advertising.c:385
+#: src/applications/advertising/advertising.c:396
 msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:553
+#: src/applications/advertising/advertising.c:544
 #, 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:561
+#: src/applications/advertising/advertising.c:553
 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:838
+#: src/applications/advertising/advertising.c:817
 msgid "# Peer advertisements received"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/applications/advertising/advertising.c:839
+#: src/applications/advertising/advertising.c:820
 #, fuzzy
 msgid "# Peer advertisements of type NAT received"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/applications/advertising/advertising.c:840
+#: src/applications/advertising/advertising.c:823
 #, fuzzy
 msgid "# Peer advertisements confirmed via PONG"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/applications/advertising/advertising.c:841
+#: src/applications/advertising/advertising.c:827
 #, fuzzy
 msgid "# Peer advertisements updating earlier HELLOs"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/applications/advertising/advertising.c:842
+#: src/applications/advertising/advertising.c:830
 #, fuzzy
 msgid "# Peer advertisements discarded due to load"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/applications/advertising/advertising.c:843
+#: src/applications/advertising/advertising.c:834
 #, fuzzy
 msgid "# Peer advertisements for unsupported transport"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/applications/advertising/advertising.c:844
+#: src/applications/advertising/advertising.c:838
 #, fuzzy
 msgid "# Peer advertisements not confirmed due to ping busy"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/applications/advertising/advertising.c:845
+#: src/applications/advertising/advertising.c:842
 #, fuzzy
 msgid "# Peer advertisements not confirmed due to lack of self ad"
 msgstr "# Anuncios de los pares recibidos"
@@ -482,204 +478,202 @@
 msgid "# Peer advertisements not confirmed due to send error"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/applications/advertising/advertising.c:847
+#: src/applications/advertising/advertising.c:848
 msgid "# Self advertisments transmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/applications/advertising/advertising.c:848
+#: src/applications/advertising/advertising.c:850
 msgid "# Foreign advertisements forwarded"
 msgstr "# Anuncios a extraños mandados"
 
-#: src/applications/advertising/advertising.c:850
-#: src/applications/pingpong/pingpong.c:520
+#: src/applications/advertising/advertising.c:852
+#: src/applications/pingpong/pingpong.c:509
 msgid "# plaintext PING messages sent"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/applications/advertising/advertising.c:855
-#: src/applications/session/connect.c:936
+#: src/applications/advertising/advertising.c:857
+#: src/applications/session/connect.c:901
 #, 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:873
+#: src/applications/advertising/advertising.c:872
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 "Asegura que este par es conocido por otros pares y descubre otros pares"
 
-#: src/applications/topology_default/topology.c:471
+#: src/applications/topology_default/topology.c:467
 msgid "maintains GNUnet default mesh topology"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:128
+#: src/applications/pingpong/pingpong.c:132
 #: src/applications/pingpong/pingpong.c:199
 #: src/applications/pingpong/pingpong.c:264
-#: src/applications/pingpong/pingpong.c:337
+#: src/applications/pingpong/pingpong.c:331
 #, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/applications/pingpong/pingpong.c:140
+#: src/applications/pingpong/pingpong.c:143
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "Recibido ping de otro par. Omitiendo.\n"
 
-#: src/applications/pingpong/pingpong.c:210
+#: src/applications/pingpong/pingpong.c:209
 msgid "Received PING not destined for us!\n"
 msgstr "¡Recibido PING no destinado a nosotros!\n"
 
-#: src/applications/pingpong/pingpong.c:309
-#: src/applications/pingpong/pingpong.c:374
+#: src/applications/pingpong/pingpong.c:303
+#: src/applications/pingpong/pingpong.c:365
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:418
+#: src/applications/pingpong/pingpong.c:409
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:510
+#: src/applications/pingpong/pingpong.c:499
 msgid "# encrypted PONG messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/applications/pingpong/pingpong.c:512
+#: src/applications/pingpong/pingpong.c:501
 msgid "# plaintext PONG messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:514
+#: src/applications/pingpong/pingpong.c:503
 msgid "# encrypted PING messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:516
+#: src/applications/pingpong/pingpong.c:505
 msgid "# PING messages created"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:518
-#: src/applications/session/connect.c:931
+#: src/applications/pingpong/pingpong.c:507
+#: src/applications/session/connect.c:896
 msgid "# encrypted PONG messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:522
-#: src/applications/session/connect.c:929
+#: src/applications/pingpong/pingpong.c:511
+#: src/applications/session/connect.c:894
 msgid "# encrypted PING messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:524
+#: src/applications/pingpong/pingpong.c:513
 #, fuzzy
 msgid "# plaintext PONG messages sent"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/applications/pingpong/pingpong.c:526
+#: src/applications/pingpong/pingpong.c:517
 #, fuzzy
 msgid "# plaintext PONG transmissions failed"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/applications/pingpong/pingpong.c:536
+#: src/applications/pingpong/pingpong.c:526
 #, c-format
 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:46
-#: src/applications/sqstore_sqlite/sqlite.c:53
-#: src/applications/sqstore_mysql/mysql.c:139
-#: src/applications/sqstore_mysql/mysql.c:146
-#: src/applications/sqstore_mysql/mysql.c:825
-#: src/applications/sqstore_mysql/mysql.c:846
-#: src/applications/sqstore_mysql/mysql.c:858
-#: src/applications/sqstore_mysql/mysql.c:891
-#: src/applications/sqstore_mysql/mysql.c:904
-#: src/applications/sqstore_mysql/mysql.c:965
-#: src/applications/sqstore_mysql/mysql.c:1065
-#: src/applications/sqstore_mysql/mysql.c:1078
-#: src/applications/sqstore_mysql/mysql.c:1149
-#: src/applications/sqstore_mysql/mysql.c:1169
-#: src/applications/sqstore_mysql/mysql.c:1181
-#: src/applications/sqstore_mysql/mysql.c:1207
-#: src/applications/sqstore_mysql/mysql.c:1220
-#: src/applications/sqstore_mysql/mysql.c:1234
-#: src/applications/sqstore_mysql/mysql.c:1301
-#: src/applications/sqstore_mysql/mysql.c:1315
-#: src/applications/sqstore_mysql/mysql.c:1374
-#: src/applications/sqstore_mysql/mysql.c:1391
+#: src/applications/sqstore_sqlite/sqlite.c:47
+#: src/applications/sqstore_sqlite/sqlite.c:54
+#: src/applications/sqstore_mysql/mysql.c:145
+#: src/applications/sqstore_mysql/mysql.c:152
+#: src/applications/sqstore_mysql/mysql.c:428
+#: src/applications/sqstore_mysql/mysql.c:438
+#: src/applications/sqstore_mysql/mysql.c:476
+#: src/applications/sqstore_mysql/mysql.c:486
+#: src/applications/sqstore_mysql/mysql.c:518
+#: src/applications/sqstore_mysql/mysql.c:529
+#: src/applications/sqstore_mysql/mysql.c:627
+#: src/applications/sqstore_mysql/mysql.c:639
+#: src/applications/sqstore_mysql/mysql.c:651
+#: src/applications/sqstore_mysql/mysql.c:665
+#: src/applications/sqstore_mysql/mysql.c:762
+#: src/applications/sqstore_mysql/mysql.c:776
+#: src/applications/sqstore_mysql/mysql.c:917
+#: src/applications/sqstore_mysql/mysql.c:929
+#: src/applications/sqstore_mysql/mysql.c:941
+#: src/applications/sqstore_mysql/mysql.c:1184
+#: src/applications/sqstore_mysql/mysql.c:1196
+#: src/applications/sqstore_mysql/mysql.c:1208
+#: src/applications/sqstore_mysql/mysql.c:1293
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:93 src/applications/dstore/dstore.c:180
-#: src/applications/dstore/dstore.c:240 src/applications/dstore/dstore.c:263
-#: src/applications/dstore/dstore.c:323 src/applications/dstore/dstore.c:378
-#: src/applications/dstore/dstore.c:474 src/util/crypto/symcipher_gcrypt.c:46
-#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:63
-#: src/util/crypto/hostkey_gcrypt.c:70
+#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:180
+#: src/applications/dstore/dstore.c:219 src/applications/dstore/dstore.c:238
+#: src/applications/dstore/dstore.c:293 src/applications/dstore/dstore.c:330
+#: src/applications/dstore/dstore.c:403 src/util/crypto/symcipher_gcrypt.c:46
+#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:64
+#: src/util/crypto/hostkey_gcrypt.c:71
 #, c-format
 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:207
+#: src/applications/sqstore_sqlite/sqlite.c:193
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:379
+#: src/applications/sqstore_sqlite/sqlite.c:393
 #, fuzzy, c-format
 msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
 msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:380
-#: src/applications/sqstore_sqlite/sqlite.c:401
+#: src/applications/sqstore_sqlite/sqlite.c:394
+#: src/applications/sqstore_sqlite/sqlite.c:416
 msgid "sqlite datastore"
 msgstr "base de datos sqlite"
 
-#: src/applications/sqstore_sqlite/sqlite.c:400
-#: src/applications/sqstore_mysql/mysql.c:262
-#: src/applications/sqstore_mysql/mysql.c:924
-#: src/applications/sqstore_mysql/mysql.c:1251
+#: src/applications/sqstore_sqlite/sqlite.c:415
 #, 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:1395
-#: src/applications/sqstore_mysql/mysql.c:1466
+#: src/applications/sqstore_sqlite/sqlite.c:1206
+#: src/applications/sqstore_mysql/mysql.c:1401
 msgid "# bytes in datastore"
 msgstr "# bytes en la base de datos"
 
-#: src/applications/session/connect.c:261
-#: src/applications/session/connect.c:278
+#: src/applications/session/connect.c:256
+#: src/applications/session/connect.c:272
 #, 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:321
+#: src/applications/session/connect.c:313
 #, fuzzy, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr "¡Imposible encriptar la clave de sesión, otro par desconocido!\n"
 
-#: src/applications/session/connect.c:520
+#: src/applications/session/connect.c:492
 #, fuzzy
 msgid "Could not create any HELLO for myself!\n"
 msgstr "¡Imposible crear la clave local!\n"
 
-#: src/applications/session/connect.c:621
+#: src/applications/session/connect.c:592
 #, 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:639
+#: src/applications/session/connect.c:614
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr "El mensaje recibido del par es inválido.\n"
 
-#: src/applications/session/connect.c:673
+#: src/applications/session/connect.c:646
 #, 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:683
+#: src/applications/session/connect.c:656
 #, 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:752
+#: src/applications/session/connect.c:719
 #, fuzzy, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
@@ -688,28 +682,28 @@
 "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:764
+#: src/applications/session/connect.c:731
 #, fuzzy, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr "Tipo desconocido en el mensaje embebido: %u (tamaño: %u)\n"
 
-#: src/applications/session/connect.c:921
+#: src/applications/session/connect.c:886
 msgid "# session keys sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/applications/session/connect.c:923
+#: src/applications/session/connect.c:888
 msgid "# session keys rejected"
 msgstr "# claves de la sesión rechazadas"
 
-#: src/applications/session/connect.c:925
+#: src/applications/session/connect.c:890
 msgid "# session keys accepted"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/applications/session/connect.c:927
+#: src/applications/session/connect.c:892
 msgid "# sessions established"
 msgstr "# sesiones establecidas"
 
-#: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
+#: src/applications/rpc/rpc.c:134 src/applications/rpc/rpc.c:175
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
@@ -718,7 +712,7 @@
 "%s::%s - RPC %s:%p no pudo ser registrada: otro evento está actualmente "
 "usando este nombre (%p)\n"
 
-#: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
+#: src/applications/rpc/rpc.c:218 src/applications/rpc/rpc.c:265
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
@@ -727,48 +721,48 @@
 "%s::%s - RPC %s:%p no pudo ser desregistrada: otro evento está actualmente "
 "registrado con este nombre (%p)\n"
 
-#: src/applications/rpc/rpc.c:233
+#: src/applications/rpc/rpc.c:237
 #, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s - RPC %s:%p no pudo ser desregistrada: no encontrada\n"
 
-#: src/applications/rpc/rpc.c:280
+#: src/applications/rpc/rpc.c:285
 #, c-format
 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:879 src/applications/rpc/rpc.c:1012
-#: src/applications/rpc/rpc.c:1101
+#: src/applications/rpc/rpc.c:909 src/applications/rpc/rpc.c:1043
+#: src/applications/rpc/rpc.c:1129
 #, 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:946
+#: src/applications/rpc/rpc.c:975
 #, 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:1291
+#: src/applications/rpc/rpc.c:1307
 #, 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/rpc/rpc.c:1415
+#: src/applications/rpc/rpc.c:1421
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "No fue desregistrada RPC: %s:%p\n"
 
-#: src/applications/rpc/rpc.c:1442
+#: src/applications/rpc/rpc.c:1450
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "'%s' registrando manejadores %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1463
+#: src/applications/rpc/rpc.c:1466
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/applications/rpc/rpc.c:1520
+#: src/applications/rpc/rpc.c:1524
 msgid "RPC async reply invalid.\n"
 msgstr "RPC respuesta asíncrona no válida.\n"
 
@@ -776,25 +770,24 @@
 msgid "async RPC reply not received.\n"
 msgstr "respuesta RPC asíncrona no recibida.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:263
-#: src/applications/sqstore_mysql/mysql.c:925
-#: src/applications/sqstore_mysql/mysql.c:1252
-msgid "mysql datastore"
-msgstr "base de datos mysql"
+#: src/applications/sqstore_mysql/mysql.c:379
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s"
+msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/applications/sqstore_mysql/mysql.c:441
+#: src/applications/sqstore_mysql/mysql.c:1311
 #, fuzzy, c-format
-msgid ""
-"`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s DG/%"
-"s\n"
+msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1496
+#: src/applications/sqstore_mysql/mysql.c:1423
+#: src/applications/sqstore_mysql/mysql.c:1570
 #, 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:1518
+#: src/applications/sqstore_mysql/mysql.c:1448
+#: src/applications/sqstore_mysql/mysql.c:1593
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -802,44 +795,39 @@
 "Falló al cargar el modulo de la base de datos MySQL.  ¡Comprueba que MySQL "
 "esta ejecutandose y esta configurada correctamente!\n"
 
-#: src/applications/datastore/datastore.c:133
+#: src/applications/datastore/datastore.c:146
 #, c-format
 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:159
-#, 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:389
+#: src/applications/datastore/datastore.c:368
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:390
+#: src/applications/datastore/datastore.c:370
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:392
+#: src/applications/datastore/datastore.c:373
 #, fuzzy
 msgid "# bytes allowed in datastore"
 msgstr "# bytes en la base de datos"
 
-#: src/applications/datastore/datastore.c:406
+#: src/applications/datastore/datastore.c:388
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:528
+#: src/applications/datastore/datastore.c:513
 #, fuzzy
 msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/applications/identity/hostkey.c:123
+#: src/applications/identity/hostkey.c:116
 #, 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:154
+#: src/applications/identity/hostkey.c:143
 #, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
@@ -847,15 +835,15 @@
 "Se produjo un fallo al comprobar la clave local existente en el fichero '%"
 "s', creando nueva clave local.\n"
 
-#: src/applications/identity/hostkey.c:162
+#: src/applications/identity/hostkey.c:152
 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:175
+#: src/applications/identity/hostkey.c:162
 msgid "Done creating hostkey.\n"
 msgstr "Correcto al crear la clave local.\n"
 
-#: src/applications/identity/identity.c:347
+#: src/applications/identity/identity.c:345
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -863,7 +851,7 @@
 "El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
 "Eliminando.\n"
 
-#: src/applications/identity/identity.c:360
+#: src/applications/identity/identity.c:358
 #, fuzzy, c-format
 msgid ""
 "Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -871,182 +859,182 @@
 "El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
 "Eliminando.\n"
 
-#: src/applications/identity/identity.c:397
+#: src/applications/identity/identity.c:393
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/applications/identity/identity.c:730
-#: src/applications/identity/identity.c:758
+#: src/applications/identity/identity.c:708
+#: src/applications/identity/identity.c:729
 #, fuzzy, c-format
 msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr "Borrando el fichero '%s' que contiene datos de saludo no válidos.\n"
 
-#: src/applications/identity/identity.c:812
+#: src/applications/identity/identity.c:776
 #, 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:822
+#: src/applications/identity/identity.c:785
 msgid "Signature failed verification: signature invalid.\n"
 msgstr "Falló la verificación de la firma: firma no válida.\n"
 
-#: src/applications/identity/identity.c:928
-#: src/applications/identity/identity.c:1044
+#: src/applications/identity/identity.c:894
+#: src/applications/identity/identity.c:1014
 #, c-format
 msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:1045
+#: src/applications/identity/identity.c:1017
 #, c-format
 msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:148
+#: src/applications/transport/transport.c:190
 #, c-format
 msgid ""
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:196
+#: src/applications/transport/transport.c:244
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:246
+#: src/applications/transport/transport.c:297
 #, c-format
 msgid ""
 "Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:307
+#: src/applications/transport/transport.c:373
 #, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:395
+#: src/applications/transport/transport.c:494
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:452
+#: src/applications/transport/transport.c:553
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:653
+#: src/applications/transport/transport.c:752
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/applications/transport/transport.c:673
+#: src/applications/transport/transport.c:771
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/applications/transport/transport.c:683
+#: src/applications/transport/transport.c:781
 #, 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:710
+#: src/applications/transport/transport.c:808
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/applications/transport/transport.c:723
+#: src/applications/transport/transport.c:819
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/applications/fragmentation/fragmentation.c:566
+#: src/applications/fragmentation/fragmentation.c:575
 msgid "# messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/applications/fragmentation/fragmentation.c:567
+#: src/applications/fragmentation/fragmentation.c:577
 msgid "# messages fragmented"
 msgstr "# mensajes fragmentados"
 
-#: src/applications/fragmentation/fragmentation.c:568
+#: src/applications/fragmentation/fragmentation.c:578
 msgid "# fragments discarded"
 msgstr "# fragmentos descartados"
 
-#: src/applications/fragmentation/fragmentation.c:580
+#: src/applications/fragmentation/fragmentation.c:588
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr "'%s' registrando manejador %d\n"
 
-#: src/applications/stats/gnunet-stats.c:65
+#: src/applications/stats/gnunet-stats.c:62
 #, c-format
 msgid "Supported peer-to-peer messages:\n"
 msgstr "Mensajes P2P soportados:\n"
 
-#: src/applications/stats/gnunet-stats.c:69
+#: src/applications/stats/gnunet-stats.c:65
 #, c-format
 msgid "Supported client-server messages:\n"
 msgstr "Mensajes cliente-servidor soportados:\n"
 
-#: src/applications/stats/gnunet-stats.c:93
+#: src/applications/stats/gnunet-stats.c:84
 #: src/applications/vpn/gnunet-vpn.c:52
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
-#: src/applications/stats/gnunet-stats.c:97
+#: src/applications/stats/gnunet-stats.c:88
 msgid "prints supported protocol messages"
 msgstr "imprime los mensajes del protocolo"
 
-#: src/applications/stats/gnunet-stats.c:133
-#: src/applications/tbench/gnunet-tbench.c:128
-#: src/applications/tracekit/gnunet-tracekit.c:313
+#: src/applications/stats/gnunet-stats.c:122
+#: src/applications/tbench/gnunet-tbench.c:127
+#: src/applications/tracekit/gnunet-tracekit.c:315
 #: src/applications/template/gnunet-template.c:94
-#: src/applications/vpn/gnunet-vpn.c:145
+#: src/applications/vpn/gnunet-vpn.c:148
 #, 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:152
+#: src/applications/stats/gnunet-stats.c:134
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
-#: src/applications/stats/clientapi.c:328
+#: src/applications/stats/clientapi.c:330
 msgid "Uptime (seconds)"
 msgstr ""
 
-#: src/applications/stats/statistics.c:214
+#: src/applications/stats/statistics.c:223
 #, fuzzy, c-format
 msgid "% of allowed network load (up)"
 msgstr "% de red permitida para la subida"
 
-#: src/applications/stats/statistics.c:216
+#: src/applications/stats/statistics.c:225
 #, fuzzy, c-format
 msgid "% of allowed network load (down)"
 msgstr "% de red permitida para bajada"
 
-#: src/applications/stats/statistics.c:218
+#: src/applications/stats/statistics.c:226
 #, fuzzy, c-format
 msgid "% of allowed cpu load"
 msgstr "% de CPU permitida para el uso"
 
-#: src/applications/stats/statistics.c:220
+#: src/applications/stats/statistics.c:227
 #, fuzzy, c-format
 msgid "% of allowed io load"
 msgstr "% de CPU permitida para el uso"
 
-#: src/applications/stats/statistics.c:222
+#: src/applications/stats/statistics.c:228
 msgid "# of connected peers"
 msgstr "# de pares conectados"
 
-#: src/applications/stats/statistics.c:224
+#: src/applications/stats/statistics.c:230
 msgid "# bytes of noise received"
 msgstr "# bytes de ruido recibidos"
 
-#: src/applications/stats/statistics.c:392
+#: src/applications/stats/statistics.c:401
 #, fuzzy, c-format
 msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/stats/statistics.c:413
+#: src/applications/stats/statistics.c:421
 msgid "keeps statistics about gnunetd's operation"
 msgstr ""
 
@@ -1054,80 +1042,80 @@
 msgid "# Any-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:152
+#: src/applications/stats/sqstats.c:151
 msgid "# DBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:154
+#: src/applications/stats/sqstats.c:152
 msgid "# SBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:156
+#: src/applications/stats/sqstats.c:153
 msgid "# KBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:158
+#: src/applications/stats/sqstats.c:154
 msgid "# NBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:160
+#: src/applications/stats/sqstats.c:155
 msgid "# KNBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:162
+#: src/applications/stats/sqstats.c:156
 msgid "# OnDemand-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:164
+#: src/applications/stats/sqstats.c:157
 msgid "# Unknown-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:166
+#: src/applications/stats/sqstats.c:158
 msgid "# expired"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:168
+#: src/applications/stats/sqstats.c:159
 msgid "# expire in 1h"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:170
+#: src/applications/stats/sqstats.c:160
 msgid "# expire in 24h"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:172
+#: src/applications/stats/sqstats.c:161
 msgid "# expire in 1 week"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:174
+#: src/applications/stats/sqstats.c:162
 msgid "# expire in 1 month"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:176
+#: src/applications/stats/sqstats.c:163
 msgid "# zero priority"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:178
+#: src/applications/stats/sqstats.c:164
 msgid "# priority one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:180
+#: src/applications/stats/sqstats.c:165
 msgid "# priority larger than one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:182
+#: src/applications/stats/sqstats.c:166
 msgid "# no anonymity"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:184
+#: src/applications/stats/sqstats.c:167
 msgid "# anonymity one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:186
+#: src/applications/stats/sqstats.c:168
 msgid "# anonymity larger than one"
 msgstr ""
 
 #: src/applications/tbench/gnunet-tbench.c:64
-#: src/applications/tracekit/gnunet-tracekit.c:53
+#: src/applications/tracekit/gnunet-tracekit.c:55
 msgid "Start GNUnet transport benchmarking tool."
 msgstr ""
 
@@ -1159,11 +1147,11 @@
 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:90
+#: src/applications/tbench/gnunet-tbench.c:91
 msgid "number of messages in a message block"
 msgstr "número de mensajes en un bloque de mensajes"
 
-#: src/applications/tbench/gnunet-tbench.c:144
+#: src/applications/tbench/gnunet-tbench.c:143
 #, c-format
 msgid "You must specify a receiver!\n"
 msgstr "¡Debes especificar un receptor!\n"
@@ -1174,37 +1162,37 @@
 msgstr ""
 "ID del par receptor especificada no válida ('%s' no es un nombre válido).\n"
 
-#: src/applications/tbench/gnunet-tbench.c:182
+#: src/applications/tbench/gnunet-tbench.c:187
 #, c-format
 msgid "Time:\n"
 msgstr "Tiempo:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:183
+#: src/applications/tbench/gnunet-tbench.c:188
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr "\tmax      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:185
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr "\tmin      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:187
+#: src/applications/tbench/gnunet-tbench.c:190
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr "\tmean     %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tbench/gnunet-tbench.c:191
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr "\tvariance %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:192
+#: src/applications/tbench/gnunet-tbench.c:193
 #, c-format
 msgid "Loss:\n"
 msgstr "Perdido:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:193
+#: src/applications/tbench/gnunet-tbench.c:194
 #, c-format
 msgid "\tmax      %u\n"
 msgstr "\tmax      %u\n"
@@ -1214,22 +1202,22 @@
 msgid "\tmin      %u\n"
 msgstr "\tmin      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:197
+#: src/applications/tbench/gnunet-tbench.c:196
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr "\tmean     %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:199
+#: src/applications/tbench/gnunet-tbench.c:197
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr "\tvariance %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:208
+#: src/applications/tbench/gnunet-tbench.c:203
 #, 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:212
+#: src/applications/tbench/gnunet-tbench.c:209
 #, c-format
 msgid ""
 "\n"
@@ -1238,7 +1226,7 @@
 "\n"
 "No se recibió el mensaje de gnunetd. ¿Está gnunetd ejecutandose?\n"
 
-#: src/applications/tbench/tbench.c:421
+#: src/applications/tbench/tbench.c:412
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
@@ -1246,27 +1234,27 @@
 msgid "probe network to the given DEPTH"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:51
+#: src/applications/tracekit/gnunet-tracekit.c:52
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:57
+#: src/applications/tracekit/gnunet-tracekit.c:59
 msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:61
+#: src/applications/tracekit/gnunet-tracekit.c:63
 msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:115
+#: src/applications/tracekit/gnunet-tracekit.c:111
 #, 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:160
 #, c-format
 msgid "`%s' is not connected to any peer.\n"
 msgstr "'%s' no esta conectado a ningún par.\n"
@@ -1276,172 +1264,172 @@
 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:210
 #, 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:236
 #, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:343
+#: src/applications/tracekit/gnunet-tracekit.c:336
 msgid "Could not send request to gnunetd.\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:68
-#: src/applications/tracekit/tracekit.c:201
+#: src/applications/tracekit/tracekit.c:72
+#: src/applications/tracekit/tracekit.c:206
 #, c-format
 msgid "Received invalid `%s' message from `%s'.\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:263
+#: src/applications/tracekit/tracekit.c:269
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:354
+#: src/applications/tracekit/tracekit.c:346
 #, c-format
 msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:461
+#: src/applications/tracekit/tracekit.c:443
 msgid "allows mapping of the network topology"
 msgstr ""
 
-#: src/applications/gap/gap.c:1661
+#: src/applications/gap/gap.c:1695
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/applications/gap/gap.c:1662
+#: src/applications/gap/gap.c:1696
 msgid "myself"
 msgstr "yo"
 
-#: src/applications/gap/gap.c:1844
+#: src/applications/gap/gap.c:1883
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 "Solicitada la cobertura de tráfico pero el servicio de tráfico no ha sido "
 "cargado. Rechazando la petición.\n"
 
-#: src/applications/gap/gap.c:1856 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1892 src/applications/fs/module/anonymity.c:65
 msgid "Failed to get traffic stats.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/applications/gap/gap.c:1863 src/applications/gap/gap.c:1869
-#: src/applications/gap/gap.c:1876
+#: src/applications/gap/gap.c:1902 src/applications/gap/gap.c:1910
+#: src/applications/gap/gap.c:1921
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 "Imposible satisfacer el nivel deseado de anonimato, ignorando la petición.\n"
 
-#: src/applications/gap/gap.c:2155
+#: src/applications/gap/gap.c:2183
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2156
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2157
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2158
+#: src/applications/gap/gap.c:2190
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2159
+#: src/applications/gap/gap.c:2194
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2160
+#: src/applications/gap/gap.c:2197
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2161
+#: src/applications/gap/gap.c:2199
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2162
+#: src/applications/gap/gap.c:2202
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2163
+#: src/applications/gap/gap.c:2206
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2164
+#: src/applications/gap/gap.c:2208
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2165
+#: src/applications/gap/gap.c:2211
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2166
+#: src/applications/gap/gap.c:2214
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2167
+#: src/applications/gap/gap.c:2216
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2168
+#: src/applications/gap/gap.c:2218
 msgid "# gap spurious replies (dropped)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2169
+#: src/applications/gap/gap.c:2220
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2170
+#: src/applications/gap/gap.c:2223
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2171
+#: src/applications/gap/gap.c:2227
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2172
+#: src/applications/gap/gap.c:2229
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2173
+#: src/applications/gap/gap.c:2231
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2189
+#: src/applications/gap/gap.c:2246
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2217
+#: src/applications/gap/gap.c:2269
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "'%s' registrando manejadores %d %d\n"
 
-#: src/applications/gap/pid_table.c:161
+#: src/applications/gap/pid_table.c:177
 msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:163
+#: src/applications/gap/pid_table.c:181
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:78
+#: src/applications/getoption/getoption.c:75
 #, c-format
 msgid "`%s' registering client handler %d\n"
 msgstr "'%s' registrando un manejador de clientes %d\n"
 
-#: src/applications/getoption/getoption.c:88
+#: src/applications/getoption/getoption.c:84
 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:273
-#: src/applications/fs/tools/gnunet-search.c:140
+#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-search.c:135
 #: src/applications/fs/tools/gnunet-download.c:69
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimato al enviar"
@@ -1469,7 +1457,7 @@
 "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:90
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
@@ -1477,13 +1465,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:93
 #, 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:97
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
@@ -1491,11 +1479,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:100
 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:104
 msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
@@ -1503,11 +1491,11 @@
 "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:107
 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:140
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "El espacio '%s' ha sido valorado con un %d.\n"
@@ -1517,151 +1505,151 @@
 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:171
 #, 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:212
+#: src/applications/fs/tools/gnunet-pseudonym.c:204
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Colección detenida.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:214
+#: src/applications/fs/tools/gnunet-pseudonym.c:206
 #, 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:222
+#: src/applications/fs/tools/gnunet-pseudonym.c:214
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:226
+#: src/applications/fs/tools/gnunet-pseudonym.c:219
 #, 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:243
+#: src/applications/fs/tools/gnunet-pseudonym.c:234
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:246
+#: src/applications/fs/tools/gnunet-pseudonym.c:238
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:279
 #, 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:291
+#: src/applications/fs/tools/gnunet-pseudonym.c:286
 #, 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:304
+#: src/applications/fs/tools/gnunet-pseudonym.c:301
 #, fuzzy, c-format
 msgid "You must specify a name for the collection (`%s' option).\n"
 msgstr "Debes especificar un apodo (use la opción '%s').\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:314
+#: src/applications/fs/tools/gnunet-pseudonym.c:309
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:83
+#: src/applications/fs/tools/gnunet-directory.c:84
 #, c-format
 msgid "==> Directory `%s':\n"
 msgstr "==> Directorio '%s':\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:90
+#: src/applications/fs/tools/gnunet-directory.c:87
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr "=\tError leyendo el directorio.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:125
+#: src/applications/fs/tools/gnunet-directory.c:114
 #, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:127
+#: src/applications/fs/tools/gnunet-directory.c:116
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr "%d ficheros encontrados en el directorio.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:142
+#: src/applications/fs/tools/gnunet-directory.c:131
 msgid "Perform directory related operations."
 msgstr "Realiza operaciones respecto al directorio."
 
-#: src/applications/fs/tools/gnunet-directory.c:144
+#: src/applications/fs/tools/gnunet-directory.c:134
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr ""
 "borra todas las entradas de la base de datos del directorio y detiene el "
 "seguimiento de URIs"
 
-#: src/applications/fs/tools/gnunet-directory.c:148
+#: src/applications/fs/tools/gnunet-directory.c:138
 msgid "list entries from the directory database"
 msgstr "lista las entradas de la base de datos del directorio"
 
-#: src/applications/fs/tools/gnunet-directory.c:151
+#: src/applications/fs/tools/gnunet-directory.c:141
 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:175
+#: src/applications/fs/tools/gnunet-directory.c:164
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "%d entradas encontradas.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:136
+#: src/applications/fs/tools/gnunet-insert.c:132
 #, 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:141
+#: src/applications/fs/tools/gnunet-insert.c:137
 #, 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:161
+#: src/applications/fs/tools/gnunet-insert.c:157
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:170
+#: src/applications/fs/tools/gnunet-insert.c:165
 msgid "filename"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:173
+#: src/applications/fs/tools/gnunet-insert.c:167
 msgid "mimetype"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:208
 #, 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:224
+#: src/applications/fs/tools/gnunet-insert.c:220
 #, 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:235
+#: src/applications/fs/tools/gnunet-insert.c:231
 #, 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:246
+#: src/applications/fs/tools/gnunet-insert.c:242
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr "Descarga abortada"
 
-#: src/applications/fs/tools/gnunet-insert.c:251
+#: src/applications/fs/tools/gnunet-insert.c:247
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1670,14 +1658,14 @@
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:260
+#: src/applications/fs/tools/gnunet-insert.c:256
 #, c-format
 msgid ""
 "\n"
 "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:277
+#: src/applications/fs/tools/gnunet-insert.c:272
 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"
@@ -1685,11 +1673,11 @@
 "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:281
+#: src/applications/fs/tools/gnunet-insert.c:277
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:281
 #, fuzzy
 msgid ""
 "do not use libextractor to add additional references to directory entries "
@@ -1698,7 +1686,7 @@
 "usa libextractor para añadir referencias directas adicionales a las entradas "
 "del directorio"
 
-#: src/applications/fs/tools/gnunet-insert.c:287
+#: src/applications/fs/tools/gnunet-insert.c:285
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -1706,11 +1694,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:289
+#: src/applications/fs/tools/gnunet-insert.c:287
 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:292
+#: src/applications/fs/tools/gnunet-insert.c:290
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
@@ -1718,7 +1706,7 @@
 "cambia el intervalo de disponibilidad de las actualizaciones a SEGUNDOS "
 "(para inserciones en el espacio solamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:296
+#: src/applications/fs/tools/gnunet-insert.c:295
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -1726,7 +1714,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:300
+#: src/applications/fs/tools/gnunet-insert.c:299
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -1734,11 +1722,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:305
+#: src/applications/fs/tools/gnunet-insert.c:304
 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:308
+#: src/applications/fs/tools/gnunet-insert.c:307
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -1758,13 +1746,13 @@
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
-#: src/applications/fs/tools/gnunet-insert.c:319
+#: src/applications/fs/tools/gnunet-insert.c:320
 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:322
+#: src/applications/fs/tools/gnunet-insert.c:323
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
@@ -1772,72 +1760,72 @@
 "especifica esto como una aperiódica pero actualizada publicación (para "
 "inserciones en el espacio únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:326
+#: src/applications/fs/tools/gnunet-insert.c:327
 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:330
+#: src/applications/fs/tools/gnunet-insert.c:332
 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:333
+#: src/applications/fs/tools/gnunet-insert.c:335
 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:368
+#: src/applications/fs/tools/gnunet-insert.c:371
 #, 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:427
+#: src/applications/fs/tools/gnunet-insert.c:418
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Imposible acceder al espacio '%s' (¿no existe?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:447
+#: src/applications/fs/tools/gnunet-insert.c:437
 #, c-format
 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:448
 #: src/applications/fs/tools/gnunet-insert.c:456
-#: src/applications/fs/tools/gnunet-insert.c:462
-#: src/applications/fs/tools/gnunet-insert.c:468
-#: src/applications/fs/tools/gnunet-insert.c:474
+#: src/applications/fs/tools/gnunet-insert.c:464
+#: src/applications/fs/tools/gnunet-insert.c:472
 #: src/applications/fs/tools/gnunet-insert.c:480
 #, 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:143
+#: src/applications/fs/tools/gnunet-search.c:138
 msgid "Search GNUnet for files."
 msgstr "Buscar GNUnet en busca de ficheros."
 
-#: src/applications/fs/tools/gnunet-search.c:147
+#: src/applications/fs/tools/gnunet-search.c:142
 msgid "exit after receiving LIMIT results"
 msgstr "sale después de recibir LIMIT resultados"
 
-#: src/applications/fs/tools/gnunet-search.c:150
+#: src/applications/fs/tools/gnunet-search.c:145
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "escribe los resultados encontrados (desencriptados) a FILENAME"
 
-#: src/applications/fs/tools/gnunet-search.c:153
+#: src/applications/fs/tools/gnunet-search.c:148
 #, 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:191
+#: src/applications/fs/tools/gnunet-search.c:183
 #, 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:73
+#: src/applications/fs/tools/gnunet-download.c:74
 msgid ""
 "download a GNUnet directory that has already been downloaded.  Requires that "
 "a filename of an existing file is specified instead of the URI.  The "
@@ -1845,89 +1833,89 @@
 "`-R' option is also specified."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:75
+#: src/applications/fs/tools/gnunet-download.c:76
 msgid "Download files from GNUnet."
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/applications/fs/tools/gnunet-download.c:79
+#: src/applications/fs/tools/gnunet-download.c:80
 msgid "write the file to FILENAME"
 msgstr "escribe el fichero al FICHERO"
 
-#: src/applications/fs/tools/gnunet-download.c:82
+#: src/applications/fs/tools/gnunet-download.c:84
 msgid "set the maximum number of parallel downloads that are allowed"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:85
+#: src/applications/fs/tools/gnunet-download.c:87
 msgid "download a GNUnet directory recursively"
 msgstr "descarga un directorio de GNUnet recursivamente"
 
-#: src/applications/fs/tools/gnunet-download.c:103
+#: src/applications/fs/tools/gnunet-download.c:108
 #, 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:116
+#: src/applications/fs/tools/gnunet-download.c:122
 #, fuzzy, c-format
 msgid "Download aborted.\n"
 msgstr "Descarga abortada"
 
-#: src/applications/fs/tools/gnunet-download.c:122
+#: src/applications/fs/tools/gnunet-download.c:128
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr "Error descargando: %s\n"
 
-#: src/applications/fs/tools/gnunet-download.c:128
+#: src/applications/fs/tools/gnunet-download.c:134
 #, fuzzy, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr ""
 "Descarga del fichero '%s' completada. La velocidad media fue %8.3fkilobytes "
 "por segundo.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:176
+#: src/applications/fs/tools/gnunet-download.c:178
 msgid "no name given"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:182
+#: src/applications/fs/tools/gnunet-download.c:184
 #, fuzzy, c-format
 msgid "Starting download `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:230
+#: src/applications/fs/tools/gnunet-download.c:225
 msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 msgstr ""
 "Argumentos insuficientes. Debes especificar una URI de un fichero de GNUnet\n"
 
-#: src/applications/fs/tools/gnunet-download.c:251
+#: src/applications/fs/tools/gnunet-download.c:242
 #, 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:281
+#: src/applications/fs/tools/gnunet-download.c:279
 #, fuzzy, c-format
 msgid "No filename specified, using `%s' instead (for now).\n"
 msgstr "Ningún nombre especificado para la tabla, usando '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:325
+#: src/applications/fs/tools/gnunet-download.c:320
 #, fuzzy, c-format
 msgid "Could not access gnunet-directory file `%s'\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:345
+#: src/applications/fs/tools/gnunet-download.c:338
 #, fuzzy, c-format
 msgid "Downloading %d files from directory `%s'.\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/applications/fs/tools/gnunet-download.c:349
+#: src/applications/fs/tools/gnunet-download.c:341
 #, fuzzy, c-format
 msgid "Did not find any files in directory `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/applications/fs/tools/gnunet-download.c:390
+#: src/applications/fs/tools/gnunet-download.c:377
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:57
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
@@ -1936,7 +1924,7 @@
 "%16llu de %16llu bytes desindexados (estimados %llu segundos para "
 "completar)          "
 
-#: src/applications/fs/tools/gnunet-unindex.c:68
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1946,7 +1934,7 @@
 "El desindexado de '%s' se completó, %llu bytes tomaron %llu segundos (%8.3f "
 "kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:80
+#: src/applications/fs/tools/gnunet-unindex.c:85
 #, c-format
 msgid ""
 "\n"
@@ -1955,36 +1943,36 @@
 "\n"
 "Error desindexando el fichero: %s\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:100
+#: src/applications/fs/tools/gnunet-unindex.c:105
 msgid "Unindex files."
 msgstr "Desindexar los ficheros."
 
-#: src/applications/fs/tools/gnunet-unindex.c:137
+#: src/applications/fs/tools/gnunet-unindex.c:142
 #, 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:164
+#: src/applications/fs/tools/gnunet-unindex.c:158
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s' falló.  ¿Es '%s' un fichero?\n"
 
-#: src/applications/fs/module/querymanager.c:225
+#: src/applications/fs/module/querymanager.c:228
 msgid "# FS currently tracked queries from clients"
 msgstr ""
 
-#: src/applications/fs/module/querymanager.c:227
+#: src/applications/fs/module/querymanager.c:230
 msgid "# FS replies passed to clients"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:336
+#: src/applications/fs/module/ondemand.c:323
 #, 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:434
+#: src/applications/fs/module/ondemand.c:418
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -1995,7 +1983,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:461
+#: src/applications/fs/module/ondemand.c:444
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2004,18 +1992,18 @@
 "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:518
+#: src/applications/fs/module/ondemand.c:495
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:681
+#: src/applications/fs/module/ondemand.c:647
 #, 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:1211
+#: src/applications/fs/module/fs.c:1170
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2024,47 +2012,47 @@
 "Debes especificar un número positivo para '%s' en la configuración en la "
 "sección '%s'.\n"
 
-#: src/applications/fs/module/fs.c:1224
+#: src/applications/fs/module/fs.c:1185
 msgid "# FS expired replies dropped"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1226
+#: src/applications/fs/module/fs.c:1187
 #, fuzzy
 msgid "# FS valid replies received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/applications/fs/module/fs.c:1263
+#: src/applications/fs/module/fs.c:1220
 #, 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:1303
+#: src/applications/fs/module/fs.c:1266
 msgid "enables (anonymous) file-sharing"
 msgstr "activa la compartición de ficheros anónima"
 
-#: src/applications/fs/module/migration.c:304
+#: src/applications/fs/module/migration.c:312
 msgid "# blocks migrated"
 msgstr "# blocks migrados"
 
-#: src/applications/fs/module/migration.c:306
+#: src/applications/fs/module/migration.c:314
 #, fuzzy
 msgid "# blocks fetched for migration"
 msgstr "# blocks migrados"
 
-#: src/applications/fs/module/migration.c:308
+#: src/applications/fs/module/migration.c:317
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/module/dht_push.c:137
+#: src/applications/fs/module/dht_push.c:138
 msgid "# blocks pushed into DHT"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:238
+#: src/applications/fs/fsui/search.c:234
 #, fuzzy
 msgid "Error running search (no reason given)."
 msgstr "Se produjo un fallo al comenzar la búsqueda. Consulte los logs.\n"
 
-#: src/applications/fs/fsui/download.c:308
+#: src/applications/fs/fsui/download.c:294
 #, fuzzy
 msgid "Download failed (no reason given)"
 msgstr "La descarga del ERCS falló (vea los logs)."
@@ -2073,37 +2061,37 @@
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:281
+#: src/applications/fs/fsui/upload.c:278
 #, 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/deserialize.c:754
+#: src/applications/fs/fsui/deserialize.c:757
 #, 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/ecrs/search.c:167
+#: src/applications/fs/ecrs/search.c:168
 msgid "CHK URI not allowed for search.\n"
 msgstr "CHK URI no autorizado para buscar.\n"
 
-#: src/applications/fs/ecrs/search.c:226
+#: src/applications/fs/ecrs/search.c:214
 msgid "LOC URI not allowed for search.\n"
 msgstr "LOC URI no autorizado para buscar.\n"
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/fs/ecrs/download.c:131
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "Imposible desenlazar temporalmente el fichero '%s': %s\n"
 
-#: src/applications/fs/ecrs/download.c:270
+#: src/applications/fs/ecrs/download.c:271
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Escribiendo(%d, %p, %d) se produjo un fallo: %s\n"
 
-#: src/applications/fs/ecrs/download.c:1043
+#: src/applications/fs/ecrs/download.c:1001
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2111,7 +2099,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:1229
+#: src/applications/fs/ecrs/download.c:1184
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -2119,53 +2107,53 @@
 "El contenido '%s' parece no estar disponible en la red (intentado %u "
 "veces).\n"
 
-#: src/applications/fs/ecrs/upload.c:164
+#: src/applications/fs/ecrs/upload.c:155
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "'%s' no es un fichero.\n"
 
-#: src/applications/fs/ecrs/upload.c:174
+#: src/applications/fs/ecrs/upload.c:162
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Imposible determinar el tamaño del fichero '%s'"
 
-#: src/applications/fs/ecrs/upload.c:183
+#: src/applications/fs/ecrs/upload.c:171
 msgid "Failed to connect to gnunetd."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/applications/fs/ecrs/upload.c:195
+#: src/applications/fs/ecrs/upload.c:183
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Imposible hallar el hash de '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:214
+#: src/applications/fs/ecrs/upload.c:202
 #, 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:221
+#: src/applications/fs/ecrs/upload.c:209
 #, 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:236
+#: src/applications/fs/ecrs/upload.c:223
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Imposible abrir el fichero de configuración '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:316
+#: src/applications/fs/ecrs/upload.c:296
 #, 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:854
+#: src/applications/fs/ecrs/meta.c:876
 #, 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:862
+#: src/applications/fs/ecrs/meta.c:884
 #, 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"
@@ -2175,35 +2163,35 @@
 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:343
-#: src/applications/fs/ecrs/namespace.c:426
-#: src/applications/fs/ecrs/namespace.c:585
+#: src/applications/fs/ecrs/namespace.c:325
+#: src/applications/fs/ecrs/namespace.c:404
+#: src/applications/fs/ecrs/namespace.c:545
 #, 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:355
-#: src/applications/fs/ecrs/namespace.c:437
+#: src/applications/fs/ecrs/namespace.c:337
+#: src/applications/fs/ecrs/namespace.c:415
 #, 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:599
-#: src/applications/fs/ecrs/namespace.c:610
+#: src/applications/fs/ecrs/namespace.c:556
+#: src/applications/fs/ecrs/namespace.c:567
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
 
-#: src/applications/fs/ecrs/helper.c:67
+#: src/applications/fs/ecrs/helper.c:74
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna clave especificada!\n"
 
-#: 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
+#: src/applications/fs/ecrs/helper.c:127 src/applications/fs/ecrs/helper.c:129
+#: src/applications/fs/ecrs/helper.c:133 src/applications/fs/ecrs/helper.c:138
 msgid "AND"
 msgstr "Y"
 
-#: src/applications/fs/ecrs/parser.c:122
+#: src/applications/fs/ecrs/parser.c:120
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2212,20 +2200,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:131
+#: src/applications/fs/uritrack/file_info.c:126
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Recolección de identificadores de fichero desactivada.\n"
 
-#: src/applications/fs/uritrack/file_info.c:402
+#: src/applications/fs/uritrack/file_info.c:395
 #, 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:727
+#: src/applications/fs/namespace/namespace_info.c:655
 msgid "Publication interval for periodic publication changed."
 msgstr "Intervalo de publicación periódica cambiado."
 
-#: src/applications/fs/namespace/namespace_info.c:748
+#: src/applications/fs/namespace/namespace_info.c:675
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -2233,25 +2221,25 @@
 "publicaciones actualizadas para contenido actualizado periódicamente más de "
 "una semana antes de la tarea planificada.\n"
 
-#: src/applications/topology_f2f/topology.c:382
+#: src/applications/topology_f2f/topology.c:373
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:400
+#: src/applications/topology_f2f/topology.c:390
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:413
+#: src/applications/topology_f2f/topology.c:404
 #, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:519
+#: src/applications/topology_f2f/topology.c:511
 msgid "maintains a friend-to-friend restricted topology"
 msgstr ""
 
-#: src/applications/template/template.c:62
+#: src/applications/template/template.c:68
 #, c-format
 msgid "`%s' registering client handler %d and %d\n"
 msgstr "'%s' registrando manejador de clientes %d y %d\n"
@@ -2260,51 +2248,51 @@
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:105
+#: src/applications/bootstrap_http/http.c:102
 #, 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:176
+#: src/applications/bootstrap_http/http.c:170
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:211
+#: src/applications/bootstrap_http/http.c:210
 #, c-format
 msgid "Bootstrapping using `%s'.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:237
+#: src/applications/bootstrap_http/http.c:224
 #, c-format
 msgid "Trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:388
+#: src/applications/bootstrap_http/http.c:352
 #, fuzzy, c-format
 msgid "Downloaded %llu bytes from `%s'.\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/applications/bootstrap_http/http.c:421
+#: src/applications/bootstrap_http/http.c:385
 #, fuzzy
 msgid "# HELLOs downloaded via http"
 msgstr "# saludos descargados vía HTTP"
 
-#: src/applications/traffic/traffic.c:441
+#: src/applications/traffic/traffic.c:454
 #, c-format
 msgid "# bytes transmitted of type %d"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:459
+#: src/applications/traffic/traffic.c:470
 #, c-format
 msgid "# bytes received of type %d"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:478
+#: src/applications/traffic/traffic.c:489
 #, fuzzy, c-format
 msgid "# bytes received in plaintext of type %d"
 msgstr "# bytes recibidos por TCP"
 
-#: src/applications/traffic/traffic.c:639
+#: src/applications/traffic/traffic.c:644
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -2312,385 +2300,385 @@
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:326
+#: src/applications/vpn/vpn.c:366
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:334
+#: src/applications/vpn/vpn.c:377
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:362
+#: src/applications/vpn/vpn.c:410
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:411
+#: src/applications/vpn/vpn.c:466
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:415
+#: src/applications/vpn/vpn.c:472
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:425
+#: src/applications/vpn/vpn.c:488
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:485
+#: src/applications/vpn/vpn.c:556
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:489
+#: src/applications/vpn/vpn.c:562
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:518
+#: src/applications/vpn/vpn.c:594
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:526
+#: src/applications/vpn/vpn.c:606
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:530
+#: src/applications/vpn/vpn.c:614
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:568
+#: src/applications/vpn/vpn.c:655
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:572
+#: src/applications/vpn/vpn.c:664
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:579
+#: src/applications/vpn/vpn.c:674
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:584
+#: src/applications/vpn/vpn.c:682
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:592
+#: src/applications/vpn/vpn.c:694
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:604
+#: src/applications/vpn/vpn.c:707
 #, 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:615
+#: src/applications/vpn/vpn.c:721
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:627
+#: src/applications/vpn/vpn.c:733
 #, 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:660
+#: src/applications/vpn/vpn.c:774
 msgid ""
 "RFC4193 We have run out of memory and so I can't store a tunnel for this "
 "peer.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:706
+#: src/applications/vpn/vpn.c:822
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:769
+#: src/applications/vpn/vpn.c:895
 #, c-format
 msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:773
+#: src/applications/vpn/vpn.c:902
 #, c-format
 msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:791
+#: src/applications/vpn/vpn.c:921
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:831
+#: src/applications/vpn/vpn.c:968
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:835
+#: src/applications/vpn/vpn.c:974
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:841
+#: src/applications/vpn/vpn.c:981
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:844
+#: src/applications/vpn/vpn.c:985
 #, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:996
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:873
+#: src/applications/vpn/vpn.c:1022
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:894
+#: src/applications/vpn/vpn.c:1043
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:899
+#: src/applications/vpn/vpn.c:1050
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:910
+#: src/applications/vpn/vpn.c:1065
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:916
+#: src/applications/vpn/vpn.c:1071
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:932
+#: src/applications/vpn/vpn.c:1088
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:936
+#: src/applications/vpn/vpn.c:1094
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:940
+#: src/applications/vpn/vpn.c:1100
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:954
+#: src/applications/vpn/vpn.c:1119
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:969
+#: src/applications/vpn/vpn.c:1137
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:997
+#: src/applications/vpn/vpn.c:1168
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1012
+#: src/applications/vpn/vpn.c:1188
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1057
+#: src/applications/vpn/vpn.c:1239
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1103
+#: src/applications/vpn/vpn.c:1292
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1129
+#: src/applications/vpn/vpn.c:1324
 msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1190 src/setup/ncurses/wizard_curs.c:105
+#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:95
 msgid "Yes"
 msgstr "Sí"
 
-#: src/applications/vpn/vpn.c:1190 src/setup/ncurses/wizard_curs.c:104
+#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:94
 msgid "No"
 msgstr "No"
 
-#: src/applications/vpn/vpn.c:1398
+#: src/applications/vpn/vpn.c:1647
 #, 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:1399
+#: src/applications/vpn/vpn.c:1650
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1449
+#: src/applications/vpn/vpn.c:1723
 #, fuzzy
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr "Activa el chat P2P (incompleto)"
 
-#: src/applications/vpn/vpn.c:1481
+#: src/applications/vpn/vpn.c:1757
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1494
+#: src/applications/vpn/vpn.c:1771
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1509
+#: src/applications/vpn/vpn.c:1788
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/dstore/dstore.c:555
+#: src/applications/dstore/dstore.c:466
 #, fuzzy
 msgid "# bytes in dstore"
 msgstr "# bytes en la base de datos"
 
-#: src/server/gnunet-update.c:143
+#: src/server/gnunet-update.c:147
 #, c-format
 msgid "Updating data for module `%s'\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/server/gnunet-update.c:148
+#: src/server/gnunet-update.c:151
 #, 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:196 src/server/gnunetd.c:144
+#: src/server/gnunet-update.c:198 src/server/gnunetd.c:136
 #, fuzzy
 msgid "Core initialization failed.\n"
 msgstr "Conexión fallida\n"
 
-#: src/server/gnunet-update.c:237
+#: src/server/gnunet-update.c:239
 #, fuzzy
 msgid "print a value from the configuration file to stdout"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/server/gnunet-update.c:239
+#: src/server/gnunet-update.c:241
 msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:401
+#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:365
 msgid "run as user LOGIN"
 msgstr "ejecuta como el usuario LOGIN"
 
-#: src/server/gnunet-update.c:246
+#: src/server/gnunet-update.c:249
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
-#: src/server/connection.c:1116
+#: src/server/connection.c:1188
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/server/connection.c:1125
+#: src/server/connection.c:1197
 #, 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:2594
+#: src/server/connection.c:2744
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Mensaje de '%s' descartado: formato inválido.\n"
 
-#: src/server/connection.c:2679
+#: src/server/connection.c:2829
 #, 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:2698
+#: src/server/connection.c:2851
 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:3154
+#: src/server/connection.c:3337
 msgid "# outgoing messages dropped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/server/connection.c:3158
+#: src/server/connection.c:3340
 msgid "# bytes of outgoing messages dropped"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/server/connection.c:3160
+#: src/server/connection.c:3342
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3163
+#: src/server/connection.c:3345
 msgid "# bytes encrypted"
 msgstr "# bytes encriptados"
 
-#: src/server/connection.c:3167
+#: src/server/connection.c:3349
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:3171
+#: src/server/connection.c:3353
 #, fuzzy
 msgid "# bytes received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/server/connection.c:3174
+#: src/server/connection.c:3355
 msgid "# bytes decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:3176
+#: src/server/connection.c:3356
 msgid "# bytes noise sent"
 msgstr "# \"bytes-ruido\" mandados"
 
-#: src/server/connection.c:3178
+#: src/server/connection.c:3359
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3180
+#: src/server/connection.c:3362
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "# bytes de ruido recibidos"
 
-#: src/server/connection.c:3182
+#: src/server/connection.c:3365
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "número de mensajes en un bloque de mensajes"
 
-#: src/server/connection.c:3184
+#: src/server/connection.c:3369
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3186
+#: src/server/connection.c:3373
 #, fuzzy
 msgid "# total number of bytes we were allowed to sent"
 msgstr "número de mensajes en un bloque de mensajes"
 
-#: src/server/connection.c:3188
+#: src/server/connection.c:3377
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
-#: src/server/startup.c:207
+#: src/server/startup.c:206
 #, fuzzy, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
 msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
 
-#: src/server/startup.c:224
+#: src/server/startup.c:223
 #, c-format
 msgid ""
 "Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
 "address@hidden"
 msgstr ""
 
-#: src/server/startup.c:238
+#: src/server/startup.c:237
 #, c-format
 msgid ""
 "Limiting datastore size to %llu GB, because the `%s' filesystem does not "
@@ -2698,12 +2686,12 @@
 "partition!\n"
 msgstr ""
 
-#: src/server/startup.c:285
+#: src/server/startup.c:274
 #, c-format
 msgid "Insufficient access permissions for `%s': %s\n"
 msgstr ""
 
-#: src/server/gnunetd.c:84
+#: src/server/gnunetd.c:85
 #, c-format
 msgid "`%s' startup complete.\n"
 msgstr "'%s' comienzo completo.\n"
@@ -2713,7 +2701,7 @@
 msgid "`%s' is shutting down.\n"
 msgstr "'%s' se esta cerrando.\n"
 
-#: src/server/gnunetd.c:206
+#: src/server/gnunetd.c:192
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
@@ -2721,95 +2709,95 @@
 "se ejecuta en modo de depuración; gnunetd no sera un demonio y los mensajes "
 "de error serán escritos a través de stderr en vez de en un fichero de log"
 
-#: src/server/gnunetd.c:210
+#: src/server/gnunetd.c:196
 msgid "Starts the gnunetd daemon."
 msgstr "Arranca el demonio de gnunetd."
 
-#: src/server/gnunetd.c:213
+#: src/server/gnunetd.c:199
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:216
+#: src/server/gnunetd.c:203
 msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:220
+#: src/server/gnunetd.c:207
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "especifica el host en el que gnunetd esta ejecutandose"
 
-#: src/server/gnunetd.c:288
+#: src/server/gnunetd.c:271
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/server/core.c:124
+#: src/server/core.c:126
 #, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr "¡El módulo de la aplicación '%s' ya esta inicializado!\n"
 
-#: src/server/core.c:174
+#: src/server/core.c:177
 #, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
 
-#: src/server/core.c:217
+#: src/server/core.c:226
 #, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr "Imposible apagar '%s': aplicación no cargada\n"
 
-#: src/server/core.c:225
+#: src/server/core.c:234
 #, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr "Imposible apagar la aplicación '%s': no inicializada\n"
 
-#: src/server/core.c:235
+#: src/server/core.c:243
 #, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr "Imposible encontrar el método '%s%s' en la biblioteca '%s'.\n"
 
-#: src/server/core.c:374
+#: src/server/core.c:386
 #, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr ""
 
-#: src/server/core.c:470
+#: src/server/core.c:492
 #, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "Imposible apagar la aplicación '%s' adecuadamente.\n"
 
-#: src/server/core.c:598
+#: src/server/core.c:628
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/server/gnunet-transport-check.c:118
+#: src/server/gnunet-transport-check.c:121
 #, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "'%s': Imposible crear saludo.\n"
 
-#: src/server/gnunet-transport-check.c:127
+#: src/server/gnunet-transport-check.c:128
 #, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "'%s': Imposible conectar.\n"
 
-#: src/server/gnunet-transport-check.c:161
+#: src/server/gnunet-transport-check.c:157
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr "'%s': Imposible mandar.\n"
 
-#: src/server/gnunet-transport-check.c:183
+#: src/server/gnunet-transport-check.c:172
 #, 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:197
+#: src/server/gnunet-transport-check.c:185
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "'%s': Imposible desconectar.\n"
 
-#: src/server/gnunet-transport-check.c:204
+#: src/server/gnunet-transport-check.c:192
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -2817,12 +2805,12 @@
 msgstr ""
 "Transporte '%s' OK. Tomó %ums transmitir %d mensajes de %d bytes cada uno.\n"
 
-#: src/server/gnunet-transport-check.c:232
+#: src/server/gnunet-transport-check.c:222
 #, 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:265
+#: src/server/gnunet-transport-check.c:251
 #, c-format
 msgid ""
 "\n"
@@ -2831,100 +2819,100 @@
 "\n"
 "Contactando '%s'."
 
-#: src/server/gnunet-transport-check.c:291
+#: src/server/gnunet-transport-check.c:276
 #, c-format
 msgid " Connection failed\n"
 msgstr "Conexión fallida\n"
 
-#: src/server/gnunet-transport-check.c:297
+#: src/server/gnunet-transport-check.c:282
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr "Conexión fallida (¿bug?)\n"
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:319
 #, c-format
 msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-transport-check.c:321
 #, fuzzy, c-format
 msgid "OK!\n"
 msgstr "OK"
 
-#: src/server/gnunet-transport-check.c:382
+#: src/server/gnunet-transport-check.c:346
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:386
+#: src/server/gnunet-transport-check.c:350
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:389
+#: src/server/gnunet-transport-check.c:353
 msgid "send COUNT messages"
 msgstr "envia COUNT mensajes"
 
-#: src/server/gnunet-transport-check.c:392
+#: src/server/gnunet-transport-check.c:356
 msgid "send messages with SIZE bytes payload"
 msgstr "manda mensajes con SIZE bytes payload"
 
-#: src/server/gnunet-transport-check.c:395
+#: src/server/gnunet-transport-check.c:359
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:398
+#: src/server/gnunet-transport-check.c:362
 msgid "specifies after how many MS to time-out"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:406
+#: src/server/gnunet-transport-check.c:370
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:471
+#: src/server/gnunet-transport-check.c:431
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/server/gnunet-transport-check.c:474
+#: src/server/gnunet-transport-check.c:433
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/server/gnunet-transport-check.c:539
+#: src/server/gnunet-transport-check.c:474
 #, c-format
 msgid ""
 "\n"
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
-#: src/server/tcpserver.c:105
+#: src/server/tcpserver.c:109
 #, c-format
 msgid "The `%s' request received from client is malformed.\n"
 msgstr "La petición '%s' recibida del cliente esta mal formada.\n"
 
-#: src/server/tcpserver.c:333
+#: src/server/tcpserver.c:324
 #, fuzzy, c-format
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/server/tcpserver.c:414
+#: src/server/tcpserver.c:398
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:466
+#: src/server/tcpserver.c:454
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%s falló, el mensaje del tipo %d ya está en uso.\n"
 
-#: src/server/handler.c:401
+#: src/server/handler.c:428
 #, c-format
 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:152
+#: src/server/version.c:141
 msgid ""
 "Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
@@ -2937,129 +2925,129 @@
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:129 src/server/gnunet-peer-info.c:159
+#: src/server/gnunet-peer-info.c:122 src/server/gnunet-peer-info.c:153
 #, 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:139
+#: src/server/gnunet-peer-info.c:133
 msgid "hello message invalid (signature invalid).\n"
 msgstr "mensaje de saludo inválido (firma no válida).\n"
 
-#: src/server/gnunet-peer-info.c:161
+#: src/server/gnunet-peer-info.c:154
 #, fuzzy, c-format
 msgid "Peer `%s' with trust %8u\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/server/gnunet-peer-info.c:166
+#: src/server/gnunet-peer-info.c:158
 #, 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/boot/startup.c:212
+#: src/util/boot/startup.c:199
 #, fuzzy, c-format
 msgid "Failed to run %s: %s %d\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/network_client/tcpio.c:94 src/util/network_client/tcpio.c:135
+#: src/util/network_client/tcpio.c:96 src/util/network_client/tcpio.c:140
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:106
+#: src/util/network_client/tcpio.c:111
 #, fuzzy, c-format
 msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/util/network_client/tcpio.c:280
+#: src/util/network_client/tcpio.c:290
 #, 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:323
+#: src/util/network_client/tcpio.c:327
 #, fuzzy, c-format
 msgid "Error connecting to %s:%u\n"
 msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/network_client/tcpio.c:336
+#: src/util/network_client/tcpio.c:338
 #, fuzzy, c-format
 msgid "Failed to connect to %s:%u in %ds\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/network_client/tcpio.c:492
+#: src/util/network_client/tcpio.c:494
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "¡'%s' falló, respuesta no válida!\n"
 
-#: src/util/crypto/hostkey_gcrypt.c:1036
+#: src/util/crypto/hostkey_gcrypt.c:898
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/util/crypto/locking_gcrypt.c:74
+#: src/util/crypto/locking_gcrypt.c:80
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 "libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/os/statuscalls.c:186 src/util/os/statuscalls.c:323
+#: src/util/os/statuscalls.c:196 src/util/os/statuscalls.c:337
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/util/os/statuscalls.c:368 src/util/os/statuscalls.c:377
+#: src/util/os/statuscalls.c:380 src/util/os/statuscalls.c:390
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
 msgstr ""
 
-#: src/util/os/semaphore.c:219
+#: src/util/os/semaphore.c:218
 #, c-format
 msgid "Can't create semaphore: %i"
 msgstr "Imposible crear un semáforo: %i"
 
-#: src/util/os/osconfig.c:121
+#: src/util/os/osconfig.c:124
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:379
+#: src/util/os/osconfig.c:391
 #, fuzzy, c-format
 msgid "Command `%s' failed with error code %u\n"
 msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/util/os/dso.c:56
+#: src/util/os/dso.c:59
 #, 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:110
+#: src/util/os/dso.c:119
 #, 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:152
+#: src/util/os/dso.c:159
 #, 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"
 
-#: src/util/os/cpustatus.c:426
+#: src/util/os/cpustatus.c:461
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr ""
 
-#: src/util/os/cpustatus.c:446
+#: src/util/os/cpustatus.c:483
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr ""
 
-#: src/util/os/user.c:128 src/util/os/user.c:169
+#: src/util/os/user.c:134 src/util/os/user.c:176
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
 
-#: src/util/os/user.c:130
+#: src/util/os/user.c:135
 msgid "No such user"
 msgstr ""
 
-#: src/util/os/user.c:143
+#: src/util/os/user.c:149
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
@@ -3069,53 +3057,55 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Respuesta inválida a '%s'.\n"
 
-#: src/util/network/select.c:315
+#: src/util/network/select.c:304
 #, 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:482
-msgid "select listen socket not valid!\n"
+#: src/util/network/select.c:473
+#, c-format
+msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
-#: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
+#: src/util/network/ipcheck.c:105 src/util/network/ipcheck.c:133
+#: src/util/network/ipcheck.c:180 src/util/network/ipcheck.c:204
+#: src/util/network/ipcheck.c:212
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: '%s'\n"
 
-#: src/util/network/ipcheck.c:156
+#: src/util/network/ipcheck.c:162
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida ('/%d' no es válido en IPv4 CIDR)."
 
-#: src/util/network/ipcheck.c:217
+#: src/util/network/ipcheck.c:259
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con ';': '%s')\n"
 
-#: src/util/network/ipcheck.c:250
+#: src/util/network/ipcheck.c:291
 #, c-format
 msgid "Wrong format `%s' for netmask: %s\n"
 msgstr "Formato '%s' erróneo para la máscara de red: %s\n"
 
-#: src/util/network/ipcheck.c:265
+#: src/util/network/ipcheck.c:304
 #, c-format
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Formato '%s' erróneo para la red: %s\n"
 
-#: src/util/network/ip.c:202
+#: src/util/network/ip.c:195
 #, fuzzy, c-format
 msgid ""
 "Could not find interface `%s' using `%s', trying to find another interface.\n"
 msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
 
-#: src/util/network/ip.c:278
+#: src/util/network/ip.c:268
 #, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr "Imposible obtener la dirección IP para la interfaz '%s'.\n"
 
-#: src/util/network/ip.c:288
+#: src/util/network/ip.c:277
 #, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
@@ -3124,131 +3114,131 @@
 "Hay más de una dirección IP especificada para la interfaz '%s'.\n"
 "GNUnet usará %u.%u.%u.%u.\n"
 
-#: src/util/network/ip.c:309
+#: src/util/network/ip.c:297
 #, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr "Imposible resolver '%s' para determinar nuestra dirección IP: %s\n"
 
-#: src/util/network/ip.c:341
+#: src/util/network/ip.c:326
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr "GNUnet usa ahora la dirección IP %u.%u.%u.%u.\n"
 
-#: src/util/disk/storage.c:202
+#: src/util/disk/storage.c:198
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/disk/storage.c:531
+#: src/util/disk/storage.c:526
 #, 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:289
+#: src/util/config_impl/impl.c:290
 #, 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:532
+#: src/util/config_impl/impl.c:533
 #, c-format
 msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:578
+#: src/util/config_impl/impl.c:579
 #, 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:590
+#: src/util/config_impl/impl.c:589
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:680
+#: src/util/config_impl/impl.c:672
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:122
+#: src/util/error/error.c:115
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:190 src/util/error/error.c:234
+#: src/util/error/error.c:187 src/util/error/error.c:222
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/error/error.c:193 src/util/error/error.c:236
+#: src/util/error/error.c:189 src/util/error/error.c:224
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:196 src/util/error/error.c:240
+#: src/util/error/error.c:191 src/util/error/error.c:228
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/error/error.c:199 src/util/error/error.c:242
+#: src/util/error/error.c:193 src/util/error/error.c:230
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/error/error.c:202 src/util/error/error.c:244
+#: src/util/error/error.c:195 src/util/error/error.c:232
 msgid "FATAL"
 msgstr "FATAL"
 
-#: src/util/error/error.c:205 src/util/error/error.c:246
+#: src/util/error/error.c:197 src/util/error/error.c:234
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:208 src/util/error/error.c:248
+#: src/util/error/error.c:199 src/util/error/error.c:236
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:211 src/util/error/error.c:250
+#: src/util/error/error.c:201 src/util/error/error.c:238
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:214 src/util/error/error.c:252
+#: src/util/error/error.c:203 src/util/error/error.c:240
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:217 src/util/error/error.c:254
+#: src/util/error/error.c:205 src/util/error/error.c:242
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:220 src/util/error/error.c:256
+#: src/util/error/error.c:207 src/util/error/error.c:244
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:223
+#: src/util/error/error.c:209
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:238
+#: src/util/error/error.c:226
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/error/error.c:257
+#: src/util/error/error.c:245
 msgid "NOTHING"
 msgstr "NADA"
 
-#: src/util/threads/mutex.c:145 src/util/threads/semaphore.c:174
-#: src/util/threads/pthread.c:150
+#: src/util/threads/mutex.c:144 src/util/threads/semaphore.c:166
+#: src/util/threads/pthread.c:154
 #, c-format
 msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:154 src/util/threads/mutex.c:194
+#: src/util/threads/mutex.c:152 src/util/threads/mutex.c:194
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/util/threads/mutex.c:159
+#: src/util/threads/mutex.c:156
 #, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr ""
@@ -3258,90 +3248,102 @@
 msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:199
+#: src/util/threads/mutex.c:198
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/util/threads/pthread.c:162 src/util/threads/pthread.c:170
-#: src/util/threads/pthread.c:177 src/util/threads/pthread.c:270
+#: src/util/threads/pthread.c:165 src/util/threads/pthread.c:171
+#: src/util/threads/pthread.c:176 src/util/threads/pthread.c:264
 #, 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:184 src/util/threads/pthread.c:281
+#: src/util/threads/pthread.c:181 src/util/threads/pthread.c:273
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/util/loggers/file.c:231
+#: src/util/loggers/file.c:229
 #, fuzzy, c-format
 msgid "Failed to open log-file `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/util/loggers/file.c:256
+#: src/util/loggers/file.c:248
 msgid "GNUnet error log"
 msgstr ""
 
-#: src/util/loggers/memory.c:71
+#: src/util/loggers/file.c:265 src/util/loggers/file.c:282
+#: src/include/gnunet_util_error.h:243 src/include/gnunet_util_error.h:250
+#: src/include/gnunet_util_error.h:257 src/include/gnunet_util_error.h:264
+#, 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/util/loggers/memory.c:70
 msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:681
+#: src/util/getopt/getopt.c:684
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/util/getopt/getopt.c:705
+#: src/util/getopt/getopt.c:710
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: la opción '--%s' no permite un argumento\n"
 
-#: src/util/getopt/getopt.c:710
+#: src/util/getopt/getopt.c:716
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: la opción '%c%s' no permite un argumento\n"
 
-#: src/util/getopt/getopt.c:727 src/util/getopt/getopt.c:901
+#: src/util/getopt/getopt.c:737 src/util/getopt/getopt.c:909
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción '%s' requiere un argumento\n"
 
-#: src/util/getopt/getopt.c:757
+#: src/util/getopt/getopt.c:767
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción no reconocida '--%s'\n"
 
-#: src/util/getopt/getopt.c:761
+#: src/util/getopt/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción no reconocida '%c%s'\n"
 
-#: src/util/getopt/getopt.c:787
+#: src/util/getopt/getopt.c:797
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción ilegal -- %c\n"
 
-#: src/util/getopt/getopt.c:790
+#: src/util/getopt/getopt.c:799
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción no válida -- %c\n"
 
-#: src/util/getopt/getopt.c:820 src/util/getopt/getopt.c:950
+#: src/util/getopt/getopt.c:828 src/util/getopt/getopt.c:958
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción requiere un argumento --%c\n"
 
-#: src/util/getopt/getopt.c:867
+#: src/util/getopt/getopt.c:876
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción '-W %s' es ambigua\n"
 
-#: src/util/getopt/getopt.c:885
+#: src/util/getopt/getopt.c:894
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: la opción '-W %s' no permite un argumento\n"
 
+#: src/util/getopt/getopt.c:1071 src/setup/gnunet-setup.c:273
+#, c-format
+msgid "Use --help to get a list of options.\n"
+msgstr "Usar --help para obtener una lista de opciones.\n"
+
 #: src/util/getopt/setoption.c:58
 #, c-format
 msgid ""
@@ -3349,18 +3351,18 @@
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
+#: src/util/getopt/setoption.c:136 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
+#: src/util/getopt/printhelp.c:49
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/string/string.c:121
+#: src/util/string/string.c:120
 msgid "ms"
 msgstr "ms"
 
@@ -3368,202 +3370,202 @@
 msgid "s"
 msgstr "s"
 
-#: src/util/string/string.c:129
+#: src/util/string/string.c:130
 msgid "m"
 msgstr "m"
 
-#: src/util/string/string.c:132
+#: src/util/string/string.c:134
 msgid "h"
 msgstr "h"
 
-#: src/util/string/string.c:135
+#: src/util/string/string.c:138
 msgid " days"
 msgstr " días"
 
-#: src/util/string/string.c:153
+#: src/util/string/string.c:154
 msgid "b"
 msgstr "b"
 
-#: src/util/string/string.c:158
+#: src/util/string/string.c:160
 msgid "KiB"
 msgstr "KiB"
 
-#: src/util/string/string.c:161
+#: src/util/string/string.c:164
 msgid "MiB"
 msgstr "MiB"
 
-#: src/util/string/string.c:164
+#: src/util/string/string.c:168
 msgid "GiB"
 msgstr "GiB"
 
-#: src/util/string/string.c:167
+#: src/util/string/string.c:172
 #, fuzzy
 msgid "TiB"
 msgstr "KiB"
 
-#: src/util/string/string.c:287
+#: src/util/string/string.c:284
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:60
+#: src/setup/gnunet-setup.c:59
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr "genera configuración para gnunetd, el demonio de GNUnet"
 
-#: src/setup/gnunet-setup.c:62
+#: src/setup/gnunet-setup.c:61
 msgid "Tool to setup GNUnet."
 msgstr "Herramienta de configuración de GNUnet."
 
-#: src/setup/gnunet-setup.c:188
+#: src/setup/gnunet-setup.c:176
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Argumentos en la linea de comandos inválidos.\n"
 
-#: src/setup/gnunet-setup.c:193
+#: src/setup/gnunet-setup.c:181
 msgid "No interface specified, using default\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/setup/gnunet-setup.c:268
+#: src/setup/gnunet-setup.c:255
 #, c-format
 msgid "`%s' is not available."
 msgstr "'%s' no esta disponible."
 
-#: src/setup/gnunet-setup.c:284
+#: src/setup/gnunet-setup.c:272
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/setup/gnunet-win-tool.c:54
+#: src/setup/gnunet-win-tool.c:55
 msgid "list all network adapters"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:57
+#: src/setup/gnunet-win-tool.c:58
 msgid "install GNUnet as Windows service"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:60
+#: src/setup/gnunet-win-tool.c:61
 msgid "uninstall GNUnet service"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:63
+#: src/setup/gnunet-win-tool.c:64
 msgid "increase the maximum number of TCP/IP connections"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:66
+#: src/setup/gnunet-win-tool.c:67
 msgid "display a file's hash value"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:121
+#: src/setup/gnunet-win-tool.c:126
 #, c-format
 msgid "GNUnet service installed successfully.\n"
 msgstr "Servicio de GNUnet instalado satisfactoriamente.\n"
 
-#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:151
+#: src/setup/gnunet-win-tool.c:129 src/setup/gnunet-win-tool.c:157
 #, c-format
 msgid "This version of Windows doesn't support services.\n"
 msgstr "Esta versión de Windows no soporta servicios.\n"
 
-#: src/setup/gnunet-win-tool.c:128 src/setup/gnunet-win-tool.c:155
+#: src/setup/gnunet-win-tool.c:133 src/setup/gnunet-win-tool.c:161
 #, fuzzy, c-format
 msgid "Error: can't open Service Control Manager: %s\n"
 msgstr "Error: imposible abrir el Service Control Manager: &s\n"
 
-#: src/setup/gnunet-win-tool.c:133
+#: src/setup/gnunet-win-tool.c:138
 #, c-format
 msgid "Error: can't create service: %s\n"
 msgstr "Error: imposible crear el servicio: %s\n"
 
-#: src/setup/gnunet-win-tool.c:136 src/setup/gnunet-win-tool.c:167
+#: src/setup/gnunet-win-tool.c:141 src/setup/gnunet-win-tool.c:173
 #, c-format
 msgid "Unknown error.\n"
 msgstr "Error desconocido.\n"
 
-#: src/setup/gnunet-win-tool.c:148
+#: src/setup/gnunet-win-tool.c:154
 #, c-format
 msgid "Service deleted.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/setup/gnunet-win-tool.c:160
+#: src/setup/gnunet-win-tool.c:166
 #, c-format
 msgid "Error: can't access service: %s\n"
 msgstr "Error: imposible acceder al servicio: %s\n"
 
-#: src/setup/gnunet-win-tool.c:164
+#: src/setup/gnunet-win-tool.c:170
 #, c-format
 msgid "Error: can't delete service: %s\n"
 msgstr "Error: imposible borrar el servicio: %s\n"
 
-#: src/setup/gtk/gconf.c:430
+#: src/setup/gtk/gconf.c:387
 #, fuzzy
 msgid "Description"
 msgstr "Pregunta"
 
-#: src/setup/gtk/gconf.c:448
+#: src/setup/gtk/gconf.c:403
 msgid "Value"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:469
+#: src/setup/gtk/gconf.c:427
 msgid "Default"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:483 src/setup/ncurses/wizard_curs.c:77
+#: src/setup/gtk/gconf.c:442 src/setup/ncurses/wizard_curs.c:73
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/setup/gtk/gconf.c:497
+#: src/setup/gtk/gconf.c:456
 #, fuzzy
 msgid "Section"
 msgstr "Pregunta"
 
-#: src/setup/gtk/gconf.c:509
+#: src/setup/gtk/gconf.c:467
 #, fuzzy
 msgid "Option"
 msgstr "_Opciones"
 
-#: src/setup/gtk/gconf.c:531
+#: src/setup/gtk/gconf.c:490
 #, fuzzy
 msgid "Configuration saved."
 msgstr "Configuración de GNUnet"
 
-#: src/setup/gtk/gconf.c:539
+#: src/setup/gtk/gconf.c:500
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "Imposible guardar la configuración"
 
-#: src/setup/gtk/gconf.c:562
+#: src/setup/gtk/gconf.c:526
 #, fuzzy
 msgid "Configuration changed. Save?"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/setup/gtk/gconf.c:573
+#: src/setup/gtk/gconf.c:539
 #, fuzzy
 msgid "Error saving configuration."
 msgstr "Imposible guardar la configuración"
 
-#: src/setup/gtk/wizard_gtk.c:145
+#: src/setup/gtk/wizard_gtk.c:144
 #, fuzzy
 msgid "(unknown connection)"
 msgstr "Conexión de red"
 
-#: src/setup/gtk/wizard_gtk.c:428 src/setup/ncurses/wizard_curs.c:466
+#: src/setup/gtk/wizard_gtk.c:413 src/setup/ncurses/wizard_curs.c:453
 #, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/setup/gtk/wizard_gtk.c:450
+#: src/setup/gtk/wizard_gtk.c:437
 #, fuzzy
 msgid "Do you want to save the new configuration?"
 msgstr "¿Quieres guardar tu configuración?"
 
-#: src/setup/gtk/wizard_gtk.c:480
+#: src/setup/gtk/wizard_gtk.c:469
 msgid "Unable to create user account:"
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/setup/gtk/wizard_gtk.c:490
+#: src/setup/gtk/wizard_gtk.c:477
 msgid "Unable to change startup process:"
 msgstr "Imposible cambiar el proceso de arranque:"
 
-#: src/setup/gtk/wizard_gtk.c:505
+#: src/setup/gtk/wizard_gtk.c:492
 msgid ""
 "Running gnunet-update failed.\n"
 "This maybe due to insufficient permissions, please check your "
@@ -3571,134 +3573,134 @@
 "Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/setup/text/conf.c:75
+#: src/setup/text/conf.c:79
 #, fuzzy
 msgid "yes"
 msgstr "Bytes"
 
-#: src/setup/text/conf.c:76
+#: src/setup/text/conf.c:80
 msgid "no"
 msgstr ""
 
-#: src/setup/text/conf.c:104
+#: src/setup/text/conf.c:105
 #, c-format
 msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/text/conf.c:116
+#: src/setup/text/conf.c:114
 msgid "\tPossible choices:\n"
 msgstr ""
 
-#: src/setup/text/conf.c:124
+#: src/setup/text/conf.c:122
 msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:126
+#: src/setup/text/conf.c:124
 #, c-format
 msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/text/conf.c:147
+#: src/setup/text/conf.c:142
 #, c-format
 msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/text/conf.c:152
+#: src/setup/text/conf.c:146
 #, c-format
 msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/text/conf.c:158
+#: src/setup/text/conf.c:152
 #, c-format
 msgid ""
 "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
 "value %llu): "
 msgstr ""
 
-#: src/setup/text/conf.c:191
+#: src/setup/text/conf.c:186
 #, fuzzy, c-format
 msgid "Yes\n"
 msgstr "Sí"
 
-#: src/setup/text/conf.c:196
+#: src/setup/text/conf.c:191
 #, fuzzy, c-format
 msgid "No\n"
 msgstr "No"
 
-#: src/setup/text/conf.c:199 src/setup/text/conf.c:235
-#: src/setup/text/conf.c:261 src/setup/text/conf.c:318
-#: src/setup/text/conf.c:370
+#: src/setup/text/conf.c:194 src/setup/text/conf.c:235
+#: src/setup/text/conf.c:265 src/setup/text/conf.c:328
+#: src/setup/text/conf.c:386
 #, fuzzy, c-format
 msgid "Help\n"
 msgstr "Ayuda"
 
-#: src/setup/text/conf.c:202 src/setup/text/conf.c:215
-#: src/setup/text/conf.c:270 src/setup/text/conf.c:299
-#: src/setup/text/conf.c:351
+#: src/setup/text/conf.c:197 src/setup/text/conf.c:212
+#: src/setup/text/conf.c:275 src/setup/text/conf.c:306
+#: src/setup/text/conf.c:364
 #, fuzzy, c-format
 msgid "Abort\n"
 msgstr "_Acerca de"
 
-#: src/setup/text/conf.c:342 src/setup/text/conf.c:397
+#: src/setup/text/conf.c:353 src/setup/text/conf.c:415
 #, c-format
 msgid ""
 "\n"
 "Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/text/conf.c:403
+#: src/setup/text/conf.c:421
 #, c-format
 msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:477
+#: src/setup/text/conf.c:482
 msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/setup/text/conf.c:488
+#: src/setup/text/conf.c:491
 msgid "Aborted.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:510
+#: src/setup/text/conf.c:504
 #, fuzzy
 msgid "Invalid entry.\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/setup/text/conf.c:529
+#: src/setup/text/conf.c:521
 #, c-format
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:560
+#: src/setup/text/conf.c:552
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:561
+#: src/setup/text/conf.c:553
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:575 src/setup/ncurses/mconf.c:519
+#: src/setup/text/conf.c:565 src/setup/ncurses/mconf.c:511
 #, 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:580
+#: src/setup/text/conf.c:571
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:592
+#: src/setup/text/conf.c:586
 #, 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:597
+#: src/setup/text/conf.c:595
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Fichero de configuración '%s' creado.\n"
@@ -3715,79 +3717,79 @@
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/setup/ncurses/mconf.c:175 src/setup/ncurses/mconf.c:278
-#: src/setup/ncurses/mconf.c:356 src/setup/ncurses/mconf.c:462
-#: src/setup/ncurses/wizard_curs.c:121 src/setup/ncurses/wizard_curs.c:191
-#: src/setup/ncurses/wizard_curs.c:307
+#: src/setup/ncurses/mconf.c:179 src/setup/ncurses/mconf.c:278
+#: src/setup/ncurses/mconf.c:359 src/setup/ncurses/mconf.c:455
+#: src/setup/ncurses/wizard_curs.c:110 src/setup/ncurses/wizard_curs.c:174
+#: src/setup/ncurses/wizard_curs.c:290
 msgid "Internal error! (Choice invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:213 src/setup/ncurses/mconf.c:408
+#: src/setup/ncurses/mconf.c:212 src/setup/ncurses/mconf.c:403
 msgid "Internal error! (Value invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:399
+#: src/setup/ncurses/mconf.c:392
 msgid "Invalid input, expecting floating point value."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:447
+#: src/setup/ncurses/mconf.c:435
 msgid "Invalid input, expecting integer."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:453
+#: src/setup/ncurses/mconf.c:443
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:505 src/setup/ncurses/wizard_curs.c:562
+#: src/setup/ncurses/mconf.c:499 src/setup/ncurses/wizard_curs.c:534
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/ncurses/mconf.c:523
+#: src/setup/ncurses/mconf.c:517
 #, fuzzy
 msgid "Do you wish to save your new configuration?"
 msgstr "¿Quieres guardar tu configuración?"
 
-#: src/setup/ncurses/mconf.c:534
+#: src/setup/ncurses/mconf.c:531
 #, fuzzy, c-format
 msgid ""
 "\n"
 "End of configuration.\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/setup/ncurses/mconf.c:537
+#: src/setup/ncurses/mconf.c:536
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Your configuration changes were NOT saved.\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/setup/ncurses/wizard_curs.c:67 src/setup/lib/wizard_util.c:131
-#: src/setup/lib/wizard_util.c:176
+#: src/setup/ncurses/wizard_curs.c:65 src/setup/lib/wizard_util.c:139
+#: src/setup/lib/wizard_util.c:194
 msgid "Error"
 msgstr "Error"
 
-#: src/setup/ncurses/wizard_curs.c:86
+#: src/setup/ncurses/wizard_curs.c:80
 #, fuzzy
 msgid "Error!"
 msgstr "Error"
 
-#: src/setup/ncurses/wizard_curs.c:153
+#: src/setup/ncurses/wizard_curs.c:142
 #, fuzzy
 msgid "Abort"
 msgstr "_Acerca de"
 
-#: src/setup/ncurses/wizard_curs.c:154
+#: src/setup/ncurses/wizard_curs.c:143
 #, fuzzy
 msgid "Ok"
 msgstr "k"
 
-#: src/setup/ncurses/wizard_curs.c:222 src/setup/ncurses/wizard_curs.c:290
-#: src/setup/ncurses/wizard_curs.c:443
+#: src/setup/ncurses/wizard_curs.c:209 src/setup/ncurses/wizard_curs.c:275
+#: src/setup/ncurses/wizard_curs.c:426
 msgid "GNUnet configuration"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:223
+#: src/setup/ncurses/wizard_curs.c:211
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -3817,7 +3819,7 @@
 "\n"
 "el equipo de GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:291
+#: src/setup/ncurses/wizard_curs.c:277
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
@@ -3825,7 +3827,7 @@
 "Escoge la interfaz de red que conecta tu ordenador a Internet de la lista de "
 "abajo."
 
-#: src/setup/ncurses/wizard_curs.c:312 src/setup/ncurses/wizard_curs.c:325
+#: src/setup/ncurses/wizard_curs.c:295 src/setup/ncurses/wizard_curs.c:309
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
@@ -3835,24 +3837,24 @@
 "Internet. Normalmente es un módem, una tarjeta de RDSI o una tarjeta de red "
 "en el caso de los xDSL como el ADSL."
 
-#: src/setup/ncurses/wizard_curs.c:323
+#: src/setup/ncurses/wizard_curs.c:306
 #, fuzzy
 msgid "Network configuration: interface"
 msgstr "Interfaz de red:"
 
-#: src/setup/ncurses/wizard_curs.c:324
+#: src/setup/ncurses/wizard_curs.c:308
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr ""
 "¿Cuál es el nombre de la interfaz de red que conecta tu ordenador a Internet?"
 
-#: src/setup/ncurses/wizard_curs.c:335
+#: src/setup/ncurses/wizard_curs.c:319
 #, fuzzy
 msgid "Network configuration: NAT"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:336
+#: src/setup/ncurses/wizard_curs.c:320
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3870,12 +3872,12 @@
 "Responde \"no\" en conexiones directas a través de módems, tarjetas de RDSI "
 "y DNAT (también conocido como \"seguimiento de puertos\")."
 
-#: src/setup/ncurses/wizard_curs.c:349
+#: src/setup/ncurses/wizard_curs.c:333
 #, fuzzy
 msgid "Network configuration: IP"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:350
+#: src/setup/ncurses/wizard_curs.c:335
 #, fuzzy
 msgid "What is this computer's public IP address or hostname?"
 msgstr ""
@@ -3884,7 +3886,7 @@
 "\n"
 "En caso de duda, dejar este campo en blanco."
 
-#: src/setup/ncurses/wizard_curs.c:351
+#: src/setup/ncurses/wizard_curs.c:336
 #, fuzzy
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
@@ -3903,17 +3905,17 @@
 "En caso de duda deja el campo en blanco. GNUnet intentará determinar tu "
 "dirección IP"
 
-#: src/setup/ncurses/wizard_curs.c:366
+#: src/setup/ncurses/wizard_curs.c:351
 #, fuzzy
 msgid "Bandwidth configuration: upload"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:367
+#: src/setup/ncurses/wizard_curs.c:353
 #, fuzzy
 msgid "How much upstream bandwidth (in bytes/s) may be used?"
 msgstr "¿Cuánta subida (Bytes/s) será usada por GNUnet?"
 
-#: src/setup/ncurses/wizard_curs.c:368
+#: src/setup/ncurses/wizard_curs.c:354
 #, fuzzy
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
@@ -3932,17 +3934,17 @@
 "este valor más tarde. Si tienes una tarifa plana puedes configurarlo a la "
 "máxima velocidad de tu conexión a Internet."
 
-#: src/setup/ncurses/wizard_curs.c:380
+#: src/setup/ncurses/wizard_curs.c:366
 #, fuzzy
 msgid "Bandwidth configuration: download"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:381
+#: src/setup/ncurses/wizard_curs.c:368
 #, fuzzy
 msgid "How much downstream bandwidth (in bytes/s) may be used?"
 msgstr "¿Cuánta bajada (Bytes/s) será usada por GNUnet?"
 
-#: src/setup/ncurses/wizard_curs.c:382
+#: src/setup/ncurses/wizard_curs.c:369
 #, fuzzy
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
@@ -3961,16 +3963,16 @@
 "este valor más tarde. Si tienes una tarifa plana puedes configurarlo a la "
 "máxima velocidad de tu conexión a Internet."
 
-#: src/setup/ncurses/wizard_curs.c:394
+#: src/setup/ncurses/wizard_curs.c:381
 #, fuzzy
 msgid "Quota configuration"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:395
+#: src/setup/ncurses/wizard_curs.c:382
 msgid "What is the maximum size of the datastore in MB?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:396
+#: src/setup/ncurses/wizard_curs.c:383
 #, fuzzy
 msgid ""
 "The GNUnet datastore contains all content that GNUnet needs to store "
@@ -3981,16 +3983,16 @@
 "El almacenamiento de GNUnet contiene todos los datos que GNUnet genera "
 "(datos del índice, contenido insertado y migrado)."
 
-#: src/setup/ncurses/wizard_curs.c:409
+#: src/setup/ncurses/wizard_curs.c:393
 #, fuzzy
 msgid "Daemon configuration: user account"
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/setup/ncurses/wizard_curs.c:410
+#: src/setup/ncurses/wizard_curs.c:394
 msgid "As which user should gnunetd be run?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:411
+#: src/setup/ncurses/wizard_curs.c:396
 #, fuzzy
 msgid ""
 "For security reasons, it is a good idea to let this setup create a new user "
@@ -4016,15 +4018,15 @@
 "Deja los campos vacíos para arrancar GNUnet con privilegios de sistema.\n"
 "Usuario de GNUnet:"
 
-#: src/setup/ncurses/wizard_curs.c:429
+#: src/setup/ncurses/wizard_curs.c:411
 msgid "Daemon configuration: group account"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:430
+#: src/setup/ncurses/wizard_curs.c:412
 msgid "As which group should gnunetd be run?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:431
+#: src/setup/ncurses/wizard_curs.c:414
 #, fuzzy
 msgid ""
 "For security reasons, it is a good idea to let this setup create a new group "
@@ -4047,11 +4049,11 @@
 "\n"
 "Grupo de GNUnet:"
 
-#: src/setup/ncurses/wizard_curs.c:444
+#: src/setup/ncurses/wizard_curs.c:428
 msgid "Do you want to automatically launch GNUnet as a system service?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:445
+#: src/setup/ncurses/wizard_curs.c:430
 #, fuzzy
 msgid ""
 "If you say \"yes\" here, the GNUnet background process will be automatically "
@@ -4064,30 +4066,30 @@
 "automáticamente arrancado cuando enciendas tu ordenador. Si dices \"no\" "
 "aquí, tendrás que ejecutar GNUnet tu mismo cada vez que quieras usarlo."
 
-#: src/setup/ncurses/wizard_curs.c:493
+#: src/setup/ncurses/wizard_curs.c:471
 #, fuzzy
 msgid "Unable to create user account for daemon."
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/setup/ncurses/wizard_curs.c:507
+#: src/setup/ncurses/wizard_curs.c:478
 msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:521
+#: src/setup/ncurses/wizard_curs.c:493
 #, fuzzy
 msgid "Save configuration?"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:522
+#: src/setup/ncurses/wizard_curs.c:494
 #, fuzzy
 msgid "Save configuration now?"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:566
+#: src/setup/ncurses/wizard_curs.c:538
 msgid "Back"
 msgstr "Atrás"
 
-#: src/setup/lib/gns.c:278
+#: src/setup/lib/gns.c:294
 #, fuzzy, c-format
 msgid ""
 "Configuration does not satisfy constraints of configuration specification "
@@ -4096,101 +4098,95 @@
 "La configuración debe especificar un directorio para los datos FS en la "
 "sección '%s' bajo'%s'.\n"
 
-#: src/setup/lib/tree.c:189
+#: src/setup/lib/tree.c:190
 #, c-format
 msgid ""
 "Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:101
+#: src/setup/lib/wizard_util.c:110
 msgid "Can't open Service Control Manager"
 msgstr "Imposible abrir el Service Control Manager"
 
-#: src/setup/lib/wizard_util.c:106
+#: src/setup/lib/wizard_util.c:116
 msgid "Can't create service"
 msgstr "Imposible crear el servicio"
 
-#: src/setup/lib/wizard_util.c:111
+#: src/setup/lib/wizard_util.c:120
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr "Error cambiando los permisos del directorio de GNUnet"
 
-#: src/setup/lib/wizard_util.c:115
+#: src/setup/lib/wizard_util.c:125
 msgid "Cannot write to the regisitry"
 msgstr "Imposible escribir en el registro"
 
-#: src/setup/lib/wizard_util.c:118
+#: src/setup/lib/wizard_util.c:128
 msgid "Can't access the service"
 msgstr "Imposible acceder al servicio"
 
-#: src/setup/lib/wizard_util.c:122
+#: src/setup/lib/wizard_util.c:131
 msgid "Can't delete the service"
 msgstr "Imposible borrar el servicio"
 
-#: src/setup/lib/wizard_util.c:126
+#: src/setup/lib/wizard_util.c:134
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/setup/lib/wizard_util.c:159
+#: src/setup/lib/wizard_util.c:170
 msgid "This version of Windows does not support multiple users."
 msgstr "Esta versión de Windows no permite usuarios múltiples"
 
-#: src/setup/lib/wizard_util.c:163
+#: src/setup/lib/wizard_util.c:174
 msgid "Error creating user"
 msgstr "Error creando usuario"
 
-#: src/setup/lib/wizard_util.c:166
+#: src/setup/lib/wizard_util.c:178
 msgid "Error accessing local security policy"
 msgstr "Error accediendo a la política de seguridad local"
 
-#: src/setup/lib/wizard_util.c:169
+#: src/setup/lib/wizard_util.c:183
 msgid "Error granting service right to user"
 msgstr "Error garantizando el servicio correcto al usuario"
 
-#: src/setup/lib/wizard_util.c:172
+#: src/setup/lib/wizard_util.c:188
 msgid "Unknown error while creating a new user"
 msgstr "Error desconocido mientras se creaba un nuevo usuario"
 
-#: src/include/gnunet_util_getopt.h:150
+#: src/include/gnunet_util_getopt.h:153
 msgid "print this help"
 msgstr "imprime esta ayuda"
 
-#: src/include/gnunet_util_getopt.h:159
+#: src/include/gnunet_util_getopt.h:162
 msgid "print the version number"
 msgstr "imprime el número de versión"
 
-#: src/include/gnunet_util_getopt.h:165
+#: src/include/gnunet_util_getopt.h:168
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:171
+#: src/include/gnunet_util_getopt.h:174
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:177
+#: src/include/gnunet_util_getopt.h:180
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "usa el fichero de configuración FILENAME"
 
-#: src/include/gnunet_util_getopt.h:183
+#: src/include/gnunet_util_getopt.h:186
 #, 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:218 src/include/gnunet_util_error.h:220
-#: src/include/gnunet_util_error.h:226 src/include/gnunet_util_error.h:236
-#: src/include/gnunet_util_error.h:242
+#: src/include/gnunet_util_error.h:212 src/include/gnunet_util_error.h:214
+#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:230
+#: src/include/gnunet_util_error.h:236
 #, fuzzy, c-format
 msgid "Internal error: 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:249 src/include/gnunet_util_error.h:256
-#: src/include/gnunet_util_error.h:263 src/include/gnunet_util_error.h:270
+#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
 #, 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:277 src/include/gnunet_util_error.h:284
-#, 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"
 
@@ -5130,6 +5126,36 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
+#~ msgid "specify nickname"
+#~ msgstr "especifica el apodo"
+
+#~ msgid "Start GNUnet chat client."
+#~ msgstr "Arranca el cliente de chat de GNUnet"
+
+#~ msgid "Could not connect to gnunetd.\n"
+#~ msgstr "Imposible conectar con gnunetd.\n"
+
+#~ msgid "You must specify a nickname (use option `%s').\n"
+#~ msgstr "Debes especificar un apodo (use la opción '%s').\n"
+
+#~ msgid "Could not send join message to gnunetd\n"
+#~ msgstr "Imposible mandar el mensaje a gnunetd\n"
+
+#~ msgid "Could not send message to gnunetd\n"
+#~ msgstr "Imposible mandar el mensaje a gnunetd\n"
+
+#~ msgid "mysql datastore"
+#~ msgstr "base de datos mysql"
+
+#, fuzzy
+#~ msgid ""
+#~ "`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s "
+#~ "DG/%s\n"
+#~ msgstr "'%s' falló en %s: %d con el error: %s\n"
+
+#~ msgid "Database failed to delete `%s'.\n"
+#~ msgstr "Falló al borrar de la base de datos %s.\n"
+
 #~ msgid "GNUnet configuration assistant"
 #~ msgstr "Asistente de configuración de GNUnet"
 
@@ -5696,9 +5722,6 @@
 #~ msgid "sendAck failed.  Terminating connection to client.\n"
 #~ msgstr "sendAck falló. Finalizando conexión con el cliente.\n"
 
-#~ msgid "Failed to deliver `%s' message.\n"
-#~ msgstr "Falló al entregar el mensaje '%s'.\n"
-
 #~ msgid "Unindex failed."
 #~ msgstr "El desindexado falló"
 

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/po/rw.po     2007-07-30 06:21:56 UTC (rev 5387)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-07 02:38-0600\n"
+"POT-Creation-Date: 2007-07-30 00:16-0600\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <address@hidden>\n"
 "Language-Team: Kinyarwanda <address@hidden>\n"
@@ -24,120 +24,120 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/transports/ip6.c:72 src/util/network/io.c:80
+#: src/transports/ip6.c:75 src/util/network/io.c:85
 #, fuzzy, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "OYA Gushaka Bya Ubuturo"
 
-#: src/transports/ip6.c:104 src/util/network/ip.c:83 src/util/network/ip.c:144
+#: src/transports/ip6.c:104 src/util/network/ip.c:84 src/util/network/ip.c:146
 #, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr "urusobe in Iboneza Icyiciro"
 
-#: src/transports/ip6.c:134 src/util/network/ip.c:113
-#: src/util/network/ip.c:234
+#: src/transports/ip6.c:135 src/util/network/ip.c:115
+#: src/util/network/ip.c:221
 #, fuzzy, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr "OYA kugirango ikoresha"
 
-#: src/transports/ip6.c:169
+#: src/transports/ip6.c:167
 #, fuzzy, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "OYA"
 
-#: src/transports/ip6.c:222 src/transports/ip.c:59
+#: src/transports/ip6.c:219 src/transports/ip.c:60
 #, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr ""
 
-#: src/transports/udp6.c:129 src/transports/udp.c:137
+#: src/transports/udp6.c:123 src/transports/udp.c:129
 #, fuzzy, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr "Kuri Kuri Umuyoboro"
 
-#: src/transports/udp6.c:268
+#: src/transports/udp6.c:264
 #, fuzzy
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp6.c:500 src/transports/udp.c:547
+#: src/transports/udp6.c:471 src/transports/udp.c:514
 #, fuzzy, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr "kugirango ni Byo hasi OYA"
 
-#: src/transports/http.c:504
+#: src/transports/http.c:522
 #, fuzzy
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/http.c:793 src/transports/http.c:892
-#: src/transports/http.c:1030 src/transports/http.c:1163
-#: src/transports/upnp/upnp.c:335 src/transports/upnp/upnp.c:591
-#: src/applications/bootstrap_http/http.c:124
-#: src/applications/bootstrap_http/http.c:269
-#: src/applications/bootstrap_http/http.c:290
-#: src/applications/bootstrap_http/http.c:324
-#: src/applications/bootstrap_http/http.c:342
-#: src/applications/bootstrap_http/http.c:356
-#: src/applications/bootstrap_http/http.c:368
-#: src/applications/bootstrap_http/http.c:380
+#: src/transports/http.c:813 src/transports/http.c:892
+#: src/transports/http.c:1007 src/transports/http.c:1147
+#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:540
+#: src/applications/bootstrap_http/http.c:115
+#: src/applications/bootstrap_http/http.c:247
+#: src/applications/bootstrap_http/http.c:263
+#: src/applications/bootstrap_http/http.c:294
+#: src/applications/bootstrap_http/http.c:313
+#: src/applications/bootstrap_http/http.c:326
+#: src/applications/bootstrap_http/http.c:336
+#: src/applications/bootstrap_http/http.c:346
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/transports/http.c:1344
+#: src/transports/http.c:1307
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:1352
+#: src/transports/http.c:1316
 #, fuzzy
 msgid "# bytes received via HTTP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/http.c:1354
+#: src/transports/http.c:1317
 #, fuzzy
 msgid "# bytes sent via HTTP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/http.c:1356
+#: src/transports/http.c:1319
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: src/transports/smtp.c:257
+#: src/transports/smtp.c:271
 #, 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:334
+#: src/transports/smtp.c:358
 #, fuzzy
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr "Ubutumwa Biturutse Ingano"
 
-#: src/transports/smtp.c:433
+#: src/transports/smtp.c:463
 #, fuzzy
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr "Muyunguruzi... kugirango E Ubutumwa Kurema"
 
-#: src/transports/smtp.c:440
+#: src/transports/smtp.c:471
 #, fuzzy, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "Muyunguruzi... Ikurikiranyanyuguti Kuri Kuri"
 
-#: src/transports/smtp.c:547
+#: src/transports/smtp.c:571
 #, fuzzy, c-format
 msgid "Failed to initialize libesmtp: %s.\n"
 msgstr "Kuri gutangiza Serivisi"
 
-#: src/transports/smtp.c:611
+#: src/transports/smtp.c:630
 #, fuzzy, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "E Ubutumwa Kuri Byanze"
 
-#: src/transports/smtp.c:679
+#: src/transports/smtp.c:702
 #, fuzzy, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
@@ -150,17 +150,17 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/smtp.c:707
+#: src/transports/smtp.c:730
 #, fuzzy, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr "kugirango ni Byo hasi OYA"
 
-#: src/transports/tcp.c:283
+#: src/transports/tcp.c:289
 #, fuzzy
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/tcp.c:387
+#: src/transports/tcp.c:384
 #, fuzzy, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
@@ -180,37 +180,37 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/tcp.c:454 src/transports/tcp6.c:414
+#: src/transports/tcp.c:437 src/transports/tcp6.c:404
 #, fuzzy, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
 
-#: src/transports/tcp.c:584
+#: src/transports/tcp.c:556
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:592
+#: src/transports/tcp.c:565
 #, fuzzy
 msgid "# bytes received via TCP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/tcp.c:594
+#: src/transports/tcp.c:566
 #, fuzzy
 msgid "# bytes sent via TCP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/tcp.c:596
+#: src/transports/tcp.c:568
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:293
+#: src/transports/udp.c:287
 #, fuzzy
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp.c:388
+#: src/transports/udp.c:378
 #, fuzzy, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
@@ -230,65 +230,65 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/udp.c:565
+#: src/transports/udp.c:529
 #, fuzzy
 msgid "# bytes received via UDP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/udp.c:567
+#: src/transports/udp.c:530
 #, fuzzy
 msgid "# bytes sent via UDP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/udp.c:569
+#: src/transports/udp.c:532
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
-#: src/transports/tcp6.c:238
+#: src/transports/tcp6.c:245
 #, fuzzy
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/tcp6.c:300
+#: src/transports/tcp6.c:312
 #, fuzzy, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "'%s':Kitazwi Serivisi"
 
-#: src/transports/tcp6.c:532
+#: src/transports/tcp6.c:512
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/tcp6.c:534
+#: src/transports/tcp6.c:513
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/tcp6.c:536
+#: src/transports/tcp6.c:515
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr ""
 
-#: src/transports/tcp_helper.c:248
+#: src/transports/tcp_helper.c:257
 #, fuzzy
 msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/transports/tcp_helper.c:314
+#: src/transports/tcp_helper.c:276
 #, fuzzy
 msgid "Received malformed message from tcp-peer connection. Closing.\n"
 msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/transports/upnp/upnp.c:443
+#: src/transports/upnp/upnp.c:429
 #, fuzzy, c-format
 msgid "%s failed for url `%s' and post-data `%s' at %s:%d: `%s'\n"
 msgstr "'%s'Byanze kugirango Isomero ku Na: Ikosa"
 
-#: src/transports/upnp/upnp.c:504
+#: src/transports/upnp/upnp.c:475
 #, c-format
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/udp_helper.c:91
+#: src/transports/udp_helper.c:94
 #, fuzzy
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr "Ubutumwa Bivuye Ukwihuza"
@@ -298,123 +298,123 @@
 msgid "Query (get KEY, put KEY VALUE) DHT table."
 msgstr "Kubona Gushyira Gukuraho... a imbonerahamwe#"
 
-#: src/applications/dht/tools/dht-query.c:59
+#: src/applications/dht/tools/dht-query.c:60
 #, fuzzy
 msgid ""
 "allow TIME ms to process a GET command or expire PUT content after ms TIME"
 msgstr "Kwemerera Kuri Komandi:"
 
-#: src/applications/dht/tools/dht-query.c:103
+#: src/applications/dht/tools/dht-query.c:98
 #, c-format
 msgid "%s(%s) operation returned no results.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:125
+#: src/applications/dht/tools/dht-query.c:115
 #, fuzzy, c-format
 msgid "Issuing '%s(%s,%s)' command.\n"
 msgstr "'%s(%s,%s)'Byanze"
 
-#: src/applications/dht/tools/dht-query.c:138
+#: src/applications/dht/tools/dht-query.c:122
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:143
+#: src/applications/dht/tools/dht-query.c:126
 #, fuzzy, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s,%s)'Byanze"
 
-#: src/applications/dht/tools/dht-query.c:171
+#: src/applications/dht/tools/dht-query.c:150
 #, fuzzy, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/dht/tools/dht-query.c:181
+#: src/applications/dht/tools/dht-query.c:163
 #, fuzzy, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr "Komandi:"
 
-#: src/applications/dht/tools/dht-query.c:194
+#: src/applications/dht/tools/dht-query.c:180
 #, fuzzy, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr "Komandi: ingingo Na"
 
-#: src/applications/dht/tools/dht-query.c:206
+#: src/applications/dht/tools/dht-query.c:191
 #, fuzzy, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Komandi:"
 
-#: src/applications/dht/module/table.c:701
+#: src/applications/dht/module/table.c:716
 msgid "# dht connections"
 msgstr ""
 
-#: src/applications/dht/module/table.c:702
+#: src/applications/dht/module/table.c:718
 #, fuzzy
 msgid "# dht discovery messages received"
 msgstr "#hejuru Ibibazo BYAKIRIWE"
 
-#: src/applications/dht/module/table.c:703
+#: src/applications/dht/module/table.c:720
 msgid "# dht route host lookups performed"
 msgstr ""
 
-#: src/applications/dht/module/table.c:704
+#: src/applications/dht/module/table.c:722
 msgid "# dht discovery messages sent"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:135
+#: src/applications/dht/module/cs.c:128
 #, fuzzy, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "'%s'Byanze."
 
-#: src/applications/dht/module/cs.c:240
+#: src/applications/dht/module/cs.c:233
 #, c-format
 msgid "`%s' registering client handlers: %d %d\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:259
+#: src/applications/dht/module/cs.c:251
 msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:752
+#: src/applications/dht/module/routing.c:736
 msgid "# dht replies routed"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:753
+#: src/applications/dht/module/routing.c:738
 #, fuzzy
 msgid "# dht requests routed"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/dht/module/routing.c:754
+#: src/applications/dht/module/routing.c:740
 #, fuzzy
 msgid "# dht get requests received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/dht/module/routing.c:755
+#: src/applications/dht/module/routing.c:742
 #, fuzzy
 msgid "# dht put requests received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/dht/module/routing.c:756
+#: src/applications/dht/module/routing.c:744
 #, fuzzy
 msgid "# dht results received"
 msgstr "#Gushaka Ibisubizo ku BYAKIRIWE KB"
 
-#: src/applications/dht/module/routing.c:760
+#: src/applications/dht/module/routing.c:748
 #, c-format
 msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:87
+#: src/applications/chat/chat.c:88
 #, fuzzy
 msgid "Message received from peer is invalid.\n"
 msgstr "BYAKIRIWE Bivuye ni Sibyo"
 
-#: src/applications/chat/chat.c:134
+#: src/applications/chat/chat.c:135
 #, fuzzy
 msgid "Message received from client is invalid\n"
 msgstr "BYAKIRIWE Bivuye Umukiriya ni"
 
-#: src/applications/chat/chat.c:156
+#: src/applications/chat/chat.c:155
 #, fuzzy
 msgid "Maximum number of chat clients reached.\n"
 msgstr "Umubare Bya"
@@ -424,117 +424,108 @@
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr "Bya ku iyi"
 
-#: src/applications/chat/chat.c:197
+#: src/applications/chat/chat.c:202
 #, c-format
 msgid "`%s' registering handlers %d and %d\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:216
+#: src/applications/chat/chat.c:219
 msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:82
-#, fuzzy
-msgid "specify nickname"
-msgstr "Irihimbano"
+#: src/applications/chat/gnunet-chat.c:45
+msgid "Join a chat on GNUnet."
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:87
-#, fuzzy
-msgid "Start GNUnet chat client."
-msgstr "Gutangira Umukiriya"
+#: src/applications/chat/gnunet-chat.c:49
+msgid "set the nickname to use (requred)"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:93 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:287
+#: src/applications/chat/gnunet-chat.c:52
+msgid "set the chat room to join (requred)"
+msgstr ""
+
+#: src/applications/chat/gnunet-chat.c:134
 #, fuzzy, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
+msgid "You must specify a nickname\n"
+msgstr "a Ijambo- banze"
 
-#: src/applications/chat/gnunet-chat.c:151
-#, fuzzy
-msgid "Could not connect to gnunetd.\n"
-msgstr "OYA Kwihuza Kuri"
+#: src/applications/chat/gnunet-chat.c:144
+#, fuzzy, c-format
+msgid "Failed to join the room\n"
+msgstr "Kuri Kuri Umuyoboro"
 
-#: src/applications/chat/gnunet-chat.c:155
+#: src/applications/chat/gnunet-chat.c:160
 #, fuzzy, c-format
-msgid "You must specify a nickname (use option `%s').\n"
-msgstr "a Irihimbano Gukoresha Ihitamo"
+msgid "Failed to send message.\n"
+msgstr "Kuri Kohereza Ubutumwa Kuri"
 
-#: src/applications/chat/gnunet-chat.c:182
-#, fuzzy
-msgid "Could not send join message to gnunetd\n"
-msgstr "OYA Kohereza Ubutumwa Kuri"
-
-#: src/applications/chat/gnunet-chat.c:191
-#, fuzzy
-msgid "Could not send message to gnunetd\n"
-msgstr "OYA Kohereza Ubutumwa Kuri"
-
-#: src/applications/advertising/advertising.c:188
+#: src/applications/advertising/advertising.c:193
 #, fuzzy, c-format
 msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 msgstr "Ubutumwa Bivuye Sibyo Isinya Sibyo"
 
-#: src/applications/advertising/advertising.c:196
+#: src/applications/advertising/advertising.c:203
 #, fuzzy
 msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr "Ubutumwa BYAKIRIWE Sibyo Igihe KURI"
 
-#: src/applications/advertising/advertising.c:367
+#: src/applications/advertising/advertising.c:374
 #, fuzzy
 msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr "OYA Kohereza"
 
-#: src/applications/advertising/advertising.c:385
+#: src/applications/advertising/advertising.c:396
 msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:553
+#: src/applications/advertising/advertising.c:544
 #, fuzzy, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Kuri Byahiswemo"
 
-#: src/applications/advertising/advertising.c:561
+#: src/applications/advertising/advertising.c:553
 #, 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:838
+#: src/applications/advertising/advertising.c:817
 #, fuzzy
 msgid "# Peer advertisements received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:839
+#: src/applications/advertising/advertising.c:820
 #, fuzzy
 msgid "# Peer advertisements of type NAT received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:840
+#: src/applications/advertising/advertising.c:823
 #, fuzzy
 msgid "# Peer advertisements confirmed via PONG"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:841
+#: src/applications/advertising/advertising.c:827
 #, fuzzy
 msgid "# Peer advertisements updating earlier HELLOs"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:842
+#: src/applications/advertising/advertising.c:830
 #, fuzzy
 msgid "# Peer advertisements discarded due to load"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:843
+#: src/applications/advertising/advertising.c:834
 #, fuzzy
 msgid "# Peer advertisements for unsupported transport"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:844
+#: src/applications/advertising/advertising.c:838
 #, fuzzy
 msgid "# Peer advertisements not confirmed due to ping busy"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:845
+#: src/applications/advertising/advertising.c:842
 #, fuzzy
 msgid "# Peer advertisements not confirmed due to lack of self ad"
 msgstr "#BYAKIRIWE"
@@ -544,292 +535,290 @@
 msgid "# Peer advertisements not confirmed due to send error"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:847
+#: src/applications/advertising/advertising.c:848
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:848
+#: src/applications/advertising/advertising.c:850
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:850
-#: src/applications/pingpong/pingpong.c:520
+#: src/applications/advertising/advertising.c:852
+#: src/applications/pingpong/pingpong.c:509
 msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:855
-#: src/applications/session/connect.c:936
+#: src/applications/advertising/advertising.c:857
+#: src/applications/session/connect.c:901
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:873
+#: src/applications/advertising/advertising.c:872
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:471
+#: src/applications/topology_default/topology.c:467
 msgid "maintains GNUnet default mesh topology"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:128
+#: src/applications/pingpong/pingpong.c:132
 #: src/applications/pingpong/pingpong.c:199
 #: src/applications/pingpong/pingpong.c:264
-#: src/applications/pingpong/pingpong.c:337
+#: src/applications/pingpong/pingpong.c:331
 #, fuzzy, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr "Ubutumwa"
 
-#: src/applications/pingpong/pingpong.c:140
+#: src/applications/pingpong/pingpong.c:143
 #, fuzzy
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "kugirango"
 
-#: src/applications/pingpong/pingpong.c:210
+#: src/applications/pingpong/pingpong.c:209
 #, fuzzy
 msgid "Received PING not destined for us!\n"
 msgstr "OYA kugirango RW"
 
-#: src/applications/pingpong/pingpong.c:309
-#: src/applications/pingpong/pingpong.c:374
+#: src/applications/pingpong/pingpong.c:303
+#: src/applications/pingpong/pingpong.c:365
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:418
+#: src/applications/pingpong/pingpong.c:409
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:510
+#: src/applications/pingpong/pingpong.c:499
 #, fuzzy
 msgid "# encrypted PONG messages received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:512
+#: src/applications/pingpong/pingpong.c:501
 #, fuzzy
 msgid "# plaintext PONG messages received"
 msgstr "#Umukiriya Ibibazo BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:514
+#: src/applications/pingpong/pingpong.c:503
 #, fuzzy
 msgid "# encrypted PING messages received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:516
+#: src/applications/pingpong/pingpong.c:505
 #, fuzzy
 msgid "# PING messages created"
 msgstr "#Ubutumwa"
 
-#: src/applications/pingpong/pingpong.c:518
-#: src/applications/session/connect.c:931
+#: src/applications/pingpong/pingpong.c:507
+#: src/applications/session/connect.c:896
 #, fuzzy
 msgid "# encrypted PONG messages sent"
 msgstr "#Bishunzwe: Bayite Yoherejwe:"
 
-#: src/applications/pingpong/pingpong.c:522
-#: src/applications/session/connect.c:929
+#: src/applications/pingpong/pingpong.c:511
+#: src/applications/session/connect.c:894
 #, fuzzy
 msgid "# encrypted PING messages sent"
 msgstr "#Bishunzwe: Bayite Yoherejwe:"
 
-#: src/applications/pingpong/pingpong.c:524
+#: src/applications/pingpong/pingpong.c:513
 #, fuzzy
 msgid "# plaintext PONG messages sent"
 msgstr "#Umukiriya Ibibazo BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:526
+#: src/applications/pingpong/pingpong.c:517
 #, fuzzy
 msgid "# plaintext PONG transmissions failed"
 msgstr "#Umukiriya Ibibazo BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:536
+#: src/applications/pingpong/pingpong.c:526
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:46
-#: src/applications/sqstore_sqlite/sqlite.c:53
-#: src/applications/sqstore_mysql/mysql.c:139
-#: src/applications/sqstore_mysql/mysql.c:146
-#: src/applications/sqstore_mysql/mysql.c:825
-#: src/applications/sqstore_mysql/mysql.c:846
-#: src/applications/sqstore_mysql/mysql.c:858
-#: src/applications/sqstore_mysql/mysql.c:891
-#: src/applications/sqstore_mysql/mysql.c:904
-#: src/applications/sqstore_mysql/mysql.c:965
-#: src/applications/sqstore_mysql/mysql.c:1065
-#: src/applications/sqstore_mysql/mysql.c:1078
-#: src/applications/sqstore_mysql/mysql.c:1149
-#: src/applications/sqstore_mysql/mysql.c:1169
-#: src/applications/sqstore_mysql/mysql.c:1181
-#: src/applications/sqstore_mysql/mysql.c:1207
-#: src/applications/sqstore_mysql/mysql.c:1220
-#: src/applications/sqstore_mysql/mysql.c:1234
-#: src/applications/sqstore_mysql/mysql.c:1301
-#: src/applications/sqstore_mysql/mysql.c:1315
-#: src/applications/sqstore_mysql/mysql.c:1374
-#: src/applications/sqstore_mysql/mysql.c:1391
+#: src/applications/sqstore_sqlite/sqlite.c:47
+#: src/applications/sqstore_sqlite/sqlite.c:54
+#: src/applications/sqstore_mysql/mysql.c:145
+#: src/applications/sqstore_mysql/mysql.c:152
+#: src/applications/sqstore_mysql/mysql.c:428
+#: src/applications/sqstore_mysql/mysql.c:438
+#: src/applications/sqstore_mysql/mysql.c:476
+#: src/applications/sqstore_mysql/mysql.c:486
+#: src/applications/sqstore_mysql/mysql.c:518
+#: src/applications/sqstore_mysql/mysql.c:529
+#: src/applications/sqstore_mysql/mysql.c:627
+#: src/applications/sqstore_mysql/mysql.c:639
+#: src/applications/sqstore_mysql/mysql.c:651
+#: src/applications/sqstore_mysql/mysql.c:665
+#: src/applications/sqstore_mysql/mysql.c:762
+#: src/applications/sqstore_mysql/mysql.c:776
+#: src/applications/sqstore_mysql/mysql.c:917
+#: src/applications/sqstore_mysql/mysql.c:929
+#: src/applications/sqstore_mysql/mysql.c:941
+#: src/applications/sqstore_mysql/mysql.c:1184
+#: src/applications/sqstore_mysql/mysql.c:1196
+#: src/applications/sqstore_mysql/mysql.c:1208
+#: src/applications/sqstore_mysql/mysql.c:1293
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:93 src/applications/dstore/dstore.c:180
-#: src/applications/dstore/dstore.c:240 src/applications/dstore/dstore.c:263
-#: src/applications/dstore/dstore.c:323 src/applications/dstore/dstore.c:378
-#: src/applications/dstore/dstore.c:474 src/util/crypto/symcipher_gcrypt.c:46
-#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:63
-#: src/util/crypto/hostkey_gcrypt.c:70
+#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:180
+#: src/applications/dstore/dstore.c:219 src/applications/dstore/dstore.c:238
+#: src/applications/dstore/dstore.c:293 src/applications/dstore/dstore.c:330
+#: src/applications/dstore/dstore.c:403 src/util/crypto/symcipher_gcrypt.c:46
+#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:64
+#: src/util/crypto/hostkey_gcrypt.c:71
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/applications/sqstore_sqlite/sqlite.c:207
+#: src/applications/sqstore_sqlite/sqlite.c:193
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kuri gutangiza"
 
-#: src/applications/sqstore_sqlite/sqlite.c:379
+#: src/applications/sqstore_sqlite/sqlite.c:393
 #, c-format
 msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:380
-#: src/applications/sqstore_sqlite/sqlite.c:401
+#: src/applications/sqstore_sqlite/sqlite.c:394
+#: src/applications/sqstore_sqlite/sqlite.c:416
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:400
-#: src/applications/sqstore_mysql/mysql.c:262
-#: src/applications/sqstore_mysql/mysql.c:924
-#: src/applications/sqstore_mysql/mysql.c:1251
+#: src/applications/sqstore_sqlite/sqlite.c:415
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1395
-#: src/applications/sqstore_mysql/mysql.c:1466
+#: src/applications/sqstore_sqlite/sqlite.c:1206
+#: src/applications/sqstore_mysql/mysql.c:1401
 #, fuzzy
 msgid "# bytes in datastore"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/applications/session/connect.c:261
-#: src/applications/session/connect.c:278
+#: src/applications/session/connect.c:256
+#: src/applications/session/connect.c:272
 #, fuzzy, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Urufunguzo Bivuye OYA Byagenzuwe"
 
-#: src/applications/session/connect.c:321
+#: src/applications/session/connect.c:313
 #, fuzzy, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr "Shyiraho Umutekano Ikindi OYA"
 
-#: src/applications/session/connect.c:520
+#: src/applications/session/connect.c:492
 msgid "Could not create any HELLO for myself!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:621
+#: src/applications/session/connect.c:592
 #, 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:639
+#: src/applications/session/connect.c:614
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr "'%s'Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:673
+#: src/applications/session/connect.c:646
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:683
+#: src/applications/session/connect.c:656
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:752
+#: src/applications/session/connect.c:719
 #, fuzzy, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
 "invalid.\n"
 msgstr "Bishunzwe: Umukoro Urufunguzo Ubutumwa Ingano ni Sibyo"
 
-#: src/applications/session/connect.c:764
+#: src/applications/session/connect.c:731
 #, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:921
+#: src/applications/session/connect.c:886
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:923
+#: src/applications/session/connect.c:888
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:925
+#: src/applications/session/connect.c:890
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:927
+#: src/applications/session/connect.c:892
 msgid "# sessions established"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
+#: src/applications/rpc/rpc.c:134 src/applications/rpc/rpc.c:175
 #, fuzzy, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
 "using this name (%p)\n"
 msgstr "%s::%s-OYA ni ikoresha iyi Izina:"
 
-#: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
+#: src/applications/rpc/rpc.c:218 src/applications/rpc/rpc.c:265
 #, fuzzy, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
 "under that name: %p\n"
 msgstr "%s::%s-OYA Izina:"
 
-#: src/applications/rpc/rpc.c:233
+#: src/applications/rpc/rpc.c:237
 #, fuzzy, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s-OYA OYA"
 
-#: src/applications/rpc/rpc.c:280
+#: src/applications/rpc/rpc.c:285
 #, fuzzy, c-format
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s-OYA OYA"
 
-#: src/applications/rpc/rpc.c:879 src/applications/rpc/rpc.c:1012
-#: src/applications/rpc/rpc.c:1101
+#: src/applications/rpc/rpc.c:909 src/applications/rpc/rpc.c:1043
+#: src/applications/rpc/rpc.c:1129
 #, fuzzy, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr "Ubutumwa Bya Ubwoko BYAKIRIWE"
 
-#: src/applications/rpc/rpc.c:946
+#: src/applications/rpc/rpc.c:975
 #, fuzzy, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "Kubaza... Ubutumwa"
 
-#: src/applications/rpc/rpc.c:1291
+#: src/applications/rpc/rpc.c:1307
 #, fuzzy, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr "'%s'Na: Igihe cyarenze: hejuru 1. ISAHA"
 
-#: src/applications/rpc/rpc.c:1415
+#: src/applications/rpc/rpc.c:1421
 #, fuzzy, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "OYA"
 
-#: src/applications/rpc/rpc.c:1442
+#: src/applications/rpc/rpc.c:1450
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1463
+#: src/applications/rpc/rpc.c:1466
 #, fuzzy, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Kuri gutangiza Serivisi"
 
-#: src/applications/rpc/rpc.c:1520
+#: src/applications/rpc/rpc.c:1524
 #, fuzzy
 msgid "RPC async reply invalid.\n"
 msgstr "Subiza Sibyo"
@@ -839,276 +828,270 @@
 msgid "async RPC reply not received.\n"
 msgstr "Subiza OYA BYAKIRIWE"
 
-#: src/applications/sqstore_mysql/mysql.c:263
-#: src/applications/sqstore_mysql/mysql.c:925
-#: src/applications/sqstore_mysql/mysql.c:1252
-msgid "mysql datastore"
-msgstr ""
+#: src/applications/sqstore_mysql/mysql.c:379
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s"
+msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/applications/sqstore_mysql/mysql.c:441
+#: src/applications/sqstore_mysql/mysql.c:1311
 #, fuzzy, c-format
-msgid ""
-"`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s DG/%"
-"s\n"
+msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/applications/sqstore_mysql/mysql.c:1496
+#: src/applications/sqstore_mysql/mysql.c:1423
+#: src/applications/sqstore_mysql/mysql.c:1570
 #, 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:1518
+#: src/applications/sqstore_mysql/mysql.c:1448
+#: src/applications/sqstore_mysql/mysql.c:1593
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:133
+#: src/applications/datastore/datastore.c:146
 #, fuzzy, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "kugirango ku"
 
-#: src/applications/datastore/datastore.c:159
-#, fuzzy, c-format
-msgid "Database failed to delete `%s'.\n"
-msgstr "Kuri IDOSIYE"
-
-#: src/applications/datastore/datastore.c:389
+#: src/applications/datastore/datastore.c:368
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:390
+#: src/applications/datastore/datastore.c:370
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:392
+#: src/applications/datastore/datastore.c:373
 msgid "# bytes allowed in datastore"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:406
+#: src/applications/datastore/datastore.c:388
 #, fuzzy
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
 
-#: src/applications/datastore/datastore.c:528
+#: src/applications/datastore/datastore.c:513
 #, fuzzy
 msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
 
-#: src/applications/identity/hostkey.c:123
+#: src/applications/identity/hostkey.c:116
 #, fuzzy, c-format
 msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr "OYA bushyinguro"
 
-#: src/applications/identity/hostkey.c:154
+#: src/applications/identity/hostkey.c:143
 #, 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:162
+#: src/applications/identity/hostkey.c:152
 #, fuzzy
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Gishya iyi Gicurasi a"
 
-#: src/applications/identity/hostkey.c:175
+#: src/applications/identity/hostkey.c:162
 msgid "Done creating hostkey.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:347
+#: src/applications/identity/identity.c:345
 #, fuzzy, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr "Idosiye in bushyinguro OYA BIHUYE"
 
-#: src/applications/identity/identity.c:360
+#: src/applications/identity/identity.c:358
 #, fuzzy, c-format
 msgid ""
 "Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr "Idosiye in bushyinguro OYA BIHUYE"
 
-#: src/applications/identity/identity.c:397
+#: src/applications/identity/identity.c:393
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:730
-#: src/applications/identity/identity.c:758
+#: src/applications/identity/identity.c:708
+#: src/applications/identity/identity.c:729
 #, fuzzy, c-format
 msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr "IDOSIYE Sibyo Ibyatanzwe"
 
-#: src/applications/identity/identity.c:812
+#: src/applications/identity/identity.c:776
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:822
+#: src/applications/identity/identity.c:785
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:928
-#: src/applications/identity/identity.c:1044
+#: src/applications/identity/identity.c:894
+#: src/applications/identity/identity.c:1014
 #, c-format
 msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:1045
+#: src/applications/identity/identity.c:1017
 #, c-format
 msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:148
+#: src/applications/transport/transport.c:190
 #, c-format
 msgid ""
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:196
+#: src/applications/transport/transport.c:244
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:246
+#: src/applications/transport/transport.c:297
 #, c-format
 msgid ""
 "Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:307
+#: src/applications/transport/transport.c:373
 #, fuzzy, c-format
 msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr "Bya Ubwoko"
 
-#: src/applications/transport/transport.c:395
+#: src/applications/transport/transport.c:494
 #, fuzzy, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Bya Ubwoko"
 
-#: src/applications/transport/transport.c:452
+#: src/applications/transport/transport.c:553
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:653
+#: src/applications/transport/transport.c:752
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "S"
 
-#: src/applications/transport/transport.c:673
+#: src/applications/transport/transport.c:771
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "OYA gutangiza Porogaramu"
 
-#: src/applications/transport/transport.c:683
+#: src/applications/transport/transport.c:781
 #, 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:710
+#: src/applications/transport/transport.c:808
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "S"
 
-#: src/applications/transport/transport.c:723
+#: src/applications/transport/transport.c:819
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:566
+#: src/applications/fragmentation/fragmentation.c:575
 #, fuzzy
 msgid "# messages defragmented"
 msgstr "#Ubutumwa"
 
-#: src/applications/fragmentation/fragmentation.c:567
+#: src/applications/fragmentation/fragmentation.c:577
 #, fuzzy
 msgid "# messages fragmented"
 msgstr "#Ubutumwa"
 
-#: src/applications/fragmentation/fragmentation.c:568
+#: src/applications/fragmentation/fragmentation.c:578
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:580
+#: src/applications/fragmentation/fragmentation.c:588
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:65
+#: src/applications/stats/gnunet-stats.c:62
 #, fuzzy, c-format
 msgid "Supported peer-to-peer messages:\n"
 msgstr "Kuri Ubutumwa"
 
-#: src/applications/stats/gnunet-stats.c:69
+#: src/applications/stats/gnunet-stats.c:65
 #, fuzzy, c-format
 msgid "Supported client-server messages:\n"
 msgstr "Umukiriya Seriveri Ubutumwa"
 
-#: src/applications/stats/gnunet-stats.c:93
+#: src/applications/stats/gnunet-stats.c:84
 #: src/applications/vpn/gnunet-vpn.c:52
 #, fuzzy
 msgid "Print statistics about GNUnet operations."
 msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
 
-#: src/applications/stats/gnunet-stats.c:97
+#: src/applications/stats/gnunet-stats.c:88
 #, fuzzy
 msgid "prints supported protocol messages"
 msgstr "Porotokole Ubutumwa"
 
-#: src/applications/stats/gnunet-stats.c:133
-#: src/applications/tbench/gnunet-tbench.c:128
-#: src/applications/tracekit/gnunet-tracekit.c:313
+#: src/applications/stats/gnunet-stats.c:122
+#: src/applications/tbench/gnunet-tbench.c:127
+#: src/applications/tracekit/gnunet-tracekit.c:315
 #: src/applications/template/gnunet-template.c:94
-#: src/applications/vpn/gnunet-vpn.c:145
+#: src/applications/vpn/gnunet-vpn.c:148
 #, fuzzy, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr "Zimya Iyemeza Bivuye"
 
-#: src/applications/stats/gnunet-stats.c:152
+#: src/applications/stats/gnunet-stats.c:134
 #, fuzzy, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr "Zimya Iyemeza Bivuye"
 
-#: src/applications/stats/clientapi.c:328
+#: src/applications/stats/clientapi.c:330
 #, fuzzy
 msgid "Uptime (seconds)"
 msgstr "amasogonda"
 
-#: src/applications/stats/statistics.c:214
+#: src/applications/stats/statistics.c:223
 #, fuzzy, c-format
 msgid "% of allowed network load (up)"
 msgstr "%Bya urusobe Ibirimo Hejuru"
 
-#: src/applications/stats/statistics.c:216
+#: src/applications/stats/statistics.c:225
 #, fuzzy, c-format
 msgid "% of allowed network load (down)"
 msgstr "%Bya urusobe Ibirimo Hasi"
 
-#: src/applications/stats/statistics.c:218
+#: src/applications/stats/statistics.c:226
 #, fuzzy, c-format
 msgid "% of allowed cpu load"
 msgstr "%Bya CPU Ibirimo"
 
-#: src/applications/stats/statistics.c:220
+#: src/applications/stats/statistics.c:227
 #, fuzzy, c-format
 msgid "% of allowed io load"
 msgstr "%Bya CPU Ibirimo"
 
-#: src/applications/stats/statistics.c:222
+#: src/applications/stats/statistics.c:228
 #, fuzzy
 msgid "# of connected peers"
 msgstr "#Bya"
 
-#: src/applications/stats/statistics.c:224
+#: src/applications/stats/statistics.c:230
 #, fuzzy
 msgid "# bytes of noise received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/stats/statistics.c:392
+#: src/applications/stats/statistics.c:401
 #, c-format
 msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:413
+#: src/applications/stats/statistics.c:421
 #, fuzzy
 msgid "keeps statistics about gnunetd's operation"
 msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
@@ -1117,80 +1100,80 @@
 msgid "# Any-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:152
+#: src/applications/stats/sqstats.c:151
 msgid "# DBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:154
+#: src/applications/stats/sqstats.c:152
 msgid "# SBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:156
+#: src/applications/stats/sqstats.c:153
 msgid "# KBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:158
+#: src/applications/stats/sqstats.c:154
 msgid "# NBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:160
+#: src/applications/stats/sqstats.c:155
 msgid "# KNBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:162
+#: src/applications/stats/sqstats.c:156
 msgid "# OnDemand-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:164
+#: src/applications/stats/sqstats.c:157
 msgid "# Unknown-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:166
+#: src/applications/stats/sqstats.c:158
 msgid "# expired"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:168
+#: src/applications/stats/sqstats.c:159
 msgid "# expire in 1h"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:170
+#: src/applications/stats/sqstats.c:160
 msgid "# expire in 24h"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:172
+#: src/applications/stats/sqstats.c:161
 msgid "# expire in 1 week"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:174
+#: src/applications/stats/sqstats.c:162
 msgid "# expire in 1 month"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:176
+#: src/applications/stats/sqstats.c:163
 msgid "# zero priority"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:178
+#: src/applications/stats/sqstats.c:164
 msgid "# priority one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:180
+#: src/applications/stats/sqstats.c:165
 msgid "# priority larger than one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:182
+#: src/applications/stats/sqstats.c:166
 msgid "# no anonymity"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:184
+#: src/applications/stats/sqstats.c:167
 msgid "# anonymity one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:186
+#: src/applications/stats/sqstats.c:168
 msgid "# anonymity larger than one"
 msgstr ""
 
 #: src/applications/tbench/gnunet-tbench.c:64
-#: src/applications/tracekit/gnunet-tracekit.c:53
+#: src/applications/tracekit/gnunet-tracekit.c:55
 #, fuzzy
 msgid "Start GNUnet transport benchmarking tool."
 msgstr "Gutangira"
@@ -1230,12 +1213,12 @@
 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:90
+#: src/applications/tbench/gnunet-tbench.c:91
 #, fuzzy
 msgid "number of messages in a message block"
 msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
 
-#: src/applications/tbench/gnunet-tbench.c:144
+#: src/applications/tbench/gnunet-tbench.c:143
 #, fuzzy, c-format
 msgid "You must specify a receiver!\n"
 msgstr "a Mwakirizi"
@@ -1245,25 +1228,25 @@
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr "Mwakirizi ni OYA Byemewe Izina:"
 
-#: src/applications/tbench/gnunet-tbench.c:182
+#: src/applications/tbench/gnunet-tbench.c:187
 #, 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:183
+#: src/applications/tbench/gnunet-tbench.c:188
 #, 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:185
+#: src/applications/tbench/gnunet-tbench.c:189
 #, 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:187
+#: src/applications/tbench/gnunet-tbench.c:190
 #, fuzzy, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr "Impuzandengo-"
@@ -1272,18 +1255,18 @@
 # 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:189
+#: src/applications/tbench/gnunet-tbench.c:191
 #, fuzzy, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
 
-#: src/applications/tbench/gnunet-tbench.c:192
+#: src/applications/tbench/gnunet-tbench.c:193
 #, 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:193
+#: src/applications/tbench/gnunet-tbench.c:194
 #, fuzzy, c-format
 msgid "\tmax      %u\n"
 msgstr "Kinini-"
@@ -1295,7 +1278,7 @@
 msgstr "Gito-"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_AVG.text
-#: src/applications/tbench/gnunet-tbench.c:197
+#: src/applications/tbench/gnunet-tbench.c:196
 #, fuzzy, c-format
 msgid "\tmean     %8.4f\n"
 msgstr "Impuzandengo-"
@@ -1304,24 +1287,24 @@
 # 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:199
+#: src/applications/tbench/gnunet-tbench.c:197
 #, fuzzy, c-format
 msgid "\tvariance %8.4f\n"
 msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
 
-#: src/applications/tbench/gnunet-tbench.c:208
+#: src/applications/tbench/gnunet-tbench.c:203
 #, fuzzy, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr "Imiterere OYA iyi OYA"
 
-#: src/applications/tbench/gnunet-tbench.c:212
+#: src/applications/tbench/gnunet-tbench.c:209
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr "OYA Akira i Ubutumwa Bivuye"
 
-#: src/applications/tbench/tbench.c:421
+#: src/applications/tbench/tbench.c:412
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
@@ -1330,31 +1313,31 @@
 msgid "probe network to the given DEPTH"
 msgstr "urusobe Kuri i"
 
-#: src/applications/tracekit/gnunet-tracekit.c:51
+#: src/applications/tracekit/gnunet-tracekit.c:52
 #, 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:57
+#: src/applications/tracekit/gnunet-tracekit.c:59
 #, 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:61
+#: src/applications/tracekit/gnunet-tracekit.c:63
 #, fuzzy
 msgid "wait DELAY seconds for replies"
 msgstr "Tegereza amasogonda kugirango"
 
-#: src/applications/tracekit/gnunet-tracekit.c:115
+#: src/applications/tracekit/gnunet-tracekit.c:111
 #, 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:160
 #, fuzzy, c-format
 msgid "`%s' is not connected to any peer.\n"
 msgstr "'%s'ni OYA Kuri"
@@ -1364,177 +1347,177 @@
 msgid "`%s' connected to `%s'.\n"
 msgstr "'%s'Kuri"
 
-#: src/applications/tracekit/gnunet-tracekit.c:212
+#: src/applications/tracekit/gnunet-tracekit.c:210
 #, 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:236
 #, fuzzy, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr "OYA Icyegeranyo Inyuma"
 
-#: src/applications/tracekit/gnunet-tracekit.c:343
+#: src/applications/tracekit/gnunet-tracekit.c:336
 #, fuzzy
 msgid "Could not send request to gnunetd.\n"
 msgstr "OYA Kohereza Kubaza... Kuri"
 
-#: src/applications/tracekit/tracekit.c:68
-#: src/applications/tracekit/tracekit.c:201
+#: src/applications/tracekit/tracekit.c:72
+#: src/applications/tracekit/tracekit.c:206
 #, fuzzy, c-format
 msgid "Received invalid `%s' message from `%s'.\n"
 msgstr "Sibyo Ubutumwa Bivuye"
 
-#: src/applications/tracekit/tracekit.c:263
+#: src/applications/tracekit/tracekit.c:269
 #, fuzzy
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr "imbonerahamwe# Kubaza..."
 
-#: src/applications/tracekit/tracekit.c:354
+#: src/applications/tracekit/tracekit.c:346
 #, fuzzy, c-format
 msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr "BYAKIRIWE Sibyo"
 
-#: src/applications/tracekit/tracekit.c:461
+#: src/applications/tracekit/tracekit.c:443
 #, fuzzy
 msgid "allows mapping of the network topology"
 msgstr "urusobe"
 
-#: src/applications/gap/gap.c:1661
+#: src/applications/gap/gap.c:1695
 #, fuzzy, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "Sibyo Ubutumwa Bivuye"
 
-#: src/applications/gap/gap.c:1662
+#: src/applications/gap/gap.c:1696
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1844
+#: src/applications/gap/gap.c:1883
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1856 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1892 src/applications/fs/module/anonymity.c:65
 #, fuzzy
 msgid "Failed to get traffic stats.\n"
 msgstr "Kuri Ikibazo# Ibyerekeye"
 
-#: src/applications/gap/gap.c:1863 src/applications/gap/gap.c:1869
-#: src/applications/gap/gap.c:1876
+#: src/applications/gap/gap.c:1902 src/applications/gap/gap.c:1910
+#: src/applications/gap/gap.c:1921
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2155
+#: src/applications/gap/gap.c:2183
 #, fuzzy
 msgid "# gap requests total received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2156
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2157
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2158
+#: src/applications/gap/gap.c:2190
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2159
+#: src/applications/gap/gap.c:2194
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2160
+#: src/applications/gap/gap.c:2197
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2161
+#: src/applications/gap/gap.c:2199
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2162
+#: src/applications/gap/gap.c:2202
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2163
+#: src/applications/gap/gap.c:2206
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2164
+#: src/applications/gap/gap.c:2208
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2165
+#: src/applications/gap/gap.c:2211
 #, fuzzy
 msgid "# gap duplicate requests that were re-tried"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2166
+#: src/applications/gap/gap.c:2214
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2167
+#: src/applications/gap/gap.c:2216
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2168
+#: src/applications/gap/gap.c:2218
 #, fuzzy
 msgid "# gap spurious replies (dropped)"
 msgstr "#hejuru Ibibazo BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2169
+#: src/applications/gap/gap.c:2220
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2170
+#: src/applications/gap/gap.c:2223
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2171
+#: src/applications/gap/gap.c:2227
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2172
+#: src/applications/gap/gap.c:2229
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2173
+#: src/applications/gap/gap.c:2231
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2189
+#: src/applications/gap/gap.c:2246
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2217
+#: src/applications/gap/gap.c:2269
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:161
+#: src/applications/gap/pid_table.c:177
 msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:163
+#: src/applications/gap/pid_table.c:181
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:78
+#: src/applications/getoption/getoption.c:75
 #, c-format
 msgid "`%s' registering client handler %d\n"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:88
+#: src/applications/getoption/getoption.c:84
 #, fuzzy
 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:273
-#: src/applications/fs/tools/gnunet-search.c:140
+#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-search.c:135
 #: src/applications/fs/tools/gnunet-download.c:69
 #, fuzzy
 msgid "set the desired LEVEL of sender-anonymity"
@@ -1565,42 +1548,42 @@
 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:90
 #, 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:93
 #, 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:97
 #, 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:100
 #, 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:104
 #, 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:107
 msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:138
+#: src/applications/fs/tools/gnunet-pseudonym.c:140
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr ""
@@ -1610,27 +1593,27 @@
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:178
+#: src/applications/fs/tools/gnunet-pseudonym.c:171
 #, fuzzy, c-format
 msgid "\tRating (after update): %d\n"
 msgstr "Nyuma"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:212
+#: src/applications/fs/tools/gnunet-pseudonym.c:204
 #, fuzzy, c-format
 msgid "Collection stopped.\n"
 msgstr "Kyahagariswe"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:214
+#: src/applications/fs/tools/gnunet-pseudonym.c:206
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:222
+#: src/applications/fs/tools/gnunet-pseudonym.c:214
 #, fuzzy, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Cyasibwe"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:226
+#: src/applications/fs/tools/gnunet-pseudonym.c:219
 #, fuzzy, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr ""
@@ -1643,17 +1626,17 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:243
+#: src/applications/fs/tools/gnunet-pseudonym.c:234
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:246
+#: src/applications/fs/tools/gnunet-pseudonym.c:238
 #, fuzzy, c-format
 msgid "Failed to start collection.\n"
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:279
 #, fuzzy, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr ""
@@ -1666,146 +1649,146 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:291
+#: src/applications/fs/tools/gnunet-pseudonym.c:286
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:304
+#: src/applications/fs/tools/gnunet-pseudonym.c:301
 #, fuzzy, c-format
 msgid "You must specify a name for the collection (`%s' option).\n"
 msgstr "a Izina: kugirango i IDOSIYE in Icyiciro"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:314
+#: src/applications/fs/tools/gnunet-pseudonym.c:309
 #, fuzzy, c-format
 msgid "Could not access namespace information.\n"
 msgstr "OYA bushyinguro"
 
-#: src/applications/fs/tools/gnunet-directory.c:83
+#: src/applications/fs/tools/gnunet-directory.c:84
 #, fuzzy, c-format
 msgid "==> Directory `%s':\n"
 msgstr "==>ububiko"
 
-#: src/applications/fs/tools/gnunet-directory.c:90
+#: src/applications/fs/tools/gnunet-directory.c:87
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:125
+#: src/applications/fs/tools/gnunet-directory.c:114
 #, fuzzy, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr "IDOSIYE Cyangwa Sibyo Imiterere kugirango bushyinguro"
 
-#: src/applications/fs/tools/gnunet-directory.c:127
+#: src/applications/fs/tools/gnunet-directory.c:116
 #, fuzzy, c-format
 msgid "%d files found in directory.\n"
 msgstr "IDOSIYE Kuri bushyinguro"
 
-#: src/applications/fs/tools/gnunet-directory.c:142
+#: src/applications/fs/tools/gnunet-directory.c:131
 #, fuzzy
 msgid "Perform directory related operations."
 msgstr "bushyinguro Ibikorwa:"
 
-#: src/applications/fs/tools/gnunet-directory.c:144
+#: src/applications/fs/tools/gnunet-directory.c:134
 #, fuzzy
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr "Gukuraho... Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-directory.c:148
+#: src/applications/fs/tools/gnunet-directory.c:138
 #, fuzzy
 msgid "list entries from the directory database"
 msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-directory.c:151
+#: src/applications/fs/tools/gnunet-directory.c:141
 #, fuzzy
 msgid "start tracking entries for the directory database"
 msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-directory.c:175
+#: src/applications/fs/tools/gnunet-directory.c:164
 #, fuzzy, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "Ibyinjijwe"
 
-#: src/applications/fs/tools/gnunet-insert.c:136
+#: src/applications/fs/tools/gnunet-insert.c:132
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:141
+#: src/applications/fs/tools/gnunet-insert.c:137
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:161
+#: src/applications/fs/tools/gnunet-insert.c:157
 #, fuzzy, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "kugirango IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-insert.c:170
+#: src/applications/fs/tools/gnunet-insert.c:165
 #, fuzzy
 msgid "filename"
 msgstr "Izina ry'idosiye"
 
 # framework/source\classes\fltdlg.src:DLG_FILTER_SELECT.FT_DLG_MIMETYPE.text
-#: src/applications/fs/tools/gnunet-insert.c:173
+#: src/applications/fs/tools/gnunet-insert.c:167
 #, fuzzy
 msgid "mimetype"
 msgstr "Ubwoko bwa MIME:"
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:208
 #, c-format
 msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-insert.c:220
 #, 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:235
+#: src/applications/fs/tools/gnunet-insert.c:231
 #, fuzzy, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Idosiye Nka"
 
-#: src/applications/fs/tools/gnunet-insert.c:246
+#: src/applications/fs/tools/gnunet-insert.c:242
 #, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:251
+#: src/applications/fs/tools/gnunet-insert.c:247
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error uploading file: %s"
 msgstr "Kuri IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-insert.c:260
+#: src/applications/fs/tools/gnunet-insert.c:256
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Unexpected event: %d\n"
 msgstr "Ibikubiyemo Ubwoko"
 
-#: src/applications/fs/tools/gnunet-insert.c:277
+#: src/applications/fs/tools/gnunet-insert.c:272
 #, 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:281
+#: src/applications/fs/tools/gnunet-insert.c:277
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:281
 msgid ""
 "do not use libextractor to add additional references to directory entries "
 "and/or the published file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:287
+#: src/applications/fs/tools/gnunet-insert.c:285
 #, fuzzy
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
@@ -1814,19 +1797,19 @@
 "Gucapa Urutonde Bya Amagambo fatizo OYA Iyinjizamo Cyangwa gushyiraho "
 "umugereka"
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:287
 #, fuzzy
 msgid "Make files available to GNUnet for sharing."
 msgstr "Idosiye Bihari Kuri kugirango Bisangiwe"
 
-#: src/applications/fs/tools/gnunet-insert.c:292
+#: src/applications/fs/tools/gnunet-insert.c:290
 #, 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:296
+#: src/applications/fs/tools/gnunet-insert.c:295
 #, fuzzy
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
@@ -1835,7 +1818,7 @@
 "Kongeramo Ijambo- banze kugirango i Hejuru: urwego IDOSIYE Cyangwa "
 "bushyinguro iyi Ihitamo Igikubo Times"
 
-#: src/applications/fs/tools/gnunet-insert.c:300
+#: src/applications/fs/tools/gnunet-insert.c:299
 #, fuzzy
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
@@ -1844,11 +1827,11 @@
 "Kongeramo Ijambo- banze kugirango Byose Idosiye Na ububiko bw'amaderese iyi "
 "Ihitamo Igikubo Times"
 
-#: src/applications/fs/tools/gnunet-insert.c:305
+#: src/applications/fs/tools/gnunet-insert.c:304
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:308
+#: src/applications/fs/tools/gnunet-insert.c:307
 #, fuzzy
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
@@ -1868,42 +1851,42 @@
 msgid "specify the priority of the content"
 msgstr "i By'ibanze Bya i Ibikubiyemo"
 
-#: src/applications/fs/tools/gnunet-insert.c:319
+#: src/applications/fs/tools/gnunet-insert.c:320
 #, 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:322
+#: src/applications/fs/tools/gnunet-insert.c:323
 #, 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:326
+#: src/applications/fs/tools/gnunet-insert.c:327
 #, 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:330
+#: src/applications/fs/tools/gnunet-insert.c:332
 #, 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:333
+#: src/applications/fs/tools/gnunet-insert.c:335
 #, 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:368
+#: src/applications/fs/tools/gnunet-insert.c:371
 #, 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:427
+#: src/applications/fs/tools/gnunet-insert.c:418
 #, fuzzy, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
@@ -1916,46 +1899,46 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-insert.c:447
+#: src/applications/fs/tools/gnunet-insert.c:437
 #, fuzzy, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Igihe Byanze Imiterere"
 
+#: src/applications/fs/tools/gnunet-insert.c:448
 #: src/applications/fs/tools/gnunet-insert.c:456
-#: src/applications/fs/tools/gnunet-insert.c:462
-#: src/applications/fs/tools/gnunet-insert.c:468
-#: src/applications/fs/tools/gnunet-insert.c:474
+#: src/applications/fs/tools/gnunet-insert.c:464
+#: src/applications/fs/tools/gnunet-insert.c:472
 #: src/applications/fs/tools/gnunet-insert.c:480
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Oya Ihitamo"
 
-#: src/applications/fs/tools/gnunet-search.c:143
+#: src/applications/fs/tools/gnunet-search.c:138
 #, fuzzy
 msgid "Search GNUnet for files."
 msgstr "kugirango Idosiye"
 
-#: src/applications/fs/tools/gnunet-search.c:147
+#: src/applications/fs/tools/gnunet-search.c:142
 #, fuzzy
 msgid "exit after receiving LIMIT results"
 msgstr "Gusohoka Nyuma Ibisubizo ku"
 
-#: src/applications/fs/tools/gnunet-search.c:150
+#: src/applications/fs/tools/gnunet-search.c:145
 #, fuzzy
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "Kwandika Gushaka Ibisubizo ku Kuri i IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-search.c:153
+#: src/applications/fs/tools/gnunet-search.c:148
 #, 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:191
+#: src/applications/fs/tools/gnunet-search.c:183
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:73
+#: src/applications/fs/tools/gnunet-download.c:74
 msgid ""
 "download a GNUnet directory that has already been downloaded.  Requires that "
 "a filename of an existing file is specified instead of the URI.  The "
@@ -1963,141 +1946,141 @@
 "`-R' option is also specified."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:75
+#: src/applications/fs/tools/gnunet-download.c:76
 #, fuzzy
 msgid "Download files from GNUnet."
 msgstr "Idosiye Bivuye"
 
-#: src/applications/fs/tools/gnunet-download.c:79
+#: src/applications/fs/tools/gnunet-download.c:80
 #, fuzzy
 msgid "write the file to FILENAME"
 msgstr "Kwandika i IDOSIYE Kuri"
 
-#: src/applications/fs/tools/gnunet-download.c:82
+#: src/applications/fs/tools/gnunet-download.c:84
 msgid "set the maximum number of parallel downloads that are allowed"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:85
+#: src/applications/fs/tools/gnunet-download.c:87
 #, fuzzy
 msgid "download a GNUnet directory recursively"
 msgstr "Gufungura a bushyinguro"
 
-#: src/applications/fs/tools/gnunet-download.c:103
+#: src/applications/fs/tools/gnunet-download.c:108
 #, 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:116
+#: src/applications/fs/tools/gnunet-download.c:122
 #, fuzzy, c-format
 msgid "Download aborted.\n"
 msgstr "/Byahiswemo"
 
-#: src/applications/fs/tools/gnunet-download.c:122
+#: src/applications/fs/tools/gnunet-download.c:128
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:128
+#: src/applications/fs/tools/gnunet-download.c:134
 #, fuzzy, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr "ISEGONDA"
 
-#: src/applications/fs/tools/gnunet-download.c:176
+#: src/applications/fs/tools/gnunet-download.c:178
 msgid "no name given"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:182
+#: src/applications/fs/tools/gnunet-download.c:184
 #, c-format
 msgid "Starting download `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:230
+#: src/applications/fs/tools/gnunet-download.c:225
 #, fuzzy
 msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 msgstr "ingingo a"
 
-#: src/applications/fs/tools/gnunet-download.c:251
+#: src/applications/fs/tools/gnunet-download.c:242
 #, fuzzy, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr "Sibyo"
 
-#: src/applications/fs/tools/gnunet-download.c:281
+#: src/applications/fs/tools/gnunet-download.c:279
 #, fuzzy, c-format
 msgid "No filename specified, using `%s' instead (for now).\n"
 msgstr "imbonerahamwe# Izina: ikoresha"
 
-#: src/applications/fs/tools/gnunet-download.c:325
+#: src/applications/fs/tools/gnunet-download.c:320
 #, fuzzy, c-format
 msgid "Could not access gnunet-directory file `%s'\n"
 msgstr "OYA bushyinguro"
 
-#: src/applications/fs/tools/gnunet-download.c:345
+#: src/applications/fs/tools/gnunet-download.c:338
 #, fuzzy, c-format
 msgid "Downloading %d files from directory `%s'.\n"
 msgstr "Idosiye Bivuye"
 
-#: src/applications/fs/tools/gnunet-download.c:349
+#: src/applications/fs/tools/gnunet-download.c:341
 #, fuzzy, c-format
 msgid "Did not find any files in directory `%s'\n"
 msgstr "OYA Gufungura bushyinguro"
 
-#: src/applications/fs/tools/gnunet-download.c:390
+#: src/applications/fs/tools/gnunet-download.c:377
 #, fuzzy, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Idosiye Nka"
 
-#: src/applications/fs/tools/gnunet-unindex.c:57
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
 "completion)                "
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:68
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, 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:80
+#: src/applications/fs/tools/gnunet-unindex.c:85
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error unindexing file: %s\n"
 msgstr "Kuri IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-unindex.c:100
+#: src/applications/fs/tools/gnunet-unindex.c:105
 #, fuzzy
 msgid "Unindex files."
 msgstr "#Idosiye"
 
-#: src/applications/fs/tools/gnunet-unindex.c:137
+#: src/applications/fs/tools/gnunet-unindex.c:142
 #, 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:164
+#: src/applications/fs/tools/gnunet-unindex.c:158
 #, fuzzy, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s'ntabwo ari idosiye"
 
-#: src/applications/fs/module/querymanager.c:225
+#: src/applications/fs/module/querymanager.c:228
 #, fuzzy
 msgid "# FS currently tracked queries from clients"
 msgstr "#Umukiriya Yoherejwe:"
 
-#: src/applications/fs/module/querymanager.c:227
+#: src/applications/fs/module/querymanager.c:230
 msgid "# FS replies passed to clients"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:336
+#: src/applications/fs/module/ondemand.c:323
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:434
+#: src/applications/fs/module/ondemand.c:418
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2105,69 +2088,69 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:461
+#: src/applications/fs/module/ondemand.c:444
 #, 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:518
+#: src/applications/fs/module/ondemand.c:495
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:681
+#: src/applications/fs/module/ondemand.c:647
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1211
+#: src/applications/fs/module/fs.c:1170
 #, 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:1224
+#: src/applications/fs/module/fs.c:1185
 msgid "# FS expired replies dropped"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1226
+#: src/applications/fs/module/fs.c:1187
 #, fuzzy
 msgid "# FS valid replies received"
 msgstr "#Gushaka Ibisubizo ku BYAKIRIWE KB"
 
-#: src/applications/fs/module/fs.c:1263
+#: src/applications/fs/module/fs.c:1220
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1303
+#: src/applications/fs/module/fs.c:1266
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:304
+#: src/applications/fs/module/migration.c:312
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:306
+#: src/applications/fs/module/migration.c:314
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:308
+#: src/applications/fs/module/migration.c:317
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/module/dht_push.c:137
+#: src/applications/fs/module/dht_push.c:138
 msgid "# blocks pushed into DHT"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:238
+#: src/applications/fs/fsui/search.c:234
 msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:308
+#: src/applications/fs/fsui/download.c:294
 #, fuzzy
 msgid "Download failed (no reason given)"
 msgstr "Idosiye Bivuye"
@@ -2176,94 +2159,94 @@
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:281
+#: src/applications/fs/fsui/upload.c:278
 #, fuzzy
 msgid "Failed to create temporary directory."
 msgstr "Kuri Kurema"
 
-#: src/applications/fs/fsui/deserialize.c:754
+#: src/applications/fs/fsui/deserialize.c:757
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:167
+#: src/applications/fs/ecrs/search.c:168
 msgid "CHK URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:226
+#: src/applications/fs/ecrs/search.c:214
 msgid "LOC URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/fs/ecrs/download.c:131
 #, fuzzy, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "OYA Kwandika Kuri IDOSIYE"
 
-#: src/applications/fs/ecrs/download.c:270
+#: src/applications/fs/ecrs/download.c:271
 #, fuzzy, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "'%s'%sByanze"
 
-#: src/applications/fs/ecrs/download.c:1043
+#: src/applications/fs/ecrs/download.c:1001
 #, fuzzy
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
 msgstr "Ibikubiyemo OYA BIHUYE Urufunguzo ni a Cyangwa a Byinjijwemo IDOSIYE"
 
-#: src/applications/fs/ecrs/download.c:1229
+#: src/applications/fs/ecrs/download.c:1184
 #, 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"
 
 # 
uui/source\ids.src:RID_UUI_ERRHDL.(ERRCODE_UUI_IO_NOTAFILE_&_ERRCODE_RES_MASK).text
-#: src/applications/fs/ecrs/upload.c:164
+#: src/applications/fs/ecrs/upload.c:155
 #, fuzzy, c-format
 msgid "`%s' is not a file.\n"
 msgstr "'%s'ntabwo ari idosiye"
 
-#: src/applications/fs/ecrs/upload.c:174
+#: src/applications/fs/ecrs/upload.c:162
 #, fuzzy, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:183
+#: src/applications/fs/ecrs/upload.c:171
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/fs/ecrs/upload.c:195
+#: src/applications/fs/ecrs/upload.c:183
 #, fuzzy, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Ibirimo"
 
-#: src/applications/fs/ecrs/upload.c:214
+#: src/applications/fs/ecrs/upload.c:202
 #, fuzzy, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Bya in IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/fs/ecrs/upload.c:209
 #, fuzzy, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Kuri Umubarendanga Urutonde Byanze Iyinjizamo"
 
-#: src/applications/fs/ecrs/upload.c:236
+#: src/applications/fs/ecrs/upload.c:223
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:316
+#: src/applications/fs/ecrs/upload.c:296
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:854
+#: src/applications/fs/ecrs/meta.c:876
 #, fuzzy, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Bya IDOSIYE Kuri Byanze"
 
-#: src/applications/fs/ecrs/meta.c:862
+#: src/applications/fs/ecrs/meta.c:884
 #, fuzzy, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "OYA Guhindura izina IDOSIYE Kuri IDOSIYE"
@@ -2273,80 +2256,80 @@
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Kurema IDOSIYE"
 
-#: src/applications/fs/ecrs/namespace.c:343
-#: src/applications/fs/ecrs/namespace.c:426
-#: src/applications/fs/ecrs/namespace.c:585
+#: src/applications/fs/ecrs/namespace.c:325
+#: src/applications/fs/ecrs/namespace.c:404
+#: src/applications/fs/ecrs/namespace.c:545
 #, fuzzy, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Idosiye OYA a"
 
-#: src/applications/fs/ecrs/namespace.c:355
-#: src/applications/fs/ecrs/namespace.c:437
+#: src/applications/fs/ecrs/namespace.c:337
+#: src/applications/fs/ecrs/namespace.c:415
 #, fuzzy, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/fs/ecrs/namespace.c:599
-#: src/applications/fs/ecrs/namespace.c:610
+#: src/applications/fs/ecrs/namespace.c:556
+#: src/applications/fs/ecrs/namespace.c:567
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/fs/ecrs/helper.c:67
+#: src/applications/fs/ecrs/helper.c:74
 #, fuzzy
 msgid "No keywords specified!\n"
 msgstr "Amagambo fatizo"
 
-#: 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
+#: src/applications/fs/ecrs/helper.c:127 src/applications/fs/ecrs/helper.c:129
+#: src/applications/fs/ecrs/helper.c:133 src/applications/fs/ecrs/helper.c:138
 msgid "AND"
 msgstr ""
 
-#: src/applications/fs/ecrs/parser.c:122
+#: src/applications/fs/ecrs/parser.c:120
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:131
+#: src/applications/fs/uritrack/file_info.c:126
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:402
+#: src/applications/fs/uritrack/file_info.c:395
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:727
+#: src/applications/fs/namespace/namespace_info.c:655
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:748
+#: src/applications/fs/namespace/namespace_info.c:675
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:382
+#: src/applications/topology_f2f/topology.c:373
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
 
-#: src/applications/topology_f2f/topology.c:400
+#: src/applications/topology_f2f/topology.c:390
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:413
+#: src/applications/topology_f2f/topology.c:404
 #, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:519
+#: src/applications/topology_f2f/topology.c:511
 msgid "maintains a friend-to-friend restricted topology"
 msgstr ""
 
-#: src/applications/template/template.c:62
+#: src/applications/template/template.c:68
 #, c-format
 msgid "`%s' registering client handler %d and %d\n"
 msgstr ""
@@ -2356,50 +2339,50 @@
 msgid "Template description."
 msgstr "/ku Isobanuramiterere"
 
-#: src/applications/bootstrap_http/http.c:105
+#: src/applications/bootstrap_http/http.c:102
 #, c-format
 msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:176
+#: src/applications/bootstrap_http/http.c:170
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:211
+#: src/applications/bootstrap_http/http.c:210
 #, c-format
 msgid "Bootstrapping using `%s'.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:237
+#: src/applications/bootstrap_http/http.c:224
 #, c-format
 msgid "Trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:388
+#: src/applications/bootstrap_http/http.c:352
 #, fuzzy, c-format
 msgid "Downloaded %llu bytes from `%s'.\n"
 msgstr "Idosiye Bivuye"
 
-#: src/applications/bootstrap_http/http.c:421
+#: src/applications/bootstrap_http/http.c:385
 msgid "# HELLOs downloaded via http"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:441
+#: src/applications/traffic/traffic.c:454
 #, fuzzy, c-format
 msgid "# bytes transmitted of type %d"
 msgstr "#Bayite Bya Ubwoko"
 
-#: src/applications/traffic/traffic.c:459
+#: src/applications/traffic/traffic.c:470
 #, fuzzy, c-format
 msgid "# bytes received of type %d"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/applications/traffic/traffic.c:478
+#: src/applications/traffic/traffic.c:489
 #, fuzzy, c-format
 msgid "# bytes received in plaintext of type %d"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/applications/traffic/traffic.c:639
+#: src/applications/traffic/traffic.c:644
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -2407,396 +2390,396 @@
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:326
+#: src/applications/vpn/vpn.c:366
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:334
+#: src/applications/vpn/vpn.c:377
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:362
+#: src/applications/vpn/vpn.c:410
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:411
+#: src/applications/vpn/vpn.c:466
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:415
+#: src/applications/vpn/vpn.c:472
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:425
+#: src/applications/vpn/vpn.c:488
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:485
+#: src/applications/vpn/vpn.c:556
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:489
+#: src/applications/vpn/vpn.c:562
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:518
+#: src/applications/vpn/vpn.c:594
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:526
+#: src/applications/vpn/vpn.c:606
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:530
+#: src/applications/vpn/vpn.c:614
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:568
+#: src/applications/vpn/vpn.c:655
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:572
+#: src/applications/vpn/vpn.c:664
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:579
+#: src/applications/vpn/vpn.c:674
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:584
+#: src/applications/vpn/vpn.c:682
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:592
+#: src/applications/vpn/vpn.c:694
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:604
+#: src/applications/vpn/vpn.c:707
 #, 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:615
+#: src/applications/vpn/vpn.c:721
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:627
+#: src/applications/vpn/vpn.c:733
 #, 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:660
+#: src/applications/vpn/vpn.c:774
 msgid ""
 "RFC4193 We have run out of memory and so I can't store a tunnel for this "
 "peer.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:706
+#: src/applications/vpn/vpn.c:822
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:769
+#: src/applications/vpn/vpn.c:895
 #, c-format
 msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:773
+#: src/applications/vpn/vpn.c:902
 #, c-format
 msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:791
+#: src/applications/vpn/vpn.c:921
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:831
+#: src/applications/vpn/vpn.c:968
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:835
+#: src/applications/vpn/vpn.c:974
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:841
+#: src/applications/vpn/vpn.c:981
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:844
+#: src/applications/vpn/vpn.c:985
 #, fuzzy, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr "Subiza Bya Kitazwi Ubwoko"
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:996
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:873
+#: src/applications/vpn/vpn.c:1022
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:894
+#: src/applications/vpn/vpn.c:1043
 #, fuzzy
 msgid "Receive route request\n"
 msgstr "Gikora"
 
-#: src/applications/vpn/vpn.c:899
+#: src/applications/vpn/vpn.c:1050
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:910
+#: src/applications/vpn/vpn.c:1065
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:916
+#: src/applications/vpn/vpn.c:1071
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:932
+#: src/applications/vpn/vpn.c:1088
 #, fuzzy
 msgid "Receive route announce.\n"
 msgstr "Subiza Bya Kitazwi Ubwoko"
 
-#: src/applications/vpn/vpn.c:936
+#: src/applications/vpn/vpn.c:1094
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:940
+#: src/applications/vpn/vpn.c:1100
 #, fuzzy, c-format
 msgid "Inserting with hops %d\n"
 msgstr "Uburyo"
 
-#: src/applications/vpn/vpn.c:954
+#: src/applications/vpn/vpn.c:1119
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:969
+#: src/applications/vpn/vpn.c:1137
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:997
+#: src/applications/vpn/vpn.c:1168
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1012
+#: src/applications/vpn/vpn.c:1188
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1057
+#: src/applications/vpn/vpn.c:1239
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1103
+#: src/applications/vpn/vpn.c:1292
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1129
+#: src/applications/vpn/vpn.c:1324
 msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1190 src/setup/ncurses/wizard_curs.c:105
+#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:95
 #, fuzzy
 msgid "Yes"
 msgstr "Yego"
 
-#: src/applications/vpn/vpn.c:1190 src/setup/ncurses/wizard_curs.c:104
+#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:94
 #, fuzzy
 msgid "No"
 msgstr "Oya."
 
-#: src/applications/vpn/vpn.c:1398
+#: src/applications/vpn/vpn.c:1647
 #, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1399
+#: src/applications/vpn/vpn.c:1650
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1449
+#: src/applications/vpn/vpn.c:1723
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1481
+#: src/applications/vpn/vpn.c:1757
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1494
+#: src/applications/vpn/vpn.c:1771
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1509
+#: src/applications/vpn/vpn.c:1788
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/dstore/dstore.c:555
+#: src/applications/dstore/dstore.c:466
 #, fuzzy
 msgid "# bytes in dstore"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/server/gnunet-update.c:143
+#: src/server/gnunet-update.c:147
 #, fuzzy, c-format
 msgid "Updating data for module `%s'\n"
 msgstr "Ibyatanzwe kugirango Modire"
 
-#: src/server/gnunet-update.c:148
+#: src/server/gnunet-update.c:151
 #, fuzzy, c-format
 msgid "Failed to update data for module `%s'\n"
 msgstr "Kuri Kuvugurura Ibyatanzwe kugirango Modire"
 
-#: src/server/gnunet-update.c:196 src/server/gnunetd.c:144
+#: src/server/gnunet-update.c:198 src/server/gnunetd.c:136
 #, fuzzy
 msgid "Core initialization failed.\n"
 msgstr "OYA Iyinjizamo Byanze"
 
-#: src/server/gnunet-update.c:237
+#: src/server/gnunet-update.c:239
 #, fuzzy
 msgid "print a value from the configuration file to stdout"
 msgstr "Gucapa a Agaciro Bivuye i Iboneza IDOSIYE Kuri"
 
-#: src/server/gnunet-update.c:239
+#: src/server/gnunet-update.c:241
 #, fuzzy
 msgid "Updates GNUnet datastructures after version change."
 msgstr "Nyuma Verisiyo Guhindura>>"
 
-#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:401
+#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:365
 #, fuzzy
 msgid "run as user LOGIN"
 msgstr "Gukoresha Nka Ukoresha:"
 
-#: src/server/gnunet-update.c:246
+#: src/server/gnunet-update.c:249
 #, fuzzy
 msgid "run in client mode (for getting client configuration values)"
 msgstr "Gukoresha in Ukoresha: Ubwoko kugirango Ukoresha: Iboneza Uduciro"
 
-#: src/server/connection.c:1116
+#: src/server/connection.c:1188
 #, fuzzy, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "'%s'Byahiswemo Inyuma Bya Ubutumwa"
 
-#: src/server/connection.c:1125
+#: src/server/connection.c:1197
 #, fuzzy, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Birambuye Uburebure By'ibanze"
 
-#: src/server/connection.c:2594
+#: src/server/connection.c:2744
 #, fuzzy, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bivuye Sibyo Imiterere"
 
-#: src/server/connection.c:2679
+#: src/server/connection.c:2829
 #, fuzzy, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Umubare Bya"
 
-#: src/server/connection.c:2698
+#: src/server/connection.c:2851
 #, fuzzy
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
 
-#: src/server/connection.c:3154
+#: src/server/connection.c:3337
 #, fuzzy
 msgid "# outgoing messages dropped"
 msgstr "#Ubutumwa"
 
-#: src/server/connection.c:3158
+#: src/server/connection.c:3340
 #, fuzzy
 msgid "# bytes of outgoing messages dropped"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:3160
+#: src/server/connection.c:3342
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3163
+#: src/server/connection.c:3345
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:3167
+#: src/server/connection.c:3349
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "#Bayite Bya Ubwoko"
 
-#: src/server/connection.c:3171
+#: src/server/connection.c:3353
 #, fuzzy
 msgid "# bytes received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:3174
+#: src/server/connection.c:3355
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:3176
+#: src/server/connection.c:3356
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/server/connection.c:3178
+#: src/server/connection.c:3359
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3180
+#: src/server/connection.c:3362
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:3182
+#: src/server/connection.c:3365
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
 
-#: src/server/connection.c:3184
+#: src/server/connection.c:3369
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3186
+#: src/server/connection.c:3373
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3188
+#: src/server/connection.c:3377
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
-#: src/server/startup.c:207
+#: src/server/startup.c:206
 #, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
 msgstr ""
 
-#: src/server/startup.c:224
+#: src/server/startup.c:223
 #, c-format
 msgid ""
 "Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
 "address@hidden"
 msgstr ""
 
-#: src/server/startup.c:238
+#: src/server/startup.c:237
 #, c-format
 msgid ""
 "Limiting datastore size to %llu GB, because the `%s' filesystem does not "
@@ -2804,12 +2787,12 @@
 "partition!\n"
 msgstr ""
 
-#: src/server/startup.c:285
+#: src/server/startup.c:274
 #, c-format
 msgid "Insufficient access permissions for `%s': %s\n"
 msgstr ""
 
-#: src/server/gnunetd.c:84
+#: src/server/gnunetd.c:85
 #, fuzzy, c-format
 msgid "`%s' startup complete.\n"
 msgstr "'%s'Byuzuye"
@@ -2819,218 +2802,218 @@
 msgid "`%s' is shutting down.\n"
 msgstr "'%s'ni Hasi"
 
-#: src/server/gnunetd.c:206
+#: src/server/gnunetd.c:192
 #, fuzzy
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
 msgstr "Gukoresha in Kosora amakosa Ubwoko OYA Na Ikosa Ubutumwa Kuri Bya a"
 
-#: src/server/gnunetd.c:210
+#: src/server/gnunetd.c:196
 #, fuzzy
 msgid "Starts the gnunetd daemon."
 msgstr "i"
 
-#: src/server/gnunetd.c:213
+#: src/server/gnunetd.c:199
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:216
+#: src/server/gnunetd.c:203
 msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:220
+#: src/server/gnunetd.c:207
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "Ubuturo ku ni"
 
-#: src/server/gnunetd.c:288
+#: src/server/gnunetd.c:271
 #, fuzzy, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: src/server/core.c:124
+#: src/server/core.c:126
 #, fuzzy, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr "Modire"
 
-#: src/server/core.c:174
+#: src/server/core.c:177
 #, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr ""
 
-#: src/server/core.c:217
+#: src/server/core.c:226
 #, fuzzy, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr "OYA Zimya Porogaramu OYA"
 
-#: src/server/core.c:225
+#: src/server/core.c:234
 #, fuzzy, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr "OYA Zimya Porogaramu OYA"
 
-#: src/server/core.c:235
+#: src/server/core.c:243
 #, fuzzy, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr "OYA Gushaka Uburyo in Isomero"
 
-#: src/server/core.c:374
+#: src/server/core.c:386
 #, fuzzy, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr "OYA Serivisi OYA"
 
-#: src/server/core.c:470
+#: src/server/core.c:492
 #, fuzzy, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "OYA Zimya Porogaramu"
 
-#: src/server/core.c:598
+#: src/server/core.c:628
 #, fuzzy, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr "OYA Kureka gufungura Serivisi"
 
-#: src/server/gnunet-transport-check.c:118
+#: src/server/gnunet-transport-check.c:121
 #, fuzzy, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "'%s':OYA Kurema"
 
-#: src/server/gnunet-transport-check.c:127
+#: src/server/gnunet-transport-check.c:128
 #, fuzzy, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "'%s':OYA Kwihuza"
 
-#: src/server/gnunet-transport-check.c:161
+#: src/server/gnunet-transport-check.c:157
 #, fuzzy, c-format
 msgid "`%s': Could not send.\n"
 msgstr "'%s':OYA Kohereza"
 
-#: src/server/gnunet-transport-check.c:183
+#: src/server/gnunet-transport-check.c:172
 #, 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:197
+#: src/server/gnunet-transport-check.c:185
 #, fuzzy, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "'%s':OYA Gucomora"
 
-#: src/server/gnunet-transport-check.c:204
+#: src/server/gnunet-transport-check.c:192
 #, 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:232
+#: src/server/gnunet-transport-check.c:222
 #, c-format
 msgid " Transport %d is not being tested\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:265
+#: src/server/gnunet-transport-check.c:251
 #, c-format
 msgid ""
 "\n"
 "Contacting `%s'."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:291
+#: src/server/gnunet-transport-check.c:276
 #, fuzzy, c-format
 msgid " Connection failed\n"
 msgstr "OYA Iyinjizamo Byanze"
 
-#: src/server/gnunet-transport-check.c:297
+#: src/server/gnunet-transport-check.c:282
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:319
 #, c-format
 msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-transport-check.c:321
 #, c-format
 msgid "OK!\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:382
+#: src/server/gnunet-transport-check.c:346
 #, fuzzy
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr "Kuri Igerageza NIBA"
 
-#: src/server/gnunet-transport-check.c:386
+#: src/server/gnunet-transport-check.c:350
 #, fuzzy
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr "Bivuye BIHUYE"
 
-#: src/server/gnunet-transport-check.c:389
+#: src/server/gnunet-transport-check.c:353
 #, fuzzy
 msgid "send COUNT messages"
 msgstr "Kohereza Ubutumwa"
 
-#: src/server/gnunet-transport-check.c:392
+#: src/server/gnunet-transport-check.c:356
 #, fuzzy
 msgid "send messages with SIZE bytes payload"
 msgstr "Kohereza Ubutumwa Na: Bayite"
 
-#: src/server/gnunet-transport-check.c:395
+#: src/server/gnunet-transport-check.c:359
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:398
+#: src/server/gnunet-transport-check.c:362
 #, fuzzy
 msgid "specifies after how many MS to time-out"
 msgstr "Nyuma Kuri Igihe Inyuma"
 
-#: src/server/gnunet-transport-check.c:406
+#: src/server/gnunet-transport-check.c:370
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:471
+#: src/server/gnunet-transport-check.c:431
 #, fuzzy, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "S"
 
-#: src/server/gnunet-transport-check.c:474
+#: src/server/gnunet-transport-check.c:433
 #, fuzzy, c-format
 msgid "Available transport(s): %s\n"
 msgstr "S"
 
-#: src/server/gnunet-transport-check.c:539
+#: src/server/gnunet-transport-check.c:474
 #, fuzzy, c-format
 msgid ""
 "\n"
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr "%dInyuma Bya Times"
 
-#: src/server/tcpserver.c:105
+#: src/server/tcpserver.c:109
 #, fuzzy, c-format
 msgid "The `%s' request received from client is malformed.\n"
 msgstr "Kubaza... BYAKIRIWE Bivuye Umukiriya ni"
 
-#: src/server/tcpserver.c:333
+#: src/server/tcpserver.c:324
 #, fuzzy, c-format
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr "OYA Kuri Umuyoboro"
 
-#: src/server/tcpserver.c:414
+#: src/server/tcpserver.c:398
 #, 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:466
+#: src/server/tcpserver.c:454
 #, fuzzy, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%sByanze Ubutumwa Ubwoko in Gukoresha"
 
-#: src/server/handler.c:401
+#: src/server/handler.c:428
 #, fuzzy, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Ubutumwa Bivuye in"
 
-#: src/server/version.c:152
+#: src/server/version.c:141
 msgid ""
 "Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
@@ -3044,41 +3027,41 @@
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:129 src/server/gnunet-peer-info.c:159
+#: src/server/gnunet-peer-info.c:122 src/server/gnunet-peer-info.c:153
 #, fuzzy, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr "OYA Kubona Aderesi Bya"
 
-#: src/server/gnunet-peer-info.c:139
+#: src/server/gnunet-peer-info.c:133
 #, fuzzy
 msgid "hello message invalid (signature invalid).\n"
 msgstr "Ubutumwa Sibyo Isinya Sibyo"
 
-#: src/server/gnunet-peer-info.c:161
+#: src/server/gnunet-peer-info.c:154
 #, fuzzy, c-format
 msgid "Peer `%s' with trust %8u\n"
 msgstr "Na: Na Aderesi"
 
-#: src/server/gnunet-peer-info.c:166
+#: src/server/gnunet-peer-info.c:158
 #, fuzzy, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Na: Na Aderesi"
 
-#: src/util/boot/startup.c:212
+#: src/util/boot/startup.c:199
 #, fuzzy, c-format
 msgid "Failed to run %s: %s %d\n"
 msgstr "Byanze Kuri Kwihuza Kuri"
 
-#: src/util/network_client/tcpio.c:94 src/util/network_client/tcpio.c:135
+#: src/util/network_client/tcpio.c:96 src/util/network_client/tcpio.c:140
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:106
+#: src/util/network_client/tcpio.c:111
 #, fuzzy, c-format
 msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'"
 msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
 
-#: src/util/network_client/tcpio.c:280
+#: src/util/network_client/tcpio.c:290
 #, fuzzy, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr ""
@@ -3098,91 +3081,91 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/util/network_client/tcpio.c:323
+#: src/util/network_client/tcpio.c:327
 #, fuzzy, c-format
 msgid "Error connecting to %s:%u\n"
 msgstr "'%s'Kuri"
 
-#: src/util/network_client/tcpio.c:336
+#: src/util/network_client/tcpio.c:338
 #, fuzzy, c-format
 msgid "Failed to connect to %s:%u in %ds\n"
 msgstr "Byanze Kuri Kwihuza Kuri"
 
-#: src/util/network_client/tcpio.c:492
+#: src/util/network_client/tcpio.c:494
 #, fuzzy, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "'%s'Byanze Subiza Sibyo"
 
-#: src/util/crypto/hostkey_gcrypt.c:1036
+#: src/util/crypto/hostkey_gcrypt.c:898
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Isinya Byanze ku"
 
-#: src/util/crypto/locking_gcrypt.c:74
+#: src/util/crypto/locking_gcrypt.c:80
 #, fuzzy, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "OYA i Ikitezwe: Verisiyo Verisiyo ni Bya ngombwa"
 
-#: src/util/os/statuscalls.c:186 src/util/os/statuscalls.c:323
+#: src/util/os/statuscalls.c:196 src/util/os/statuscalls.c:337
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Kuri Ibyatanzwe Bivuye ku"
 
-#: src/util/os/statuscalls.c:368 src/util/os/statuscalls.c:377
+#: src/util/os/statuscalls.c:380 src/util/os/statuscalls.c:390
 #, fuzzy, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
 msgstr "urusobe in Iboneza Icyiciro"
 
-#: src/util/os/semaphore.c:219
+#: src/util/os/semaphore.c:218
 #, c-format
 msgid "Can't create semaphore: %i"
 msgstr ""
 
-#: src/util/os/osconfig.c:121
+#: src/util/os/osconfig.c:124
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:379
+#: src/util/os/osconfig.c:391
 #, fuzzy, c-format
 msgid "Command `%s' failed with error code %u\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/util/os/dso.c:56
+#: src/util/os/dso.c:59
 #, fuzzy, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Bya Byanze"
 
-#: src/util/os/dso.c:110
+#: src/util/os/dso.c:119
 #, 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:152
+#: src/util/os/dso.c:159
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "'%s'Byanze Kuri Uburyo ku Na: Ikosa"
 
-#: src/util/os/cpustatus.c:426
+#: src/util/os/cpustatus.c:461
 #, fuzzy
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "Ikibazo# i Ikoresha:"
 
-#: src/util/os/cpustatus.c:446
+#: src/util/os/cpustatus.c:483
 #, fuzzy
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Ikibazo# i Ikoresha:"
 
-#: src/util/os/user.c:128 src/util/os/user.c:169
+#: src/util/os/user.c:134 src/util/os/user.c:176
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/util/os/user.c:130
+#: src/util/os/user.c:135
 msgid "No such user"
 msgstr ""
 
-#: src/util/os/user.c:143
+#: src/util/os/user.c:149
 #, fuzzy, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Guhindura>> Ukoresha: Itsinda Kuri"
@@ -3192,53 +3175,55 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Kuri"
 
-#: src/util/network/select.c:315
+#: src/util/network/select.c:304
 #, fuzzy
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/util/network/select.c:482
-msgid "select listen socket not valid!\n"
+#: src/util/network/select.c:473
+#, c-format
+msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
-#: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
+#: src/util/network/ipcheck.c:105 src/util/network/ipcheck.c:133
+#: src/util/network/ipcheck.c:180 src/util/network/ipcheck.c:204
+#: src/util/network/ipcheck.c:212
 #, fuzzy, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Imiterere kugirango"
 
-#: src/util/network/ipcheck.c:156
+#: src/util/network/ipcheck.c:162
 #, fuzzy, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "urusobe ni OYA By'amategeko in"
 
-#: src/util/network/ipcheck.c:217
+#: src/util/network/ipcheck.c:259
 #, fuzzy, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "urusobe OYA Impera Na:"
 
-#: src/util/network/ipcheck.c:250
+#: src/util/network/ipcheck.c:291
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask: %s\n"
 msgstr "Imiterere kugirango"
 
-#: src/util/network/ipcheck.c:265
+#: src/util/network/ipcheck.c:304
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Imiterere kugirango urusobe"
 
-#: src/util/network/ip.c:202
+#: src/util/network/ip.c:195
 #, fuzzy, c-format
 msgid ""
 "Could not find interface `%s' using `%s', trying to find another interface.\n"
 msgstr "OYA Gushaka in Kuri Gushaka"
 
-#: src/util/network/ip.c:278
+#: src/util/network/ip.c:268
 #, fuzzy, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr "OYA Gushaka Aderesi kugirango"
 
-#: src/util/network/ip.c:288
+#: src/util/network/ip.c:277
 #, fuzzy, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
@@ -3267,131 +3252,131 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/util/network/ip.c:309
+#: src/util/network/ip.c:297
 #, fuzzy, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr "OYA Kuri Aderesi"
 
-#: src/util/network/ip.c:341
+#: src/util/network/ip.c:326
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/util/disk/storage.c:202
+#: src/util/disk/storage.c:198
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "'%s'Byanze kugirango Porogaramu- shoboza"
 
-#: src/util/disk/storage.c:531
+#: src/util/disk/storage.c:526
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "'%s'Ikitezwe: Kuri a bushyinguro"
 
-#: src/util/config_impl/impl.c:289
+#: src/util/config_impl/impl.c:290
 #, 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:532
+#: src/util/config_impl/impl.c:533
 #, c-format
 msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:578
+#: src/util/config_impl/impl.c:579
 #, 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:590
+#: src/util/config_impl/impl.c:589
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:680
+#: src/util/config_impl/impl.c:672
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:122
+#: src/util/error/error.c:115
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:190 src/util/error/error.c:234
+#: src/util/error/error.c:187 src/util/error/error.c:222
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/error/error.c:193 src/util/error/error.c:236
+#: src/util/error/error.c:189 src/util/error/error.c:224
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:196 src/util/error/error.c:240
+#: src/util/error/error.c:191 src/util/error/error.c:228
 msgid "WARNING"
 msgstr ""
 
-#: src/util/error/error.c:199 src/util/error/error.c:242
+#: src/util/error/error.c:193 src/util/error/error.c:230
 msgid "ERROR"
 msgstr ""
 
-#: src/util/error/error.c:202 src/util/error/error.c:244
+#: src/util/error/error.c:195 src/util/error/error.c:232
 msgid "FATAL"
 msgstr ""
 
-#: src/util/error/error.c:205 src/util/error/error.c:246
+#: src/util/error/error.c:197 src/util/error/error.c:234
 #, fuzzy
 msgid "USER"
 msgstr "Umubare"
 
-#: src/util/error/error.c:208 src/util/error/error.c:248
+#: src/util/error/error.c:199 src/util/error/error.c:236
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:211 src/util/error/error.c:250
+#: src/util/error/error.c:201 src/util/error/error.c:238
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:214 src/util/error/error.c:252
+#: src/util/error/error.c:203 src/util/error/error.c:240
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:217 src/util/error/error.c:254
+#: src/util/error/error.c:205 src/util/error/error.c:242
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:220 src/util/error/error.c:256
+#: src/util/error/error.c:207 src/util/error/error.c:244
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:223
+#: src/util/error/error.c:209
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:238
+#: src/util/error/error.c:226
 msgid "INFO"
 msgstr ""
 
-#: src/util/error/error.c:257
+#: src/util/error/error.c:245
 msgid "NOTHING"
 msgstr ""
 
-#: src/util/threads/mutex.c:145 src/util/threads/semaphore.c:174
-#: src/util/threads/pthread.c:150
+#: src/util/threads/mutex.c:144 src/util/threads/semaphore.c:166
+#: src/util/threads/pthread.c:154
 #, fuzzy, c-format
 msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 msgstr "Binini Bayite ku"
 
-#: src/util/threads/mutex.c:154 src/util/threads/mutex.c:194
+#: src/util/threads/mutex.c:152 src/util/threads/mutex.c:194
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Inkoresha siyo"
 
-#: src/util/threads/mutex.c:159
+#: src/util/threads/mutex.c:156
 #, fuzzy, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr "Kuri ku"
@@ -3401,90 +3386,102 @@
 msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:199
+#: src/util/threads/mutex.c:198
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "kugirango ku"
 
-#: src/util/threads/pthread.c:162 src/util/threads/pthread.c:170
-#: src/util/threads/pthread.c:177 src/util/threads/pthread.c:270
+#: src/util/threads/pthread.c:165 src/util/threads/pthread.c:171
+#: src/util/threads/pthread.c:176 src/util/threads/pthread.c:264
 #, fuzzy, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/util/threads/pthread.c:184 src/util/threads/pthread.c:281
+#: src/util/threads/pthread.c:181 src/util/threads/pthread.c:273
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/util/loggers/file.c:231
+#: src/util/loggers/file.c:229
 #, fuzzy, c-format
 msgid "Failed to open log-file `%s': %s\n"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/util/loggers/file.c:256
+#: src/util/loggers/file.c:248
 msgid "GNUnet error log"
 msgstr ""
 
-#: src/util/loggers/memory.c:71
+#: src/util/loggers/file.c:265 src/util/loggers/file.c:282
+#: src/include/gnunet_util_error.h:243 src/include/gnunet_util_error.h:250
+#: src/include/gnunet_util_error.h:257 src/include/gnunet_util_error.h:264
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
+msgstr "'%s'Byanze ku Na: Ikosa"
+
+#: src/util/loggers/memory.c:70
 msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:681
+#: src/util/getopt/getopt.c:684
 #, fuzzy, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s:Ihitamo ni"
 
-#: src/util/getopt/getopt.c:705
+#: src/util/getopt/getopt.c:710
 #, fuzzy, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s:Ihitamo OYA Kwemerera"
 
-#: src/util/getopt/getopt.c:710
+#: src/util/getopt/getopt.c:716
 #, fuzzy, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s:Ihitamo OYA Kwemerera"
 
-#: src/util/getopt/getopt.c:727 src/util/getopt/getopt.c:901
+#: src/util/getopt/getopt.c:737 src/util/getopt/getopt.c:909
 #, fuzzy, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt/getopt.c:757
+#: src/util/getopt/getopt.c:767
 #, fuzzy, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt/getopt.c:761
+#: src/util/getopt/getopt.c:771
 #, fuzzy, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt/getopt.c:787
+#: src/util/getopt/getopt.c:797
 #, fuzzy, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt/getopt.c:790
+#: src/util/getopt/getopt.c:799
 #, fuzzy, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s:Sibyo Ihitamo"
 
-#: src/util/getopt/getopt.c:820 src/util/getopt/getopt.c:950
+#: src/util/getopt/getopt.c:828 src/util/getopt/getopt.c:958
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt/getopt.c:867
+#: src/util/getopt/getopt.c:876
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s:Ihitamo ni"
 
-#: src/util/getopt/getopt.c:885
+#: src/util/getopt/getopt.c:894
 #, fuzzy, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s:Ihitamo OYA Kwemerera"
 
+#: src/util/getopt/getopt.c:1071 src/setup/gnunet-setup.c:273
+#, fuzzy, c-format
+msgid "Use --help to get a list of options.\n"
+msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
+
 #: src/util/getopt/setoption.c:58
 #, c-format
 msgid ""
@@ -3492,18 +3489,18 @@
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
+#: src/util/getopt/setoption.c:136 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
+#: src/util/getopt/printhelp.c:49
 #, fuzzy, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "kugirango Amahitamo kugirango Amahitamo"
 
-#: src/util/string/string.c:121
+#: src/util/string/string.c:120
 msgid "ms"
 msgstr ""
 
@@ -3511,200 +3508,200 @@
 msgid "s"
 msgstr ""
 
-#: src/util/string/string.c:129
+#: src/util/string/string.c:130
 msgid "m"
 msgstr ""
 
-#: src/util/string/string.c:132
+#: src/util/string/string.c:134
 msgid "h"
 msgstr ""
 
-#: src/util/string/string.c:135
+#: src/util/string/string.c:138
 #, fuzzy
 msgid " days"
 msgstr "7 Iminsi"
 
-#: src/util/string/string.c:153
+#: src/util/string/string.c:154
 msgid "b"
 msgstr ""
 
-#: src/util/string/string.c:158
+#: src/util/string/string.c:160
 msgid "KiB"
 msgstr ""
 
-#: src/util/string/string.c:161
+#: src/util/string/string.c:164
 msgid "MiB"
 msgstr ""
 
-#: src/util/string/string.c:164
+#: src/util/string/string.c:168
 msgid "GiB"
 msgstr ""
 
-#: src/util/string/string.c:167
+#: src/util/string/string.c:172
 msgid "TiB"
 msgstr ""
 
-#: src/util/string/string.c:287
+#: src/util/string/string.c:284
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:60
+#: src/setup/gnunet-setup.c:59
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:62
+#: src/setup/gnunet-setup.c:61
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:188
+#: src/setup/gnunet-setup.c:176
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Komandi: Umurongo ingingo"
 
-#: src/setup/gnunet-setup.c:193
+#: src/setup/gnunet-setup.c:181
 #, fuzzy
 msgid "No interface specified, using default\n"
 msgstr "imbonerahamwe# Izina: ikoresha"
 
 # 
uui/source\ids.src:RID_UUI_ERRHDL.(ERRCODE_UUI_IO_NOTAFILE_&_ERRCODE_RES_MASK).text
-#: src/setup/gnunet-setup.c:268
+#: src/setup/gnunet-setup.c:255
 #, fuzzy, c-format
 msgid "`%s' is not available."
 msgstr "'%s'ntabwo ari idosiye"
 
-#: src/setup/gnunet-setup.c:284
+#: src/setup/gnunet-setup.c:272
 #, fuzzy, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Imiterere Verisiyo"
 
-#: src/setup/gnunet-win-tool.c:54
+#: src/setup/gnunet-win-tool.c:55
 msgid "list all network adapters"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:57
+#: src/setup/gnunet-win-tool.c:58
 msgid "install GNUnet as Windows service"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:60
+#: src/setup/gnunet-win-tool.c:61
 msgid "uninstall GNUnet service"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:63
+#: src/setup/gnunet-win-tool.c:64
 msgid "increase the maximum number of TCP/IP connections"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:66
+#: src/setup/gnunet-win-tool.c:67
 msgid "display a file's hash value"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:121
+#: src/setup/gnunet-win-tool.c:126
 #, c-format
 msgid "GNUnet service installed successfully.\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:151
+#: src/setup/gnunet-win-tool.c:129 src/setup/gnunet-win-tool.c:157
 #, c-format
 msgid "This version of Windows doesn't support services.\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:128 src/setup/gnunet-win-tool.c:155
+#: src/setup/gnunet-win-tool.c:133 src/setup/gnunet-win-tool.c:161
 #, c-format
 msgid "Error: can't open Service Control Manager: %s\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:133
+#: src/setup/gnunet-win-tool.c:138
 #, c-format
 msgid "Error: can't create service: %s\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:136 src/setup/gnunet-win-tool.c:167
+#: src/setup/gnunet-win-tool.c:141 src/setup/gnunet-win-tool.c:173
 #, fuzzy, c-format
 msgid "Unknown error.\n"
 msgstr "Verisiyo"
 
-#: src/setup/gnunet-win-tool.c:148
+#: src/setup/gnunet-win-tool.c:154
 #, fuzzy, c-format
 msgid "Service deleted.\n"
 msgstr "/Byahiswemo"
 
-#: src/setup/gnunet-win-tool.c:160
+#: src/setup/gnunet-win-tool.c:166
 #, c-format
 msgid "Error: can't access service: %s\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:164
+#: src/setup/gnunet-win-tool.c:170
 #, c-format
 msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:430
+#: src/setup/gtk/gconf.c:387
 msgid "Description"
 msgstr "Insobanuramiterere"
 
-#: src/setup/gtk/gconf.c:448
+#: src/setup/gtk/gconf.c:403
 msgid "Value"
 msgstr "Agaciro"
 
-#: src/setup/gtk/gconf.c:469
+#: src/setup/gtk/gconf.c:427
 msgid "Default"
 msgstr ""
 
 # sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: src/setup/gtk/gconf.c:483 src/setup/ncurses/wizard_curs.c:77
+#: src/setup/gtk/gconf.c:442 src/setup/ncurses/wizard_curs.c:73
 #, fuzzy
 msgid "Help"
 msgstr "/Kugoboka"
 
-#: src/setup/gtk/gconf.c:497
+#: src/setup/gtk/gconf.c:456
 #, fuzzy
 msgid "Section"
 msgstr "Insobanuramiterere"
 
-#: src/setup/gtk/gconf.c:509
+#: src/setup/gtk/gconf.c:467
 #, fuzzy
 msgid "Option"
 msgstr "ibirindiro"
 
-#: src/setup/gtk/gconf.c:531
+#: src/setup/gtk/gconf.c:490
 msgid "Configuration saved."
 msgstr ""
 
-#: src/setup/gtk/gconf.c:539
+#: src/setup/gtk/gconf.c:500
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "OYA Iboneza IDOSIYE"
 
-#: src/setup/gtk/gconf.c:562
+#: src/setup/gtk/gconf.c:526
 msgid "Configuration changed. Save?"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:573
+#: src/setup/gtk/gconf.c:539
 #, fuzzy
 msgid "Error saving configuration."
 msgstr "Zimya Iyemeza Bivuye"
 
-#: src/setup/gtk/wizard_gtk.c:145
+#: src/setup/gtk/wizard_gtk.c:144
 msgid "(unknown connection)"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:428 src/setup/ncurses/wizard_curs.c:466
+#: src/setup/gtk/wizard_gtk.c:413 src/setup/ncurses/wizard_curs.c:453
 #, fuzzy, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "OYA Iboneza IDOSIYE"
 
-#: src/setup/gtk/wizard_gtk.c:450
+#: src/setup/gtk/wizard_gtk.c:437
 msgid "Do you want to save the new configuration?"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:480
+#: src/setup/gtk/wizard_gtk.c:469
 msgid "Unable to create user account:"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:490
+#: src/setup/gtk/wizard_gtk.c:477
 msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:505
+#: src/setup/gtk/wizard_gtk.c:492
 msgid ""
 "Running gnunet-update failed.\n"
 "This maybe due to insufficient permissions, please check your "
@@ -3712,132 +3709,132 @@
 "Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/setup/text/conf.c:75
+#: src/setup/text/conf.c:79
 msgid "yes"
 msgstr ""
 
-#: src/setup/text/conf.c:76
+#: src/setup/text/conf.c:80
 msgid "no"
 msgstr ""
 
-#: src/setup/text/conf.c:104
+#: src/setup/text/conf.c:105
 #, c-format
 msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/text/conf.c:116
+#: src/setup/text/conf.c:114
 msgid "\tPossible choices:\n"
 msgstr ""
 
-#: src/setup/text/conf.c:124
+#: src/setup/text/conf.c:122
 msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:126
+#: src/setup/text/conf.c:124
 #, c-format
 msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/text/conf.c:147
+#: src/setup/text/conf.c:142
 #, c-format
 msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/text/conf.c:152
+#: src/setup/text/conf.c:146
 #, c-format
 msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/text/conf.c:158
+#: src/setup/text/conf.c:152
 #, c-format
 msgid ""
 "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
 "value %llu): "
 msgstr ""
 
-#: src/setup/text/conf.c:191
+#: src/setup/text/conf.c:186
 #, fuzzy, c-format
 msgid "Yes\n"
 msgstr "Yego"
 
-#: src/setup/text/conf.c:196
+#: src/setup/text/conf.c:191
 #, fuzzy, c-format
 msgid "No\n"
 msgstr "Oya."
 
 # sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: src/setup/text/conf.c:199 src/setup/text/conf.c:235
-#: src/setup/text/conf.c:261 src/setup/text/conf.c:318
-#: src/setup/text/conf.c:370
+#: src/setup/text/conf.c:194 src/setup/text/conf.c:235
+#: src/setup/text/conf.c:265 src/setup/text/conf.c:328
+#: src/setup/text/conf.c:386
 #, fuzzy, c-format
 msgid "Help\n"
 msgstr "/Kugoboka"
 
-#: src/setup/text/conf.c:202 src/setup/text/conf.c:215
-#: src/setup/text/conf.c:270 src/setup/text/conf.c:299
-#: src/setup/text/conf.c:351
+#: src/setup/text/conf.c:197 src/setup/text/conf.c:212
+#: src/setup/text/conf.c:275 src/setup/text/conf.c:306
+#: src/setup/text/conf.c:364
 #, c-format
 msgid "Abort\n"
 msgstr ""
 
-#: src/setup/text/conf.c:342 src/setup/text/conf.c:397
+#: src/setup/text/conf.c:353 src/setup/text/conf.c:415
 #, c-format
 msgid ""
 "\n"
 "Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/text/conf.c:403
+#: src/setup/text/conf.c:421
 #, c-format
 msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:477
+#: src/setup/text/conf.c:482
 msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/setup/text/conf.c:488
+#: src/setup/text/conf.c:491
 msgid "Aborted.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:510
+#: src/setup/text/conf.c:504
 #, fuzzy
 msgid "Invalid entry.\n"
 msgstr "ingingo"
 
-#: src/setup/text/conf.c:529
+#: src/setup/text/conf.c:521
 #, c-format
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:560
+#: src/setup/text/conf.c:552
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:561
+#: src/setup/text/conf.c:553
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:575 src/setup/ncurses/mconf.c:519
+#: src/setup/text/conf.c:565 src/setup/ncurses/mconf.c:511
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: src/setup/text/conf.c:580
+#: src/setup/text/conf.c:571
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:592
+#: src/setup/text/conf.c:586
 #, fuzzy, c-format
 msgid "Configuration was unchanged, no need to save.\n"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: src/setup/text/conf.c:597
+#: src/setup/text/conf.c:595
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Gufungura Iboneza IDOSIYE"
@@ -3854,78 +3851,78 @@
 msgid "Cancel"
 msgstr "Kureka"
 
-#: src/setup/ncurses/mconf.c:175 src/setup/ncurses/mconf.c:278
-#: src/setup/ncurses/mconf.c:356 src/setup/ncurses/mconf.c:462
-#: src/setup/ncurses/wizard_curs.c:121 src/setup/ncurses/wizard_curs.c:191
-#: src/setup/ncurses/wizard_curs.c:307
+#: src/setup/ncurses/mconf.c:179 src/setup/ncurses/mconf.c:278
+#: src/setup/ncurses/mconf.c:359 src/setup/ncurses/mconf.c:455
+#: src/setup/ncurses/wizard_curs.c:110 src/setup/ncurses/wizard_curs.c:174
+#: src/setup/ncurses/wizard_curs.c:290
 msgid "Internal error! (Choice invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:213 src/setup/ncurses/mconf.c:408
+#: src/setup/ncurses/mconf.c:212 src/setup/ncurses/mconf.c:403
 msgid "Internal error! (Value invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:399
+#: src/setup/ncurses/mconf.c:392
 msgid "Invalid input, expecting floating point value."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:447
+#: src/setup/ncurses/mconf.c:435
 msgid "Invalid input, expecting integer."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:453
+#: src/setup/ncurses/mconf.c:443
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:505 src/setup/ncurses/wizard_curs.c:562
+#: src/setup/ncurses/mconf.c:499 src/setup/ncurses/wizard_curs.c:534
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "Umubare Bya Amasubiramo"
 
-#: src/setup/ncurses/mconf.c:523
+#: src/setup/ncurses/mconf.c:517
 msgid "Do you wish to save your new configuration?"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:534
+#: src/setup/ncurses/mconf.c:531
 #, fuzzy, c-format
 msgid ""
 "\n"
 "End of configuration.\n"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/setup/ncurses/mconf.c:537
+#: src/setup/ncurses/mconf.c:536
 #, c-format
 msgid ""
 "\n"
 "Your configuration changes were NOT saved.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:67 src/setup/lib/wizard_util.c:131
-#: src/setup/lib/wizard_util.c:176
+#: src/setup/ncurses/wizard_curs.c:65 src/setup/lib/wizard_util.c:139
+#: src/setup/lib/wizard_util.c:194
 msgid "Error"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:86
+#: src/setup/ncurses/wizard_curs.c:80
 msgid "Error!"
 msgstr ""
 
 # offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
-#: src/setup/ncurses/wizard_curs.c:153
+#: src/setup/ncurses/wizard_curs.c:142
 #, fuzzy
 msgid "Abort"
 msgstr "Ibyerekeye"
 
-#: src/setup/ncurses/wizard_curs.c:154
+#: src/setup/ncurses/wizard_curs.c:143
 msgid "Ok"
 msgstr "Oke"
 
-#: src/setup/ncurses/wizard_curs.c:222 src/setup/ncurses/wizard_curs.c:290
-#: src/setup/ncurses/wizard_curs.c:443
+#: src/setup/ncurses/wizard_curs.c:209 src/setup/ncurses/wizard_curs.c:275
+#: src/setup/ncurses/wizard_curs.c:426
 #, fuzzy
 msgid "GNUnet configuration"
 msgstr "Umubare Bya Amasubiramo"
 
-#: src/setup/ncurses/wizard_curs.c:223
+#: src/setup/ncurses/wizard_curs.c:211
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -3942,35 +3939,35 @@
 "the GNUnet team"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:291
+#: src/setup/ncurses/wizard_curs.c:277
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:312 src/setup/ncurses/wizard_curs.c:325
+#: src/setup/ncurses/wizard_curs.c:295 src/setup/ncurses/wizard_curs.c:309
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
 "you are using DSL."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:323
+#: src/setup/ncurses/wizard_curs.c:306
 msgid "Network configuration: interface"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:324
+#: src/setup/ncurses/wizard_curs.c:308
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:335
+#: src/setup/ncurses/wizard_curs.c:319
 #, fuzzy
 msgid "Network configuration: NAT"
 msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/setup/ncurses/wizard_curs.c:336
+#: src/setup/ncurses/wizard_curs.c:320
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3981,16 +3978,16 @@
 "forwarding\")."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:349
+#: src/setup/ncurses/wizard_curs.c:333
 #, fuzzy
 msgid "Network configuration: IP"
 msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/setup/ncurses/wizard_curs.c:350
+#: src/setup/ncurses/wizard_curs.c:335
 msgid "What is this computer's public IP address or hostname?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:351
+#: src/setup/ncurses/wizard_curs.c:336
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -4002,15 +3999,15 @@
 "If in doubt, leave this empty."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:366
+#: src/setup/ncurses/wizard_curs.c:351
 msgid "Bandwidth configuration: upload"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:367
+#: src/setup/ncurses/wizard_curs.c:353
 msgid "How much upstream bandwidth (in bytes/s) may be used?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:368
+#: src/setup/ncurses/wizard_curs.c:354
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -4021,15 +4018,15 @@
 "connection allows."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:380
+#: src/setup/ncurses/wizard_curs.c:366
 msgid "Bandwidth configuration: download"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:381
+#: src/setup/ncurses/wizard_curs.c:368
 msgid "How much downstream bandwidth (in bytes/s) may be used?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:382
+#: src/setup/ncurses/wizard_curs.c:369
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -4040,30 +4037,30 @@
 "connection allows."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:394
+#: src/setup/ncurses/wizard_curs.c:381
 #, fuzzy
 msgid "Quota configuration"
 msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/setup/ncurses/wizard_curs.c:395
+#: src/setup/ncurses/wizard_curs.c:382
 msgid "What is the maximum size of the datastore in MB?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:396
+#: src/setup/ncurses/wizard_curs.c:383
 msgid ""
 "The GNUnet datastore contains all content that GNUnet needs to store "
 "(indexed, inserted and migrated content)."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:409
+#: src/setup/ncurses/wizard_curs.c:393
 msgid "Daemon configuration: user account"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:410
+#: src/setup/ncurses/wizard_curs.c:394
 msgid "As which user should gnunetd be run?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:411
+#: src/setup/ncurses/wizard_curs.c:396
 msgid ""
 "For security reasons, it is a good idea to let this setup create a new user "
 "account under which the GNUnet service is started at system startup.\n"
@@ -4075,15 +4072,15 @@
 "Leave the field empty to run GNUnet with system privileges.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:429
+#: src/setup/ncurses/wizard_curs.c:411
 msgid "Daemon configuration: group account"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:430
+#: src/setup/ncurses/wizard_curs.c:412
 msgid "As which group should gnunetd be run?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:431
+#: src/setup/ncurses/wizard_curs.c:414
 msgid ""
 "For security reasons, it is a good idea to let this setup create a new group "
 "for the chosen user account.\n"
@@ -4094,144 +4091,138 @@
 "server and have access to GNUnet server data.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:444
+#: src/setup/ncurses/wizard_curs.c:428
 msgid "Do you want to automatically launch GNUnet as a system service?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:445
+#: src/setup/ncurses/wizard_curs.c:430
 msgid ""
 "If you say \"yes\" here, the GNUnet background process will be automatically "
 "started when you turn on your computer. If you say \"no\" here, you have to "
 "launch GNUnet yourself each time you want to use it."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:493
+#: src/setup/ncurses/wizard_curs.c:471
 msgid "Unable to create user account for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:507
+#: src/setup/ncurses/wizard_curs.c:478
 msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:521
+#: src/setup/ncurses/wizard_curs.c:493
 #, fuzzy
 msgid "Save configuration?"
 msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/setup/ncurses/wizard_curs.c:522
+#: src/setup/ncurses/wizard_curs.c:494
 msgid "Save configuration now?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:566
+#: src/setup/ncurses/wizard_curs.c:538
 msgid "Back"
 msgstr ""
 
-#: src/setup/lib/gns.c:278
+#: src/setup/lib/gns.c:294
 #, c-format
 msgid ""
 "Configuration does not satisfy constraints of configuration specification "
 "file `%s'!\n"
 msgstr ""
 
-#: src/setup/lib/tree.c:189
+#: src/setup/lib/tree.c:190
 #, c-format
 msgid ""
 "Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:101
+#: src/setup/lib/wizard_util.c:110
 msgid "Can't open Service Control Manager"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:106
+#: src/setup/lib/wizard_util.c:116
 msgid "Can't create service"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:111
+#: src/setup/lib/wizard_util.c:120
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:115
+#: src/setup/lib/wizard_util.c:125
 msgid "Cannot write to the regisitry"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:118
+#: src/setup/lib/wizard_util.c:128
 msgid "Can't access the service"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:122
+#: src/setup/lib/wizard_util.c:131
 msgid "Can't delete the service"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:126
+#: src/setup/lib/wizard_util.c:134
 #, fuzzy
 msgid "Unknown error"
 msgstr "itazwi"
 
-#: src/setup/lib/wizard_util.c:159
+#: src/setup/lib/wizard_util.c:170
 msgid "This version of Windows does not support multiple users."
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:163
+#: src/setup/lib/wizard_util.c:174
 #, fuzzy
 msgid "Error creating user"
 msgstr "Ivugurura Verisiyo"
 
-#: src/setup/lib/wizard_util.c:166
+#: src/setup/lib/wizard_util.c:178
 msgid "Error accessing local security policy"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:169
+#: src/setup/lib/wizard_util.c:183
 msgid "Error granting service right to user"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:172
+#: src/setup/lib/wizard_util.c:188
 msgid "Unknown error while creating a new user"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:150
+#: src/include/gnunet_util_getopt.h:153
 #, fuzzy
 msgid "print this help"
 msgstr "Gucapa iyi Ifashayobora"
 
-#: src/include/gnunet_util_getopt.h:159
+#: src/include/gnunet_util_getopt.h:162
 #, fuzzy
 msgid "print the version number"
 msgstr "Gucapa i Verisiyo Umubare"
 
-#: src/include/gnunet_util_getopt.h:165
+#: src/include/gnunet_util_getopt.h:168
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:171
+#: src/include/gnunet_util_getopt.h:174
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:177
+#: src/include/gnunet_util_getopt.h:180
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/include/gnunet_util_getopt.h:183
+#: src/include/gnunet_util_getopt.h:186
 #, fuzzy
 msgid "specify host on which gnunetd is running"
 msgstr "Ubuturo ku ni"
 
-#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:220
-#: src/include/gnunet_util_error.h:226 src/include/gnunet_util_error.h:236
-#: src/include/gnunet_util_error.h:242
+#: src/include/gnunet_util_error.h:212 src/include/gnunet_util_error.h:214
+#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:230
+#: src/include/gnunet_util_error.h:236
 #, fuzzy, c-format
 msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr "Byanze ku"
 
-#: src/include/gnunet_util_error.h:249 src/include/gnunet_util_error.h:256
-#: src/include/gnunet_util_error.h:263 src/include/gnunet_util_error.h:270
+#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
 #, 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:277 src/include/gnunet_util_error.h:284
-#, 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"
 
@@ -5152,6 +5143,40 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "specify nickname"
+#~ msgstr "Irihimbano"
+
+#, fuzzy
+#~ msgid "Start GNUnet chat client."
+#~ msgstr "Gutangira Umukiriya"
+
+#, fuzzy
+#~ msgid "Could not connect to gnunetd.\n"
+#~ msgstr "OYA Kwihuza Kuri"
+
+#, fuzzy
+#~ msgid "You must specify a nickname (use option `%s').\n"
+#~ msgstr "a Irihimbano Gukoresha Ihitamo"
+
+#, fuzzy
+#~ msgid "Could not send join message to gnunetd\n"
+#~ msgstr "OYA Kohereza Ubutumwa Kuri"
+
+#, fuzzy
+#~ msgid "Could not send message to gnunetd\n"
+#~ msgstr "OYA Kohereza Ubutumwa Kuri"
+
+#, fuzzy
+#~ msgid ""
+#~ "`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s "
+#~ "DG/%s\n"
+#~ msgstr "'%s'Byanze ku Na: Ikosa"
+
+#, fuzzy
+#~ msgid "Database failed to delete `%s'.\n"
+#~ msgstr "Kuri IDOSIYE"
+
+#, fuzzy
 #~ msgid "Store migrated content"
 #~ msgstr "#GUSHAKISHA Byinjijwemo Cyangwa Ibikubiyemo"
 
@@ -7196,10 +7221,6 @@
 #~ msgstr "Ikiranga in i Gicurasi"
 
 #, fuzzy
-#~ msgid "You must specify a keyword.\n"
-#~ msgstr "a Ijambo- banze"
-
-#, fuzzy
 #~ msgid ""
 #~ "create a new pseudonym under the given NICKNAME (with the given password "
 #~ "if specified)"
@@ -7523,10 +7544,6 @@
 #~ msgstr "Ikosa in Kuri"
 
 #, fuzzy
-#~ msgid "Failed to send '%s' message to gnunetd\n"
-#~ msgstr "Kuri Kohereza Ubutumwa Kuri"
-
-#, fuzzy
 #~ msgid "Unexpected reply to '%s' operation.\n"
 #~ msgstr "Subiza Kuri"
 

Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po     2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/po/sv.po     2007-07-30 06:21:56 UTC (rev 5387)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-07 02:38-0600\n"
+"POT-Creation-Date: 2007-07-30 00:16-0600\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -15,86 +15,86 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/transports/ip6.c:72 src/util/network/io.c:80
+#: src/transports/ip6.c:75 src/util/network/io.c:85
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:104 src/util/network/ip.c:83 src/util/network/ip.c:144
+#: src/transports/ip6.c:104 src/util/network/ip.c:84 src/util/network/ip.c:146
 #, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr ""
 "Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%s"
 "\"!\n"
 
-#: src/transports/ip6.c:134 src/util/network/ip.c:113
-#: src/util/network/ip.c:234
+#: src/transports/ip6.c:135 src/util/network/ip.c:115
+#: src/util/network/ip.c:221
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 
-#: src/transports/ip6.c:169
+#: src/transports/ip6.c:167
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transports/ip6.c:222 src/transports/ip.c:59
+#: src/transports/ip6.c:219 src/transports/ip.c:60
 #, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr ""
 
-#: src/transports/udp6.c:129 src/transports/udp.c:137
+#: src/transports/udp6.c:123 src/transports/udp.c:129
 #, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transports/udp6.c:268
+#: src/transports/udp6.c:264
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/udp6.c:500 src/transports/udp.c:547
+#: src/transports/udp6.c:471 src/transports/udp.c:514
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/http.c:504
+#: src/transports/http.c:522
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
 
-#: src/transports/http.c:793 src/transports/http.c:892
-#: src/transports/http.c:1030 src/transports/http.c:1163
-#: src/transports/upnp/upnp.c:335 src/transports/upnp/upnp.c:591
-#: src/applications/bootstrap_http/http.c:124
-#: src/applications/bootstrap_http/http.c:269
-#: src/applications/bootstrap_http/http.c:290
-#: src/applications/bootstrap_http/http.c:324
-#: src/applications/bootstrap_http/http.c:342
-#: src/applications/bootstrap_http/http.c:356
-#: src/applications/bootstrap_http/http.c:368
-#: src/applications/bootstrap_http/http.c:380
+#: src/transports/http.c:813 src/transports/http.c:892
+#: src/transports/http.c:1007 src/transports/http.c:1147
+#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:540
+#: src/applications/bootstrap_http/http.c:115
+#: src/applications/bootstrap_http/http.c:247
+#: src/applications/bootstrap_http/http.c:263
+#: src/applications/bootstrap_http/http.c:294
+#: src/applications/bootstrap_http/http.c:313
+#: src/applications/bootstrap_http/http.c:326
+#: src/applications/bootstrap_http/http.c:336
+#: src/applications/bootstrap_http/http.c:346
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/transports/http.c:1344
+#: src/transports/http.c:1307
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:1352
+#: src/transports/http.c:1316
 msgid "# bytes received via HTTP"
 msgstr "# byte mottagna via HTTP"
 
-#: src/transports/http.c:1354
+#: src/transports/http.c:1317
 msgid "# bytes sent via HTTP"
 msgstr "# byte skickade via HTTP"
 
-#: src/transports/http.c:1356
+#: src/transports/http.c:1319
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte kastade via HTTP (utgående)"
 
-#: src/transports/smtp.c:257
+#: src/transports/smtp.c:271
 #, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
@@ -103,138 +103,138 @@
 "Du måste ange ett namn på röret för SMTP-transporten i sektion \"%s\" under "
 "\"%s\".\n"
 
-#: src/transports/smtp.c:334
+#: src/transports/smtp.c:358
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/transports/smtp.c:433
+#: src/transports/smtp.c:463
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 
 # capped är inte ett bra ord IMHO
-#: src/transports/smtp.c:440
+#: src/transports/smtp.c:471
 #, 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:547
+#: src/transports/smtp.c:571
 #, fuzzy, c-format
 msgid "Failed to initialize libesmtp: %s.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transports/smtp.c:611
+#: src/transports/smtp.c:630
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Sändning av e-post till \"%s\" misslyckades.\n"
 
-#: src/transports/smtp.c:679
+#: src/transports/smtp.c:702
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s filter %s (SMTP)"
 
-#: src/transports/smtp.c:707
+#: src/transports/smtp.c:730
 #, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 
-#: src/transports/tcp.c:283
+#: src/transports/tcp.c:289
 #, fuzzy
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
 
-#: src/transports/tcp.c:387
+#: src/transports/tcp.c:384
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/transports/tcp.c:454 src/transports/tcp6.c:414
+#: src/transports/tcp.c:437 src/transports/tcp6.c:404
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:584
+#: src/transports/tcp.c:556
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:592
+#: src/transports/tcp.c:565
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transports/tcp.c:594
+#: src/transports/tcp.c:566
 msgid "# bytes sent via TCP"
 msgstr "# byte skickades via TCP"
 
-#: src/transports/tcp.c:596
+#: src/transports/tcp.c:568
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transports/udp.c:293
+#: src/transports/udp.c:287
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/udp.c:388
+#: src/transports/udp.c:378
 #, 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:565
+#: src/transports/udp.c:529
 msgid "# bytes received via UDP"
 msgstr "# byte mottagna via UDP"
 
-#: src/transports/udp.c:567
+#: src/transports/udp.c:530
 msgid "# bytes sent via UDP"
 msgstr "# byte skickade via UDP"
 
-#: src/transports/udp.c:569
+#: src/transports/udp.c:532
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/transports/tcp6.c:238
+#: src/transports/tcp6.c:245
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/transports/tcp6.c:300
+#: src/transports/tcp6.c:312
 #, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/transports/tcp6.c:532
+#: src/transports/tcp6.c:512
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "# byte mottogs via TCP"
 
-#: src/transports/tcp6.c:534
+#: src/transports/tcp6.c:513
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "# byte skickades via TCP"
 
-#: src/transports/tcp6.c:536
+#: src/transports/tcp6.c:515
 #, fuzzy
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transports/tcp_helper.c:248
+#: src/transports/tcp_helper.c:257
 msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr ""
 
-#: src/transports/tcp_helper.c:314
+#: src/transports/tcp_helper.c:276
 #, 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/upnp/upnp.c:443
+#: src/transports/upnp/upnp.c:429
 #, fuzzy, c-format
 msgid "%s failed for url `%s' and post-data `%s' at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
-#: src/transports/upnp/upnp.c:504
+#: src/transports/upnp/upnp.c:475
 #, c-format
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/udp_helper.c:91
+#: src/transports/udp_helper.c:94
 #, fuzzy
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
@@ -243,120 +243,120 @@
 msgid "Query (get KEY, put KEY VALUE) DHT table."
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:59
+#: src/applications/dht/tools/dht-query.c:60
 #, fuzzy
 msgid ""
 "allow TIME ms to process a GET command or expire PUT content after ms TIME"
 msgstr "tillåt TID ms för behandling av varje kommando"
 
-#: src/applications/dht/tools/dht-query.c:103
+#: src/applications/dht/tools/dht-query.c:98
 #, c-format
 msgid "%s(%s) operation returned no results.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:125
+#: src/applications/dht/tools/dht-query.c:115
 #, fuzzy, c-format
 msgid "Issuing '%s(%s,%s)' command.\n"
 msgstr "\"%s(%s,%s)\" misslyckades.\n"
 
-#: src/applications/dht/tools/dht-query.c:138
+#: src/applications/dht/tools/dht-query.c:122
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr "\"%s(%s,%s)\" lyckades\n"
 
-#: src/applications/dht/tools/dht-query.c:143
+#: src/applications/dht/tools/dht-query.c:126
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "\"%s(%s,%s)\" misslyckades.\n"
 
-#: src/applications/dht/tools/dht-query.c:171
+#: src/applications/dht/tools/dht-query.c:150
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/applications/dht/tools/dht-query.c:181
+#: src/applications/dht/tools/dht-query.c:163
 #, 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:194
+#: src/applications/dht/tools/dht-query.c:180
 #, 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:206
+#: src/applications/dht/tools/dht-query.c:191
 #, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/applications/dht/module/table.c:701
+#: src/applications/dht/module/table.c:716
 #, fuzzy
 msgid "# dht connections"
 msgstr "Nätverksanslutning"
 
-#: src/applications/dht/module/table.c:702
+#: src/applications/dht/module/table.c:718
 #, fuzzy
 msgid "# dht discovery messages received"
 msgstr "# krypterade PING-meddelanden mottagna"
 
-#: src/applications/dht/module/table.c:703
+#: src/applications/dht/module/table.c:720
 msgid "# dht route host lookups performed"
 msgstr ""
 
-#: src/applications/dht/module/table.c:704
+#: src/applications/dht/module/table.c:722
 #, fuzzy
 msgid "# dht discovery messages sent"
 msgstr "# krypterade PING-meddelanden skickade"
 
-#: src/applications/dht/module/cs.c:135
+#: src/applications/dht/module/cs.c:128
 #, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "\"%s\" misslyckades. Terminerar anslutning till klient.\n"
 
-#: src/applications/dht/module/cs.c:240
+#: src/applications/dht/module/cs.c:233
 #, fuzzy, c-format
 msgid "`%s' registering client handlers: %d %d\n"
 msgstr "\"%s\" registrerar klienthandtag %d\n"
 
-#: src/applications/dht/module/cs.c:259
+#: src/applications/dht/module/cs.c:251
 msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:752
+#: src/applications/dht/module/routing.c:736
 msgid "# dht replies routed"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:753
+#: src/applications/dht/module/routing.c:738
 msgid "# dht requests routed"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:754
+#: src/applications/dht/module/routing.c:740
 msgid "# dht get requests received"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:755
+#: src/applications/dht/module/routing.c:742
 msgid "# dht put requests received"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:756
+#: src/applications/dht/module/routing.c:744
 #, fuzzy
 msgid "# dht results received"
 msgstr "# byte mottogs via TCP"
 
-#: src/applications/dht/module/routing.c:760
+#: src/applications/dht/module/routing.c:748
 #, fuzzy, c-format
 msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr "\"%s\" registrerar handtag %d %d %d\n"
 
-#: src/applications/chat/chat.c:87
+#: src/applications/chat/chat.c:88
 msgid "Message received from peer is invalid.\n"
 msgstr "Meddelande mottaget från motpart är ogiltig.\n"
 
-#: src/applications/chat/chat.c:134
+#: src/applications/chat/chat.c:135
 msgid "Message received from client is invalid\n"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/applications/chat/chat.c:156
+#: src/applications/chat/chat.c:155
 msgid "Maximum number of chat clients reached.\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
@@ -365,103 +365,99 @@
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr "Nu är det %d av %d chattklienter på den här noden.\n"
 
-#: src/applications/chat/chat.c:197
+#: src/applications/chat/chat.c:202
 #, c-format
 msgid "`%s' registering handlers %d and %d\n"
 msgstr "\"%s\" registrerar handtagen %d och %d\n"
 
-#: src/applications/chat/chat.c:216
+#: src/applications/chat/chat.c:219
 msgid "enables P2P-chat (incomplete)"
 msgstr "aktiverar P2P-chatt (ej komplett)"
 
-#: src/applications/chat/gnunet-chat.c:82
-msgid "specify nickname"
-msgstr "ange smeknamn"
+#: src/applications/chat/gnunet-chat.c:45
+msgid "Join a chat on GNUnet."
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:87
-msgid "Start GNUnet chat client."
-msgstr "Starta GNUnets chattklient."
+#: src/applications/chat/gnunet-chat.c:49
+msgid "set the nickname to use (requred)"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:93 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:287
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Använd --help för att få en lista på flaggor.\n"
+#: src/applications/chat/gnunet-chat.c:52
+msgid "set the chat room to join (requred)"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:151
-msgid "Could not connect to gnunetd.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+#: src/applications/chat/gnunet-chat.c:134
+#, fuzzy, c-format
+msgid "You must specify a nickname\n"
+msgstr "Du måste ange en mottagare!\n"
 
-#: src/applications/chat/gnunet-chat.c:155
-#, c-format
-msgid "You must specify a nickname (use option `%s').\n"
-msgstr "Du måste ange ett smeknamn (använd flagga \"%s\").\n"
+#: src/applications/chat/gnunet-chat.c:144
+#, fuzzy, c-format
+msgid "Failed to join the room\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/applications/chat/gnunet-chat.c:182
-msgid "Could not send join message to gnunetd\n"
-msgstr ""
+#: src/applications/chat/gnunet-chat.c:160
+#, fuzzy, c-format
+msgid "Failed to send message.\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/applications/chat/gnunet-chat.c:191
-msgid "Could not send message to gnunetd\n"
-msgstr "Kunde inte skicka meddelande till gnunetd\n"
-
-#: src/applications/advertising/advertising.c:188
+#: src/applications/advertising/advertising.c:193
 #, fuzzy, c-format
 msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
 
-#: src/applications/advertising/advertising.c:196
+#: src/applications/advertising/advertising.c:203
 msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:367
+#: src/applications/advertising/advertising.c:374
 msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:385
+#: src/applications/advertising/advertising.c:396
 msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:553
+#: src/applications/advertising/advertising.c:544
 #, 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:561
+#: src/applications/advertising/advertising.c:553
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:838
+#: src/applications/advertising/advertising.c:817
 msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:839
+#: src/applications/advertising/advertising.c:820
 msgid "# Peer advertisements of type NAT received"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:840
+#: src/applications/advertising/advertising.c:823
 msgid "# Peer advertisements confirmed via PONG"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:841
+#: src/applications/advertising/advertising.c:827
 msgid "# Peer advertisements updating earlier HELLOs"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:842
+#: src/applications/advertising/advertising.c:830
 #, fuzzy
 msgid "# Peer advertisements discarded due to load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/applications/advertising/advertising.c:843
+#: src/applications/advertising/advertising.c:834
 msgid "# Peer advertisements for unsupported transport"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:844
+#: src/applications/advertising/advertising.c:838
 msgid "# Peer advertisements not confirmed due to ping busy"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:845
+#: src/applications/advertising/advertising.c:842
 msgid "# Peer advertisements not confirmed due to lack of self ad"
 msgstr ""
 
@@ -469,284 +465,282 @@
 msgid "# Peer advertisements not confirmed due to send error"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:847
+#: src/applications/advertising/advertising.c:848
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:848
+#: src/applications/advertising/advertising.c:850
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:850
-#: src/applications/pingpong/pingpong.c:520
+#: src/applications/advertising/advertising.c:852
+#: src/applications/pingpong/pingpong.c:509
 msgid "# plaintext PING messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/applications/advertising/advertising.c:855
-#: src/applications/session/connect.c:936
+#: src/applications/advertising/advertising.c:857
+#: src/applications/session/connect.c:901
 #, 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:873
+#: src/applications/advertising/advertising.c:872
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:471
+#: src/applications/topology_default/topology.c:467
 msgid "maintains GNUnet default mesh topology"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:128
+#: src/applications/pingpong/pingpong.c:132
 #: src/applications/pingpong/pingpong.c:199
 #: src/applications/pingpong/pingpong.c:264
-#: src/applications/pingpong/pingpong.c:337
+#: src/applications/pingpong/pingpong.c:331
 #, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:140
+#: src/applications/pingpong/pingpong.c:143
 msgid "Received ping for another peer. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:210
+#: src/applications/pingpong/pingpong.c:209
 msgid "Received PING not destined for us!\n"
 msgstr "Mottog PING som ej var ämnat för oss!\n"
 
-#: src/applications/pingpong/pingpong.c:309
-#: src/applications/pingpong/pingpong.c:374
+#: src/applications/pingpong/pingpong.c:303
+#: src/applications/pingpong/pingpong.c:365
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:418
+#: src/applications/pingpong/pingpong.c:409
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr "Kan inte skapa PING, tabell är full. Försök att öka MAX_PING_PONG.\n"
 
-#: src/applications/pingpong/pingpong.c:510
+#: src/applications/pingpong/pingpong.c:499
 msgid "# encrypted PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/applications/pingpong/pingpong.c:512
+#: src/applications/pingpong/pingpong.c:501
 msgid "# plaintext PONG messages received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/applications/pingpong/pingpong.c:514
+#: src/applications/pingpong/pingpong.c:503
 msgid "# encrypted PING messages received"
 msgstr "# krypterade PING-meddelanden mottagna"
 
-#: src/applications/pingpong/pingpong.c:516
+#: src/applications/pingpong/pingpong.c:505
 msgid "# PING messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/applications/pingpong/pingpong.c:518
-#: src/applications/session/connect.c:931
+#: src/applications/pingpong/pingpong.c:507
+#: src/applications/session/connect.c:896
 msgid "# encrypted PONG messages sent"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/applications/pingpong/pingpong.c:522
-#: src/applications/session/connect.c:929
+#: src/applications/pingpong/pingpong.c:511
+#: src/applications/session/connect.c:894
 msgid "# encrypted PING messages sent"
 msgstr "# krypterade PING-meddelanden skickade"
 
-#: src/applications/pingpong/pingpong.c:524
+#: src/applications/pingpong/pingpong.c:513
 #, fuzzy
 msgid "# plaintext PONG messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/applications/pingpong/pingpong.c:526
+#: src/applications/pingpong/pingpong.c:517
 #, fuzzy
 msgid "# plaintext PONG transmissions failed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/applications/pingpong/pingpong.c:536
+#: src/applications/pingpong/pingpong.c:526
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "\"%s\" registrerar handtag %d %d (klartext och kryptotext)\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:46
-#: src/applications/sqstore_sqlite/sqlite.c:53
-#: src/applications/sqstore_mysql/mysql.c:139
-#: src/applications/sqstore_mysql/mysql.c:146
-#: src/applications/sqstore_mysql/mysql.c:825
-#: src/applications/sqstore_mysql/mysql.c:846
-#: src/applications/sqstore_mysql/mysql.c:858
-#: src/applications/sqstore_mysql/mysql.c:891
-#: src/applications/sqstore_mysql/mysql.c:904
-#: src/applications/sqstore_mysql/mysql.c:965
-#: src/applications/sqstore_mysql/mysql.c:1065
-#: src/applications/sqstore_mysql/mysql.c:1078
-#: src/applications/sqstore_mysql/mysql.c:1149
-#: src/applications/sqstore_mysql/mysql.c:1169
-#: src/applications/sqstore_mysql/mysql.c:1181
-#: src/applications/sqstore_mysql/mysql.c:1207
-#: src/applications/sqstore_mysql/mysql.c:1220
-#: src/applications/sqstore_mysql/mysql.c:1234
-#: src/applications/sqstore_mysql/mysql.c:1301
-#: src/applications/sqstore_mysql/mysql.c:1315
-#: src/applications/sqstore_mysql/mysql.c:1374
-#: src/applications/sqstore_mysql/mysql.c:1391
+#: src/applications/sqstore_sqlite/sqlite.c:47
+#: src/applications/sqstore_sqlite/sqlite.c:54
+#: src/applications/sqstore_mysql/mysql.c:145
+#: src/applications/sqstore_mysql/mysql.c:152
+#: src/applications/sqstore_mysql/mysql.c:428
+#: src/applications/sqstore_mysql/mysql.c:438
+#: src/applications/sqstore_mysql/mysql.c:476
+#: src/applications/sqstore_mysql/mysql.c:486
+#: src/applications/sqstore_mysql/mysql.c:518
+#: src/applications/sqstore_mysql/mysql.c:529
+#: src/applications/sqstore_mysql/mysql.c:627
+#: src/applications/sqstore_mysql/mysql.c:639
+#: src/applications/sqstore_mysql/mysql.c:651
+#: src/applications/sqstore_mysql/mysql.c:665
+#: src/applications/sqstore_mysql/mysql.c:762
+#: src/applications/sqstore_mysql/mysql.c:776
+#: src/applications/sqstore_mysql/mysql.c:917
+#: src/applications/sqstore_mysql/mysql.c:929
+#: src/applications/sqstore_mysql/mysql.c:941
+#: src/applications/sqstore_mysql/mysql.c:1184
+#: src/applications/sqstore_mysql/mysql.c:1196
+#: src/applications/sqstore_mysql/mysql.c:1208
+#: src/applications/sqstore_mysql/mysql.c:1293
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:93 src/applications/dstore/dstore.c:180
-#: src/applications/dstore/dstore.c:240 src/applications/dstore/dstore.c:263
-#: src/applications/dstore/dstore.c:323 src/applications/dstore/dstore.c:378
-#: src/applications/dstore/dstore.c:474 src/util/crypto/symcipher_gcrypt.c:46
-#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:63
-#: src/util/crypto/hostkey_gcrypt.c:70
+#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:180
+#: src/applications/dstore/dstore.c:219 src/applications/dstore/dstore.c:238
+#: src/applications/dstore/dstore.c:293 src/applications/dstore/dstore.c:330
+#: src/applications/dstore/dstore.c:403 src/util/crypto/symcipher_gcrypt.c:46
+#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:64
+#: src/util/crypto/hostkey_gcrypt.c:71
 #, c-format
 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:207
+#: src/applications/sqstore_sqlite/sqlite.c:193
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:379
+#: src/applications/sqstore_sqlite/sqlite.c:393
 #, c-format
 msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:380
-#: src/applications/sqstore_sqlite/sqlite.c:401
+#: src/applications/sqstore_sqlite/sqlite.c:394
+#: src/applications/sqstore_sqlite/sqlite.c:416
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:400
-#: src/applications/sqstore_mysql/mysql.c:262
-#: src/applications/sqstore_mysql/mysql.c:924
-#: src/applications/sqstore_mysql/mysql.c:1251
+#: src/applications/sqstore_sqlite/sqlite.c:415
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1395
-#: src/applications/sqstore_mysql/mysql.c:1466
+#: src/applications/sqstore_sqlite/sqlite.c:1206
+#: src/applications/sqstore_mysql/mysql.c:1401
 msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/session/connect.c:261
-#: src/applications/session/connect.c:278
+#: src/applications/session/connect.c:256
+#: src/applications/session/connect.c:272
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:321
+#: src/applications/session/connect.c:313
 #, fuzzy, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
 
-#: src/applications/session/connect.c:520
+#: src/applications/session/connect.c:492
 #, fuzzy
 msgid "Could not create any HELLO for myself!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/applications/session/connect.c:621
+#: src/applications/session/connect.c:592
 #, 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:639
+#: src/applications/session/connect.c:614
 #, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:673
+#: src/applications/session/connect.c:646
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:683
+#: src/applications/session/connect.c:656
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:752
+#: src/applications/session/connect.c:719
 #, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
 "invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:764
+#: src/applications/session/connect.c:731
 #, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:921
+#: src/applications/session/connect.c:886
 msgid "# session keys sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/applications/session/connect.c:923
+#: src/applications/session/connect.c:888
 msgid "# session keys rejected"
 msgstr "# sessionnycklar vägrade"
 
-#: src/applications/session/connect.c:925
+#: src/applications/session/connect.c:890
 msgid "# session keys accepted"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/applications/session/connect.c:927
+#: src/applications/session/connect.c:892
 msgid "# sessions established"
 msgstr "# sessioner etablerade"
 
-#: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
+#: src/applications/rpc/rpc.c:134 src/applications/rpc/rpc.c:175
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
 "using this name (%p)\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
+#: src/applications/rpc/rpc.c:218 src/applications/rpc/rpc.c:265
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
 "under that name: %p\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:233
+#: src/applications/rpc/rpc.c:237
 #, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s - RPC %s:%p kunde inte avregistreras: hittades inte\n"
 
-#: src/applications/rpc/rpc.c:280
+#: src/applications/rpc/rpc.c:285
 #, c-format
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:879 src/applications/rpc/rpc.c:1012
-#: src/applications/rpc/rpc.c:1101
+#: src/applications/rpc/rpc.c:909 src/applications/rpc/rpc.c:1043
+#: src/applications/rpc/rpc.c:1129
 #, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:946
+#: src/applications/rpc/rpc.c:975
 #, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1291
+#: src/applications/rpc/rpc.c:1307
 #, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr "\"%s\" anropad med timeout över 1 timma (fel?)\n"
 
-#: src/applications/rpc/rpc.c:1415
+#: src/applications/rpc/rpc.c:1421
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1442
+#: src/applications/rpc/rpc.c:1450
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "\"%s\" registrerar handtag %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1463
+#: src/applications/rpc/rpc.c:1466
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/applications/rpc/rpc.c:1520
+#: src/applications/rpc/rpc.c:1524
 msgid "RPC async reply invalid.\n"
 msgstr ""
 
@@ -754,67 +748,61 @@
 msgid "async RPC reply not received.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:263
-#: src/applications/sqstore_mysql/mysql.c:925
-#: src/applications/sqstore_mysql/mysql.c:1252
-msgid "mysql datastore"
-msgstr ""
+#: src/applications/sqstore_mysql/mysql.c:379
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/applications/sqstore_mysql/mysql.c:441
+#: src/applications/sqstore_mysql/mysql.c:1311
 #, fuzzy, c-format
-msgid ""
-"`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s DG/%"
-"s\n"
+msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1496
+#: src/applications/sqstore_mysql/mysql.c:1423
+#: src/applications/sqstore_mysql/mysql.c:1570
 #, 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:1518
+#: src/applications/sqstore_mysql/mysql.c:1448
+#: src/applications/sqstore_mysql/mysql.c:1593
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:133
+#: src/applications/datastore/datastore.c:146
 #, c-format
 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:159
-#, c-format
-msgid "Database failed to delete `%s'.\n"
-msgstr "Databas misslyckades att ta bort \"%s\".\n"
-
-#: src/applications/datastore/datastore.c:389
+#: src/applications/datastore/datastore.c:368
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:390
+#: src/applications/datastore/datastore.c:370
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:392
+#: src/applications/datastore/datastore.c:373
 msgid "# bytes allowed in datastore"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:406
+#: src/applications/datastore/datastore.c:388
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:528
+#: src/applications/datastore/datastore.c:513
 #, fuzzy
 msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/applications/identity/hostkey.c:123
+#: src/applications/identity/hostkey.c:116
 #, fuzzy, c-format
 msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/applications/identity/hostkey.c:154
+#: src/applications/identity/hostkey.c:143
 #, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
@@ -822,201 +810,201 @@
 "Existerande värdnyckel i filen \"%s\" felade vid formatkontroll, skapar en "
 "ny värdnyckel.\n"
 
-#: src/applications/identity/hostkey.c:162
+#: src/applications/identity/hostkey.c:152
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/applications/identity/hostkey.c:175
+#: src/applications/identity/hostkey.c:162
 msgid "Done creating hostkey.\n"
 msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/applications/identity/identity.c:347
+#: src/applications/identity/identity.c:345
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:360
+#: src/applications/identity/identity.c:358
 #, c-format
 msgid ""
 "Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:397
+#: src/applications/identity/identity.c:393
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:730
-#: src/applications/identity/identity.c:758
+#: src/applications/identity/identity.c:708
+#: src/applications/identity/identity.c:729
 #, c-format
 msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:812
+#: src/applications/identity/identity.c:776
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:822
+#: src/applications/identity/identity.c:785
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:928
-#: src/applications/identity/identity.c:1044
+#: src/applications/identity/identity.c:894
+#: src/applications/identity/identity.c:1014
 #, c-format
 msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:1045
+#: src/applications/identity/identity.c:1017
 #, c-format
 msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:148
+#: src/applications/transport/transport.c:190
 #, c-format
 msgid ""
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:196
+#: src/applications/transport/transport.c:244
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:246
+#: src/applications/transport/transport.c:297
 #, c-format
 msgid ""
 "Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:307
+#: src/applications/transport/transport.c:373
 #, 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:395
+#: src/applications/transport/transport.c:494
 #, 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:452
+#: src/applications/transport/transport.c:553
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:653
+#: src/applications/transport/transport.c:752
 #, fuzzy, c-format
 msgid "Loading transports `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/applications/transport/transport.c:673
+#: src/applications/transport/transport.c:771
 #, fuzzy, c-format
 msgid "Could not load transport plugin `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/applications/transport/transport.c:683
+#: src/applications/transport/transport.c:781
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:710
+#: src/applications/transport/transport.c:808
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/applications/transport/transport.c:723
+#: src/applications/transport/transport.c:819
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/applications/fragmentation/fragmentation.c:566
+#: src/applications/fragmentation/fragmentation.c:575
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:567
+#: src/applications/fragmentation/fragmentation.c:577
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:568
+#: src/applications/fragmentation/fragmentation.c:578
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:580
+#: src/applications/fragmentation/fragmentation.c:588
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr "\"%s\" registrerar handtag %d\n"
 
-#: src/applications/stats/gnunet-stats.c:65
+#: src/applications/stats/gnunet-stats.c:62
 #, c-format
 msgid "Supported peer-to-peer messages:\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:69
+#: src/applications/stats/gnunet-stats.c:65
 #, c-format
 msgid "Supported client-server messages:\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:93
+#: src/applications/stats/gnunet-stats.c:84
 #: src/applications/vpn/gnunet-vpn.c:52
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
-#: src/applications/stats/gnunet-stats.c:97
+#: src/applications/stats/gnunet-stats.c:88
 msgid "prints supported protocol messages"
 msgstr "skriver ut stödda protokollmeddelanden"
 
-#: src/applications/stats/gnunet-stats.c:133
-#: src/applications/tbench/gnunet-tbench.c:128
-#: src/applications/tracekit/gnunet-tracekit.c:313
+#: src/applications/stats/gnunet-stats.c:122
+#: src/applications/tbench/gnunet-tbench.c:127
+#: src/applications/tracekit/gnunet-tracekit.c:315
 #: src/applications/template/gnunet-template.c:94
-#: src/applications/vpn/gnunet-vpn.c:145
+#: src/applications/vpn/gnunet-vpn.c:148
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:152
+#: src/applications/stats/gnunet-stats.c:134
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr ""
 
-#: src/applications/stats/clientapi.c:328
+#: src/applications/stats/clientapi.c:330
 msgid "Uptime (seconds)"
 msgstr "Upptid (sekunder)"
 
-#: src/applications/stats/statistics.c:214
+#: src/applications/stats/statistics.c:223
 #, c-format
 msgid "% of allowed network load (up)"
 msgstr ""
 
-#: src/applications/stats/statistics.c:216
+#: src/applications/stats/statistics.c:225
 #, c-format
 msgid "% of allowed network load (down)"
 msgstr ""
 
-#: src/applications/stats/statistics.c:218
+#: src/applications/stats/statistics.c:226
 #, c-format
 msgid "% of allowed cpu load"
 msgstr ""
 
-#: src/applications/stats/statistics.c:220
+#: src/applications/stats/statistics.c:227
 #, c-format
 msgid "% of allowed io load"
 msgstr ""
 
-#: src/applications/stats/statistics.c:222
+#: src/applications/stats/statistics.c:228
 msgid "# of connected peers"
 msgstr "# av anslutna parter"
 
-#: src/applications/stats/statistics.c:224
+#: src/applications/stats/statistics.c:230
 msgid "# bytes of noise received"
 msgstr ""
 
-#: src/applications/stats/statistics.c:392
+#: src/applications/stats/statistics.c:401
 #, fuzzy, c-format
 msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
 
-#: src/applications/stats/statistics.c:413
+#: src/applications/stats/statistics.c:421
 msgid "keeps statistics about gnunetd's operation"
 msgstr "behåller statistik om gnunetds operation"
 
@@ -1024,80 +1012,80 @@
 msgid "# Any-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:152
+#: src/applications/stats/sqstats.c:151
 msgid "# DBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:154
+#: src/applications/stats/sqstats.c:152
 msgid "# SBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:156
+#: src/applications/stats/sqstats.c:153
 msgid "# KBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:158
+#: src/applications/stats/sqstats.c:154
 msgid "# NBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:160
+#: src/applications/stats/sqstats.c:155
 msgid "# KNBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:162
+#: src/applications/stats/sqstats.c:156
 msgid "# OnDemand-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:164
+#: src/applications/stats/sqstats.c:157
 msgid "# Unknown-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:166
+#: src/applications/stats/sqstats.c:158
 msgid "# expired"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:168
+#: src/applications/stats/sqstats.c:159
 msgid "# expire in 1h"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:170
+#: src/applications/stats/sqstats.c:160
 msgid "# expire in 24h"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:172
+#: src/applications/stats/sqstats.c:161
 msgid "# expire in 1 week"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:174
+#: src/applications/stats/sqstats.c:162
 msgid "# expire in 1 month"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:176
+#: src/applications/stats/sqstats.c:163
 msgid "# zero priority"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:178
+#: src/applications/stats/sqstats.c:164
 msgid "# priority one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:180
+#: src/applications/stats/sqstats.c:165
 msgid "# priority larger than one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:182
+#: src/applications/stats/sqstats.c:166
 msgid "# no anonymity"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:184
+#: src/applications/stats/sqstats.c:167
 msgid "# anonymity one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:186
+#: src/applications/stats/sqstats.c:168
 msgid "# anonymity larger than one"
 msgstr ""
 
 #: src/applications/tbench/gnunet-tbench.c:64
-#: src/applications/tracekit/gnunet-tracekit.c:53
+#: src/applications/tracekit/gnunet-tracekit.c:55
 msgid "Start GNUnet transport benchmarking tool."
 msgstr ""
 
@@ -1129,11 +1117,11 @@
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:90
+#: src/applications/tbench/gnunet-tbench.c:91
 msgid "number of messages in a message block"
 msgstr "antal meddelanden i ett meddelandeblock"
 
-#: src/applications/tbench/gnunet-tbench.c:144
+#: src/applications/tbench/gnunet-tbench.c:143
 #, c-format
 msgid "You must specify a receiver!\n"
 msgstr "Du måste ange en mottagare!\n"
@@ -1143,37 +1131,37 @@
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:182
+#: src/applications/tbench/gnunet-tbench.c:187
 #, c-format
 msgid "Time:\n"
 msgstr "Tid:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:183
+#: src/applications/tbench/gnunet-tbench.c:188
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr "\tmax      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:185
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr "\tmin      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:187
+#: src/applications/tbench/gnunet-tbench.c:190
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tbench/gnunet-tbench.c:191
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:192
+#: src/applications/tbench/gnunet-tbench.c:193
 #, c-format
 msgid "Loss:\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:193
+#: src/applications/tbench/gnunet-tbench.c:194
 #, c-format
 msgid "\tmax      %u\n"
 msgstr "\tmax      %u\n"
@@ -1183,29 +1171,29 @@
 msgid "\tmin      %u\n"
 msgstr "\tmin      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:197
+#: src/applications/tbench/gnunet-tbench.c:196
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:199
+#: src/applications/tbench/gnunet-tbench.c:197
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:208
+#: src/applications/tbench/gnunet-tbench.c:203
 #, 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:212
+#: src/applications/tbench/gnunet-tbench.c:209
 #, c-format
 msgid ""
 "\n"
 "Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:421
+#: src/applications/tbench/tbench.c:412
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
@@ -1213,27 +1201,27 @@
 msgid "probe network to the given DEPTH"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:51
+#: src/applications/tracekit/gnunet-tracekit.c:52
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:57
+#: src/applications/tracekit/gnunet-tracekit.c:59
 msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:61
+#: src/applications/tracekit/gnunet-tracekit.c:63
 msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:115
+#: src/applications/tracekit/gnunet-tracekit.c:111
 #, 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:160
 #, c-format
 msgid "`%s' is not connected to any peer.\n"
 msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
@@ -1243,169 +1231,169 @@
 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:210
 #, 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:236
 #, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr "Motpart \"%s\" rapporterade inte tillbaka.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:343
+#: src/applications/tracekit/gnunet-tracekit.c:336
 msgid "Could not send request to gnunetd.\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/applications/tracekit/tracekit.c:68
-#: src/applications/tracekit/tracekit.c:201
+#: src/applications/tracekit/tracekit.c:72
+#: src/applications/tracekit/tracekit.c:206
 #, c-format
 msgid "Received invalid `%s' message from `%s'.\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/applications/tracekit/tracekit.c:263
+#: src/applications/tracekit/tracekit.c:269
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:354
+#: src/applications/tracekit/tracekit.c:346
 #, c-format
 msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:461
+#: src/applications/tracekit/tracekit.c:443
 msgid "allows mapping of the network topology"
 msgstr "tillåter kartläggning av nätverkstopologin"
 
-#: src/applications/gap/gap.c:1661
+#: src/applications/gap/gap.c:1695
 #, fuzzy, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/applications/gap/gap.c:1662
+#: src/applications/gap/gap.c:1696
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1844
+#: src/applications/gap/gap.c:1883
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1856 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1892 src/applications/fs/module/anonymity.c:65
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1863 src/applications/gap/gap.c:1869
-#: src/applications/gap/gap.c:1876
+#: src/applications/gap/gap.c:1902 src/applications/gap/gap.c:1910
+#: src/applications/gap/gap.c:1921
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2155
+#: src/applications/gap/gap.c:2183
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2156
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2157
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2158
+#: src/applications/gap/gap.c:2190
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2159
+#: src/applications/gap/gap.c:2194
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2160
+#: src/applications/gap/gap.c:2197
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2161
+#: src/applications/gap/gap.c:2199
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2162
+#: src/applications/gap/gap.c:2202
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2163
+#: src/applications/gap/gap.c:2206
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2164
+#: src/applications/gap/gap.c:2208
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2165
+#: src/applications/gap/gap.c:2211
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2166
+#: src/applications/gap/gap.c:2214
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2167
+#: src/applications/gap/gap.c:2216
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2168
+#: src/applications/gap/gap.c:2218
 msgid "# gap spurious replies (dropped)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2169
+#: src/applications/gap/gap.c:2220
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2170
+#: src/applications/gap/gap.c:2223
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2171
+#: src/applications/gap/gap.c:2227
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2172
+#: src/applications/gap/gap.c:2229
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2173
+#: src/applications/gap/gap.c:2231
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2189
+#: src/applications/gap/gap.c:2246
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2217
+#: src/applications/gap/gap.c:2269
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "\"%s\" registrerar handtag %d %d\n"
 
-#: src/applications/gap/pid_table.c:161
+#: src/applications/gap/pid_table.c:177
 msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:163
+#: src/applications/gap/pid_table.c:181
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:78
+#: src/applications/getoption/getoption.c:75
 #, c-format
 msgid "`%s' registering client handler %d\n"
 msgstr "\"%s\" registrerar klienthandtag %d\n"
 
-#: src/applications/getoption/getoption.c:88
+#: src/applications/getoption/getoption.c:84
 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:273
-#: src/applications/fs/tools/gnunet-search.c:140
+#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-search.c:135
 #: src/applications/fs/tools/gnunet-download.c:69
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
@@ -1432,37 +1420,37 @@
 "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:90
 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:93
 msgid "specify metadata describing the namespace or collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:95
+#: src/applications/fs/tools/gnunet-pseudonym.c:97
 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:100
 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:104
 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:107
 msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:138
+#: src/applications/fs/tools/gnunet-pseudonym.c:140
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr ""
@@ -1472,149 +1460,149 @@
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:178
+#: src/applications/fs/tools/gnunet-pseudonym.c:171
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:212
+#: src/applications/fs/tools/gnunet-pseudonym.c:204
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Samling stoppad.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:214
+#: src/applications/fs/tools/gnunet-pseudonym.c:206
 #, 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:222
+#: src/applications/fs/tools/gnunet-pseudonym.c:214
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:226
+#: src/applications/fs/tools/gnunet-pseudonym.c:219
 #, 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:243
+#: src/applications/fs/tools/gnunet-pseudonym.c:234
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:246
+#: src/applications/fs/tools/gnunet-pseudonym.c:238
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:279
 #, 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:291
+#: src/applications/fs/tools/gnunet-pseudonym.c:286
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:304
+#: src/applications/fs/tools/gnunet-pseudonym.c:301
 #, fuzzy, c-format
 msgid "You must specify a name for the collection (`%s' option).\n"
 msgstr "Du måste ange ett namn för PID-filen i sektion \"%s\" under \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:314
+#: src/applications/fs/tools/gnunet-pseudonym.c:309
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:83
+#: src/applications/fs/tools/gnunet-directory.c:84
 #, c-format
 msgid "==> Directory `%s':\n"
 msgstr "==> Katalog \"%s\":\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:90
+#: src/applications/fs/tools/gnunet-directory.c:87
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:125
+#: src/applications/fs/tools/gnunet-directory.c:114
 #, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:127
+#: src/applications/fs/tools/gnunet-directory.c:116
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:142
+#: src/applications/fs/tools/gnunet-directory.c:131
 msgid "Perform directory related operations."
 msgstr "Genomför katalogrelaterade operationer."
 
-#: src/applications/fs/tools/gnunet-directory.c:144
+#: src/applications/fs/tools/gnunet-directory.c:134
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:148
+#: src/applications/fs/tools/gnunet-directory.c:138
 msgid "list entries from the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:151
+#: src/applications/fs/tools/gnunet-directory.c:141
 msgid "start tracking entries for the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:175
+#: src/applications/fs/tools/gnunet-directory.c:164
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "Listade %d matchande poster.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:136
+#: src/applications/fs/tools/gnunet-insert.c:132
 #, 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:141
+#: src/applications/fs/tools/gnunet-insert.c:137
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:161
+#: src/applications/fs/tools/gnunet-insert.c:157
 #, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:170
+#: src/applications/fs/tools/gnunet-insert.c:165
 msgid "filename"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:173
+#: src/applications/fs/tools/gnunet-insert.c:167
 msgid "mimetype"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:208
 #, 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:224
+#: src/applications/fs/tools/gnunet-insert.c:220
 #, 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:235
+#: src/applications/fs/tools/gnunet-insert.c:231
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:246
+#: src/applications/fs/tools/gnunet-insert.c:242
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr "Nedladdning avbruten."
 
-#: src/applications/fs/tools/gnunet-insert.c:251
+#: src/applications/fs/tools/gnunet-insert.c:247
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1623,14 +1611,14 @@
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:260
+#: src/applications/fs/tools/gnunet-insert.c:256
 #, c-format
 msgid ""
 "\n"
 "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:277
+#: src/applications/fs/tools/gnunet-insert.c:272
 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"
@@ -1638,11 +1626,11 @@
 "även om gnunetd körs på den lokala maskinen, tvinga fram skapandet av en "
 "kopia istället för att göra en länk till GNUnets utdelade katalog"
 
-#: src/applications/fs/tools/gnunet-insert.c:281
+#: src/applications/fs/tools/gnunet-insert.c:277
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:281
 #, fuzzy
 msgid ""
 "do not use libextractor to add additional references to directory entries "
@@ -1651,39 +1639,39 @@
 "använd libextractor för att lägga till ytterligare direktreferenser till "
 "katalogposter"
 
-#: src/applications/fs/tools/gnunet-insert.c:287
+#: src/applications/fs/tools/gnunet-insert.c:285
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:289
+#: src/applications/fs/tools/gnunet-insert.c:287
 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:292
+#: src/applications/fs/tools/gnunet-insert.c:290
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:296
+#: src/applications/fs/tools/gnunet-insert.c:295
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:300
+#: src/applications/fs/tools/gnunet-insert.c:299
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:305
+#: src/applications/fs/tools/gnunet-insert.c:304
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:308
+#: src/applications/fs/tools/gnunet-insert.c:307
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -1699,75 +1687,75 @@
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/applications/fs/tools/gnunet-insert.c:319
+#: src/applications/fs/tools/gnunet-insert.c:320
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:322
+#: src/applications/fs/tools/gnunet-insert.c:323
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:326
+#: src/applications/fs/tools/gnunet-insert.c:327
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:330
+#: src/applications/fs/tools/gnunet-insert.c:332
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:333
+#: src/applications/fs/tools/gnunet-insert.c:335
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:368
+#: src/applications/fs/tools/gnunet-insert.c:371
 #, 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:427
+#: src/applications/fs/tools/gnunet-insert.c:418
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:447
+#: src/applications/fs/tools/gnunet-insert.c:437
 #, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr ""
 
+#: src/applications/fs/tools/gnunet-insert.c:448
 #: src/applications/fs/tools/gnunet-insert.c:456
-#: src/applications/fs/tools/gnunet-insert.c:462
-#: src/applications/fs/tools/gnunet-insert.c:468
-#: src/applications/fs/tools/gnunet-insert.c:474
+#: src/applications/fs/tools/gnunet-insert.c:464
+#: src/applications/fs/tools/gnunet-insert.c:472
 #: src/applications/fs/tools/gnunet-insert.c:480
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:143
+#: src/applications/fs/tools/gnunet-search.c:138
 msgid "Search GNUnet for files."
 msgstr "Sök GNUnet efter filer."
 
-#: src/applications/fs/tools/gnunet-search.c:147
+#: src/applications/fs/tools/gnunet-search.c:142
 msgid "exit after receiving LIMIT results"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:150
+#: src/applications/fs/tools/gnunet-search.c:145
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:153
+#: src/applications/fs/tools/gnunet-search.c:148
 msgid "wait DELAY seconds for search results before aborting"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:191
+#: src/applications/fs/tools/gnunet-search.c:183
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:73
+#: src/applications/fs/tools/gnunet-download.c:74
 msgid ""
 "download a GNUnet directory that has already been downloaded.  Requires that "
 "a filename of an existing file is specified instead of the URI.  The "
@@ -1775,88 +1763,88 @@
 "`-R' option is also specified."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:75
+#: src/applications/fs/tools/gnunet-download.c:76
 msgid "Download files from GNUnet."
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/applications/fs/tools/gnunet-download.c:79
+#: src/applications/fs/tools/gnunet-download.c:80
 msgid "write the file to FILENAME"
 msgstr "skriv filen till FILNAMN"
 
-#: src/applications/fs/tools/gnunet-download.c:82
+#: src/applications/fs/tools/gnunet-download.c:84
 msgid "set the maximum number of parallel downloads that are allowed"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:85
+#: src/applications/fs/tools/gnunet-download.c:87
 msgid "download a GNUnet directory recursively"
 msgstr "hämta en GNUnet-katalog rekursivt"
 
-#: src/applications/fs/tools/gnunet-download.c:103
+#: src/applications/fs/tools/gnunet-download.c:108
 #, 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:116
+#: src/applications/fs/tools/gnunet-download.c:122
 #, fuzzy, c-format
 msgid "Download aborted.\n"
 msgstr "Nedladdning avbruten."
 
-#: src/applications/fs/tools/gnunet-download.c:122
+#: src/applications/fs/tools/gnunet-download.c:128
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/applications/fs/tools/gnunet-download.c:128
+#: src/applications/fs/tools/gnunet-download.c:134
 #, fuzzy, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr ""
 "Hämtning av fil \"%s\" färdig.  Hastigheten var %8.3f kilobyte per sekund.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:176
+#: src/applications/fs/tools/gnunet-download.c:178
 msgid "no name given"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:182
+#: src/applications/fs/tools/gnunet-download.c:184
 #, fuzzy, c-format
 msgid "Starting download `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-download.c:230
+#: src/applications/fs/tools/gnunet-download.c:225
 msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 msgstr ""
 "Inte tillräckligt med argument. Du måste ange en URI till en GNUnet-fil\n"
 
-#: src/applications/fs/tools/gnunet-download.c:251
+#: src/applications/fs/tools/gnunet-download.c:242
 #, 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:281
+#: src/applications/fs/tools/gnunet-download.c:279
 #, fuzzy, c-format
 msgid "No filename specified, using `%s' instead (for now).\n"
 msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-download.c:325
+#: src/applications/fs/tools/gnunet-download.c:320
 #, fuzzy, c-format
 msgid "Could not access gnunet-directory file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-download.c:345
+#: src/applications/fs/tools/gnunet-download.c:338
 #, fuzzy, c-format
 msgid "Downloading %d files from directory `%s'.\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/applications/fs/tools/gnunet-download.c:349
+#: src/applications/fs/tools/gnunet-download.c:341
 #, fuzzy, c-format
 msgid "Did not find any files in directory `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:390
+#: src/applications/fs/tools/gnunet-download.c:377
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Fil lagrad som \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:57
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
@@ -1865,7 +1853,7 @@
 "%16llu av %16llu byte avindexerat (uppskattar %llu sekunder till "
 "färdigställd)                "
 
-#: src/applications/fs/tools/gnunet-unindex.c:68
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1874,7 +1862,7 @@
 "\n"
 "Avindexering av \"%s\" klar, %llu byte tog %llu sekunder (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:80
+#: src/applications/fs/tools/gnunet-unindex.c:85
 #, c-format
 msgid ""
 "\n"
@@ -1883,35 +1871,35 @@
 "\n"
 "Fel vid avindexering av fil: %s\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:100
+#: src/applications/fs/tools/gnunet-unindex.c:105
 msgid "Unindex files."
 msgstr "Avindexera filer."
 
-#: src/applications/fs/tools/gnunet-unindex.c:137
+#: src/applications/fs/tools/gnunet-unindex.c:142
 #, 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:164
+#: src/applications/fs/tools/gnunet-unindex.c:158
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "\"%s\" misslyckades.  Är \"%s\" en fil?\n"
 
-#: src/applications/fs/module/querymanager.c:225
+#: src/applications/fs/module/querymanager.c:228
 msgid "# FS currently tracked queries from clients"
 msgstr ""
 
-#: src/applications/fs/module/querymanager.c:227
+#: src/applications/fs/module/querymanager.c:230
 msgid "# FS replies passed to clients"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:336
+#: src/applications/fs/module/ondemand.c:323
 #, 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:434
+#: src/applications/fs/module/ondemand.c:418
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -1919,24 +1907,24 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:461
+#: src/applications/fs/module/ondemand.c:444
 #, 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:518
+#: src/applications/fs/module/ondemand.c:495
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:681
+#: src/applications/fs/module/ondemand.c:647
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1211
+#: src/applications/fs/module/fs.c:1170
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -1945,45 +1933,45 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/applications/fs/module/fs.c:1224
+#: src/applications/fs/module/fs.c:1185
 msgid "# FS expired replies dropped"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1226
+#: src/applications/fs/module/fs.c:1187
 #, fuzzy
 msgid "# FS valid replies received"
 msgstr "# byte mottogs via TCP"
 
-#: src/applications/fs/module/fs.c:1263
+#: src/applications/fs/module/fs.c:1220
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1303
+#: src/applications/fs/module/fs.c:1266
 msgid "enables (anonymous) file-sharing"
 msgstr "aktiverar (anonym) fildelning"
 
-#: src/applications/fs/module/migration.c:304
+#: src/applications/fs/module/migration.c:312
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:306
+#: src/applications/fs/module/migration.c:314
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:308
+#: src/applications/fs/module/migration.c:317
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/module/dht_push.c:137
+#: src/applications/fs/module/dht_push.c:138
 msgid "# blocks pushed into DHT"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:238
+#: src/applications/fs/fsui/search.c:234
 msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:308
+#: src/applications/fs/fsui/download.c:294
 #, fuzzy
 msgid "Download failed (no reason given)"
 msgstr "Ladda ner filer från GNUnet."
@@ -1992,34 +1980,34 @@
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:281
+#: src/applications/fs/fsui/upload.c:278
 msgid "Failed to create temporary directory."
 msgstr ""
 
-#: src/applications/fs/fsui/deserialize.c:754
+#: src/applications/fs/fsui/deserialize.c:757
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:167
+#: src/applications/fs/ecrs/search.c:168
 msgid "CHK URI not allowed for search.\n"
 msgstr "CHK URI tillåts inte för sökning.\n"
 
-#: src/applications/fs/ecrs/search.c:226
+#: src/applications/fs/ecrs/search.c:214
 msgid "LOC URI not allowed for search.\n"
 msgstr "LOC URI tillåts inte för sökning.\n"
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/fs/ecrs/download.c:131
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:270
+#: src/applications/fs/ecrs/download.c:271
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Skrivning(%d, %p, %d) misslyckades: %s\n"
 
-#: src/applications/fs/ecrs/download.c:1043
+#: src/applications/fs/ecrs/download.c:1001
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2027,58 +2015,58 @@
 "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:1229
+#: src/applications/fs/ecrs/download.c:1184
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:164
+#: src/applications/fs/ecrs/upload.c:155
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/applications/fs/ecrs/upload.c:174
+#: src/applications/fs/ecrs/upload.c:162
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Kan inte hämta storlek på fil \"%s\""
 
-#: src/applications/fs/ecrs/upload.c:183
+#: src/applications/fs/ecrs/upload.c:171
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/applications/fs/ecrs/upload.c:195
+#: src/applications/fs/ecrs/upload.c:183
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:214
+#: src/applications/fs/ecrs/upload.c:202
 #, 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:221
+#: src/applications/fs/ecrs/upload.c:209
 #, 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:236
+#: src/applications/fs/ecrs/upload.c:223
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/applications/fs/ecrs/upload.c:316
+#: src/applications/fs/ecrs/upload.c:296
 #, 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:854
+#: src/applications/fs/ecrs/meta.c:876
 #, 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:862
+#: src/applications/fs/ecrs/meta.c:884
 #, 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"
@@ -2088,79 +2076,79 @@
 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:343
-#: src/applications/fs/ecrs/namespace.c:426
-#: src/applications/fs/ecrs/namespace.c:585
+#: src/applications/fs/ecrs/namespace.c:325
+#: src/applications/fs/ecrs/namespace.c:404
+#: src/applications/fs/ecrs/namespace.c:545
 #, 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:355
-#: src/applications/fs/ecrs/namespace.c:437
+#: src/applications/fs/ecrs/namespace.c:337
+#: src/applications/fs/ecrs/namespace.c:415
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:599
-#: src/applications/fs/ecrs/namespace.c:610
+#: src/applications/fs/ecrs/namespace.c:556
+#: src/applications/fs/ecrs/namespace.c:567
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Formatet på filen \"%s\" är ogiltig.\n"
 
-#: src/applications/fs/ecrs/helper.c:67
+#: src/applications/fs/ecrs/helper.c:74
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: 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
+#: src/applications/fs/ecrs/helper.c:127 src/applications/fs/ecrs/helper.c:129
+#: src/applications/fs/ecrs/helper.c:133 src/applications/fs/ecrs/helper.c:138
 msgid "AND"
 msgstr "OCH"
 
-#: src/applications/fs/ecrs/parser.c:122
+#: src/applications/fs/ecrs/parser.c:120
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:131
+#: src/applications/fs/uritrack/file_info.c:126
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:402
+#: src/applications/fs/uritrack/file_info.c:395
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:727
+#: src/applications/fs/namespace/namespace_info.c:655
 msgid "Publication interval for periodic publication changed."
 msgstr "Publiseringsintervall för periodisk publisering har ändrats."
 
-#: src/applications/fs/namespace/namespace_info.c:748
+#: src/applications/fs/namespace/namespace_info.c:675
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:382
+#: src/applications/topology_f2f/topology.c:373
 #, 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:400
+#: src/applications/topology_f2f/topology.c:390
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:413
+#: src/applications/topology_f2f/topology.c:404
 #, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:519
+#: src/applications/topology_f2f/topology.c:511
 msgid "maintains a friend-to-friend restricted topology"
 msgstr ""
 
-#: src/applications/template/template.c:62
+#: src/applications/template/template.c:68
 #, c-format
 msgid "`%s' registering client handler %d and %d\n"
 msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
@@ -2169,50 +2157,50 @@
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:105
+#: src/applications/bootstrap_http/http.c:102
 #, 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:176
+#: src/applications/bootstrap_http/http.c:170
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:211
+#: src/applications/bootstrap_http/http.c:210
 #, c-format
 msgid "Bootstrapping using `%s'.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:237
+#: src/applications/bootstrap_http/http.c:224
 #, 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:388
+#: src/applications/bootstrap_http/http.c:352
 #, fuzzy, c-format
 msgid "Downloaded %llu bytes from `%s'.\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/applications/bootstrap_http/http.c:421
+#: src/applications/bootstrap_http/http.c:385
 msgid "# HELLOs downloaded via http"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:441
+#: src/applications/traffic/traffic.c:454
 #, c-format
 msgid "# bytes transmitted of type %d"
 msgstr "# byte skickade av typen %d"
 
-#: src/applications/traffic/traffic.c:459
+#: src/applications/traffic/traffic.c:470
 #, c-format
 msgid "# bytes received of type %d"
 msgstr "# byte mottagna av typen %d"
 
-#: src/applications/traffic/traffic.c:478
+#: src/applications/traffic/traffic.c:489
 #, fuzzy, c-format
 msgid "# bytes received in plaintext of type %d"
 msgstr "# byte mottagna av typen %d"
 
-#: src/applications/traffic/traffic.c:639
+#: src/applications/traffic/traffic.c:644
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -2220,382 +2208,382 @@
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:326
+#: src/applications/vpn/vpn.c:366
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:334
+#: src/applications/vpn/vpn.c:377
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:362
+#: src/applications/vpn/vpn.c:410
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:411
+#: src/applications/vpn/vpn.c:466
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:415
+#: src/applications/vpn/vpn.c:472
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:425
+#: src/applications/vpn/vpn.c:488
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:485
+#: src/applications/vpn/vpn.c:556
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:489
+#: src/applications/vpn/vpn.c:562
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:518
+#: src/applications/vpn/vpn.c:594
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:526
+#: src/applications/vpn/vpn.c:606
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:530
+#: src/applications/vpn/vpn.c:614
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:568
+#: src/applications/vpn/vpn.c:655
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:572
+#: src/applications/vpn/vpn.c:664
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:579
+#: src/applications/vpn/vpn.c:674
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:584
+#: src/applications/vpn/vpn.c:682
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:592
+#: src/applications/vpn/vpn.c:694
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:604
+#: src/applications/vpn/vpn.c:707
 #, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:615
+#: src/applications/vpn/vpn.c:721
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:627
+#: src/applications/vpn/vpn.c:733
 #, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:660
+#: src/applications/vpn/vpn.c:774
 msgid ""
 "RFC4193 We have run out of memory and so I can't store a tunnel for this "
 "peer.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:706
+#: src/applications/vpn/vpn.c:822
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:769
+#: src/applications/vpn/vpn.c:895
 #, c-format
 msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:773
+#: src/applications/vpn/vpn.c:902
 #, c-format
 msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:791
+#: src/applications/vpn/vpn.c:921
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:831
+#: src/applications/vpn/vpn.c:968
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:835
+#: src/applications/vpn/vpn.c:974
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:841
+#: src/applications/vpn/vpn.c:981
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:844
+#: src/applications/vpn/vpn.c:985
 #, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:996
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:873
+#: src/applications/vpn/vpn.c:1022
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:894
+#: src/applications/vpn/vpn.c:1043
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:899
+#: src/applications/vpn/vpn.c:1050
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:910
+#: src/applications/vpn/vpn.c:1065
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:916
+#: src/applications/vpn/vpn.c:1071
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:932
+#: src/applications/vpn/vpn.c:1088
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:936
+#: src/applications/vpn/vpn.c:1094
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:940
+#: src/applications/vpn/vpn.c:1100
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:954
+#: src/applications/vpn/vpn.c:1119
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:969
+#: src/applications/vpn/vpn.c:1137
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:997
+#: src/applications/vpn/vpn.c:1168
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1012
+#: src/applications/vpn/vpn.c:1188
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1057
+#: src/applications/vpn/vpn.c:1239
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1103
+#: src/applications/vpn/vpn.c:1292
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1129
+#: src/applications/vpn/vpn.c:1324
 msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1190 src/setup/ncurses/wizard_curs.c:105
+#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:95
 msgid "Yes"
 msgstr "Ja"
 
-#: src/applications/vpn/vpn.c:1190 src/setup/ncurses/wizard_curs.c:104
+#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:94
 msgid "No"
 msgstr "Nej"
 
-#: src/applications/vpn/vpn.c:1398
+#: src/applications/vpn/vpn.c:1647
 #, 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:1399
+#: src/applications/vpn/vpn.c:1650
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1449
+#: src/applications/vpn/vpn.c:1723
 #, fuzzy
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr "aktiverar P2P-chatt (ej komplett)"
 
-#: src/applications/vpn/vpn.c:1481
+#: src/applications/vpn/vpn.c:1757
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1494
+#: src/applications/vpn/vpn.c:1771
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1509
+#: src/applications/vpn/vpn.c:1788
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/dstore/dstore.c:555
+#: src/applications/dstore/dstore.c:466
 #, fuzzy
 msgid "# bytes in dstore"
 msgstr "# byte krypterade"
 
-#: src/server/gnunet-update.c:143
+#: src/server/gnunet-update.c:147
 #, c-format
 msgid "Updating data for module `%s'\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/server/gnunet-update.c:148
+#: src/server/gnunet-update.c:151
 #, c-format
 msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:196 src/server/gnunetd.c:144
+#: src/server/gnunet-update.c:198 src/server/gnunetd.c:136
 #, fuzzy
 msgid "Core initialization failed.\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/server/gnunet-update.c:237
+#: src/server/gnunet-update.c:239
 msgid "print a value from the configuration file to stdout"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/server/gnunet-update.c:239
+#: src/server/gnunet-update.c:241
 msgid "Updates GNUnet datastructures after version change."
 msgstr "Uppdaterar GNUnets datastruktur efter versionsändring."
 
-#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:401
+#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:365
 msgid "run as user LOGIN"
 msgstr "kör som användare LOGIN"
 
-#: src/server/gnunet-update.c:246
+#: src/server/gnunet-update.c:249
 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:1116
+#: src/server/connection.c:1188
 #, 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:1125
+#: src/server/connection.c:1197
 #, 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:2594
+#: src/server/connection.c:2744
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
 
-#: src/server/connection.c:2679
+#: src/server/connection.c:2829
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2698
+#: src/server/connection.c:2851
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:3154
+#: src/server/connection.c:3337
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3158
+#: src/server/connection.c:3340
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3160
+#: src/server/connection.c:3342
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3163
+#: src/server/connection.c:3345
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/server/connection.c:3167
+#: src/server/connection.c:3349
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/server/connection.c:3171
+#: src/server/connection.c:3353
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/server/connection.c:3174
+#: src/server/connection.c:3355
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/server/connection.c:3176
+#: src/server/connection.c:3356
 msgid "# bytes noise sent"
 msgstr ""
 
-#: src/server/connection.c:3178
+#: src/server/connection.c:3359
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3180
+#: src/server/connection.c:3362
 msgid "# total bytes per second receive limit"
 msgstr ""
 
-#: src/server/connection.c:3182
+#: src/server/connection.c:3365
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "antal meddelanden i ett meddelandeblock"
 
-#: src/server/connection.c:3184
+#: src/server/connection.c:3369
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3186
+#: src/server/connection.c:3373
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3188
+#: src/server/connection.c:3377
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
-#: src/server/startup.c:207
+#: src/server/startup.c:206
 #, fuzzy, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/server/startup.c:224
+#: src/server/startup.c:223
 #, c-format
 msgid ""
 "Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
 "address@hidden"
 msgstr ""
 
-#: src/server/startup.c:238
+#: src/server/startup.c:237
 #, c-format
 msgid ""
 "Limiting datastore size to %llu GB, because the `%s' filesystem does not "
@@ -2603,12 +2591,12 @@
 "partition!\n"
 msgstr ""
 
-#: src/server/startup.c:285
+#: src/server/startup.c:274
 #, c-format
 msgid "Insufficient access permissions for `%s': %s\n"
 msgstr ""
 
-#: src/server/gnunetd.c:84
+#: src/server/gnunetd.c:85
 #, c-format
 msgid "`%s' startup complete.\n"
 msgstr "\"%s\" uppstart klar.\n"
@@ -2618,101 +2606,101 @@
 msgid "`%s' is shutting down.\n"
 msgstr ""
 
-#: src/server/gnunetd.c:206
+#: src/server/gnunetd.c:192
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
 msgstr ""
 
-#: src/server/gnunetd.c:210
+#: src/server/gnunetd.c:196
 msgid "Starts the gnunetd daemon."
 msgstr "Startar gnunetd-demonen."
 
-#: src/server/gnunetd.c:213
+#: src/server/gnunetd.c:199
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:216
+#: src/server/gnunetd.c:203
 msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:220
+#: src/server/gnunetd.c:207
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: src/server/gnunetd.c:288
+#: src/server/gnunetd.c:271
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
 "Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
 
-#: src/server/core.c:124
+#: src/server/core.c:126
 #, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr ""
 
-#: src/server/core.c:174
+#: src/server/core.c:177
 #, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr ""
 
-#: src/server/core.c:217
+#: src/server/core.c:226
 #, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr ""
 
-#: src/server/core.c:225
+#: src/server/core.c:234
 #, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr ""
 
-#: src/server/core.c:235
+#: src/server/core.c:243
 #, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:374
+#: src/server/core.c:386
 #, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr ""
 
-#: src/server/core.c:470
+#: src/server/core.c:492
 #, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:598
+#: src/server/core.c:628
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:118
+#: src/server/gnunet-transport-check.c:121
 #, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:127
+#: src/server/gnunet-transport-check.c:128
 #, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "\"%s\": Kunde inte ansluta.\n"
 
-#: src/server/gnunet-transport-check.c:161
+#: src/server/gnunet-transport-check.c:157
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr "\"%s\": Kunde inte skicka.\n"
 
-#: src/server/gnunet-transport-check.c:183
+#: src/server/gnunet-transport-check.c:172
 #, 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:197
+#: src/server/gnunet-transport-check.c:185
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "\"%s\": Kunde inte koppla ned.\n"
 
-#: src/server/gnunet-transport-check.c:204
+#: src/server/gnunet-transport-check.c:192
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -2721,12 +2709,12 @@
 "\"%s\" transport OK.  Det tog %ums att överföra %d meddelanden på %d byte "
 "styck.\n"
 
-#: src/server/gnunet-transport-check.c:232
+#: src/server/gnunet-transport-check.c:222
 #, fuzzy, c-format
 msgid " Transport %d is not being tested\n"
 msgstr " Transport %d ej tillgänglig\n"
 
-#: src/server/gnunet-transport-check.c:265
+#: src/server/gnunet-transport-check.c:251
 #, c-format
 msgid ""
 "\n"
@@ -2735,99 +2723,99 @@
 "\n"
 "Kontaktar \"%s\"."
 
-#: src/server/gnunet-transport-check.c:291
+#: src/server/gnunet-transport-check.c:276
 #, c-format
 msgid " Connection failed\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/server/gnunet-transport-check.c:297
+#: src/server/gnunet-transport-check.c:282
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:319
 #, c-format
 msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-transport-check.c:321
 #, fuzzy, c-format
 msgid "OK!\n"
 msgstr "OK"
 
-#: src/server/gnunet-transport-check.c:382
+#: src/server/gnunet-transport-check.c:346
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:386
+#: src/server/gnunet-transport-check.c:350
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:389
+#: src/server/gnunet-transport-check.c:353
 msgid "send COUNT messages"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/server/gnunet-transport-check.c:392
+#: src/server/gnunet-transport-check.c:356
 msgid "send messages with SIZE bytes payload"
 msgstr "skicka meddelanden med STORLEK bytes nyttolast"
 
-#: src/server/gnunet-transport-check.c:395
+#: src/server/gnunet-transport-check.c:359
 msgid "specifies which TRANSPORT should be tested"
 msgstr "anger vilken TRANSPORT som ska testas"
 
-#: src/server/gnunet-transport-check.c:398
+#: src/server/gnunet-transport-check.c:362
 msgid "specifies after how many MS to time-out"
 msgstr "anger timeout efter antal MS"
 
-#: src/server/gnunet-transport-check.c:406
+#: src/server/gnunet-transport-check.c:370
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:471
+#: src/server/gnunet-transport-check.c:431
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/server/gnunet-transport-check.c:474
+#: src/server/gnunet-transport-check.c:433
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/server/gnunet-transport-check.c:539
+#: src/server/gnunet-transport-check.c:474
 #, c-format
 msgid ""
 "\n"
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
-#: src/server/tcpserver.c:105
+#: src/server/tcpserver.c:109
 #, c-format
 msgid "The `%s' request received from client is malformed.\n"
 msgstr ""
 
-#: src/server/tcpserver.c:333
+#: src/server/tcpserver.c:324
 #, fuzzy, c-format
 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:414
+#: src/server/tcpserver.c:398
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:466
+#: src/server/tcpserver.c:454
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr ""
 
-#: src/server/handler.c:401
+#: src/server/handler.c:428
 #, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/server/version.c:152
+#: src/server/version.c:141
 msgid ""
 "Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
@@ -2840,77 +2828,77 @@
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:129 src/server/gnunet-peer-info.c:159
+#: src/server/gnunet-peer-info.c:122 src/server/gnunet-peer-info.c:153
 #, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:139
+#: src/server/gnunet-peer-info.c:133
 msgid "hello message invalid (signature invalid).\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:161
+#: src/server/gnunet-peer-info.c:154
 #, fuzzy, c-format
 msgid "Peer `%s' with trust %8u\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/server/gnunet-peer-info.c:166
+#: src/server/gnunet-peer-info.c:158
 #, 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/boot/startup.c:212
+#: src/util/boot/startup.c:199
 #, fuzzy, c-format
 msgid "Failed to run %s: %s %d\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/util/network_client/tcpio.c:94 src/util/network_client/tcpio.c:135
+#: src/util/network_client/tcpio.c:96 src/util/network_client/tcpio.c:140
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:106
+#: src/util/network_client/tcpio.c:111
 #, fuzzy, c-format
 msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/network_client/tcpio.c:280
+#: src/util/network_client/tcpio.c:290
 #, 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:323
+#: src/util/network_client/tcpio.c:327
 #, fuzzy, c-format
 msgid "Error connecting to %s:%u\n"
 msgstr ""
 "\n"
 "Fel vid avindexering av fil: %s\n"
 
-#: src/util/network_client/tcpio.c:336
+#: src/util/network_client/tcpio.c:338
 #, fuzzy, c-format
 msgid "Failed to connect to %s:%u in %ds\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/util/network_client/tcpio.c:492
+#: src/util/network_client/tcpio.c:494
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "\"%s\" misslyckades, svar ogiltigt!\n"
 
-#: src/util/crypto/hostkey_gcrypt.c:1036
+#: src/util/crypto/hostkey_gcrypt.c:898
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto/locking_gcrypt.c:74
+#: src/util/crypto/locking_gcrypt.c:80
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/os/statuscalls.c:186 src/util/os/statuscalls.c:323
+#: src/util/os/statuscalls.c:196 src/util/os/statuscalls.c:337
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/os/statuscalls.c:368 src/util/os/statuscalls.c:377
+#: src/util/os/statuscalls.c:380 src/util/os/statuscalls.c:390
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -2918,53 +2906,53 @@
 "Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%s"
 "\"!\n"
 
-#: src/util/os/semaphore.c:219
+#: src/util/os/semaphore.c:218
 #, c-format
 msgid "Can't create semaphore: %i"
 msgstr "Kan inte skapa semafor: %i"
 
-#: src/util/os/osconfig.c:121
+#: src/util/os/osconfig.c:124
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:379
+#: src/util/os/osconfig.c:391
 #, fuzzy, c-format
 msgid "Command `%s' failed with error code %u\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/os/dso.c:56
+#: src/util/os/dso.c:59
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/util/os/dso.c:110
+#: src/util/os/dso.c:119
 #, 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:152
+#: src/util/os/dso.c:159
 #, 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"
 
-#: src/util/os/cpustatus.c:426
+#: src/util/os/cpustatus.c:461
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "Kan inte fråga efter CPU-användning (Windows NT).\n"
 
-#: src/util/os/cpustatus.c:446
+#: src/util/os/cpustatus.c:483
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Kan inte fråga efter CPU-användning (Win 9x).\n"
 
-#: src/util/os/user.c:128 src/util/os/user.c:169
+#: src/util/os/user.c:134 src/util/os/user.c:176
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/os/user.c:130
+#: src/util/os/user.c:135
 msgid "No such user"
 msgstr ""
 
-#: src/util/os/user.c:143
+#: src/util/os/user.c:149
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
@@ -2974,183 +2962,185 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/network/select.c:315
+#: src/util/network/select.c:304
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 
-#: src/util/network/select.c:482
-msgid "select listen socket not valid!\n"
+#: src/util/network/select.c:473
+#, c-format
+msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
-#: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
+#: src/util/network/ipcheck.c:105 src/util/network/ipcheck.c:133
+#: src/util/network/ipcheck.c:180 src/util/network/ipcheck.c:204
+#: src/util/network/ipcheck.c:212
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/network/ipcheck.c:156
+#: src/util/network/ipcheck.c:162
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/util/network/ipcheck.c:217
+#: src/util/network/ipcheck.c:259
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/network/ipcheck.c:250
+#: src/util/network/ipcheck.c:291
 #, c-format
 msgid "Wrong format `%s' for netmask: %s\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/network/ipcheck.c:265
+#: src/util/network/ipcheck.c:304
 #, c-format
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
 
-#: src/util/network/ip.c:202
+#: src/util/network/ip.c:195
 #, c-format
 msgid ""
 "Could not find interface `%s' using `%s', trying to find another interface.\n"
 msgstr ""
 
-#: src/util/network/ip.c:278
+#: src/util/network/ip.c:268
 #, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr ""
 
-#: src/util/network/ip.c:288
+#: src/util/network/ip.c:277
 #, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
 "GNUnet will use %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/util/network/ip.c:309
+#: src/util/network/ip.c:297
 #, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr ""
 
-#: src/util/network/ip.c:341
+#: src/util/network/ip.c:326
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/disk/storage.c:202
+#: src/util/disk/storage.c:198
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk/storage.c:531
+#: src/util/disk/storage.c:526
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/config_impl/impl.c:289
+#: src/util/config_impl/impl.c:290
 #, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/config_impl/impl.c:532
+#: src/util/config_impl/impl.c:533
 #, c-format
 msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:578
+#: src/util/config_impl/impl.c:579
 #, 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:590
+#: src/util/config_impl/impl.c:589
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:680
+#: src/util/config_impl/impl.c:672
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:122
+#: src/util/error/error.c:115
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:190 src/util/error/error.c:234
+#: src/util/error/error.c:187 src/util/error/error.c:222
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/error/error.c:193 src/util/error/error.c:236
+#: src/util/error/error.c:189 src/util/error/error.c:224
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:196 src/util/error/error.c:240
+#: src/util/error/error.c:191 src/util/error/error.c:228
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/error/error.c:199 src/util/error/error.c:242
+#: src/util/error/error.c:193 src/util/error/error.c:230
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/error/error.c:202 src/util/error/error.c:244
+#: src/util/error/error.c:195 src/util/error/error.c:232
 msgid "FATAL"
 msgstr "ÖDESDIGER"
 
-#: src/util/error/error.c:205 src/util/error/error.c:246
+#: src/util/error/error.c:197 src/util/error/error.c:234
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:208 src/util/error/error.c:248
+#: src/util/error/error.c:199 src/util/error/error.c:236
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:211 src/util/error/error.c:250
+#: src/util/error/error.c:201 src/util/error/error.c:238
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:214 src/util/error/error.c:252
+#: src/util/error/error.c:203 src/util/error/error.c:240
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:217 src/util/error/error.c:254
+#: src/util/error/error.c:205 src/util/error/error.c:242
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:220 src/util/error/error.c:256
+#: src/util/error/error.c:207 src/util/error/error.c:244
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:223
+#: src/util/error/error.c:209
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:238
+#: src/util/error/error.c:226
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/error/error.c:257
+#: src/util/error/error.c:245
 msgid "NOTHING"
 msgstr "INGET"
 
-#: src/util/threads/mutex.c:145 src/util/threads/semaphore.c:174
-#: src/util/threads/pthread.c:150
+#: src/util/threads/mutex.c:144 src/util/threads/semaphore.c:166
+#: src/util/threads/pthread.c:154
 #, fuzzy, c-format
 msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 msgstr "Icke-förväntad mycket stor allokering (%u byte) vid %s:%d!\n"
 
-#: src/util/threads/mutex.c:154 src/util/threads/mutex.c:194
+#: src/util/threads/mutex.c:152 src/util/threads/mutex.c:194
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/util/threads/mutex.c:159
+#: src/util/threads/mutex.c:156
 #, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr ""
@@ -3160,91 +3150,103 @@
 msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:199
+#: src/util/threads/mutex.c:198
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/threads/pthread.c:162 src/util/threads/pthread.c:170
-#: src/util/threads/pthread.c:177 src/util/threads/pthread.c:270
+#: src/util/threads/pthread.c:165 src/util/threads/pthread.c:171
+#: src/util/threads/pthread.c:176 src/util/threads/pthread.c:264
 #, 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:184 src/util/threads/pthread.c:281
+#: src/util/threads/pthread.c:181 src/util/threads/pthread.c:273
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/loggers/file.c:231
+#: src/util/loggers/file.c:229
 #, fuzzy, c-format
 msgid "Failed to open log-file `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/loggers/file.c:256
+#: src/util/loggers/file.c:248
 #, fuzzy
 msgid "GNUnet error log"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/util/loggers/memory.c:71
+#: src/util/loggers/file.c:265 src/util/loggers/file.c:282
+#: src/include/gnunet_util_error.h:243 src/include/gnunet_util_error.h:250
+#: src/include/gnunet_util_error.h:257 src/include/gnunet_util_error.h:264
+#, 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/util/loggers/memory.c:70
 msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:681
+#: src/util/getopt/getopt.c:684
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/getopt/getopt.c:705
+#: src/util/getopt/getopt.c:710
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt/getopt.c:710
+#: src/util/getopt/getopt.c:716
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt/getopt.c:727 src/util/getopt/getopt.c:901
+#: src/util/getopt/getopt.c:737 src/util/getopt/getopt.c:909
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flagga \"%s\" kräver ett argument\n"
 
-#: src/util/getopt/getopt.c:757
+#: src/util/getopt/getopt.c:767
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: src/util/getopt/getopt.c:761
+#: src/util/getopt/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: src/util/getopt/getopt.c:787
+#: src/util/getopt/getopt.c:797
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: otillåten flagga -- %c\n"
 
-#: src/util/getopt/getopt.c:790
+#: src/util/getopt/getopt.c:799
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: src/util/getopt/getopt.c:820 src/util/getopt/getopt.c:950
+#: src/util/getopt/getopt.c:828 src/util/getopt/getopt.c:958
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: flagga kräver ett argument -- %c\n"
 
-#: src/util/getopt/getopt.c:867
+#: src/util/getopt/getopt.c:876
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flagga \"-W %s\" är tvetydig\n"
 
-#: src/util/getopt/getopt.c:885
+#: src/util/getopt/getopt.c:894
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
 
+#: src/util/getopt/getopt.c:1071 src/setup/gnunet-setup.c:273
+#, 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/util/getopt/setoption.c:58
 #, c-format
 msgid ""
@@ -3252,12 +3254,12 @@
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
+#: src/util/getopt/setoption.c:136 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
+#: src/util/getopt/printhelp.c:49
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -3265,7 +3267,7 @@
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/string/string.c:121
+#: src/util/string/string.c:120
 msgid "ms"
 msgstr "ms"
 
@@ -3273,200 +3275,200 @@
 msgid "s"
 msgstr "s"
 
-#: src/util/string/string.c:129
+#: src/util/string/string.c:130
 msgid "m"
 msgstr "m"
 
-#: src/util/string/string.c:132
+#: src/util/string/string.c:134
 msgid "h"
 msgstr "h"
 
-#: src/util/string/string.c:135
+#: src/util/string/string.c:138
 msgid " days"
 msgstr " dagar"
 
-#: src/util/string/string.c:153
+#: src/util/string/string.c:154
 msgid "b"
 msgstr "b"
 
-#: src/util/string/string.c:158
+#: src/util/string/string.c:160
 msgid "KiB"
 msgstr ""
 
-#: src/util/string/string.c:161
+#: src/util/string/string.c:164
 msgid "MiB"
 msgstr ""
 
-#: src/util/string/string.c:164
+#: src/util/string/string.c:168
 msgid "GiB"
 msgstr ""
 
-#: src/util/string/string.c:167
+#: src/util/string/string.c:172
 msgid "TiB"
 msgstr ""
 
-#: src/util/string/string.c:287
+#: src/util/string/string.c:284
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:60
+#: src/setup/gnunet-setup.c:59
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:62
+#: src/setup/gnunet-setup.c:61
 msgid "Tool to setup GNUnet."
 msgstr "Verktyg för att ställa in GNUnet."
 
-#: src/setup/gnunet-setup.c:188
+#: src/setup/gnunet-setup.c:176
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Ogiltiga kommandoradsargument.\n"
 
-#: src/setup/gnunet-setup.c:193
+#: src/setup/gnunet-setup.c:181
 msgid "No interface specified, using default\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:268
+#: src/setup/gnunet-setup.c:255
 #, c-format
 msgid "`%s' is not available."
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/setup/gnunet-setup.c:284
+#: src/setup/gnunet-setup.c:272
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/setup/gnunet-win-tool.c:54
+#: src/setup/gnunet-win-tool.c:55
 msgid "list all network adapters"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:57
+#: src/setup/gnunet-win-tool.c:58
 msgid "install GNUnet as Windows service"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:60
+#: src/setup/gnunet-win-tool.c:61
 msgid "uninstall GNUnet service"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:63
+#: src/setup/gnunet-win-tool.c:64
 msgid "increase the maximum number of TCP/IP connections"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:66
+#: src/setup/gnunet-win-tool.c:67
 msgid "display a file's hash value"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:121
+#: src/setup/gnunet-win-tool.c:126
 #, c-format
 msgid "GNUnet service installed successfully.\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:151
+#: src/setup/gnunet-win-tool.c:129 src/setup/gnunet-win-tool.c:157
 #, c-format
 msgid "This version of Windows doesn't support services.\n"
 msgstr "Denna version av Windows har inte stöd för tjänster.\n"
 
-#: src/setup/gnunet-win-tool.c:128 src/setup/gnunet-win-tool.c:155
+#: src/setup/gnunet-win-tool.c:133 src/setup/gnunet-win-tool.c:161
 #, c-format
 msgid "Error: can't open Service Control Manager: %s\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:133
+#: src/setup/gnunet-win-tool.c:138
 #, c-format
 msgid "Error: can't create service: %s\n"
 msgstr "Fel: kan inte skapa tjänst: %s\n"
 
-#: src/setup/gnunet-win-tool.c:136 src/setup/gnunet-win-tool.c:167
+#: src/setup/gnunet-win-tool.c:141 src/setup/gnunet-win-tool.c:173
 #, c-format
 msgid "Unknown error.\n"
 msgstr "Okänt fel.\n"
 
-#: src/setup/gnunet-win-tool.c:148
+#: src/setup/gnunet-win-tool.c:154
 #, c-format
 msgid "Service deleted.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/setup/gnunet-win-tool.c:160
+#: src/setup/gnunet-win-tool.c:166
 #, c-format
 msgid "Error: can't access service: %s\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:164
+#: src/setup/gnunet-win-tool.c:170
 #, c-format
 msgid "Error: can't delete service: %s\n"
 msgstr "Fel: kan inte ta bort tjänst: %s\n"
 
-#: src/setup/gtk/gconf.c:430
+#: src/setup/gtk/gconf.c:387
 #, fuzzy
 msgid "Description"
 msgstr "Fråga"
 
-#: src/setup/gtk/gconf.c:448
+#: src/setup/gtk/gconf.c:403
 msgid "Value"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:469
+#: src/setup/gtk/gconf.c:427
 msgid "Default"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:483 src/setup/ncurses/wizard_curs.c:77
+#: src/setup/gtk/gconf.c:442 src/setup/ncurses/wizard_curs.c:73
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/setup/gtk/gconf.c:497
+#: src/setup/gtk/gconf.c:456
 #, fuzzy
 msgid "Section"
 msgstr "Fråga"
 
-#: src/setup/gtk/gconf.c:509
+#: src/setup/gtk/gconf.c:467
 #, fuzzy
 msgid "Option"
 msgstr "_Alternativ"
 
-#: src/setup/gtk/gconf.c:531
+#: src/setup/gtk/gconf.c:490
 #, fuzzy
 msgid "Configuration saved."
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/setup/gtk/gconf.c:539
+#: src/setup/gtk/gconf.c:500
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/setup/gtk/gconf.c:562
+#: src/setup/gtk/gconf.c:526
 #, fuzzy
 msgid "Configuration changed. Save?"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/setup/gtk/gconf.c:573
+#: src/setup/gtk/gconf.c:539
 #, fuzzy
 msgid "Error saving configuration."
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/setup/gtk/wizard_gtk.c:145
+#: src/setup/gtk/wizard_gtk.c:144
 #, fuzzy
 msgid "(unknown connection)"
 msgstr "Nätverksanslutning"
 
-#: src/setup/gtk/wizard_gtk.c:428 src/setup/ncurses/wizard_curs.c:466
+#: src/setup/gtk/wizard_gtk.c:413 src/setup/ncurses/wizard_curs.c:453
 #, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/setup/gtk/wizard_gtk.c:450
+#: src/setup/gtk/wizard_gtk.c:437
 #, fuzzy
 msgid "Do you want to save the new configuration?"
 msgstr "Vill du spara dina inställningar?"
 
-#: src/setup/gtk/wizard_gtk.c:480
+#: src/setup/gtk/wizard_gtk.c:469
 msgid "Unable to create user account:"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/setup/gtk/wizard_gtk.c:490
+#: src/setup/gtk/wizard_gtk.c:477
 msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:505
+#: src/setup/gtk/wizard_gtk.c:492
 msgid ""
 "Running gnunet-update failed.\n"
 "This maybe due to insufficient permissions, please check your "
@@ -3474,134 +3476,134 @@
 "Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/setup/text/conf.c:75
+#: src/setup/text/conf.c:79
 #, fuzzy
 msgid "yes"
 msgstr "Ja"
 
-#: src/setup/text/conf.c:76
+#: src/setup/text/conf.c:80
 msgid "no"
 msgstr ""
 
-#: src/setup/text/conf.c:104
+#: src/setup/text/conf.c:105
 #, c-format
 msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/text/conf.c:116
+#: src/setup/text/conf.c:114
 msgid "\tPossible choices:\n"
 msgstr ""
 
-#: src/setup/text/conf.c:124
+#: src/setup/text/conf.c:122
 msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:126
+#: src/setup/text/conf.c:124
 #, c-format
 msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/text/conf.c:147
+#: src/setup/text/conf.c:142
 #, c-format
 msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/text/conf.c:152
+#: src/setup/text/conf.c:146
 #, c-format
 msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/text/conf.c:158
+#: src/setup/text/conf.c:152
 #, c-format
 msgid ""
 "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
 "value %llu): "
 msgstr ""
 
-#: src/setup/text/conf.c:191
+#: src/setup/text/conf.c:186
 #, fuzzy, c-format
 msgid "Yes\n"
 msgstr "Ja"
 
-#: src/setup/text/conf.c:196
+#: src/setup/text/conf.c:191
 #, fuzzy, c-format
 msgid "No\n"
 msgstr "Nej"
 
-#: src/setup/text/conf.c:199 src/setup/text/conf.c:235
-#: src/setup/text/conf.c:261 src/setup/text/conf.c:318
-#: src/setup/text/conf.c:370
+#: src/setup/text/conf.c:194 src/setup/text/conf.c:235
+#: src/setup/text/conf.c:265 src/setup/text/conf.c:328
+#: src/setup/text/conf.c:386
 #, fuzzy, c-format
 msgid "Help\n"
 msgstr "Hjälp"
 
-#: src/setup/text/conf.c:202 src/setup/text/conf.c:215
-#: src/setup/text/conf.c:270 src/setup/text/conf.c:299
-#: src/setup/text/conf.c:351
+#: src/setup/text/conf.c:197 src/setup/text/conf.c:212
+#: src/setup/text/conf.c:275 src/setup/text/conf.c:306
+#: src/setup/text/conf.c:364
 #, fuzzy, c-format
 msgid "Abort\n"
 msgstr "_Om"
 
-#: src/setup/text/conf.c:342 src/setup/text/conf.c:397
+#: src/setup/text/conf.c:353 src/setup/text/conf.c:415
 #, c-format
 msgid ""
 "\n"
 "Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/text/conf.c:403
+#: src/setup/text/conf.c:421
 #, c-format
 msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:477
+#: src/setup/text/conf.c:482
 msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/setup/text/conf.c:488
+#: src/setup/text/conf.c:491
 msgid "Aborted.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:510
+#: src/setup/text/conf.c:504
 #, fuzzy
 msgid "Invalid entry.\n"
 msgstr "Ogiltiga argument: "
 
-#: src/setup/text/conf.c:529
+#: src/setup/text/conf.c:521
 #, c-format
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:560
+#: src/setup/text/conf.c:552
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:561
+#: src/setup/text/conf.c:553
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:575 src/setup/ncurses/mconf.c:519
+#: src/setup/text/conf.c:565 src/setup/ncurses/mconf.c:511
 #, 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:580
+#: src/setup/text/conf.c:571
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:592
+#: src/setup/text/conf.c:586
 #, 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:597
+#: src/setup/text/conf.c:595
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
@@ -3618,79 +3620,79 @@
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/setup/ncurses/mconf.c:175 src/setup/ncurses/mconf.c:278
-#: src/setup/ncurses/mconf.c:356 src/setup/ncurses/mconf.c:462
-#: src/setup/ncurses/wizard_curs.c:121 src/setup/ncurses/wizard_curs.c:191
-#: src/setup/ncurses/wizard_curs.c:307
+#: src/setup/ncurses/mconf.c:179 src/setup/ncurses/mconf.c:278
+#: src/setup/ncurses/mconf.c:359 src/setup/ncurses/mconf.c:455
+#: src/setup/ncurses/wizard_curs.c:110 src/setup/ncurses/wizard_curs.c:174
+#: src/setup/ncurses/wizard_curs.c:290
 msgid "Internal error! (Choice invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:213 src/setup/ncurses/mconf.c:408
+#: src/setup/ncurses/mconf.c:212 src/setup/ncurses/mconf.c:403
 msgid "Internal error! (Value invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:399
+#: src/setup/ncurses/mconf.c:392
 msgid "Invalid input, expecting floating point value."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:447
+#: src/setup/ncurses/mconf.c:435
 msgid "Invalid input, expecting integer."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:453
+#: src/setup/ncurses/mconf.c:443
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:505 src/setup/ncurses/wizard_curs.c:562
+#: src/setup/ncurses/mconf.c:499 src/setup/ncurses/wizard_curs.c:534
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "GNUnet-konfiguration"
 
-#: src/setup/ncurses/mconf.c:523
+#: src/setup/ncurses/mconf.c:517
 #, fuzzy
 msgid "Do you wish to save your new configuration?"
 msgstr "Vill du spara dina inställningar?"
 
-#: src/setup/ncurses/mconf.c:534
+#: src/setup/ncurses/mconf.c:531
 #, fuzzy, c-format
 msgid ""
 "\n"
 "End of configuration.\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/setup/ncurses/mconf.c:537
+#: src/setup/ncurses/mconf.c:536
 #, c-format
 msgid ""
 "\n"
 "Your configuration changes were NOT saved.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:67 src/setup/lib/wizard_util.c:131
-#: src/setup/lib/wizard_util.c:176
+#: src/setup/ncurses/wizard_curs.c:65 src/setup/lib/wizard_util.c:139
+#: src/setup/lib/wizard_util.c:194
 msgid "Error"
 msgstr "Fel"
 
-#: src/setup/ncurses/wizard_curs.c:86
+#: src/setup/ncurses/wizard_curs.c:80
 #, fuzzy
 msgid "Error!"
 msgstr "Fel"
 
-#: src/setup/ncurses/wizard_curs.c:153
+#: src/setup/ncurses/wizard_curs.c:142
 #, fuzzy
 msgid "Abort"
 msgstr "_Om"
 
-#: src/setup/ncurses/wizard_curs.c:154
+#: src/setup/ncurses/wizard_curs.c:143
 #, fuzzy
 msgid "Ok"
 msgstr "k"
 
-#: src/setup/ncurses/wizard_curs.c:222 src/setup/ncurses/wizard_curs.c:290
-#: src/setup/ncurses/wizard_curs.c:443
+#: src/setup/ncurses/wizard_curs.c:209 src/setup/ncurses/wizard_curs.c:275
+#: src/setup/ncurses/wizard_curs.c:426
 msgid "GNUnet configuration"
 msgstr "GNUnet-konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:223
+#: src/setup/ncurses/wizard_curs.c:211
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -3720,36 +3722,36 @@
 "\n"
 "the GNUnet team"
 
-#: src/setup/ncurses/wizard_curs.c:291
+#: src/setup/ncurses/wizard_curs.c:277
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:312 src/setup/ncurses/wizard_curs.c:325
+#: src/setup/ncurses/wizard_curs.c:295 src/setup/ncurses/wizard_curs.c:309
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
 "you are using DSL."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:323
+#: src/setup/ncurses/wizard_curs.c:306
 #, fuzzy
 msgid "Network configuration: interface"
 msgstr "Nätverksgränssnitt:"
 
-#: src/setup/ncurses/wizard_curs.c:324
+#: src/setup/ncurses/wizard_curs.c:308
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:335
+#: src/setup/ncurses/wizard_curs.c:319
 #, fuzzy
 msgid "Network configuration: NAT"
 msgstr "GNUnet-konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:336
+#: src/setup/ncurses/wizard_curs.c:320
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3760,16 +3762,16 @@
 "forwarding\")."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:349
+#: src/setup/ncurses/wizard_curs.c:333
 #, fuzzy
 msgid "Network configuration: IP"
 msgstr "GNUnet-konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:350
+#: src/setup/ncurses/wizard_curs.c:335
 msgid "What is this computer's public IP address or hostname?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:351
+#: src/setup/ncurses/wizard_curs.c:336
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -3781,17 +3783,17 @@
 "If in doubt, leave this empty."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:366
+#: src/setup/ncurses/wizard_curs.c:351
 #, fuzzy
 msgid "Bandwidth configuration: upload"
 msgstr "Bandbreddsbegränsning"
 
-#: src/setup/ncurses/wizard_curs.c:367
+#: src/setup/ncurses/wizard_curs.c:353
 #, fuzzy
 msgid "How much upstream bandwidth (in bytes/s) may be used?"
 msgstr "Hur mycket CPU (i %) får användas?"
 
-#: src/setup/ncurses/wizard_curs.c:368
+#: src/setup/ncurses/wizard_curs.c:354
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3802,17 +3804,17 @@
 "connection allows."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:380
+#: src/setup/ncurses/wizard_curs.c:366
 #, fuzzy
 msgid "Bandwidth configuration: download"
 msgstr "Bandbreddsbegränsning"
 
-#: src/setup/ncurses/wizard_curs.c:381
+#: src/setup/ncurses/wizard_curs.c:368
 #, fuzzy
 msgid "How much downstream bandwidth (in bytes/s) may be used?"
 msgstr "Hur mycket CPU (i %) får användas?"
 
-#: src/setup/ncurses/wizard_curs.c:382
+#: src/setup/ncurses/wizard_curs.c:369
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3823,31 +3825,31 @@
 "connection allows."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:394
+#: src/setup/ncurses/wizard_curs.c:381
 #, fuzzy
 msgid "Quota configuration"
 msgstr "GNUnet-konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:395
+#: src/setup/ncurses/wizard_curs.c:382
 msgid "What is the maximum size of the datastore in MB?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:396
+#: src/setup/ncurses/wizard_curs.c:383
 msgid ""
 "The GNUnet datastore contains all content that GNUnet needs to store "
 "(indexed, inserted and migrated content)."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:409
+#: src/setup/ncurses/wizard_curs.c:393
 #, fuzzy
 msgid "Daemon configuration: user account"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/setup/ncurses/wizard_curs.c:410
+#: src/setup/ncurses/wizard_curs.c:394
 msgid "As which user should gnunetd be run?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:411
+#: src/setup/ncurses/wizard_curs.c:396
 msgid ""
 "For security reasons, it is a good idea to let this setup create a new user "
 "account under which the GNUnet service is started at system startup.\n"
@@ -3859,15 +3861,15 @@
 "Leave the field empty to run GNUnet with system privileges.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:429
+#: src/setup/ncurses/wizard_curs.c:411
 msgid "Daemon configuration: group account"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:430
+#: src/setup/ncurses/wizard_curs.c:412
 msgid "As which group should gnunetd be run?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:431
+#: src/setup/ncurses/wizard_curs.c:414
 msgid ""
 "For security reasons, it is a good idea to let this setup create a new group "
 "for the chosen user account.\n"
@@ -3878,140 +3880,134 @@
 "server and have access to GNUnet server data.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:444
+#: src/setup/ncurses/wizard_curs.c:428
 msgid "Do you want to automatically launch GNUnet as a system service?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:445
+#: src/setup/ncurses/wizard_curs.c:430
 msgid ""
 "If you say \"yes\" here, the GNUnet background process will be automatically "
 "started when you turn on your computer. If you say \"no\" here, you have to "
 "launch GNUnet yourself each time you want to use it."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:493
+#: src/setup/ncurses/wizard_curs.c:471
 #, fuzzy
 msgid "Unable to create user account for daemon."
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/setup/ncurses/wizard_curs.c:507
+#: src/setup/ncurses/wizard_curs.c:478
 msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:521
+#: src/setup/ncurses/wizard_curs.c:493
 #, fuzzy
 msgid "Save configuration?"
 msgstr "GNUnet-konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:522
+#: src/setup/ncurses/wizard_curs.c:494
 #, fuzzy
 msgid "Save configuration now?"
 msgstr "GNUnet-konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:566
+#: src/setup/ncurses/wizard_curs.c:538
 msgid "Back"
 msgstr "Tillbaka"
 
-#: src/setup/lib/gns.c:278
+#: src/setup/lib/gns.c:294
 #, c-format
 msgid ""
 "Configuration does not satisfy constraints of configuration specification "
 "file `%s'!\n"
 msgstr ""
 
-#: src/setup/lib/tree.c:189
+#: src/setup/lib/tree.c:190
 #, c-format
 msgid ""
 "Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:101
+#: src/setup/lib/wizard_util.c:110
 msgid "Can't open Service Control Manager"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:106
+#: src/setup/lib/wizard_util.c:116
 msgid "Can't create service"
 msgstr "Kan inte skapa tjänst"
 
-#: src/setup/lib/wizard_util.c:111
+#: src/setup/lib/wizard_util.c:120
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr "Fel vid ändring av rättigheterna på GNUnet-katalogen"
 
-#: src/setup/lib/wizard_util.c:115
+#: src/setup/lib/wizard_util.c:125
 msgid "Cannot write to the regisitry"
 msgstr "Kan inte skriva till registret"
 
-#: src/setup/lib/wizard_util.c:118
+#: src/setup/lib/wizard_util.c:128
 msgid "Can't access the service"
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/setup/lib/wizard_util.c:122
+#: src/setup/lib/wizard_util.c:131
 msgid "Can't delete the service"
 msgstr "Kan inte ta bort tjänsten"
 
-#: src/setup/lib/wizard_util.c:126
+#: src/setup/lib/wizard_util.c:134
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: src/setup/lib/wizard_util.c:159
+#: src/setup/lib/wizard_util.c:170
 msgid "This version of Windows does not support multiple users."
 msgstr "Denna version för Windows har inte stöd för flera användare."
 
-#: src/setup/lib/wizard_util.c:163
+#: src/setup/lib/wizard_util.c:174
 msgid "Error creating user"
 msgstr "Fel vid skapandet av användare"
 
-#: src/setup/lib/wizard_util.c:166
+#: src/setup/lib/wizard_util.c:178
 msgid "Error accessing local security policy"
 msgstr "Fel vid åtkomst av lokal säkerhetspolicy"
 
-#: src/setup/lib/wizard_util.c:169
+#: src/setup/lib/wizard_util.c:183
 msgid "Error granting service right to user"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:172
+#: src/setup/lib/wizard_util.c:188
 msgid "Unknown error while creating a new user"
 msgstr "Okänt fel vid skapandet av ny användare"
 
-#: src/include/gnunet_util_getopt.h:150
+#: src/include/gnunet_util_getopt.h:153
 msgid "print this help"
 msgstr "skriv ut denna hjälp"
 
-#: src/include/gnunet_util_getopt.h:159
+#: src/include/gnunet_util_getopt.h:162
 msgid "print the version number"
 msgstr "skriv ut versionsnummer"
 
-#: src/include/gnunet_util_getopt.h:165
+#: src/include/gnunet_util_getopt.h:168
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:171
+#: src/include/gnunet_util_getopt.h:174
 msgid "be verbose"
 msgstr "var informativ"
 
-#: src/include/gnunet_util_getopt.h:177
+#: src/include/gnunet_util_getopt.h:180
 msgid "use configuration file FILENAME"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/include/gnunet_util_getopt.h:183
+#: src/include/gnunet_util_getopt.h:186
 msgid "specify host on which gnunetd is running"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:220
-#: src/include/gnunet_util_error.h:226 src/include/gnunet_util_error.h:236
-#: src/include/gnunet_util_error.h:242
+#: src/include/gnunet_util_error.h:212 src/include/gnunet_util_error.h:214
+#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:230
+#: src/include/gnunet_util_error.h:236
 #, c-format
 msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:249 src/include/gnunet_util_error.h:256
-#: src/include/gnunet_util_error.h:263 src/include/gnunet_util_error.h:270
+#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
 #, 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:277 src/include/gnunet_util_error.h:284
-#, 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"
 
@@ -4940,8 +4936,32 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
+#~ msgid "specify nickname"
+#~ msgstr "ange smeknamn"
+
+#~ msgid "Start GNUnet chat client."
+#~ msgstr "Starta GNUnets chattklient."
+
+#~ msgid "Could not connect to gnunetd.\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#~ msgid "You must specify a nickname (use option `%s').\n"
+#~ msgstr "Du måste ange ett smeknamn (använd flagga \"%s\").\n"
+
+#~ msgid "Could not send message to gnunetd\n"
+#~ msgstr "Kunde inte skicka meddelande till gnunetd\n"
+
 #, fuzzy
 #~ msgid ""
+#~ "`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s "
+#~ "DG/%s\n"
+#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#~ msgid "Database failed to delete `%s'.\n"
+#~ msgstr "Databas misslyckades att ta bort \"%s\".\n"
+
+#, fuzzy
+#~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"
 #~ "This assistant will ask you a few basic questions in order to configure "
@@ -5113,9 +5133,6 @@
 #~ msgid "sendAck failed.  Terminating connection to client.\n"
 #~ msgstr "sendAck misslyckades.  Terminerar anslutning till klient.\n"
 
-#~ msgid "Failed to deliver `%s' message.\n"
-#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
 #~ msgid "Could not find peer `%s' in routing table!\n"
 #~ msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2007-07-30 06:19:49 UTC (rev 5386)
+++ GNUnet/po/vi.po     2007-07-30 06:21:56 UTC (rev 5387)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-07-07 02:38-0600\n"
+"POT-Creation-Date: 2007-07-30 00:16-0600\n"
 "PO-Revision-Date: 2005-07-05 21:18+0400\n"
 "Last-Translator: Phan Vinh Thinh <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -15,85 +15,85 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: src/transports/ip6.c:72 src/util/network/io.c:80
+#: src/transports/ip6.c:75 src/util/network/io.c:85
 #, 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:104 src/util/network/ip.c:83 src/util/network/ip.c:144
+#: src/transports/ip6.c:104 src/util/network/ip.c:84 src/util/network/ip.c:146
 #, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr ""
 "Không có giao diện mạng được xác định trong cấu hình phần '%s' dưới '%s'!\n"
 
-#: src/transports/ip6.c:134 src/util/network/ip.c:113
-#: src/util/network/ip.c:234
+#: src/transports/ip6.c:135 src/util/network/ip.c:115
+#: src/util/network/ip.c:221
 #, fuzzy, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr "Không lấy được IP cho giao diện '%s' đang dùng '%s'.\n"
 
-#: src/transports/ip6.c:169
+#: src/transports/ip6.c:167
 #, fuzzy, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Không tìm thấy '%s': %s\n"
 
-#: src/transports/ip6.c:222 src/transports/ip.c:59
+#: src/transports/ip6.c:219 src/transports/ip.c:60
 #, 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:129 src/transports/udp.c:137
+#: src/transports/udp6.c:123 src/transports/udp.c:129
 #, 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"
 
-#: src/transports/udp6.c:268
+#: src/transports/udp6.c:264
 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:500 src/transports/udp.c:547
+#: src/transports/udp6.c:471 src/transports/udp.c:514
 #, fuzzy, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
 
-#: src/transports/http.c:504
+#: src/transports/http.c:522
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/transports/http.c:793 src/transports/http.c:892
-#: src/transports/http.c:1030 src/transports/http.c:1163
-#: src/transports/upnp/upnp.c:335 src/transports/upnp/upnp.c:591
-#: src/applications/bootstrap_http/http.c:124
-#: src/applications/bootstrap_http/http.c:269
-#: src/applications/bootstrap_http/http.c:290
-#: src/applications/bootstrap_http/http.c:324
-#: src/applications/bootstrap_http/http.c:342
-#: src/applications/bootstrap_http/http.c:356
-#: src/applications/bootstrap_http/http.c:368
-#: src/applications/bootstrap_http/http.c:380
+#: src/transports/http.c:813 src/transports/http.c:892
+#: src/transports/http.c:1007 src/transports/http.c:1147
+#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:540
+#: src/applications/bootstrap_http/http.c:115
+#: src/applications/bootstrap_http/http.c:247
+#: src/applications/bootstrap_http/http.c:263
+#: src/applications/bootstrap_http/http.c:294
+#: src/applications/bootstrap_http/http.c:313
+#: src/applications/bootstrap_http/http.c:326
+#: src/applications/bootstrap_http/http.c:336
+#: src/applications/bootstrap_http/http.c:346
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/transports/http.c:1344
+#: src/transports/http.c:1307
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:1352
+#: src/transports/http.c:1316
 msgid "# bytes received via HTTP"
 msgstr "# byte nhận được qua HTTP"
 
-#: src/transports/http.c:1354
+#: src/transports/http.c:1317
 msgid "# bytes sent via HTTP"
 msgstr "# byte gửi qua HTTP"
 
-#: src/transports/http.c:1356
+#: src/transports/http.c:1319
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte loại bỏ bởi HTTP (đi ra)"
 
-#: src/transports/smtp.c:257
+#: src/transports/smtp.c:271
 #, fuzzy, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
@@ -102,144 +102,144 @@
 "Người dùng phải chỉ ra tên của ống pipe cho truyền tải SMTP trong phần '%s' "
 "dưới '%s'.\n"
 
-#: src/transports/smtp.c:334
+#: src/transports/smtp.c:358
 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:433
+#: src/transports/smtp.c:463
 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:440
+#: src/transports/smtp.c:471
 #, 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:547
+#: src/transports/smtp.c:571
 #, fuzzy, c-format
 msgid "Failed to initialize libesmtp: %s.\n"
 msgstr "Chạy dịch vụ '%s' không thành công.\n"
 
-#: src/transports/smtp.c:611
+#: src/transports/smtp.c:630
 #, 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:679
+#: src/transports/smtp.c:702
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s đầu lọc %s (SMTP)"
 
-#: src/transports/smtp.c:707
+#: src/transports/smtp.c:730
 #, fuzzy, c-format
 msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
 
-#: src/transports/tcp.c:283
+#: src/transports/tcp.c:289
 #, fuzzy
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr "HTTP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/transports/tcp.c:387
+#: src/transports/tcp.c:384
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr "Không kết nối được tới %u.%u.%u.%u:%u: %s\n"
 
-#: src/transports/tcp.c:454 src/transports/tcp6.c:414
+#: src/transports/tcp.c:437 src/transports/tcp6.c:404
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Chạy dịch vụ truyền tải trên cổng %d thất bại.\n"
 
-#: src/transports/tcp.c:584
+#: src/transports/tcp.c:556
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:592
+#: src/transports/tcp.c:565
 msgid "# bytes received via TCP"
 msgstr "# byte nhận được qua TCP"
 
-#: src/transports/tcp.c:594
+#: src/transports/tcp.c:566
 msgid "# bytes sent via TCP"
 msgstr "# Byte gửi qua TCP"
 
-#: src/transports/tcp.c:596
+#: src/transports/tcp.c:568
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte loại đi bởi TCP (đi ra)"
 
-#: src/transports/udp.c:293
+#: src/transports/udp.c:287
 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:388
+#: src/transports/udp.c:378
 #, 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:565
+#: src/transports/udp.c:529
 msgid "# bytes received via UDP"
 msgstr "# byte nhận được qua UDP"
 
-#: src/transports/udp.c:567
+#: src/transports/udp.c:530
 msgid "# bytes sent via UDP"
 msgstr "# byte gửi qua UDP"
 
-#: src/transports/udp.c:569
+#: src/transports/udp.c:532
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte loại bỏ bởi UDP (đi ra)"
 
-#: src/transports/tcp6.c:238
+#: src/transports/tcp6.c:245
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Không nhận ra địa chỉ IPv6 của tôi.\n"
 
-#: src/transports/tcp6.c:300
+#: src/transports/tcp6.c:312
 #, fuzzy, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "'%s': không rõ dịch vụ: %s\n"
 
-#: src/transports/tcp6.c:532
+#: src/transports/tcp6.c:512
 #, fuzzy
 msgid "# bytes received via TCP6"
 msgstr "# byte nhận được qua TCP"
 
-#: src/transports/tcp6.c:534
+#: src/transports/tcp6.c:513
 #, fuzzy
 msgid "# bytes sent via TCP6"
 msgstr "# Byte gửi qua TCP"
 
-#: src/transports/tcp6.c:536
+#: src/transports/tcp6.c:515
 #, fuzzy
 msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr "# byte loại đi bởi TCP (đi ra)"
 
-#: src/transports/tcp_helper.c:248
+#: src/transports/tcp_helper.c:257
 #, 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:314
+#: src/transports/tcp_helper.c:276
 #, 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/upnp/upnp.c:443
+#: src/transports/upnp/upnp.c:429
 #, fuzzy, c-format
 msgid "%s failed for url `%s' and post-data `%s' at %s:%d: `%s'\n"
 msgstr "'%s' thất bại cho thư viện '%s' tại %s:%d với lỗi: %s\n"
 
-#: src/transports/upnp/upnp.c:504
+#: src/transports/upnp/upnp.c:475
 #, c-format
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/udp_helper.c:91
+#: src/transports/udp_helper.c:94
 #, fuzzy
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr ""
@@ -251,123 +251,123 @@
 msgid "Query (get KEY, put KEY VALUE) 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:59
+#: src/applications/dht/tools/dht-query.c:60
 #, fuzzy
 msgid ""
 "allow TIME ms to process a GET command or expire PUT content after ms TIME"
 msgstr "cho phép TIME mili giây để tiến hành mỗi câu lệnh"
 
-#: src/applications/dht/tools/dht-query.c:103
+#: src/applications/dht/tools/dht-query.c:98
 #, c-format
 msgid "%s(%s) operation returned no results.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:125
+#: src/applications/dht/tools/dht-query.c:115
 #, fuzzy, c-format
 msgid "Issuing '%s(%s,%s)' command.\n"
 msgstr "'%s(%s,%s)' thất bại.\n"
 
-#: src/applications/dht/tools/dht-query.c:138
+#: src/applications/dht/tools/dht-query.c:122
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr "'%s(%s,%s)' đã thành công\n"
 
-#: src/applications/dht/tools/dht-query.c:143
+#: src/applications/dht/tools/dht-query.c:126
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s,%s)' thất bại.\n"
 
-#: src/applications/dht/tools/dht-query.c:171
+#: src/applications/dht/tools/dht-query.c:150
 #, 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:181
+#: src/applications/dht/tools/dht-query.c:163
 #, 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:194
+#: src/applications/dht/tools/dht-query.c:180
 #, 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:206
+#: src/applications/dht/tools/dht-query.c:191
 #, 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/module/table.c:701
+#: src/applications/dht/module/table.c:716
 #, fuzzy
 msgid "# dht connections"
 msgstr "Kết nối mạng"
 
-#: src/applications/dht/module/table.c:702
+#: src/applications/dht/module/table.c:718
 #, fuzzy
 msgid "# dht discovery messages received"
 msgstr "# nhận được thông báo PING đã mã hóa"
 
-#: src/applications/dht/module/table.c:703
+#: src/applications/dht/module/table.c:720
 msgid "# dht route host lookups performed"
 msgstr ""
 
-#: src/applications/dht/module/table.c:704
+#: src/applications/dht/module/table.c:722
 #, fuzzy
 msgid "# dht discovery messages sent"
 msgstr "# đã gửi các thông báo PING mã hóa"
 
-#: src/applications/dht/module/cs.c:135
+#: src/applications/dht/module/cs.c:128
 #, 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:240
+#: src/applications/dht/module/cs.c:233
 #, fuzzy, c-format
 msgid "`%s' registering client handlers: %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển máy khách %d\n"
 
-#: src/applications/dht/module/cs.c:259
+#: src/applications/dht/module/cs.c:251
 msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:752
+#: src/applications/dht/module/routing.c:736
 msgid "# dht replies routed"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:753
+#: src/applications/dht/module/routing.c:738
 #, fuzzy
 msgid "# dht requests routed"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/dht/module/routing.c:754
+#: src/applications/dht/module/routing.c:740
 #, fuzzy
 msgid "# dht get requests received"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/dht/module/routing.c:755
+#: src/applications/dht/module/routing.c:742
 #, fuzzy
 msgid "# dht put requests received"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/dht/module/routing.c:756
+#: src/applications/dht/module/routing.c:744
 #, fuzzy
 msgid "# dht results received"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/dht/module/routing.c:760
+#: src/applications/dht/module/routing.c:748
 #, fuzzy, c-format
 msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d %d %d\n"
 
-#: src/applications/chat/chat.c:87
+#: src/applications/chat/chat.c:88
 msgid "Message received from peer is invalid.\n"
 msgstr "Thông báo nhận được từ một đầu là sai.\n"
 
-#: src/applications/chat/chat.c:134
+#: src/applications/chat/chat.c:135
 msgid "Message received from client is invalid\n"
 msgstr "Thông báo nhận được từ máy khách là sai.\n"
 
-#: src/applications/chat/chat.c:156
+#: src/applications/chat/chat.c:155
 msgid "Maximum number of chat clients reached.\n"
 msgstr "Đã đạt tới số máy khách chát lớn nhất.\n"
 
@@ -376,112 +376,108 @@
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr "Bây giờ có %d từ %d máy khách chát tại nút này.\n"
 
-#: src/applications/chat/chat.c:197
+#: src/applications/chat/chat.c:202
 #, fuzzy, c-format
 msgid "`%s' registering handlers %d and %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d và %d\n"
 
-#: src/applications/chat/chat.c:216
+#: src/applications/chat/chat.c:219
 msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:82
-msgid "specify nickname"
-msgstr "chỉ ra tên nick"
+#: src/applications/chat/gnunet-chat.c:45
+msgid "Join a chat on GNUnet."
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:87
-msgid "Start GNUnet chat client."
-msgstr "Chạy máy khách chát của GNUnet."
+#: src/applications/chat/gnunet-chat.c:49
+msgid "set the nickname to use (requred)"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:93 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:287
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Dùng --help để xem danh sách các tùy chọn.\n"
+#: src/applications/chat/gnunet-chat.c:52
+msgid "set the chat room to join (requred)"
+msgstr ""
 
-#: 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"
+#: src/applications/chat/gnunet-chat.c:134
+#, fuzzy, c-format
+msgid "You must specify a nickname\n"
+msgstr "Người dùng phải chỉ ra một trình nhận!\n"
 
-#: src/applications/chat/gnunet-chat.c:155
+#: src/applications/chat/gnunet-chat.c:144
 #, fuzzy, c-format
-msgid "You must specify a nickname (use option `%s').\n"
-msgstr "Người dùng phải chỉ ra một tên nick (dùng tùy chọn '%s').\n"
+msgid "Failed to join the room\n"
+msgstr "Không kết gắn được tới cổng UDP %d.\n"
 
-#: src/applications/chat/gnunet-chat.c:182
-msgid "Could not send join message to gnunetd\n"
-msgstr "Không gửi được thông báo nhập join tới gnunetd\n"
+#: src/applications/chat/gnunet-chat.c:160
+#, fuzzy, c-format
+msgid "Failed to send message.\n"
+msgstr "Phân phát tin nhắn '%s' không thành công.\n"
 
-#: src/applications/chat/gnunet-chat.c:191
-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:188
+#: src/applications/advertising/advertising.c:193
 #, fuzzy, c-format
 msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 msgstr "Thông báo HELO từ '%s' bị sai (sai chữ ký). Đang bỏ đi.\n"
 
-#: src/applications/advertising/advertising.c:196
+#: src/applications/advertising/advertising.c:203
 #, fuzzy
 msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr "Thông báo HELO nhận được bị sai (vượt quá thời hạn). Đang bỏ đi.\n"
 
-#: src/applications/advertising/advertising.c:367
+#: src/applications/advertising/advertising.c:374
 #, fuzzy
 msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr "Không gửi được các HELO+PING, đầy bộ đệm ping.\n"
 
-#: src/applications/advertising/advertising.c:385
+#: src/applications/advertising/advertising.c:396
 msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:553
+#: src/applications/advertising/advertising.c:544
 #, 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:561
+#: src/applications/advertising/advertising.c:553
 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:838
+#: src/applications/advertising/advertising.c:817
 msgid "# Peer advertisements received"
 msgstr "# Nhận được quảng cáo của đầu peer"
 
-#: src/applications/advertising/advertising.c:839
+#: src/applications/advertising/advertising.c:820
 #, fuzzy
 msgid "# Peer advertisements of type NAT received"
 msgstr "# Nhận được quảng cáo của đầu peer"
 
-#: src/applications/advertising/advertising.c:840
+#: src/applications/advertising/advertising.c:823
 #, fuzzy
 msgid "# Peer advertisements confirmed via PONG"
 msgstr "# Nhận được quảng cáo của đầu peer"
 
-#: src/applications/advertising/advertising.c:841
+#: src/applications/advertising/advertising.c:827
 #, fuzzy
 msgid "# Peer advertisements updating earlier HELLOs"
 msgstr "# Nhận được quảng cáo của đầu peer"
 
-#: src/applications/advertising/advertising.c:842
+#: src/applications/advertising/advertising.c:830
 #, fuzzy
 msgid "# Peer advertisements discarded due to load"
 msgstr "# Nhận được quảng cáo của đầu peer"
 
-#: src/applications/advertising/advertising.c:843
+#: src/applications/advertising/advertising.c:834
 #, fuzzy
 msgid "# Peer advertisements for unsupported transport"
 msgstr "# Nhận được quảng cáo của đầu peer"
 
-#: src/applications/advertising/advertising.c:844
+#: src/applications/advertising/advertising.c:838
 #, fuzzy
 msgid "# Peer advertisements not confirmed due to ping busy"
 msgstr "# Nhận được quảng cáo của đầu peer"
 
-#: src/applications/advertising/advertising.c:845
+#: src/applications/advertising/advertising.c:842
 #, fuzzy
 msgid "# Peer advertisements not confirmed due to lack of self ad"
 msgstr "# Nhận được quảng cáo của đầu peer"
@@ -491,53 +487,53 @@
 msgid "# Peer advertisements not confirmed due to send error"
 msgstr "# Nhận được quảng cáo của đầu peer"
 
-#: src/applications/advertising/advertising.c:847
+#: src/applications/advertising/advertising.c:848
 msgid "# Self advertisments transmitted"
 msgstr "# Đã truyền tải tự quảng cáo"
 
-#: src/applications/advertising/advertising.c:848
+#: src/applications/advertising/advertising.c:850
 msgid "# Foreign advertisements forwarded"
 msgstr "# Đã chuyển tiếp quàng cáo ngoài"
 
-#: src/applications/advertising/advertising.c:850
-#: src/applications/pingpong/pingpong.c:520
+#: src/applications/advertising/advertising.c:852
+#: src/applications/pingpong/pingpong.c:509
 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:855
-#: src/applications/session/connect.c:936
+#: src/applications/advertising/advertising.c:857
+#: src/applications/session/connect.c:901
 #, 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:873
+#: src/applications/advertising/advertising.c:872
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:471
+#: src/applications/topology_default/topology.c:467
 msgid "maintains GNUnet default mesh topology"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:128
+#: src/applications/pingpong/pingpong.c:132
 #: src/applications/pingpong/pingpong.c:199
 #: src/applications/pingpong/pingpong.c:264
-#: src/applications/pingpong/pingpong.c:337
+#: src/applications/pingpong/pingpong.c:331
 #, fuzzy, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr "Nhận được thông báo '%s' hỏng. Đang bỏ đi.\n"
 
-#: src/applications/pingpong/pingpong.c:140
+#: src/applications/pingpong/pingpong.c:143
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "Nhận được ping cho đầu peer khác. Đang bỏ đi.\n"
 
-#: src/applications/pingpong/pingpong.c:210
+#: src/applications/pingpong/pingpong.c:209
 msgid "Received PING not destined for us!\n"
 msgstr "Nhận được PING không dành cho chúng ta!\n"
 
-#: src/applications/pingpong/pingpong.c:309
-#: src/applications/pingpong/pingpong.c:374
+#: src/applications/pingpong/pingpong.c:303
+#: src/applications/pingpong/pingpong.c:365
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
@@ -545,153 +541,151 @@
 "Không tương ứng được PONG đối với bất kỳ PING. Hãy thử tăng hằng số "
 "MAX_PING_PONG.\n"
 
-#: src/applications/pingpong/pingpong.c:418
+#: src/applications/pingpong/pingpong.c:409
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr "Không tạo được PING, bảng đầy. Hãy thử tăng MAX_PING_PONG.\n"
 
-#: src/applications/pingpong/pingpong.c:510
+#: src/applications/pingpong/pingpong.c:499
 msgid "# encrypted PONG messages received"
 msgstr "# nhận được thông báo PONG đã mã hóa"
 
-#: src/applications/pingpong/pingpong.c:512
+#: src/applications/pingpong/pingpong.c:501
 msgid "# plaintext PONG messages received"
 msgstr "# nhận được thông báo PONG dạng văn bản thường"
 
-#: src/applications/pingpong/pingpong.c:514
+#: src/applications/pingpong/pingpong.c:503
 msgid "# encrypted PING messages received"
 msgstr "# nhận được thông báo PING đã mã hóa"
 
-#: src/applications/pingpong/pingpong.c:516
+#: src/applications/pingpong/pingpong.c:505
 msgid "# PING messages created"
 msgstr "# đã tạo tin nhắn PING"
 
-#: src/applications/pingpong/pingpong.c:518
-#: src/applications/session/connect.c:931
+#: src/applications/pingpong/pingpong.c:507
+#: src/applications/session/connect.c:896
 msgid "# encrypted PONG messages sent"
 msgstr "# đã gửi thông báo PONG đã mã hóa"
 
-#: src/applications/pingpong/pingpong.c:522
-#: src/applications/session/connect.c:929
+#: src/applications/pingpong/pingpong.c:511
+#: src/applications/session/connect.c:894
 msgid "# encrypted PING messages sent"
 msgstr "# đã gửi các thông báo PING mã hóa"
 
-#: src/applications/pingpong/pingpong.c:524
+#: src/applications/pingpong/pingpong.c:513
 #, fuzzy
 msgid "# plaintext PONG messages sent"
 msgstr "# đã gửi các thông báo PING dạng văn bản thông thường"
 
-#: src/applications/pingpong/pingpong.c:526
+#: src/applications/pingpong/pingpong.c:517
 #, fuzzy
 msgid "# plaintext PONG transmissions failed"
 msgstr "# nhận được thông báo PONG dạng văn bản thường"
 
-#: src/applications/pingpong/pingpong.c:536
+#: src/applications/pingpong/pingpong.c:526
 #, fuzzy, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 "'%s' đăng ký trình điều khiển %d %d (văn bản thông thường và văn bản mã "
 "hóa)\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:46
-#: src/applications/sqstore_sqlite/sqlite.c:53
-#: src/applications/sqstore_mysql/mysql.c:139
-#: src/applications/sqstore_mysql/mysql.c:146
-#: src/applications/sqstore_mysql/mysql.c:825
-#: src/applications/sqstore_mysql/mysql.c:846
-#: src/applications/sqstore_mysql/mysql.c:858
-#: src/applications/sqstore_mysql/mysql.c:891
-#: src/applications/sqstore_mysql/mysql.c:904
-#: src/applications/sqstore_mysql/mysql.c:965
-#: src/applications/sqstore_mysql/mysql.c:1065
-#: src/applications/sqstore_mysql/mysql.c:1078
-#: src/applications/sqstore_mysql/mysql.c:1149
-#: src/applications/sqstore_mysql/mysql.c:1169
-#: src/applications/sqstore_mysql/mysql.c:1181
-#: src/applications/sqstore_mysql/mysql.c:1207
-#: src/applications/sqstore_mysql/mysql.c:1220
-#: src/applications/sqstore_mysql/mysql.c:1234
-#: src/applications/sqstore_mysql/mysql.c:1301
-#: src/applications/sqstore_mysql/mysql.c:1315
-#: src/applications/sqstore_mysql/mysql.c:1374
-#: src/applications/sqstore_mysql/mysql.c:1391
+#: src/applications/sqstore_sqlite/sqlite.c:47
+#: src/applications/sqstore_sqlite/sqlite.c:54
+#: src/applications/sqstore_mysql/mysql.c:145
+#: src/applications/sqstore_mysql/mysql.c:152
+#: src/applications/sqstore_mysql/mysql.c:428
+#: src/applications/sqstore_mysql/mysql.c:438
+#: src/applications/sqstore_mysql/mysql.c:476
+#: src/applications/sqstore_mysql/mysql.c:486
+#: src/applications/sqstore_mysql/mysql.c:518
+#: src/applications/sqstore_mysql/mysql.c:529
+#: src/applications/sqstore_mysql/mysql.c:627
+#: src/applications/sqstore_mysql/mysql.c:639
+#: src/applications/sqstore_mysql/mysql.c:651
+#: src/applications/sqstore_mysql/mysql.c:665
+#: src/applications/sqstore_mysql/mysql.c:762
+#: src/applications/sqstore_mysql/mysql.c:776
+#: src/applications/sqstore_mysql/mysql.c:917
+#: src/applications/sqstore_mysql/mysql.c:929
+#: src/applications/sqstore_mysql/mysql.c:941
+#: src/applications/sqstore_mysql/mysql.c:1184
+#: src/applications/sqstore_mysql/mysql.c:1196
+#: src/applications/sqstore_mysql/mysql.c:1208
+#: src/applications/sqstore_mysql/mysql.c:1293
 #: src/applications/kvstore_sqlite/kv_sqlite.c:44
 #: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:93 src/applications/dstore/dstore.c:180
-#: src/applications/dstore/dstore.c:240 src/applications/dstore/dstore.c:263
-#: src/applications/dstore/dstore.c:323 src/applications/dstore/dstore.c:378
-#: src/applications/dstore/dstore.c:474 src/util/crypto/symcipher_gcrypt.c:46
-#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:63
-#: src/util/crypto/hostkey_gcrypt.c:70
+#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:180
+#: src/applications/dstore/dstore.c:219 src/applications/dstore/dstore.c:238
+#: src/applications/dstore/dstore.c:293 src/applications/dstore/dstore.c:330
+#: src/applications/dstore/dstore.c:403 src/util/crypto/symcipher_gcrypt.c:46
+#: src/util/crypto/symcipher_gcrypt.c:53 src/util/crypto/hostkey_gcrypt.c:64
+#: src/util/crypto/hostkey_gcrypt.c:71
 #, fuzzy, c-format
 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:207
+#: src/applications/sqstore_sqlite/sqlite.c:193
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không chạy được SQLite.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:379
+#: src/applications/sqstore_sqlite/sqlite.c:393
 #, c-format
 msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:380
-#: src/applications/sqstore_sqlite/sqlite.c:401
+#: src/applications/sqstore_sqlite/sqlite.c:394
+#: src/applications/sqstore_sqlite/sqlite.c:416
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:400
-#: src/applications/sqstore_mysql/mysql.c:262
-#: src/applications/sqstore_mysql/mysql.c:924
-#: src/applications/sqstore_mysql/mysql.c:1251
+#: src/applications/sqstore_sqlite/sqlite.c:415
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1395
-#: src/applications/sqstore_mysql/mysql.c:1466
+#: src/applications/sqstore_sqlite/sqlite.c:1206
+#: src/applications/sqstore_mysql/mysql.c:1401
 msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/session/connect.c:261
-#: src/applications/session/connect.c:278
+#: src/applications/session/connect.c:256
+#: src/applications/session/connect.c:272
 #, 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:321
+#: src/applications/session/connect.c:313
 #, fuzzy, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr ""
 "Không mã hóa được chìa khóa buổi làm việc, không biết đến đầu peer khác!\n"
 
-#: src/applications/session/connect.c:520
+#: src/applications/session/connect.c:492
 #, fuzzy
 msgid "Could not create any HELLO for myself!\n"
 msgstr "Không tạo được chìa khóa máy!\n"
 
-#: src/applications/session/connect.c:621
+#: src/applications/session/connect.c:592
 #, 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:639
+#: src/applications/session/connect.c:614
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr "Không kiểm tra được chìa khóa buổi làm việc từ đầu peer '%s'.\n"
 
-#: src/applications/session/connect.c:673
+#: src/applications/session/connect.c:646
 #, 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:683
+#: src/applications/session/connect.c:656
 #, 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:752
+#: src/applications/session/connect.c:719
 #, fuzzy, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
@@ -700,28 +694,28 @@
 "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:764
+#: src/applications/session/connect.c:731
 #, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:921
+#: src/applications/session/connect.c:886
 msgid "# session keys sent"
 msgstr "# đã gửi các phím buổi làm việc"
 
-#: src/applications/session/connect.c:923
+#: src/applications/session/connect.c:888
 msgid "# session keys rejected"
 msgstr "# đã nhả ra các phím buổi làm việc"
 
-#: src/applications/session/connect.c:925
+#: src/applications/session/connect.c:890
 msgid "# session keys accepted"
 msgstr "# đã chấp nhận các phím buổi làm việc"
 
-#: src/applications/session/connect.c:927
+#: src/applications/session/connect.c:892
 msgid "# sessions established"
 msgstr "# đã thiết lập buổi làm việc"
 
-#: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
+#: src/applications/rpc/rpc.c:134 src/applications/rpc/rpc.c:175
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
@@ -730,7 +724,7 @@
 "%s::%s - RPC %s:%p không đăng ký được: một gọi lại khác đã dùng tên này (%"
 "p)\n"
 
-#: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
+#: src/applications/rpc/rpc.c:218 src/applications/rpc/rpc.c:265
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
@@ -739,48 +733,48 @@
 "%s::%s - RPC %s:%p không đăng ký được: một gọi lại khác đã đăng ký dưới tên "
 "đó (%p)\n"
 
-#: src/applications/rpc/rpc.c:233
+#: src/applications/rpc/rpc.c:237
 #, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s - RPC %s:%p không đăng ký được: không tìm thấy\n"
 
-#: src/applications/rpc/rpc.c:280
+#: src/applications/rpc/rpc.c:285
 #, c-format
 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:879 src/applications/rpc/rpc.c:1012
-#: src/applications/rpc/rpc.c:1101
+#: src/applications/rpc/rpc.c:909 src/applications/rpc/rpc.c:1043
+#: src/applications/rpc/rpc.c:1129
 #, 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:946
+#: src/applications/rpc/rpc.c:975
 #, 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:1291
+#: src/applications/rpc/rpc.c:1307
 #, 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/rpc/rpc.c:1415
+#: src/applications/rpc/rpc.c:1421
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "Chưa bỏ đăng ký RPC: %s: %p\n"
 
-#: src/applications/rpc/rpc.c:1442
+#: src/applications/rpc/rpc.c:1450
 #, 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:1463
+#: src/applications/rpc/rpc.c:1466
 #, 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:1520
+#: src/applications/rpc/rpc.c:1524
 msgid "RPC async reply invalid.\n"
 msgstr "Câu trả lời async của RPC sai.\n"
 
@@ -788,68 +782,62 @@
 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:263
-#: src/applications/sqstore_mysql/mysql.c:925
-#: src/applications/sqstore_mysql/mysql.c:1252
-msgid "mysql datastore"
-msgstr ""
+#: src/applications/sqstore_mysql/mysql.c:379
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s"
+msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/applications/sqstore_mysql/mysql.c:441
+#: src/applications/sqstore_mysql/mysql.c:1311
 #, fuzzy, c-format
-msgid ""
-"`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s DG/%"
-"s\n"
+msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1496
+#: src/applications/sqstore_mysql/mysql.c:1423
+#: src/applications/sqstore_mysql/mysql.c:1570
 #, 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:1518
+#: src/applications/sqstore_mysql/mysql.c:1448
+#: src/applications/sqstore_mysql/mysql.c:1593
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:133
+#: src/applications/datastore/datastore.c:146
 #, fuzzy, c-format
 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:159
-#, 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:389
+#: src/applications/datastore/datastore.c:368
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:390
+#: src/applications/datastore/datastore.c:370
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:392
+#: src/applications/datastore/datastore.c:373
 msgid "# bytes allowed in datastore"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:406
+#: src/applications/datastore/datastore.c:388
 #, fuzzy
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr "Chạy dịch vụ truyền tải trên cổng %d thất bại.\n"
 
-#: src/applications/datastore/datastore.c:528
+#: src/applications/datastore/datastore.c:513
 #, fuzzy
 msgid "Failed to load sqstore service.  Check your configuration!\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:123
+#: src/applications/identity/hostkey.c:116
 #, fuzzy, c-format
 msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
 
-#: src/applications/identity/hostkey.c:154
+#: src/applications/identity/hostkey.c:143
 #, fuzzy, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
@@ -857,203 +845,203 @@
 "Kiểm tra chìa khóa máy có trong '%s' không thành công, đang tạo chìa khóa "
 "máy mới.\n"
 
-#: src/applications/identity/hostkey.c:162
+#: src/applications/identity/hostkey.c:152
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Đang tạo chìa khóa máy mới (có thể cần một chút thời gian).\n"
 
-#: src/applications/identity/hostkey.c:175
+#: src/applications/identity/hostkey.c:162
 msgid "Done creating hostkey.\n"
 msgstr "Đã tạo xong chìa khóa máy.\n"
 
-#: src/applications/identity/identity.c:347
+#: src/applications/identity/identity.c:345
 #, fuzzy, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 "Tập tin '%s' trong thư mục '%s' không tương ứng quy ước tên. Đã xóa bỏ.\n"
 
-#: src/applications/identity/identity.c:360
+#: src/applications/identity/identity.c:358
 #, fuzzy, c-format
 msgid ""
 "Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 "Tập tin '%s' trong thư mục '%s' không tương ứng quy ước tên. Đã xóa bỏ.\n"
 
-#: src/applications/identity/identity.c:397
+#: src/applications/identity/identity.c:393
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:730
-#: src/applications/identity/identity.c:758
+#: src/applications/identity/identity.c:708
+#: src/applications/identity/identity.c:729
 #, 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:812
+#: src/applications/identity/identity.c:776
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:822
+#: src/applications/identity/identity.c:785
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:928
-#: src/applications/identity/identity.c:1044
+#: src/applications/identity/identity.c:894
+#: src/applications/identity/identity.c:1014
 #, c-format
 msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:1045
+#: src/applications/identity/identity.c:1017
 #, c-format
 msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:148
+#: src/applications/transport/transport.c:190
 #, c-format
 msgid ""
 "Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:196
+#: src/applications/transport/transport.c:244
 #, c-format
 msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:246
+#: src/applications/transport/transport.c:297
 #, c-format
 msgid ""
 "Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:307
+#: src/applications/transport/transport.c:373
 #, 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:395
+#: src/applications/transport/transport.c:494
 #, 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:452
+#: src/applications/transport/transport.c:553
 msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:653
+#: src/applications/transport/transport.c:752
 #, 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:673
+#: src/applications/transport/transport.c:771
 #, 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:683
+#: src/applications/transport/transport.c:781
 #, 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:710
+#: src/applications/transport/transport.c:808
 #, fuzzy, c-format
 msgid "Loaded transport `%s'\n"
 msgstr "(Các) truyền tải có: %s\n"
 
-#: src/applications/transport/transport.c:723
+#: src/applications/transport/transport.c:819
 #, fuzzy, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là một đầu peer '%s'.\n"
 
-#: src/applications/fragmentation/fragmentation.c:566
+#: src/applications/fragmentation/fragmentation.c:575
 msgid "# messages defragmented"
 msgstr "# thông báo đã gom lại"
 
-#: src/applications/fragmentation/fragmentation.c:567
+#: src/applications/fragmentation/fragmentation.c:577
 msgid "# messages fragmented"
 msgstr "# thông báo đã phân mảnh"
 
-#: src/applications/fragmentation/fragmentation.c:568
+#: src/applications/fragmentation/fragmentation.c:578
 msgid "# fragments discarded"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/applications/fragmentation/fragmentation.c:580
+#: src/applications/fragmentation/fragmentation.c:588
 #, 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:65
+#: src/applications/stats/gnunet-stats.c:62
 #, c-format
 msgid "Supported peer-to-peer messages:\n"
 msgstr "Thông báo Peer to Peer được hỗ trợ:\n"
 
-#: src/applications/stats/gnunet-stats.c:69
+#: src/applications/stats/gnunet-stats.c:65
 #, c-format
 msgid "Supported client-server messages:\n"
 msgstr "Thông báo máy khách-máy chủ hỗ trợ:\n"
 
-#: src/applications/stats/gnunet-stats.c:93
+#: src/applications/stats/gnunet-stats.c:84
 #: 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."
 
-#: src/applications/stats/gnunet-stats.c:97
+#: src/applications/stats/gnunet-stats.c:88
 msgid "prints supported protocol messages"
 msgstr "in các thông báo giao thức hỗ trợ"
 
-#: src/applications/stats/gnunet-stats.c:133
-#: src/applications/tbench/gnunet-tbench.c:128
-#: src/applications/tracekit/gnunet-tracekit.c:313
+#: src/applications/stats/gnunet-stats.c:122
+#: src/applications/tbench/gnunet-tbench.c:127
+#: src/applications/tracekit/gnunet-tracekit.c:315
 #: src/applications/template/gnunet-template.c:94
-#: src/applications/vpn/gnunet-vpn.c:145
+#: src/applications/vpn/gnunet-vpn.c:148
 #, 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:152
+#: src/applications/stats/gnunet-stats.c:134
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr "Lỗi đọc thông tin từ gnunetd.\n"
 
-#: src/applications/stats/clientapi.c:328
+#: src/applications/stats/clientapi.c:330
 msgid "Uptime (seconds)"
 msgstr "Đã chạy (giây)"
 
-#: src/applications/stats/statistics.c:214
+#: src/applications/stats/statistics.c:223
 #, c-format
 msgid "% of allowed network load (up)"
 msgstr "% o tải mạng cho phép (lên)"
 
-#: src/applications/stats/statistics.c:216
+#: src/applications/stats/statistics.c:225
 #, c-format
 msgid "% of allowed network load (down)"
 msgstr "% o tải mạng cho phép (xuống)"
 
-#: src/applications/stats/statistics.c:218
+#: src/applications/stats/statistics.c:226
 #, c-format
 msgid "% of allowed cpu load"
 msgstr "% o tải cho phép của cpu"
 
-#: src/applications/stats/statistics.c:220
+#: src/applications/stats/statistics.c:227
 #, fuzzy, c-format
 msgid "% of allowed io load"
 msgstr "% o tải cho phép của cpu"
 
-#: src/applications/stats/statistics.c:222
+#: src/applications/stats/statistics.c:228
 msgid "# of connected peers"
 msgstr "# của các đầu đã kết nối"
 
-#: src/applications/stats/statistics.c:224
+#: src/applications/stats/statistics.c:230
 msgid "# bytes of noise received"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/applications/stats/statistics.c:392
+#: src/applications/stats/statistics.c:401
 #, fuzzy, c-format
 msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr "'%s' đăng ký trình điều khiển máy khách %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/stats/statistics.c:413
+#: src/applications/stats/statistics.c:421
 #, fuzzy
 msgid "keeps statistics about gnunetd's operation"
 msgstr "In thống kê về các thao tác của GNUnet."
@@ -1062,80 +1050,80 @@
 msgid "# Any-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:152
+#: src/applications/stats/sqstats.c:151
 msgid "# DBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:154
+#: src/applications/stats/sqstats.c:152
 msgid "# SBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:156
+#: src/applications/stats/sqstats.c:153
 msgid "# KBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:158
+#: src/applications/stats/sqstats.c:154
 msgid "# NBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:160
+#: src/applications/stats/sqstats.c:155
 msgid "# KNBlocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:162
+#: src/applications/stats/sqstats.c:156
 msgid "# OnDemand-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:164
+#: src/applications/stats/sqstats.c:157
 msgid "# Unknown-Blocks"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:166
+#: src/applications/stats/sqstats.c:158
 msgid "# expired"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:168
+#: src/applications/stats/sqstats.c:159
 msgid "# expire in 1h"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:170
+#: src/applications/stats/sqstats.c:160
 msgid "# expire in 24h"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:172
+#: src/applications/stats/sqstats.c:161
 msgid "# expire in 1 week"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:174
+#: src/applications/stats/sqstats.c:162
 msgid "# expire in 1 month"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:176
+#: src/applications/stats/sqstats.c:163
 msgid "# zero priority"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:178
+#: src/applications/stats/sqstats.c:164
 msgid "# priority one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:180
+#: src/applications/stats/sqstats.c:165
 msgid "# priority larger than one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:182
+#: src/applications/stats/sqstats.c:166
 msgid "# no anonymity"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:184
+#: src/applications/stats/sqstats.c:167
 msgid "# anonymity one"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:186
+#: src/applications/stats/sqstats.c:168
 msgid "# anonymity larger than one"
 msgstr ""
 
 #: src/applications/tbench/gnunet-tbench.c:64
-#: src/applications/tracekit/gnunet-tracekit.c:53
+#: src/applications/tracekit/gnunet-tracekit.c:55
 msgid "Start GNUnet transport benchmarking tool."
 msgstr "Chạy công cụ kiểm tra truyền tải của GNUnet."
 
@@ -1167,11 +1155,11 @@
 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:90
+#: src/applications/tbench/gnunet-tbench.c:91
 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:144
+#: src/applications/tbench/gnunet-tbench.c:143
 #, 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"
@@ -1181,37 +1169,37 @@
 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:182
+#: src/applications/tbench/gnunet-tbench.c:187
 #, c-format
 msgid "Time:\n"
 msgstr "Thời gian:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:183
+#: src/applications/tbench/gnunet-tbench.c:188
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr "\tmax      %llu miligiây\n"
 
-#: src/applications/tbench/gnunet-tbench.c:185
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr "\tmin      %llu miligiây\n"
 
-#: src/applications/tbench/gnunet-tbench.c:187
+#: src/applications/tbench/gnunet-tbench.c:190
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr "\tý nghĩa   %8.4f miligiây\n"
 
-#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tbench/gnunet-tbench.c:191
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr "\tkhác nhau %8.4f miligiây\n"
 
-#: src/applications/tbench/gnunet-tbench.c:192
+#: src/applications/tbench/gnunet-tbench.c:193
 #, c-format
 msgid "Loss:\n"
 msgstr "Mất:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:193
+#: src/applications/tbench/gnunet-tbench.c:194
 #, c-format
 msgid "\tmax      %u\n"
 msgstr "\tmax      %u\n"
@@ -1221,22 +1209,22 @@
 msgid "\tmin      %u\n"
 msgstr "\tmin      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:197
+#: src/applications/tbench/gnunet-tbench.c:196
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr "\tý nghĩa   %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:199
+#: src/applications/tbench/gnunet-tbench.c:197
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr "\tkhác nhau %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:208
+#: src/applications/tbench/gnunet-tbench.c:203
 #, 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:212
+#: src/applications/tbench/gnunet-tbench.c:209
 #, c-format
 msgid ""
 "\n"
@@ -1245,7 +1233,7 @@
 "\n"
 "Không nhận được thông báo từ gnunetd. gnunetd đang chạy?\n"
 
-#: src/applications/tbench/tbench.c:421
+#: src/applications/tbench/tbench.c:412
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
@@ -1253,21 +1241,21 @@
 msgid "probe network to the given DEPTH"
 msgstr "thử mạng tới độ sâu DEPTH đưa ra"
 
-#: src/applications/tracekit/gnunet-tracekit.c:51
+#: src/applications/tracekit/gnunet-tracekit.c:52
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 "chỉ ra định dạng kết quả; 0 - dạng người dùng dễ đọc, 1 - dấu chấm, 2 - vcg"
 
-#: src/applications/tracekit/gnunet-tracekit.c:57
+#: src/applications/tracekit/gnunet-tracekit.c:59
 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:61
+#: src/applications/tracekit/gnunet-tracekit.c:63
 msgid "wait DELAY seconds for replies"
 msgstr "chờ các câu trả lời DELAY giây"
 
-#: src/applications/tracekit/gnunet-tracekit.c:115
+#: src/applications/tracekit/gnunet-tracekit.c:111
 #, c-format
 msgid ""
 "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
@@ -1275,7 +1263,7 @@
 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:160
 #, 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"
@@ -1285,144 +1273,144 @@
 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:210
 #, 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:236
 #, 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:343
+#: src/applications/tracekit/gnunet-tracekit.c:336
 msgid "Could not send request to gnunetd.\n"
 msgstr "Không gửi được yêu cầu tới gnunetd.\n"
 
-#: src/applications/tracekit/tracekit.c:68
-#: src/applications/tracekit/tracekit.c:201
+#: src/applications/tracekit/tracekit.c:72
+#: src/applications/tracekit/tracekit.c:206
 #, fuzzy, c-format
 msgid "Received invalid `%s' message from `%s'.\n"
 msgstr "Nhận được thông báo sai '%s' từ '%s'.\n"
 
-#: src/applications/tracekit/tracekit.c:263
+#: src/applications/tracekit/tracekit.c:269
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr "TRACEKIT: bảng định tuyến đầy, bỏ đi yêu cầu theo vết trace\n"
 
-#: src/applications/tracekit/tracekit.c:354
+#: src/applications/tracekit/tracekit.c:346
 #, fuzzy, c-format
 msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr "TRACEKIT: nhận được thông báo sai '%s'\n"
 
-#: src/applications/tracekit/tracekit.c:461
+#: src/applications/tracekit/tracekit.c:443
 #, fuzzy
 msgid "allows mapping of the network topology"
 msgstr "Theo dấu vết trace hình học của mạng GNUnet."
 
-#: src/applications/gap/gap.c:1661
+#: src/applications/gap/gap.c:1695
 #, fuzzy, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "Nhận được thông báo sai '%s' từ '%s'.\n"
 
-#: src/applications/gap/gap.c:1662
+#: src/applications/gap/gap.c:1696
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1844
+#: src/applications/gap/gap.c:1883
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 "Đã yêu cầu che truyền tải nhưng chưa nạp dịch vụ truyền tải.  Đang nhả ra "
 "yêu cầu.\n"
 
-#: src/applications/gap/gap.c:1856 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1892 src/applications/fs/module/anonymity.c:65
 msgid "Failed to get traffic stats.\n"
 msgstr "Lấy các thông tin truyền tải không thành công.\n"
 
-#: src/applications/gap/gap.c:1863 src/applications/gap/gap.c:1869
-#: src/applications/gap/gap.c:1876
+#: src/applications/gap/gap.c:1902 src/applications/gap/gap.c:1910
+#: src/applications/gap/gap.c:1921
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr "Không thể thỏa mãn mức độ dấu tên mong muốn, đang lờ đi yêu cầu.\n"
 
-#: src/applications/gap/gap.c:2155
+#: src/applications/gap/gap.c:2183
 #, fuzzy
 msgid "# gap requests total received"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/gap/gap.c:2156
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2157
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2158
+#: src/applications/gap/gap.c:2190
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2159
+#: src/applications/gap/gap.c:2194
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2160
+#: src/applications/gap/gap.c:2197
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2161
+#: src/applications/gap/gap.c:2199
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2162
+#: src/applications/gap/gap.c:2202
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2163
+#: src/applications/gap/gap.c:2206
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2164
+#: src/applications/gap/gap.c:2208
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2165
+#: src/applications/gap/gap.c:2211
 #, fuzzy
 msgid "# gap duplicate requests that were re-tried"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/gap/gap.c:2166
+#: src/applications/gap/gap.c:2214
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2167
+#: src/applications/gap/gap.c:2216
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2168
+#: src/applications/gap/gap.c:2218
 msgid "# gap spurious replies (dropped)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2169
+#: src/applications/gap/gap.c:2220
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2170
+#: src/applications/gap/gap.c:2223
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2171
+#: src/applications/gap/gap.c:2227
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2172
+#: src/applications/gap/gap.c:2229
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2173
+#: src/applications/gap/gap.c:2231
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2189
+#: src/applications/gap/gap.c:2246
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
@@ -1430,32 +1418,32 @@
 "Nạp dịch vụ truyền tải không thành công; lỗ hổng không thể chắc chắn khả "
 "năng truyền tải.\n"
 
-#: src/applications/gap/gap.c:2217
+#: src/applications/gap/gap.c:2269
 #, fuzzy, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d %d\n"
 
-#: src/applications/gap/pid_table.c:161
+#: src/applications/gap/pid_table.c:177
 msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:163
+#: src/applications/gap/pid_table.c:181
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:78
+#: src/applications/getoption/getoption.c:75
 #, fuzzy, c-format
 msgid "`%s' registering client handler %d\n"
 msgstr "'%s' đăng ký trình điều khiển máy khách %d\n"
 
-#: src/applications/getoption/getoption.c:88
+#: src/applications/getoption/getoption.c:84
 #, fuzzy
 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:273
-#: src/applications/fs/tools/gnunet-search.c:140
+#: src/applications/fs/tools/gnunet-insert.c:268
+#: src/applications/fs/tools/gnunet-search.c:135
 #: src/applications/fs/tools/gnunet-download.c:69
 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"
@@ -1480,7 +1468,7 @@
 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:90
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
@@ -1488,12 +1476,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:93
 #, 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:97
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
@@ -1501,11 +1489,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:100
 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:104
 msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
@@ -1513,11 +1501,11 @@
 "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:107
 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:140
 #, fuzzy, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "Không gian tên '%s' có xếp hạng %d.\n"
@@ -1527,149 +1515,149 @@
 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:171
 #, 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:212
+#: src/applications/fs/tools/gnunet-pseudonym.c:204
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Dừng thu thập.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:214
+#: src/applications/fs/tools/gnunet-pseudonym.c:206
 #, 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:222
+#: src/applications/fs/tools/gnunet-pseudonym.c:214
 #, fuzzy, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Đã xóa tên hiệu '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:226
+#: src/applications/fs/tools/gnunet-pseudonym.c:219
 #, 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:243
+#: src/applications/fs/tools/gnunet-pseudonym.c:234
 #, fuzzy, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Bắt đầu thu thập '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:246
+#: src/applications/fs/tools/gnunet-pseudonym.c:238
 #, 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:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:279
 #, 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:291
+#: src/applications/fs/tools/gnunet-pseudonym.c:286
 #, 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:304
+#: src/applications/fs/tools/gnunet-pseudonym.c:301
 #, fuzzy, c-format
 msgid "You must specify a name for the collection (`%s' option).\n"
 msgstr ""
 "Người dùng phải chỉ ra một tên cho tập tin PID trong phần '%s' dưới '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:314
+#: src/applications/fs/tools/gnunet-pseudonym.c:309
 #, 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"
 
-#: src/applications/fs/tools/gnunet-directory.c:83
+#: src/applications/fs/tools/gnunet-directory.c:84
 #, fuzzy, c-format
 msgid "==> Directory `%s':\n"
 msgstr "==> Thư mục '%s':\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:90
+#: src/applications/fs/tools/gnunet-directory.c:87
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:125
+#: src/applications/fs/tools/gnunet-directory.c:114
 #, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:127
+#: src/applications/fs/tools/gnunet-directory.c:116
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr "Tìm thấy %d tập tin trong thư mục.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:142
+#: src/applications/fs/tools/gnunet-directory.c:131
 msgid "Perform directory related operations."
 msgstr "Thực hiện các thao tác có liên quan đến thư mục."
 
-#: src/applications/fs/tools/gnunet-directory.c:144
+#: src/applications/fs/tools/gnunet-directory.c:134
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr "xóa bỏ mọi mục từ cơ sở dữ liệu thư mục và dừng theo dấu vết các URI"
 
-#: src/applications/fs/tools/gnunet-directory.c:148
+#: src/applications/fs/tools/gnunet-directory.c:138
 msgid "list entries from the directory database"
 msgstr "liệt kê tất cả các mục từ cơ sở dữ liệu thư mục"
 
-#: src/applications/fs/tools/gnunet-directory.c:151
+#: src/applications/fs/tools/gnunet-directory.c:141
 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:175
+#: src/applications/fs/tools/gnunet-directory.c:164
 #, 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:136
+#: src/applications/fs/tools/gnunet-insert.c:132
 #, 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:141
+#: src/applications/fs/tools/gnunet-insert.c:137
 #, 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:161
+#: src/applications/fs/tools/gnunet-insert.c:157
 #, 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:170
+#: src/applications/fs/tools/gnunet-insert.c:165
 msgid "filename"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:173
+#: src/applications/fs/tools/gnunet-insert.c:167
 msgid "mimetype"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:208
 #, 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:224
+#: src/applications/fs/tools/gnunet-insert.c:220
 #, 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:235
+#: src/applications/fs/tools/gnunet-insert.c:231
 #, 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:246
+#: src/applications/fs/tools/gnunet-insert.c:242
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Upload aborted.\n"
 msgstr "Dừng tải xuống."
 
-#: src/applications/fs/tools/gnunet-insert.c:251
+#: src/applications/fs/tools/gnunet-insert.c:247
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1678,14 +1666,14 @@
 "\n"
 "Lỗi tải lên tập tin: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:260
+#: src/applications/fs/tools/gnunet-insert.c:256
 #, c-format
 msgid ""
 "\n"
 "Unexpected event: %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:277
+#: src/applications/fs/tools/gnunet-insert.c:272
 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"
@@ -1693,17 +1681,17 @@
 "thậm chí nếu gnunetd đang chạy trên máy nội bộ, bắt buộc tạo một bản sao "
 "thay vì tạo một liên kết đến thư mục chia sẻ của GNUnet"
 
-#: src/applications/fs/tools/gnunet-insert.c:281
+#: src/applications/fs/tools/gnunet-insert.c:277
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:284
+#: src/applications/fs/tools/gnunet-insert.c:281
 msgid ""
 "do not use libextractor to add additional references to directory entries "
 "and/or the published file"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:287
+#: src/applications/fs/tools/gnunet-insert.c:285
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -1711,18 +1699,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:289
+#: src/applications/fs/tools/gnunet-insert.c:287
 msgid "Make files available to GNUnet for sharing."
 msgstr "Cho phép GNUnet chia sẻ các tập tin."
 
-#: src/applications/fs/tools/gnunet-insert.c:292
+#: src/applications/fs/tools/gnunet-insert.c:290
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr ""
 "đặt khoảng thời gian cho cập nhật thành GIÂY (chỉ cho sự chèn không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:296
+#: src/applications/fs/tools/gnunet-insert.c:295
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -1730,7 +1718,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:300
+#: src/applications/fs/tools/gnunet-insert.c:299
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -1738,11 +1726,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:305
+#: src/applications/fs/tools/gnunet-insert.c:304
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt dữ liệu meta cho TYPE đưa ra tới VALUE chỉ ra"
 
-#: src/applications/fs/tools/gnunet-insert.c:308
+#: src/applications/fs/tools/gnunet-insert.c:307
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -1762,13 +1750,13 @@
 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:319
+#: src/applications/fs/tools/gnunet-insert.c:320
 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:322
+#: src/applications/fs/tools/gnunet-insert.c:323
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
@@ -1776,67 +1764,67 @@
 "chỉ ra sự chia sẻ này không theo chu kỳ nhưng đã cập nhật (chỉ cho chèn "
 "không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:326
+#: src/applications/fs/tools/gnunet-insert.c:327
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr "đặt ID của phiên bản này của sự chia sẻ (chỉ cho chèn không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:330
+#: src/applications/fs/tools/gnunet-insert.c:332
 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:333
+#: src/applications/fs/tools/gnunet-insert.c:335
 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:368
+#: src/applications/fs/tools/gnunet-insert.c:371
 #, 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:427
+#: src/applications/fs/tools/gnunet-insert.c:418
 #, 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"
 
-#: src/applications/fs/tools/gnunet-insert.c:447
+#: src/applications/fs/tools/gnunet-insert.c:437
 #, fuzzy, c-format
 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:448
 #: src/applications/fs/tools/gnunet-insert.c:456
-#: src/applications/fs/tools/gnunet-insert.c:462
-#: src/applications/fs/tools/gnunet-insert.c:468
-#: src/applications/fs/tools/gnunet-insert.c:474
+#: src/applications/fs/tools/gnunet-insert.c:464
+#: src/applications/fs/tools/gnunet-insert.c:472
 #: src/applications/fs/tools/gnunet-insert.c:480
 #, 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:143
+#: src/applications/fs/tools/gnunet-search.c:138
 msgid "Search GNUnet for files."
 msgstr "Tìm kiếm tập tin trong GNUnet."
 
-#: src/applications/fs/tools/gnunet-search.c:147
+#: src/applications/fs/tools/gnunet-search.c:142
 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:150
+#: src/applications/fs/tools/gnunet-search.c:145
 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:153
+#: src/applications/fs/tools/gnunet-search.c:148
 #, 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:191
+#: src/applications/fs/tools/gnunet-search.c:183
 #, 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:73
+#: src/applications/fs/tools/gnunet-download.c:74
 msgid ""
 "download a GNUnet directory that has already been downloaded.  Requires that "
 "a filename of an existing file is specified instead of the URI.  The "
@@ -1844,87 +1832,87 @@
 "`-R' option is also specified."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:75
+#: src/applications/fs/tools/gnunet-download.c:76
 msgid "Download files from GNUnet."
 msgstr "Tải tập tin từ GNUnet."
 
-#: src/applications/fs/tools/gnunet-download.c:79
+#: src/applications/fs/tools/gnunet-download.c:80
 msgid "write the file to FILENAME"
 msgstr "ghi tập tin vào TÊNTẬPTIN"
 
-#: src/applications/fs/tools/gnunet-download.c:82
+#: src/applications/fs/tools/gnunet-download.c:84
 msgid "set the maximum number of parallel downloads that are allowed"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:85
+#: src/applications/fs/tools/gnunet-download.c:87
 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:103
+#: src/applications/fs/tools/gnunet-download.c:108
 #, 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:116
+#: src/applications/fs/tools/gnunet-download.c:122
 #, fuzzy, c-format
 msgid "Download aborted.\n"
 msgstr "Dừng tải xuống."
 
-#: src/applications/fs/tools/gnunet-download.c:122
+#: src/applications/fs/tools/gnunet-download.c:128
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr "Lỗi tải xuống: %s\n"
 
-#: src/applications/fs/tools/gnunet-download.c:128
+#: src/applications/fs/tools/gnunet-download.c:134
 #, fuzzy, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr ""
 "Hoàn thành tải xuống tập tin '%s'.  Tốc độ là %8.3f kilô byte một giây.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:176
+#: src/applications/fs/tools/gnunet-download.c:178
 msgid "no name given"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:182
+#: src/applications/fs/tools/gnunet-download.c:184
 #, fuzzy, c-format
 msgid "Starting download `%s'\n"
 msgstr "Lỗi tải xuống: %s\n"
 
-#: src/applications/fs/tools/gnunet-download.c:230
+#: src/applications/fs/tools/gnunet-download.c:225
 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:251
+#: src/applications/fs/tools/gnunet-download.c:242
 #, 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:281
+#: src/applications/fs/tools/gnunet-download.c:279
 #, fuzzy, c-format
 msgid "No filename specified, using `%s' instead (for now).\n"
 msgstr "Chưa chỉ ra tên bảng, đang dùng '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:325
+#: src/applications/fs/tools/gnunet-download.c:320
 #, fuzzy, c-format
 msgid "Could not access gnunet-directory file `%s'\n"
 msgstr "Không phân tích được tập tin cấu hình '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:345
+#: src/applications/fs/tools/gnunet-download.c:338
 #, fuzzy, c-format
 msgid "Downloading %d files from directory `%s'.\n"
 msgstr "Tải tập tin từ GNUnet."
 
-#: src/applications/fs/tools/gnunet-download.c:349
+#: src/applications/fs/tools/gnunet-download.c:341
 #, fuzzy, c-format
 msgid "Did not find any files in directory `%s'\n"
 msgstr "Tìm thấy %d tập tin trong thư mục.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:390
+#: src/applications/fs/tools/gnunet-download.c:377
 #, 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:57
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
@@ -1933,7 +1921,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:68
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1942,7 +1930,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:80
+#: src/applications/fs/tools/gnunet-unindex.c:85
 #, c-format
 msgid ""
 "\n"
@@ -1951,35 +1939,35 @@
 "\n"
 "Lỗi bỏ đánh chỉ mục tập tin: %s\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:100
+#: src/applications/fs/tools/gnunet-unindex.c:105
 msgid "Unindex files."
 msgstr "Tập tin đã bỏ đánh chỉ mục."
 
-#: src/applications/fs/tools/gnunet-unindex.c:137
+#: src/applications/fs/tools/gnunet-unindex.c:142
 #, 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:164
+#: src/applications/fs/tools/gnunet-unindex.c:158
 #, 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/querymanager.c:225
+#: src/applications/fs/module/querymanager.c:228
 #, fuzzy
 msgid "# FS currently tracked queries from clients"
 msgstr "# đã gửi câu trả lời theo vết trace đến máy khách"
 
-#: src/applications/fs/module/querymanager.c:227
+#: src/applications/fs/module/querymanager.c:230
 msgid "# FS replies passed to clients"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:336
+#: src/applications/fs/module/ondemand.c:323
 #, 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:434
+#: 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 "
@@ -1990,7 +1978,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:461
+#: src/applications/fs/module/ondemand.c:444
 #, fuzzy, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -1999,17 +1987,17 @@
 "Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu FS trong phần '%s' dưới "
 "'%s'.\n"
 
-#: src/applications/fs/module/ondemand.c:518
+#: src/applications/fs/module/ondemand.c:495
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:681
+#: src/applications/fs/module/ondemand.c:647
 #, 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:1211
+#: src/applications/fs/module/fs.c:1170
 #, fuzzy, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2017,45 +2005,45 @@
 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:1224
+#: src/applications/fs/module/fs.c:1185
 msgid "# FS expired replies dropped"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1226
+#: src/applications/fs/module/fs.c:1187
 #, fuzzy
 msgid "# FS valid replies received"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/fs/module/fs.c:1263
+#: src/applications/fs/module/fs.c:1220
 #, 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:1303
+#: src/applications/fs/module/fs.c:1266
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:304
+#: src/applications/fs/module/migration.c:312
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:306
+#: src/applications/fs/module/migration.c:314
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:308
+#: src/applications/fs/module/migration.c:317
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/module/dht_push.c:137
+#: src/applications/fs/module/dht_push.c:138
 msgid "# blocks pushed into DHT"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:238
+#: src/applications/fs/fsui/search.c:234
 msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:308
+#: src/applications/fs/fsui/download.c:294
 #, fuzzy
 msgid "Download failed (no reason given)"
 msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
@@ -2064,35 +2052,35 @@
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:281
+#: src/applications/fs/fsui/upload.c:278
 #, fuzzy
 msgid "Failed to create temporary directory."
 msgstr "Lấy các thông tin truyền tải không thành công.\n"
 
-#: src/applications/fs/fsui/deserialize.c:754
+#: src/applications/fs/fsui/deserialize.c:757
 #, 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/ecrs/search.c:167
+#: src/applications/fs/ecrs/search.c:168
 msgid "CHK URI not allowed for search.\n"
 msgstr "Không cho phép tìm kiếm CHK URI.\n"
 
-#: src/applications/fs/ecrs/search.c:226
+#: src/applications/fs/ecrs/search.c:214
 msgid "LOC URI not allowed for search.\n"
 msgstr "Không cho phép tìm kiếm LOC URI.\n"
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/fs/ecrs/download.c:131
 #, fuzzy, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "Không ghi được PID tới tập tin '%s': %s.\n"
 
-#: src/applications/fs/ecrs/download.c:270
+#: src/applications/fs/ecrs/download.c:271
 #, fuzzy, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "'%s' %s không thành công: %s\n"
 
-#: src/applications/fs/ecrs/download.c:1043
+#: src/applications/fs/ecrs/download.c:1001
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2100,58 +2088,58 @@
 "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:1229
+#: src/applications/fs/ecrs/download.c:1184
 #, 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:164
+#: src/applications/fs/ecrs/upload.c:155
 #, 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:174
+#: src/applications/fs/ecrs/upload.c:162
 #, 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:183
+#: src/applications/fs/ecrs/upload.c:171
 #, 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:195
+#: src/applications/fs/ecrs/upload.c:183
 #, fuzzy, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Không hash được '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:214
+#: src/applications/fs/ecrs/upload.c:202
 #, 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:221
+#: src/applications/fs/ecrs/upload.c:209
 #, 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:236
+#: src/applications/fs/ecrs/upload.c:223
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Không mở được tập tin cấu hình '%s'\n"
 
-#: src/applications/fs/ecrs/upload.c:316
+#: src/applications/fs/ecrs/upload.c:296
 #, 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:854
+#: src/applications/fs/ecrs/meta.c:876
 #, 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:862
+#: src/applications/fs/ecrs/meta.c:884
 #, 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"
@@ -2161,56 +2149,56 @@
 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:343
-#: src/applications/fs/ecrs/namespace.c:426
-#: src/applications/fs/ecrs/namespace.c:585
+#: src/applications/fs/ecrs/namespace.c:325
+#: src/applications/fs/ecrs/namespace.c:404
+#: src/applications/fs/ecrs/namespace.c:545
 #, 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:355
-#: src/applications/fs/ecrs/namespace.c:437
+#: src/applications/fs/ecrs/namespace.c:337
+#: src/applications/fs/ecrs/namespace.c:415
 #, 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:599
-#: src/applications/fs/ecrs/namespace.c:610
+#: src/applications/fs/ecrs/namespace.c:556
+#: src/applications/fs/ecrs/namespace.c:567
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Định dạng của tập tin '%s' sai.\n"
 
-#: src/applications/fs/ecrs/helper.c:67
+#: src/applications/fs/ecrs/helper.c:74
 msgid "No keywords specified!\n"
 msgstr "Chưa chỉ ra từ khóa!\n"
 
-#: 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
+#: src/applications/fs/ecrs/helper.c:127 src/applications/fs/ecrs/helper.c:129
+#: src/applications/fs/ecrs/helper.c:133 src/applications/fs/ecrs/helper.c:138
 msgid "AND"
 msgstr "VÀ"
 
-#: src/applications/fs/ecrs/parser.c:122
+#: src/applications/fs/ecrs/parser.c:120
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:131
+#: src/applications/fs/uritrack/file_info.c:126
 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:402
+#: src/applications/fs/uritrack/file_info.c:395
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:727
+#: src/applications/fs/namespace/namespace_info.c:655
 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:748
+#: src/applications/fs/namespace/namespace_info.c:675
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -2218,25 +2206,25 @@
 "Đ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:382
+#: src/applications/topology_f2f/topology.c:373
 #, 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:400
+#: src/applications/topology_f2f/topology.c:390
 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:413
+#: src/applications/topology_f2f/topology.c:404
 #, 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"
 
-#: src/applications/topology_f2f/topology.c:519
+#: src/applications/topology_f2f/topology.c:511
 msgid "maintains a friend-to-friend restricted topology"
 msgstr ""
 
-#: src/applications/template/template.c:62
+#: src/applications/template/template.c:68
 #, fuzzy, c-format
 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"
@@ -2245,51 +2233,51 @@
 msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:105
+#: src/applications/bootstrap_http/http.c:102
 #, 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:176
+#: src/applications/bootstrap_http/http.c:170
 msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:211
+#: src/applications/bootstrap_http/http.c:210
 #, c-format
 msgid "Bootstrapping using `%s'.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:237
+#: src/applications/bootstrap_http/http.c:224
 #, 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:388
+#: src/applications/bootstrap_http/http.c:352
 #, fuzzy, c-format
 msgid "Downloaded %llu bytes from `%s'.\n"
 msgstr "Tải tập tin từ GNUnet."
 
-#: src/applications/bootstrap_http/http.c:421
+#: src/applications/bootstrap_http/http.c:385
 #, fuzzy
 msgid "# HELLOs downloaded via http"
 msgstr "# đã tải xuống HELO qua http"
 
-#: src/applications/traffic/traffic.c:441
+#: src/applications/traffic/traffic.c:454
 #, c-format
 msgid "# bytes transmitted of type %d"
 msgstr "# byte đã truyền của dạng %d"
 
-#: src/applications/traffic/traffic.c:459
+#: src/applications/traffic/traffic.c:470
 #, c-format
 msgid "# bytes received of type %d"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/applications/traffic/traffic.c:478
+#: src/applications/traffic/traffic.c:489
 #, fuzzy, c-format
 msgid "# bytes received in plaintext of type %d"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/applications/traffic/traffic.c:639
+#: src/applications/traffic/traffic.c:644
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -2297,385 +2285,385 @@
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:326
+#: src/applications/vpn/vpn.c:366
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:334
+#: src/applications/vpn/vpn.c:377
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:362
+#: src/applications/vpn/vpn.c:410
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:411
+#: src/applications/vpn/vpn.c:466
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:415
+#: src/applications/vpn/vpn.c:472
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:425
+#: src/applications/vpn/vpn.c:488
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:485
+#: src/applications/vpn/vpn.c:556
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:489
+#: src/applications/vpn/vpn.c:562
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:518
+#: src/applications/vpn/vpn.c:594
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:526
+#: src/applications/vpn/vpn.c:606
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:530
+#: src/applications/vpn/vpn.c:614
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:568
+#: src/applications/vpn/vpn.c:655
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:572
+#: src/applications/vpn/vpn.c:664
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:579
+#: src/applications/vpn/vpn.c:674
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:584
+#: src/applications/vpn/vpn.c:682
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:592
+#: src/applications/vpn/vpn.c:694
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:604
+#: src/applications/vpn/vpn.c:707
 #, 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:615
+#: src/applications/vpn/vpn.c:721
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:627
+#: src/applications/vpn/vpn.c:733
 #, 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:660
+#: src/applications/vpn/vpn.c:774
 msgid ""
 "RFC4193 We have run out of memory and so I can't store a tunnel for this "
 "peer.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:706
+#: src/applications/vpn/vpn.c:822
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:769
+#: src/applications/vpn/vpn.c:895
 #, c-format
 msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:773
+#: src/applications/vpn/vpn.c:902
 #, c-format
 msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:791
+#: src/applications/vpn/vpn.c:921
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:831
+#: src/applications/vpn/vpn.c:968
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:835
+#: src/applications/vpn/vpn.c:974
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:841
+#: src/applications/vpn/vpn.c:981
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:844
+#: src/applications/vpn/vpn.c:985
 #, 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:854
+#: src/applications/vpn/vpn.c:996
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:873
+#: src/applications/vpn/vpn.c:1022
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:894
+#: src/applications/vpn/vpn.c:1043
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:899
+#: src/applications/vpn/vpn.c:1050
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:910
+#: src/applications/vpn/vpn.c:1065
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:916
+#: src/applications/vpn/vpn.c:1071
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:932
+#: src/applications/vpn/vpn.c:1088
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:936
+#: src/applications/vpn/vpn.c:1094
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:940
+#: src/applications/vpn/vpn.c:1100
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:954
+#: src/applications/vpn/vpn.c:1119
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:969
+#: src/applications/vpn/vpn.c:1137
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:997
+#: src/applications/vpn/vpn.c:1168
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1012
+#: src/applications/vpn/vpn.c:1188
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1057
+#: src/applications/vpn/vpn.c:1239
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1103
+#: src/applications/vpn/vpn.c:1292
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1129
+#: src/applications/vpn/vpn.c:1324
 msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1190 src/setup/ncurses/wizard_curs.c:105
+#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:95
 msgid "Yes"
 msgstr "Có"
 
-#: src/applications/vpn/vpn.c:1190 src/setup/ncurses/wizard_curs.c:104
+#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:94
 msgid "No"
 msgstr "Không"
 
-#: src/applications/vpn/vpn.c:1398
+#: src/applications/vpn/vpn.c:1647
 #, 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:1399
+#: src/applications/vpn/vpn.c:1650
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1449
+#: src/applications/vpn/vpn.c:1723
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1481
+#: src/applications/vpn/vpn.c:1757
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1494
+#: src/applications/vpn/vpn.c:1771
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1509
+#: src/applications/vpn/vpn.c:1788
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/dstore/dstore.c:555
+#: src/applications/dstore/dstore.c:466
 msgid "# bytes in dstore"
 msgstr ""
 
-#: src/server/gnunet-update.c:143
+#: src/server/gnunet-update.c:147
 #, 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:148
+#: src/server/gnunet-update.c:151
 #, 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:196 src/server/gnunetd.c:144
+#: src/server/gnunet-update.c:198 src/server/gnunetd.c:136
 #, fuzzy
 msgid "Core initialization failed.\n"
 msgstr " Kết nối không thành công\n"
 
-#: src/server/gnunet-update.c:237
+#: src/server/gnunet-update.c:239
 msgid "print a value from the configuration file to stdout"
 msgstr "in một giá trị từ tập tin cấu hình ra stdout"
 
-#: src/server/gnunet-update.c:239
+#: src/server/gnunet-update.c:241
 msgid "Updates GNUnet datastructures after version change."
 msgstr "Cập nhật cấu trúc dữ liệu GNUnet sau khi thay đổi phiên bản."
 
-#: src/server/gnunet-update.c:243 src/server/gnunet-transport-check.c:401
+#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:365
 msgid "run as user LOGIN"
 msgstr "chạy dưới người dùng LOGIN"
 
-#: src/server/gnunet-update.c:246
+#: src/server/gnunet-update.c:249
 #, 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:1116
+#: src/server/connection.c:1188
 #, 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:1125
+#: src/server/connection.c:1197
 #, 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:2594
+#: src/server/connection.c:2744
 #, 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:2679
+#: src/server/connection.c:2829
 #, 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:2698
+#: src/server/connection.c:2851
 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:3154
+#: src/server/connection.c:3337
 msgid "# outgoing messages dropped"
 msgstr "# thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:3158
+#: src/server/connection.c:3340
 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:3160
+#: src/server/connection.c:3342
 msgid "# connections closed (HANGUP sent)"
 msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
-#: src/server/connection.c:3163
+#: src/server/connection.c:3345
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:3167
+#: src/server/connection.c:3349
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte đã truyền của dạng %d"
 
-#: src/server/connection.c:3171
+#: src/server/connection.c:3353
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte nhận được qua TCP"
 
-#: src/server/connection.c:3174
+#: src/server/connection.c:3355
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:3176
+#: src/server/connection.c:3356
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/server/connection.c:3178
+#: src/server/connection.c:3359
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3180
+#: src/server/connection.c:3362
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/server/connection.c:3182
+#: src/server/connection.c:3365
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "số thông báo trong một khối tin nhắn"
 
-#: src/server/connection.c:3184
+#: src/server/connection.c:3369
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3186
+#: src/server/connection.c:3373
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3188
+#: src/server/connection.c:3377
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
-#: src/server/startup.c:207
+#: src/server/startup.c:206
 #, fuzzy, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
 msgstr "Không ghi được các tập tin cấu hình: %s.\n"
 
-#: src/server/startup.c:224
+#: src/server/startup.c:223
 #, c-format
 msgid ""
 "Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
 "address@hidden"
 msgstr ""
 
-#: src/server/startup.c:238
+#: src/server/startup.c:237
 #, c-format
 msgid ""
 "Limiting datastore size to %llu GB, because the `%s' filesystem does not "
@@ -2683,12 +2671,12 @@
 "partition!\n"
 msgstr ""
 
-#: src/server/startup.c:285
+#: src/server/startup.c:274
 #, c-format
 msgid "Insufficient access permissions for `%s': %s\n"
 msgstr ""
 
-#: src/server/gnunetd.c:84
+#: src/server/gnunetd.c:85
 #, fuzzy, c-format
 msgid "`%s' startup complete.\n"
 msgstr "'%s' khởi động thành công.\n"
@@ -2698,7 +2686,7 @@
 msgid "`%s' is shutting down.\n"
 msgstr "'%s' đang tắt.\n"
 
-#: src/server/gnunetd.c:206
+#: src/server/gnunetd.c:192
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
@@ -2706,95 +2694,95 @@
 "chạy trong chế độ tìm sửa lỗi debug; gnunetd sẽ không tạo daemon và sẽ ghi "
 "thông báo lỗi ra stderr thay vì vào một tập tin bản ghi log"
 
-#: src/server/gnunetd.c:210
+#: src/server/gnunetd.c:196
 msgid "Starts the gnunetd daemon."
 msgstr "Chạy daemon gnunetd."
 
-#: src/server/gnunetd.c:213
+#: src/server/gnunetd.c:199
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:216
+#: src/server/gnunetd.c:203
 msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:220
+#: src/server/gnunetd.c:207
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/server/gnunetd.c:288
+#: src/server/gnunetd.c:271
 #, fuzzy, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
 "Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
 
-#: src/server/core.c:124
+#: src/server/core.c:126
 #, fuzzy, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr "Đã chạy môđun ứng dụng '%s'!\n"
 
-#: src/server/core.c:174
+#: src/server/core.c:177
 #, fuzzy, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr "Nạp plugin '%s' không thành công tại %s: %d.  Đang bỏ nạp plugin.\n"
 
-#: src/server/core.c:217
+#: src/server/core.c:226
 #, fuzzy, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr "Không tắt được '%s': chưa nạp ứng dụng\n"
 
-#: src/server/core.c:225
+#: src/server/core.c:234
 #, fuzzy, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr "Không tắt được ứng dụng '%s': chưa chạy\n"
 
-#: src/server/core.c:235
+#: src/server/core.c:243
 #, fuzzy, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr "Không tìm thấy phương pháp '%s%s' trong thư viện '%s'.\n"
 
-#: src/server/core.c:374
+#: src/server/core.c:386
 #, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr "Không phát hành được %p: chưa nạp dịch vụ\n"
 
-#: src/server/core.c:470
+#: src/server/core.c:492
 #, fuzzy, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "Không tắt đúng được ứng dụng '%s'.\n"
 
-#: src/server/core.c:598
+#: src/server/core.c:628
 #, fuzzy, c-format
 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:118
+#: src/server/gnunet-transport-check.c:121
 #, 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:127
+#: src/server/gnunet-transport-check.c:128
 #, 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:161
+#: src/server/gnunet-transport-check.c:157
 #, fuzzy, c-format
 msgid "`%s': Could not send.\n"
 msgstr "'%s': Không gửi được.\n"
 
-#: src/server/gnunet-transport-check.c:183
+#: src/server/gnunet-transport-check.c:172
 #, 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:197
+#: src/server/gnunet-transport-check.c:185
 #, 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:204
+#: src/server/gnunet-transport-check.c:192
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -2803,12 +2791,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:232
+#: src/server/gnunet-transport-check.c:222
 #, 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:265
+#: src/server/gnunet-transport-check.c:251
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2817,83 +2805,83 @@
 "\n"
 "Đang liên hệ '%s'."
 
-#: src/server/gnunet-transport-check.c:291
+#: src/server/gnunet-transport-check.c:276
 #, c-format
 msgid " Connection failed\n"
 msgstr " Kết nối không thành công\n"
 
-#: src/server/gnunet-transport-check.c:297
+#: src/server/gnunet-transport-check.c:282
 #, 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:350
+#: src/server/gnunet-transport-check.c:319
 #, c-format
 msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-transport-check.c:321
 #, fuzzy, c-format
 msgid "OK!\n"
 msgstr "Ừ"
 
-#: src/server/gnunet-transport-check.c:382
+#: src/server/gnunet-transport-check.c:346
 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:386
+#: src/server/gnunet-transport-check.c:350
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr "ping các đầu peer từ HOSTLISTURL tương ứng với truyền tải"
 
-#: src/server/gnunet-transport-check.c:389
+#: src/server/gnunet-transport-check.c:353
 msgid "send COUNT messages"
 msgstr "gửi COUNT thông báo"
 
-#: src/server/gnunet-transport-check.c:392
+#: src/server/gnunet-transport-check.c:356
 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:395
+#: src/server/gnunet-transport-check.c:359
 msgid "specifies which TRANSPORT should be tested"
 msgstr "chỉ ra TRANSPORT cần được thử nghiệm"
 
-#: src/server/gnunet-transport-check.c:398
+#: src/server/gnunet-transport-check.c:362
 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:406
+#: src/server/gnunet-transport-check.c:370
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:471
+#: src/server/gnunet-transport-check.c:431
 #, 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:474
+#: src/server/gnunet-transport-check.c:433
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "(Các) truyền tải có: %s\n"
 
-#: src/server/gnunet-transport-check.c:539
+#: src/server/gnunet-transport-check.c:474
 #, fuzzy, c-format
 msgid ""
 "\n"
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr "đã kết nối thành công %d từ %d đầu peer (có %d lần truyền tải).\n"
 
-#: src/server/tcpserver.c:105
+#: src/server/tcpserver.c:109
 #, fuzzy, c-format
 msgid "The `%s' request received from client is malformed.\n"
 msgstr "Yêu cầu '%s' nhận được từ máy khác là hỏng.\n"
 
-#: src/server/tcpserver.c:333
+#: src/server/tcpserver.c:324
 #, c-format
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr ""
 
-#: src/server/tcpserver.c:414
+#: src/server/tcpserver.c:398
 #, fuzzy, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
@@ -2901,17 +2889,17 @@
 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:466
+#: src/server/tcpserver.c:454
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%s thất bại, dạng thông báo %d đã sử dụng.\n"
 
-#: src/server/handler.c:401
+#: src/server/handler.c:428
 #, fuzzy, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Nhận được thông báo không đúng từ đầu peer '%s' trong '%s': %d.\n"
 
-#: src/server/version.c:152
+#: src/server/version.c:141
 msgid ""
 "Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
@@ -2924,132 +2912,132 @@
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:129 src/server/gnunet-peer-info.c:159
+#: src/server/gnunet-peer-info.c:122 src/server/gnunet-peer-info.c:153
 #, 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:139
+#: src/server/gnunet-peer-info.c:133
 #, 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:161
+#: src/server/gnunet-peer-info.c:154
 #, fuzzy, c-format
 msgid "Peer `%s' with trust %8u\n"
 msgstr "Đầu peer '%s' với tin tưởng %8u và địa chỉ '%s'\n"
 
-#: src/server/gnunet-peer-info.c:166
+#: src/server/gnunet-peer-info.c:158
 #, 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/boot/startup.c:212
+#: src/util/boot/startup.c:199
 #, fuzzy, c-format
 msgid "Failed to run %s: %s %d\n"
 msgstr "Kết nối tới gnunetd không thành công.\n"
 
-#: src/util/network_client/tcpio.c:94 src/util/network_client/tcpio.c:135
+#: src/util/network_client/tcpio.c:96 src/util/network_client/tcpio.c:140
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:106
+#: src/util/network_client/tcpio.c:111
 #, fuzzy, c-format
 msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'"
 msgstr "Lỗi cú pháp trong tập tin cấu hình '%s' trên dòng %d.\n"
 
-#: src/util/network_client/tcpio.c:280
+#: src/util/network_client/tcpio.c:290
 #, 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:323
+#: src/util/network_client/tcpio.c:327
 #, fuzzy, c-format
 msgid "Error connecting to %s:%u\n"
 msgstr ""
 "\n"
 "Lỗi bỏ đánh chỉ mục tập tin: %s\n"
 
-#: src/util/network_client/tcpio.c:336
+#: src/util/network_client/tcpio.c:338
 #, fuzzy, c-format
 msgid "Failed to connect to %s:%u in %ds\n"
 msgstr "Kết nối tới gnunetd không thành công.\n"
 
-#: src/util/network_client/tcpio.c:492
+#: src/util/network_client/tcpio.c:494
 #, fuzzy, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "'%s' thất bại, câu trả lời sai!\n"
 
-#: src/util/crypto/hostkey_gcrypt.c:1036
+#: src/util/crypto/hostkey_gcrypt.c:898
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Kiểm tra chữ ký RSA thất bại tại %s:%d: %s\n"
 
-#: src/util/crypto/locking_gcrypt.c:74
+#: src/util/crypto/locking_gcrypt.c:80
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/os/statuscalls.c:186 src/util/os/statuscalls.c:323
+#: src/util/os/statuscalls.c:196 src/util/os/statuscalls.c:337
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Thất bại khi phân tích dữ liệu giao diện từ '%s' tại %s:%d.\n"
 
-#: src/util/os/statuscalls.c:368 src/util/os/statuscalls.c:377
+#: src/util/os/statuscalls.c:380 src/util/os/statuscalls.c:390
 #, fuzzy, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
 msgstr ""
 "Không có giao diện mạng được xác định trong cấu hình phần '%s' dưới '%s'!\n"
 
-#: src/util/os/semaphore.c:219
+#: src/util/os/semaphore.c:218
 #, c-format
 msgid "Can't create semaphore: %i"
 msgstr "Không tạo được đèn tín hiệu: %i"
 
-#: src/util/os/osconfig.c:121
+#: src/util/os/osconfig.c:124
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:379
+#: src/util/os/osconfig.c:391
 #, fuzzy, c-format
 msgid "Command `%s' failed with error code %u\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/util/os/dso.c:56
+#: src/util/os/dso.c:59
 #, 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:110
+#: src/util/os/dso.c:119
 #, 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:152
+#: src/util/os/dso.c:159
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 "'%s' thất bại khi giải quyết phương pháp '%s%s' tại %s:%d với lỗi: %s\n"
 
-#: src/util/os/cpustatus.c:426
+#: src/util/os/cpustatus.c:461
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "Không hỏi được sự sử dụng CPU (Windows NT).\n"
 
-#: src/util/os/cpustatus.c:446
+#: src/util/os/cpustatus.c:483
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Không hỏi được sự sử dụng CPU (Windows 9x).\n"
 
-#: src/util/os/user.c:128 src/util/os/user.c:169
+#: src/util/os/user.c:134 src/util/os/user.c:176
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không ghi được các tập tin cấu hình: %s.\n"
 
-#: src/util/os/user.c:130
+#: src/util/os/user.c:135
 msgid "No such user"
 msgstr ""
 
-#: src/util/os/user.c:143
+#: src/util/os/user.c:149
 #, 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"
@@ -3059,44 +3047,46 @@
 msgid "Invalid process priority `%s'\n"
 msgstr "Câu trả lời không đúng tới '%s'.\n"
 
-#: src/util/network/select.c:315
+#: src/util/network/select.c:304
 #, 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:482
-msgid "select listen socket not valid!\n"
+#: src/util/network/select.c:473
+#, c-format
+msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
-#: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
+#: src/util/network/ipcheck.c:105 src/util/network/ipcheck.c:133
+#: src/util/network/ipcheck.c:180 src/util/network/ipcheck.c:204
+#: src/util/network/ipcheck.c:212
 #, fuzzy, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Định dạng sai cho IP: '%s'\n"
 
-#: src/util/network/ipcheck.c:156
+#: src/util/network/ipcheck.c:162
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai ('/%d' không hợp lệ trong CIDR IPv4)."
 
-#: src/util/network/ipcheck.c:217
+#: src/util/network/ipcheck.c:259
 #, fuzzy, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với ';': '%s')\n"
 
-#: src/util/network/ipcheck.c:250
+#: src/util/network/ipcheck.c:291
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask: %s\n"
 msgstr "Định dạng sai '%s' cho mặt nạ mạng: %s\n"
 
-#: src/util/network/ipcheck.c:265
+#: src/util/network/ipcheck.c:304
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Định dạng sai '%s' cho mạng: %s\n"
 
-#: src/util/network/ip.c:202
+#: src/util/network/ip.c:195
 #, fuzzy, c-format
 msgid ""
 "Could not find interface `%s' using `%s', trying to find another interface.\n"
@@ -3104,12 +3094,12 @@
 "Không tìm thấy giao diện '%s' trong '%s', đang thử kết gắn tới giao diện "
 "khác.\n"
 
-#: src/util/network/ip.c:278
+#: src/util/network/ip.c:268
 #, fuzzy, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr "Không tìm thấy một địa chỉ IP cho giao diện '%s'.\n"
 
-#: src/util/network/ip.c:288
+#: src/util/network/ip.c:277
 #, fuzzy, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
@@ -3118,131 +3108,131 @@
 "Có vài địa chỉ IP chỉ ra cho giao diện '%s'.\n"
 "GNUnet sẽ dùng %u.%u.%u.%u.\n"
 
-#: src/util/network/ip.c:309
+#: src/util/network/ip.c:297
 #, fuzzy, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr "Không tìm thấy '%s' để nhận ra địa chỉ IP của chúng ta: %s\n"
 
-#: src/util/network/ip.c:341
+#: src/util/network/ip.c:326
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %u.%u.%u.%u.\n"
 
-#: src/util/disk/storage.c:202
+#: src/util/disk/storage.c:198
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "'%s' thất bại cho ổ %s: %u\n"
 
-#: src/util/disk/storage.c:531
+#: src/util/disk/storage.c:526
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "'%s' mong đợi '%s' là một thư mục!\n"
 
-#: src/util/config_impl/impl.c:289
+#: src/util/config_impl/impl.c:290
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr "Lỗi cú pháp trong tập tin cấu hình '%s' trên dòng %d.\n"
 
-#: src/util/config_impl/impl.c:532
+#: src/util/config_impl/impl.c:533
 #, c-format
 msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:578
+#: src/util/config_impl/impl.c:579
 #, 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:590
+#: src/util/config_impl/impl.c:589
 #, fuzzy, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 "Trong phần '%s' dưới '%s' của cấu hình phải chỉ ra thư mục cho dữ liệu FS.\n"
 
-#: src/util/config_impl/impl.c:680
+#: src/util/config_impl/impl.c:672
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:122
+#: src/util/error/error.c:115
 #, c-format
 msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:190 src/util/error/error.c:234
+#: src/util/error/error.c:187 src/util/error/error.c:222
 msgid "DEBUG"
 msgstr "TÌMLỖI"
 
-#: src/util/error/error.c:193 src/util/error/error.c:236
+#: src/util/error/error.c:189 src/util/error/error.c:224
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:196 src/util/error/error.c:240
+#: src/util/error/error.c:191 src/util/error/error.c:228
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/error/error.c:199 src/util/error/error.c:242
+#: src/util/error/error.c:193 src/util/error/error.c:230
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/error/error.c:202 src/util/error/error.c:244
+#: src/util/error/error.c:195 src/util/error/error.c:232
 msgid "FATAL"
 msgstr "LỖI NẶNG"
 
-#: src/util/error/error.c:205 src/util/error/error.c:246
+#: src/util/error/error.c:197 src/util/error/error.c:234
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:208 src/util/error/error.c:248
+#: src/util/error/error.c:199 src/util/error/error.c:236
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:211 src/util/error/error.c:250
+#: src/util/error/error.c:201 src/util/error/error.c:238
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:214 src/util/error/error.c:252
+#: src/util/error/error.c:203 src/util/error/error.c:240
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:217 src/util/error/error.c:254
+#: src/util/error/error.c:205 src/util/error/error.c:242
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:220 src/util/error/error.c:256
+#: src/util/error/error.c:207 src/util/error/error.c:244
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:223
+#: src/util/error/error.c:209
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:238
+#: src/util/error/error.c:226
 msgid "INFO"
 msgstr "THÔNGTIN"
 
-#: src/util/error/error.c:257
+#: src/util/error/error.c:245
 msgid "NOTHING"
 msgstr "KHÔNGCÓGÌ"
 
-#: src/util/threads/mutex.c:145 src/util/threads/semaphore.c:174
-#: src/util/threads/pthread.c:150
+#: src/util/threads/mutex.c:144 src/util/threads/semaphore.c:166
+#: src/util/threads/pthread.c:154
 #, fuzzy, c-format
 msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 msgstr "Không mong đợi một phân phối rất rộng (%u) tại %s:%d!\n"
 
-#: src/util/threads/mutex.c:154 src/util/threads/mutex.c:194
+#: src/util/threads/mutex.c:152 src/util/threads/mutex.c:194
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Tham số sai: '%s'\n"
 
-#: src/util/threads/mutex.c:159
+#: src/util/threads/mutex.c:156
 #, fuzzy, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr "Khóa chết theo '%s' tại %s: %d.\n"
@@ -3252,90 +3242,102 @@
 msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:199
+#: src/util/threads/mutex.c:198
 #, 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:162 src/util/threads/pthread.c:170
-#: src/util/threads/pthread.c:177 src/util/threads/pthread.c:270
+#: src/util/threads/pthread.c:165 src/util/threads/pthread.c:171
+#: src/util/threads/pthread.c:176 src/util/threads/pthread.c:264
 #, 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:184 src/util/threads/pthread.c:281
+#: src/util/threads/pthread.c:181 src/util/threads/pthread.c:273
 #, 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"
 
-#: src/util/loggers/file.c:231
+#: src/util/loggers/file.c:229
 #, fuzzy, c-format
 msgid "Failed to open log-file `%s': %s\n"
 msgstr "Không mở được tập tin cấu hình '%s'\n"
 
-#: src/util/loggers/file.c:256
+#: src/util/loggers/file.c:248
 msgid "GNUnet error log"
 msgstr ""
 
-#: src/util/loggers/memory.c:71
+#: src/util/loggers/file.c:265 src/util/loggers/file.c:282
+#: src/include/gnunet_util_error.h:243 src/include/gnunet_util_error.h:250
+#: src/include/gnunet_util_error.h:257 src/include/gnunet_util_error.h:264
+#, 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/util/loggers/memory.c:70
 msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:681
+#: src/util/getopt/getopt.c:684
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: tùy chọn '%s' không rõ ràng\n"
 
-#: src/util/getopt/getopt.c:705
+#: src/util/getopt/getopt.c:710
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: tùy chọn `--%s' không cho phép một tham số\n"
 
-#: src/util/getopt/getopt.c:710
+#: src/util/getopt/getopt.c:716
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: tùy chọn `%c%s' không cho phép một tham số\n"
 
-#: src/util/getopt/getopt.c:727 src/util/getopt/getopt.c:901
+#: src/util/getopt/getopt.c:737 src/util/getopt/getopt.c:909
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tùy chọn `%s' cần một tham số\n"
 
-#: src/util/getopt/getopt.c:757
+#: src/util/getopt/getopt.c:767
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: tùy chọn không nhận ra `--%s'\n"
 
-#: src/util/getopt/getopt.c:761
+#: src/util/getopt/getopt.c:771
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: tùy chọn không nhận ra `%c%s'\n"
 
-#: src/util/getopt/getopt.c:787
+#: src/util/getopt/getopt.c:797
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: tùy chọn không hợp lệ -- %c\n"
 
-#: src/util/getopt/getopt.c:790
+#: src/util/getopt/getopt.c:799
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: tùy chọn sai -- %c\n"
 
-#: src/util/getopt/getopt.c:820 src/util/getopt/getopt.c:950
+#: src/util/getopt/getopt.c:828 src/util/getopt/getopt.c:958
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: tùy chọn cần một tham số -- %c\n"
 
-#: src/util/getopt/getopt.c:867
+#: src/util/getopt/getopt.c:876
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn `-W %s' không rõ ràng\n"
 
-#: src/util/getopt/getopt.c:885
+#: src/util/getopt/getopt.c:894
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: tùy chọn `-W %s' không cho phép một tham số\n"
 
+#: src/util/getopt/getopt.c:1071 src/setup/gnunet-setup.c:273
+#, 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/util/getopt/setoption.c:58
 #, c-format
 msgid ""
@@ -3343,18 +3345,18 @@
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:137 src/util/getopt/setoption.c:153
+#: src/util/getopt/setoption.c:136 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
+#: src/util/getopt/printhelp.c:49
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "Tham số cho tùy chọn dài cũng là tham số cho tùy chọn ngắn.\n"
 
-#: src/util/string/string.c:121
+#: src/util/string/string.c:120
 msgid "ms"
 msgstr "mili giây"
 
@@ -3362,201 +3364,201 @@
 msgid "s"
 msgstr "giây"
 
-#: src/util/string/string.c:129
+#: src/util/string/string.c:130
 msgid "m"
 msgstr "phút"
 
-#: src/util/string/string.c:132
+#: src/util/string/string.c:134
 msgid "h"
 msgstr "giờ"
 
-#: src/util/string/string.c:135
+#: src/util/string/string.c:138
 msgid " days"
 msgstr " ngày"
 
-#: src/util/string/string.c:153
+#: src/util/string/string.c:154
 msgid "b"
 msgstr ""
 
-#: src/util/string/string.c:158
+#: src/util/string/string.c:160
 msgid "KiB"
 msgstr ""
 
-#: src/util/string/string.c:161
+#: src/util/string/string.c:164
 msgid "MiB"
 msgstr ""
 
-#: src/util/string/string.c:164
+#: src/util/string/string.c:168
 msgid "GiB"
 msgstr ""
 
-#: src/util/string/string.c:167
+#: src/util/string/string.c:172
 msgid "TiB"
 msgstr ""
 
-#: src/util/string/string.c:287
+#: src/util/string/string.c:284
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:60
+#: src/setup/gnunet-setup.c:59
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:62
+#: src/setup/gnunet-setup.c:61
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:188
+#: src/setup/gnunet-setup.c:176
 #, fuzzy, c-format
 msgid "Too many arguments.\n"
 msgstr "Sai tham số dòng lệnh.\n"
 
-#: src/setup/gnunet-setup.c:193
+#: src/setup/gnunet-setup.c:181
 #, 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:268
+#: src/setup/gnunet-setup.c:255
 #, 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:284
+#: src/setup/gnunet-setup.c:272
 #, fuzzy, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Lỗi không rõ.\n"
 
-#: src/setup/gnunet-win-tool.c:54
+#: src/setup/gnunet-win-tool.c:55
 msgid "list all network adapters"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:57
+#: src/setup/gnunet-win-tool.c:58
 msgid "install GNUnet as Windows service"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:60
+#: src/setup/gnunet-win-tool.c:61
 msgid "uninstall GNUnet service"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:63
+#: src/setup/gnunet-win-tool.c:64
 msgid "increase the maximum number of TCP/IP connections"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:66
+#: src/setup/gnunet-win-tool.c:67
 msgid "display a file's hash value"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:121
+#: src/setup/gnunet-win-tool.c:126
 #, c-format
 msgid "GNUnet service installed successfully.\n"
 msgstr "Dịch vụ GNUnet đã cài đặt thành công.\n"
 
-#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:151
+#: src/setup/gnunet-win-tool.c:129 src/setup/gnunet-win-tool.c:157
 #, c-format
 msgid "This version of Windows doesn't support services.\n"
 msgstr "Phiên bản này của Windows không hỗ trợ các dịch vụ.\n"
 
-#: src/setup/gnunet-win-tool.c:128 src/setup/gnunet-win-tool.c:155
+#: src/setup/gnunet-win-tool.c:133 src/setup/gnunet-win-tool.c:161
 #, c-format
 msgid "Error: can't open Service Control Manager: %s\n"
 msgstr "Lỗi: không mở được Trình Quản lý Dịch vụ: %s\n"
 
-#: src/setup/gnunet-win-tool.c:133
+#: src/setup/gnunet-win-tool.c:138
 #, c-format
 msgid "Error: can't create service: %s\n"
 msgstr "Lỗi: không tạo được dịch vụ: %s\n"
 
-#: src/setup/gnunet-win-tool.c:136 src/setup/gnunet-win-tool.c:167
+#: src/setup/gnunet-win-tool.c:141 src/setup/gnunet-win-tool.c:173
 #, c-format
 msgid "Unknown error.\n"
 msgstr "Lỗi không rõ.\n"
 
-#: src/setup/gnunet-win-tool.c:148
+#: src/setup/gnunet-win-tool.c:154
 #, c-format
 msgid "Service deleted.\n"
 msgstr "Đã xóa bỏ dịch vụ.\n"
 
-#: src/setup/gnunet-win-tool.c:160
+#: src/setup/gnunet-win-tool.c:166
 #, c-format
 msgid "Error: can't access service: %s\n"
 msgstr "Lỗi: không truy cập được dịch vụ: %s\n"
 
-#: src/setup/gnunet-win-tool.c:164
+#: src/setup/gnunet-win-tool.c:170
 #, c-format
 msgid "Error: can't delete service: %s\n"
 msgstr "Lỗi: không xóa được dịch vụ: %s\n"
 
-#: src/setup/gtk/gconf.c:430
+#: src/setup/gtk/gconf.c:387
 #, fuzzy
 msgid "Description"
 msgstr "Câu hỏi"
 
-#: src/setup/gtk/gconf.c:448
+#: src/setup/gtk/gconf.c:403
 msgid "Value"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:469
+#: src/setup/gtk/gconf.c:427
 msgid "Default"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:483 src/setup/ncurses/wizard_curs.c:77
+#: src/setup/gtk/gconf.c:442 src/setup/ncurses/wizard_curs.c:73
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: src/setup/gtk/gconf.c:497
+#: src/setup/gtk/gconf.c:456
 #, fuzzy
 msgid "Section"
 msgstr "Câu hỏi"
 
-#: src/setup/gtk/gconf.c:509
+#: src/setup/gtk/gconf.c:467
 #, fuzzy
 msgid "Option"
 msgstr "Tùy _chọn"
 
-#: src/setup/gtk/gconf.c:531
+#: src/setup/gtk/gconf.c:490
 #, fuzzy
 msgid "Configuration saved."
 msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
 
-#: src/setup/gtk/gconf.c:539
+#: src/setup/gtk/gconf.c:500
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "Không ghi được thiết lập!"
 
-#: src/setup/gtk/gconf.c:562
+#: src/setup/gtk/gconf.c:526
 #, fuzzy
 msgid "Configuration changed. Save?"
 msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
 
-#: src/setup/gtk/gconf.c:573
+#: src/setup/gtk/gconf.c:539
 #, fuzzy
 msgid "Error saving configuration."
 msgstr "Không ghi được thiết lập!"
 
-#: src/setup/gtk/wizard_gtk.c:145
+#: src/setup/gtk/wizard_gtk.c:144
 #, fuzzy
 msgid "(unknown connection)"
 msgstr "Kết nối mạng"
 
-#: src/setup/gtk/wizard_gtk.c:428 src/setup/ncurses/wizard_curs.c:466
+#: src/setup/gtk/wizard_gtk.c:413 src/setup/ncurses/wizard_curs.c:453
 #, 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:450
+#: src/setup/gtk/wizard_gtk.c:437
 #, fuzzy
 msgid "Do you want to save the new configuration?"
 msgstr "Ghi thiết lập?"
 
-#: src/setup/gtk/wizard_gtk.c:480
+#: src/setup/gtk/wizard_gtk.c:469
 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:490
+#: src/setup/gtk/wizard_gtk.c:477
 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:505
+#: src/setup/gtk/wizard_gtk.c:492
 msgid ""
 "Running gnunet-update failed.\n"
 "This maybe due to insufficient permissions, please check your "
@@ -3564,134 +3566,134 @@
 "Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/setup/text/conf.c:75
+#: src/setup/text/conf.c:79
 #, fuzzy
 msgid "yes"
 msgstr "Có"
 
-#: src/setup/text/conf.c:76
+#: src/setup/text/conf.c:80
 msgid "no"
 msgstr ""
 
-#: src/setup/text/conf.c:104
+#: src/setup/text/conf.c:105
 #, c-format
 msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/text/conf.c:116
+#: src/setup/text/conf.c:114
 msgid "\tPossible choices:\n"
 msgstr ""
 
-#: src/setup/text/conf.c:124
+#: src/setup/text/conf.c:122
 msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:126
+#: src/setup/text/conf.c:124
 #, c-format
 msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/text/conf.c:147
+#: src/setup/text/conf.c:142
 #, c-format
 msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/text/conf.c:152
+#: src/setup/text/conf.c:146
 #, c-format
 msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/text/conf.c:158
+#: src/setup/text/conf.c:152
 #, c-format
 msgid ""
 "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
 "value %llu): "
 msgstr ""
 
-#: src/setup/text/conf.c:191
+#: src/setup/text/conf.c:186
 #, fuzzy, c-format
 msgid "Yes\n"
 msgstr "Có"
 
-#: src/setup/text/conf.c:196
+#: src/setup/text/conf.c:191
 #, fuzzy, c-format
 msgid "No\n"
 msgstr "Không"
 
-#: src/setup/text/conf.c:199 src/setup/text/conf.c:235
-#: src/setup/text/conf.c:261 src/setup/text/conf.c:318
-#: src/setup/text/conf.c:370
+#: src/setup/text/conf.c:194 src/setup/text/conf.c:235
+#: src/setup/text/conf.c:265 src/setup/text/conf.c:328
+#: src/setup/text/conf.c:386
 #, fuzzy, c-format
 msgid "Help\n"
 msgstr "Trợ giúp"
 
-#: src/setup/text/conf.c:202 src/setup/text/conf.c:215
-#: src/setup/text/conf.c:270 src/setup/text/conf.c:299
-#: src/setup/text/conf.c:351
+#: src/setup/text/conf.c:197 src/setup/text/conf.c:212
+#: src/setup/text/conf.c:275 src/setup/text/conf.c:306
+#: src/setup/text/conf.c:364
 #, fuzzy, c-format
 msgid "Abort\n"
 msgstr "_Nói về"
 
-#: src/setup/text/conf.c:342 src/setup/text/conf.c:397
+#: src/setup/text/conf.c:353 src/setup/text/conf.c:415
 #, c-format
 msgid ""
 "\n"
 "Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/text/conf.c:403
+#: src/setup/text/conf.c:421
 #, c-format
 msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:477
+#: src/setup/text/conf.c:482
 msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/setup/text/conf.c:488
+#: src/setup/text/conf.c:491
 msgid "Aborted.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:510
+#: src/setup/text/conf.c:504
 #, fuzzy
 msgid "Invalid entry.\n"
 msgstr "Tham số sai: "
 
-#: src/setup/text/conf.c:529
+#: src/setup/text/conf.c:521
 #, c-format
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:560
+#: src/setup/text/conf.c:552
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:561
+#: src/setup/text/conf.c:553
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:575 src/setup/ncurses/mconf.c:519
+#: src/setup/text/conf.c:565 src/setup/ncurses/mconf.c:511
 #, 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:580
+#: src/setup/text/conf.c:571
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:592
+#: src/setup/text/conf.c:586
 #, 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:597
+#: src/setup/text/conf.c:595
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
@@ -3708,78 +3710,78 @@
 msgid "Cancel"
 msgstr "Dừng"
 
-#: src/setup/ncurses/mconf.c:175 src/setup/ncurses/mconf.c:278
-#: src/setup/ncurses/mconf.c:356 src/setup/ncurses/mconf.c:462
-#: src/setup/ncurses/wizard_curs.c:121 src/setup/ncurses/wizard_curs.c:191
-#: src/setup/ncurses/wizard_curs.c:307
+#: src/setup/ncurses/mconf.c:179 src/setup/ncurses/mconf.c:278
+#: src/setup/ncurses/mconf.c:359 src/setup/ncurses/mconf.c:455
+#: src/setup/ncurses/wizard_curs.c:110 src/setup/ncurses/wizard_curs.c:174
+#: src/setup/ncurses/wizard_curs.c:290
 msgid "Internal error! (Choice invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:213 src/setup/ncurses/mconf.c:408
+#: src/setup/ncurses/mconf.c:212 src/setup/ncurses/mconf.c:403
 msgid "Internal error! (Value invalid?)"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:399
+#: src/setup/ncurses/mconf.c:392
 msgid "Invalid input, expecting floating point value."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:447
+#: src/setup/ncurses/mconf.c:435
 msgid "Invalid input, expecting integer."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:453
+#: src/setup/ncurses/mconf.c:443
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:505 src/setup/ncurses/wizard_curs.c:562
+#: src/setup/ncurses/mconf.c:499 src/setup/ncurses/wizard_curs.c:534
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "Cấu hình GNUnet"
 
-#: src/setup/ncurses/mconf.c:523
+#: src/setup/ncurses/mconf.c:517
 #, fuzzy
 msgid "Do you wish to save your new configuration?"
 msgstr "Ghi thiết lập?"
 
-#: src/setup/ncurses/mconf.c:534
+#: src/setup/ncurses/mconf.c:531
 #, fuzzy, c-format
 msgid ""
 "\n"
 "End of configuration.\n"
 msgstr "Cấu hình GNUnet"
 
-#: src/setup/ncurses/mconf.c:537
+#: src/setup/ncurses/mconf.c:536
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Your configuration changes were NOT saved.\n"
 msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
 
-#: src/setup/ncurses/wizard_curs.c:67 src/setup/lib/wizard_util.c:131
-#: src/setup/lib/wizard_util.c:176
+#: src/setup/ncurses/wizard_curs.c:65 src/setup/lib/wizard_util.c:139
+#: src/setup/lib/wizard_util.c:194
 msgid "Error"
 msgstr "Lỗi"
 
-#: src/setup/ncurses/wizard_curs.c:86
+#: src/setup/ncurses/wizard_curs.c:80
 #, fuzzy
 msgid "Error!"
 msgstr "Lỗi"
 
-#: src/setup/ncurses/wizard_curs.c:153
+#: src/setup/ncurses/wizard_curs.c:142
 #, fuzzy
 msgid "Abort"
 msgstr "_Nói về"
 
-#: src/setup/ncurses/wizard_curs.c:154
+#: src/setup/ncurses/wizard_curs.c:143
 msgid "Ok"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:222 src/setup/ncurses/wizard_curs.c:290
-#: src/setup/ncurses/wizard_curs.c:443
+#: src/setup/ncurses/wizard_curs.c:209 src/setup/ncurses/wizard_curs.c:275
+#: src/setup/ncurses/wizard_curs.c:426
 msgid "GNUnet configuration"
 msgstr "Cấu hình GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:223
+#: src/setup/ncurses/wizard_curs.c:211
 #, fuzzy
 msgid ""
 "Welcome to GNUnet!\n"
@@ -3809,14 +3811,14 @@
 "\n"
 "đội GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:291
+#: src/setup/ncurses/wizard_curs.c:277
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
 msgstr ""
 "Chọn giao diện mạng kết nối máy tính tới internet từ danh sách dưới đây."
 
-#: src/setup/ncurses/wizard_curs.c:312 src/setup/ncurses/wizard_curs.c:325
+#: src/setup/ncurses/wizard_curs.c:295 src/setup/ncurses/wizard_curs.c:309
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
@@ -3825,23 +3827,23 @@
 "\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây thường là "
 "một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL."
 
-#: src/setup/ncurses/wizard_curs.c:323
+#: src/setup/ncurses/wizard_curs.c:306
 #, fuzzy
 msgid "Network configuration: interface"
 msgstr "Giao diện mạng:"
 
-#: src/setup/ncurses/wizard_curs.c:324
+#: src/setup/ncurses/wizard_curs.c:308
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr "Tên của giao diện mạng kết nối máy tính tới Internet là gì?"
 
-#: src/setup/ncurses/wizard_curs.c:335
+#: src/setup/ncurses/wizard_curs.c:319
 #, fuzzy
 msgid "Network configuration: NAT"
 msgstr "Cấu hình GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:336
+#: src/setup/ncurses/wizard_curs.c:320
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3858,12 +3860,12 @@
 "thể kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu kết nối "
 "thẳng qua môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp cổng\")."
 
-#: src/setup/ncurses/wizard_curs.c:349
+#: src/setup/ncurses/wizard_curs.c:333
 #, fuzzy
 msgid "Network configuration: IP"
 msgstr "Cấu hình GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:350
+#: src/setup/ncurses/wizard_curs.c:335
 #, fuzzy
 msgid "What is this computer's public IP address or hostname?"
 msgstr ""
@@ -3871,7 +3873,7 @@
 "\n"
 "Nếu không biết, hãy để trống."
 
-#: src/setup/ncurses/wizard_curs.c:351
+#: src/setup/ncurses/wizard_curs.c:336
 #, fuzzy
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
@@ -3891,17 +3893,17 @@
 "Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra địa "
 "chỉ IP."
 
-#: src/setup/ncurses/wizard_curs.c:366
+#: src/setup/ncurses/wizard_curs.c:351
 #, fuzzy
 msgid "Bandwidth configuration: upload"
 msgstr "Giới hạn băng thông"
 
-#: src/setup/ncurses/wizard_curs.c:367
+#: src/setup/ncurses/wizard_curs.c:353
 #, fuzzy
 msgid "How much upstream bandwidth (in bytes/s) may be used?"
 msgstr "Tốc độ ra giới hạn là bao nhiêu (Byte/giây)?"
 
-#: src/setup/ncurses/wizard_curs.c:368
+#: src/setup/ncurses/wizard_curs.c:354
 #, fuzzy
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
@@ -3919,17 +3921,17 @@
 "chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
 "internet lớn nhất."
 
-#: src/setup/ncurses/wizard_curs.c:380
+#: src/setup/ncurses/wizard_curs.c:366
 #, fuzzy
 msgid "Bandwidth configuration: download"
 msgstr "Giới hạn băng thông"
 
-#: src/setup/ncurses/wizard_curs.c:381
+#: src/setup/ncurses/wizard_curs.c:368
 #, fuzzy
 msgid "How much downstream bandwidth (in bytes/s) may be used?"
 msgstr "Dùng bao nhiêu (Byte/giây) cho dòng vào?"
 
-#: src/setup/ncurses/wizard_curs.c:382
+#: src/setup/ncurses/wizard_curs.c:369
 #, fuzzy
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
@@ -3947,16 +3949,16 @@
 "chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
 "internet lớn nhất."
 
-#: src/setup/ncurses/wizard_curs.c:394
+#: src/setup/ncurses/wizard_curs.c:381
 #, fuzzy
 msgid "Quota configuration"
 msgstr "Cấu hình GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:395
+#: src/setup/ncurses/wizard_curs.c:382
 msgid "What is the maximum size of the datastore in MB?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:396
+#: src/setup/ncurses/wizard_curs.c:383
 #, fuzzy
 msgid ""
 "The GNUnet datastore contains all content that GNUnet needs to store "
@@ -3967,16 +3969,16 @@
 "Kho dữ liệu GNUnet chứa tất cả các dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, "
 "nội dung chèn và nhập vào)."
 
-#: src/setup/ncurses/wizard_curs.c:409
+#: src/setup/ncurses/wizard_curs.c:393
 #, fuzzy
 msgid "Daemon configuration: user account"
 msgstr "Không tạo được tài khoản người dùng:"
 
-#: src/setup/ncurses/wizard_curs.c:410
+#: src/setup/ncurses/wizard_curs.c:394
 msgid "As which user should gnunetd be run?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:411
+#: src/setup/ncurses/wizard_curs.c:396
 #, fuzzy
 msgid ""
 "For security reasons, it is a good idea to let this setup create a new user "
@@ -4000,15 +4002,15 @@
 "Để trống để chạy GNUnet với quyền hệ thống.\n"
 "Người dùng GNUnet:"
 
-#: src/setup/ncurses/wizard_curs.c:429
+#: src/setup/ncurses/wizard_curs.c:411
 msgid "Daemon configuration: group account"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:430
+#: src/setup/ncurses/wizard_curs.c:412
 msgid "As which group should gnunetd be run?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:431
+#: src/setup/ncurses/wizard_curs.c:414
 #, fuzzy
 msgid ""
 "For security reasons, it is a good idea to let this setup create a new group "
@@ -4031,11 +4033,11 @@
 "\n"
 "Nhóm GNUnet:"
 
-#: src/setup/ncurses/wizard_curs.c:444
+#: src/setup/ncurses/wizard_curs.c:428
 msgid "Do you want to automatically launch GNUnet as a system service?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:445
+#: src/setup/ncurses/wizard_curs.c:430
 #, fuzzy
 msgid ""
 "If you say \"yes\" here, the GNUnet background process will be automatically "
@@ -4047,129 +4049,123 @@
 "Nếu chọn \"yes\", tiến trình nền sau GNUnet sẽ tự động chạy khi bật máy "
 "tính. Nếu chọn \"no\", thì cần chạy GNUnet mỗi khi muốn sử dụng."
 
-#: src/setup/ncurses/wizard_curs.c:493
+#: src/setup/ncurses/wizard_curs.c:471
 #, fuzzy
 msgid "Unable to create user account for daemon."
 msgstr "Không tạo được tài khoản người dùng:"
 
-#: src/setup/ncurses/wizard_curs.c:507
+#: src/setup/ncurses/wizard_curs.c:478
 msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:521
+#: src/setup/ncurses/wizard_curs.c:493
 #, fuzzy
 msgid "Save configuration?"
 msgstr "Cấu hình GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:522
+#: src/setup/ncurses/wizard_curs.c:494
 #, fuzzy
 msgid "Save configuration now?"
 msgstr "Cấu hình GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:566
+#: src/setup/ncurses/wizard_curs.c:538
 msgid "Back"
 msgstr "Quay lại"
 
-#: src/setup/lib/gns.c:278
+#: src/setup/lib/gns.c:294
 #, c-format
 msgid ""
 "Configuration does not satisfy constraints of configuration specification "
 "file `%s'!\n"
 msgstr ""
 
-#: src/setup/lib/tree.c:189
+#: src/setup/lib/tree.c:190
 #, c-format
 msgid ""
 "Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:101
+#: src/setup/lib/wizard_util.c:110
 msgid "Can't open Service Control Manager"
 msgstr "Không mở được Trình Quản Lý Điều Khiển Dịch Vụ"
 
-#: src/setup/lib/wizard_util.c:106
+#: src/setup/lib/wizard_util.c:116
 msgid "Can't create service"
 msgstr "Không tạo được dịch vụ"
 
-#: src/setup/lib/wizard_util.c:111
+#: src/setup/lib/wizard_util.c:120
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr "Lỗi thay đổi quyền hạn của thư mục GNUnet"
 
-#: src/setup/lib/wizard_util.c:115
+#: src/setup/lib/wizard_util.c:125
 msgid "Cannot write to the regisitry"
 msgstr "Không ghi được tới bản ghi"
 
-#: src/setup/lib/wizard_util.c:118
+#: src/setup/lib/wizard_util.c:128
 msgid "Can't access the service"
 msgstr "Không truy cập được dịch vụ"
 
-#: src/setup/lib/wizard_util.c:122
+#: src/setup/lib/wizard_util.c:131
 msgid "Can't delete the service"
 msgstr "Không xóa được dịch vụ"
 
-#: src/setup/lib/wizard_util.c:126
+#: src/setup/lib/wizard_util.c:134
 msgid "Unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/setup/lib/wizard_util.c:159
+#: src/setup/lib/wizard_util.c:170
 msgid "This version of Windows does not support multiple users."
 msgstr "Phiên bản này của Windows không hỗ trợ nhiều người dùng."
 
-#: src/setup/lib/wizard_util.c:163
+#: src/setup/lib/wizard_util.c:174
 msgid "Error creating user"
 msgstr "Lỗi tạo người dùng"
 
-#: src/setup/lib/wizard_util.c:166
+#: src/setup/lib/wizard_util.c:178
 msgid "Error accessing local security policy"
 msgstr "Lỗi truy cập chính sách bảo mật nội bộ"
 
-#: src/setup/lib/wizard_util.c:169
+#: src/setup/lib/wizard_util.c:183
 msgid "Error granting service right to user"
 msgstr "Lỗi chuyển quyền hạn dịch vụ tới cho người dùng"
 
-#: src/setup/lib/wizard_util.c:172
+#: src/setup/lib/wizard_util.c:188
 msgid "Unknown error while creating a new user"
 msgstr "Lỗi không rõ khi tạo một người dùng mới"
 
-#: src/include/gnunet_util_getopt.h:150
+#: src/include/gnunet_util_getopt.h:153
 msgid "print this help"
 msgstr "in trợ giúp này"
 
-#: src/include/gnunet_util_getopt.h:159
+#: src/include/gnunet_util_getopt.h:162
 msgid "print the version number"
 msgstr "in số của phiên bản"
 
-#: src/include/gnunet_util_getopt.h:165
+#: src/include/gnunet_util_getopt.h:168
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:171
+#: src/include/gnunet_util_getopt.h:174
 msgid "be verbose"
 msgstr "thông báo chi tiết"
 
-#: src/include/gnunet_util_getopt.h:177
+#: src/include/gnunet_util_getopt.h:180
 msgid "use configuration file FILENAME"
 msgstr "dùng tập tin cấu hình FILENAME"
 
-#: src/include/gnunet_util_getopt.h:183
+#: src/include/gnunet_util_getopt.h:186
 msgid "specify host on which gnunetd is running"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:220
-#: src/include/gnunet_util_error.h:226 src/include/gnunet_util_error.h:236
-#: src/include/gnunet_util_error.h:242
+#: src/include/gnunet_util_error.h:212 src/include/gnunet_util_error.h:214
+#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:230
+#: src/include/gnunet_util_error.h:236
 #, fuzzy, c-format
 msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr "Xác nhận thất bại tại %s:%d.\n"
 
-#: src/include/gnunet_util_error.h:249 src/include/gnunet_util_error.h:256
-#: src/include/gnunet_util_error.h:263 src/include/gnunet_util_error.h:270
+#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
 #, 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:277 src/include/gnunet_util_error.h:284
-#, 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"
 
@@ -5092,6 +5088,35 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
+#~ msgid "specify nickname"
+#~ msgstr "chỉ ra tên nick"
+
+#~ msgid "Start GNUnet chat client."
+#~ msgstr "Chạy máy khách chát của GNUnet."
+
+#~ msgid "Could not connect to gnunetd.\n"
+#~ msgstr "Không kết nối được tới gnunetd.\n"
+
+#, fuzzy
+#~ msgid "You must specify a nickname (use option `%s').\n"
+#~ msgstr "Người dùng phải chỉ ra một tên nick (dùng tùy chọn '%s').\n"
+
+#~ msgid "Could not send join message to gnunetd\n"
+#~ msgstr "Không gửi được thông báo nhập join tới gnunetd\n"
+
+#~ msgid "Could not send message to gnunetd\n"
+#~ msgstr "Không gửi được thông báo tới gnunetd\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s "
+#~ "DG/%s\n"
+#~ msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
+
+#, fuzzy
+#~ msgid "Database failed to delete `%s'.\n"
+#~ msgstr "Cơ sở dữ liệu xóa %s không thành công.\n"
+
 #~ msgid "GNUnet configuration assistant"
 #~ msgstr "Trình giúp cấu hình GNUnet"
 
@@ -5547,9 +5572,6 @@
 #~ 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"
 
-#~ msgid "Failed to deliver '%s' message.\n"
-#~ msgstr "Phân phát tin nhắn '%s' không thành công.\n"
-
 #~ 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"
 





reply via email to

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