gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r5851 - in GNUnet: . m4 po src/applications/topology_defaul


From: gnunet
Subject: [GNUnet-SVN] r5851 - in GNUnet: . m4 po src/applications/topology_default src/util/os
Date: Sun, 9 Dec 2007 20:20:14 -0700 (MST)

Author: grothoff
Date: 2007-12-09 20:20:09 -0700 (Sun, 09 Dec 2007)
New Revision: 5851

Modified:
   GNUnet/configure.ac
   GNUnet/m4/Makefile.in
   GNUnet/po/GNUnet.pot
   GNUnet/po/POTFILES.in
   GNUnet/po/de.po
   GNUnet/po/es.po
   GNUnet/po/rw.po
   GNUnet/po/sv.po
   GNUnet/po/vi.po
   GNUnet/src/applications/topology_default/topology.c
   GNUnet/src/util/os/daemon.c
Log:
warning

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2007-12-10 02:47:03 UTC (rev 5850)
+++ GNUnet/configure.ac 2007-12-10 03:20:09 UTC (rev 5851)
@@ -74,12 +74,19 @@
      build_target="macosx"
      LIBPREFIX=
      DLLDIR=lib
+     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+     QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     QTBIN="$QTDIR/bin"
      ;;
 linux*)
      AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
      build_target="linux"
      LIBPREFIX=
      DLLDIR=lib
+     AC_PATH_XTRA
+     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+     QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     QTBIN="$QTDIR/bin"
      ;;
 freebsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
@@ -88,6 +95,9 @@
      build_target="freebsd"
      LIBPREFIX=
      DLLDIR=lib
+     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+     QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     QTBIN="$QTDIR/bin"
      ;;
 openbsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
@@ -96,12 +106,18 @@
      build_target="openbsd"
      LIBPREFIX=
      DLLDIR=lib
+     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+     QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     QTBIN="$QTDIR/bin"
      ;;
 netbsd*)
      AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
      AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system])
      LIBPREFIX=
      DLLDIR=lib
+     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+     QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     QTBIN="$QTDIR/bin"
      ;;
 *solaris*)
      AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system])
@@ -111,6 +127,9 @@
      build_target="solaris"
      LIBPREFIX=
      DLLDIR=lib
+     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+     QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     QTBIN="$QTDIR/bin"
      ;;
 *arm-linux*)
      AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
@@ -118,6 +137,9 @@
      build_target="linux"
      LIBPREFIX=
      DLLDIR=lib
+     QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore 
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+     QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore 
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB 
-DQT_SHARED"
+     QTBIN="$QTDIR/bin"
      ;;
 *cygwin*)
      AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
@@ -129,6 +151,9 @@
      LIBPREFIX=lib
      DLLDIR=bin
      AC_PROG_CXX
+     QTLIBS="-L$QTDIR/lib -lopengl32 -lglu32 -lgdi32 -luser32 -lmingw32 
-lqtmain -lQtOpenGL4 -lQtGui4 -lQtCore4 -mthreads -Wl,-enable-stdcall-fixup 
-Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -Wl,-s -Wl,-s 
-Wl,-subsystem,windows"
+     QTINC="-I$QTDIR/include -I$QTDIR/include/QtCore -I$QTDIR/include/QtGui 
-I$QTDIR/include/QtOpenGL -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL 
-DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT 
-DQT_NEEDS_QMAIN -frtti -fexceptions"
+     QTBIN="$QTDIR/bin"
      ;;
 *mingw*)
      AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
@@ -141,6 +166,9 @@
      AC_PROG_CXX
      LIBPREFIX=lib
      DLLDIR=bin
+     QTLIBS="-L$QTDIR/lib -lopengl32 -lglu32 -lgdi32 -luser32 -lmingw32 
-lqtmain -lQtOpenGL4 -lQtGui4 -lQtCore4 -mthreads -Wl,-enable-stdcall-fixup 
-Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -Wl,-s -Wl,-s 
-Wl,-subsystem,windows"
+     QTINC="-I$QTDIR/include -I$QTDIR/include/QtCore -I$QTDIR/include/QtGui 
-I$QTDIR/include/QtOpenGL -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL 
-DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT 
-DQT_NEEDS_QMAIN -frtti -fexceptions"
+     QTBIN="$QTDIR/bin"
      ;;
 *)
      AC_MSG_RESULT(Unrecognised OS $host_os)
@@ -170,9 +198,6 @@
 AC_CHECK_LIB(m, log)
 AC_CHECK_LIB(c, getloadavg, AC_DEFINE(HAVE_GETLOADAVG,1,[getloadavg 
supported]))
 
-# test for qmake
-AC_CHECK_PROG([QMAKE], [qmake-qt4], [qmake-qt4], [qmake])
-
 # 'save' libs; only those libs found so far will be
 # linked against _everywhere_.  For the others, we
 # will be more selective!
@@ -432,45 +457,111 @@
 
 # check for Qt 4
 AC_LANG_PUSH([C++])
-qt=0
+qt=1
 AC_MSG_CHECKING(for Qt)
-AC_ARG_WITH(qt,
-   [  --with-qt=PFX    Base of Qt installation],
-   [AC_MSG_RESULT([$with_qt])
-    case $with_qt in
-      no)
-        ;;
-      yes)
-        AC_CHECK_HEADERS([Qt/qpixmap.h],
-          AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv],
-            qt=1,
-              AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
-              qt=1)))
-        ;;
-      *)
-        LDFLAGS="-L$with_qt/lib $LDFLAGS"
-        CPPFLAGS="-I$with_qt/include -I$with_qt/include/qt4 $CPPFLAGS"
-        AC_CHECK_HEADERS([Qt/qpixmap.h],
-          AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv],
-            EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
-            qt=1,
-              AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
-              EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
-              qt=1)))
-        ;;
-    esac
-   ],
-   [AC_MSG_RESULT([--with-qt not specified])
-    LDFLAGS="-L/usr/lib $LDFLAGS"
-    CPPFLAGS="-I/usr/include -I/usr/include/qt4 $CPPFLAGS"    
-    AC_CHECK_HEADERS([Qt/qpixmap.h],
-          AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv],
-            EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
-            qt=1,
-              AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
-              EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
-              qt=1)))])
+# Verbatim from http://qtnode.net/wiki?title=Qt_with_autotools
+AC_MSG_CHECKING(QT4.1 directory)
+QTDIR=xxx
+AC_ARG_WITH([qt-dir],
+             AC_HELP_STRING([--with-qt-dir=/path/to/Qt-4.1.0],
+                            [to specify the path to the Qt-4.1.0 directory.]),
+             [QTPATHS="$withval"],
+             [QTPATHS="/usr/local/Trolltech/Qt-4.1.0 /c/Qt/4.1.0"])
 
+for x in $QTPATHS; do
+    if test -d $x ; then
+       QTDIR="$x"
+    fi
+done
+if test $QTDIR = xxx ; then
+   AC_MSG_RESULT(Could not locate QT 4.1)
+   qt=0
+fi
+AC_MSG_RESULT($QTDIR)
+
+LIBS="$LIBS $QTLIBS"
+INCLUDES="$INCLUDES $QTINC"
+PATH="$PATH:$QTBIN"
+CXXFLAGS="$CXXFLAGS $QTINC"
+AC_SUBST(QTINC)
+AC_SUBST(QTLIBS)
+
+# Now we check whether we can actually build a Qt app.
+cat > myqt.h << EOF
+#include <QObject>
+class Test : public QObject
+{
+Q_OBJECT
+public:
+  Test() {}
+  ~Test() {}
+public slots:
+  void receive() {}
+signals:
+  void send();
+};
+EOF
+
+cat > myqt.cpp << EOF
+#include "myqt.h"
+#include <QApplication>
+int main( int argc, char **argv )
+{
+  QApplication app( argc, argv );
+  Test t;
+  QObject::connect( &t, SIGNAL(send()), &t, SLOT(receive()) );
+}
+EOF
+
+AC_MSG_CHECKING(does moc work?)
+bnv_try_1="moc myqt.h -o moc_myqt.cpp"
+AC_TRY_EVAL(bnv_try_1)
+if test x"$ac_status" != x0; then
+   AC_MSG_RESULT(moc doesn't work)
+   qt=0
+else
+   AC_MSG_RESULT(yes)
+fi
+AC_MSG_CHECKING(can I compile moc_myqt.cpp?)
+bnv_try_2="$CXX -c $CXXFLAGS -o moc_myqt.o moc_myqt.cpp"
+AC_TRY_EVAL(bnv_try_2)
+if test x"$ac_status" != x0; then
+   AC_MSG_RESULT(couldn't compile moc_myqt.cpp)
+   qt=0
+else
+   AC_MSG_RESULT(yes)
+fi
+AC_MSG_CHECKING(can I compile myqt.cpp?)
+bnv_try_3="$CXX $QTINC -c $CXXFLAGS -o myqt.o myqt.cpp"
+AC_TRY_EVAL(bnv_try_3)
+if test x"$ac_status" != x0; then
+   AC_MSG_RESULT(couldn't compile myqt.cpp)
+   qt=0
+else
+   AC_MSG_RESULT(yes)
+fi
+AC_MSG_CHECKING(can I link against QT?)
+nv_try_4="$CXX $LIBS -o myqt myqt.o moc_myqt.o"
+AC_TRY_EVAL(bnv_try_4)
+if test x"$ac_status" != x0; then
+   AC_MSG_RESULT(couldn't link)
+   qt=0
+else
+   AC_MSG_RESULT(yes)
+fi
+
+AC_MSG_CHECKING(for mkoctfile)
+AC_TRY_EVAL(mkoctfile)
+if test x"$ac_status" != x0; then
+   AC_MSG_RESULT(mkoctfile is not in the path)
+   qt=0
+else
+  AC_MSG_RESULT(yes)
+fi
+rm -f moc_myqt.cpp myqt.h myqt.cpp myqt.o myqt moc_myqt.o
+
+
+
 # libmicrohttpd
 lmhd=0
 AC_MSG_CHECKING([for libmicrohttpd])
@@ -759,7 +850,7 @@
 src/setup/Makefile
 src/setup/lib/Makefile
 src/setup/gtk/Makefile
-src/setup/qt/qt.pro
+src/setup/qt/Makefile
 src/setup/ncurses/Makefile
 src/setup/text/Makefile
 src/server/Makefile
@@ -785,15 +876,6 @@
 ])
 AC_OUTPUT
 
-if test "$qt" = 1
-then
-       AC_MSG_NOTICE([Running qmake])
-       PWD=$(pwd)
-       cd src/setup/qt
-       MINGW_IN_SHELL=1 $QMAKE qt.pro -unix -recursive
-       cd $PWD
-fi
-
 # Finally: summary!
 
 # warn user if mysql found but not used due to version

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2007-12-10 02:47:03 UTC (rev 5850)
+++ GNUnet/m4/Makefile.in       2007-12-10 03:20:09 UTC (rev 5851)
@@ -131,7 +131,8 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
-QMAKE = @QMAKE@
+QTINC = @QTINC@
+QTLIBS = @QTLIBS@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -141,9 +142,14 @@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
 XML2_CONFIG = @XML2_CONFIG@
 XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
 _libcurl_config = @_libcurl_config@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2007-12-10 02:47:03 UTC (rev 5850)
+++ GNUnet/po/GNUnet.pot        2007-12-10 03:20:09 UTC (rev 5851)
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <address@hidden>, YEAR.
 #
-#: contrib/config-daemon.scm:555
+#: contrib/config-daemon.scm:584
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-09-29 16:48-0600\n"
+"POT-Creation-Date: 2007-12-09 19:48-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -17,1498 +17,1625 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/transports/ip6.c:75 src/util/network/io.c:85
+#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:541
+#: src/transports/http.c:1320 src/transports/http.c:1413
+#: src/transports/http.c:1588 src/transports/http.c:2014
+#: src/transports/http.c:2075 src/applications/bootstrap_http/http.c:123
+#: src/applications/bootstrap_http/http.c:257
+#: src/applications/bootstrap_http/http.c:274
+#: src/applications/bootstrap_http/http.c:306
+#: src/applications/bootstrap_http/http.c:325
+#: src/applications/bootstrap_http/http.c:338
+#: src/applications/bootstrap_http/http.c:348
+#: src/applications/bootstrap_http/http.c:358
 #, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr ""
+
+#: src/transports/upnp/upnp.c:431
+#, c-format
+msgid "%s failed for url `%s' and post-data `%s' at %s:%d: `%s'\n"
+msgstr ""
+
+#: src/transports/upnp/upnp.c:476
+#, c-format
+msgid "upnp: NAT Returned IP: %s\n"
+msgstr ""
+
+#: src/transports/ip6.c:77 src/util/network/io.c:86
+#, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:104 src/util/network/ip.c:84 src/util/network/ip.c:146
+#: src/transports/ip6.c:109 src/util/network/ip.c:87 src/util/network/ip.c:151
 #, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr ""
 
-#: src/transports/ip6.c:135 src/util/network/ip.c:115
-#: src/util/network/ip.c:221
+#: src/transports/ip6.c:140 src/util/network/ip.c:118
+#: src/util/network/ip.c:237
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 
-#: src/transports/ip6.c:167
+#: src/transports/ip6.c:174
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:219 src/transports/ip.c:60
+#: src/transports/ip6.c:228 src/transports/ip.c:61
 #, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr ""
 
-#: src/transports/udp6.c:123 src/transports/udp.c:129
+#: src/transports/tcp6.c:249
+msgid "Could not determine my public IPv6 address.\n"
+msgstr ""
+
+#: src/transports/tcp6.c:317
 #, c-format
+msgid "`%s': unknown service: %s\n"
+msgstr ""
+
+#: src/transports/tcp6.c:420 src/transports/tcp.c:462
+#, c-format
+msgid "Failed to start transport service on port %d.\n"
+msgstr ""
+
+#: src/transports/tcp6.c:531
+msgid "# bytes received via TCP6"
+msgstr ""
+
+#: src/transports/tcp6.c:532
+msgid "# bytes sent via TCP6"
+msgstr ""
+
+#: src/transports/tcp6.c:534
+msgid "# bytes dropped by TCP6 (outgoing)"
+msgstr ""
+
+#: src/transports/udp6.c:131 src/transports/udp.c:135
+#, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr ""
 
-#: src/transports/udp6.c:264
+#: src/transports/udp6.c:277
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/udp6.c:471 src/transports/udp.c:520
+#: src/transports/udp6.c:495 src/transports/udp.c:544
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/udp6.c:476
+#: src/transports/udp6.c:501
 msgid "# bytes received via UDP6"
 msgstr ""
 
-#: src/transports/udp6.c:477
+#: src/transports/udp6.c:502
 msgid "# bytes sent via UDP6"
 msgstr ""
 
-#: src/transports/udp6.c:479
+#: src/transports/udp6.c:504
 msgid "# bytes dropped by UDP6 (outgoing)"
 msgstr ""
 
-#: src/transports/udp6.c:481
+#: src/transports/udp6.c:506
 msgid "# UDP6 connections (right now)"
 msgstr ""
 
-#: src/transports/http.c:824
+#: src/transports/http.c:875
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/http.c:1235 src/transports/http.c:1309
-#: src/transports/http.c:1464 src/transports/http.c:1858
-#: src/transports/http.c:1894 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:540 src/applications/bootstrap_http/http.c:122
-#: src/applications/bootstrap_http/http.c:254
-#: src/applications/bootstrap_http/http.c:270
-#: src/applications/bootstrap_http/http.c:301
-#: src/applications/bootstrap_http/http.c:320
-#: src/applications/bootstrap_http/http.c:333
-#: src/applications/bootstrap_http/http.c:343
-#: src/applications/bootstrap_http/http.c:353
-#, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr ""
-
-#: src/transports/http.c:2080
+#: src/transports/http.c:2290
 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:2089
+#: src/transports/http.c:2299
 msgid "# bytes received via HTTP"
 msgstr ""
 
-#: src/transports/http.c:2090
+#: src/transports/http.c:2300
 msgid "# bytes sent via HTTP"
 msgstr ""
 
-#: src/transports/http.c:2092
+#: src/transports/http.c:2302
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: 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:358
+#: src/transports/smtp.c:362
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/transports/smtp.c:463
-msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
+#: src/transports/smtp.c:454
+msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transports/smtp.c:471
+#: src/transports/smtp.c:464
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transports/smtp.c:571
+#: src/transports/smtp.c:552 src/transports/smtp.c:563
+#: src/transports/smtp.c:577 src/transports/smtp.c:597
+#: src/transports/smtp.c:622 src/transports/smtp.c:631
+#: src/transports/smtp.c:645 src/transports/smtp.c:657
 #, c-format
-msgid "Failed to initialize libesmtp: %s.\n"
+msgid "SMTP: `%s' failed: %s.\n"
 msgstr ""
 
-#: src/transports/smtp.c:630
-#, c-format
-msgid "Sending E-mail to `%s' failed.\n"
+#: src/transports/smtp.c:802
+msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transports/smtp.c:702
-#, c-format
-msgid "%.*s filter %s (SMTP)"
+#: src/transports/smtp.c:815
+msgid "# bytes received via SMTP"
 msgstr ""
 
-#: src/transports/smtp.c:730
-#, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+#: src/transports/smtp.c:816
+msgid "# bytes sent via SMTP"
 msgstr ""
 
-#: src/transports/tcp.c:290
+#: src/transports/smtp.c:818
+msgid "# bytes dropped by SMTP (outgoing)"
+msgstr ""
+
+#: src/transports/tcp_helper.c:260
+msgid "Received malformed message instead of welcome message. Closing.\n"
+msgstr ""
+
+#: src/transports/tcp_helper.c:279
+msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgstr ""
+
+#: src/transports/tcp.c:296
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/tcp.c:389
+#: src/transports/tcp.c:401
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/transports/tcp.c:442 src/transports/tcp6.c:404
-#, c-format
-msgid "Failed to start transport service on port %d.\n"
-msgstr ""
-
-#: src/transports/tcp.c:561
+#: src/transports/tcp.c:584
 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:570
+#: src/transports/tcp.c:593
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:571
+#: src/transports/tcp.c:594
 msgid "# bytes sent via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:573
+#: src/transports/tcp.c:596
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:288
+#: src/transports/udp.c:301
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/udp.c:384
+#: src/transports/udp.c:400
 #, 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:535
+#: src/transports/udp.c:560
 msgid "# bytes received via UDP"
 msgstr ""
 
-#: src/transports/udp.c:536
+#: src/transports/udp.c:561
 msgid "# bytes sent via UDP"
 msgstr ""
 
-#: src/transports/udp.c:538
+#: src/transports/udp.c:563
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:540
+#: src/transports/udp.c:565
 msgid "# UDP connections (right now)"
 msgstr ""
 
-#: src/transports/tcp6.c:245
-msgid "Could not determine my public IPv6 address.\n"
+#: src/transports/udp_helper.c:96
+msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr ""
 
-#: src/transports/tcp6.c:312
-#, c-format
-msgid "`%s': unknown service: %s\n"
+#: src/setup/ncurses/mconf.c:86
+msgid "Exit"
 msgstr ""
 
-#: src/transports/tcp6.c:512
-msgid "# bytes received via TCP6"
+#: src/setup/ncurses/mconf.c:89
+msgid "Up"
 msgstr ""
 
-#: src/transports/tcp6.c:513
-msgid "# bytes sent via TCP6"
+#: src/setup/ncurses/mconf.c:92 src/setup/gtk/gnunet-setup.glade:136
+#: src/setup/gtk/gnunet-setup.glade:404 src/setup/gtk/gnunet-setup.glade:814
+#: src/setup/gtk/gnunet-setup.glade:1147 src/setup/gtk/gnunet-setup.glade:1431
+msgid "Cancel"
 msgstr ""
 
-#: src/transports/tcp6.c:515
-msgid "# bytes dropped by TCP6 (outgoing)"
+#: src/setup/ncurses/mconf.c:183 src/setup/ncurses/mconf.c:288
+#: src/setup/ncurses/mconf.c:371 src/setup/ncurses/mconf.c:471
+#: src/setup/ncurses/wizard_curs.c:111 src/setup/ncurses/wizard_curs.c:176
+#: src/setup/ncurses/wizard_curs.c:292
+msgid "Internal error! (Choice invalid?)"
 msgstr ""
 
-#: src/transports/tcp_helper.c:257
-msgid "Received malformed message instead of welcome message. Closing.\n"
+#: src/setup/ncurses/mconf.c:219 src/setup/ncurses/mconf.c:418
+msgid "Internal error! (Value invalid?)"
 msgstr ""
 
-#: src/transports/tcp_helper.c:276
-msgid "Received malformed message from tcp-peer connection. Closing.\n"
+#: src/setup/ncurses/mconf.c:404
+msgid "Invalid input, expecting floating point value."
 msgstr ""
 
-#: src/transports/upnp/upnp.c:429
-#, c-format
-msgid "%s failed for url `%s' and post-data `%s' at %s:%d: `%s'\n"
+#: src/setup/ncurses/mconf.c:450
+msgid "Invalid input, expecting integer."
 msgstr ""
 
-#: src/transports/upnp/upnp.c:475
-#, c-format
-msgid "upnp: NAT Returned IP: %s\n"
+#: src/setup/ncurses/mconf.c:458
+msgid "Value is not in legal range."
 msgstr ""
 
-#: src/transports/udp_helper.c:96
-msgid "Received malformed message from udp-peer connection. Closing.\n"
+#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:527
+msgid "GNUnet Configuration"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:55
-msgid "Query (get KEY, put KEY VALUE) DHT table."
+#: src/setup/ncurses/mconf.c:527 src/setup/text/conf.c:569
+#, c-format
+msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:60
-msgid ""
-"allow TIME ms to process a GET command or expire PUT content after ms TIME"
+#: src/setup/ncurses/mconf.c:533
+msgid "Do you wish to save your new configuration?"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:99
+#: src/setup/ncurses/mconf.c:547
 #, c-format
-msgid "%s(%s) operation returned no results.\n"
+msgid ""
+"\n"
+"End of configuration.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:116
+#: src/setup/ncurses/mconf.c:552
 #, c-format
-msgid "Issuing '%s(%s,%s)' command.\n"
+msgid ""
+"\n"
+"Your configuration changes were NOT saved.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:123
-#, c-format
-msgid "'%s(%s,%s)' succeeded\n"
+#: src/setup/ncurses/wizard_curs.c:65 src/setup/lib/wizard_util.c:140
+#: src/setup/lib/wizard_util.c:195
+msgid "Error"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:127
-#, c-format
-msgid "'%s(%s,%s)' failed.\n"
+#: src/setup/ncurses/wizard_curs.c:73 src/setup/gtk/gconf.c:444
+msgid "Help"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:151
-#, c-format
-msgid "Failed to connect to gnunetd.\n"
+#: src/setup/ncurses/wizard_curs.c:80
+msgid "Error!"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:164
-#, c-format
-msgid "Command `%s' requires an argument (`%s').\n"
+#: src/setup/ncurses/wizard_curs.c:94 src/applications/vpn/vpn.c:1454
+msgid "No"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:181
-#, c-format
-msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
+#: src/setup/ncurses/wizard_curs.c:95 src/applications/vpn/vpn.c:1454
+msgid "Yes"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:192
-#, c-format
-msgid "Unsupported command `%s'.  Aborting.\n"
+#: src/setup/ncurses/wizard_curs.c:143
+msgid "Abort"
 msgstr ""
 
-#: src/applications/dht/module/table.c:716
-msgid "# dht connections"
+#: src/setup/ncurses/wizard_curs.c:144
+msgid "Ok"
 msgstr ""
 
-#: src/applications/dht/module/table.c:718
-msgid "# dht discovery messages received"
+#: src/setup/ncurses/wizard_curs.c:211 src/setup/ncurses/wizard_curs.c:277
+#: src/setup/ncurses/wizard_curs.c:418
+msgid "GNUnet configuration"
 msgstr ""
 
-#: src/applications/dht/module/table.c:720
-msgid "# dht route host lookups performed"
+#: src/setup/ncurses/wizard_curs.c:213
+msgid ""
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org/\n";
+"and join our community at\n"
+"\thttp://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"the GNUnet team"
 msgstr ""
 
-#: src/applications/dht/module/table.c:722
-msgid "# dht discovery messages sent"
+#: src/setup/ncurses/wizard_curs.c:279
+msgid ""
+"Choose the network interface that connects your computer to the internet "
+"from the list below."
 msgstr ""
 
-#: src/applications/dht/module/cs.c:128
-#, c-format
-msgid "`%s' failed. Terminating connection to client.\n"
+#: src/setup/ncurses/wizard_curs.c:297 src/setup/ncurses/wizard_curs.c:311
+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/applications/dht/module/cs.c:233
-#, c-format
-msgid "`%s' registering client handlers: %d %d\n"
+#: src/setup/ncurses/wizard_curs.c:308
+msgid "Network configuration: interface"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:251
-msgid "Enables efficient non-anonymous routing"
+#: src/setup/ncurses/wizard_curs.c:310
+msgid ""
+"What is the name of the network interface that connects your computer to the "
+"Internet?"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:736
-msgid "# dht replies routed"
+#: src/setup/ncurses/wizard_curs.c:321
+msgid "Network configuration: IP"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:738
-msgid "# dht requests routed"
+#: src/setup/ncurses/wizard_curs.c:323
+msgid "What is this computer's public IP address or hostname?"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:740
-msgid "# dht get requests received"
+#: src/setup/ncurses/wizard_curs.c:324
+msgid ""
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If left empty, GNUnet will try to automatically detect the IP.\n"
+"You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
+"If in doubt, leave this empty."
 msgstr ""
 
-#: src/applications/dht/module/routing.c:742
-msgid "# dht put requests received"
+#: src/setup/ncurses/wizard_curs.c:339
+msgid "Bandwidth configuration: upload"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:744
-msgid "# dht results received"
+#: src/setup/ncurses/wizard_curs.c:341
+msgid "How much upstream bandwidth (in bytes/s) may be used?"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:748
-#, c-format
-msgid "`%s' registering p2p handlers: %d %d %d\n"
+#: src/setup/ncurses/wizard_curs.c:342
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
+"you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
 msgstr ""
 
-#: src/applications/chat/chat.c:88
-msgid "Message received from peer is invalid.\n"
+#: src/setup/ncurses/wizard_curs.c:354
+msgid "Bandwidth configuration: download"
 msgstr ""
 
-#: src/applications/chat/chat.c:135
-msgid "Message received from client is invalid\n"
+#: src/setup/ncurses/wizard_curs.c:356
+msgid "How much downstream bandwidth (in bytes/s) may be used?"
 msgstr ""
 
-#: src/applications/chat/chat.c:155
-msgid "Maximum number of chat clients reached.\n"
+#: src/setup/ncurses/wizard_curs.c:357
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
+"If you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
 msgstr ""
 
-#: src/applications/chat/chat.c:160
-#, c-format
-msgid "Now %d of %d chat clients at this node.\n"
+#: src/setup/ncurses/wizard_curs.c:369
+msgid "Quota configuration"
 msgstr ""
 
-#: src/applications/chat/chat.c:202
-#, c-format
-msgid "`%s' registering handlers %d and %d\n"
+#: src/setup/ncurses/wizard_curs.c:370
+msgid "What is the maximum size of the datastore in MB?"
 msgstr ""
 
-#: src/applications/chat/chat.c:219
-msgid "enables P2P-chat (incomplete)"
+#: src/setup/ncurses/wizard_curs.c:371
+msgid ""
+"The GNUnet datastore contains all content that GNUnet needs to store "
+"(indexed, inserted and migrated content)."
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:45
-msgid "Join a chat on GNUnet."
+#: src/setup/ncurses/wizard_curs.c:383
+msgid "Daemon configuration: user account"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:49
-msgid "set the nickname to use (requred)"
+#: src/setup/ncurses/wizard_curs.c:384
+msgid "As which user should gnunetd be run?"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:52
-msgid "set the chat room to join (requred)"
+#: src/setup/ncurses/wizard_curs.c:386
+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"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the field empty to run GNUnet with system privileges.\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:134
-#, c-format
-msgid "You must specify a nickname\n"
+#: src/setup/ncurses/wizard_curs.c:403
+msgid "Daemon configuration: group account"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:144
-#, c-format
-msgid "Failed to join the room\n"
+#: src/setup/ncurses/wizard_curs.c:404
+msgid "As which group should gnunetd be run?"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:160
-#, c-format
-msgid "Failed to send message.\n"
+#: src/setup/ncurses/wizard_curs.c:406
+msgid ""
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
+"\n"
+"You can also specify a already existant group here.\n"
+"\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:193
+#: src/setup/ncurses/wizard_curs.c:420
+msgid "Do you want to automatically launch GNUnet as a system service?"
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:422
+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:445 src/setup/gtk/wizard_gtk.c:415
 #, c-format
-msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
+msgid "Unable to save configuration file `%s':"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:203
-msgid "HELLO message has expiration too far in the future. Dropping.\n"
+#: src/setup/ncurses/wizard_curs.c:464
+msgid "Unable to create user account for daemon."
 msgstr ""
 
-#: src/applications/advertising/advertising.c:374
-msgid "Could not send HELLO+PING, ping buffer full.\n"
+#: src/setup/ncurses/wizard_curs.c:471
+msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/applications/advertising/advertising.c:396
-msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
+#: src/setup/ncurses/wizard_curs.c:486
+msgid "Save configuration?"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:544
-#, c-format
-msgid "Advertising my transport %d to selected peers.\n"
+#: src/setup/ncurses/wizard_curs.c:487
+msgid "Save configuration now?"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:553
-msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
+#: src/setup/ncurses/wizard_curs.c:531 src/setup/gtk/gnunet-setup.glade:723
+#: src/setup/gtk/gnunet-setup.glade:1056 src/setup/gtk/gnunet-setup.glade:1340
+msgid "Back"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:817
-msgid "# Peer advertisements received"
+#: src/setup/text/conf.c:79
+msgid "yes"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:820
-msgid "# Peer advertisements of type NAT received"
+#: src/setup/text/conf.c:80
+msgid "no"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:823
-msgid "# Peer advertisements confirmed via PONG"
+#: src/setup/text/conf.c:106
+#, c-format
+msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/applications/advertising/advertising.c:827
-msgid "# Peer advertisements updating earlier HELLOs"
+#: src/setup/text/conf.c:115
+msgid "\tPossible choices:\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:830
-msgid "# Peer advertisements discarded due to load"
+#: src/setup/text/conf.c:123
+msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:834
-msgid "# Peer advertisements for unsupported transport"
+#: src/setup/text/conf.c:125
+#, c-format
+msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/applications/advertising/advertising.c:838
-msgid "# Peer advertisements not confirmed due to ping busy"
+#: src/setup/text/conf.c:143
+#, c-format
+msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/applications/advertising/advertising.c:842
-msgid "# Peer advertisements not confirmed due to lack of self ad"
+#: src/setup/text/conf.c:147
+#, c-format
+msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/applications/advertising/advertising.c:846
-msgid "# Peer advertisements not confirmed due to send error"
+#: src/setup/text/conf.c:153
+#, c-format
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
 msgstr ""
 
-#: src/applications/advertising/advertising.c:848
-msgid "# Self advertisments transmitted"
+#: src/setup/text/conf.c:187
+#, c-format
+msgid "Yes\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:850
-msgid "# Foreign advertisements forwarded"
+#: src/setup/text/conf.c:192
+#, c-format
+msgid "No\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:852
-#: src/applications/pingpong/pingpong.c:509
-msgid "# plaintext PING messages sent"
+#: src/setup/text/conf.c:195 src/setup/text/conf.c:236
+#: src/setup/text/conf.c:266 src/setup/text/conf.c:329
+#: src/setup/text/conf.c:387
+#, c-format
+msgid "Help\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:857
-#: src/applications/session/connect.c:913
+#: src/setup/text/conf.c:198 src/setup/text/conf.c:213
+#: src/setup/text/conf.c:276 src/setup/text/conf.c:307
+#: src/setup/text/conf.c:365
 #, c-format
-msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
+msgid "Abort\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:872
+#: src/setup/text/conf.c:354 src/setup/text/conf.c:416
+#, c-format
 msgid ""
-"ensures that this peer is known by other peers and discovers other peers"
+"\n"
+"Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/applications/topology_default/topology.c:467
-msgid "maintains GNUnet default mesh topology"
+#: src/setup/text/conf.c:422
+#, c-format
+msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:132
-#: src/applications/pingpong/pingpong.c:199
-#: src/applications/pingpong/pingpong.c:264
-#: src/applications/pingpong/pingpong.c:331
-#, c-format
-msgid "Received malformed `%s' message. Dropping.\n"
+#: src/setup/text/conf.c:484
+msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:143
-msgid "Received ping for another peer. Dropping.\n"
+#: src/setup/text/conf.c:493
+msgid "Aborted.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:209
-msgid "Received PING not destined for us!\n"
+#: src/setup/text/conf.c:506
+msgid "Invalid entry.\n"
 msgstr ""
 
-#: 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"
+#: src/setup/text/conf.c:524
+#, c-format
+msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:409
-msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
+#: src/setup/text/conf.c:556
+#, c-format
+msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:499
-msgid "# encrypted PONG messages received"
+#: src/setup/text/conf.c:557
+#, c-format
+msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:501
-msgid "# plaintext PONG messages received"
+#: src/setup/text/conf.c:575
+#, c-format
+msgid ""
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:503
-msgid "# encrypted PING messages received"
+#: src/setup/text/conf.c:590
+#, c-format
+msgid "Configuration was unchanged, no need to save.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:505
-msgid "# PING messages created"
+#: src/setup/text/conf.c:599
+#, c-format
+msgid "Configuration file `%s' written.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:507
-#: src/applications/session/connect.c:908
-msgid "# encrypted PONG messages sent"
+#: src/setup/gtk/wizard_gtk.c:141
+msgid "(unknown connection)"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:511
-#: src/applications/session/connect.c:906
-msgid "# encrypted PING messages sent"
+#: src/setup/gtk/wizard_gtk.c:439
+msgid "Do you want to save the new configuration?"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:513
-msgid "# plaintext PONG messages sent"
+#: src/setup/gtk/wizard_gtk.c:471
+msgid "Unable to create user account:"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:517
-msgid "# plaintext PONG transmissions failed"
+#: src/setup/gtk/wizard_gtk.c:479
+msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:526
-#, c-format
-msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
+#: src/setup/gtk/wizard_gtk.c:494
+msgid ""
+"Running gnunet-update failed.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
+"Finally, run gnunet-update manually."
 msgstr ""
 
-#: 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:470
-#: src/applications/sqstore_mysql/mysql.c:480
-#: src/applications/sqstore_mysql/mysql.c:518
-#: src/applications/sqstore_mysql/mysql.c:528
-#: src/applications/sqstore_mysql/mysql.c:560
-#: src/applications/sqstore_mysql/mysql.c:571
-#: src/applications/sqstore_mysql/mysql.c:669
-#: src/applications/sqstore_mysql/mysql.c:681
-#: src/applications/sqstore_mysql/mysql.c:693
-#: src/applications/sqstore_mysql/mysql.c:707
-#: src/applications/sqstore_mysql/mysql.c:804
-#: src/applications/sqstore_mysql/mysql.c:818
-#: src/applications/sqstore_mysql/mysql.c:968
-#: src/applications/sqstore_mysql/mysql.c:980
-#: src/applications/sqstore_mysql/mysql.c:992
-#: src/applications/sqstore_mysql/mysql.c:1232
-#: src/applications/sqstore_mysql/mysql.c:1244
-#: src/applications/sqstore_mysql/mysql.c:1256
-#: src/applications/sqstore_mysql/mysql.c:1341
-#: src/applications/kvstore_sqlite/kv_sqlite.c:44
-#: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:99
-#: src/applications/dstore/dstore.c:195 src/applications/dstore/dstore.c:234
-#: src/applications/dstore/dstore.c:253 src/applications/dstore/dstore.c:308
-#: src/applications/dstore/dstore.c:326 src/applications/dstore/dstore.c:337
-#: src/applications/dstore/dstore.c:368 src/applications/dstore/dstore.c:459
-#: 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"
+#: src/setup/gtk/ngconf.c:383 src/setup/gtk/gconf.c:492
+msgid "Configuration saved."
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:193
-#, c-format
-msgid "Unable to initialize SQLite: %s.\n"
+#: src/setup/gtk/ngconf.c:393 src/setup/gtk/gconf.c:502
+msgid "Failed to save configuration."
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:393
-#, c-format
-msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
+#: src/setup/gtk/ngconf.c:418 src/setup/gtk/gconf.c:528
+msgid "Configuration changed. Save?"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:394
-#: src/applications/sqstore_sqlite/sqlite.c:431
-msgid "sqlite datastore"
+#: src/setup/gtk/ngconf.c:431 src/setup/gtk/gconf.c:541
+msgid "Error saving configuration."
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:430
-#, c-format
-msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
+#: src/setup/gtk/gconf.c:389
+msgid "Description"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1276
-#: src/applications/sqstore_mysql/mysql.c:1449
-msgid "# bytes in datastore"
+#: src/setup/gtk/gconf.c:405
+msgid "Value"
 msgstr ""
 
-#: 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"
+#: src/setup/gtk/gconf.c:429
+msgid "Default"
 msgstr ""
 
-#: src/applications/session/connect.c:313
-#, c-format
-msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
+#: src/setup/gtk/gconf.c:458
+msgid "Section"
 msgstr ""
 
-#: src/applications/session/connect.c:492
-msgid "Could not create any HELLO for myself!\n"
+#: src/setup/gtk/gconf.c:469
+msgid "Option"
 msgstr ""
 
-#: src/applications/session/connect.c:592
+#: src/setup/lib/tree.c:191
 #, c-format
-msgid "Session key received from peer `%s' has invalid format (discarded).\n"
+msgid ""
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:624
+#: src/setup/lib/gns.c:315
 #, c-format
-msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:656
-#, c-format
-msgid "Invalid `%s' message received from peer `%s'.\n"
+#: src/setup/lib/wizard_util.c:111
+msgid "Can't open Service Control Manager"
 msgstr ""
 
-#: src/applications/session/connect.c:666
-#, c-format
-msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
+#: src/setup/lib/wizard_util.c:117
+msgid "Can't create service"
 msgstr ""
 
-#: src/applications/session/connect.c:729
-#, c-format
-msgid ""
-"Error parsing encrypted session key from `%s', given message part size is "
-"invalid.\n"
+#: src/setup/lib/wizard_util.c:121
+msgid "Error changing the permissions of the GNUnet directory"
 msgstr ""
 
-#: src/applications/session/connect.c:741
-#, c-format
-msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
+#: src/setup/lib/wizard_util.c:126
+msgid "Cannot write to the regisitry"
 msgstr ""
 
-#: src/applications/session/connect.c:898
-msgid "# session keys sent"
+#: src/setup/lib/wizard_util.c:129
+msgid "Can't access the service"
 msgstr ""
 
-#: src/applications/session/connect.c:900
-msgid "# session keys rejected"
+#: src/setup/lib/wizard_util.c:132
+msgid "Can't delete the service"
 msgstr ""
 
-#: src/applications/session/connect.c:902
-msgid "# session keys accepted"
+#: src/setup/lib/wizard_util.c:135
+msgid "Unknown error"
 msgstr ""
 
-#: src/applications/session/connect.c:904
-msgid "# sessions established"
+#: src/setup/lib/wizard_util.c:171
+msgid "This version of Windows does not support multiple users."
 msgstr ""
 
-#: 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"
+#: src/setup/lib/wizard_util.c:175
+msgid "Error creating user"
 msgstr ""
 
-#: 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"
+#: src/setup/lib/wizard_util.c:179
+msgid "Error accessing local security policy"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:237
-#, c-format
-msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
+#: src/setup/lib/wizard_util.c:184
+msgid "Error granting service right to user"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:285
-#, c-format
-msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
+#: src/setup/lib/wizard_util.c:189
+msgid "Unknown error while creating a new user"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:909 src/applications/rpc/rpc.c:1043
-#: src/applications/rpc/rpc.c:1129
+#: src/setup/gnunet-setup.c:64
 #, c-format
-msgid "Invalid message of type %u received.  Dropping.\n"
+msgid "Can only set one option per invocation.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:975
+#: src/setup/gnunet-setup.c:72
 #, c-format
-msgid "Dropping RPC request %u: message malformed.\n"
+msgid ""
+"Invalid synatx, argument to 'set' must have the format SECTION:"
+"OPTION=VALUE.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1307
+#: src/setup/gnunet-setup.c:86
 #, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgid "Can only display one option per invocation.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1421
+#: src/setup/gnunet-setup.c:93
 #, c-format
-msgid "RPC not unregistered: %s:%p\n"
+msgid ""
+"Invalid synatx, argument to 'get' must have the format SECTION:OPTION.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1450
-#, c-format
-msgid "`%s' registering handlers %d %d %d\n"
+#: src/setup/gnunet-setup.c:107
+msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1466
-#, c-format
-msgid "Failed to initialize `%s' service.\n"
+#: src/setup/gnunet-setup.c:110 src/server/gnunet-update.c:265
+msgid "print a value from the configuration file to stdout"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1524
-msgid "RPC async reply invalid.\n"
+#: src/setup/gnunet-setup.c:112
+msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1592
-msgid "async RPC reply not received.\n"
+#: src/setup/gnunet-setup.c:114
+msgid "update a value in the configuration file"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:421
+#: src/setup/gnunet-setup.c:257
 #, c-format
-msgid "`%s' failed at %s:%d with error: %s"
+msgid "Too many arguments.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1359
+#: src/setup/gnunet-setup.c:263
+msgid "No interface specified, using default\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:340
 #, c-format
-msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
+msgid "Undefined option.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1471
-#: src/applications/sqstore_mysql/mysql.c:1618
+#: src/setup/gnunet-setup.c:391
 #, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgid "`%s' is not available."
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1496
-#: src/applications/sqstore_mysql/mysql.c:1641
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
+#: src/setup/gnunet-setup.c:409
+#, c-format
+msgid "Unknown operation `%s'\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:146
+#: src/setup/gnunet-setup.c:410 src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:517 src/util/getopt/getopt.c:1072
 #, c-format
-msgid "Availability test failed for `%s' at %s:%d.\n"
+msgid "Use --help to get a list of options.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:368
-msgid "# requests filtered by bloom filter"
+#: src/setup/gnunet-win-tool.c:52
+msgid "list all network adapters"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:370
-msgid "# bloom filter false positives"
+#: src/setup/gnunet-win-tool.c:55
+msgid "install GNUnet as Windows service"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:373
-msgid "# bytes allowed in datastore"
+#: src/setup/gnunet-win-tool.c:58
+msgid "uninstall GNUnet service"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:388
-msgid "Failed to load state service. Trying to do without.\n"
+#: src/setup/gnunet-win-tool.c:61
+msgid "increase the maximum number of TCP/IP connections"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:513
-msgid "Failed to load sqstore service.  Check your configuration!\n"
+#: src/setup/gnunet-win-tool.c:64
+msgid "display a file's hash value"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:116
+#: src/setup/gnunet-win-tool.c:123
 #, c-format
-msgid "Failed to access GNUnet home directory `%s'\n"
+msgid "GNUnet service installed successfully.\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:143
+#: src/setup/gnunet-win-tool.c:126 src/setup/gnunet-win-tool.c:154
 #, c-format
-msgid ""
-"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+msgid "This version of Windows doesn't support services.\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:152
-msgid "Creating new hostkey (this may take a while).\n"
+#: src/setup/gnunet-win-tool.c:130 src/setup/gnunet-win-tool.c:158
+#, c-format
+msgid "Error: can't open Service Control Manager: %s\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:162
-msgid "Done creating hostkey.\n"
+#: src/setup/gnunet-win-tool.c:135
+#, c-format
+msgid "Error: can't create service: %s\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:345
+#: src/setup/gnunet-win-tool.c:138 src/setup/gnunet-win-tool.c:170
 #, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgid "Unknown error.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:358
+#: src/setup/gnunet-win-tool.c:151
 #, c-format
-msgid ""
-"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgid "Service deleted.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:393
+#: src/setup/gnunet-win-tool.c:163
 #, c-format
-msgid "Still no peers found in `%s'!\n"
+msgid "Error: can't access service: %s\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:708
-#: src/applications/identity/identity.c:729
+#: src/setup/gnunet-win-tool.c:167
 #, c-format
-msgid "Removed file `%s' containing invalid HELLO data.\n"
+msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:776
-#, c-format
-msgid "Signature failed verification: peer `%s' not known.\n"
+#: src/applications/dht/tools/dhttest.c:43
+#: src/applications/dht/tools/dhttest2.c:43
+#: src/applications/dht/module/table.c:734
+msgid "# dht connections"
 msgstr ""
 
-#: src/applications/identity/identity.c:785
-msgid "Signature failed verification: signature invalid.\n"
+#: src/applications/dht/tools/dht-query.c:52
+msgid "Query (get KEY, put KEY VALUE) DHT table."
 msgstr ""
 
-#: 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"
+#: src/applications/dht/tools/dht-query.c:57
+msgid ""
+"allow TIME ms to process a GET command or expire PUT content after ms TIME"
 msgstr ""
 
-#: src/applications/identity/identity.c:1017
+#: src/applications/dht/tools/dht-query.c:96
 #, c-format
-msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
+msgid "%s(%s) operation returned no results.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:190
+#: src/applications/dht/tools/dht-query.c:113
 #, c-format
-msgid ""
-"Converting peer address to string failed, transport type %d not supported\n"
+msgid "Issuing '%s(%s,%s)' command.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:244
+#: src/applications/dht/tools/dht-query.c:120
 #, c-format
-msgid "Transport connection attempt failed, transport type %d not supported\n"
+msgid "'%s(%s,%s)' succeeded\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:297
+#: src/applications/dht/tools/dht-query.c:124
 #, c-format
-msgid ""
-"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
+msgid "'%s(%s,%s)' failed.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:373
+#: src/applications/dht/tools/dht-query.c:148
 #, c-format
-msgid "Transmission attempt failed, transport type %d unknown.\n"
+msgid "Failed to connect to gnunetd.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:494
+#: src/applications/dht/tools/dht-query.c:161
 #, c-format
-msgid "No transport of type %d known.\n"
+msgid "Command `%s' requires an argument (`%s').\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:553
-msgid "No transport succeeded in creating a hello!\n"
+#: src/applications/dht/tools/dht-query.c:178
+#, c-format
+msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:752
+#: src/applications/dht/tools/dht-query.c:189
 #, c-format
-msgid "Loading transports `%s'\n"
+msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:771
+#: src/applications/dht/module/cs.c:135
 #, c-format
-msgid "Could not load transport plugin `%s'\n"
+msgid "`%s' failed. Terminating connection to client.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:781
+#: src/applications/dht/module/cs.c:242
 #, c-format
-msgid "Transport library `%s' did not provide required function '%s%s'.\n"
+msgid "`%s' registering client handlers: %d %d\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:808
-#, c-format
-msgid "Loaded transport `%s'\n"
+#: src/applications/dht/module/cs.c:261
+msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
-#: src/applications/transport/transport.c:819
-#, c-format
-msgid "I am peer `%s'.\n"
+#: src/applications/dht/module/routing.c:747
+msgid "# dht replies routed"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:575
-msgid "# messages defragmented"
+#: src/applications/dht/module/routing.c:749
+msgid "# dht requests routed"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:577
-msgid "# messages fragmented"
+#: src/applications/dht/module/routing.c:751
+msgid "# dht get requests received"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:578
-msgid "# fragments discarded"
+#: src/applications/dht/module/routing.c:753
+msgid "# dht put requests received"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:588
-#, c-format
-msgid "`%s' registering handler %d\n"
+#: src/applications/dht/module/routing.c:755
+msgid "# dht results received"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:62
+#: src/applications/dht/module/routing.c:759
 #, c-format
-msgid "Supported peer-to-peer messages:\n"
+msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:65
-#, c-format
-msgid "Supported client-server messages:\n"
+#: src/applications/dht/module/table.c:736
+msgid "# dht discovery messages received"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:84
-#: src/applications/vpn/gnunet-vpn.c:53
-msgid "Print statistics about GNUnet operations."
+#: src/applications/dht/module/table.c:738
+msgid "# dht route host lookups performed"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:88
-msgid "prints supported protocol messages"
+#: src/applications/dht/module/table.c:740
+msgid "# dht discovery messages sent"
 msgstr ""
 
-#: 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:149
+#: src/applications/topology_default/topology.c:545
 #, c-format
-msgid "Error establishing connection with gnunetd.\n"
+msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:134
+#: src/applications/topology_default/topology.c:562
+msgid "Syntax error in topology specification, skipping bytes.\n"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:576
 #, c-format
-msgid "Error reading information from gnunetd.\n"
+msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/applications/stats/clientapi.c:330
-msgid "Uptime (seconds)"
+#: src/applications/topology_default/topology.c:588
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:223
-#, c-format
-msgid "% of allowed network load (up)"
+#: src/applications/topology_default/topology.c:596
+msgid ""
+"More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:225
+#: src/applications/topology_default/topology.c:703
+msgid "maintains GNUnet default mesh topology"
+msgstr ""
+
+#: src/applications/rpc/rpc.c:136 src/applications/rpc/rpc.c:181
 #, c-format
-msgid "% of allowed network load (down)"
+msgid ""
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:226
+#: src/applications/rpc/rpc.c:228 src/applications/rpc/rpc.c:281
 #, c-format
-msgid "% of allowed cpu load"
+msgid ""
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:227
+#: src/applications/rpc/rpc.c:250
 #, c-format
-msgid "% of allowed io load"
+msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:228
-msgid "# of connected peers"
+#: src/applications/rpc/rpc.c:303
+#, c-format
+msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:230
-msgid "# bytes of noise received"
+#: src/applications/rpc/rpc.c:945 src/applications/rpc/rpc.c:1084
+#: src/applications/rpc/rpc.c:1174
+#, c-format
+msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:401
+#: src/applications/rpc/rpc.c:1015
 #, c-format
-msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
+msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:421
-msgid "keeps statistics about gnunetd's operation"
+#: src/applications/rpc/rpc.c:1363
+#, c-format
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:150
-msgid "# Any-Blocks"
+#: src/applications/rpc/rpc.c:1482
+#, c-format
+msgid "RPC not unregistered: %s:%p\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:151
-msgid "# DBlocks"
+#: src/applications/rpc/rpc.c:1511
+#, c-format
+msgid "`%s' registering handlers %d %d %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:152
-msgid "# SBlocks"
+#: src/applications/rpc/rpc.c:1529
+#, c-format
+msgid "Failed to initialize `%s' service.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:153
-msgid "# KBlocks"
+#: src/applications/rpc/rpc.c:1592
+msgid "RPC async reply invalid.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:154
-msgid "# NBlocks"
+#: src/applications/rpc/rpc.c:1663
+msgid "async RPC reply not received.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:155
-msgid "# KNBlocks"
+#: src/applications/datastore/datastore.c:170
+#: src/applications/datastore/datastore.c:184
+#, c-format
+msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:156
-msgid "# OnDemand-Blocks"
+#: src/applications/datastore/datastore.c:423
+msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:157
-msgid "# Unknown-Blocks"
+#: src/applications/datastore/datastore.c:425
+msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:158
-msgid "# expired"
+#: src/applications/datastore/datastore.c:428
+msgid "# bytes allowed in datastore"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:159
-msgid "# expire in 1h"
+#: src/applications/datastore/datastore.c:445
+msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:160
-msgid "# expire in 24h"
+#: src/applications/datastore/datastore.c:586
+msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:161
-msgid "# expire in 1 week"
+#: src/applications/fragmentation/fragmentation.c:578
+msgid "# messages defragmented"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:162
-msgid "# expire in 1 month"
+#: src/applications/fragmentation/fragmentation.c:580
+msgid "# messages fragmented"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:163
-msgid "# zero priority"
+#: src/applications/fragmentation/fragmentation.c:581
+msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:164
-msgid "# priority one"
+#: src/applications/fragmentation/fragmentation.c:592
+#, c-format
+msgid "`%s' registering handler %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:165
-msgid "# priority larger than one"
+#: src/applications/vpn/gnunet-vpn.c:51
+#: src/applications/stats/gnunet-stats.c:83
+msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/applications/stats/sqstats.c:166
-msgid "# no anonymity"
+#: src/applications/vpn/gnunet-vpn.c:55
+msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:167
-msgid "# anonymity one"
+#: src/applications/vpn/gnunet-vpn.c:149
+#: src/applications/stats/gnunet-stats.c:121
+#: src/applications/tbench/gnunet-tbench.c:126
+#: src/applications/tracekit/gnunet-tracekit.c:325
+#: src/applications/template/gnunet-template.c:95
+#, c-format
+msgid "Error establishing connection with gnunetd.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:168
-msgid "# anonymity larger than one"
+#: src/applications/vpn/vpn.c:368
+#, c-format
+msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:64
-#: src/applications/tracekit/gnunet-tracekit.c:55
-msgid "Start GNUnet transport benchmarking tool."
+#: src/applications/vpn/vpn.c:379
+#, c-format
+msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:66
-msgid "output in gnuplot format"
+#: src/applications/vpn/vpn.c:412
+#, c-format
+msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:70
-msgid "number of iterations"
+#: src/applications/vpn/vpn.c:468
+#, c-format
+msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:74
-msgid "number of messages to use per iteration"
+#: src/applications/vpn/vpn.c:475
+#, c-format
+msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:77
-msgid "receiver host identifier (ENC file name)"
+#: src/applications/vpn/vpn.c:491
+#, c-format
+msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:80
-msgid "message size"
+#: src/applications/vpn/vpn.c:563
+#, c-format
+msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:83
-msgid "sleep for SPACE ms after each a message block"
+#: src/applications/vpn/vpn.c:569
+#, c-format
+msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:86
-msgid "time to wait for the completion of an iteration (in ms)"
+#: src/applications/vpn/vpn.c:606
+#, c-format
+msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:91
-msgid "number of messages in a message block"
+#: src/applications/vpn/vpn.c:621
+#, c-format
+msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:143
+#: src/applications/vpn/vpn.c:631
 #, c-format
-msgid "You must specify a receiver!\n"
+msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:152
+#: src/applications/vpn/vpn.c:673
 #, c-format
-msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
+msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:187
+#: src/applications/vpn/vpn.c:683
 #, c-format
-msgid "Time:\n"
+msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:188
+#: src/applications/vpn/vpn.c:693
 #, c-format
-msgid "\tmax      %llums\n"
+msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/vpn/vpn.c:701
 #, c-format
-msgid "\tmin      %llums\n"
+msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:190
+#: src/applications/vpn/vpn.c:715
 #, c-format
-msgid "\tmean     %8.4fms\n"
+msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:191
+#: src/applications/vpn/vpn.c:730
 #, c-format
-msgid "\tvariance %8.4fms\n"
+msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:193
+#: src/applications/vpn/vpn.c:746
 #, c-format
-msgid "Loss:\n"
+msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:194
+#: src/applications/vpn/vpn.c:760
 #, c-format
-msgid "\tmax      %u\n"
+msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:195
+#: src/applications/vpn/vpn.c:803
+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:853
 #, c-format
-msgid "\tmin      %u\n"
+msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:196
+#: src/applications/vpn/vpn.c:932
 #, c-format
-msgid "\tmean     %8.4f\n"
+msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:197
+#: src/applications/vpn/vpn.c:941
 #, c-format
-msgid "\tvariance %8.4f\n"
+msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:203
+#: src/applications/vpn/vpn.c:961
+msgid "RFC4193 Thread exiting\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1010
+msgid "VPN IP src not anonymous. drop..\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1018
+msgid "VPN IP not anonymous, drop.\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1027
+msgid "VPN Received, not anonymous, drop.\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1032
 #, c-format
-msgid "Output format not known, this should not happen.\n"
+msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:209
+#: src/applications/vpn/vpn.c:1043
 #, c-format
-msgid ""
-"\n"
-"Did not receive the message from gnunetd. Is gnunetd running?\n"
+msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:412
-msgid "allows profiling of direct peer-to-peer connections"
+#: src/applications/vpn/vpn.c:1071
+msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:48
-msgid "probe network to the given DEPTH"
+#: src/applications/vpn/vpn.c:1092
+msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:52
-msgid ""
-"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+#: src/applications/vpn/vpn.c:1099
+#, c-format
+msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:59
-msgid "use PRIO for the priority of the trace request"
+#: src/applications/vpn/vpn.c:1117
+#, c-format
+msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:63
-msgid "wait DELAY seconds for replies"
+#: src/applications/vpn/vpn.c:1123
+#, c-format
+msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:111
+#: src/applications/vpn/vpn.c:1140
+msgid "Receive route announce.\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1146
+msgid "Going to try insert route into local table.\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1152
 #, c-format
-msgid ""
-"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
-"vcg.\n"
+msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:160
+#: src/applications/vpn/vpn.c:1173
 #, c-format
-msgid "`%s' is not connected to any peer.\n"
+msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:197
+#: src/applications/vpn/vpn.c:1191
 #, c-format
-msgid "`%s' connected to `%s'.\n"
+msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:210
+#: src/applications/vpn/vpn.c:1223
+msgid "realise alloc ram\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1244
+msgid "realise add routes\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1296
+msgid "realise pull routes\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1350
+msgid "realise copy table\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1383
+msgid "Cannot store client info\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1723
 #, c-format
-msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
+msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:236
+#: src/applications/vpn/vpn.c:1728
 #, c-format
-msgid "Peer `%s' did not report back.\n"
+msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:336
-msgid "Could not send request to gnunetd.\n"
+#: src/applications/vpn/vpn.c:1817
+msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:72
-#: src/applications/tracekit/tracekit.c:206
-#, c-format
-msgid "Received invalid `%s' message from `%s'.\n"
+#: src/applications/vpn/vpn.c:1851
+msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:269
-msgid "TRACEKIT: routing table full, trace request dropped\n"
+#: src/applications/vpn/vpn.c:1866
+msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:346
+#: src/applications/vpn/vpn.c:1884
 #, c-format
-msgid "TRACEKIT: received invalid `%s' message\n"
+msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:443
-msgid "allows mapping of the network topology"
+#: src/applications/gap/pid_table.c:177
+msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/gap.c:1695
+#: src/applications/gap/pid_table.c:181
+msgid "# total RC of interned peer IDs in pid table"
+msgstr ""
+
+#: src/applications/gap/gap.c:1723
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1696
+#: src/applications/gap/gap.c:1724
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1883
+#: src/applications/gap/gap.c:1916
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1892 src/applications/fs/module/anonymity.c:65
+#: src/applications/gap/gap.c:1927 src/applications/fs/module/anonymity.c:66
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1902 src/applications/gap/gap.c:1910
-#: src/applications/gap/gap.c:1921
+#: src/applications/gap/gap.c:1938 src/applications/gap/gap.c:1947
+#: src/applications/gap/gap.c:1959
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2183
+#: src/applications/gap/gap.c:2231
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2234
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2188
+#: src/applications/gap/gap.c:2236
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2190
+#: src/applications/gap/gap.c:2238
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2194
+#: src/applications/gap/gap.c:2242
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2197
+#: src/applications/gap/gap.c:2245
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2199
+#: src/applications/gap/gap.c:2247
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2202
+#: src/applications/gap/gap.c:2250
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2206
+#: src/applications/gap/gap.c:2254
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2208
+#: src/applications/gap/gap.c:2256
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2211
+#: src/applications/gap/gap.c:2259
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2262
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2216
+#: src/applications/gap/gap.c:2264
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2218
+#: src/applications/gap/gap.c:2266
 msgid "# gap spurious replies (dropped)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2220
+#: src/applications/gap/gap.c:2268
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2223
+#: src/applications/gap/gap.c:2271
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2227
+#: src/applications/gap/gap.c:2275
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2229
+#: src/applications/gap/gap.c:2277
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2231
+#: src/applications/gap/gap.c:2279
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2246
+#: src/applications/gap/gap.c:2295
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2269
+#: src/applications/gap/gap.c:2319
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:177
-msgid "# distinct interned peer IDs in pid table"
-msgstr ""
-
-#: src/applications/gap/pid_table.c:181
-msgid "# total RC of interned peer IDs in pid table"
-msgstr ""
-
-#: src/applications/getoption/getoption.c:75
-#, c-format
-msgid "`%s' registering client handler %d\n"
-msgstr ""
-
-#: 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-pseudonym.c:70
 #: src/applications/fs/tools/gnunet-insert.c:268
-#: src/applications/fs/tools/gnunet-search.c:135
+#: src/applications/fs/tools/gnunet-search.c:136
 #: src/applications/fs/tools/gnunet-download.c:69
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:74
+#: src/applications/fs/tools/gnunet-pseudonym.c:73
 msgid "automate creation of a namespace by starting a collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:78
+#: src/applications/fs/tools/gnunet-pseudonym.c:77
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:81
+#: src/applications/fs/tools/gnunet-pseudonym.c:80
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:84
+#: src/applications/fs/tools/gnunet-pseudonym.c:83
 msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:86
+#: src/applications/fs/tools/gnunet-pseudonym.c:85
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:90
+#: src/applications/fs/tools/gnunet-pseudonym.c:89
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:93
+#: src/applications/fs/tools/gnunet-pseudonym.c:92
 msgid "specify metadata describing the namespace or collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:97
+#: src/applications/fs/tools/gnunet-pseudonym.c:96
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:100
+#: src/applications/fs/tools/gnunet-pseudonym.c:99
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:104
+#: src/applications/fs/tools/gnunet-pseudonym.c:103
 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:107
+#: src/applications/fs/tools/gnunet-pseudonym.c:106
 msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:140
+#: src/applications/fs/tools/gnunet-pseudonym.c:139
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:142
+#: src/applications/fs/tools/gnunet-pseudonym.c:141
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:171
+#: src/applications/fs/tools/gnunet-pseudonym.c:170
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:204
+#: src/applications/fs/tools/gnunet-pseudonym.c:203
 #, c-format
 msgid "Collection stopped.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:206
+#: src/applications/fs/tools/gnunet-pseudonym.c:205
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:214
+#: src/applications/fs/tools/gnunet-pseudonym.c:213
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:219
+#: src/applications/fs/tools/gnunet-pseudonym.c:218
 #, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:234
+#: src/applications/fs/tools/gnunet-pseudonym.c:233
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:238
+#: src/applications/fs/tools/gnunet-pseudonym.c:237
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:279
+#: src/applications/fs/tools/gnunet-pseudonym.c:280
 #, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:287
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:301
+#: src/applications/fs/tools/gnunet-pseudonym.c:302
 #, c-format
 msgid "You must specify a name for the collection (`%s' option).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:309
+#: src/applications/fs/tools/gnunet-pseudonym.c:310
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr ""
@@ -1518,38 +1645,38 @@
 msgid "==> Directory `%s':\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:87
+#: src/applications/fs/tools/gnunet-directory.c:88
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:114
+#: src/applications/fs/tools/gnunet-directory.c:118
 #, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:116
+#: src/applications/fs/tools/gnunet-directory.c:120
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:131
+#: src/applications/fs/tools/gnunet-directory.c:135
 msgid "Perform directory related operations."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:134
+#: src/applications/fs/tools/gnunet-directory.c:138
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:138
+#: src/applications/fs/tools/gnunet-directory.c:142
 msgid "list entries from the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:141
+#: src/applications/fs/tools/gnunet-directory.c:145
 msgid "start tracking entries for the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:164
+#: src/applications/fs/tools/gnunet-directory.c:168
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr ""
@@ -1705,42 +1832,42 @@
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:418
+#: src/applications/fs/tools/gnunet-insert.c:420
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:437
+#: src/applications/fs/tools/gnunet-insert.c:440
 #, 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:464
-#: src/applications/fs/tools/gnunet-insert.c:472
-#: src/applications/fs/tools/gnunet-insert.c:480
+#: src/applications/fs/tools/gnunet-insert.c:451
+#: src/applications/fs/tools/gnunet-insert.c:459
+#: src/applications/fs/tools/gnunet-insert.c:467
+#: src/applications/fs/tools/gnunet-insert.c:475
+#: src/applications/fs/tools/gnunet-insert.c:483
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:138
+#: src/applications/fs/tools/gnunet-search.c:139
 msgid "Search GNUnet for files."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:142
+#: src/applications/fs/tools/gnunet-search.c:143
 msgid "exit after receiving LIMIT results"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:145
+#: src/applications/fs/tools/gnunet-search.c:146
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:148
+#: src/applications/fs/tools/gnunet-search.c:149
 msgid "wait DELAY seconds for search results before aborting"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:183
+#: src/applications/fs/tools/gnunet-search.c:186
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
@@ -1789,45 +1916,45 @@
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:178
+#: src/applications/fs/tools/gnunet-download.c:180
 msgid "no name given"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:184
+#: src/applications/fs/tools/gnunet-download.c:186
 #, c-format
 msgid "Starting download `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:225
+#: src/applications/fs/tools/gnunet-download.c:228
 msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:242
+#: src/applications/fs/tools/gnunet-download.c:246
 #, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:279
+#: src/applications/fs/tools/gnunet-download.c:289
 #, c-format
 msgid "No filename specified, using `%s' instead (for now).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:320
+#: src/applications/fs/tools/gnunet-download.c:331
 #, c-format
 msgid "Could not access gnunet-directory file `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:338
+#: src/applications/fs/tools/gnunet-download.c:351
 #, c-format
 msgid "Downloading %d files from directory `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:341
+#: src/applications/fs/tools/gnunet-download.c:354
 #, c-format
 msgid "Did not find any files in directory `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:377
+#: src/applications/fs/tools/gnunet-download.c:391
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr ""
@@ -1839,47 +1966,60 @@
 "completion)                "
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:73
 #, 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:85
+#: src/applications/fs/tools/gnunet-unindex.c:88
 #, c-format
 msgid ""
 "\n"
 "Error unindexing file: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:105
+#: src/applications/fs/tools/gnunet-unindex.c:108
 msgid "Unindex files."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:142
+#: src/applications/fs/tools/gnunet-unindex.c:145
 msgid "Not enough arguments. You must specify a filename.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:158
+#: src/applications/fs/tools/gnunet-unindex.c:163
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr ""
 
-#: src/applications/fs/module/querymanager.c:228
+#: src/applications/fs/uritrack/file_info.c:134
+msgid "Collecting file identifiers disabled.\n"
+msgstr ""
+
+#: src/applications/fs/uritrack/file_info.c:414
+#, c-format
+msgid "Deleted corrupt URI database in `%s'."
+msgstr ""
+
+#: src/applications/fs/module/dht_push.c:138
+msgid "# blocks pushed into DHT"
+msgstr ""
+
+#: src/applications/fs/module/querymanager.c:234
 msgid "# FS currently tracked queries from clients"
 msgstr ""
 
-#: src/applications/fs/module/querymanager.c:230
+#: src/applications/fs/module/querymanager.c:236
 msgid "# FS replies passed to clients"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:323
+#: src/applications/fs/module/ondemand.c:330
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:418
+#: src/applications/fs/module/ondemand.c:431
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -1887,2050 +2027,2197 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:444
+#: src/applications/fs/module/ondemand.c:457
 #, 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:495
+#: src/applications/fs/module/ondemand.c:514
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:647
+#: src/applications/fs/module/ondemand.c:668
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1170
+#: src/applications/fs/module/fs.c:1204
 #, 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:1185
+#: src/applications/fs/module/fs.c:1219
 msgid "# FS expired replies dropped"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1187
+#: src/applications/fs/module/fs.c:1221
 msgid "# FS valid replies received"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1220
+#: src/applications/fs/module/fs.c:1257
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1266
+#: src/applications/fs/module/fs.c:1314
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:374
+#: src/applications/fs/module/migration.c:381
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:376
+#: src/applications/fs/module/migration.c:383
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:379
+#: src/applications/fs/module/migration.c:386
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/module/dht_push.c:138
-msgid "# blocks pushed into DHT"
+#: src/applications/fs/fsui/deserialize.c:772
+#, c-format
+msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:234
+#: src/applications/fs/fsui/searchtest.c:154
+#: src/applications/fs/fsui/fsuitest.c:173
+#: src/applications/fs/fsui/downloadtest.c:289
+#: src/applications/fs/fsui/serializetest2.c:391
+#: src/applications/fs/fsui/serializetest3.c:163
+#: src/applications/fs/fsui/serializetest4.c:358
+#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
+#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
+msgid "AND"
+msgstr ""
+
+#: src/applications/fs/fsui/search.c:241
 msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:294
+#: src/applications/fs/fsui/download.c:311
 msgid "Download failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/unindex.c:109
+#: src/applications/fs/fsui/unindex.c:114
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:278
+#: src/applications/fs/fsui/upload.c:328
 msgid "Failed to create temporary directory."
 msgstr ""
 
-#: 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:168
 msgid "CHK URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:214
+#: src/applications/fs/ecrs/search.c:217
 msgid "LOC URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:131
+#: src/applications/fs/ecrs/download.c:132
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:271
+#: src/applications/fs/ecrs/download.c:272
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:1001
+#: src/applications/fs/ecrs/download.c:1010
 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:1184
+#: src/applications/fs/ecrs/download.c:1205
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:155
+#: src/applications/fs/ecrs/helper.c:75
+msgid "No keywords specified!\n"
+msgstr ""
+
+#: src/applications/fs/ecrs/upload.c:156
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:162
+#: src/applications/fs/ecrs/upload.c:164
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:171
+#: src/applications/fs/ecrs/upload.c:173
 msgid "Failed to connect to gnunetd."
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:183
+#: src/applications/fs/ecrs/upload.c:185
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:202
+#: src/applications/fs/ecrs/upload.c:204
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:209
+#: src/applications/fs/ecrs/upload.c:212
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:223
+#: src/applications/fs/ecrs/upload.c:226
 #, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:296
+#: src/applications/fs/ecrs/upload.c:309
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:876
+#: src/applications/fs/ecrs/meta.c:883
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:884
+#: src/applications/fs/ecrs/meta.c:893
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:154
+#: src/applications/fs/ecrs/namespace.c:157
 #, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:325
-#: src/applications/fs/ecrs/namespace.c:404
-#: src/applications/fs/ecrs/namespace.c:545
+#: src/applications/fs/ecrs/namespace.c:339
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:571
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:337
-#: src/applications/fs/ecrs/namespace.c:415
+#: src/applications/fs/ecrs/namespace.c:352
+#: src/applications/fs/ecrs/namespace.c:432
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:556
-#: src/applications/fs/ecrs/namespace.c:567
+#: src/applications/fs/ecrs/namespace.c:583
+#: src/applications/fs/ecrs/namespace.c:594
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/helper.c:74
-msgid "No keywords specified!\n"
-msgstr ""
-
-#: 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:120
+#: src/applications/fs/ecrs/parser.c:124
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:126
-msgid "Collecting file identifiers disabled.\n"
-msgstr ""
-
-#: 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:655
+#: src/applications/fs/namespace/namespace_info.c:685
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:675
+#: src/applications/fs/namespace/namespace_info.c:708
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:373
+#: src/applications/testing/testing.c:247
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
+msgid "Waiting for peers to connect"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:390
-msgid "Syntax error in topology specification, skipping bytes.\n"
+#: src/applications/kvstore_sqlite/kv_sqlite.c:44
+#: src/applications/kvstore_sqlite/kv_sqlite.c:51
+#: 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:476
+#: src/applications/sqstore_mysql/mysql.c:487
+#: src/applications/sqstore_mysql/mysql.c:526
+#: src/applications/sqstore_mysql/mysql.c:537
+#: src/applications/sqstore_mysql/mysql.c:571
+#: src/applications/sqstore_mysql/mysql.c:582
+#: src/applications/sqstore_mysql/mysql.c:680
+#: src/applications/sqstore_mysql/mysql.c:693
+#: src/applications/sqstore_mysql/mysql.c:706
+#: src/applications/sqstore_mysql/mysql.c:721
+#: src/applications/sqstore_mysql/mysql.c:821
+#: src/applications/sqstore_mysql/mysql.c:836
+#: src/applications/sqstore_mysql/mysql.c:988
+#: src/applications/sqstore_mysql/mysql.c:1000
+#: src/applications/sqstore_mysql/mysql.c:1012
+#: src/applications/sqstore_mysql/mysql.c:1260
+#: src/applications/sqstore_mysql/mysql.c:1272
+#: src/applications/sqstore_mysql/mysql.c:1284
+#: src/applications/sqstore_mysql/mysql.c:1369
+#: src/applications/kvstore_mysql/kv_mysql.c:44
+#: src/applications/kvstore_mysql/kv_mysql.c:51
+#: src/applications/dstore_mysql/dstore_mysql.c:107
+#: src/applications/dstore_mysql/dstore_mysql.c:114
+#: src/applications/dstore_mysql/dstore_mysql.c:286
+#: src/applications/dstore_mysql/dstore_mysql.c:301
+#: src/applications/dstore_mysql/dstore_mysql.c:315
+#: src/applications/dstore_mysql/dstore_mysql.c:329
+#: src/applications/dstore_mysql/dstore_mysql.c:342
+#: src/applications/dstore_mysql/dstore_mysql.c:412
+#: src/applications/dstore_mysql/dstore_mysql.c:434
+#: src/applications/dstore_mysql/dstore_mysql.c:446
+#: src/applications/dstore_mysql/dstore_mysql.c:521
+#: src/applications/dstore_mysql/dstore_mysql.c:533
+#: src/applications/dstore_mysql/dstore_mysql.c:554
+#: src/applications/dstore_sqlite/dstore.c:91
+#: src/applications/dstore_sqlite/dstore.c:98
+#: src/applications/dstore_sqlite/dstore.c:194
+#: src/applications/dstore_sqlite/dstore.c:236
+#: src/applications/dstore_sqlite/dstore.c:257
+#: src/applications/dstore_sqlite/dstore.c:313
+#: src/applications/dstore_sqlite/dstore.c:331
+#: src/applications/dstore_sqlite/dstore.c:343
+#: src/applications/dstore_sqlite/dstore.c:375
+#: src/applications/dstore_sqlite/dstore.c:467
+#: src/util/crypto/hostkey_gcrypt.c:64 src/util/crypto/hostkey_gcrypt.c:71
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:404
+#: src/applications/advertising/advertising_test.c:47
+#: src/applications/session/sessiontest_http.c:40
+#: src/applications/session/sessiontest.c:40
+#: src/applications/session/sessiontest2.c:40
+#: src/applications/stats/statistics.c:233
+msgid "# of connected peers"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:194
 #, c-format
-msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:511
-msgid "maintains a friend-to-friend restricted topology"
+#: src/applications/advertising/advertising.c:205
+msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr ""
 
-#: src/applications/template/template.c:68
-#, c-format
-msgid "`%s' registering client handler %d and %d\n"
+#: src/applications/advertising/advertising.c:407
+msgid "Could not send HELLO+PING, ping buffer full.\n"
 msgstr ""
 
-#: src/applications/template/gnunet-template.c:43
-msgid "Template description."
+#: src/applications/advertising/advertising.c:429
+msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:109
+#: src/applications/advertising/advertising.c:601
 #, c-format
-msgid "Bootstrap data obtained from `%s' is invalid.\n"
+msgid "Advertising my transport %d to selected peers.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:177
-msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
+#: src/applications/advertising/advertising.c:610
+msgid ""
+"Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:217
-#, c-format
-msgid "Bootstrapping using `%s'.\n"
+#: src/applications/advertising/advertising.c:887
+msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:231
-#, c-format
-msgid "Trying to download hostlist from `%s'\n"
+#: src/applications/advertising/advertising.c:890
+msgid "# Peer advertisements of type NAT received"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:359
-#, c-format
-msgid "Downloaded %llu bytes from `%s'.\n"
+#: src/applications/advertising/advertising.c:893
+msgid "# Peer advertisements confirmed via PONG"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:392
-msgid "# HELLOs downloaded via http"
+#: src/applications/advertising/advertising.c:897
+msgid "# Peer advertisements updating earlier HELLOs"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:454
-#, c-format
-msgid "# bytes transmitted of type %d"
+#: src/applications/advertising/advertising.c:900
+msgid "# Peer advertisements discarded due to load"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:470
-#, c-format
-msgid "# bytes received of type %d"
+#: src/applications/advertising/advertising.c:904
+msgid "# Peer advertisements for unsupported transport"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:489
-#, c-format
-msgid "# bytes received in plaintext of type %d"
+#: src/applications/advertising/advertising.c:908
+msgid "# Peer advertisements not confirmed due to ping busy"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:644
-msgid "tracks bandwidth utilization by gnunetd"
+#: src/applications/advertising/advertising.c:912
+msgid "# Peer advertisements not confirmed due to lack of self ad"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:57
-msgid "Suppress display of asynchronous log messages"
+#: src/applications/advertising/advertising.c:916
+msgid "# Peer advertisements not confirmed due to send error"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:366
-#, c-format
-msgid "Not storing route to myself from peer %d\n"
+#: src/applications/advertising/advertising.c:918
+msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:377
-#, c-format
-msgid "Duplicate route to node from peer %d, choosing minimum hops"
+#: src/applications/advertising/advertising.c:920
+msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:410
-#, c-format
-msgid "Inserting route from peer %d in route table at location %d\n"
+#: src/applications/advertising/advertising.c:922
+#: src/applications/pingpong/pingpong.c:527
+msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:466
+#: src/applications/advertising/advertising.c:928
+#: src/applications/session/connect.c:953
 #, c-format
-msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
+msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:472
-#, c-format
-msgid "RFC4193 Frame length %d too small\n"
+#: src/applications/advertising/advertising.c:944
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:488
-#, c-format
-msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
+#: src/applications/chat/chat.c:91
+msgid "Message received from peer is invalid.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:556
-#, c-format
-msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
+#: src/applications/chat/chat.c:140
+msgid "Message received from client is invalid\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:562
-#, c-format
-msgid "Cannot open tunnel device because of %s"
+#: src/applications/chat/chat.c:161
+msgid "Maximum number of chat clients reached.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:594
+#: src/applications/chat/chat.c:167
 #, c-format
-msgid "RFC4193 Create skips gnu%d as we are already using it\n"
+msgid "Now %d of %d chat clients at this node.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:606
+#: src/applications/chat/chat.c:211
 #, c-format
-msgid "Cannot set tunnel name to %s because of %s\n"
+msgid "`%s' registering handlers %d and %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:614
-#, c-format
-msgid "Configured tunnel name to %s\n"
+#: src/applications/chat/chat.c:230
+msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:655
-#, c-format
-msgid "Cannot get socket flags for gnu%d because %s\n"
+#: src/applications/chat/gnunet-chat.c:45
+msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/applications/vpn/vpn.c:664
-#, c-format
-msgid "Cannot set socket flags for gnu%d because %s\n"
+#: src/applications/chat/gnunet-chat.c:49
+msgid "set the nickname to use (requred)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:674
-#, c-format
-msgid "Cannot set MTU for gnu%d because %s\n"
+#: src/applications/chat/gnunet-chat.c:52
+msgid "set the chat room to join (requred)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:682
+#: src/applications/chat/gnunet-chat.c:135
 #, c-format
-msgid "Cannot get interface index for gnu%d because %s\n"
+msgid "You must specify a nickname\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:694
+#: src/applications/chat/gnunet-chat.c:145
 #, c-format
-msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgid "Failed to join the room\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:707
+#: src/applications/chat/gnunet-chat.c:162
 #, c-format
-msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
+msgid "Failed to send message.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:721
+#: src/applications/sqstore_sqlite/sqlite.c:238
 #, c-format
-msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:733
+#: src/applications/sqstore_sqlite/sqlite.c:442
 #, c-format
-msgid "Cannot add route IPv6 address for gnu%s because %s\n"
+msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: 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"
+#: src/applications/sqstore_sqlite/sqlite.c:443
+#: src/applications/sqstore_sqlite/sqlite.c:482
+msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:822
+#: src/applications/sqstore_sqlite/sqlite.c:481
 #, c-format
-msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
+msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:895
-#, c-format
-msgid "VPN dropping connection %x\n"
+#: src/applications/sqstore_sqlite/sqlite.c:1336
+#: src/applications/sqstore_mysql/mysql.c:1483
+msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:902
+#: src/applications/pingpong/pingpong.c:134
+#: src/applications/pingpong/pingpong.c:205
+#: src/applications/pingpong/pingpong.c:273
+#: src/applications/pingpong/pingpong.c:345
 #, c-format
-msgid "VPN cannot drop connection %x\n"
+msgid "Received malformed `%s' message. Dropping.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:921
-msgid "RFC4193 Thread exiting\n"
+#: src/applications/pingpong/pingpong.c:146
+msgid "Received ping for another peer. Dropping.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:968
-msgid "VPN IP src not anonymous. drop..\n"
+#: src/applications/pingpong/pingpong.c:216
+msgid "Received PING not destined for us!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:974
-msgid "VPN IP not anonymous, drop.\n"
+#: src/applications/pingpong/pingpong.c:315
+#: src/applications/pingpong/pingpong.c:381
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:981
-msgid "VPN Received, not anonymous, drop.\n"
+#: src/applications/pingpong/pingpong.c:425
+msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:985
-#, c-format
-msgid "VPN Received unknown IP version %d...\n"
+#: src/applications/pingpong/pingpong.c:517
+msgid "# encrypted PONG messages received"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:996
-#, c-format
-msgid "<- GNUnet(%d) : %s\n"
+#: src/applications/pingpong/pingpong.c:519
+msgid "# plaintext PONG messages received"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1022
-msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
+#: src/applications/pingpong/pingpong.c:521
+msgid "# encrypted PING messages received"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1043
-msgid "Receive route request\n"
+#: src/applications/pingpong/pingpong.c:523
+msgid "# PING messages created"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1050
-#, c-format
-msgid "Prepare route announcement level %d\n"
+#: src/applications/pingpong/pingpong.c:525
+#: src/applications/session/connect.c:947
+msgid "# encrypted PONG messages sent"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1065
+#: src/applications/pingpong/pingpong.c:529
+#: src/applications/session/connect.c:945
+msgid "# encrypted PING messages sent"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:531
+msgid "# plaintext PONG messages sent"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:535
+msgid "# plaintext PONG transmissions failed"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:545
 #, c-format
-msgid "Send route announcement %d with route announce\n"
+msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1071
+#: src/applications/session/connect.c:260
+#: src/applications/session/connect.c:279
 #, c-format
-msgid "Send outside table info %d\n"
+msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1088
-msgid "Receive route announce.\n"
+#: src/applications/session/connect.c:323
+#, c-format
+msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1094
-msgid "Going to try insert route into local table.\n"
+#: src/applications/session/connect.c:512
+msgid "Could not create any HELLO for myself!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1100
+#: src/applications/session/connect.c:615
 #, c-format
-msgid "Inserting with hops %d\n"
+msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1119
+#: src/applications/session/connect.c:649
 #, c-format
-msgid "Request level %d from peer %d\n"
+msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1137
+#: src/applications/session/connect.c:683
 #, c-format
-msgid "Receive table limit on peer reached %d\n"
+msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1168
-msgid "realise alloc ram\n"
+#: src/applications/session/connect.c:694
+#, c-format
+msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1188
-msgid "realise add routes\n"
+#: src/applications/session/connect.c:763
+#, c-format
+msgid ""
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1239
-msgid "realise pull routes\n"
+#: src/applications/session/connect.c:776
+#, c-format
+msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1292
-msgid "realise copy table\n"
+#: src/applications/session/connect.c:937
+msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1324
-msgid "Cannot store client info\n"
+#: src/applications/session/connect.c:939
+msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:95
-msgid "Yes"
+#: src/applications/session/connect.c:941
+msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:94
-msgid "No"
+#: src/applications/session/connect.c:943
+msgid "# sessions established"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1651
+#: src/applications/sqstore_mysql/mysql.c:427
+#: src/applications/dstore_mysql/dstore_mysql.c:220
 #, c-format
-msgid "`%s' initialising RFC4913 module  %d and %d\n"
+msgid "`%s' failed at %s:%d with error: %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1654
+#: src/applications/sqstore_mysql/mysql.c:1388
 #, c-format
-msgid "RFC4193 my First 4 hex digits of host id are %x\n"
+msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1727
-msgid "enables IPv6 over GNUnet (incomplete)"
+#: src/applications/sqstore_mysql/mysql.c:1508
+#: src/applications/sqstore_mysql/mysql.c:1661
+#: src/applications/dstore_mysql/dstore_mysql.c:627
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1761
-msgid "RFC4193 Waiting for tun thread to end\n"
+#: src/applications/sqstore_mysql/mysql.c:1535
+#: src/applications/sqstore_mysql/mysql.c:1686
+msgid ""
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1775
-msgid "RFC4193 The tun thread has ended\n"
+#: src/applications/identity/hostkey.c:122
+#, c-format
+msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1792
+#: src/applications/identity/hostkey.c:155
 #, c-format
-msgid "RFC4193 Closing tunnel %d fd %d\n"
+msgid ""
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr ""
 
-#: src/applications/dstore/dstore.c:525
-msgid "# bytes in dstore"
+#: src/applications/identity/hostkey.c:164
+msgid "Creating new hostkey (this may take a while).\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:147
-#, c-format
-msgid "Updating data for module `%s'\n"
+#: src/applications/identity/hostkey.c:176
+msgid "Done creating hostkey.\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:151
+#: src/applications/identity/identity.c:352
 #, c-format
-msgid "Failed to update data for module `%s'\n"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:198 src/server/gnunetd.c:136
-msgid "Core initialization failed.\n"
+#: src/applications/identity/identity.c:366
+#, c-format
+msgid ""
+"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:239
-msgid "print a value from the configuration file to stdout"
+#: src/applications/identity/identity.c:402
+#, c-format
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:241
-msgid "Updates GNUnet datastructures after version change."
+#: src/applications/identity/identity.c:731
+#: src/applications/identity/identity.c:757
+#, c-format
+msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:369
-msgid "run as user LOGIN"
+#: src/applications/identity/identity.c:809
+#, c-format
+msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:249
-msgid "run in client mode (for getting client configuration values)"
+#: src/applications/identity/identity.c:819
+msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
-#: src/server/connection.c:1202
+#: src/applications/identity/identity.c:935
+#: src/applications/identity/identity.c:1058
 #, c-format
-msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
+msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/server/connection.c:1211
+#: src/applications/identity/identity.c:1061
 #, c-format
-msgid "Message details: %u: length %d, priority: %d\n"
+msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/server/connection.c:2897
+#: src/applications/testbed/commands.c:1179
+#: src/applications/stats/gnunet-stats.c:61
 #, c-format
-msgid "Message from `%s' discarded: invalid format.\n"
+msgid "Supported peer-to-peer messages:\n"
 msgstr ""
 
-#: src/server/connection.c:2982
+#: src/applications/testbed/commands.c:1181
+#: src/applications/stats/gnunet-stats.c:64
 #, c-format
-msgid "Invalid sequence number %u <= %u, dropping message.\n"
+msgid "Supported client-server messages:\n"
 msgstr ""
 
-#: src/server/connection.c:3004
-msgid "Message received more than one day old. Dropped.\n"
+#: src/applications/testbed/gnunet-testbed.c:118
+msgid "Start GNUnet-testbed helper."
 msgstr ""
 
-#: src/server/connection.c:3500
-msgid "# outgoing messages dropped"
+#: src/applications/testbed/gnunet-testbed.c:176
+#, c-format
+msgid "Cannot connect to LOOPBACK port %d: %s\n"
 msgstr ""
 
-#: src/server/connection.c:3503
-msgid "# bytes of outgoing messages dropped"
+#: src/applications/testbed/gnunet-testbed.c:268
+#, c-format
+msgid "Could not execute `%s': %s\n"
 msgstr ""
 
-#: src/server/connection.c:3505
-msgid "# connections closed (HANGUP sent)"
+#: src/applications/testbed/gnunet-testbed.c:314
+msgid "No client service started. Trying again in 30 seconds.\n"
 msgstr ""
 
-#: src/server/connection.c:3509
-msgid "# connections closed (transport issue)"
+#: src/applications/testbed/gnunet-testbed.c:329
+#, c-format
+msgid ""
+"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
+"Trying again in %d seconds...\n"
 msgstr ""
 
-#: src/server/connection.c:3512
-msgid "# bytes encrypted"
+#: src/applications/testbed/gnunet-testbed.c:392
+#, c-format
+msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/server/connection.c:3516
-msgid "# bytes transmitted"
+#: src/applications/testbed/gnunet-testbed.c:406
+#, c-format
+msgid "Protocol violation on socket. Expected command.\n"
 msgstr ""
 
-#: src/server/connection.c:3520
-msgid "# bytes received"
+#: src/applications/testbed/gnunet-testbed.c:446
+#, c-format
+msgid "Command `%s' not found!\n"
 msgstr ""
 
-#: src/server/connection.c:3522
-msgid "# bytes decrypted"
+#: src/applications/testbed/gnunet-testbed.c:510
+msgid "Start GNUnet testbed controller."
 msgstr ""
 
-#: src/server/connection.c:3523
-msgid "# bytes noise sent"
+#: src/applications/testbed/gnunet-testbed.c:572
+#, c-format
+msgid "Malformed entry in the configuration in section %s under %s: %s\n"
 msgstr ""
 
-#: src/server/connection.c:3526
-msgid "# total bytes per second send limit"
+#: src/applications/testbed/testbed.c:53
+msgid "Could not send acknowledgement back to client.\n"
 msgstr ""
 
-#: src/server/connection.c:3529
-msgid "# total bytes per second receive limit"
+#: src/applications/testbed/testbed.c:64
+#, c-format
+msgid "Received unknown testbed message of type %u.\n"
 msgstr ""
 
-#: src/server/connection.c:3532
-msgid "# total number of messages in send buffers"
+#: src/applications/testbed/testbed.c:82
+#: src/applications/testbed/testbed.c:848
+#, c-format
+msgid "size of `%s' message is too short. Ignoring.\n"
 msgstr ""
 
-#: src/server/connection.c:3536
-msgid "# total number of bytes we were allowed to sent but did not"
+#: src/applications/testbed/testbed.c:90
+#, c-format
+msgid "size of `%s' message is wrong. Ignoring.\n"
 msgstr ""
 
-#: src/server/connection.c:3540
-msgid "# total number of bytes we were allowed to sent"
+#: src/applications/testbed/testbed.c:145
+#, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
 msgstr ""
 
-#: src/server/connection.c:3544
-msgid "# total number of bytes we are currently allowed to send"
+#: src/applications/testbed/testbed.c:223
+#: src/applications/testbed/testbed.c:268
+#: src/applications/testbed/testbed.c:381
+#: src/applications/testbed/testbed.c:390
+#: src/applications/testbed/testbed.c:434
+#: src/applications/testbed/testbed.c:443
+#, c-format
+msgid "received invalid `%s' message\n"
 msgstr ""
 
-#: src/server/connection.c:3547
-msgid "# transports switched to stream transport"
-msgstr ""
-
-#: src/server/startup.c:206
+#: src/applications/testbed/testbed.c:240
+#: src/applications/testbed/testbed.c:284
 #, c-format
-msgid "Unable to obtain filesystem information for `%s': %u\n"
+msgid "received invalid `%s' message (empty module name)\n"
 msgstr ""
 
-#: src/server/startup.c:223
+#: src/applications/testbed/testbed.c:247
 #, c-format
-msgid ""
-"Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
-"address@hidden"
+msgid "loading module `%s' failed.  Notifying client.\n"
 msgstr ""
 
-#: src/server/startup.c:237
-#, c-format
-msgid ""
-"Limiting datastore size to %llu GB, because the `%s' filesystem does not "
-"support larger files. Please consider storing the database on a NTFS "
-"partition!\n"
+#: src/applications/testbed/testbed.c:291
+msgid "unloading module failed.  Notifying client.\n"
 msgstr ""
 
-#: src/server/startup.c:274
+#: src/applications/testbed/testbed.c:576
 #, c-format
-msgid "Insufficient access permissions for `%s': %s\n"
+msgid "`%s' %s failed: %s\n"
 msgstr ""
 
-#: src/server/gnunetd.c:85
+#: src/applications/testbed/testbed.c:658
 #, c-format
-msgid "`%s' startup complete.\n"
+msgid "received invalid `%s' message: %s.\n"
 msgstr ""
 
-#: src/server/gnunetd.c:89
+#: src/applications/testbed/testbed.c:861
 #, c-format
-msgid "`%s' is shutting down.\n"
+msgid "'..' is not allowed in file name (%s).\n"
 msgstr ""
 
-#: 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"
+#: src/applications/testbed/testbed.c:872
+msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
 msgstr ""
 
-#: src/server/gnunetd.c:196
-msgid "Starts the gnunetd daemon."
+#: src/applications/testbed/testbed.c:881
+msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
 msgstr ""
 
-#: src/server/gnunetd.c:199
-msgid "disable padding with random data (experimental)"
+#: src/applications/testbed/testbed.c:889
+msgid "Upload refused!"
 msgstr ""
 
-#: src/server/gnunetd.c:203
-msgid "print all log messages to the console (only works together with -d)"
+#: src/applications/testbed/testbed.c:919
+#, c-format
+msgid "Invalid message received at %s:%d."
 msgstr ""
 
-#: src/server/gnunetd.c:207
-msgid "specify username as which gnunetd should run"
+#: src/applications/testbed/testbed.c:1041
+#, c-format
+msgid "received invalid testbed message of size %u\n"
 msgstr ""
 
-#: src/server/gnunetd.c:271
+#: src/applications/testbed/testbed.c:1064
 #, c-format
-msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
+msgid ""
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
 msgstr ""
 
-#: src/server/core.c:126
-#, c-format
-msgid "Application module `%s' already initialized!\n"
+#: src/applications/testbed/testbed.c:1110
+msgid "No testbed URL given, not registered.\n"
 msgstr ""
 
-#: src/server/core.c:177
+#: src/applications/testbed/testbed.c:1121
 #, c-format
-msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
+msgid "Could not resolve name of HTTP proxy `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:226
+#: src/applications/testbed/testbed.c:1151
 #, c-format
-msgid "Could not shutdown `%s': application not loaded\n"
+msgid "Invalid URL `%s' (must begin with `%s')\n"
 msgstr ""
 
-#: src/server/core.c:234
+#: src/applications/testbed/testbed.c:1194
 #, c-format
-msgid "Could not shutdown application `%s': not initialized\n"
+msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
 msgstr ""
 
-#: src/server/core.c:243
+#: src/applications/testbed/testbed.c:1229
 #, c-format
-msgid "Could not find '%s%s' method in library `%s'.\n"
+msgid "Could not register testbed, host `%s' unknown\n"
 msgstr ""
 
-#: src/server/core.c:386
+#: src/applications/testbed/testbed.c:1251
 #, c-format
-msgid "Could not release %p: service not loaded\n"
+msgid "Failed to send HTTP request to host `%s': %s\n"
 msgstr ""
 
-#: src/server/core.c:492
+#: src/applications/testbed/testbed.c:1289
 #, c-format
-msgid "Could not properly shutdown application `%s'.\n"
+msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
 msgstr ""
 
-#: src/server/core.c:628
-#, c-format
-msgid "Could not properly unload service `%s'!\n"
+#: src/applications/testbed/testbed.c:1327
+msgid "Exit register (error: no http response read).\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:122
-#, c-format
-msgid "`%s': Could not create hello.\n"
+#: src/applications/testbed/testbed.c:1434
+msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:129
+#: src/applications/transport/transport.c:192
 #, c-format
-msgid "`%s': Could not connect.\n"
+msgid ""
+"Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:161
+#: src/applications/transport/transport.c:247
 #, c-format
-msgid "`%s': Could not send.\n"
+msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:176
+#: src/applications/transport/transport.c:300
 #, c-format
-msgid "`%s': Did not receive message within %llu ms.\n"
+msgid ""
+"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:189
+#: src/applications/transport/transport.c:377
 #, c-format
-msgid "`%s': Could not disconnect.\n"
+msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:196
+#: src/applications/transport/transport.c:500
 #, c-format
-msgid ""
-"`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
-"each.\n"
+msgid "No transport of type %d known.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:226
-#, c-format
-msgid " Transport %d is not being tested\n"
+#: src/applications/transport/transport.c:559
+msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:255
+#: src/applications/transport/transport.c:760
 #, c-format
-msgid ""
-"\n"
-"Contacting `%s'."
+msgid "Loading transports `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:280
+#: src/applications/transport/transport.c:780
 #, c-format
-msgid " Connection failed\n"
+msgid "Could not load transport plugin `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:286
+#: src/applications/transport/transport.c:794
 #, c-format
-msgid " Connection failed (bug?)\n"
+msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:323
+#: src/applications/transport/transport.c:823
 #, c-format
-msgid "Timeout after %llums.\n"
+msgid "Loaded transport `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:325
+#: src/applications/transport/transport.c:835
 #, c-format
-msgid "OK!\n"
+msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:350
-msgid "Tool to test if GNUnet transport services are operational."
+#: src/applications/stats/sqstats.c:151
+msgid "# Any-Blocks"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:354
-msgid "ping peers from HOSTLISTURL that match transports"
+#: src/applications/stats/sqstats.c:152
+msgid "# DBlocks"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:357
-msgid "send COUNT messages"
+#: src/applications/stats/sqstats.c:153
+msgid "# SBlocks"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:360
-msgid "send messages with SIZE bytes payload"
+#: src/applications/stats/sqstats.c:154
+msgid "# KBlocks"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:363
-msgid "specifies which TRANSPORT should be tested"
+#: src/applications/stats/sqstats.c:155
+msgid "# NBlocks"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:366
-msgid "specifies after how many MS to time-out"
+#: src/applications/stats/sqstats.c:156
+msgid "# KNBlocks"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:374
-msgid "repeat each test X times"
+#: src/applications/stats/sqstats.c:157
+msgid "# OnDemand-Blocks"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:435
-#, c-format
-msgid "Testing transport(s) %s\n"
+#: src/applications/stats/sqstats.c:158
+msgid "# Unknown-Blocks"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:437
-#, c-format
-msgid "Available transport(s): %s\n"
+#: src/applications/stats/sqstats.c:159
+msgid "# expired"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:478
+#: src/applications/stats/sqstats.c:160
+msgid "# expire in 1h"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:161
+msgid "# expire in 24h"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:162
+msgid "# expire in 1 week"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:163
+msgid "# expire in 1 month"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:164
+msgid "# zero priority"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:165
+msgid "# priority one"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:166
+msgid "# priority larger than one"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:167
+msgid "# no anonymity"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:168
+msgid "# anonymity one"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:169
+msgid "# anonymity larger than one"
+msgstr ""
+
+#: src/applications/stats/clientapi.c:333
+msgid "Uptime (seconds)"
+msgstr ""
+
+#: src/applications/stats/statistics.c:228
 #, c-format
-msgid ""
-"\n"
-"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
+msgid "% of allowed network load (up)"
 msgstr ""
 
-#: src/server/tcpserver.c:109
+#: src/applications/stats/statistics.c:230
 #, c-format
-msgid "The `%s' request received from client is malformed.\n"
+msgid "% of allowed network load (down)"
 msgstr ""
 
-#: src/server/tcpserver.c:324
+#: src/applications/stats/statistics.c:231
 #, c-format
-msgid "`%s' failed for port %d. Is gnunetd already running?\n"
+msgid "% of allowed cpu load"
 msgstr ""
 
-#: src/server/tcpserver.c:398
+#: src/applications/stats/statistics.c:232
 #, c-format
-msgid ""
-"Malformed network specification in the configuration in section `%s' for "
-"entry `%s': %s\n"
+msgid "% of allowed io load"
 msgstr ""
 
-#: src/server/tcpserver.c:454
+#: src/applications/stats/statistics.c:235
+msgid "# bytes of noise received"
+msgstr ""
+
+#: src/applications/stats/statistics.c:237
+msgid "# plibc handles"
+msgstr ""
+
+#: src/applications/stats/statistics.c:421
 #, c-format
-msgid "%s failed, message type %d already in use.\n"
+msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr ""
 
-#: src/server/handler.c:428
+#: src/applications/stats/statistics.c:445
+msgid "keeps statistics about gnunetd's operation"
+msgstr ""
+
+#: src/applications/stats/gnunet-stats.c:87
+msgid "prints supported protocol messages"
+msgstr ""
+
+#: src/applications/stats/gnunet-stats.c:136
 #, c-format
-msgid "Received corrupt message from peer `%s'in %s:%d.\n"
+msgid "Error reading information from gnunetd.\n"
 msgstr ""
 
-#: src/server/version.c:141
-msgid ""
-"Failed to determine filename used to store GNUnet version information!\n"
+#: src/applications/tbench/gnunet-tbench.c:63
+#: src/applications/tracekit/gnunet-tracekit.c:54
+msgid "Start GNUnet transport benchmarking tool."
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:53
-msgid "Print information about GNUnet peers."
+#: src/applications/tbench/gnunet-tbench.c:65
+msgid "output in gnuplot format"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:57
-msgid "don't resolve host names"
+#: src/applications/tbench/gnunet-tbench.c:69
+msgid "number of iterations"
 msgstr ""
 
-#: 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"
+#: src/applications/tbench/gnunet-tbench.c:73
+msgid "number of messages to use per iteration"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:133
-msgid "hello message invalid (signature invalid).\n"
+#: src/applications/tbench/gnunet-tbench.c:76
+msgid "receiver host identifier (ENC file name)"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:154
+#: src/applications/tbench/gnunet-tbench.c:79
+msgid "message size"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:82
+msgid "sleep for SPACE ms after each a message block"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:85
+msgid "time to wait for the completion of an iteration (in ms)"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:90
+msgid "number of messages in a message block"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:142
 #, c-format
-msgid "Peer `%s' with trust %8u\n"
+msgid "You must specify a receiver!\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:158
+#: src/applications/tbench/gnunet-tbench.c:152
 #, c-format
-msgid "Peer `%s' with trust %8u and address `%s'\n"
+msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 
-#: src/util/boot/startup.c:199
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
-msgid "Failed to run %s: %s %d\n"
+msgid "Time:\n"
 msgstr ""
 
-#: 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."
+#: src/applications/tbench/gnunet-tbench.c:190
+#, c-format
+msgid "\tmax      %llums\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:111
+#: src/applications/tbench/gnunet-tbench.c:191
 #, c-format
-msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'"
+msgid "\tmin      %llums\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:290
+#: src/applications/tbench/gnunet-tbench.c:192
 #, c-format
-msgid "Cannot connect to %s:%u: %s\n"
+msgid "\tmean     %8.4fms\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:327
+#: src/applications/tbench/gnunet-tbench.c:193
 #, c-format
-msgid "Error connecting to %s:%u\n"
+msgid "\tvariance %8.4fms\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:338
+#: src/applications/tbench/gnunet-tbench.c:195
 #, c-format
-msgid "Failed to connect to %s:%u in %ds\n"
+msgid "Loss:\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:494
+#: src/applications/tbench/gnunet-tbench.c:196
 #, c-format
-msgid "`%s' failed, reply invalid!\n"
+msgid "\tmax      %u\n"
 msgstr ""
 
-#: src/util/crypto/hostkey_gcrypt.c:898
+#: src/applications/tbench/gnunet-tbench.c:197
 #, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
+msgid "\tmin      %u\n"
 msgstr ""
 
-#: src/util/crypto/locking_gcrypt.c:80
+#: src/applications/tbench/gnunet-tbench.c:198
 #, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgid "\tmean     %8.4f\n"
 msgstr ""
 
-#: src/util/os/statuscalls.c:195 src/util/os/statuscalls.c:336
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
-msgid "Failed to parse interface data from `%s'.\n"
+msgid "\tvariance %8.4f\n"
 msgstr ""
 
-#: src/util/os/statuscalls.c:379 src/util/os/statuscalls.c:389
+#: src/applications/tbench/gnunet-tbench.c:205
 #, c-format
-msgid ""
-"No network interfaces defined in configuration section `%s' under `%s'!\n"
+msgid "Output format not known, this should not happen.\n"
 msgstr ""
 
-#: src/util/os/semaphore.c:218
+#: src/applications/tbench/gnunet-tbench.c:211
 #, c-format
-msgid "Can't create semaphore: %i"
+msgid ""
+"\n"
+"Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:124
-msgid "Setting open descriptor limit not supported.\n"
+#: src/applications/tbench/tbench.c:420
+msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/util/os/osconfig.c:391
+#: src/applications/tbench/tbenchtest.c:53
 #, c-format
-msgid "Command `%s' failed with error code %u\n"
+msgid "Using %u messages of size %u for %u times.\n"
 msgstr ""
 
-#: src/util/os/dso.c:59
+#: src/applications/tbench/tbenchtest.c:85
 #, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
+msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/util/os/dso.c:119
+#: src/applications/tbench/tbenchtest.c:89
 #, c-format
-msgid "`%s' failed for library `%s' with error: %s\n"
+msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/util/os/dso.c:159
+#: src/applications/tbench/tbenchtest.c:95
 #, c-format
-msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgid ""
+"\n"
+"Failed to receive reply from gnunetd.\n"
 msgstr ""
 
-#: src/util/os/cpustatus.c:461
-msgid "Cannot query the CPU usage (Windows NT).\n"
+#: src/applications/tbench/tbenchtest.c:151
+#, c-format
+msgid "Running benchmark...\n"
 msgstr ""
 
-#: src/util/os/cpustatus.c:483
-msgid "Cannot query the CPU usage (Win 9x)\n"
+#: src/applications/tracekit/gnunet-tracekit.c:47
+msgid "probe network to the given DEPTH"
 msgstr ""
 
-#: src/util/os/user.c:134 src/util/os/user.c:176
-#, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
+#: src/applications/tracekit/gnunet-tracekit.c:51
+msgid ""
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/util/os/user.c:135
-msgid "No such user"
+#: src/applications/tracekit/gnunet-tracekit.c:58
+msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/util/os/user.c:149
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
+#: src/applications/tracekit/gnunet-tracekit.c:62
+msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/util/os/priority.c:78
+#: src/applications/tracekit/gnunet-tracekit.c:110
 #, c-format
-msgid "Invalid process priority `%s'\n"
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
 msgstr ""
 
-#: src/util/network/select.c:304
-msgid "Received malformed message (too small) from connection. Closing.\n"
+#: src/applications/tracekit/gnunet-tracekit.c:164
+#, c-format
+msgid "`%s' is not connected to any peer.\n"
 msgstr ""
 
-#: src/util/network/select.c:473
+#: src/applications/tracekit/gnunet-tracekit.c:207
 #, c-format
-msgid "select listen socket for `%s' not valid!\n"
+msgid "`%s' connected to `%s'.\n"
 msgstr ""
 
-#: 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
+#: src/applications/tracekit/gnunet-tracekit.c:220
 #, c-format
-msgid "Invalid format for IP: `%s'\n"
+msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:162
+#: src/applications/tracekit/gnunet-tracekit.c:246
 #, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgid "Peer `%s' did not report back.\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:259
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
+#: src/applications/tracekit/gnunet-tracekit.c:348
+msgid "Could not send request to gnunetd.\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:291
+#: src/applications/tracekit/tracekit.c:74
+#: src/applications/tracekit/tracekit.c:216
 #, c-format
-msgid "Wrong format `%s' for netmask: %s\n"
+msgid "Received invalid `%s' message from `%s'.\n"
 msgstr ""
 
-#: src/util/network/ipcheck.c:304
+#: src/applications/tracekit/tracekit.c:283
+msgid "TRACEKIT: routing table full, trace request dropped\n"
+msgstr ""
+
+#: src/applications/tracekit/tracekit.c:362
 #, c-format
-msgid "Wrong format `%s' for network: %s\n"
+msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr ""
 
-#: src/util/network/ip.c:195
+#: src/applications/tracekit/tracekit.c:462
+msgid "allows mapping of the network topology"
+msgstr ""
+
+#: src/applications/getoption/getoption.c:78
 #, c-format
-msgid ""
-"Could not find interface `%s' using `%s', trying to find another interface.\n"
+msgid "`%s' registering client handler %d\n"
 msgstr ""
 
-#: src/util/network/ip.c:268
+#: src/applications/getoption/getoption.c:88
+msgid "allows clients to determine gnunetd's configuration"
+msgstr ""
+
+#: src/applications/template/gnunet-template.c:42
+msgid "Template description."
+msgstr ""
+
+#: src/applications/template/template.c:70
 #, c-format
-msgid "Could not find an IP address for interface `%s'.\n"
+msgid "`%s' registering client handler %d and %d\n"
 msgstr ""
 
-#: src/util/network/ip.c:277
+#: src/applications/bootstrap_http/http.c:110
 #, c-format
-msgid ""
-"There is more than one IP address specified for interface `%s'.\n"
-"GNUnet will use %u.%u.%u.%u.\n"
+msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr ""
 
-#: src/util/network/ip.c:297
+#: src/applications/bootstrap_http/http.c:178
+msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:219
 #, c-format
-msgid "Could not resolve `%s' to determine our IP address: %s\n"
+msgid "Bootstrapping using `%s'.\n"
 msgstr ""
 
-#: src/util/network/ip.c:326
+#: src/applications/bootstrap_http/http.c:234
 #, c-format
-msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
+msgid "Trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/util/disk/storage.c:198
+#: src/applications/bootstrap_http/http.c:364
 #, c-format
-msgid "`%s' failed for drive `%s': %u\n"
+msgid "Downloaded %llu bytes from `%s'.\n"
 msgstr ""
 
-#: src/util/disk/storage.c:526
+#: src/applications/bootstrap_http/http.c:397
+msgid "# HELLOs downloaded via http"
+msgstr ""
+
+#: src/applications/traffic/traffic.c:454
 #, c-format
-msgid "Expected `%s' to be a directory!\n"
+msgid "# bytes transmitted of type %d"
 msgstr ""
 
-#: src/util/config_impl/impl.c:290
+#: src/applications/traffic/traffic.c:470
 #, c-format
-msgid "Syntax error in configuration file `%s' at line %d.\n"
+msgid "# bytes received of type %d"
 msgstr ""
 
-#: src/util/config_impl/impl.c:533
+#: src/applications/traffic/traffic.c:489
 #, c-format
-msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgid "# bytes received in plaintext of type %d"
 msgstr ""
 
-#: src/util/config_impl/impl.c:579
+#: src/applications/traffic/traffic.c:650
+msgid "tracks bandwidth utilization by gnunetd"
+msgstr ""
+
+#: src/applications/dstore_mysql/dstore_mysql.c:636
+msgid "Failed to initialize MySQL database connection for dstore.\n"
+msgstr ""
+
+#: src/applications/dstore_mysql/dstore_mysql.c:661
+#: src/applications/dstore_sqlite/dstore.c:535
+msgid "# bytes in dstore"
+msgstr ""
+
+#: src/server/connection.c:1214
 #, c-format
-msgid ""
-"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
-"llu,%llu]\n"
+msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:589
+#: src/server/connection.c:1224
 #, c-format
-msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
+msgid "Message details: %u: length %d, priority: %d\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:672
+#: src/server/connection.c:2986
 #, c-format
-msgid ""
-"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
-"choices\n"
+msgid "Message from `%s' discarded: invalid format.\n"
 msgstr ""
 
-#: src/util/error/error.c:115
+#: src/server/connection.c:3075
 #, c-format
-msgid ""
-"\n"
-"Press any key to continue\n"
+msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/util/error/error.c:187 src/util/error/error.c:222
-msgid "DEBUG"
+#: src/server/connection.c:3097
+msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/util/error/error.c:189 src/util/error/error.c:224
-msgid "STATUS"
+#: src/server/connection.c:3608
+msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/util/error/error.c:191 src/util/error/error.c:228
-msgid "WARNING"
+#: src/server/connection.c:3611
+msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/util/error/error.c:193 src/util/error/error.c:230
-msgid "ERROR"
+#: src/server/connection.c:3613
+msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/util/error/error.c:195 src/util/error/error.c:232
-msgid "FATAL"
+#: src/server/connection.c:3617
+msgid "# connections closed (transport issue)"
 msgstr ""
 
-#: src/util/error/error.c:197 src/util/error/error.c:234
-msgid "USER"
+#: src/server/connection.c:3620
+msgid "# bytes encrypted"
 msgstr ""
 
-#: src/util/error/error.c:199 src/util/error/error.c:236
-msgid "ADMIN"
+#: src/server/connection.c:3624
+msgid "# bytes transmitted"
 msgstr ""
 
-#: src/util/error/error.c:201 src/util/error/error.c:238
-msgid "DEVELOPER"
+#: src/server/connection.c:3628
+msgid "# bytes received"
 msgstr ""
 
-#: src/util/error/error.c:203 src/util/error/error.c:240
-msgid "REQUEST"
+#: src/server/connection.c:3630
+msgid "# bytes decrypted"
 msgstr ""
 
-#: src/util/error/error.c:205 src/util/error/error.c:242
-msgid "BULK"
+#: src/server/connection.c:3631
+msgid "# bytes noise sent"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:244
-msgid "IMMEDIATE"
+#: src/server/connection.c:3634
+msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/util/error/error.c:209
-msgid "ALL"
+#: src/server/connection.c:3637
+msgid "# total bytes per second receive limit"
 msgstr ""
 
-#: src/util/error/error.c:226
-msgid "INFO"
+#: src/server/connection.c:3640
+msgid "# total number of messages in send buffers"
 msgstr ""
 
-#: src/util/error/error.c:245
-msgid "NOTHING"
+#: src/server/connection.c:3644
+msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: 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"
+#: src/server/connection.c:3648
+msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/util/threads/mutex.c:152 src/util/threads/mutex.c:194
-#, c-format
-msgid "Invalid argument for `%s'.\n"
+#: src/server/connection.c:3652
+msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
-#: src/util/threads/mutex.c:156
+#: src/server/connection.c:3655
+msgid "# transports switched to stream transport"
+msgstr ""
+
+#: src/server/startup.c:215
 #, c-format
-msgid "Deadlock due to `%s'.\n"
+msgid "Unable to obtain filesystem information for `%s': %u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:181
+#: src/server/startup.c:233
 #, c-format
-msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
+msgid ""
+"Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
+"address@hidden"
 msgstr ""
 
-#: src/util/threads/mutex.c:198
+#: src/server/startup.c:248
 #, c-format
-msgid "Permission denied for `%s'.\n"
+msgid ""
+"Limiting datastore size to %llu GB, because the `%s' filesystem does not "
+"support larger files. Please consider storing the database on a NTFS "
+"partition!\n"
 msgstr ""
 
-#: src/util/threads/pthread.c:165 src/util/threads/pthread.c:171
-#: src/util/threads/pthread.c:176 src/util/threads/pthread.c:264
+#: src/server/startup.c:287
 #, c-format
-msgid "`%s' failed with error code %s: %s\n"
+msgid "Insufficient access permissions for `%s': %s\n"
 msgstr ""
 
-#: src/util/threads/pthread.c:181 src/util/threads/pthread.c:273
+#: src/server/gnunetd.c:83
 #, c-format
-msgid "`%s' failed with error code %d: %s\n"
+msgid "`%s' startup complete.\n"
 msgstr ""
 
-#: src/util/loggers/file.c:229
+#: src/server/gnunetd.c:87
 #, c-format
-msgid "Failed to open log-file `%s': %s\n"
+msgid "`%s' is shutting down.\n"
 msgstr ""
 
-#: src/util/loggers/file.c:248
-msgid "GNUnet error log"
+#: src/server/gnunetd.c:121 src/server/gnunet-update.c:222
+msgid "Core initialization failed.\n"
 msgstr ""
 
-#: 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"
+#: src/server/gnunetd.c:176
+msgid ""
+"run in debug mode; gnunetd will not daemonize and error messages will be "
+"written to stderr instead of a logfile"
 msgstr ""
 
-#: src/util/loggers/memory.c:70
-msgid "Out of memory (for logging)"
+#: src/server/gnunetd.c:180
+msgid "Starts the gnunetd daemon."
 msgstr ""
 
-#: src/util/getopt/getopt.c:684
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: src/server/gnunetd.c:183
+msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:710
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
+#: src/server/gnunetd.c:187
+msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:716
+#: src/server/gnunetd.c:191
+msgid "specify username as which gnunetd should run"
+msgstr ""
+
+#: src/server/gnunetd.c:272
 #, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
+msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:737 src/util/getopt/getopt.c:909
+#: src/server/gnunet-transport-check.c:121
 #, c-format
-msgid "%s: option `%s' requires an argument\n"
+msgid "`%s': Could not create hello.\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:767
+#: src/server/gnunet-transport-check.c:128
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "`%s': Could not connect.\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:771
+#: src/server/gnunet-transport-check.c:160
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid "`%s': Could not send.\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:797
+#: src/server/gnunet-transport-check.c:175
 #, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:799
+#: src/server/gnunet-transport-check.c:188
 #, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "`%s': Could not disconnect.\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:828 src/util/getopt/getopt.c:958
+#: src/server/gnunet-transport-check.c:195
 #, c-format
-msgid "%s: option requires an argument -- %c\n"
+msgid ""
+"`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
+"each.\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:876
+#: src/server/gnunet-transport-check.c:226
 #, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+msgid " Transport %d is not being tested\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:894
+#: src/server/gnunet-transport-check.c:256
 #, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
+msgid ""
+"\n"
+"Contacting `%s'."
 msgstr ""
 
-#: src/util/getopt/getopt.c:1071 src/setup/gnunet-setup.c:273
+#: src/server/gnunet-transport-check.c:281
 #, c-format
-msgid "Use --help to get a list of options.\n"
+msgid " Connection failed\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:58
+#: src/server/gnunet-transport-check.c:287
 #, c-format
-msgid ""
-"Setting option `%s' in section `%s' to `%s' when processing command line "
-"option `%s' was denied.\n"
+msgid " Connection failed (bug?)\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:136 src/util/getopt/setoption.c:153
+#: src/server/gnunet-transport-check.c:325
 #, c-format
-msgid "You must pass a number to the `%s' option.\n"
+msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/util/getopt/printhelp.c:49
+#: src/server/gnunet-transport-check.c:327
 #, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+msgid "OK!\n"
 msgstr ""
 
-#: src/util/string/string.c:120
-msgid "ms"
+#: src/server/gnunet-transport-check.c:352
+msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/util/string/string.c:126
-msgid "s"
+#: src/server/gnunet-transport-check.c:356
+msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/util/string/string.c:130
-msgid "m"
+#: src/server/gnunet-transport-check.c:359
+msgid "send COUNT messages"
 msgstr ""
 
-#: src/util/string/string.c:134
-msgid "h"
+#: src/server/gnunet-transport-check.c:362
+msgid "send messages with SIZE bytes payload"
 msgstr ""
 
-#: src/util/string/string.c:138
-msgid " days"
+#: src/server/gnunet-transport-check.c:365
+msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/util/string/string.c:154
-msgid "b"
+#: src/server/gnunet-transport-check.c:368
+msgid "specifies after how many MS to time-out"
 msgstr ""
 
-#: src/util/string/string.c:160
-msgid "KiB"
+#: src/server/gnunet-transport-check.c:371 src/server/gnunet-update.c:271
+msgid "run as user LOGIN"
 msgstr ""
 
-#: src/util/string/string.c:164
-msgid "MiB"
+#: src/server/gnunet-transport-check.c:376
+msgid "repeat each test X times"
 msgstr ""
 
-#: src/util/string/string.c:168
-msgid "GiB"
+#: src/server/gnunet-transport-check.c:440
+#, c-format
+msgid "Testing transport(s) %s\n"
 msgstr ""
 
-#: src/util/string/string.c:172
-msgid "TiB"
+#: src/server/gnunet-transport-check.c:442
+#, c-format
+msgid "Available transport(s): %s\n"
 msgstr ""
 
-#: src/util/string/string.c:284
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
+#: src/server/gnunet-transport-check.c:489
+#, c-format
+msgid ""
+"\n"
+"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:59
-msgid "generate configuration for gnunetd, the GNUnet daemon"
+#: src/server/tcpserver.c:111
+#, c-format
+msgid "The `%s' request received from client is malformed.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:61
-msgid "Tool to setup GNUnet."
+#: src/server/tcpserver.c:336
+#, c-format
+msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:176
+#: src/server/tcpserver.c:411
 #, c-format
-msgid "Too many arguments.\n"
+msgid ""
+"Malformed network specification in the configuration in section `%s' for "
+"entry `%s': %s\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:181
-msgid "No interface specified, using default\n"
+#: src/server/tcpserver.c:468
+#, c-format
+msgid "%s failed, message type %d already in use.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:255
+#: src/server/handler.c:431
 #, c-format
-msgid "`%s' is not available."
+msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:272
+#: src/server/gnunet-update.c:146
 #, c-format
-msgid "Unknown operation `%s'\n"
+msgid "Updating data for module `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:55
-msgid "list all network adapters"
+#: src/server/gnunet-update.c:151
+#, c-format
+msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:58
-msgid "install GNUnet as Windows service"
+#: src/server/gnunet-update.c:267
+msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:61
-msgid "uninstall GNUnet service"
+#: src/server/gnunet-update.c:275
+msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:64
-msgid "increase the maximum number of TCP/IP connections"
+#: src/server/gnunet-peer-info.c:51
+msgid "Print information about GNUnet peers."
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:67
-msgid "display a file's hash value"
+#: src/server/gnunet-peer-info.c:55
+msgid "don't resolve host names"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:126
+#: src/server/gnunet-peer-info.c:120 src/server/gnunet-peer-info.c:153
 #, c-format
-msgid "GNUnet service installed successfully.\n"
+msgid "Could not get address of peer `%s'.\n"
 msgstr ""
 
-#: 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"
+#: src/server/gnunet-peer-info.c:133
+msgid "hello message invalid (signature invalid).\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:133 src/setup/gnunet-win-tool.c:161
+#: src/server/gnunet-peer-info.c:154
 #, c-format
-msgid "Error: can't open Service Control Manager: %s\n"
+msgid "Peer `%s' with trust %8u\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:138
+#: src/server/gnunet-peer-info.c:158
 #, c-format
-msgid "Error: can't create service: %s\n"
+msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:141 src/setup/gnunet-win-tool.c:173
-#, c-format
-msgid "Unknown error.\n"
+#: src/server/version.c:143
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:154
+#: src/server/core.c:129
 #, c-format
-msgid "Service deleted.\n"
+msgid "Application module `%s' already initialized!\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:166
+#: src/server/core.c:183
 #, c-format
-msgid "Error: can't access service: %s\n"
+msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:170
+#: src/server/core.c:233
 #, c-format
-msgid "Error: can't delete service: %s\n"
+msgid "Could not shutdown `%s': application not loaded\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:387
-msgid "Description"
+#: src/server/core.c:244
+#, c-format
+msgid "Could not shutdown application `%s': not initialized\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:403
-msgid "Value"
+#: src/server/core.c:254
+#, c-format
+msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:427
-msgid "Default"
+#: src/server/core.c:400
+#, c-format
+msgid "Could not release %p: service not loaded\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:442 src/setup/ncurses/wizard_curs.c:73
-msgid "Help"
+#: src/server/core.c:509
+#, c-format
+msgid "Could not properly shutdown application `%s'.\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:456
-msgid "Section"
+#: src/server/core.c:646
+#, c-format
+msgid "Could not properly unload service `%s'!\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:467
-msgid "Option"
+#: src/util/crypto/hostkey_gcrypt.c:907
+#, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:490
-msgid "Configuration saved."
+#: src/util/crypto/locking_gcrypt.c:80
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:500
-msgid "Failed to save configuration."
+#: src/util/os/statuscalls.c:197 src/util/os/statuscalls.c:342
+#, c-format
+msgid "Failed to parse interface data from `%s'.\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:526
-msgid "Configuration changed. Save?"
+#: src/util/os/statuscalls.c:387 src/util/os/statuscalls.c:397
+#, c-format
+msgid ""
+"No network interfaces defined in configuration section `%s' under `%s'!\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:539
-msgid "Error saving configuration."
+#: src/util/os/osconfig.c:127
+msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:144
-msgid "(unknown connection)"
+#: src/util/os/osconfig.c:402
+#, c-format
+msgid "Command `%s' failed with error code %u\n"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:413 src/setup/ncurses/wizard_curs.c:453
+#: src/util/os/user.c:136 src/util/os/user.c:181
 #, c-format
-msgid "Unable to save configuration file `%s':"
+msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:437
-msgid "Do you want to save the new configuration?"
+#: src/util/os/user.c:137
+msgid "No such user"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:469
-msgid "Unable to create user account:"
+#: src/util/os/user.c:152
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:477
-msgid "Unable to change startup process:"
+#: src/util/os/priority.c:78
+#, c-format
+msgid "Invalid process priority `%s'\n"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:492
-msgid ""
-"Running gnunet-update failed.\n"
-"This maybe due to insufficient permissions, please check your "
-"configuration.\n"
-"Finally, run gnunet-update manually."
+#: src/util/os/semaphore.c:223
+#, c-format
+msgid "Can't create semaphore: %i"
 msgstr ""
 
-#: src/setup/text/conf.c:79
-msgid "yes"
+#: src/util/os/dso.c:59
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:80
-msgid "no"
+#: src/util/os/dso.c:120
+#, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/setup/text/conf.c:105
+#: src/util/os/dso.c:162
 #, c-format
-msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/setup/text/conf.c:114
-msgid "\tPossible choices:\n"
+#: src/util/os/cpustatus.c:466
+msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr ""
 
-#: src/setup/text/conf.c:122
-msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
+#: src/util/os/cpustatus.c:489
+msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr ""
 
-#: src/setup/text/conf.c:124
-#, c-format
-msgid "\tEnter string (type '%s' for default value `%s'): "
+#: src/util/network_client/tcpio.c:98 src/util/network_client/tcpio.c:144
+msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/setup/text/conf.c:142
+#: src/util/network_client/tcpio.c:113
 #, c-format
-msgid "\t Enter choice (default is %c): "
+msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'"
 msgstr ""
 
-#: src/setup/text/conf.c:146
+#: src/util/network_client/tcpio.c:302
 #, c-format
-msgid "\tEnter floating point (type '%s' for default value %f): "
+msgid "Cannot connect to %s:%u: %s\n"
 msgstr ""
 
-#: src/setup/text/conf.c:152
+#: src/util/network_client/tcpio.c:340
 #, c-format
-msgid ""
-"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
-"value %llu): "
+msgid "Error connecting to %s:%u\n"
 msgstr ""
 
-#: src/setup/text/conf.c:186
+#: src/util/network_client/tcpio.c:351
 #, c-format
-msgid "Yes\n"
+msgid "Failed to connect to %s:%u in %ds\n"
 msgstr ""
 
-#: src/setup/text/conf.c:191
+#: src/util/network_client/tcpio.c:516
 #, c-format
-msgid "No\n"
+msgid "`%s' failed, reply invalid!\n"
 msgstr ""
 
-#: 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"
+#: src/util/network/select.c:310
+msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 
-#: 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
+#: src/util/network/select.c:483
 #, c-format
-msgid "Abort\n"
+msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:353 src/setup/text/conf.c:415
+#: src/util/network/ipcheck.c:106 src/util/network/ipcheck.c:136
+#: src/util/network/ipcheck.c:186 src/util/network/ipcheck.c:211
+#: src/util/network/ipcheck.c:219
 #, c-format
-msgid ""
-"\n"
-"Invalid entry, try again (use '?' for help): "
+msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/setup/text/conf.c:421
+#: src/util/network/ipcheck.c:167
 #, c-format
-msgid "Unknown kind %x (internal error).  Skipping option.\n"
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/setup/text/conf.c:482
-msgid "\tDescend? (y/n/?) "
+#: src/util/network/ipcheck.c:267
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/setup/text/conf.c:491
-msgid "Aborted.\n"
-msgstr ""
-
-#: src/setup/text/conf.c:504
-msgid "Invalid entry.\n"
-msgstr ""
-
-#: src/setup/text/conf.c:521
+#: src/util/network/ipcheck.c:300
 #, c-format
-msgid "Unknown kind %x (internal error).  Aborting.\n"
+msgid "Wrong format `%s' for netmask: %s\n"
 msgstr ""
 
-#: src/setup/text/conf.c:552
+#: src/util/network/ipcheck.c:314
 #, c-format
-msgid "You can always press ENTER to keep the current value.\n"
+msgid "Wrong format `%s' for network: %s\n"
 msgstr ""
 
-#: src/setup/text/conf.c:553
+#: src/util/network/ip.c:207
 #, c-format
-msgid "Use the '%s' key to abort.\n"
+msgid ""
+"Could not find interface `%s' using `%s', trying to find another interface.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:565 src/setup/ncurses/mconf.c:511
+#: src/util/network/ip.c:285
 #, c-format
-msgid "Configuration unchanged, no need to save.\n"
+msgid "Could not find an IP address for interface `%s'.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:571
+#: src/util/network/ip.c:295
 #, c-format
 msgid ""
-"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
-"configuration. "
+"There is more than one IP address specified for interface `%s'.\n"
+"GNUnet will use %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:586
+#: src/util/network/ip.c:317
 #, c-format
-msgid "Configuration was unchanged, no need to save.\n"
+msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr ""
 
-#: src/setup/text/conf.c:595
+#: src/util/network/ip.c:350
 #, c-format
-msgid "Configuration file `%s' written.\n"
+msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:85
-msgid "Exit"
+#: src/util/error/error.c:117
+#, c-format
+msgid ""
+"\n"
+"Press any key to continue\n"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:88
-msgid "Up"
+#: src/util/error/error.c:190 src/util/error/error.c:225
+msgid "DEBUG"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:91
-msgid "Cancel"
+#: src/util/error/error.c:192 src/util/error/error.c:227
+msgid "STATUS"
 msgstr ""
 
-#: 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?)"
+#: src/util/error/error.c:194 src/util/error/error.c:231
+msgid "WARNING"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:212 src/setup/ncurses/mconf.c:403
-msgid "Internal error! (Value invalid?)"
+#: src/util/error/error.c:196 src/util/error/error.c:233
+msgid "ERROR"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:392
-msgid "Invalid input, expecting floating point value."
+#: src/util/error/error.c:198 src/util/error/error.c:235
+msgid "FATAL"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:435
-msgid "Invalid input, expecting integer."
+#: src/util/error/error.c:200 src/util/error/error.c:237
+msgid "USER"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:443
-msgid "Value is not in legal range."
+#: src/util/error/error.c:202 src/util/error/error.c:239
+msgid "ADMIN"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:499 src/setup/ncurses/wizard_curs.c:534
-msgid "GNUnet Configuration"
+#: src/util/error/error.c:204 src/util/error/error.c:241
+msgid "DEVELOPER"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:517
-msgid "Do you wish to save your new configuration?"
+#: src/util/error/error.c:206 src/util/error/error.c:243
+msgid "REQUEST"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:531
-#, c-format
-msgid ""
-"\n"
-"End of configuration.\n"
+#: src/util/error/error.c:208 src/util/error/error.c:245
+msgid "BULK"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:536
-#, c-format
-msgid ""
-"\n"
-"Your configuration changes were NOT saved.\n"
+#: src/util/error/error.c:210 src/util/error/error.c:247
+msgid "IMMEDIATE"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:65 src/setup/lib/wizard_util.c:139
-#: src/setup/lib/wizard_util.c:194
-msgid "Error"
+#: src/util/error/error.c:212
+msgid "ALL"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:80
-msgid "Error!"
+#: src/util/error/error.c:229
+msgid "INFO"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:142
-msgid "Abort"
+#: src/util/error/error.c:248
+msgid "NOTHING"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:143
-msgid "Ok"
+#: src/util/disk/storage.c:203
+#, c-format
+msgid "`%s' failed for drive `%s': %u\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:209 src/setup/ncurses/wizard_curs.c:275
-#: src/setup/ncurses/wizard_curs.c:426
-msgid "GNUnet configuration"
+#: src/util/disk/storage.c:543
+#, c-format
+msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:211
-msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org/\n";
-"and join our community at\n"
-"\thttp://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"the GNUnet team"
+#: src/util/threads/mutex.c:146 src/util/threads/semaphore.c:168
+#: src/util/threads/pthread.c:157
+#, c-format
+msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:277
-msgid ""
-"Choose the network interface that connects your computer to the internet "
-"from the list below."
+#: src/util/threads/mutex.c:155 src/util/threads/mutex.c:201
+#, c-format
+msgid "Invalid argument for `%s'.\n"
 msgstr ""
 
-#: 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."
+#: src/util/threads/mutex.c:160
+#, c-format
+msgid "Deadlock due to `%s'.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:306
-msgid "Network configuration: interface"
+#: src/util/threads/mutex.c:187
+#, c-format
+msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:308
-msgid ""
-"What is the name of the network interface that connects your computer to the "
-"Internet?"
+#: src/util/threads/mutex.c:207
+#, c-format
+msgid "Permission denied for `%s'.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:319
-msgid "Network configuration: NAT"
+#: src/util/threads/pthread.c:169 src/util/threads/pthread.c:176
+#: src/util/threads/pthread.c:182 src/util/threads/pthread.c:276
+#, c-format
+msgid "`%s' failed with error code %s: %s\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:320
-msgid ""
-"Is this machine behind NAT?\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
-"connections through modems, ISDN cards and DNAT (also known as \"port "
-"forwarding\")."
+#: src/util/threads/pthread.c:188 src/util/threads/pthread.c:286
+#, c-format
+msgid "`%s' failed with error code %d: %s\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:333
-msgid "Network configuration: IP"
+#: src/util/loggers/file.c:236
+#, c-format
+msgid "Failed to open log-file `%s': %s\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:335
-msgid "What is this computer's public IP address or hostname?"
+#: src/util/loggers/file.c:257
+msgid "GNUnet error log"
 msgstr ""
 
-#: 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 "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If left empty, GNUnet will try to automatically detect the IP.\n"
-"You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
-"If in doubt, leave this empty."
+#: src/util/loggers/file.c:278 src/util/loggers/file.c:296
+#: src/include/gnunet_util_error.h:252 src/include/gnunet_util_error.h:259
+#: src/include/gnunet_util_error.h:266 src/include/gnunet_util_error.h:273
+#, c-format
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:351
-msgid "Bandwidth configuration: upload"
+#: src/util/loggers/memory.c:72
+msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:353
-msgid "How much upstream bandwidth (in bytes/s) may be used?"
+#: src/util/getopt/getopt.c:684
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:354
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"upstream\" is the data channel through which data is *sent* to the "
-"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
-"you have a flatrate, you can set it to the maximum speed of your internet "
-"connection. You should not use a value that is higher than what your actual "
-"connection allows."
+#: src/util/getopt/getopt.c:710
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:366
-msgid "Bandwidth configuration: download"
+#: src/util/getopt/getopt.c:716
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:368
-msgid "How much downstream bandwidth (in bytes/s) may be used?"
+#: src/util/getopt/getopt.c:737 src/util/getopt/getopt.c:909
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:369
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"downstream\" is the data channel through which data is *received* from "
-"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
-"If you have a flatrate, you can set it to the maximum speed of your internet "
-"connection. You should not use a value that is higher than what your actual "
-"connection allows."
+#: src/util/getopt/getopt.c:767
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:381
-msgid "Quota configuration"
+#: src/util/getopt/getopt.c:771
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:382
-msgid "What is the maximum size of the datastore in MB?"
+#: src/util/getopt/getopt.c:797
+#, c-format
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:383
-msgid ""
-"The GNUnet datastore contains all content that GNUnet needs to store "
-"(indexed, inserted and migrated content)."
+#: src/util/getopt/getopt.c:799
+#, c-format
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:393
-msgid "Daemon configuration: user account"
+#: src/util/getopt/getopt.c:828 src/util/getopt/getopt.c:958
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:394
-msgid "As which user should gnunetd be run?"
+#: src/util/getopt/getopt.c:876
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: 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"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the field empty to run GNUnet with system privileges.\n"
+#: src/util/getopt/getopt.c:894
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:411
-msgid "Daemon configuration: group account"
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:412
-msgid "As which group should gnunetd be run?"
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:414
+#: src/util/getopt/setoption.c:59
+#, c-format
 msgid ""
-"For security reasons, it is a good idea to let this setup create a new group "
-"for the chosen user account.\n"
-"\n"
-"You can also specify a already existant group here.\n"
-"\n"
-"Only members of this group will be allowed to start and stop the the GNUnet "
-"server and have access to GNUnet server data.\n"
+"Setting option `%s' in section `%s' to `%s' when processing command line "
+"option `%s' was denied.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:428
-msgid "Do you want to automatically launch GNUnet as a system service?"
+#: src/util/getopt/setoption.c:138 src/util/getopt/setoption.c:155
+#, c-format
+msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:430
+#: src/util/getopt/printhelp.c:49
+#, c-format
 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."
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:471
-msgid "Unable to create user account for daemon."
+#: src/util/boot/startup.c:251
+#, c-format
+msgid "Failed to run %s: %s %d\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:478
-msgid "Unable to setup autostart for daemon."
+#: src/util/config/config.c:295
+#, c-format
+msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:493
-msgid "Save configuration?"
+#: src/util/config/config.c:544
+#, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:494
-msgid "Save configuration now?"
+#: src/util/config/config.c:592
+#, c-format
+msgid ""
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:538
-msgid "Back"
-msgstr ""
-
-#: src/setup/lib/gns.c:294
+#: src/util/config/config.c:602
 #, c-format
-msgid ""
-"Configuration does not satisfy constraints of configuration specification "
-"file `%s'!\n"
+msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/setup/lib/tree.c:190
+#: src/util/config/config.c:688
 #, c-format
 msgid ""
-"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:110
-msgid "Can't open Service Control Manager"
+#: src/util/string/string.c:55
+msgid "ms"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:116
-msgid "Can't create service"
+#: src/util/string/string.c:61
+msgid "s"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:120
-msgid "Error changing the permissions of the GNUnet directory"
+#: src/util/string/string.c:65
+msgid "m"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:125
-msgid "Cannot write to the regisitry"
+#: src/util/string/string.c:69
+msgid "h"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:128
-msgid "Can't access the service"
+#: src/util/string/string.c:73
+msgid " days"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:131
-msgid "Can't delete the service"
+#: src/util/string/string.c:89
+msgid "b"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:134
-msgid "Unknown error"
+#: src/util/string/string.c:95
+msgid "KiB"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:170
-msgid "This version of Windows does not support multiple users."
+#: src/util/string/string.c:99
+msgid "MiB"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:174
-msgid "Error creating user"
+#: src/util/string/string.c:103
+msgid "GiB"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:178
-msgid "Error accessing local security policy"
+#: src/util/string/string.c:107
+msgid "TiB"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:183
-msgid "Error granting service right to user"
+#: src/util/string/string.c:226
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/lib/wizard_util.c:188
-msgid "Unknown error while creating a new user"
-msgstr ""
-
-#: src/include/gnunet_util_getopt.h:153
+#: src/include/gnunet_util_getopt.h:154
 msgid "print this help"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:162
+#: src/include/gnunet_util_getopt.h:163
 msgid "print the version number"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:168
+#: src/include/gnunet_util_getopt.h:169
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:174
+#: src/include/gnunet_util_getopt.h:175
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:180
+#: src/include/gnunet_util_getopt.h:181
 msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:186
+#: src/include/gnunet_util_getopt.h:187
 msgid "specify host on which gnunetd is running"
 msgstr ""
 
-#: 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:236
+#: src/include/gnunet_util_error.h:221 src/include/gnunet_util_error.h:223
+#: src/include/gnunet_util_error.h:229 src/include/gnunet_util_error.h:245
 #, c-format
 msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:230
+#: src/include/gnunet_util_error.h:239
 #, c-format
 msgid ""
 "External protocol violation: assertion failed at %s:%d in %s (no need to "
 "panic, we can handle this).\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
+#: src/include/gnunet_util_error.h:280 src/include/gnunet_util_error.h:287
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr ""
@@ -4068,23 +4355,35 @@
 "configuration here.  Default is no proxy."
 msgstr ""
 
-#: contrib/config-daemon.scm:224 contrib/config-client.scm:144
+#: contrib/config-daemon.scm:210
+msgid ""
+"Name of the directory where gnunetd should store contact information about "
+"peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:212
+msgid ""
+"Unless you want to share the directory directly using a webserver, the "
+"default is most likely just fine."
+msgstr ""
+
+#: contrib/config-daemon.scm:238 contrib/config-client.scm:144
 msgid "How long should logs be kept?"
 msgstr ""
 
-#: contrib/config-daemon.scm:226 contrib/config-client.scm:146
+#: contrib/config-daemon.scm:240 contrib/config-client.scm:146
 msgid ""
 "How long should logs be kept? If you specify a value greater than zero, a "
 "log is created each day with the date appended to its filename. These logs "
 "are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
 msgstr ""
 
-#: contrib/config-daemon.scm:237
+#: contrib/config-daemon.scm:251
 msgid ""
 "What maximum number of open file descriptors should be requested from the OS?"
 msgstr ""
 
-#: contrib/config-daemon.scm:239
+#: contrib/config-daemon.scm:253
 msgid ""
 "The default of 1024 should be fine for most systems.  If your system can "
 "support more, increasing the number might help support additional clients on "
@@ -4096,62 +4395,66 @@
 "run with what it is given."
 msgstr ""
 
-#: contrib/config-daemon.scm:250
+#: contrib/config-daemon.scm:264
 msgid "Where should gnunetd write the logs?"
 msgstr ""
 
-#: contrib/config-daemon.scm:262 contrib/config-client.scm:169
+#: contrib/config-daemon.scm:276
+msgid "Enable for extra-verbose logging."
+msgstr ""
+
+#: contrib/config-daemon.scm:288 contrib/config-client.scm:169
 msgid "Logging"
 msgstr ""
 
-#: contrib/config-daemon.scm:263 contrib/config-client.scm:170
+#: contrib/config-daemon.scm:289 contrib/config-client.scm:170
 msgid "Specify which system messages should be logged how"
 msgstr ""
 
-#: contrib/config-daemon.scm:267 contrib/config-client.scm:174
+#: contrib/config-daemon.scm:294 contrib/config-client.scm:174
 msgid "Logging of events for users"
 msgstr ""
 
-#: contrib/config-daemon.scm:268 contrib/config-client.scm:175
+#: contrib/config-daemon.scm:295 contrib/config-client.scm:175
 msgid "Logging of events for the system administrator"
 msgstr ""
 
-#: contrib/config-daemon.scm:280
+#: contrib/config-daemon.scm:307
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:281
+#: contrib/config-daemon.scm:308
 msgid ""
 "The default is no longer /var/run/gnunetd.pid since we could not delete the "
 "file on shutdown at that location."
 msgstr ""
 
-#: contrib/config-daemon.scm:293
+#: contrib/config-daemon.scm:320
 msgid "As which user should gnunetd run?"
 msgstr ""
 
-#: contrib/config-daemon.scm:295
+#: contrib/config-daemon.scm:322
 msgid ""
 "Empty means \"current user\". On computer startup, it is root/SYSTEM.  Under "
 "Windows, this setting affects the creation of a new system service only."
 msgstr ""
 
-#: contrib/config-daemon.scm:308
+#: contrib/config-daemon.scm:335
 msgid "Should gnunetd be automatically started when the system boots?"
 msgstr ""
 
-#: contrib/config-daemon.scm:309
+#: contrib/config-daemon.scm:336
 msgid ""
 "Set to YES if gnunetd should be automatically started on boot.  If this "
 "option is set, gnunet-setup will install a script to start the daemon upon "
 "completion.  This option may not work on all systems."
 msgstr ""
 
-#: contrib/config-daemon.scm:321
+#: contrib/config-daemon.scm:348
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:323
+#: contrib/config-daemon.scm:350
 msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
 "available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
@@ -4165,11 +4468,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:337
+#: contrib/config-daemon.scm:364
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:339
+#: contrib/config-daemon.scm:366
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -4206,11 +4509,11 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:368
+#: contrib/config-daemon.scm:395
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:369
+#: contrib/config-daemon.scm:396
 msgid ""
 "This option can be used to tell gnunetd not to open the client port.  When "
 "run like this, gnunetd will participate as a peer in the network but not "
@@ -4219,11 +4522,11 @@
 "prevent you from running diagnostic tools like gnunet-stats!"
 msgstr ""
 
-#: contrib/config-daemon.scm:381
+#: contrib/config-daemon.scm:408
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:382
+#: contrib/config-daemon.scm:409
 msgid ""
 "The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
 "peer to peers of which the hostkey has been copied by hand to data/hosts;  "
@@ -4235,15 +4538,15 @@
 "lines above would need some minor editing :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:393
+#: contrib/config-daemon.scm:420
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:405
+#: contrib/config-daemon.scm:432
 msgid "Disable automatic establishment of connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:406
+#: contrib/config-daemon.scm:433
 msgid ""
 "If this option is enabled, GNUnet will not automatically establish "
 "connections to other peers, but instead wait for applications to "
@@ -4251,21 +4554,21 @@
 "connect to us)."
 msgstr ""
 
-#: contrib/config-daemon.scm:417
+#: contrib/config-daemon.scm:444
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:418
+#: contrib/config-daemon.scm:445
 msgid ""
 "This option maybe useful during testing, but turning it off is dangerous! If "
 "in any doubt, set it to YES (which is the default)."
 msgstr ""
 
-#: contrib/config-daemon.scm:429
+#: contrib/config-daemon.scm:456
 msgid "Port for communication with GNUnet user interfaces"
 msgstr ""
 
-#: contrib/config-daemon.scm:430
+#: contrib/config-daemon.scm:457
 msgid ""
 "Which is the client-server port that is used between gnunetd and the clients "
 "(TCP only).  You may firewall this port for non-local machines (but you do "
@@ -4273,11 +4576,11 @@
 "connections from machines that are listed under TRUSTED)."
 msgstr ""
 
-#: contrib/config-daemon.scm:441
+#: contrib/config-daemon.scm:468
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:442
+#: contrib/config-daemon.scm:469
 msgid ""
 "This option specifies which hosts are trusted enough to connect as clients "
 "(to the TCP port).  This is useful if you run gnunetd on one host of your "
@@ -4288,69 +4591,69 @@
 "separated by a semicolon, spaces are not allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:481
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:455
+#: contrib/config-daemon.scm:482
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If it is set, "
 "only the specified peers are allowed. Specify the list of peer IDs (not IPs!)"
 msgstr ""
 
-#: contrib/config-daemon.scm:466
+#: contrib/config-daemon.scm:493
 msgid "Run gnunetd as this group."
 msgstr ""
 
-#: contrib/config-daemon.scm:467
+#: contrib/config-daemon.scm:494
 msgid ""
 "When started as root, gnunetd will change permissions to the given group."
 msgstr ""
 
-#: contrib/config-daemon.scm:478
+#: contrib/config-daemon.scm:505
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:479
+#: contrib/config-daemon.scm:506
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If the ID of a "
 "peer is listed here, connections from that peer will be refused.  Specify "
 "the list of peer IDs (not IPs!)"
 msgstr ""
 
-#: contrib/config-daemon.scm:490
+#: contrib/config-daemon.scm:517
 msgid "Topology Maintenance"
 msgstr ""
 
-#: contrib/config-daemon.scm:491
+#: contrib/config-daemon.scm:518
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:511
+#: contrib/config-daemon.scm:538
 msgid "General settings"
 msgstr ""
 
-#: contrib/config-daemon.scm:512
+#: contrib/config-daemon.scm:539
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:536
+#: contrib/config-daemon.scm:564
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:537
+#: contrib/config-daemon.scm:565
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:554
+#: contrib/config-daemon.scm:583
 msgid "Fundamentals"
 msgstr ""
 
-#: contrib/config-daemon.scm:574
+#: contrib/config-daemon.scm:603
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:576
+#: contrib/config-daemon.scm:605
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -4359,51 +4662,87 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:589
+#: contrib/config-daemon.scm:618 contrib/config-daemon.scm:631
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:591
+#: contrib/config-daemon.scm:619
+msgid "Which database should be used for the temporary datastore of the DHT?"
+msgstr ""
+
+#: contrib/config-daemon.scm:633
 msgid ""
-"Which topology should be used?  The only options at the moment are "
-"\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
-"to connect to a diverse set of peers, and welcome connections from anyone.  "
-"In f2f (friend-to-friend) mode, GNUnet will only allow connections from "
-"peers that are explicitly listed in a FRIENDS file.  Note that you can list "
-"peers in the FRIENDS file that run in default mode.\n"
-"\n"
-"Use f2f only if you have (trustworthy) friends that use GNUnet and are "
-"afraid of establishing (direct) connections to unknown peers."
+"Which topology should be used?  The only option at the moment is "
+"\"topology_default\""
 msgstr ""
 
-#: contrib/config-daemon.scm:607
+#: contrib/config-daemon.scm:647
+msgid ""
+"Minimum number of connected friends before this peer is allowed to connect "
+"to peers that are not listed as friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:648
+msgid ""
+"Note that this option does not guarantee that the peer will be able to "
+"connect to the specified number of friends.  Also, if the peer had connected "
+"to a sufficient number of friends and then established non-friend "
+"connections, some of the friends may drop out of the network, temporarily "
+"resulting in having fewer than the specified number of friends connected "
+"while being connected to non-friends.  However, it is guaranteed that the "
+"peer itself will never choose to drop a friend's connection if this would "
+"result in dropping below the specified number of friends (unless that number "
+"is higher than the overall connection target)."
+msgstr ""
+
+#: contrib/config-daemon.scm:659
+msgid ""
+"If set to YES, the peer is only allowed to connect to other peers that are "
+"explicitly specified as friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:660
+msgid ""
+"Use YES only if you have (trustworthy) friends that use GNUnet and are "
+"afraid of establishing (direct) connections to unknown peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:671
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:608
+#: contrib/config-daemon.scm:672
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:622
+#: contrib/config-daemon.scm:683
+msgid "Friend-to-Friend Topology Specification"
+msgstr ""
+
+#: contrib/config-daemon.scm:684
+msgid "Settings for restricting connections to friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:701
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:634
+#: contrib/config-daemon.scm:713
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:646
+#: contrib/config-daemon.scm:725
 msgid "Configuration of the MySQL database"
 msgstr ""
 
-#: contrib/config-daemon.scm:665
+#: contrib/config-daemon.scm:744
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:667
+#: contrib/config-daemon.scm:746
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -4414,19 +4753,19 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:681
+#: contrib/config-daemon.scm:760
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:693
+#: contrib/config-daemon.scm:772
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:706
+#: contrib/config-daemon.scm:785
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:708
+#: contrib/config-daemon.scm:787
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -4438,13 +4777,13 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:722
+#: contrib/config-daemon.scm:801
 msgid ""
 "MB of diskspace GNUnet can use for caching DHT index data (the data will be "
 "stored in /tmp)"
 msgstr ""
 
-#: contrib/config-daemon.scm:723
+#: contrib/config-daemon.scm:802
 msgid ""
 "DHT index data is inherently small and expires comparatively quickly.  It is "
 "deleted whenever gnunetd is shut down.\n"
@@ -4452,19 +4791,19 @@
 "The size of the DSTORE QUOTA is specified in MB."
 msgstr ""
 
-#: contrib/config-daemon.scm:737
+#: contrib/config-daemon.scm:816
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:756
+#: contrib/config-daemon.scm:835
 msgid "Applications"
 msgstr ""
 
-#: contrib/config-daemon.scm:772
+#: contrib/config-daemon.scm:851
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:773
+#: contrib/config-daemon.scm:852
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port and that cannot be traversed using UPnP.  Note "
@@ -4474,18 +4813,21 @@
 "contact you directly.  You can use 'make check' in src/transports/upnp/ to "
 "find out if your NAT supports UPnP.  You can also use gnunet-transport-check "
 "with the '-p' option in order to determine which setting results in more "
-"connections.  Use YES only if you get no connections otherwise."
+"connections.  Use YES only if you get no connections otherwise.  Set to AUTO "
+"to use YES if the local IP is belongs to a private IP network and NO "
+"otherwise."
 msgstr ""
 
-#: contrib/config-daemon.scm:784
+#: contrib/config-daemon.scm:863
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:796 contrib/config-daemon.scm:901
+#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:941
+#: contrib/config-daemon.scm:1078
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:797
+#: contrib/config-daemon.scm:876
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP.  You should disable this option if you are sure that you are "
@@ -4493,30 +4835,38 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:808 contrib/config-daemon.scm:925
-#: contrib/config-daemon.scm:980 contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:887 contrib/config-daemon.scm:1102
+#: contrib/config-daemon.scm:1157 contrib/config-daemon.scm:1222
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:820
+#: contrib/config-daemon.scm:899
 msgid ""
 "Which IPs are allowed to connect? Leave empty to use the IP of your primary "
 "network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:832
+#: contrib/config-daemon.scm:911
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:850
+#: contrib/config-daemon.scm:929
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:862
+#: contrib/config-daemon.scm:942 contrib/config-daemon.scm:1079
+msgid ""
+"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
+"supports UPnP. You should disable this option if you are sure that you are "
+"not behind a NAT.  If your NAT box does not support UPnP, having this on "
+"will not do much harm (only cost a small amount of resources)."
+msgstr ""
+
+#: contrib/config-daemon.scm:953
 msgid "Which is the external port of the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:863
+#: contrib/config-daemon.scm:954
 msgid ""
 "Use this option if your firewall maps say port 80 to your real HTTP port.  "
 "This can be useful in making the HTTP messages appear even more legit "
@@ -4524,90 +4874,128 @@
 "priviledged port)."
 msgstr ""
 
-#: contrib/config-daemon.scm:874
+#: contrib/config-daemon.scm:965
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:889
-msgid "Which port should be used by the UDP IPv4 transport?"
+#: contrib/config-daemon.scm:984
+msgid "What is the maximum transfer unit for SMTP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:902
+#: contrib/config-daemon.scm:996
+msgid "Which e-mail address should be used to send e-mail to this peer?"
+msgstr ""
+
+#: contrib/config-daemon.scm:997
 msgid ""
-"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
-"supports UPnP. You should disable this option if you are sure that you are "
-"not behind a NAT.  If your NAT box does not support UPnP, having this on "
-"will not do much harm (only cost a small amount of resources)."
+"You must make sure that e-mail received at this address is forwarded to the "
+"PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with "
+"procmail and the PIPE option to set the name of the pipe."
 msgstr ""
 
-#: contrib/config-daemon.scm:913
+#: contrib/config-daemon.scm:1008
+msgid ""
+"Which header line should other peers include in e-mails to enable filtering?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1009
+msgid ""
+"You can specify a header line here which can then be used by procmail to "
+"filter GNUnet e-mail from your inbox and forward it to gnunetd."
+msgstr ""
+
+#: contrib/config-daemon.scm:1020
+msgid "What is the filename of the pipe where gnunetd can read its e-mail?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1021
+msgid "Have a look at contrib/dot-procmailrc for an example .procmailrc file."
+msgstr ""
+
+#: contrib/config-daemon.scm:1032
+msgid "What is the name and port of the server for outgoing e-mail?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1033
+msgid "The basic format is HOSTNAME:PORT."
+msgstr ""
+
+#: contrib/config-daemon.scm:1044
+msgid "SMTP transport"
+msgstr ""
+
+#: contrib/config-daemon.scm:1066
+msgid "Which port should be used by the UDP IPv4 transport?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1090
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:937
+#: contrib/config-daemon.scm:1114
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow connections from any "
 "IP."
 msgstr ""
 
-#: contrib/config-daemon.scm:949
+#: contrib/config-daemon.scm:1126
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:968
+#: contrib/config-daemon.scm:1145
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:992 contrib/config-daemon.scm:1057
+#: contrib/config-daemon.scm:1169 contrib/config-daemon.scm:1234
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow any IP to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:1004
+#: contrib/config-daemon.scm:1181
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1021
+#: contrib/config-daemon.scm:1198
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1033
+#: contrib/config-daemon.scm:1210
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1069
+#: contrib/config-daemon.scm:1246
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1087
+#: contrib/config-daemon.scm:1264
 msgid "Network interface"
 msgstr ""
 
-#: contrib/config-daemon.scm:1099
+#: contrib/config-daemon.scm:1276
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1111
+#: contrib/config-daemon.scm:1288
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1123
+#: contrib/config-daemon.scm:1300
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1146
+#: contrib/config-daemon.scm:1324
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1158
+#: contrib/config-daemon.scm:1336
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1170
+#: contrib/config-daemon.scm:1348
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1172
+#: contrib/config-daemon.scm:1350
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -4617,11 +5005,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1183
+#: contrib/config-daemon.scm:1361
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1185
+#: contrib/config-daemon.scm:1363
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4631,36 +5019,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1196
+#: contrib/config-daemon.scm:1374
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1197
+#: contrib/config-daemon.scm:1375
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1208
+#: contrib/config-daemon.scm:1386
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1209
+#: contrib/config-daemon.scm:1387
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1220
+#: contrib/config-daemon.scm:1398
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1232
+#: contrib/config-daemon.scm:1410
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1234
+#: contrib/config-daemon.scm:1412
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -4705,11 +5093,11 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1251
+#: contrib/config-daemon.scm:1429
 msgid "Network interface to monitor"
 msgstr ""
 
-#: contrib/config-daemon.scm:1252
+#: contrib/config-daemon.scm:1430
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -4720,11 +5108,11 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1263
+#: contrib/config-daemon.scm:1441
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1288 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1466 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -4853,3 +5241,567 @@
 #: contrib/config-client.scm:368
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:9 src/setup/gtk/gnunet-setup.glade:167
+#: src/setup/gtk/gnunet-setup.glade:435 src/setup/gtk/gnunet-setup.glade:845
+#: src/setup/gtk/gnunet-setup.glade:1178
+msgid "GNUnet configuration assistant"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:34
+msgid ""
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org\n";
+"and join our community at\n"
+"\thttps://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"The GNUnet team"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:92 src/setup/gtk/gnunet-setup.glade:360
+#: src/setup/gtk/gnunet-setup.glade:767 src/setup/gtk/gnunet-setup.glade:1384
+msgid "Next"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:194
+msgid ""
+"Enter information about your network connection here.\n"
+"\n"
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL.\n"
+"\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address.\n"
+"\n"
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, check the last option on this page. Leave it "
+"unchecked on direct connections through modems, ISDN cards and DNAT (also "
+"known as \"port forwarding\")."
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:250
+msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:283
+msgid "IP-Address/Hostname:"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:296
+msgid "Network interface:"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:319
+msgid "Network connection"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:462
+msgid ""
+"You can limit GNUnet's ressource usage here.\n"
+"\n"
+"\"Bandwidth limitation\" is how much data may be sent per second. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection.\n"
+"\n"
+"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
+"to use."
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:520
+msgid "Downstream (Bytes/s):"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:547
+msgid "Upstream (Bytes/s):"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:561
+msgid "Bandwidth limitation"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:580
+msgid "Use denoted bandwidth for GNUnet"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:596
+msgid "Share denoted bandwidth with other applications"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:614
+msgid "Bandwidth sharing"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:636
+msgid "Max. CPU usage (%):"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:659
+msgid "CPU usage"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:682
+msgid "Load limitation"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:872
+msgid ""
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability.\n"
+"\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content). Its maximum size can be specified below.\n"
+"\n"
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
+"\n"
+"After changing the configuration and/or updating GNUnet, it is sometimes "
+"required to run gnunet-update to update internal data structures. Depending "
+"on the changes made, this may take some time."
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:905
+msgid "Store migrated content"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:923
+msgid "Maximum datastore size (MB):"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:952
+msgid "Start the GNUnet background process on computer startup"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:969
+msgid "Open the enhanced configurator"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:986
+msgid "Run gnunet-update"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1015 src/setup/gtk/gnunet-setup.glade:1299
+msgid "Other settings"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1100
+msgid "Finish"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1205
+msgid ""
+"Define the user and the group owning the GNUnet service here.\n"
+"\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account and a new group under which the GNUnet service is started at system "
+"startup.\n"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the fields empty to run GNUnet with system privileges."
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1239
+msgid "User account:"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1279
+msgid "Group:"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1462
+msgid "gnunet-setup"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1481
+msgid "Save configuration"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1493
+msgid "Show copyright information for gnunet-setup."
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1526
+msgid "About gnunet-setup"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1531
+msgid "(C) 2001-2007 Christian Grothoff (and other contributing authors)"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1532
+msgid "This is the configuration tool for GNUnet."
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1535
+msgid ""
+"\t\t    GNU GENERAL PUBLIC LICENSE\n"
+"\t\t       Version 2, June 1991\n"
+"\n"
+" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
+"     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+" Everyone is permitted to copy and distribute verbatim copies\n"
+" of this license document, but changing it is not allowed.\n"
+"\n"
+"\t\t\t    Preamble\n"
+"\n"
+"  The licenses for most software are designed to take away your\n"
+"freedom to share and change it.  By contrast, the GNU General Public\n"
+"License is intended to guarantee your freedom to share and change free\n"
+"software--to make sure the software is free for all its users.  This\n"
+"General Public License applies to most of the Free Software\n"
+"Foundation's software and to any other program whose authors commit to\n"
+"using it.  (Some other Free Software Foundation software is covered by\n"
+"the GNU Library General Public License instead.)  You can apply it to\n"
+"your programs, too.\n"
+"\n"
+"  When we speak of free software, we are referring to freedom, not\n"
+"price.  Our General Public Licenses are designed to make sure that you\n"
+"have the freedom to distribute copies of free software (and charge for\n"
+"this service if you wish), that you receive source code or can get it\n"
+"if you want it, that you can change the software or use pieces of it\n"
+"in new free programs; and that you know you can do these things.\n"
+"\n"
+"  To protect your rights, we need to make restrictions that forbid\n"
+"anyone to deny you these rights or to ask you to surrender the rights.\n"
+"These restrictions translate to certain responsibilities for you if you\n"
+"distribute copies of the software, or if you modify it.\n"
+"\n"
+"  For example, if you distribute copies of such a program, whether\n"
+"gratis or for a fee, you must give the recipients all the rights that\n"
+"you have.  You must make sure that they, too, receive or can get the\n"
+"source code.  And you must show them these terms so they know their\n"
+"rights.\n"
+"\n"
+"  We protect your rights with two steps: (1) copyright the software, and\n"
+"(2) offer you this license which gives you legal permission to copy,\n"
+"distribute and/or modify the software.\n"
+"\n"
+"  Also, for each author's protection and ours, we want to make certain\n"
+"that everyone understands that there is no warranty for this free\n"
+"software.  If the software is modified by someone else and passed on, we\n"
+"want its recipients to know that what they have is not the original, so\n"
+"that any problems introduced by others will not reflect on the original\n"
+"authors' reputations.\n"
+"\n"
+"  Finally, any free program is threatened constantly by software\n"
+"patents.  We wish to avoid the danger that redistributors of a free\n"
+"program will individually obtain patent licenses, in effect making the\n"
+"program proprietary.  To prevent this, we have made it clear that any\n"
+"patent must be licensed for everyone's free use or not licensed at all.\n"
+"\n"
+"  The precise terms and conditions for copying, distribution and\n"
+"modification follow.\n"
+"\n"
+"\t\t    GNU GENERAL PUBLIC LICENSE\n"
+"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
+"\n"
+"  0. This License applies to any program or other work which contains\n"
+"a notice placed by the copyright holder saying it may be distributed\n"
+"under the terms of this General Public License.  The \"Program\", below,\n"
+"refers to any such program or work, and a \"work based on the Program\"\n"
+"means either the Program or any derivative work under copyright law:\n"
+"that is to say, a work containing the Program or a portion of it,\n"
+"either verbatim or with modifications and/or translated into another\n"
+"language.  (Hereinafter, translation is included without limitation in\n"
+"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
+"\n"
+"Activities other than copying, distribution and modification are not\n"
+"covered by this License; they are outside its scope.  The act of\n"
+"running the Program is not restricted, and the output from the Program\n"
+"is covered only if its contents constitute a work based on the\n"
+"Program (independent of having been made by running the Program).\n"
+"Whether that is true depends on what the Program does.\n"
+"\n"
+"  1. You may copy and distribute verbatim copies of the Program's\n"
+"source code as you receive it, in any medium, provided that you\n"
+"conspicuously and appropriately publish on each copy an appropriate\n"
+"copyright notice and disclaimer of warranty; keep intact all the\n"
+"notices that refer to this License and to the absence of any warranty;\n"
+"and give any other recipients of the Program a copy of this License\n"
+"along with the Program.\n"
+"\n"
+"You may charge a fee for the physical act of transferring a copy, and\n"
+"you may at your option offer warranty protection in exchange for a fee.\n"
+"\n"
+"  2. You may modify your copy or copies of the Program or any portion\n"
+"of it, thus forming a work based on the Program, and copy and\n"
+"distribute such modifications or work under the terms of Section 1\n"
+"above, provided that you also meet all of these conditions:\n"
+"\n"
+"    a) You must cause the modified files to carry prominent notices\n"
+"    stating that you changed the files and the date of any change.\n"
+"\n"
+"    b) You must cause any work that you distribute or publish, that in\n"
+"    whole or in part contains or is derived from the Program or any\n"
+"    part thereof, to be licensed as a whole at no charge to all third\n"
+"    parties under the terms of this License.\n"
+"\n"
+"    c) If the modified program normally reads commands interactively\n"
+"    when run, you must cause it, when started running for such\n"
+"    interactive use in the most ordinary way, to print or display an\n"
+"    announcement including an appropriate copyright notice and a\n"
+"    notice that there is no warranty (or else, saying that you provide\n"
+"    a warranty) and that users may redistribute the program under\n"
+"    these conditions, and telling the user how to view a copy of this\n"
+"    License.  (Exception: if the Program itself is interactive but\n"
+"    does not normally print such an announcement, your work based on\n"
+"    the Program is not required to print an announcement.)\n"
+"\n"
+"These requirements apply to the modified work as a whole.  If\n"
+"identifiable sections of that work are not derived from the Program,\n"
+"and can be reasonably considered independent and separate works in\n"
+"themselves, then this License, and its terms, do not apply to those\n"
+"sections when you distribute them as separate works.  But when you\n"
+"distribute the same sections as part of a whole which is a work based\n"
+"on the Program, the distribution of the whole must be on the terms of\n"
+"this License, whose permissions for other licensees extend to the\n"
+"entire whole, and thus to each and every part regardless of who wrote it.\n"
+"\n"
+"Thus, it is not the intent of this section to claim rights or contest\n"
+"your rights to work written entirely by you; rather, the intent is to\n"
+"exercise the right to control the distribution of derivative or\n"
+"collective works based on the Program.\n"
+"\n"
+"In addition, mere aggregation of another work not based on the Program\n"
+"with the Program (or with a work based on the Program) on a volume of\n"
+"a storage or distribution medium does not bring the other work under\n"
+"the scope of this License.\n"
+"\n"
+"  3. You may copy and distribute the Program (or a work based on it,\n"
+"under Section 2) in object code or executable form under the terms of\n"
+"Sections 1 and 2 above provided that you also do one of the following:\n"
+"\n"
+"    a) Accompany it with the complete corresponding machine-readable\n"
+"    source code, which must be distributed under the terms of Sections\n"
+"    1 and 2 above on a medium customarily used for software interchange; "
+"or,\n"
+"\n"
+"    b) Accompany it with a written offer, valid for at least three\n"
+"    years, to give any third party, for a charge no more than your\n"
+"    cost of physically performing source distribution, a complete\n"
+"    machine-readable copy of the corresponding source code, to be\n"
+"    distributed under the terms of Sections 1 and 2 above on a medium\n"
+"    customarily used for software interchange; or,\n"
+"\n"
+"    c) Accompany it with the information you received as to the offer\n"
+"    to distribute corresponding source code.  (This alternative is\n"
+"    allowed only for noncommercial distribution and only if you\n"
+"    received the program in object code or executable form with such\n"
+"    an offer, in accord with Subsection b above.)\n"
+"\n"
+"The source code for a work means the preferred form of the work for\n"
+"making modifications to it.  For an executable work, complete source\n"
+"code means all the source code for all modules it contains, plus any\n"
+"associated interface definition files, plus the scripts used to\n"
+"control compilation and installation of the executable.  However, as a\n"
+"special exception, the source code distributed need not include\n"
+"anything that is normally distributed (in either source or binary\n"
+"form) with the major components (compiler, kernel, and so on) of the\n"
+"operating system on which the executable runs, unless that component\n"
+"itself accompanies the executable.\n"
+"\n"
+"If distribution of executable or object code is made by offering\n"
+"access to copy from a designated place, then offering equivalent\n"
+"access to copy the source code from the same place counts as\n"
+"distribution of the source code, even though third parties are not\n"
+"compelled to copy the source along with the object code.\n"
+"\n"
+"  4. You may not copy, modify, sublicense, or distribute the Program\n"
+"except as expressly provided under this License.  Any attempt\n"
+"otherwise to copy, modify, sublicense or distribute the Program is\n"
+"void, and will automatically terminate your rights under this License.\n"
+"However, parties who have received copies, or rights, from you under\n"
+"this License will not have their licenses terminated so long as such\n"
+"parties remain in full compliance.\n"
+"\n"
+"  5. You are not required to accept this License, since you have not\n"
+"signed it.  However, nothing else grants you permission to modify or\n"
+"distribute the Program or its derivative works.  These actions are\n"
+"prohibited by law if you do not accept this License.  Therefore, by\n"
+"modifying or distributing the Program (or any work based on the\n"
+"Program), you indicate your acceptance of this License to do so, and\n"
+"all its terms and conditions for copying, distributing or modifying\n"
+"the Program or works based on it.\n"
+"\n"
+"  6. Each time you redistribute the Program (or any work based on the\n"
+"Program), the recipient automatically receives a license from the\n"
+"original licensor to copy, distribute or modify the Program subject to\n"
+"these terms and conditions.  You may not impose any further\n"
+"restrictions on the recipients' exercise of the rights granted herein.\n"
+"You are not responsible for enforcing compliance by third parties to\n"
+"this License.\n"
+"\n"
+"  7. If, as a consequence of a court judgment or allegation of patent\n"
+"infringement or for any other reason (not limited to patent issues),\n"
+"conditions are imposed on you (whether by court order, agreement or\n"
+"otherwise) that contradict the conditions of this License, they do not\n"
+"excuse you from the conditions of this License.  If you cannot\n"
+"distribute so as to satisfy simultaneously your obligations under this\n"
+"License and any other pertinent obligations, then as a consequence you\n"
+"may not distribute the Program at all.  For example, if a patent\n"
+"license would not permit royalty-free redistribution of the Program by\n"
+"all those who receive copies directly or indirectly through you, then\n"
+"the only way you could satisfy both it and this License would be to\n"
+"refrain entirely from distribution of the Program.\n"
+"\n"
+"If any portion of this section is held invalid or unenforceable under\n"
+"any particular circumstance, the balance of the section is intended to\n"
+"apply and the section as a whole is intended to apply in other\n"
+"circumstances.\n"
+"\n"
+"It is not the purpose of this section to induce you to infringe any\n"
+"patents or other property right claims or to contest validity of any\n"
+"such claims; this section has the sole purpose of protecting the\n"
+"integrity of the free software distribution system, which is\n"
+"implemented by public license practices.  Many people have made\n"
+"generous contributions to the wide range of software distributed\n"
+"through that system in reliance on consistent application of that\n"
+"system; it is up to the author/donor to decide if he or she is willing\n"
+"to distribute software through any other system and a licensee cannot\n"
+"impose that choice.\n"
+"\n"
+"This section is intended to make thoroughly clear what is believed to\n"
+"be a consequence of the rest of this License.\n"
+"\n"
+"  8. If the distribution and/or use of the Program is restricted in\n"
+"certain countries either by patents or by copyrighted interfaces, the\n"
+"original copyright holder who places the Program under this License\n"
+"may add an explicit geographical distribution limitation excluding\n"
+"those countries, so that distribution is permitted only in or among\n"
+"countries not thus excluded.  In such case, this License incorporates\n"
+"the limitation as if written in the body of this License.\n"
+"\n"
+"  9. The Free Software Foundation may publish revised and/or new versions\n"
+"of the General Public License from time to time.  Such new versions will\n"
+"be similar in spirit to the present version, but may differ in detail to\n"
+"address new problems or concerns.\n"
+"\n"
+"Each version is given a distinguishing version number.  If the Program\n"
+"specifies a version number of this License which applies to it and \"any\n"
+"later version\", you have the option of following the terms and conditions\n"
+"either of that version or of any later version published by the Free\n"
+"Software Foundation.  If the Program does not specify a version number of\n"
+"this License, you may choose any version ever published by the Free "
+"Software\n"
+"Foundation.\n"
+"\n"
+"  10. If you wish to incorporate parts of the Program into other free\n"
+"programs whose distribution conditions are different, write to the author\n"
+"to ask for permission.  For software which is copyrighted by the Free\n"
+"Software Foundation, write to the Free Software Foundation; we sometimes\n"
+"make exceptions for this.  Our decision will be guided by the two goals\n"
+"of preserving the free status of all derivatives of our free software and\n"
+"of promoting the sharing and reuse of software generally.\n"
+"\n"
+"\t\t\t    NO WARRANTY\n"
+"\n"
+"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
+"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
+"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
+"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
+"EXPRESSED\n"
+"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
+"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
+"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
+"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
+"REPAIR OR CORRECTION.\n"
+"\n"
+"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
+"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
+"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
+"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
+"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
+"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
+"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
+"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
+"POSSIBILITY OF SUCH DAMAGES.\n"
+"\n"
+"\t\t     END OF TERMS AND CONDITIONS\n"
+"\n"
+"\t    How to Apply These Terms to Your New Programs\n"
+"\n"
+"  If you develop a new program, and you want it to be of the greatest\n"
+"possible use to the public, the best way to achieve this is to make it\n"
+"free software which everyone can redistribute and change under these terms.\n"
+"\n"
+"  To do so, attach the following notices to the program.  It is safest\n"
+"to attach them to the start of each source file to most effectively\n"
+"convey the exclusion of warranty; and each file should have at least\n"
+"the \"copyright\" line and a pointer to where the full notice is found.\n"
+"\n"
+"    <one line to give the program's name and a brief idea of what it does.>\n"
+"    Copyright (C) <year>  <name of author>\n"
+"\n"
+"    This program is free software; you can redistribute it and/or modify\n"
+"    it under the terms of the GNU General Public License as published by\n"
+"    the Free Software Foundation; either version 2 of the License, or\n"
+"    (at your option) any later version.\n"
+"\n"
+"    This program is distributed in the hope that it will be useful,\n"
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"    GNU General Public License for more details.\n"
+"\n"
+"    You should have received a copy of the GNU General Public License\n"
+"    along with this program; if not, write to the Free Software\n"
+"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+"USA\n"
+"\n"
+"\n"
+"Also add information on how to contact you by electronic and paper mail.\n"
+"\n"
+"If the program is interactive, make it output a short notice like this\n"
+"when it starts in an interactive mode:\n"
+"\n"
+"    Gnomovision version 69, Copyright (C) year  name of author\n"
+"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
+"w'.\n"
+"    This is free software, and you are welcome to redistribute it\n"
+"    under certain conditions; type `show c' for details.\n"
+"\n"
+"The hypothetical commands `show w' and `show c' should show the appropriate\n"
+"parts of the General Public License.  Of course, the commands you use may\n"
+"be called something other than `show w' and `show c'; they could even be\n"
+"mouse-clicks or menu items--whatever suits your program.\n"
+"\n"
+"You should also get your employer (if you work as a programmer) or your\n"
+"school, if any, to sign a \"copyright disclaimer\" for the program, if\n"
+"necessary.  Here is a sample; alter the names:\n"
+"\n"
+"  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
+"  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
+"\n"
+"  <signature of Ty Coon>, 1 April 1989\n"
+"  Ty Coon, President of Vice\n"
+"\n"
+"This General Public License does not permit incorporating your program into\n"
+"proprietary programs.  If your program is a subroutine library, you may\n"
+"consider it more useful to permit linking proprietary applications with the\n"
+"library.  If this is what you want to do, use the GNU Library General\n"
+"Public License instead of this License.\n"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1917
+msgid "Not for English ;-)"
+msgstr ""

Modified: GNUnet/po/POTFILES.in
===================================================================
--- GNUnet/po/POTFILES.in       2007-12-10 02:47:03 UTC (rev 5850)
+++ GNUnet/po/POTFILES.in       2007-12-10 03:20:09 UTC (rev 5851)
@@ -1,287 +1,386 @@
 libltdl/ltdl.c
+src/transports/upnp/upnp.c
+src/transports/upnp/upnptest.c
+src/transports/upnp/init.c
+src/transports/upnp/xmlnode.c
+src/transports/upnp/ip.c
+src/transports/upnp/error.c
+src/transports/upnp/util.c
 src/transports/ip6.c
+src/transports/ip.c
+src/transports/tcp6.c
 src/transports/udp6.c
 src/transports/http.c
+src/transports/test.c
 src/transports/nat.c
 src/transports/smtp.c
+src/transports/tcp_helper.c
 src/transports/tcp.c
 src/transports/udp.c
-src/transports/ip.c
-src/transports/tcp6.c
-src/transports/tcp_helper.c
-src/transports/upnp/xmlnode.c
-src/transports/upnp/upnp.c
-src/transports/upnp/ip.c
-src/transports/upnp/error.c
-src/transports/upnp/util.c
-src/transports/upnp/init.c
 src/transports/udp_helper.c
+src/transports/test_repeat.c
+src/setup/ncurses/mconf.c
+src/setup/ncurses/wizard_curs.c
+src/setup/text/conf.c
+src/setup/gtk/wizard_gtk.c
+src/setup/gtk/glade_support.c
+src/setup/gtk/about.c
+src/setup/gtk/ngconf.c
+src/setup/gtk/gconf.c
+src/setup/lib/tree.c
+src/setup/lib/gns.c
+src/setup/lib/wizard_util.c
+src/setup/gnunet-setup.c
+src/setup/gnunet-win-tool.c
+src/applications/dht/tools/dhttest.c
+src/applications/dht/tools/dhttest2.c
 src/applications/dht/tools/dht-query.c
 src/applications/dht/tools/dht_api.c
-src/applications/dht/module/table.c
-src/applications/dht/module/cs.c
 src/applications/dht/module/dstore.c
 src/applications/dht/module/service.c
+src/applications/dht/module/cs.c
 src/applications/dht/module/routing.c
-src/applications/chat/chat.c
-src/applications/chat/gnunet-chat.c
-src/applications/advertising/advertising.c
-src/applications/advertising/bootstrap.c
+src/applications/dht/module/table.c
 src/applications/topology_default/topology.c
-src/applications/pingpong/pingpong.c
-src/applications/sqstore_sqlite/sqlite.c
-src/applications/session/connect.c
 src/applications/rpc/parameters.c
+src/applications/rpc/parameterstest.c
 src/applications/rpc/rpc.c
-src/applications/sqstore_mysql/mysql.c
 src/applications/datastore/prefetch.c
 src/applications/datastore/filter.c
 src/applications/datastore/datastore.c
-src/applications/identity/hostkey.c
-src/applications/identity/identity.c
-src/applications/identity/clientapi.c
-src/applications/transport/transport.c
 src/applications/fragmentation/fragmentation.c
-src/applications/stats/gnunet-stats.c
-src/applications/stats/clientapi.c
-src/applications/stats/statistics.c
-src/applications/stats/sqstats.c
-src/applications/tbench/gnunet-tbench.c
-src/applications/tbench/tbench.c
-src/applications/tracekit/gnunet-tracekit.c
-src/applications/tracekit/tracekit.c
+src/applications/fragmentation/fragmentationtest.c
+src/applications/vpn/gnunet-vpn.c
+src/applications/vpn/vpn.c
+src/applications/gap/pid_table.c
 src/applications/gap/gap.c
-src/applications/gap/pid_table.c
-src/applications/getoption/clientapi.c
-src/applications/getoption/getoption.c
+src/applications/gap/gaptest.c
+src/applications/gap/gaptest2.c
+src/applications/gap/gaptest3.c
 src/applications/fs/tools/gnunet-pseudonym.c
 src/applications/fs/tools/gnunet-directory.c
 src/applications/fs/tools/gnunet-insert.c
 src/applications/fs/tools/gnunet-search.c
 src/applications/fs/tools/gnunet-download.c
 src/applications/fs/tools/gnunet-unindex.c
+src/applications/fs/uritrack/callbacks.c
+src/applications/fs/uritrack/tracktest.c
+src/applications/fs/uritrack/file_info.c
+src/applications/fs/uritrack/uri_info.c
+src/applications/fs/module/dht_push.c
 src/applications/fs/module/querymanager.c
 src/applications/fs/module/ondemand.c
 src/applications/fs/module/anonymity.c
 src/applications/fs/module/fs.c
 src/applications/fs/module/migration.c
-src/applications/fs/module/dht_push.c
+src/applications/fs/fsui/deserialize.c
+src/applications/fs/fsui/searchtest.c
 src/applications/fs/fsui/search.c
+src/applications/fs/fsui/fsuitest.c
 src/applications/fs/fsui/fsui.c
+src/applications/fs/fsui/downloadtest.c
 src/applications/fs/fsui/download.c
+src/applications/fs/fsui/serializetest2.c
+src/applications/fs/fsui/fsui-loader.c
+src/applications/fs/fsui/serializetest3.c
 src/applications/fs/fsui/unindex.c
+src/applications/fs/fsui/serializetest4.c
 src/applications/fs/fsui/upload.c
+src/applications/fs/fsui/serializetest.c
 src/applications/fs/fsui/serialize.c
-src/applications/fs/fsui/fsui-loader.c
-src/applications/fs/fsui/deserialize.c
+src/applications/fs/fsui/fsuitest2.c
 src/applications/fs/lib/fslib.c
+src/applications/fs/lib/fslibtest.c
+src/applications/fs/collection/collection.c
+src/applications/fs/collection/collectiontest.c
+src/applications/fs/ecrs/uritest.c
+src/applications/fs/ecrs/uri.c
 src/applications/fs/ecrs/tree.c
-src/applications/fs/ecrs/uri.c
+src/applications/fs/ecrs/directory.c
+src/applications/fs/ecrs/directorytest.c
 src/applications/fs/ecrs/keyspace.c
-src/applications/fs/ecrs/directory.c
+src/applications/fs/ecrs/searchtest.c
 src/applications/fs/ecrs/search.c
 src/applications/fs/ecrs/download.c
+src/applications/fs/ecrs/downloadtest.c
+src/applications/fs/ecrs/metatest2.c
 src/applications/fs/ecrs/unindex.c
+src/applications/fs/ecrs/helper.c
 src/applications/fs/ecrs/indexinfo.c
 src/applications/fs/ecrs/upload.c
+src/applications/fs/ecrs/bincodertest.c
+src/applications/fs/ecrs/bincoder.c
+src/applications/fs/ecrs/metatest.c
 src/applications/fs/ecrs/meta.c
+src/applications/fs/ecrs/ecrstest.c
+src/applications/fs/ecrs/ecrs.c
 src/applications/fs/ecrs/namespace.c
-src/applications/fs/ecrs/ecrs.c
-src/applications/fs/ecrs/helper.c
+src/applications/fs/ecrs/namespacetest.c
 src/applications/fs/ecrs/parser.c
-src/applications/fs/ecrs/bincoder.c
+src/applications/fs/namespace/namespace_info.c
+src/applications/fs/namespace/namespace_infotest.c
+src/applications/fs/ecrs_core_test.c
 src/applications/fs/ecrs_core.c
-src/applications/fs/uritrack/file_info.c
-src/applications/fs/uritrack/uri_info.c
-src/applications/fs/uritrack/callbacks.c
-src/applications/fs/namespace/namespace_info.c
-src/applications/fs/collection/collection.c
-src/applications/topology_f2f/topology.c
+src/applications/testing/testing.c
+src/applications/testing/testingtest.c
+src/applications/kvstore_sqlite/kv_sqlite.c
+src/applications/kvstore_sqlite/kv_sqlitetest.c
+src/applications/advertising/advertising_test.c
+src/applications/advertising/advertising.c
+src/applications/advertising/bootstrap.c
+src/applications/chat/chat.c
+src/applications/chat/clientapi.c
+src/applications/chat/gnunet-chat.c
+src/applications/state/state.c
+src/applications/state/statetest.c
+src/applications/sqstore_sqlite/sqlite.c
+src/applications/sqstore_sqlite/sqlitetest.c
+src/applications/sqstore_sqlite/sqlitetest2.c
+src/applications/sqstore_sqlite/sqlitetest3.c
+src/applications/pingpong/pingpong.c
+src/applications/session/sessiontest_http.c
+src/applications/session/sessiontest.c
+src/applications/session/sessiontest2.c
+src/applications/session/connect.c
+src/applications/sqstore_mysql/mysql.c
+src/applications/sqstore_mysql/mysqltest.c
+src/applications/sqstore_mysql/mysqltest2.c
+src/applications/sqstore_mysql/mysqltest3.c
+src/applications/identity/hostkey.c
+src/applications/identity/clientapi.c
+src/applications/identity/identity.c
+src/applications/identity/identitytest.c
+src/applications/testbed/commands.c
+src/applications/testbed/gnunet-testbed.c
+src/applications/testbed/socket.c
+src/applications/testbed/testbed.c
+src/applications/transport/transport.c
+src/applications/transport/check.c
+src/applications/stats/sqstats.c
+src/applications/stats/clientapi.c
+src/applications/stats/statistics.c
+src/applications/stats/gnunet-stats.c
+src/applications/tbench/gnunet-tbench.c
+src/applications/tbench/tbench.c
+src/applications/tbench/tbenchtest.c
+src/applications/tracekit/gnunet-tracekit.c
+src/applications/tracekit/tracekit.c
+src/applications/getoption/clientapi.c
+src/applications/getoption/getoption.c
+src/applications/template/gnunet-template.c
 src/applications/template/template.c
-src/applications/template/gnunet-template.c
 src/applications/bootstrap_http/http.c
+src/applications/bootstrap_http/httptest.c
 src/applications/traffic/traffic.c
 src/applications/traffic/clientapi.c
-src/applications/kvstore_sqlite/kv_sqlite.c
-src/applications/vpn/gnunet-vpn.c
-src/applications/vpn/vpn.c
-src/applications/state/state.c
-src/applications/dstore/dstore.c
-src/server/gnunet-update.c
+src/applications/kvstore_mysql/kv_mysql.c
+src/applications/kvstore_mysql/kv_mysqltest.c
+src/applications/dstore_mysql/dstore_test.c
+src/applications/dstore_mysql/dstore_mysql.c
+src/applications/dstore_sqlite/dstore_test.c
+src/applications/dstore_sqlite/dstore.c
 src/server/connection.c
 src/server/startup.c
 src/server/gnunetd.c
-src/server/core.c
 src/server/gnunet-transport-check.c
 src/server/tcpserver.c
 src/server/handler.c
+src/server/gnunet-update.c
+src/server/gnunet-peer-info.c
 src/server/version.c
-src/server/gnunet-peer-info.c
-src/util/win/winproc.c
-src/util/cron/cron.c
-src/util/boot/startup.c
-src/util/network_client/tcpio.c
-src/util/network_client/daemon.c
-src/util/libgnunetutil.c
-src/util/crypto/symcipher_gcrypt.c
+src/server/core.c
+src/util/crypto/hashperf.c
+src/util/crypto/weakkeytest.c
+src/util/crypto/symciphertest.c
+src/util/crypto/crctest.c
+src/util/crypto/crc32.c
+src/util/crypto/kblockkey_test.c
 src/util/crypto/hostkey_gcrypt.c
 src/util/crypto/kblockkey.c
 src/util/crypto/locking_gcrypt.c
 src/util/crypto/random.c
 src/util/crypto/hashing.c
-src/util/crypto/crc32.c
-src/util/crypto/hashperf.c
+src/util/crypto/hashingtest.c
+src/util/crypto/hostkeytest.c
+src/util/crypto/symcipher_gcrypt.c
+src/util/os/time.c
+src/util/os/statuscallstest.c
 src/util/os/statuscalls.c
+src/util/os/console.c
+src/util/os/init.c
+src/util/os/daemontest.c
 src/util/os/daemon.c
+src/util/os/osconfig.c
+src/util/os/user.c
+src/util/os/priority.c
+src/util/os/semaphoretest.c
 src/util/os/semaphore.c
-src/util/os/osconfig.c
+src/util/os/installpath.c
 src/util/os/dso.c
 src/util/os/cpustatus.c
-src/util/os/init.c
-src/util/os/time.c
-src/util/os/user.c
-src/util/os/installpath.c
-src/util/os/priority.c
-src/util/os/console.c
+src/util/config_impl/impl.c
+src/util/config_impl/configtest.c
+src/util/network_client/tcpio.c
+src/util/network_client/tcpiotest.c
+src/util/network_client/daemon.c
 src/util/network/endian.c
 src/util/network/select.c
+src/util/network/selecttest.c
+src/util/network/dns.c
+src/util/network/ipcheck.c
 src/util/network/io.c
-src/util/network/ipcheck.c
 src/util/network/ip.c
+src/util/network/ipchecktest.c
+src/util/error/error.c
 src/util/disk/storage.c
-src/util/config_impl/impl.c
-src/util/error/error.c
+src/util/disk/storagetest.c
+src/util/threads/time.c
+src/util/threads/timertest.c
 src/util/threads/mutex.c
 src/util/threads/semaphore.c
+src/util/threads/semaphoretest.c
 src/util/threads/pthread.c
 src/util/threads/shutdown.c
-src/util/threads/time.c
+src/util/threads/shutdowntest.c
+src/util/threads/shutdowntest2.c
 src/util/threads/signal.c
+src/util/win/winproc.c
+src/util/cron/timertest.c
+src/util/cron/cron.c
+src/util/cron/crontest.c
 src/util/loggers/file.c
 src/util/loggers/smtp.c
 src/util/loggers/memory.c
+src/util/getopt/getopt.c
 src/util/getopt/printversion.c
-src/util/getopt/getopt.c
 src/util/getopt/setoption.c
 src/util/getopt/printhelp.c
+src/util/boot/startup.c
 src/util/containers/bloomfilter.c
 src/util/containers/vector.c
+src/util/containers/vectortest.c
+src/util/containers/hashtest.c
+src/util/containers/bloomtest.c
 src/util/config/config.c
+src/util/config/configtest.c
 src/util/string/xmalloc.c
+src/util/string/xmalloctest.c
 src/util/string/string.c
-src/setup/gnunet-setup.c
-src/setup/gnunet-win-tool.c
-src/setup/gtk/gconf.c
-src/setup/gtk/glade_support.c
-src/setup/gtk/wizard_gtk.c
-src/setup/gtk/about.c
-src/setup/text/conf.c
-src/setup/ncurses/mconf.c
-src/setup/ncurses/wizard_curs.c
-src/setup/lib/gns.c
-src/setup/lib/tree.c
-src/setup/lib/wizard_util.c
+src/util/libgnunetutil.c
+confdefs.h
 config.h
 libltdl/ltdl.h
 libltdl/config.h
-src/transports/ip6.h
-src/transports/ip.h
+src/transports/upnp/error.h
+src/transports/upnp/util.h
 src/transports/upnp/upnp.h
 src/transports/upnp/xmlnode.h
-src/transports/upnp/error.h
-src/transports/upnp/util.h
 src/transports/upnp/ip.h
-src/include/gnunet_core.h
+src/transports/ip6.h
+src/transports/ip.h
+src/setup/ncurses/wizard_curs.h
+src/setup/ncurses/mconf.h
+src/setup/text/conf.h
+src/setup/gtk/gconf.h
+src/setup/gtk/wizard_gtk.h
+src/setup/gtk/glade_support.h
+src/setup/lib/wizard_util.h
+src/setup/lib/tree.h
+src/setup/qt/ui_gnunet-setup.h
+src/setup/qt/setupWizard.h
+src/setup/qt/ui_enhanced.h
+src/include/gnunet_directories.h
 src/include/gnunet_util.h
+src/include/gnunet_kvstore_service.h
 src/include/gnunet_fragmentation_service.h
-src/include/gnunet_getoption_lib.h
-src/include/gnunet_stats_lib.h
-src/include/gnunet_protocols.h
+src/include/gnunet_util_network_client.h
+src/include/gnunet_util_network.h
+src/include/gnunet_setup_lib.h
+src/include/gnunet_util_threads.h
 src/include/gnunet_gap_service.h
-src/include/ecrs_core.h
-src/include/core.h
 src/include/gnunet_topology_service.h
-src/include/gnunet_bootstrap_service.h
-src/include/gnunet_pingpong_service.h
+src/include/gnunet_util_cron.h
+src/include/gnunet_getoption_lib.h
+src/include/gnunet_util_getopt.h
+src/include/dht.h
+src/include/gnunet_state_service.h
 src/include/winproc.h
+src/include/gnunet_upnp_service.h
+src/include/gnunet_util_string.h
 src/include/gnunet_session_service.h
-src/include/gnunet_traffic_lib.h
-src/include/platform.h
-src/include/gnunet_dht_lib.h
-src/include/plibc.h
-src/include/gnunet_fs_lib.h
 src/include/gnunet_identity_service.h
+src/include/gnunet_uritrack_lib.h
+src/include/gnunet_stats_service.h
+src/include/gnunet_sqstore_service.h
 src/include/fs.h
 src/include/gnunet_transport.h
-src/include/gnunet_transport_service.h
-src/include/gnunet_stats_service.h
-src/include/gnunet_sqstore_service.h
-src/include/gnunet_ecrs_lib.h
+src/include/gnunet_fsui_lib.h
 src/include/gnunet_traffic_service.h
-src/include/gnunet_fsui_lib.h
-src/include/gnunet_util_boot.h
 src/include/gnunet_dht_service.h
-src/include/gnunet_rpc_service.h
+src/include/gnunet_testing_lib.h
 src/include/gettext.h
-src/include/gnunet_blockstore.h
-src/include/gnunet_datastore_service.h
-src/include/dht.h
-src/include/gnunet_util_config_impl.h
-src/include/gnunet_util_config.h
-src/include/gnunet_util_getopt.h
-src/include/gnunet_kvstore_service.h
-src/include/gnunet_testing_lib.h
-src/include/gnunet_util_network_client.h
-src/include/gnunet_setup_lib.h
-src/include/gnunet_util_os.h
+src/include/gnunet_util_error_loggers.h
 src/include/gnunet_util_crypto.h
+src/include/gnunet_identity_lib.h
+src/include/gnunet_dstore_service.h
+src/include/gnunet_stats_lib.h
+src/include/gnunet_protocols.h
+src/include/gnunet_util_common.h
 src/include/gnunet_util_error.h
-src/include/gnunet_util_network.h
-src/include/gnunet_util_cron.h
-src/include/gnunet_util_threads.h
-src/include/gnunet_util_string.h
-src/include/gnunet_dstore_service.h
-src/include/gnunet_state_service.h
+src/include/gnunet_core.h
+src/include/gnunet_bootstrap_service.h
+src/include/gnunet_pingpong_service.h
 src/include/gnunet_util_containers.h
-src/include/gnunet_identity_lib.h
-src/include/gnunet_util_disk.h
-src/include/gnunet_directories.h
-src/include/gnunet_util_error_loggers.h
-src/include/gnunet_util_common.h
+src/include/gnunet_util_config.h
+src/include/platform.h
+src/include/gnunet_traffic_lib.h
+src/include/gnunet_dht_lib.h
+src/include/core.h
+src/include/plibc.h
+src/include/gnunet_transport_service.h
+src/include/gnunet_util_os.h
 src/include/gnunet_collection_lib.h
-src/include/gnunet_uritrack_lib.h
+src/include/gnunet_ecrs_lib.h
 src/include/gnunet_namespace_lib.h
+src/include/ecrs_core.h
 src/include/gnunet_util_core.h
+src/include/gnunet_util_disk.h
 src/include/gnunet_peerinfo_lib.h
-src/include/gnunet_upnp_service.h
+src/include/gnunet_fs_lib.h
+src/include/gnunet_util_boot.h
+src/include/gnunet_rpc_service.h
+src/include/gnunet_datastore_service.h
+src/include/gnunet_blockstore.h
+src/include/gnunet_chat_lib.h
+src/include/gnunet_rpc_lib.h
+src/applications/dht/module/dstore.h
 src/applications/dht/module/routing.h
-src/applications/dht/module/dstore.h
 src/applications/dht/module/table.h
-src/applications/chat/chat.h
-src/applications/advertising/bootstrap.h
 src/applications/datastore/prefetch.h
 src/applications/datastore/filter.h
-src/applications/identity/hostkey.h
-src/applications/identity/identity.h
-src/applications/testbed/testbed.h
-src/applications/testbed/commands.h
-src/applications/testbed/socket.h
-src/applications/stats/statistics.h
-src/applications/tbench/tbench.h
-src/applications/tracekit/tracekit.h
+src/applications/gap/pid_table.h
 src/applications/gap/gap.h
-src/applications/gap/pid_table.h
-src/applications/getoption/getoption.h
+src/applications/fs/uritrack/callbacks.h
 src/applications/fs/module/migration.h
+src/applications/fs/module/dht_push.h
 src/applications/fs/module/querymanager.h
 src/applications/fs/module/ondemand.h
 src/applications/fs/module/anonymity.h
-src/applications/fs/module/dht_push.h
 src/applications/fs/fsui/fsui.h
 src/applications/fs/ecrs/ecrs.h
 src/applications/fs/ecrs/tree.h
 src/applications/fs/ecrs/uri.h
-src/applications/fs/uritrack/callbacks.h
+src/applications/advertising/bootstrap.h
+src/applications/chat/chat.h
+src/applications/identity/identity.h
+src/applications/identity/hostkey.h
+src/applications/testbed/testbed.h
+src/applications/testbed/commands.h
+src/applications/testbed/socket.h
+src/applications/stats/statistics.h
+src/applications/tbench/tbench.h
+src/applications/tracekit/tracekit.h
+src/applications/getoption/getoption.h
 src/applications/traffic/traffic.h
 src/server/connection.h
 src/server/startup.h
@@ -290,14 +389,11 @@
 src/server/version.h
 src/util/crypto/locking_gcrypt.h
 src/util/network/network.h
-src/setup/gtk/glade_support.h
-src/setup/gtk/gconf.h
-src/setup/gtk/wizard_gtk.h
-src/setup/text/conf.h
-src/setup/ncurses/mconf.h
-src/setup/ncurses/wizard_curs.h
-src/setup/lib/tree.h
-src/setup/lib/wizard_util.h
 contrib/config-daemon.scm
 contrib/gnunet-download-manager.scm
 contrib/config-client.scm
+src/setup/gtk/gnunet-setup.glade
+GNUnet-0.7.2c/src/util/win/win.cc
+src/setup/qt/setupWizard.cc
+src/setup/qt/qtconfig.cc
+src/util/win/win.cc

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2007-12-10 02:47:03 UTC (rev 5850)
+++ GNUnet/po/de.po     2007-12-10 03:20:09 UTC (rev 5851)
@@ -3,12 +3,12 @@
 # Copyright (C) 2004, 2005 Christian Grothoff
 # This file is distributed under the same license as the GNUnet package.
 # Christian Grothoff <address@hidden>, 2004, 2005.
-#: contrib/config-daemon.scm:555
+#: contrib/config-daemon.scm:584
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-09-29 16:48-0600\n"
+"POT-Creation-Date: 2007-12-09 19:48-0700\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -17,756 +17,1203 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/transports/ip6.c:75 src/util/network/io.c:85
+#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:541
+#: src/transports/http.c:1320 src/transports/http.c:1413
+#: src/transports/http.c:1588 src/transports/http.c:2014
+#: src/transports/http.c:2075 src/applications/bootstrap_http/http.c:123
+#: src/applications/bootstrap_http/http.c:257
+#: src/applications/bootstrap_http/http.c:274
+#: src/applications/bootstrap_http/http.c:306
+#: src/applications/bootstrap_http/http.c:325
+#: src/applications/bootstrap_http/http.c:338
+#: src/applications/bootstrap_http/http.c:348
+#: src/applications/bootstrap_http/http.c:358
 #, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#: src/transports/upnp/upnp.c:431
+#, 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:476
+#, c-format
+msgid "upnp: NAT Returned IP: %s\n"
+msgstr ""
+
+#: src/transports/ip6.c:77 src/util/network/io.c:86
+#, 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:84 src/util/network/ip.c:146
+#: src/transports/ip6.c:109 src/util/network/ip.c:87 src/util/network/ip.c:151
 #, 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:135 src/util/network/ip.c:115
-#: src/util/network/ip.c:221
+#: src/transports/ip6.c:140 src/util/network/ip.c:118
+#: src/util/network/ip.c:237
 #, 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:167
+#: src/transports/ip6.c:174
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/transports/ip6.c:219 src/transports/ip.c:60
+#: src/transports/ip6.c:228 src/transports/ip.c:61
 #, 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:123 src/transports/udp.c:129
+#: src/transports/tcp6.c:249
+msgid "Could not determine my public IPv6 address.\n"
+msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
+
+#: src/transports/tcp6.c:317
 #, c-format
+msgid "`%s': unknown service: %s\n"
+msgstr "`%s': unbekannter Dienst: %s\n"
+
+#: src/transports/tcp6.c:420 src/transports/tcp.c:462
+#, 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/tcp6.c:531
+#, fuzzy
+msgid "# bytes received via TCP6"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/transports/tcp6.c:532
+#, fuzzy
+msgid "# bytes sent via TCP6"
+msgstr "# Bytes gesendet über TCP"
+
+#: src/transports/tcp6.c:534
+#, fuzzy
+msgid "# bytes dropped by TCP6 (outgoing)"
+msgstr "# Bytes verworfen von TCP (ausgehend)"
+
+#: src/transports/udp6.c:131 src/transports/udp.c:135
+#, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transports/udp6.c:264
+#: src/transports/udp6.c:277
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "UDP6: Öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/udp6.c:471 src/transports/udp.c:520
+#: src/transports/udp6.c:495 src/transports/udp.c:544
 #, 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/udp6.c:476
+#: src/transports/udp6.c:501
 #, fuzzy
 msgid "# bytes received via UDP6"
 msgstr "# Bytes empfangen über UDP"
 
-#: src/transports/udp6.c:477
+#: src/transports/udp6.c:502
 #, fuzzy
 msgid "# bytes sent via UDP6"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transports/udp6.c:479
+#: src/transports/udp6.c:504
 #, fuzzy
 msgid "# bytes dropped by UDP6 (outgoing)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/transports/udp6.c:481
+#: src/transports/udp6.c:506
 msgid "# UDP6 connections (right now)"
 msgstr ""
 
-#: src/transports/http.c:824
+#: src/transports/http.c:875
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/http.c:1235 src/transports/http.c:1309
-#: src/transports/http.c:1464 src/transports/http.c:1858
-#: src/transports/http.c:1894 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:540 src/applications/bootstrap_http/http.c:122
-#: src/applications/bootstrap_http/http.c:254
-#: src/applications/bootstrap_http/http.c:270
-#: src/applications/bootstrap_http/http.c:301
-#: src/applications/bootstrap_http/http.c:320
-#: src/applications/bootstrap_http/http.c:333
-#: src/applications/bootstrap_http/http.c:343
-#: src/applications/bootstrap_http/http.c:353
-#, 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:2080
+#: src/transports/http.c:2290
 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:2089
+#: src/transports/http.c:2299
 msgid "# bytes received via HTTP"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/transports/http.c:2090
+#: src/transports/http.c:2300
 msgid "# bytes sent via HTTP"
 msgstr "# Bytes gesendet über HTTP"
 
-#: src/transports/http.c:2092
+#: src/transports/http.c:2302
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# Bytes verworfen von HTTP"
 
-#: 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 ""
-"Für den SMTP Transport müssen Sie den Namen einer Pipe in Sektion `%s', "
-"Eintrag `%s' eintragen.\n"
-
-#: src/transports/smtp.c:358
+#: src/transports/smtp.c:362
 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: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:454
+#, fuzzy
+msgid "SMTP filter string to invalid, lacks ': '\n"
+msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
 
-#: src/transports/smtp.c:471
+#: src/transports/smtp.c:464
 #, 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:571
+#: src/transports/smtp.c:552 src/transports/smtp.c:563
+#: src/transports/smtp.c:577 src/transports/smtp.c:597
+#: src/transports/smtp.c:622 src/transports/smtp.c:631
+#: src/transports/smtp.c:645 src/transports/smtp.c:657
 #, fuzzy, c-format
-msgid "Failed to initialize libesmtp: %s.\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+msgid "SMTP: `%s' failed: %s.\n"
+msgstr "`%s' schlug fehl: %s\n"
 
-#: 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:802
+#, fuzzy
+msgid "No email-address specified, can not start SMTP transport.\n"
+msgstr ""
+"Kein Filter für E-Mail angegeben, es kann keine Bekanntmachung erstellt "
+"werden.\n"
 
-#: src/transports/smtp.c:702
-#, c-format
-msgid "%.*s filter %s (SMTP)"
-msgstr "%.*s filter %s (SMTP)"
+#: src/transports/smtp.c:815
+#, fuzzy
+msgid "# bytes received via SMTP"
+msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/smtp.c:730
-#, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+#: src/transports/smtp.c:816
+#, fuzzy
+msgid "# bytes sent via SMTP"
+msgstr "# Bytes gesendet über TCP"
+
+#: src/transports/smtp.c:818
+#, fuzzy
+msgid "# bytes dropped by SMTP (outgoing)"
+msgstr "# Bytes verworfen von TCP (ausgehend)"
+
+#: src/transports/tcp_helper.c:260
+#, fuzzy
+msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr ""
-"MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
-"implementiert!)\n"
+"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
+"u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/transports/tcp.c:290
+#: src/transports/tcp_helper.c:279
 #, 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/tcp.c:296
+#, 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:389
+#: src/transports/tcp.c:401
 #, 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:442 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:561
+#: src/transports/tcp.c:584
 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:570
+#: src/transports/tcp.c:593
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/tcp.c:571
+#: src/transports/tcp.c:594
 msgid "# bytes sent via TCP"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transports/tcp.c:573
+#: src/transports/tcp.c:596
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transports/udp.c:288
+#: src/transports/udp.c:301
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "UDP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/udp.c:384
+#: src/transports/udp.c:400
 #, 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:535
+#: src/transports/udp.c:560
 msgid "# bytes received via UDP"
 msgstr "# Bytes empfangen über UDP"
 
-#: src/transports/udp.c:536
+#: src/transports/udp.c:561
 msgid "# bytes sent via UDP"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transports/udp.c:538
+#: src/transports/udp.c:563
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/transports/udp.c:540
+#: src/transports/udp.c:565
 msgid "# UDP connections (right now)"
 msgstr ""
 
-#: 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/udp_helper.c:96
+#, fuzzy
+msgid "Received malformed message from udp-peer connection. Closing.\n"
+msgstr ""
+"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
+"u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/transports/tcp6.c:312
-#, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "`%s': unbekannter Dienst: %s\n"
+#: src/setup/ncurses/mconf.c:86
+msgid "Exit"
+msgstr ""
 
-#: src/transports/tcp6.c:512
+#: src/setup/ncurses/mconf.c:89
+msgid "Up"
+msgstr "Oben"
+
+#: src/setup/ncurses/mconf.c:92 src/setup/gtk/gnunet-setup.glade:136
+#: src/setup/gtk/gnunet-setup.glade:404 src/setup/gtk/gnunet-setup.glade:814
+#: src/setup/gtk/gnunet-setup.glade:1147 src/setup/gtk/gnunet-setup.glade:1431
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/setup/ncurses/mconf.c:183 src/setup/ncurses/mconf.c:288
+#: src/setup/ncurses/mconf.c:371 src/setup/ncurses/mconf.c:471
+#: src/setup/ncurses/wizard_curs.c:111 src/setup/ncurses/wizard_curs.c:176
+#: src/setup/ncurses/wizard_curs.c:292
+msgid "Internal error! (Choice invalid?)"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:219 src/setup/ncurses/mconf.c:418
+msgid "Internal error! (Value invalid?)"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:404
+msgid "Invalid input, expecting floating point value."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:450
+msgid "Invalid input, expecting integer."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:458
+msgid "Value is not in legal range."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:527
 #, fuzzy
-msgid "# bytes received via TCP6"
-msgstr "# Bytes empfangen über TCP"
+msgid "GNUnet Configuration"
+msgstr "GNUnet Konfiguration"
 
-#: src/transports/tcp6.c:513
+#: src/setup/ncurses/mconf.c:527 src/setup/text/conf.c:569
+#, 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/ncurses/mconf.c:533
 #, fuzzy
-msgid "# bytes sent via TCP6"
-msgstr "# Bytes gesendet über TCP"
+msgid "Do you wish to save your new configuration?"
+msgstr "Möchten Sie Ihre Einstellungen speichern?"
 
-#: src/transports/tcp6.c:515
+#: src/setup/ncurses/mconf.c:547
+#, fuzzy, c-format
+msgid ""
+"\n"
+"End of configuration.\n"
+msgstr " gconfig\tGTK Konfiguration\n"
+
+#: src/setup/ncurses/mconf.c:552
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Your configuration changes were NOT saved.\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/setup/ncurses/wizard_curs.c:65 src/setup/lib/wizard_util.c:140
+#: src/setup/lib/wizard_util.c:195
+msgid "Error"
+msgstr "Fehler"
+
+#: src/setup/ncurses/wizard_curs.c:73 src/setup/gtk/gconf.c:444
+msgid "Help"
+msgstr "Hilfe"
+
+#: src/setup/ncurses/wizard_curs.c:80
 #, fuzzy
-msgid "# bytes dropped by TCP6 (outgoing)"
-msgstr "# Bytes verworfen von TCP (ausgehend)"
+msgid "Error!"
+msgstr "Fehler"
 
-#: src/transports/tcp_helper.c:257
+#: src/setup/ncurses/wizard_curs.c:94 src/applications/vpn/vpn.c:1454
+msgid "No"
+msgstr "Nein"
+
+#: src/setup/ncurses/wizard_curs.c:95 src/applications/vpn/vpn.c:1454
+msgid "Yes"
+msgstr "Ja"
+
+#: src/setup/ncurses/wizard_curs.c:143
 #, 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"
+msgid "Abort"
+msgstr "_über"
 
-#: src/transports/tcp_helper.c:276
+#: src/setup/ncurses/wizard_curs.c:144
 #, fuzzy
-msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgid "Ok"
+msgstr "k"
+
+#: src/setup/ncurses/wizard_curs.c:211 src/setup/ncurses/wizard_curs.c:277
+#: src/setup/ncurses/wizard_curs.c:418
+msgid "GNUnet configuration"
+msgstr "GNUnet Konfiguration"
+
+#: src/setup/ncurses/wizard_curs.c:213
+msgid ""
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org/\n";
+"and join our community at\n"
+"\thttp://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"the GNUnet team"
 msgstr ""
-"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
-"u) empfangen. Verbindung wird geschlossen.\n"
+"Willkommen bei GNUnet!\n"
+"\n"
+"Dieser Assistent wird Ihnen einige grundlegende Fragen stellen, um GNUnet zu "
+"konfigurieren.\n"
+"\n"
+"Bitte besuchen Sie unsere Homepage\n"
+"\thttp://gnunet.org\n";
+"und schließen Sie sich unserer Community an:\n"
+"\thttps://gnunet.org/drupal/\n";
+"\n"
+"Viel Spaß,\n"
+"\n"
+"das GNUnet-Team"
 
-#: 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/setup/ncurses/wizard_curs.c:279
+msgid ""
+"Choose the network interface that connects your computer to the internet "
+"from the list below."
+msgstr ""
+"Wählen Sie das Netzwerkgerät, das Ihren Computer mit dem Internet verbindet, "
+"aus unten stehender Liste."
 
-#: src/transports/upnp/upnp.c:475
-#, c-format
-msgid "upnp: NAT Returned IP: %s\n"
+#: src/setup/ncurses/wizard_curs.c:297 src/setup/ncurses/wizard_curs.c:311
+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 ""
+"Das \"Netzwerkgerät\" ist das Gerät, das Ihren Computer mit dem Internet "
+"verbindet. Dies ist üblicherweise ein Modem, eine ISDN-Karte oder eine "
+"Netzwerkkarte falls Sie DSL nutzen."
 
-#: src/transports/udp_helper.c:96
+#: src/setup/ncurses/wizard_curs.c:308
 #, fuzzy
-msgid "Received malformed message from udp-peer connection. Closing.\n"
+msgid "Network configuration: interface"
+msgstr "Netzwerkgerät:"
+
+#: src/setup/ncurses/wizard_curs.c:310
+msgid ""
+"What is the name of the network interface that connects your computer to the "
+"Internet?"
 msgstr ""
-"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
-"u) empfangen. Verbindung wird geschlossen.\n"
+"Was ist der Name des Netzwerkgerätes, das Ihren Computer mit dem Internet "
+"verbindet?"
 
-#: src/applications/dht/tools/dht-query.c:55
+#: src/setup/ncurses/wizard_curs.c:321
 #, fuzzy
-msgid "Query (get KEY, put KEY VALUE) DHT table."
-msgstr "Eine DHT Tabelle abfragen (get KEY, put KEY VALUE, remove KEY VALUE)."
+msgid "Network configuration: IP"
+msgstr "GNUnet Konfiguration"
 
-#: src/applications/dht/tools/dht-query.c:60
+#: src/setup/ncurses/wizard_curs.c:323
 #, fuzzy
+msgid "What is this computer's public IP address or hostname?"
+msgstr ""
+"Wie heißt die öffentliche IP-Adresse oder der öffentliche Name dieses "
+"Computers?\n"
+"Wenn Sie nicht sicher sind, lassen Sie dieses Feld leer."
+
+#: src/setup/ncurses/wizard_curs.c:324
+#, 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:99
-#, c-format
-msgid "%s(%s) operation returned no results.\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If left empty, GNUnet will try to automatically detect the IP.\n"
+"You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
+"If in doubt, leave this empty."
 msgstr ""
+"Wenn Ihr Provider Ihnen immer die gleiche IP-Adresse zuweist (eine "
+"\"statische\" IP-Adresse), so geben Sie diese in das \"IP-Adresse\"-Feld "
+"ein. Wenn sich Ihre IP-Adresse immer wieder ändert (\"dynamische\" IP-"
+"Adresse), es jedoch einen Rechnernamen gibt, der immer auf Ihre aktuelle IP-"
+"Adresse verweist, so können Sie diesen ebenfalls eintragen.\n"
+"Wenn Sie nicht sicher sind, so können Sie das Feld leer lassen. GNUnet wird "
+"dann versuchen, Ihre IP-Adresse automatisch zu bestimmen."
 
-#: src/applications/dht/tools/dht-query.c:116
-#, fuzzy, c-format
-msgid "Issuing '%s(%s,%s)' command.\n"
-msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
+#: src/setup/ncurses/wizard_curs.c:339
+#, fuzzy
+msgid "Bandwidth configuration: upload"
+msgstr "GNUnet Konfiguration"
 
-#: src/applications/dht/tools/dht-query.c:123
-#, c-format
-msgid "'%s(%s,%s)' succeeded\n"
-msgstr "'%s(%s,%s)' erfolgreich abgeschlossen\n"
+#: src/setup/ncurses/wizard_curs.c:341
+#, fuzzy
+msgid "How much upstream bandwidth (in bytes/s) may be used?"
+msgstr "Wieviel Upstream (Bytes/s) darf verwendet werden?"
 
-#: src/applications/dht/tools/dht-query.c:127
-#, c-format
-msgid "'%s(%s,%s)' failed.\n"
-msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
+#: src/setup/ncurses/wizard_curs.c:342
+#, fuzzy
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
+"you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
+msgstr ""
+"Hier können Sie GNUnets Ressourcenverwendung einschränken.\n"
+"\n"
+"Der \"Upstream\" ist der Datenkanal, durch den Daten an das Internet "
+"*gesendet* werden. Das Limit ist entweder das gesamte Maximum für diesem "
+"Computer oder wieviel GNUnet selbst verwenden darf. Dies können Sie später "
+"festlegen. Wenn Sie eine Flatrate haben, können Sie die maximale "
+"Geschwindigkeit Ihrer Internetverbindung angeben."
 
-#: src/applications/dht/tools/dht-query.c:151
-#, c-format
-msgid "Failed to connect to gnunetd.\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/setup/ncurses/wizard_curs.c:354
+#, fuzzy
+msgid "Bandwidth configuration: download"
+msgstr "GNUnet Konfiguration"
 
-#: src/applications/dht/tools/dht-query.c:164
-#, c-format
-msgid "Command `%s' requires an argument (`%s').\n"
-msgstr "Kommando `%s' benötigt eine zusätzliche Angabe (`%s').\n"
+#: src/setup/ncurses/wizard_curs.c:356
+#, fuzzy
+msgid "How much downstream bandwidth (in bytes/s) may be used?"
+msgstr "Wieviel Downstream (Bytes/s) darf verwendet werden?"
 
-#: src/applications/dht/tools/dht-query.c:181
-#, 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/setup/ncurses/wizard_curs.c:357
+#, fuzzy
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
+"If you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
+msgstr ""
+"Hier können Sie GNUnets Ressourcenverwendung einschränken.\n"
+"\n"
+"Der \"Downstream\" ist der Datenkanal, durch den Daten vom Internet "
+"*empfangen* werden. Das Limit ist entweder das gesamte Maximum für diesem "
+"Computer oder wieviel GNUnet selbst verwenden darf. Dies können Sie später "
+"festlegen. Wenn Sie eine Flatrate haben, können Sie die maximale "
+"Geschwindigkeit Ihrer Internetverbindung angeben."
 
-#: src/applications/dht/tools/dht-query.c:192
-#, c-format
-msgid "Unsupported command `%s'.  Aborting.\n"
-msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
+#: src/setup/ncurses/wizard_curs.c:369
+#, fuzzy
+msgid "Quota configuration"
+msgstr "GNUnet Konfiguration"
 
-#: src/applications/dht/module/table.c:716
-msgid "# dht connections"
+#: src/setup/ncurses/wizard_curs.c:370
+msgid "What is the maximum size of the datastore in MB?"
 msgstr ""
 
-#: src/applications/dht/module/table.c:718
+#: src/setup/ncurses/wizard_curs.c:371
 #, fuzzy
-msgid "# dht discovery messages received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+msgid ""
+"The GNUnet datastore contains all content that GNUnet needs to store "
+"(indexed, inserted and migrated content)."
+msgstr ""
+"Was ist die maximale Größe des GNUnet Datenspeichers (in MB)?\n"
+"Der GNUnet Datenspeicher enthält alle Daten, die GNUnet erzeugt (Indexdaten, "
+"eingefügte und migrierte Inhalte)."
 
-#: src/applications/dht/module/table.c:720
-msgid "# dht route host lookups performed"
+#: src/setup/ncurses/wizard_curs.c:383
+#, fuzzy
+msgid "Daemon configuration: user account"
+msgstr "Fehler beim Anlegen des Benutzerkontos:"
+
+#: src/setup/ncurses/wizard_curs.c:384
+msgid "As which user should gnunetd be run?"
 msgstr ""
 
-#: src/applications/dht/module/table.c:722
+#: src/setup/ncurses/wizard_curs.c:386
 #, fuzzy
-msgid "# dht discovery messages sent"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+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"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the field empty to run GNUnet with system privileges.\n"
+msgstr ""
+"Geben Sie den Benutzer an, dem der GNUnet Dienst gehören soll.\n"
+"\n"
+"Aus Sicherheitsgründen ist es eine gute Idee, dieses Setup ein neues "
+"Benutzerkonto anlegen zu lassen, unter dem der GNUnet Dienst beim "
+"Systemstart läuft.\n"
+"\n"
+"Natürlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies "
+"betrifft auch Dateien, die Sie im GNUnet veröffentlichen möchten. Sie müssen "
+"dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen geben.\n"
+"\n"
+"Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen "
+"lassen möchten.\n"
+"\n"
+"GNUnet Benutzer:"
 
-#: 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/setup/ncurses/wizard_curs.c:403
+msgid "Daemon configuration: group account"
+msgstr ""
 
-#: 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/setup/ncurses/wizard_curs.c:404
+msgid "As which group should gnunetd be run?"
+msgstr ""
 
-#: src/applications/dht/module/cs.c:251
-msgid "Enables efficient non-anonymous routing"
+#: src/setup/ncurses/wizard_curs.c:406
+#, fuzzy
+msgid ""
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
+"\n"
+"You can also specify a already existant group here.\n"
+"\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
 msgstr ""
+"Definieren Sie eine Gruppe, der der GNUnet Dienst gehört.\n"
+"\n"
+"Aus Sicherheitsgründen ist es eine gute Idee, dieses Setup eine neue Gruppe "
+"für das gewählte Benutzerkonto anlegen zu lassen.\n"
+"\n"
+"Sie können hier auch eine bestehende Gruppe angeben.\n"
+"\n"
+"Nur Mitglieder dieser Gruppe dürfen den GNUnet Server starten und anhalten "
+"und haben Zugriff auf die Daten des GNUnet Servers.\n"
+"\n"
+"GNUnet Gruppe:"
 
-#: src/applications/dht/module/routing.c:736
-msgid "# dht replies routed"
+#: src/setup/ncurses/wizard_curs.c:420
+msgid "Do you want to automatically launch GNUnet as a system service?"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:738
-msgid "# dht requests routed"
-msgstr "# dht Anfragen weitergeleitet"
+#: src/setup/ncurses/wizard_curs.c:422
+#, fuzzy
+msgid ""
+"If you say \"yes\" here, the GNUnet background process will be automatically "
+"started when you turn on your computer. If you say \"no\" here, you have to "
+"launch GNUnet yourself each time you want to use it."
+msgstr ""
+"Möchten Sie GNUnet als Systemdienst starten?\n"
+"\n"
+"Wenn Sie hier \"Ja\" sagen, so wird der GNUnet Hintergrundprozess jedesmal "
+"automatisch gestartet, wenn Sie Ihren Computer einschalten. Wenn Sie hier "
+"\"Nein\" sagen, so müssen Sie GNUnet jedesmal selbst starten, wenn Sie es "
+"verwenden möchten."
 
-#: src/applications/dht/module/routing.c:740
+#: src/setup/ncurses/wizard_curs.c:445 src/setup/gtk/wizard_gtk.c:415
+#, c-format
+msgid "Unable to save configuration file `%s':"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/setup/ncurses/wizard_curs.c:464
 #, fuzzy
-msgid "# dht get requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+msgid "Unable to create user account for daemon."
+msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/applications/dht/module/routing.c:742
+#: src/setup/ncurses/wizard_curs.c:471
+msgid "Unable to setup autostart for daemon."
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:486
 #, fuzzy
-msgid "# dht put requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+msgid "Save configuration?"
+msgstr "GNUnet Konfiguration"
 
-#: src/applications/dht/module/routing.c:744
+#: src/setup/ncurses/wizard_curs.c:487
 #, fuzzy
-msgid "# dht results received"
-msgstr "# Bytes empfangen über TCP"
+msgid "Save configuration now?"
+msgstr "GNUnet Konfiguration"
 
-#: 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/setup/ncurses/wizard_curs.c:531 src/setup/gtk/gnunet-setup.glade:723
+#: src/setup/gtk/gnunet-setup.glade:1056 src/setup/gtk/gnunet-setup.glade:1340
+msgid "Back"
+msgstr "Zurück"
 
-#: src/applications/chat/chat.c:88
-msgid "Message received from peer is invalid.\n"
-msgstr "Empfangene Nachricht ist ungültig.\n"
+#: src/setup/text/conf.c:79
+#, fuzzy
+msgid "yes"
+msgstr "Ja"
 
-#: src/applications/chat/chat.c:135
-msgid "Message received from client is invalid\n"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+#: src/setup/text/conf.c:80
+msgid "no"
+msgstr ""
 
-#: src/applications/chat/chat.c:155
-msgid "Maximum number of chat clients reached.\n"
-msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
-
-#: src/applications/chat/chat.c:160
+#: src/setup/text/conf.c:106
 #, c-format
-msgid "Now %d of %d chat clients at this node.\n"
-msgstr "Jetzt sind %d von %d auf diesem Knoten.\n"
+msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgstr ""
 
-#: 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/setup/text/conf.c:115
+msgid "\tPossible choices:\n"
+msgstr ""
 
-#: src/applications/chat/chat.c:219
-msgid "enables P2P-chat (incomplete)"
-msgstr "Ermöglicht P2P-Chat"
+#: src/setup/text/conf.c:123
+msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:45
-msgid "Join a chat on GNUnet."
+#: src/setup/text/conf.c:125
+#, c-format
+msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:49
-msgid "set the nickname to use (requred)"
+#: src/setup/text/conf.c:143
+#, c-format
+msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:52
-msgid "set the chat room to join (requred)"
+#: src/setup/text/conf.c:147
+#, c-format
+msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:134
+#: src/setup/text/conf.c:153
+#, c-format
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
+msgstr ""
+
+#: src/setup/text/conf.c:187
 #, fuzzy, c-format
-msgid "You must specify a nickname\n"
-msgstr "Sie müssen einen Empfänger angeben!\n"
+msgid "Yes\n"
+msgstr "Ja"
 
-#: src/applications/chat/gnunet-chat.c:144
+#: src/setup/text/conf.c:192
 #, fuzzy, c-format
-msgid "Failed to join the room\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
+msgid "No\n"
+msgstr "Nein"
 
-#: src/applications/chat/gnunet-chat.c:160
+#: src/setup/text/conf.c:195 src/setup/text/conf.c:236
+#: src/setup/text/conf.c:266 src/setup/text/conf.c:329
+#: src/setup/text/conf.c:387
 #, fuzzy, c-format
-msgid "Failed to send message.\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+msgid "Help\n"
+msgstr "Hilfe"
 
-#: src/applications/advertising/advertising.c:193
+#: src/setup/text/conf.c:198 src/setup/text/conf.c:213
+#: src/setup/text/conf.c:276 src/setup/text/conf.c:307
+#: src/setup/text/conf.c:365
 #, fuzzy, c-format
-msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
+msgid "Abort\n"
+msgstr "_über"
+
+#: src/setup/text/conf.c:354 src/setup/text/conf.c:416
+#, c-format
+msgid ""
+"\n"
+"Invalid entry, try again (use '?' for help): "
 msgstr ""
-"Hello Nachricht von `%s' ist ungültig (Signatur ist ungültig). Nachricht "
-"wurde verworfen.\n"
 
-#: src/applications/advertising/advertising.c:203
-#, fuzzy
-msgid "HELLO message has expiration too far in the future. Dropping.\n"
+#: src/setup/text/conf.c:422
+#, c-format
+msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
-"Empfangene Hello Nachricht ist ungültig (Ablaufzeit über Limit). Nachricht "
-"wurde verworfen.\n"
 
-#: src/applications/advertising/advertising.c:374
+#: src/setup/text/conf.c:484
+msgid "\tDescend? (y/n/?) "
+msgstr ""
+
+#: src/setup/text/conf.c:493
+msgid "Aborted.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:506
 #, fuzzy
-msgid "Could not send HELLO+PING, ping buffer full.\n"
-msgstr "Hellos+PING konnten nicht gesendet werden, Ping Puffer ist voll.\n"
+msgid "Invalid entry.\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/applications/advertising/advertising.c:396
-msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
+#: src/setup/text/conf.c:524
+#, c-format
+msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:544
+#: src/setup/text/conf.c:556
 #, c-format
-msgid "Advertising my transport %d to selected peers.\n"
-msgstr "Transport %d wird ausgewählten anderen Knoten bekannt gegeben.\n"
+msgid "You can always press ENTER to keep the current value.\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:553
+#: src/setup/text/conf.c:557
+#, c-format
+msgid "Use the '%s' key to abort.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:575
+#, c-format
 msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
 msgstr ""
-"Bekanntmachung von uns zwecklos: bis jetzt sind uns keine anderen Knoten "
-"bekannt.\n"
 
-#: src/applications/advertising/advertising.c:817
-msgid "# Peer advertisements received"
-msgstr "# Knotenankündigungen empfangen"
+#: src/setup/text/conf.c:590
+#, 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/applications/advertising/advertising.c:820
-#, fuzzy
-msgid "# Peer advertisements of type NAT received"
-msgstr "# Knotenankündigungen empfangen"
+#: src/setup/text/conf.c:599
+#, fuzzy, c-format
+msgid "Configuration file `%s' written.\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/applications/advertising/advertising.c:823
+#: src/setup/gtk/wizard_gtk.c:141
 #, fuzzy
-msgid "# Peer advertisements confirmed via PONG"
-msgstr "# Knotenankündigungen empfangen"
+msgid "(unknown connection)"
+msgstr "Netzwerkverbindung"
 
-#: src/applications/advertising/advertising.c:827
+#: src/setup/gtk/wizard_gtk.c:439
 #, fuzzy
-msgid "# Peer advertisements updating earlier HELLOs"
-msgstr "# Knotenankündigungen empfangen"
+msgid "Do you want to save the new configuration?"
+msgstr "Möchten Sie Ihre Einstellungen speichern?"
 
-#: src/applications/advertising/advertising.c:830
+#: src/setup/gtk/wizard_gtk.c:471
+msgid "Unable to create user account:"
+msgstr "Fehler beim Anlegen des Benutzerkontos:"
+
+#: src/setup/gtk/wizard_gtk.c:479
+msgid "Unable to change startup process:"
+msgstr "Startprozeß konnte nicht geändert werden:"
+
+#: src/setup/gtk/wizard_gtk.c:494
+msgid ""
+"Running gnunet-update failed.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
+"Finally, run gnunet-update manually."
+msgstr ""
+
+#: src/setup/gtk/ngconf.c:383 src/setup/gtk/gconf.c:492
 #, fuzzy
-msgid "# Peer advertisements discarded due to load"
-msgstr "# Knotenankündigungen empfangen"
+msgid "Configuration saved."
+msgstr "GNUnet Konfiguration"
 
-#: src/applications/advertising/advertising.c:834
+#: src/setup/gtk/ngconf.c:393 src/setup/gtk/gconf.c:502
 #, fuzzy
-msgid "# Peer advertisements for unsupported transport"
-msgstr "# Knotenankündigungen empfangen"
+msgid "Failed to save configuration."
+msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/applications/advertising/advertising.c:838
+#: src/setup/gtk/ngconf.c:418 src/setup/gtk/gconf.c:528
 #, fuzzy
-msgid "# Peer advertisements not confirmed due to ping busy"
-msgstr "# Knotenankündigungen empfangen"
+msgid "Configuration changed. Save?"
+msgstr ""
+"Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
+"ausführen!\n"
 
-#: src/applications/advertising/advertising.c:842
+#: src/setup/gtk/ngconf.c:431 src/setup/gtk/gconf.c:541
 #, fuzzy
-msgid "# Peer advertisements not confirmed due to lack of self ad"
-msgstr "# Knotenankündigungen empfangen"
+msgid "Error saving configuration."
+msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/applications/advertising/advertising.c:846
+#: src/setup/gtk/gconf.c:389
 #, fuzzy
-msgid "# Peer advertisements not confirmed due to send error"
-msgstr "# Knotenankündigungen empfangen"
+msgid "Description"
+msgstr "Frage"
 
-#: src/applications/advertising/advertising.c:848
-msgid "# Self advertisments transmitted"
-msgstr "# Selbstbekanntmachungen übertragen"
+#: src/setup/gtk/gconf.c:405
+msgid "Value"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:850
-msgid "# Foreign advertisements forwarded"
-msgstr "# Bekanntmachungen von anderen übertragen"
+#: src/setup/gtk/gconf.c:429
+msgid "Default"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:852
-#: src/applications/pingpong/pingpong.c:509
-msgid "# plaintext PING messages sent"
-msgstr "# Klartext PING Nachrichten gesendet"
+#: src/setup/gtk/gconf.c:458
+#, fuzzy
+msgid "Section"
+msgstr "Frage"
 
-#: src/applications/advertising/advertising.c:857
-#: src/applications/session/connect.c:913
+#: src/setup/gtk/gconf.c:469
+#, fuzzy
+msgid "Option"
+msgstr "_Optionen"
+
+#: src/setup/lib/tree.c:191
 #, c-format
-msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
-msgstr "`%s' registriert Handler %d (Plaintext und Ciphertext)\n"
+msgid ""
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:872
+#: src/setup/lib/gns.c:315
+#, fuzzy, c-format
 msgid ""
-"ensures that this peer is known by other peers and discovers other peers"
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
 msgstr ""
-"Stellt sicher, dass dieser Knoten anderen Knoten bekannt ist und entdeckt "
-"andere Knoten"
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"für FS Daten angeben.\n"
 
-#: src/applications/topology_default/topology.c:467
-msgid "maintains GNUnet default mesh topology"
+#: src/setup/lib/wizard_util.c:111
+msgid "Can't open Service Control Manager"
+msgstr "Der Dienstemanager konnte nicht geöffnet werden"
+
+#: src/setup/lib/wizard_util.c:117
+msgid "Can't create service"
+msgstr "Der Dienst konnte nicht angelegt werden"
+
+#: src/setup/lib/wizard_util.c:121
+msgid "Error changing the permissions of the GNUnet directory"
+msgstr "Fehler beim Ändern der Berechtigungen des GNUnet Verzeichnisses"
+
+#: src/setup/lib/wizard_util.c:126
+msgid "Cannot write to the regisitry"
+msgstr "Konnte nicht in die Registry schreiben"
+
+#: src/setup/lib/wizard_util.c:129
+msgid "Can't access the service"
+msgstr "Auf den Dienst konnte nicht zugegriffen werden"
+
+#: src/setup/lib/wizard_util.c:132
+msgid "Can't delete the service"
+msgstr "Dienst konnte nicht gelöscht werden"
+
+#: src/setup/lib/wizard_util.c:135
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
+
+#: src/setup/lib/wizard_util.c:171
+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:175
+msgid "Error creating user"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/setup/lib/wizard_util.c:179
+msgid "Error accessing local security policy"
+msgstr "Fehler beim Zugriff auf die lokale Sicherheitsrichtlinie"
+
+#: src/setup/lib/wizard_util.c:184
+msgid "Error granting service right to user"
+msgstr "Fehler beim Zuweisen des Dienstrechtes dem Benutzer"
+
+#: src/setup/lib/wizard_util.c:189
+msgid "Unknown error while creating a new user"
+msgstr "Unbekannter Fehler beim Anlegen des neuen Benutzers"
+
+#: src/setup/gnunet-setup.c:64
+#, c-format
+msgid "Can only set one option per invocation.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:132
-#: src/applications/pingpong/pingpong.c:199
-#: src/applications/pingpong/pingpong.c:264
-#: src/applications/pingpong/pingpong.c:331
+#: src/setup/gnunet-setup.c:72
 #, c-format
-msgid "Received malformed `%s' message. Dropping.\n"
-msgstr "Beschädigte `%s' Nachricht empfangen. Nachricht wird verworfen.\n"
+msgid ""
+"Invalid synatx, argument to 'set' must have the format SECTION:"
+"OPTION=VALUE.\n"
+msgstr ""
 
-#: 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/setup/gnunet-setup.c:86
+#, c-format
+msgid "Can only display one option per invocation.\n"
+msgstr ""
 
-#: 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:303
-#: src/applications/pingpong/pingpong.c:365
+#: src/setup/gnunet-setup.c:93
+#, c-format
 msgid ""
-"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
-"constant.\n"
+"Invalid synatx, argument to 'get' must have the format SECTION:OPTION.\n"
 msgstr ""
-"PONG konnte keinem PING zugeordnet werden. Versuchen Sie die Konstante "
-"MAX_PING_PONG hochzusetzen.\n"
 
-#: src/applications/pingpong/pingpong.c:409
-msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
+#: src/setup/gnunet-setup.c:107
+msgid "generate configuration for gnunetd, the GNUnet daemon"
+msgstr "Generiere Konfiguration für gnunetd, den GNUnet Daemon"
+
+#: src/setup/gnunet-setup.c:110 src/server/gnunet-update.c:265
+msgid "print a value from the configuration file to stdout"
 msgstr ""
-"PING konnte nicht erstellt werden, da die Tabelle voll ist. Versuchen Sie, "
-"die Konstante MAX_PING_PONG hochzusetzen.\n"
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/applications/pingpong/pingpong.c:499
-msgid "# encrypted PONG messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+#: src/setup/gnunet-setup.c:112
+msgid "Tool to setup GNUnet."
+msgstr "Werkzeug für die Einrichtung von GNUnet."
 
-#: src/applications/pingpong/pingpong.c:501
-msgid "# plaintext PONG messages received"
-msgstr "# Klartext PONG Nachrichten empfangen"
+#: src/setup/gnunet-setup.c:114
+#, fuzzy
+msgid "update a value in the configuration file"
+msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/applications/pingpong/pingpong.c:503
-msgid "# encrypted PING messages received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+#: src/setup/gnunet-setup.c:257
+#, fuzzy, c-format
+msgid "Too many arguments.\n"
+msgstr "Ungültige Kommandozeilen Parameter.\n"
 
-#: src/applications/pingpong/pingpong.c:505
-msgid "# PING messages created"
-msgstr "# PING Nachrichten erstellt"
+#: src/setup/gnunet-setup.c:263
+msgid "No interface specified, using default\n"
+msgstr "Keine Oberfläche angegeben, verwende Standard\n"
 
-#: src/applications/pingpong/pingpong.c:507
-#: src/applications/session/connect.c:908
-msgid "# encrypted PONG messages sent"
-msgstr "# verschlüsselter PONG Nachrichten gesendet"
+#: src/setup/gnunet-setup.c:340
+#, fuzzy, c-format
+msgid "Undefined option.\n"
+msgstr "Weitere Einstellungen"
 
-#: src/applications/pingpong/pingpong.c:511
-#: src/applications/session/connect.c:906
-msgid "# encrypted PING messages sent"
-msgstr "# verschlüsselter PING Nachrichten gesendet"
+#: src/setup/gnunet-setup.c:391
+#, c-format
+msgid "`%s' is not available."
+msgstr "`%s' ist nicht verfügbar."
 
-#: src/applications/pingpong/pingpong.c:513
-#, fuzzy
-msgid "# plaintext PONG messages sent"
-msgstr "# Klartext PING Nachrichten gesendet"
+#: src/setup/gnunet-setup.c:409
+#, c-format
+msgid "Unknown operation `%s'\n"
+msgstr "Unbekannte Operation `%s'\n"
 
-#: src/applications/pingpong/pingpong.c:517
-#, fuzzy
-msgid "# plaintext PONG transmissions failed"
-msgstr "# Klartext PONG Nachrichten empfangen"
+#: src/setup/gnunet-setup.c:410 src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:517 src/util/getopt/getopt.c:1072
+#, 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/pingpong/pingpong.c:526
+#: src/setup/gnunet-win-tool.c:52
+msgid "list all network adapters"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:55
+msgid "install GNUnet as Windows service"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:58
+msgid "uninstall GNUnet service"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:61
+msgid "increase the maximum number of TCP/IP connections"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:64
+msgid "display a file's hash value"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:123
 #, c-format
-msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
-msgstr "`%s' registriert Handler %d %d (Plaintext und Ciphertext)\n"
+msgid "GNUnet service installed successfully.\n"
+msgstr "Der GNUnet Dienst wurde erfolgreich installiert.\n"
 
-#: 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:470
-#: src/applications/sqstore_mysql/mysql.c:480
-#: src/applications/sqstore_mysql/mysql.c:518
-#: src/applications/sqstore_mysql/mysql.c:528
-#: src/applications/sqstore_mysql/mysql.c:560
-#: src/applications/sqstore_mysql/mysql.c:571
-#: src/applications/sqstore_mysql/mysql.c:669
-#: src/applications/sqstore_mysql/mysql.c:681
-#: src/applications/sqstore_mysql/mysql.c:693
-#: src/applications/sqstore_mysql/mysql.c:707
-#: src/applications/sqstore_mysql/mysql.c:804
-#: src/applications/sqstore_mysql/mysql.c:818
-#: src/applications/sqstore_mysql/mysql.c:968
-#: src/applications/sqstore_mysql/mysql.c:980
-#: src/applications/sqstore_mysql/mysql.c:992
-#: src/applications/sqstore_mysql/mysql.c:1232
-#: src/applications/sqstore_mysql/mysql.c:1244
-#: src/applications/sqstore_mysql/mysql.c:1256
-#: src/applications/sqstore_mysql/mysql.c:1341
-#: src/applications/kvstore_sqlite/kv_sqlite.c:44
-#: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:99
-#: src/applications/dstore/dstore.c:195 src/applications/dstore/dstore.c:234
-#: src/applications/dstore/dstore.c:253 src/applications/dstore/dstore.c:308
-#: src/applications/dstore/dstore.c:326 src/applications/dstore/dstore.c:337
-#: src/applications/dstore/dstore.c:368 src/applications/dstore/dstore.c:459
-#: 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
+#: src/setup/gnunet-win-tool.c:126 src/setup/gnunet-win-tool.c:154
 #, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+msgid "This version of Windows doesn't support services.\n"
+msgstr "Diese Version von Windows unterstützt keine Dienste.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:193
+#: src/setup/gnunet-win-tool.c:130 src/setup/gnunet-win-tool.c:158
 #, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+msgid "Error: can't open Service Control Manager: %s\n"
+msgstr "Fehler: der Dienstemanager konnte nicht geöffnet werden: %s\n"
 
-#: 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/setup/gnunet-win-tool.c:135
+#, c-format
+msgid "Error: can't create service: %s\n"
+msgstr "Fehler: Dienst konnte nicht angelegt werden: %s\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:394
-#: src/applications/sqstore_sqlite/sqlite.c:431
-msgid "sqlite datastore"
-msgstr "sqlite Datenspeicher"
+#: src/setup/gnunet-win-tool.c:138 src/setup/gnunet-win-tool.c:170
+#, c-format
+msgid "Unknown error.\n"
+msgstr "Unbekannter Fehler.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:430
+#: src/setup/gnunet-win-tool.c:151
 #, 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"
+msgid "Service deleted.\n"
+msgstr "Dienst gelöscht.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1276
-#: src/applications/sqstore_mysql/mysql.c:1449
-msgid "# bytes in datastore"
-msgstr "# bytes in der Datenbank"
+#: src/setup/gnunet-win-tool.c:163
+#, c-format
+msgid "Error: can't access service: %s\n"
+msgstr "Fehler: auf den Dienst konnte nicht zugegriffen werden: %s\n"
 
-#: src/applications/session/connect.c:256
-#: src/applications/session/connect.c:272
+#: src/setup/gnunet-win-tool.c:167
 #, 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"
+msgid "Error: can't delete service: %s\n"
+msgstr "Fehler: Dienst konnte nicht gelöscht werden: %s\n"
 
-#: src/applications/session/connect.c:313
-#, c-format
-msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
+#: src/applications/dht/tools/dhttest.c:43
+#: src/applications/dht/tools/dhttest2.c:43
+#: src/applications/dht/module/table.c:734
+msgid "# dht connections"
 msgstr ""
-"Sitzungsschlüssel kann nicht verschlüsselt werden, Knoten `%s' ist uns nicht "
-"bekannt!\n"
 
-#: src/applications/session/connect.c:492
+#: src/applications/dht/tools/dht-query.c:52
 #, fuzzy
-msgid "Could not create any HELLO for myself!\n"
-msgstr "Hostkey konnte nicht erzeugt werden!\n"
+msgid "Query (get KEY, put KEY VALUE) DHT table."
+msgstr "Eine DHT Tabelle abfragen (get KEY, put KEY VALUE, remove KEY VALUE)."
 
-#: 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/dht/tools/dht-query.c:57
+#, 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/session/connect.c:624
+#: src/applications/dht/tools/dht-query.c:96
+#, c-format
+msgid "%s(%s) operation returned no results.\n"
+msgstr ""
+
+#: src/applications/dht/tools/dht-query.c:113
 #, 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"
+msgid "Issuing '%s(%s,%s)' command.\n"
+msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
 
-#: src/applications/session/connect.c:656
+#: src/applications/dht/tools/dht-query.c:120
 #, c-format
-msgid "Invalid `%s' message received from peer `%s'.\n"
-msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
+msgid "'%s(%s,%s)' succeeded\n"
+msgstr "'%s(%s,%s)' erfolgreich abgeschlossen\n"
 
-#: src/applications/session/connect.c:666
+#: src/applications/dht/tools/dht-query.c:124
 #, 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"
+msgid "'%s(%s,%s)' failed.\n"
+msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
 
-#: src/applications/session/connect.c:729
+#: src/applications/dht/tools/dht-query.c:148
+#, 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:161
+#, 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:178
+#, 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:189
+#, c-format
+msgid "Unsupported command `%s'.  Aborting.\n"
+msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
+
+#: src/applications/dht/module/cs.c:135
+#, c-format
+msgid "`%s' failed. Terminating connection to client.\n"
+msgstr "`%s' fehlgeschlagen. Beende Verbindung zu Client.\n"
+
+#: src/applications/dht/module/cs.c:242
 #, fuzzy, c-format
-msgid ""
-"Error parsing encrypted session key from `%s', given message part size is "
-"invalid.\n"
+msgid "`%s' registering client handlers: %d %d\n"
+msgstr "`%s' registriert Client-Handler %d\n"
+
+#: src/applications/dht/module/cs.c:261
+msgid "Enables efficient non-anonymous routing"
 msgstr ""
-"Fehler beim Parsen des Verschlüsselten Sitzungsschlüssels, gegebene "
-"Nachrichtenteilgröße ist ungültig.\n"
 
-#: src/applications/session/connect.c:741
+#: src/applications/dht/module/routing.c:747
+msgid "# dht replies routed"
+msgstr ""
+
+#: src/applications/dht/module/routing.c:749
+msgid "# dht requests routed"
+msgstr "# dht Anfragen weitergeleitet"
+
+#: src/applications/dht/module/routing.c:751
+#, fuzzy
+msgid "# dht get requests received"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/applications/dht/module/routing.c:753
+#, fuzzy
+msgid "# dht put requests received"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/applications/dht/module/routing.c:755
+#, fuzzy
+msgid "# dht results received"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/applications/dht/module/routing.c:759
 #, 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"
+msgid "`%s' registering p2p handlers: %d %d %d\n"
+msgstr "`%s' registriert Handler %d %d %d\n"
 
-#: src/applications/session/connect.c:898
-msgid "# session keys sent"
-msgstr "# Sitzungsschlüssel gesendet"
+#: src/applications/dht/module/table.c:736
+#, fuzzy
+msgid "# dht discovery messages received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/applications/session/connect.c:900
-msgid "# session keys rejected"
-msgstr "# Sitzungsschlüssel abgelehnt"
+#: src/applications/dht/module/table.c:738
+msgid "# dht route host lookups performed"
+msgstr ""
 
-#: src/applications/session/connect.c:902
-msgid "# session keys accepted"
-msgstr "# Sitzungsschlüssel akzeptiert"
+#: src/applications/dht/module/table.c:740
+#, fuzzy
+msgid "# dht discovery messages sent"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/applications/session/connect.c:904
-msgid "# sessions established"
-msgstr "# Sitzungen aufgebaut"
+#: src/applications/topology_default/topology.c:545
+#, c-format
+msgid "Failed to read friends list from `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/applications/rpc/rpc.c:134 src/applications/rpc/rpc.c:175
+#: src/applications/topology_default/topology.c:562
+msgid "Syntax error in topology specification, skipping bytes.\n"
+msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
+
+#: src/applications/topology_default/topology.c:576
 #, c-format
+msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
+
+#: src/applications/topology_default/topology.c:588
 msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:596
+msgid ""
+"More friendly connections required than target total number of connections.\n"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:703
+msgid "maintains GNUnet default mesh topology"
+msgstr ""
+
+#: src/applications/rpc/rpc.c:136 src/applications/rpc/rpc.c:181
+#, c-format
+msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
 "using this name (%p)\n"
 msgstr ""
 "%s::%s - RPC %s:%p konnte nicht registriert werden: ein anderer Callback "
 "verwendet bereits diesen Namen (%p)\n"
 
-#: src/applications/rpc/rpc.c:218 src/applications/rpc/rpc.c:265
+#: src/applications/rpc/rpc.c:228 src/applications/rpc/rpc.c:281
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
@@ -775,696 +1222,470 @@
 "%s::%s - RPC %s:%p konnte nicht unregistriert werden: ein anderer Callback "
 "ist unter diesem Namen registiert: %p\n"
 
-#: src/applications/rpc/rpc.c:237
+#: src/applications/rpc/rpc.c:250
 #, 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:285
+#: src/applications/rpc/rpc.c:303
 #, 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:909 src/applications/rpc/rpc.c:1043
-#: src/applications/rpc/rpc.c:1129
+#: src/applications/rpc/rpc.c:945 src/applications/rpc/rpc.c:1084
+#: src/applications/rpc/rpc.c:1174
 #, 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:975
+#: src/applications/rpc/rpc.c:1015
 #, 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:1307
+#: src/applications/rpc/rpc.c:1363
 #, 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:1421
+#: src/applications/rpc/rpc.c:1482
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "RPC nicht unregistriert: %s:%p\n"
 
-#: src/applications/rpc/rpc.c:1450
+#: src/applications/rpc/rpc.c:1511
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "`%s' registriert Handler %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1466
+#: src/applications/rpc/rpc.c:1529
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/applications/rpc/rpc.c:1524
+#: src/applications/rpc/rpc.c:1592
 msgid "RPC async reply invalid.\n"
 msgstr "RPC async Antwort ungültig.\n"
 
-#: src/applications/rpc/rpc.c:1592
+#: src/applications/rpc/rpc.c:1663
 msgid "async RPC reply not received.\n"
 msgstr "async RPC Antwort nicht empfangen.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:421
-#, 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:1359
-#, fuzzy, c-format
-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:1471
-#: src/applications/sqstore_mysql/mysql.c:1618
+#: src/applications/datastore/datastore.c:170
+#: src/applications/datastore/datastore.c:184
 #, 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:1496
-#: src/applications/sqstore_mysql/mysql.c:1641
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
-msgstr ""
-"Fehler beim Laden des MySQL Datenbankmoduls. Prüfen Sie, ob MySQL läuft und "
-"richtig eingerichtet ist!\n"
-
-#: 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:368
+#: src/applications/datastore/datastore.c:423
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:370
+#: src/applications/datastore/datastore.c:425
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:373
+#: src/applications/datastore/datastore.c:428
 msgid "# bytes allowed in datastore"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/applications/datastore/datastore.c:388
+#: src/applications/datastore/datastore.c:445
 #, 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:513
+#: src/applications/datastore/datastore.c:586
 #, 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:116
-#, fuzzy, c-format
-msgid "Failed to access GNUnet home directory `%s'\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+#: src/applications/fragmentation/fragmentation.c:578
+msgid "# messages defragmented"
+msgstr "# defragmentierter Nachrichten"
 
-#: src/applications/identity/hostkey.c:143
+#: src/applications/fragmentation/fragmentation.c:580
+msgid "# messages fragmented"
+msgstr "# fragmentierter Nachrichten"
+
+#: src/applications/fragmentation/fragmentation.c:581
+msgid "# fragments discarded"
+msgstr "# verworfener Nachrichten"
+
+#: src/applications/fragmentation/fragmentation.c:592
 #, c-format
-msgid ""
-"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
-msgstr ""
-"Formatüberprüfung schlug für die existierende Hostkeydatei `%s' fehl, es "
-"wird ein neuer Hostkey erzeugt.\n"
+msgid "`%s' registering handler %d\n"
+msgstr "`%s' registriert Handler %d\n"
 
-#: 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/vpn/gnunet-vpn.c:51
+#: src/applications/stats/gnunet-stats.c:83
+msgid "Print statistics about GNUnet operations."
+msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
-#: src/applications/identity/hostkey.c:162
-msgid "Done creating hostkey.\n"
-msgstr "Hostkey wurde erfolgreich erzeugt.\n"
+#: src/applications/vpn/gnunet-vpn.c:55
+msgid "Suppress display of asynchronous log messages"
+msgstr ""
 
-#: src/applications/identity/identity.c:345
+#: src/applications/vpn/gnunet-vpn.c:149
+#: src/applications/stats/gnunet-stats.c:121
+#: src/applications/tbench/gnunet-tbench.c:126
+#: src/applications/tracekit/gnunet-tracekit.c:325
+#: src/applications/template/gnunet-template.c:95
 #, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
-"Datei wurde entfernt.\n"
+msgid "Error establishing connection with gnunetd.\n"
+msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/applications/identity/identity.c:358
+#: src/applications/vpn/vpn.c:368
 #, c-format
-msgid ""
-"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgid "Not storing route to myself from peer %d\n"
 msgstr ""
-"Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
-"Datei wurde entfernt.\n"
 
-#: 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: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:776
+#: src/applications/vpn/vpn.c:379
 #, c-format
-msgid "Signature failed verification: peer `%s' not known.\n"
+msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
-"Signatur kann nicht verifiziert werden, der Knoten `%s' ist uns nicht "
-"bekannt!\n"
 
-#: 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:894
-#: src/applications/identity/identity.c:1014
+#: src/applications/vpn/vpn.c:412
 #, c-format
-msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
+msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:1017
+#: src/applications/vpn/vpn.c:468
 #, c-format
-msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
+msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:190
+#: src/applications/vpn/vpn.c:475
 #, c-format
-msgid ""
-"Converting peer address to string failed, transport type %d not supported\n"
+msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:244
+#: src/applications/vpn/vpn.c:491
 #, c-format
-msgid "Transport connection attempt failed, transport type %d not supported\n"
+msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:297
+#: src/applications/vpn/vpn.c:563
 #, c-format
-msgid ""
-"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
+msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: 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:494
+#: src/applications/vpn/vpn.c:569
 #, c-format
-msgid "No transport of type %d known.\n"
-msgstr "Kein Transport des Typs %d bekannt.\n"
-
-#: src/applications/transport/transport.c:553
-msgid "No transport succeeded in creating a hello!\n"
+msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: 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: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:781
+#: src/applications/vpn/vpn.c:606
 #, c-format
-msgid "Transport library `%s' did not provide required function '%s%s'.\n"
+msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
-"Transport Bibliothek `%s' stellt nicht die benötigte Funktion '%s%s' zur "
-"Verfügung.\n"
 
-#: 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:819
+#: src/applications/vpn/vpn.c:621
 #, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Ich bin Peer `%s'.\n"
+msgid "Cannot set tunnel name to %s because of %s\n"
+msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:575
-msgid "# messages defragmented"
-msgstr "# defragmentierter Nachrichten"
-
-#: src/applications/fragmentation/fragmentation.c:577
-msgid "# messages fragmented"
-msgstr "# fragmentierter Nachrichten"
-
-#: src/applications/fragmentation/fragmentation.c:578
-msgid "# fragments discarded"
-msgstr "# verworfener Nachrichten"
-
-#: src/applications/fragmentation/fragmentation.c:588
+#: src/applications/vpn/vpn.c:631
 #, c-format
-msgid "`%s' registering handler %d\n"
-msgstr "`%s' registriert Handler %d\n"
+msgid "Configured tunnel name to %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:62
+#: src/applications/vpn/vpn.c:673
 #, c-format
-msgid "Supported peer-to-peer messages:\n"
-msgstr "unterstützte Peer-to-Peer Nachrichten:\n"
+msgid "Cannot get socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:65
+#: src/applications/vpn/vpn.c:683
 #, c-format
-msgid "Supported client-server messages:\n"
-msgstr "unterstützte Client-Server Nachrichten:\n"
+msgid "Cannot set socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:84
-#: src/applications/vpn/gnunet-vpn.c:53
-msgid "Print statistics about GNUnet operations."
-msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
-
-#: src/applications/stats/gnunet-stats.c:88
-msgid "prints supported protocol messages"
-msgstr "gibt unterstützte Protokollnachrichten aus"
-
-#: 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:149
+#: src/applications/vpn/vpn.c:693
 #, c-format
-msgid "Error establishing connection with gnunetd.\n"
-msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
+msgid "Cannot set MTU for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:134
+#: src/applications/vpn/vpn.c:701
 #, c-format
-msgid "Error reading information from gnunetd.\n"
-msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
+msgid "Cannot get interface index for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/clientapi.c:330
-msgid "Uptime (seconds)"
-msgstr "Laufzeit (Sekunden)"
-
-#: src/applications/stats/statistics.c:223
+#: src/applications/vpn/vpn.c:715
 #, c-format
-msgid "% of allowed network load (up)"
-msgstr "% of allowed network load (up)"
+msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:225
-#, c-format
-msgid "% of allowed network load (down)"
-msgstr "% of allowed network load (down)"
+#: src/applications/vpn/vpn.c:730
+#, 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/stats/statistics.c:226
+#: src/applications/vpn/vpn.c:746
 #, c-format
-msgid "% of allowed cpu load"
-msgstr "% of allowed cpu load"
+msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:227
+#: src/applications/vpn/vpn.c:760
 #, fuzzy, c-format
-msgid "% of allowed io load"
-msgstr "% of allowed cpu load"
+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/stats/statistics.c:228
-msgid "# of connected peers"
-msgstr "# verbundener Knoten"
-
-#: src/applications/stats/statistics.c:230
-msgid "# bytes of noise received"
-msgstr "# Bytes Rauschen empfangen"
-
-#: 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:421
-msgid "keeps statistics about gnunetd's operation"
-msgstr "Hält Statistiken über Betrieb von gnunetd"
-
-#: src/applications/stats/sqstats.c:150
-msgid "# Any-Blocks"
+#: src/applications/vpn/vpn.c:803
+msgid ""
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:151
-msgid "# DBlocks"
+#: src/applications/vpn/vpn.c:853
+#, c-format
+msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:152
-msgid "# SBlocks"
+#: src/applications/vpn/vpn.c:932
+#, c-format
+msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:153
-msgid "# KBlocks"
+#: src/applications/vpn/vpn.c:941
+#, c-format
+msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:154
-msgid "# NBlocks"
+#: src/applications/vpn/vpn.c:961
+msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:155
-msgid "# KNBlocks"
+#: src/applications/vpn/vpn.c:1010
+msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:156
-msgid "# OnDemand-Blocks"
+#: src/applications/vpn/vpn.c:1018
+msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:157
-msgid "# Unknown-Blocks"
+#: src/applications/vpn/vpn.c:1027
+msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:158
-msgid "# expired"
-msgstr ""
+#: src/applications/vpn/vpn.c:1032
+#, 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/stats/sqstats.c:159
-msgid "# expire in 1h"
+#: src/applications/vpn/vpn.c:1043
+#, c-format
+msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:160
-msgid "# expire in 24h"
+#: src/applications/vpn/vpn.c:1071
+msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:161
-msgid "# expire in 1 week"
+#: src/applications/vpn/vpn.c:1092
+msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:162
-msgid "# expire in 1 month"
+#: src/applications/vpn/vpn.c:1099
+#, c-format
+msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:163
-msgid "# zero priority"
+#: src/applications/vpn/vpn.c:1117
+#, c-format
+msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:164
-msgid "# priority one"
+#: src/applications/vpn/vpn.c:1123
+#, c-format
+msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:165
-msgid "# priority larger than one"
+#: src/applications/vpn/vpn.c:1140
+msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:166
-msgid "# no anonymity"
+#: src/applications/vpn/vpn.c:1146
+msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:167
-msgid "# anonymity one"
+#: src/applications/vpn/vpn.c:1152
+#, c-format
+msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:168
-msgid "# anonymity larger than one"
+#: src/applications/vpn/vpn.c:1173
+#, c-format
+msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:64
-#: src/applications/tracekit/gnunet-tracekit.c:55
-msgid "Start GNUnet transport benchmarking tool."
-msgstr "GNUnet Transport Benchmarking Werkzeug starten."
-
-#: src/applications/tbench/gnunet-tbench.c:66
-msgid "output in gnuplot format"
-msgstr "Ausgabe im gnuplot Format"
-
-#: src/applications/tbench/gnunet-tbench.c:70
-msgid "number of iterations"
-msgstr "Anzahl an Durchläufen"
-
-#: src/applications/tbench/gnunet-tbench.c:74
-msgid "number of messages to use per iteration"
-msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
-
-#: src/applications/tbench/gnunet-tbench.c:77
-msgid "receiver host identifier (ENC file name)"
-msgstr "Bezeichner des Empfängerhosts (ENC Dateiname)"
-
-#: src/applications/tbench/gnunet-tbench.c:80
-msgid "message size"
-msgstr "Nachrichtengröße"
-
-#: src/applications/tbench/gnunet-tbench.c:83
-msgid "sleep for SPACE ms after each a message block"
-msgstr "Für SPACE ms nach jedem Nachrichtenblock pausieren"
-
-#: src/applications/tbench/gnunet-tbench.c:86
-msgid "time to wait for the completion of an iteration (in ms)"
-msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
-
-#: src/applications/tbench/gnunet-tbench.c:91
-msgid "number of messages in a message block"
-msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
-
-#: src/applications/tbench/gnunet-tbench.c:143
+#: src/applications/vpn/vpn.c:1191
 #, c-format
-msgid "You must specify a receiver!\n"
-msgstr "Sie müssen einen Empfänger angeben!\n"
+msgid "Receive table limit on peer reached %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:152
-#, c-format
-msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
+#: src/applications/vpn/vpn.c:1223
+msgid "realise alloc ram\n"
 msgstr ""
-"Ungültige Empfängerknoten ID angegeben (`%s' ist kein gültiger Name).\n"
 
-#: src/applications/tbench/gnunet-tbench.c:187
-#, c-format
-msgid "Time:\n"
-msgstr "Zeit:\n"
+#: src/applications/vpn/vpn.c:1244
+msgid "realise add routes\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:188
-#, c-format
-msgid "\tmax      %llums\n"
-msgstr "\tMax      %llums\n"
+#: src/applications/vpn/vpn.c:1296
+msgid "realise pull routes\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:189
-#, c-format
-msgid "\tmin      %llums\n"
-msgstr "\tMin      %llums\n"
+#: src/applications/vpn/vpn.c:1350
+msgid "realise copy table\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:190
-#, c-format
-msgid "\tmean     %8.4fms\n"
-msgstr "\tMittel   %8.4fms\n"
+#: src/applications/vpn/vpn.c:1383
+msgid "Cannot store client info\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:191
-#, c-format
-msgid "\tvariance %8.4fms\n"
-msgstr "\tVarianz  %8.4fms\n"
+#: src/applications/vpn/vpn.c:1723
+#, fuzzy, c-format
+msgid "`%s' initialising RFC4913 module  %d and %d\n"
+msgstr "`%s' registriert Handler %d und %d\n"
 
-#: src/applications/tbench/gnunet-tbench.c:193
+#: src/applications/vpn/vpn.c:1728
 #, c-format
-msgid "Loss:\n"
-msgstr "Verlust:\n"
+msgid "RFC4193 my First 4 hex digits of host id are %x\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:194
-#, c-format
-msgid "\tmax      %u\n"
-msgstr "\tMax      %u\n"
+#: src/applications/vpn/vpn.c:1817
+#, fuzzy
+msgid "enables IPv6 over GNUnet (incomplete)"
+msgstr "Ermöglicht P2P-Chat"
 
-#: src/applications/tbench/gnunet-tbench.c:195
-#, c-format
-msgid "\tmin      %u\n"
-msgstr "\tMin      %u\n"
+#: src/applications/vpn/vpn.c:1851
+msgid "RFC4193 Waiting for tun thread to end\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:196
-#, c-format
-msgid "\tmean     %8.4f\n"
-msgstr "\tMittel   %8.4fms\n"
+#: src/applications/vpn/vpn.c:1866
+msgid "RFC4193 The tun thread has ended\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:197
+#: src/applications/vpn/vpn.c:1884
 #, c-format
-msgid "\tvariance %8.4f\n"
-msgstr "\tVarianz %8.4f\n"
-
-#: 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:209
-#, c-format
-msgid ""
-"\n"
-"Did not receive the message from gnunetd. Is gnunetd running?\n"
+msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
-"\n"
-"Es wurde keine Nachricht von gnunetd empfangen. Läuft gnunetd?\n"
 
-#: 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"
-
-#: src/applications/tracekit/gnunet-tracekit.c:48
-msgid "probe network to the given DEPTH"
-msgstr "Netzwerk bis zur angegebenen Tiefe DEPTH sondieren"
-
-#: src/applications/tracekit/gnunet-tracekit.c:52
-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: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:63
-msgid "wait DELAY seconds for replies"
-msgstr "DELAY Sekunden auf Antworten warten"
-
-#: 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"
+#: src/applications/gap/pid_table.c:177
+msgid "# distinct interned peer IDs in pid table"
 msgstr ""
-"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:160
-#, c-format
-msgid "`%s' is not connected to any peer.\n"
-msgstr "`%s' ist zu keinem Knoten verbunden.\n"
-
-#: src/applications/tracekit/gnunet-tracekit.c:197
-#, c-format
-msgid "`%s' connected to `%s'.\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
-
-#: src/applications/tracekit/gnunet-tracekit.c:210
-#, c-format
-msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
+#: src/applications/gap/pid_table.c:181
+msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
-"Formatangabe ungültig. Verwenden Sie 0 für menschen-lesbar und 1 für dot\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:236
+#: src/applications/gap/gap.c:1723
 #, 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:336
-msgid "Could not send request to gnunetd.\n"
-msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
-
-#: 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: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:346
-#, c-format
-msgid "TRACEKIT: received invalid `%s' message\n"
-msgstr "TRACEKIT: ungültige `%s' Nachricht empfangen\n"
-
-#: src/applications/tracekit/tracekit.c:443
-msgid "allows mapping of the network topology"
-msgstr "Erlaubt die Kartographierung der Netzwerktopologie"
-
-#: 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:1696
+#: src/applications/gap/gap.c:1724
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1883
+#: src/applications/gap/gap.c:1916
 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:1892 src/applications/fs/module/anonymity.c:65
+#: src/applications/gap/gap.c:1927 src/applications/fs/module/anonymity.c:66
 msgid "Failed to get traffic stats.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/applications/gap/gap.c:1902 src/applications/gap/gap.c:1910
-#: src/applications/gap/gap.c:1921
+#: src/applications/gap/gap.c:1938 src/applications/gap/gap.c:1947
+#: src/applications/gap/gap.c:1959
 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:2183
+#: src/applications/gap/gap.c:2231
 msgid "# gap requests total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2234
 msgid "# gap requests policy: immediate drop"
 msgstr "# gap Anfragen mit taktischer Entscheidung: sofortiges Verwerfen"
 
-#: src/applications/gap/gap.c:2188
+#: src/applications/gap/gap.c:2236
 msgid "# gap requests policy: not routed"
 msgstr "# gap Anfragen mit taktischer Entscheidung: kein Routing"
 
-#: src/applications/gap/gap.c:2190
+#: src/applications/gap/gap.c:2238
 msgid "# gap requests policy: not answered"
 msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten"
 
-#: src/applications/gap/gap.c:2194
+#: src/applications/gap/gap.c:2242
 msgid "# gap requests processed: attempted add to RT"
 msgstr "# gap Anfragen verarbeitet: versucht, der RT hinzuzufügen"
 
-#: src/applications/gap/gap.c:2197
+#: src/applications/gap/gap.c:2245
 msgid "# gap requests processed: local result"
 msgstr "# gap Anfragen verarbeitet: lokales Ergebnis"
 
-#: src/applications/gap/gap.c:2199
+#: src/applications/gap/gap.c:2247
 msgid "# gap routing successes (total)"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/applications/gap/gap.c:2202
+#: src/applications/gap/gap.c:2250
 msgid "# gap requests dropped: collision in RT"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/applications/gap/gap.c:2206
+#: src/applications/gap/gap.c:2254
 msgid "# gap requests forwarded (counting each peer)"
 msgstr "#gap Anfragen weitergeleitet (jeder Knoten gezählt)"
 
-#: src/applications/gap/gap.c:2208
+#: src/applications/gap/gap.c:2256
 msgid "# gap duplicate requests (pending)"
 msgstr "# gap doppelte Anfragen (unfertig)"
 
-#: src/applications/gap/gap.c:2211
+#: src/applications/gap/gap.c:2259
 msgid "# gap duplicate requests that were re-tried"
 msgstr "# gap doppelte Anfragen, die wiederholt wurden"
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2262
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr "# gap Wiederholungs-TTL-Differenz (kummulativ)"
 
-#: src/applications/gap/gap.c:2216
+#: src/applications/gap/gap.c:2264
 msgid "# gap reply duplicates"
 msgstr "#gap doppelte Antworten"
 
-#: src/applications/gap/gap.c:2218
+#: src/applications/gap/gap.c:2266
 #, fuzzy
 msgid "# gap spurious replies (dropped)"
 msgstr "# gap falsche Antworten"
 
-#: src/applications/gap/gap.c:2220
+#: src/applications/gap/gap.c:2268
 msgid "# gap routing slots currently in use"
 msgstr "# gap Routingschächte im Moment in Verwendung"
 
-#: src/applications/gap/gap.c:2223
+#: src/applications/gap/gap.c:2271
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2227
+#: src/applications/gap/gap.c:2275
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2229
+#: src/applications/gap/gap.c:2277
 #, fuzzy
 msgid "# gap rewards pending"
 msgstr "# gap doppelte Anfragen (unfertig)"
 
-#: src/applications/gap/gap.c:2231
+#: src/applications/gap/gap.c:2279
 #, fuzzy
 msgid "# gap response weights"
 msgstr "# gap falsche Antworten"
 
-#: src/applications/gap/gap.c:2246
+#: src/applications/gap/gap.c:2295
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
@@ -1472,61 +1693,44 @@
 "Verkehrsdienst konnte nicht geladen werden, GAP kann keinen verdeckenden "
 "Netzwerkverkehr sicherstellen.\n"
 
-#: src/applications/gap/gap.c:2269
+#: src/applications/gap/gap.c:2319
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "`%s' registriert Handler %d %d\n"
 
-#: src/applications/gap/pid_table.c:177
-msgid "# distinct interned peer IDs in pid table"
-msgstr ""
-
-#: src/applications/gap/pid_table.c:181
-msgid "# total RC of interned peer IDs in pid table"
-msgstr ""
-
-#: 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: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-pseudonym.c:70
 #: src/applications/fs/tools/gnunet-insert.c:268
-#: src/applications/fs/tools/gnunet-search.c:135
+#: src/applications/fs/tools/gnunet-search.c:136
 #: 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"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:74
+#: src/applications/fs/tools/gnunet-pseudonym.c:73
 msgid "automate creation of a namespace by starting a collection"
 msgstr ""
 "Erstellung eines Namespaces durch das Anfangen einer Collection "
 "automatisieren"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:78
+#: src/applications/fs/tools/gnunet-pseudonym.c:77
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "Neues Pseudonym unter dem angegebenen NICKNAME erstellen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:81
+#: src/applications/fs/tools/gnunet-pseudonym.c:80
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "Pseudonym mit dem angegeben NICKNAME löschen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:84
+#: src/applications/fs/tools/gnunet-pseudonym.c:83
 msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 "Automatisierte Erstellung eines Namespaces beenden (beendet Collection)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:86
+#: src/applications/fs/tools/gnunet-pseudonym.c:85
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
 msgstr ""
 "Erstellen von neuen Pseudonymen, Löschen von Pseudonymen und Auflisten von "
 "bestehenden Pseudonymen."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:90
+#: src/applications/fs/tools/gnunet-pseudonym.c:89
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
@@ -1534,13 +1738,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:93
+#: src/applications/fs/tools/gnunet-pseudonym.c:92
 #, fuzzy
 msgid "specify metadata describing the namespace or collection"
 msgstr ""
 "Automatisierte Erstellung eines Namespaces beenden (beendet Collection)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:97
+#: src/applications/fs/tools/gnunet-pseudonym.c:96
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
@@ -1548,11 +1752,11 @@
 "Keine Bekanntmachung für diesen Namespace erstellen (zu verwenden, wenn ein "
 "neues Pseudonym erstellt wird)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:100
+#: src/applications/fs/tools/gnunet-pseudonym.c:99
 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:104
+#: src/applications/fs/tools/gnunet-pseudonym.c:103
 msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
@@ -1560,73 +1764,73 @@
 "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:107
+#: src/applications/fs/tools/gnunet-pseudonym.c:106
 msgid "set the rating of a namespace"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:140
+#: src/applications/fs/tools/gnunet-pseudonym.c:139
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:142
+#: src/applications/fs/tools/gnunet-pseudonym.c:141
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr "Namespace `%s' (%s) hat das Rating %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:171
+#: src/applications/fs/tools/gnunet-pseudonym.c:170
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr "\tRating (nach Update): %d\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:204
+#: src/applications/fs/tools/gnunet-pseudonym.c:203
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Collection beendet.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:206
+#: src/applications/fs/tools/gnunet-pseudonym.c:205
 #, 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:214
+#: src/applications/fs/tools/gnunet-pseudonym.c:213
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:219
+#: src/applications/fs/tools/gnunet-pseudonym.c:218
 #, 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:234
+#: src/applications/fs/tools/gnunet-pseudonym.c:233
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:238
+#: src/applications/fs/tools/gnunet-pseudonym.c:237
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:279
+#: src/applications/fs/tools/gnunet-pseudonym.c:280
 #, 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:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:287
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr "Namespace `%s' wurde erstellt (Root: %s).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:301
+#: src/applications/fs/tools/gnunet-pseudonym.c:302
 #, 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:309
+#: src/applications/fs/tools/gnunet-pseudonym.c:310
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -1636,40 +1840,40 @@
 msgid "==> Directory `%s':\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:87
+#: src/applications/fs/tools/gnunet-directory.c:88
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:114
+#: src/applications/fs/tools/gnunet-directory.c:118
 #, 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:116
+#: src/applications/fs/tools/gnunet-directory.c:120
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr "%d Dateien im Verzeichnis gefunden.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:131
+#: src/applications/fs/tools/gnunet-directory.c:135
 msgid "Perform directory related operations."
 msgstr "Verzeichnisbezogene Operationen durchführen."
 
-#: src/applications/fs/tools/gnunet-directory.c:134
+#: src/applications/fs/tools/gnunet-directory.c:138
 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:138
+#: src/applications/fs/tools/gnunet-directory.c:142
 msgid "list entries from the directory database"
 msgstr "Einträge aus der Verzeichnis Datenbank auflisten"
 
-#: src/applications/fs/tools/gnunet-directory.c:141
+#: src/applications/fs/tools/gnunet-directory.c:145
 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:164
+#: src/applications/fs/tools/gnunet-directory.c:168
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "%d übereinstimmende Einträge aufgelistet.\n"
@@ -1860,42 +2064,42 @@
 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:418
+#: src/applications/fs/tools/gnunet-insert.c:420
 #, 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:437
+#: src/applications/fs/tools/gnunet-insert.c:440
 #, 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:464
-#: src/applications/fs/tools/gnunet-insert.c:472
-#: src/applications/fs/tools/gnunet-insert.c:480
+#: src/applications/fs/tools/gnunet-insert.c:451
+#: src/applications/fs/tools/gnunet-insert.c:459
+#: src/applications/fs/tools/gnunet-insert.c:467
+#: src/applications/fs/tools/gnunet-insert.c:475
+#: src/applications/fs/tools/gnunet-insert.c:483
 #, 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:138
+#: src/applications/fs/tools/gnunet-search.c:139
 msgid "Search GNUnet for files."
 msgstr "Das GNUnet nach Dateien durchsuchen."
 
-#: src/applications/fs/tools/gnunet-search.c:142
+#: src/applications/fs/tools/gnunet-search.c:143
 msgid "exit after receiving LIMIT results"
 msgstr "Abbrechen, nachdem LIMIT Ergebnisse empfangen wurden"
 
-#: src/applications/fs/tools/gnunet-search.c:145
+#: src/applications/fs/tools/gnunet-search.c:146
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "Begegnete (entschlüsselte) Suchergebnisse in FILENAME schreiben"
 
-#: src/applications/fs/tools/gnunet-search.c:148
+#: src/applications/fs/tools/gnunet-search.c:149
 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:183
+#: src/applications/fs/tools/gnunet-search.c:186
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
@@ -1945,45 +2149,45 @@
 msgstr ""
 "Download der Datei `%s' abgeschlossen. Geschwindigkeit war %8.3f KB/s.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:178
+#: src/applications/fs/tools/gnunet-download.c:180
 msgid "no name given"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:184
+#: src/applications/fs/tools/gnunet-download.c:186
 #, fuzzy, c-format
 msgid "Starting download `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:225
+#: src/applications/fs/tools/gnunet-download.c:228
 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:242
+#: src/applications/fs/tools/gnunet-download.c:246
 #, 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:279
+#: src/applications/fs/tools/gnunet-download.c:289
 #, 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:320
+#: src/applications/fs/tools/gnunet-download.c:331
 #, 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:338
+#: src/applications/fs/tools/gnunet-download.c:351
 #, fuzzy, c-format
 msgid "Downloading %d files from directory `%s'.\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/applications/fs/tools/gnunet-download.c:341
+#: src/applications/fs/tools/gnunet-download.c:354
 #, 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:377
+#: src/applications/fs/tools/gnunet-download.c:391
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -1997,7 +2201,7 @@
 "%16llu von %16llu Bytes deindiziert (schätze %llu Sekunden bis "
 "Fertigstellung)            "
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:73
 #, c-format
 msgid ""
 "\n"
@@ -2007,7 +2211,7 @@
 "Deindizierung von `%s' abgeschlossen, %llu Bytes benötigten %llu Sekunden (%"
 "8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:85
+#: src/applications/fs/tools/gnunet-unindex.c:88
 #, c-format
 msgid ""
 "\n"
@@ -2016,36 +2220,49 @@
 "\n"
 "Fehler beim Deindizieren der Datei: %s\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:105
+#: src/applications/fs/tools/gnunet-unindex.c:108
 msgid "Unindex files."
 msgstr "Dateien deindizieren."
 
-#: src/applications/fs/tools/gnunet-unindex.c:142
+#: src/applications/fs/tools/gnunet-unindex.c:145
 #, 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:158
+#: src/applications/fs/tools/gnunet-unindex.c:163
 #, 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:228
+#: src/applications/fs/uritrack/file_info.c:134
+msgid "Collecting file identifiers disabled.\n"
+msgstr "Einsammeln von Dateibezeichnern deaktiviert.\n"
+
+#: src/applications/fs/uritrack/file_info.c:414
+#, c-format
+msgid "Deleted corrupt URI database in `%s'."
+msgstr ""
+
+#: src/applications/fs/module/dht_push.c:138
+msgid "# blocks pushed into DHT"
+msgstr ""
+
+#: src/applications/fs/module/querymanager.c:234
 #, fuzzy
 msgid "# FS currently tracked queries from clients"
 msgstr "# Client Trace-Antworten gesendet"
 
-#: src/applications/fs/module/querymanager.c:230
+#: src/applications/fs/module/querymanager.c:236
 msgid "# FS replies passed to clients"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:323
+#: src/applications/fs/module/ondemand.c:330
 #, 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:418
+#: src/applications/fs/module/ondemand.c:431
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2056,7 +2273,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:444
+#: src/applications/fs/module/ondemand.c:457
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2065,11 +2282,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:495
+#: src/applications/fs/module/ondemand.c:514
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:647
+#: src/applications/fs/module/ondemand.c:668
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -2077,7 +2294,7 @@
 "Deindizierter ODB Block `%s' vom Offset %llu fehlt bereits im "
 "Datenspeicher.\n"
 
-#: src/applications/fs/module/fs.c:1170
+#: src/applications/fs/module/fs.c:1204
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2086,82 +2303,89 @@
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/applications/fs/module/fs.c:1185
+#: src/applications/fs/module/fs.c:1219
 msgid "# FS expired replies dropped"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1187
+#: src/applications/fs/module/fs.c:1221
 #, fuzzy
 msgid "# FS valid replies received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/applications/fs/module/fs.c:1220
+#: src/applications/fs/module/fs.c:1257
 #, 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:1266
+#: src/applications/fs/module/fs.c:1314
 msgid "enables (anonymous) file-sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
-#: src/applications/fs/module/migration.c:374
+#: src/applications/fs/module/migration.c:381
 msgid "# blocks migrated"
 msgstr "# Blöcke migriert"
 
-#: src/applications/fs/module/migration.c:376
+#: src/applications/fs/module/migration.c:383
 #, fuzzy
 msgid "# blocks fetched for migration"
 msgstr "# Blöcke migriert"
 
-#: src/applications/fs/module/migration.c:379
+#: src/applications/fs/module/migration.c:386
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/module/dht_push.c:138
-msgid "# blocks pushed into DHT"
-msgstr ""
+#: src/applications/fs/fsui/deserialize.c:772
+#, c-format
+msgid "FSUI state file `%s' had syntax error at offset %u.\n"
+msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n"
 
-#: src/applications/fs/fsui/search.c:234
+#: src/applications/fs/fsui/searchtest.c:154
+#: src/applications/fs/fsui/fsuitest.c:173
+#: src/applications/fs/fsui/downloadtest.c:289
+#: src/applications/fs/fsui/serializetest2.c:391
+#: src/applications/fs/fsui/serializetest3.c:163
+#: src/applications/fs/fsui/serializetest4.c:358
+#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
+#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
+msgid "AND"
+msgstr "UND"
+
+#: src/applications/fs/fsui/search.c:241
 msgid "Error running search (no reason given)."
 msgstr "Das Starten der Suche schlug fehl (Ursache unbekannt)."
 
-#: src/applications/fs/fsui/download.c:294
+#: src/applications/fs/fsui/download.c:311
 msgid "Download failed (no reason given)"
 msgstr "ECRS Download schlug fehl (Ursache unbekannt)."
 
-#: src/applications/fs/fsui/unindex.c:109
+#: src/applications/fs/fsui/unindex.c:114
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:278
+#: src/applications/fs/fsui/upload.c:328
 #, fuzzy
 msgid "Failed to create temporary directory."
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: 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: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:214
+#: src/applications/fs/ecrs/search.c:217
 msgid "LOC URI not allowed for search.\n"
 msgstr "LOC URI ist nicht erlaubt für Suchen.\n"
 
-#: src/applications/fs/ecrs/download.c:131
+#: src/applications/fs/ecrs/download.c:132
 #, 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:271
+#: src/applications/fs/ecrs/download.c:272
 #, 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:1001
+#: src/applications/fs/ecrs/download.c:1010
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2170,120 +2394,106 @@
 "Bug oder eine mit bösen Absichten eingefügte Datei. Download wurde "
 "abgebrochen.\n"
 
-#: src/applications/fs/ecrs/download.c:1184
+#: src/applications/fs/ecrs/download.c:1205
 #, 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:155
+#: src/applications/fs/ecrs/helper.c:75
+msgid "No keywords specified!\n"
+msgstr "Keine Schlüsselwörter angegeben!\n"
+
+#: src/applications/fs/ecrs/upload.c:156
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/applications/fs/ecrs/upload.c:162
+#: src/applications/fs/ecrs/upload.c:164
 #, 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:171
+#: src/applications/fs/ecrs/upload.c:173
 msgid "Failed to connect to gnunetd."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/applications/fs/ecrs/upload.c:183
+#: src/applications/fs/ecrs/upload.c:185
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "`%s' konnte nicht gehashed werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:202
+#: src/applications/fs/ecrs/upload.c:204
 #, 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:209
+#: src/applications/fs/ecrs/upload.c:212
 #, 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:223
+#: src/applications/fs/ecrs/upload.c:226
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:296
+#: src/applications/fs/ecrs/upload.c:309
 #, 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:876
+#: src/applications/fs/ecrs/meta.c:883
 #, 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:884
+#: src/applications/fs/ecrs/meta.c:893
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr ""
 "Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n"
 
-#: src/applications/fs/ecrs/namespace.c:154
+#: src/applications/fs/ecrs/namespace.c:157
 #, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr ""
 "Pseudonym `%s' kann nicht erstellt werden, da die Datei `%s' bereits "
 "existiert.\n"
 
-#: src/applications/fs/ecrs/namespace.c:325
-#: src/applications/fs/ecrs/namespace.c:404
-#: src/applications/fs/ecrs/namespace.c:545
+#: src/applications/fs/ecrs/namespace.c:339
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:571
 #, 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:337
-#: src/applications/fs/ecrs/namespace.c:415
+#: src/applications/fs/ecrs/namespace.c:352
+#: src/applications/fs/ecrs/namespace.c:432
 #, 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:556
-#: src/applications/fs/ecrs/namespace.c:567
+#: src/applications/fs/ecrs/namespace.c:583
+#: src/applications/fs/ecrs/namespace.c:594
 #, 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:74
-msgid "No keywords specified!\n"
-msgstr "Keine Schlüsselwörter angegeben!\n"
-
-#: 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:120
+#: src/applications/fs/ecrs/parser.c:124
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: 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:395
-#, c-format
-msgid "Deleted corrupt URI database in `%s'."
-msgstr ""
-
-#: src/applications/fs/namespace/namespace_info.c:655
+#: src/applications/fs/namespace/namespace_info.c:685
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 "Veröffentlichungsintervall für periodische Veröffentlichung wurde geändert."
 
-#: src/applications/fs/namespace/namespace_info.c:675
+#: src/applications/fs/namespace/namespace_info.c:708
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -2291,476 +2501,1291 @@
 "Veröffentlichungsdatum für periodisch aktualisierten Inhalt ist mehr als "
 "eine Woche früher als geplant.\n"
 
-#: src/applications/topology_f2f/topology.c:373
+#: src/applications/testing/testing.c:247
+#, fuzzy, c-format
+msgid "Waiting for peers to connect"
+msgstr ""
+"Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
+"verbleiben)...\n"
+
+#: src/applications/kvstore_sqlite/kv_sqlite.c:44
+#: src/applications/kvstore_sqlite/kv_sqlite.c:51
+#: 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:476
+#: src/applications/sqstore_mysql/mysql.c:487
+#: src/applications/sqstore_mysql/mysql.c:526
+#: src/applications/sqstore_mysql/mysql.c:537
+#: src/applications/sqstore_mysql/mysql.c:571
+#: src/applications/sqstore_mysql/mysql.c:582
+#: src/applications/sqstore_mysql/mysql.c:680
+#: src/applications/sqstore_mysql/mysql.c:693
+#: src/applications/sqstore_mysql/mysql.c:706
+#: src/applications/sqstore_mysql/mysql.c:721
+#: src/applications/sqstore_mysql/mysql.c:821
+#: src/applications/sqstore_mysql/mysql.c:836
+#: src/applications/sqstore_mysql/mysql.c:988
+#: src/applications/sqstore_mysql/mysql.c:1000
+#: src/applications/sqstore_mysql/mysql.c:1012
+#: src/applications/sqstore_mysql/mysql.c:1260
+#: src/applications/sqstore_mysql/mysql.c:1272
+#: src/applications/sqstore_mysql/mysql.c:1284
+#: src/applications/sqstore_mysql/mysql.c:1369
+#: src/applications/kvstore_mysql/kv_mysql.c:44
+#: src/applications/kvstore_mysql/kv_mysql.c:51
+#: src/applications/dstore_mysql/dstore_mysql.c:107
+#: src/applications/dstore_mysql/dstore_mysql.c:114
+#: src/applications/dstore_mysql/dstore_mysql.c:286
+#: src/applications/dstore_mysql/dstore_mysql.c:301
+#: src/applications/dstore_mysql/dstore_mysql.c:315
+#: src/applications/dstore_mysql/dstore_mysql.c:329
+#: src/applications/dstore_mysql/dstore_mysql.c:342
+#: src/applications/dstore_mysql/dstore_mysql.c:412
+#: src/applications/dstore_mysql/dstore_mysql.c:434
+#: src/applications/dstore_mysql/dstore_mysql.c:446
+#: src/applications/dstore_mysql/dstore_mysql.c:521
+#: src/applications/dstore_mysql/dstore_mysql.c:533
+#: src/applications/dstore_mysql/dstore_mysql.c:554
+#: src/applications/dstore_sqlite/dstore.c:91
+#: src/applications/dstore_sqlite/dstore.c:98
+#: src/applications/dstore_sqlite/dstore.c:194
+#: src/applications/dstore_sqlite/dstore.c:236
+#: src/applications/dstore_sqlite/dstore.c:257
+#: src/applications/dstore_sqlite/dstore.c:313
+#: src/applications/dstore_sqlite/dstore.c:331
+#: src/applications/dstore_sqlite/dstore.c:343
+#: src/applications/dstore_sqlite/dstore.c:375
+#: src/applications/dstore_sqlite/dstore.c:467
+#: src/util/crypto/hostkey_gcrypt.c:64 src/util/crypto/hostkey_gcrypt.c:71
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: 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/advertising/advertising_test.c:47
+#: src/applications/session/sessiontest_http.c:40
+#: src/applications/session/sessiontest.c:40
+#: src/applications/session/sessiontest2.c:40
+#: src/applications/stats/statistics.c:233
+msgid "# of connected peers"
+msgstr "# verbundener Knoten"
 
-#: 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/advertising/advertising.c:194
+#, 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/topology_f2f/topology.c:511
-msgid "maintains a friend-to-friend restricted topology"
+#: src/applications/advertising/advertising.c:205
+#, 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/template/template.c:68
+#: src/applications/advertising/advertising.c:407
+#, 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:429
+msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:601
 #, c-format
-msgid "`%s' registering client handler %d and %d\n"
-msgstr "`%s' registriert Client-Handler %d and %d\n"
+msgid "Advertising my transport %d to selected peers.\n"
+msgstr "Transport %d wird ausgewählten anderen Knoten bekannt gegeben.\n"
 
-#: src/applications/template/gnunet-template.c:43
-msgid "Template description."
+#: src/applications/advertising/advertising.c:610
+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/bootstrap_http/http.c:109
-#, fuzzy, c-format
-msgid "Bootstrap data obtained from `%s' is invalid.\n"
-msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
+#: src/applications/advertising/advertising.c:887
+msgid "# Peer advertisements received"
+msgstr "# Knotenankündigungen empfangen"
 
-#: src/applications/bootstrap_http/http.c:177
-msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
+#: src/applications/advertising/advertising.c:890
+#, fuzzy
+msgid "# Peer advertisements of type NAT received"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:893
+#, fuzzy
+msgid "# Peer advertisements confirmed via PONG"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:897
+#, fuzzy
+msgid "# Peer advertisements updating earlier HELLOs"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:900
+#, fuzzy
+msgid "# Peer advertisements discarded due to load"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:904
+#, fuzzy
+msgid "# Peer advertisements for unsupported transport"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:908
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to ping busy"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:912
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to lack of self ad"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:916
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to send error"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:918
+msgid "# Self advertisments transmitted"
+msgstr "# Selbstbekanntmachungen übertragen"
+
+#: src/applications/advertising/advertising.c:920
+msgid "# Foreign advertisements forwarded"
+msgstr "# Bekanntmachungen von anderen übertragen"
+
+#: src/applications/advertising/advertising.c:922
+#: src/applications/pingpong/pingpong.c:527
+msgid "# plaintext PING messages sent"
+msgstr "# Klartext PING Nachrichten gesendet"
+
+#: src/applications/advertising/advertising.c:928
+#: src/applications/session/connect.c:953
+#, 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:944
+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/bootstrap_http/http.c:217
+#: src/applications/chat/chat.c:91
+msgid "Message received from peer is invalid.\n"
+msgstr "Empfangene Nachricht ist ungültig.\n"
+
+#: src/applications/chat/chat.c:140
+msgid "Message received from client is invalid\n"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#: src/applications/chat/chat.c:161
+msgid "Maximum number of chat clients reached.\n"
+msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
+
+#: src/applications/chat/chat.c:167
 #, c-format
-msgid "Bootstrapping using `%s'.\n"
+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:211
+#, c-format
+msgid "`%s' registering handlers %d and %d\n"
+msgstr "`%s' registriert Handler %d und %d\n"
+
+#: src/applications/chat/chat.c:230
+msgid "enables P2P-chat (incomplete)"
+msgstr "Ermöglicht P2P-Chat"
+
+#: src/applications/chat/gnunet-chat.c:45
+msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:231
+#: src/applications/chat/gnunet-chat.c:49
+msgid "set the nickname to use (requred)"
+msgstr ""
+
+#: src/applications/chat/gnunet-chat.c:52
+msgid "set the chat room to join (requred)"
+msgstr ""
+
+#: src/applications/chat/gnunet-chat.c:135
 #, fuzzy, c-format
-msgid "Trying to download hostlist from `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "You must specify a nickname\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/applications/bootstrap_http/http.c:359
+#: src/applications/chat/gnunet-chat.c:145
 #, fuzzy, c-format
-msgid "Downloaded %llu bytes from `%s'.\n"
-msgstr "Dateien aus dem GNUnet herunterladen."
+msgid "Failed to join the room\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/applications/bootstrap_http/http.c:392
-#, fuzzy
-msgid "# HELLOs downloaded via http"
-msgstr "# Hellos per HTTP heruntergeladen"
+#: src/applications/chat/gnunet-chat.c:162
+#, fuzzy, c-format
+msgid "Failed to send message.\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/applications/traffic/traffic.c:454
+#: src/applications/sqstore_sqlite/sqlite.c:238
 #, c-format
-msgid "# bytes transmitted of type %d"
-msgstr "# Bytes des Typs %d übertragen"
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/applications/traffic/traffic.c:470
+#: src/applications/sqstore_sqlite/sqlite.c:442
+#, 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:443
+#: src/applications/sqstore_sqlite/sqlite.c:482
+msgid "sqlite datastore"
+msgstr "sqlite Datenspeicher"
+
+#: src/applications/sqstore_sqlite/sqlite.c:481
 #, c-format
-msgid "# bytes received of type %d"
-msgstr "# Bytes des Typs %d empfangen"
+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/traffic/traffic.c:489
-#, fuzzy, c-format
-msgid "# bytes received in plaintext of type %d"
-msgstr "# Bytes des Typs %d empfangen"
+#: src/applications/sqstore_sqlite/sqlite.c:1336
+#: src/applications/sqstore_mysql/mysql.c:1483
+msgid "# bytes in datastore"
+msgstr "# bytes in der Datenbank"
 
-#: src/applications/traffic/traffic.c:644
-msgid "tracks bandwidth utilization by gnunetd"
-msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
+#: src/applications/pingpong/pingpong.c:134
+#: src/applications/pingpong/pingpong.c:205
+#: src/applications/pingpong/pingpong.c:273
+#: src/applications/pingpong/pingpong.c:345
+#, c-format
+msgid "Received malformed `%s' message. Dropping.\n"
+msgstr "Beschädigte `%s' Nachricht empfangen. Nachricht wird verworfen.\n"
 
-#: src/applications/vpn/gnunet-vpn.c:57
-msgid "Suppress display of asynchronous log messages"
+#: src/applications/pingpong/pingpong.c:146
+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:216
+msgid "Received PING not destined for us!\n"
+msgstr "Empfangener PING ist nicht an uns gerichtet!\n"
+
+#: src/applications/pingpong/pingpong.c:315
+#: src/applications/pingpong/pingpong.c:381
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
 msgstr ""
+"PONG konnte keinem PING zugeordnet werden. Versuchen Sie die Konstante "
+"MAX_PING_PONG hochzusetzen.\n"
 
-#: src/applications/vpn/vpn.c:366
-#, c-format
-msgid "Not storing route to myself from peer %d\n"
+#: src/applications/pingpong/pingpong.c:425
+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/vpn/vpn.c:377
+#: src/applications/pingpong/pingpong.c:517
+msgid "# encrypted PONG messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/applications/pingpong/pingpong.c:519
+msgid "# plaintext PONG messages received"
+msgstr "# Klartext PONG Nachrichten empfangen"
+
+#: src/applications/pingpong/pingpong.c:521
+msgid "# encrypted PING messages received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#: src/applications/pingpong/pingpong.c:523
+msgid "# PING messages created"
+msgstr "# PING Nachrichten erstellt"
+
+#: src/applications/pingpong/pingpong.c:525
+#: src/applications/session/connect.c:947
+msgid "# encrypted PONG messages sent"
+msgstr "# verschlüsselter PONG Nachrichten gesendet"
+
+#: src/applications/pingpong/pingpong.c:529
+#: src/applications/session/connect.c:945
+msgid "# encrypted PING messages sent"
+msgstr "# verschlüsselter PING Nachrichten gesendet"
+
+#: src/applications/pingpong/pingpong.c:531
+#, fuzzy
+msgid "# plaintext PONG messages sent"
+msgstr "# Klartext PING Nachrichten gesendet"
+
+#: src/applications/pingpong/pingpong.c:535
+#, fuzzy
+msgid "# plaintext PONG transmissions failed"
+msgstr "# Klartext PONG Nachrichten empfangen"
+
+#: src/applications/pingpong/pingpong.c:545
 #, c-format
-msgid "Duplicate route to node from peer %d, choosing minimum hops"
-msgstr ""
+msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
+msgstr "`%s' registriert Handler %d %d (Plaintext und Ciphertext)\n"
 
-#: src/applications/vpn/vpn.c:410
+#: src/applications/session/connect.c:260
+#: src/applications/session/connect.c:279
 #, c-format
-msgid "Inserting route from peer %d in route table at location %d\n"
-msgstr ""
+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/vpn/vpn.c:466
+#: src/applications/session/connect.c:323
 #, c-format
-msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
+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/vpn/vpn.c:472
+#: src/applications/session/connect.c:512
+#, fuzzy
+msgid "Could not create any HELLO for myself!\n"
+msgstr "Hostkey konnte nicht erzeugt werden!\n"
+
+#: src/applications/session/connect.c:615
+#, 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:649
+#, 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:683
 #, c-format
-msgid "RFC4193 Frame length %d too small\n"
-msgstr ""
+msgid "Invalid `%s' message received from peer `%s'.\n"
+msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/applications/vpn/vpn.c:488
+#: src/applications/session/connect.c:694
 #, c-format
-msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
+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/vpn/vpn.c:556
+#: src/applications/session/connect.c:763
+#, fuzzy, c-format
+msgid ""
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
+msgstr ""
+"Fehler beim Parsen des Verschlüsselten Sitzungsschlüssels, gegebene "
+"Nachrichtenteilgröße ist ungültig.\n"
+
+#: src/applications/session/connect.c:776
+#, 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:937
+msgid "# session keys sent"
+msgstr "# Sitzungsschlüssel gesendet"
+
+#: src/applications/session/connect.c:939
+msgid "# session keys rejected"
+msgstr "# Sitzungsschlüssel abgelehnt"
+
+#: src/applications/session/connect.c:941
+msgid "# session keys accepted"
+msgstr "# Sitzungsschlüssel akzeptiert"
+
+#: src/applications/session/connect.c:943
+msgid "# sessions established"
+msgstr "# Sitzungen aufgebaut"
+
+#: src/applications/sqstore_mysql/mysql.c:427
+#: src/applications/dstore_mysql/dstore_mysql.c:220
+#, 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:1388
+#, fuzzy, c-format
+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:1508
+#: src/applications/sqstore_mysql/mysql.c:1661
+#: src/applications/dstore_mysql/dstore_mysql.c:627
 #, c-format
-msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
+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:1535
+#: src/applications/sqstore_mysql/mysql.c:1686
+msgid ""
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
 msgstr ""
+"Fehler beim Laden des MySQL Datenbankmoduls. Prüfen Sie, ob MySQL läuft und "
+"richtig eingerichtet ist!\n"
 
-#: src/applications/vpn/vpn.c:562
+#: src/applications/identity/hostkey.c:122
+#, fuzzy, c-format
+msgid "Failed to access GNUnet home directory `%s'\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/applications/identity/hostkey.c:155
 #, c-format
-msgid "Cannot open tunnel device because of %s"
+msgid ""
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr ""
+"Formatüberprüfung schlug für die existierende Hostkeydatei `%s' fehl, es "
+"wird ein neuer Hostkey erzeugt.\n"
 
-#: src/applications/vpn/vpn.c:594
+#: src/applications/identity/hostkey.c:164
+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:176
+msgid "Done creating hostkey.\n"
+msgstr "Hostkey wurde erfolgreich erzeugt.\n"
+
+#: src/applications/identity/identity.c:352
 #, c-format
-msgid "RFC4193 Create skips gnu%d as we are already using it\n"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
+"Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
+"Datei wurde entfernt.\n"
 
-#: src/applications/vpn/vpn.c:606
+#: src/applications/identity/identity.c:366
 #, c-format
-msgid "Cannot set tunnel name to %s because of %s\n"
+msgid ""
+"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
+"Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
+"Datei wurde entfernt.\n"
 
-#: src/applications/vpn/vpn.c:614
+#: src/applications/identity/identity.c:402
+#, 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:731
+#: src/applications/identity/identity.c:757
+#, 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:809
 #, c-format
-msgid "Configured tunnel name to %s\n"
+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/vpn/vpn.c:655
+#: src/applications/identity/identity.c:819
+msgid "Signature failed verification: signature invalid.\n"
+msgstr "Verifikation einer Signatur fehlgeschlagen: Signatur ist ungültig.\n"
+
+#: src/applications/identity/identity.c:935
+#: src/applications/identity/identity.c:1058
 #, c-format
-msgid "Cannot get socket flags for gnu%d because %s\n"
+msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:664
+#: src/applications/identity/identity.c:1061
 #, c-format
-msgid "Cannot set socket flags for gnu%d because %s\n"
+msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:674
+#: src/applications/testbed/commands.c:1179
+#: src/applications/stats/gnunet-stats.c:61
 #, c-format
-msgid "Cannot set MTU for gnu%d because %s\n"
+msgid "Supported peer-to-peer messages:\n"
+msgstr "unterstützte Peer-to-Peer Nachrichten:\n"
+
+#: src/applications/testbed/commands.c:1181
+#: src/applications/stats/gnunet-stats.c:64
+#, c-format
+msgid "Supported client-server messages:\n"
+msgstr "unterstützte Client-Server Nachrichten:\n"
+
+#: src/applications/testbed/gnunet-testbed.c:118
+msgid "Start GNUnet-testbed helper."
+msgstr "GNUnet-testbed Helfer starten."
+
+#: src/applications/testbed/gnunet-testbed.c:176
+#, c-format
+msgid "Cannot connect to LOOPBACK port %d: %s\n"
+msgstr "Verbindung zum LOOPBACK port %d schlug fehl: %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:268
+#, c-format
+msgid "Could not execute `%s': %s\n"
+msgstr "`%s' konnte nicht ausgeführt werden: %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:314
+msgid "No client service started. Trying again in 30 seconds.\n"
+msgstr "Kein Client Dienst gestartet. Erneuter Versuch in 30 Sekunden.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:329
+#, c-format
+msgid ""
+"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
+"Trying again in %d seconds...\n"
 msgstr ""
+"Fehler (%s) beim Binden des TCP Listeners an den Port %d. Der Proxy Dienst "
+"wurde nicht gestartet.\n"
+"Erneuter Versuch in %d Sekunden...\n"
 
-#: src/applications/vpn/vpn.c:682
+#: src/applications/testbed/gnunet-testbed.c:392
 #, c-format
-msgid "Cannot get interface index for gnu%d because %s\n"
+msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
+msgstr "Unauthorisierte Verbindung von %u.%u.%u.%u. wurde abgewiesen.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:406
+#, c-format
+msgid "Protocol violation on socket. Expected command.\n"
+msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:446
+#, c-format
+msgid "Command `%s' not found!\n"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/applications/testbed/gnunet-testbed.c:510
+msgid "Start GNUnet testbed controller."
+msgstr "GNUnet testbed Controller starten."
+
+#: src/applications/testbed/gnunet-testbed.c:572
+#, c-format
+msgid "Malformed entry in the configuration in section %s under %s: %s\n"
 msgstr ""
+"Beschädigter Eintrag in der Konfigurationsdatei in Sektion %s unter %s: %s\n"
 
-#: src/applications/vpn/vpn.c:694
+#: src/applications/testbed/testbed.c:53
+msgid "Could not send acknowledgement back to client.\n"
+msgstr "Bestätigung konnte nicht an Client zurück gesendet werden.\n"
+
+#: src/applications/testbed/testbed.c:64
 #, c-format
-msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgid "Received unknown testbed message of type %u.\n"
+msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
+
+#: src/applications/testbed/testbed.c:82
+#: src/applications/testbed/testbed.c:848
+#, c-format
+msgid "size of `%s' message is too short. Ignoring.\n"
+msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
+
+#: src/applications/testbed/testbed.c:90
+#, c-format
+msgid "size of `%s' message is wrong. Ignoring.\n"
+msgstr "Größe der `%s' Nachricht ist falsch. Nachricht wird ignoriert.\n"
+
+#: src/applications/testbed/testbed.c:145
+#, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
 msgstr ""
+"Das TESTBED konnte keine Hello Nachricht für das Protokoll %u erzeugen\n"
 
-#: 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/testbed/testbed.c:223
+#: src/applications/testbed/testbed.c:268
+#: src/applications/testbed/testbed.c:381
+#: src/applications/testbed/testbed.c:390
+#: src/applications/testbed/testbed.c:434
+#: src/applications/testbed/testbed.c:443
+#, c-format
+msgid "received invalid `%s' message\n"
+msgstr "ungültige `%s' Nachricht empfangen\n"
 
-#: src/applications/vpn/vpn.c:721
+#: src/applications/testbed/testbed.c:240
+#: src/applications/testbed/testbed.c:284
 #, c-format
-msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgid "received invalid `%s' message (empty module name)\n"
+msgstr "ungültige `%s' Nachricht empfangen (leerer Modulname)\n"
+
+#: src/applications/testbed/testbed.c:247
+#, c-format
+msgid "loading module `%s' failed.  Notifying client.\n"
+msgstr "das Laden von Modul `%s' schlug fehl. Client wird benachrichtigt.\n"
+
+#: src/applications/testbed/testbed.c:291
+msgid "unloading module failed.  Notifying client.\n"
+msgstr "das Entladen des Moduls schlug fehl. Client wird benachrichtigt.\n"
+
+#: src/applications/testbed/testbed.c:576
+#, c-format
+msgid "`%s' %s failed: %s\n"
+msgstr "`%s' %s schlug fehl: %s\n"
+
+#: src/applications/testbed/testbed.c:658
+#, c-format
+msgid "received invalid `%s' message: %s.\n"
+msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
+
+#: src/applications/testbed/testbed.c:861
+#, c-format
+msgid "'..' is not allowed in file name (%s).\n"
+msgstr "'..' ist nicht erlaubt in einem Dateinamen (%s).\n"
+
+#: src/applications/testbed/testbed.c:872
+msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
+msgstr "Leerer Dateiname für UPLOAD_FILE Nachricht ist ungültig!\n"
+
+#: src/applications/testbed/testbed.c:881
+msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
 msgstr ""
+"Dateiname für UPLOAD_FILE Nachricht ist nicht Null-terminiert (ungültig!)\n"
 
-#: 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/testbed/testbed.c:889
+msgid "Upload refused!"
+msgstr "Upload abgewiesen!"
 
-#: src/applications/vpn/vpn.c:774
+#: src/applications/testbed/testbed.c:919
+#, c-format
+msgid "Invalid message received at %s:%d."
+msgstr "Ungültige Nachricht empfangen bei %s:%d."
+
+#: src/applications/testbed/testbed.c:1041
+#, c-format
+msgid "received invalid testbed message of size %u\n"
+msgstr "ungültige Testbed Nachricht der Größe %u empfangen\n"
+
+#: src/applications/testbed/testbed.c:1064
+#, c-format
 msgid ""
-"RFC4193 We have run out of memory and so I can't store a tunnel for this "
-"peer.\n"
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
 msgstr ""
+"Empfangene Testbed Nachricht des Typs %u hat die unerwartete Größe %u, es "
+"wurde %u erwartet\n"
 
-#: src/applications/vpn/vpn.c:822
+#: src/applications/testbed/testbed.c:1110
+msgid "No testbed URL given, not registered.\n"
+msgstr ""
+"Keine Testbed URL angegeben, es wurde keine Registrierung vorgenommen.\n"
+
+#: src/applications/testbed/testbed.c:1121
 #, c-format
-msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
+msgid "Could not resolve name of HTTP proxy `%s'.\n"
+msgstr "Der Name des HTTP Proxies `%s' konnte nicht aufgelöst werden.\n"
+
+#: src/applications/testbed/testbed.c:1151
+#, c-format
+msgid "Invalid URL `%s' (must begin with `%s')\n"
+msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
+
+#: src/applications/testbed/testbed.c:1194
+#, c-format
+msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
 msgstr ""
+"Beschädigte HTTP URL: `%s' bei `%s'. Testbed-Client wurde nicht "
+"registriert.\n"
 
-#: src/applications/vpn/vpn.c:895
+#: src/applications/testbed/testbed.c:1229
 #, c-format
-msgid "VPN dropping connection %x\n"
+msgid "Could not register testbed, host `%s' unknown\n"
 msgstr ""
+"Testbed konnte nicht registriert werden, Host `%s' ist nicht bekannt.\n"
 
-#: src/applications/vpn/vpn.c:902
+#: src/applications/testbed/testbed.c:1251
 #, c-format
-msgid "VPN cannot drop connection %x\n"
+msgid "Failed to send HTTP request to host `%s': %s\n"
+msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
+
+#: src/applications/testbed/testbed.c:1289
+#, c-format
+msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
+msgstr "Fehler beim Senden der HTTP Anfrage `%s' an Host `%s': %s\n"
+
+#: src/applications/testbed/testbed.c:1327
+msgid "Exit register (error: no http response read).\n"
+msgstr "Abbruch der Registrierung (Fehler: keine HTTP Antwort gelesen).\n"
+
+#: src/applications/testbed/testbed.c:1434
+msgid "allows construction of a P2P-testbed (incomplete)"
+msgstr "Ermöglicht die Konstruktion einer P2P-Testumgebung (inkomplett)"
+
+#: src/applications/transport/transport.c:192
+#, c-format
+msgid ""
+"Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:921
-msgid "RFC4193 Thread exiting\n"
+#: src/applications/transport/transport.c:247
+#, c-format
+msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:968
-msgid "VPN IP src not anonymous. drop..\n"
+#: src/applications/transport/transport.c:300
+#, c-format
+msgid ""
+"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:974
-msgid "VPN IP not anonymous, drop.\n"
+#: src/applications/transport/transport.c:377
+#, 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:500
+#, c-format
+msgid "No transport of type %d known.\n"
+msgstr "Kein Transport des Typs %d bekannt.\n"
+
+#: src/applications/transport/transport.c:559
+msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:981
-msgid "VPN Received, not anonymous, drop.\n"
+#: src/applications/transport/transport.c:760
+#, fuzzy, c-format
+msgid "Loading transports `%s'\n"
+msgstr "Teste Transport(e) %s\n"
+
+#: src/applications/transport/transport.c:780
+#, fuzzy, c-format
+msgid "Could not load transport plugin `%s'\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/applications/transport/transport.c:794
+#, 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/vpn/vpn.c:985
+#: src/applications/transport/transport.c:823
 #, fuzzy, c-format
-msgid "VPN Received unknown IP version %d...\n"
-msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
+msgid "Loaded transport `%s'\n"
+msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/applications/vpn/vpn.c:996
+#: src/applications/transport/transport.c:835
 #, c-format
-msgid "<- GNUnet(%d) : %s\n"
+msgid "I am peer `%s'.\n"
+msgstr "Ich bin Peer `%s'.\n"
+
+#: src/applications/stats/sqstats.c:151
+msgid "# Any-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1022
-msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
+#: src/applications/stats/sqstats.c:152
+msgid "# DBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1043
-msgid "Receive route request\n"
+#: src/applications/stats/sqstats.c:153
+msgid "# SBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1050
-#, c-format
-msgid "Prepare route announcement level %d\n"
+#: src/applications/stats/sqstats.c:154
+msgid "# KBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1065
-#, c-format
-msgid "Send route announcement %d with route announce\n"
+#: src/applications/stats/sqstats.c:155
+msgid "# NBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1071
-#, c-format
-msgid "Send outside table info %d\n"
+#: src/applications/stats/sqstats.c:156
+msgid "# KNBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1088
-msgid "Receive route announce.\n"
+#: src/applications/stats/sqstats.c:157
+msgid "# OnDemand-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1094
-msgid "Going to try insert route into local table.\n"
+#: src/applications/stats/sqstats.c:158
+msgid "# Unknown-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1100
-#, c-format
-msgid "Inserting with hops %d\n"
+#: src/applications/stats/sqstats.c:159
+msgid "# expired"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1119
-#, c-format
-msgid "Request level %d from peer %d\n"
+#: src/applications/stats/sqstats.c:160
+msgid "# expire in 1h"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1137
-#, c-format
-msgid "Receive table limit on peer reached %d\n"
+#: src/applications/stats/sqstats.c:161
+msgid "# expire in 24h"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1168
-msgid "realise alloc ram\n"
+#: src/applications/stats/sqstats.c:162
+msgid "# expire in 1 week"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1188
-msgid "realise add routes\n"
+#: src/applications/stats/sqstats.c:163
+msgid "# expire in 1 month"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1239
-msgid "realise pull routes\n"
+#: src/applications/stats/sqstats.c:164
+msgid "# zero priority"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1292
-msgid "realise copy table\n"
+#: src/applications/stats/sqstats.c:165
+msgid "# priority one"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1324
-msgid "Cannot store client info\n"
+#: src/applications/stats/sqstats.c:166
+msgid "# priority larger than one"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:95
-msgid "Yes"
-msgstr "Ja"
+#: src/applications/stats/sqstats.c:167
+msgid "# no anonymity"
+msgstr ""
 
-#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:94
-msgid "No"
-msgstr "Nein"
+#: src/applications/stats/sqstats.c:168
+msgid "# anonymity one"
+msgstr ""
 
-#: src/applications/vpn/vpn.c:1651
+#: src/applications/stats/sqstats.c:169
+msgid "# anonymity larger than one"
+msgstr ""
+
+#: src/applications/stats/clientapi.c:333
+msgid "Uptime (seconds)"
+msgstr "Laufzeit (Sekunden)"
+
+#: src/applications/stats/statistics.c:228
+#, c-format
+msgid "% of allowed network load (up)"
+msgstr "% of allowed network load (up)"
+
+#: src/applications/stats/statistics.c:230
+#, c-format
+msgid "% of allowed network load (down)"
+msgstr "% of allowed network load (down)"
+
+#: src/applications/stats/statistics.c:231
+#, c-format
+msgid "% of allowed cpu load"
+msgstr "% of allowed cpu load"
+
+#: src/applications/stats/statistics.c:232
 #, fuzzy, c-format
-msgid "`%s' initialising RFC4913 module  %d and %d\n"
-msgstr "`%s' registriert Handler %d und %d\n"
+msgid "% of allowed io load"
+msgstr "% of allowed cpu load"
 
-#: src/applications/vpn/vpn.c:1654
+#: src/applications/stats/statistics.c:235
+msgid "# bytes of noise received"
+msgstr "# Bytes Rauschen empfangen"
+
+#: src/applications/stats/statistics.c:237
+msgid "# plibc handles"
+msgstr ""
+
+#: src/applications/stats/statistics.c:421
+#, 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:445
+msgid "keeps statistics about gnunetd's operation"
+msgstr "Hält Statistiken über Betrieb von gnunetd"
+
+#: src/applications/stats/gnunet-stats.c:87
+msgid "prints supported protocol messages"
+msgstr "gibt unterstützte Protokollnachrichten aus"
+
+#: src/applications/stats/gnunet-stats.c:136
 #, c-format
-msgid "RFC4193 my First 4 hex digits of host id are %x\n"
+msgid "Error reading information from gnunetd.\n"
+msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
+
+#: src/applications/tbench/gnunet-tbench.c:63
+#: src/applications/tracekit/gnunet-tracekit.c:54
+msgid "Start GNUnet transport benchmarking tool."
+msgstr "GNUnet Transport Benchmarking Werkzeug starten."
+
+#: src/applications/tbench/gnunet-tbench.c:65
+msgid "output in gnuplot format"
+msgstr "Ausgabe im gnuplot Format"
+
+#: src/applications/tbench/gnunet-tbench.c:69
+msgid "number of iterations"
+msgstr "Anzahl an Durchläufen"
+
+#: src/applications/tbench/gnunet-tbench.c:73
+msgid "number of messages to use per iteration"
+msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
+
+#: src/applications/tbench/gnunet-tbench.c:76
+msgid "receiver host identifier (ENC file name)"
+msgstr "Bezeichner des Empfängerhosts (ENC Dateiname)"
+
+#: src/applications/tbench/gnunet-tbench.c:79
+msgid "message size"
+msgstr "Nachrichtengröße"
+
+#: src/applications/tbench/gnunet-tbench.c:82
+msgid "sleep for SPACE ms after each a message block"
+msgstr "Für SPACE ms nach jedem Nachrichtenblock pausieren"
+
+#: src/applications/tbench/gnunet-tbench.c:85
+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
+msgid "number of messages in a message block"
+msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
+
+#: src/applications/tbench/gnunet-tbench.c:142
+#, c-format
+msgid "You must specify a receiver!\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
+
+#: src/applications/tbench/gnunet-tbench.c:152
+#, c-format
+msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
+"Ungültige Empfängerknoten ID angegeben (`%s' ist kein gültiger Name).\n"
 
-#: src/applications/vpn/vpn.c:1727
-#, fuzzy
-msgid "enables IPv6 over GNUnet (incomplete)"
-msgstr "Ermöglicht P2P-Chat"
+#: src/applications/tbench/gnunet-tbench.c:189
+#, c-format
+msgid "Time:\n"
+msgstr "Zeit:\n"
 
-#: src/applications/vpn/vpn.c:1761
-msgid "RFC4193 Waiting for tun thread to end\n"
+#: src/applications/tbench/gnunet-tbench.c:190
+#, c-format
+msgid "\tmax      %llums\n"
+msgstr "\tMax      %llums\n"
+
+#: src/applications/tbench/gnunet-tbench.c:191
+#, c-format
+msgid "\tmin      %llums\n"
+msgstr "\tMin      %llums\n"
+
+#: src/applications/tbench/gnunet-tbench.c:192
+#, c-format
+msgid "\tmean     %8.4fms\n"
+msgstr "\tMittel   %8.4fms\n"
+
+#: src/applications/tbench/gnunet-tbench.c:193
+#, c-format
+msgid "\tvariance %8.4fms\n"
+msgstr "\tVarianz  %8.4fms\n"
+
+#: src/applications/tbench/gnunet-tbench.c:195
+#, c-format
+msgid "Loss:\n"
+msgstr "Verlust:\n"
+
+#: src/applications/tbench/gnunet-tbench.c:196
+#, c-format
+msgid "\tmax      %u\n"
+msgstr "\tMax      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:197
+#, c-format
+msgid "\tmin      %u\n"
+msgstr "\tMin      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:198
+#, c-format
+msgid "\tmean     %8.4f\n"
+msgstr "\tMittel   %8.4fms\n"
+
+#: src/applications/tbench/gnunet-tbench.c:199
+#, c-format
+msgid "\tvariance %8.4f\n"
+msgstr "\tVarianz %8.4f\n"
+
+#: src/applications/tbench/gnunet-tbench.c:205
+#, 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:211
+#, c-format
+msgid ""
+"\n"
+"Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
+"\n"
+"Es wurde keine Nachricht von gnunetd empfangen. Läuft gnunetd?\n"
 
-#: src/applications/vpn/vpn.c:1775
-msgid "RFC4193 The tun thread has ended\n"
+#: src/applications/tbench/tbench.c:420
+msgid "allows profiling of direct peer-to-peer connections"
+msgstr "Ermöglicht das Untersuchen direkter Peer-to-Peer Verbindungen"
+
+#: src/applications/tbench/tbenchtest.c:53
+#, c-format
+msgid "Using %u messages of size %u for %u times.\n"
+msgstr "Verwende %u Nachrichten der Größe %u %umal.\n"
+
+#: src/applications/tbench/tbenchtest.c:85
+#, c-format
+msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
+msgstr "Zeiten:   Max %16llu  Min %16llu  Mittel %12.3f  Varianz %12.3f\n"
+
+#: src/applications/tbench/tbenchtest.c:89
+#, c-format
+msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
+msgstr "Verloren:  Max %16u  Min %16u  Mittel %12.3f  Varianz %12.3f\n"
+
+#: src/applications/tbench/tbenchtest.c:95
+#, c-format
+msgid ""
+"\n"
+"Failed to receive reply from gnunetd.\n"
 msgstr ""
+"\n"
+"Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/applications/vpn/vpn.c:1792
+#: src/applications/tbench/tbenchtest.c:151
 #, c-format
-msgid "RFC4193 Closing tunnel %d fd %d\n"
+msgid "Running benchmark...\n"
+msgstr "Benchmark läuft...\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:47
+msgid "probe network to the given DEPTH"
+msgstr "Netzwerk bis zur angegebenen Tiefe DEPTH sondieren"
+
+#: src/applications/tracekit/gnunet-tracekit.c:51
+msgid ""
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+msgstr "Gibt das Ausgabeformat an: 0 für menschen-lesbar, 1 für dot, 2 für vcg"
+
+#: src/applications/tracekit/gnunet-tracekit.c:58
+msgid "use PRIO for the priority of the trace request"
+msgstr "PRIO als Priorität für die Trace Anfragen verwenden"
+
+#: src/applications/tracekit/gnunet-tracekit.c:62
+msgid "wait DELAY seconds for replies"
+msgstr "DELAY Sekunden auf Antworten warten"
+
+#: src/applications/tracekit/gnunet-tracekit.c:110
+#, c-format
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
 msgstr ""
+"Formatangabe ungültig. Verwenden Sie 0 für menschen-lesbar, 1 für dot und 2 "
+"für vcg.\n"
 
-#: src/applications/dstore/dstore.c:525
-#, fuzzy
-msgid "# bytes in dstore"
-msgstr "# bytes in der Datenbank"
+#: src/applications/tracekit/gnunet-tracekit.c:164
+#, c-format
+msgid "`%s' is not connected to any peer.\n"
+msgstr "`%s' ist zu keinem Knoten verbunden.\n"
 
-#: src/server/gnunet-update.c:147
+#: src/applications/tracekit/gnunet-tracekit.c:207
 #, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Daten des Moduls `%s' werden aktualisiert\n"
+msgid "`%s' connected to `%s'.\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/server/gnunet-update.c:151
+#: src/applications/tracekit/gnunet-tracekit.c:220
 #, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+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/server/gnunet-update.c:198 src/server/gnunetd.c:136
-#, fuzzy
-msgid "Core initialization failed.\n"
-msgstr " Verbindung fehlgeschlagen\n"
+#: src/applications/tracekit/gnunet-tracekit.c:246
+#, c-format
+msgid "Peer `%s' did not report back.\n"
+msgstr "Knoten `%s' hat sich nicht zurückgemeldet.\n"
 
-#: src/server/gnunet-update.c:239
-msgid "print a value from the configuration file to stdout"
+#: src/applications/tracekit/gnunet-tracekit.c:348
+msgid "Could not send request to gnunetd.\n"
+msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
+
+#: src/applications/tracekit/tracekit.c:74
+#: src/applications/tracekit/tracekit.c:216
+#, c-format
+msgid "Received invalid `%s' message from `%s'.\n"
+msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
+
+#: src/applications/tracekit/tracekit.c:283
+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:362
+#, c-format
+msgid "TRACEKIT: received invalid `%s' message\n"
+msgstr "TRACEKIT: ungültige `%s' Nachricht empfangen\n"
+
+#: src/applications/tracekit/tracekit.c:462
+msgid "allows mapping of the network topology"
+msgstr "Erlaubt die Kartographierung der Netzwerktopologie"
+
+#: src/applications/getoption/getoption.c:78
+#, c-format
+msgid "`%s' registering client handler %d\n"
+msgstr "`%s' registriert Client-Handler %d\n"
+
+#: src/applications/getoption/getoption.c:88
+msgid "allows clients to determine gnunetd's configuration"
+msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
+
+#: src/applications/template/gnunet-template.c:42
+msgid "Template description."
 msgstr ""
-"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/server/gnunet-update.c:241
-msgid "Updates GNUnet datastructures after version change."
-msgstr "GNUnet Datenstrukturen nach einer Versionsänderung aktualisieren."
+#: src/applications/template/template.c:70
+#, c-format
+msgid "`%s' registering client handler %d and %d\n"
+msgstr "`%s' registriert Client-Handler %d and %d\n"
 
-#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:369
-msgid "run as user LOGIN"
-msgstr "als Benutzer LOGIN ausführen"
+#: src/applications/bootstrap_http/http.c:110
+#, fuzzy, c-format
+msgid "Bootstrap data obtained from `%s' is invalid.\n"
+msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
-#: src/server/gnunet-update.c:249
-msgid "run in client mode (for getting client configuration values)"
+#: src/applications/bootstrap_http/http.c:178
+msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
-"Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
-"zu holen"
 
-#: src/server/connection.c:1202
+#: src/applications/bootstrap_http/http.c:219
 #, c-format
+msgid "Bootstrapping using `%s'.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:234
+#, 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:364
+#, fuzzy, c-format
+msgid "Downloaded %llu bytes from `%s'.\n"
+msgstr "Dateien aus dem GNUnet herunterladen."
+
+#: src/applications/bootstrap_http/http.c:397
+#, fuzzy
+msgid "# HELLOs downloaded via http"
+msgstr "# Hellos per HTTP heruntergeladen"
+
+#: 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:470
+#, c-format
+msgid "# bytes received of type %d"
+msgstr "# Bytes des Typs %d empfangen"
+
+#: 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:650
+msgid "tracks bandwidth utilization by gnunetd"
+msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
+
+#: src/applications/dstore_mysql/dstore_mysql.c:636
+#, fuzzy
+msgid "Failed to initialize MySQL database connection for dstore.\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#: src/applications/dstore_mysql/dstore_mysql.c:661
+#: src/applications/dstore_sqlite/dstore.c:535
+#, fuzzy
+msgid "# bytes in dstore"
+msgstr "# bytes in der Datenbank"
+
+#: src/server/connection.c:1214
+#, 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:1211
+#: src/server/connection.c:1224
 #, 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:2897
+#: src/server/connection.c:2986
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Nachricht von `%s' verworfen: ungültiges Format.\n"
 
-#: src/server/connection.c:2982
+#: src/server/connection.c:3075
 #, 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:3004
+#: src/server/connection.c:3097
 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:3500
+#: src/server/connection.c:3608
 msgid "# outgoing messages dropped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:3503
+#: src/server/connection.c:3611
 msgid "# bytes of outgoing messages dropped"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:3505
+#: src/server/connection.c:3613
 msgid "# connections closed (HANGUP sent)"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/server/connection.c:3509
+#: src/server/connection.c:3617
 #, fuzzy
 msgid "# connections closed (transport issue)"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/server/connection.c:3512
+#: src/server/connection.c:3620
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/server/connection.c:3516
+#: src/server/connection.c:3624
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/server/connection.c:3520
+#: src/server/connection.c:3628
 #, fuzzy
 msgid "# bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/server/connection.c:3522
+#: src/server/connection.c:3630
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/server/connection.c:3523
+#: src/server/connection.c:3631
 msgid "# bytes noise sent"
 msgstr "# Bytes Rauschen gesendet"
 
-#: src/server/connection.c:3526
+#: src/server/connection.c:3634
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3529
+#: src/server/connection.c:3637
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/server/connection.c:3532
+#: src/server/connection.c:3640
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
 
-#: src/server/connection.c:3536
+#: src/server/connection.c:3644
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3540
+#: src/server/connection.c:3648
 #, fuzzy
 msgid "# total number of bytes we were allowed to sent"
 msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
 
-#: src/server/connection.c:3544
+#: src/server/connection.c:3652
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
-#: src/server/connection.c:3547
+#: src/server/connection.c:3655
 msgid "# transports switched to stream transport"
 msgstr ""
 
-#: src/server/startup.c:206
+#: src/server/startup.c:215
 #, 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:223
+#: src/server/startup.c:233
 #, c-format
 msgid ""
 "Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
 "address@hidden"
 msgstr ""
 
-#: src/server/startup.c:237
+#: src/server/startup.c:248
 #, c-format
 msgid ""
 "Limiting datastore size to %llu GB, because the `%s' filesystem does not "
@@ -2768,22 +3793,27 @@
 "partition!\n"
 msgstr ""
 
-#: src/server/startup.c:274
+#: src/server/startup.c:287
 #, c-format
 msgid "Insufficient access permissions for `%s': %s\n"
 msgstr ""
 
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:83
 #, c-format
 msgid "`%s' startup complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/server/gnunetd.c:89
+#: src/server/gnunetd.c:87
 #, c-format
 msgid "`%s' is shutting down.\n"
 msgstr "`%s' fährt herunter.\n"
 
-#: src/server/gnunetd.c:192
+#: src/server/gnunetd.c:121 src/server/gnunet-update.c:222
+#, fuzzy
+msgid "Core initialization failed.\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/server/gnunetd.c:176
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
@@ -2792,98 +3822,56 @@
 "Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die "
 "Standardfehlerausgabe (stderr) geschrieben."
 
-#: src/server/gnunetd.c:196
+#: src/server/gnunetd.c:180
 msgid "Starts the gnunetd daemon."
 msgstr "Startet den gnunetd Daemonen."
 
-#: src/server/gnunetd.c:199
+#: src/server/gnunetd.c:183
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:203
+#: src/server/gnunetd.c:187
 msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:207
+#: src/server/gnunetd.c:191
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
-#: src/server/gnunetd.c:271
+#: src/server/gnunetd.c:272
 #, 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:126
+#: src/server/gnunet-transport-check.c:121
 #, c-format
-msgid "Application module `%s' already initialized!\n"
-msgstr "Anwendungsmodul `%s' ist bereits initialisiert!\n"
-
-#: 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: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: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: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: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:492
-#, c-format
-msgid "Could not properly shutdown application `%s'.\n"
-msgstr "Anwendung `%s' konnte nicht ordentlich heruntergefahren werden.\n"
-
-#: 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:122
-#, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "`%s': Hello konnte nicht erzeugt werden.\n"
 
-#: src/server/gnunet-transport-check.c:129
+#: 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:160
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr "`%s': Kann nicht senden.\n"
 
-#: src/server/gnunet-transport-check.c:176
+#: src/server/gnunet-transport-check.c:175
 #, 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:189
+#: src/server/gnunet-transport-check.c:188
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "`%s': Verbindung konnte nicht getrennt werden.\n"
 
-#: src/server/gnunet-transport-check.c:196
+#: src/server/gnunet-transport-check.c:195
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -2897,7 +3885,7 @@
 msgid " Transport %d is not being tested\n"
 msgstr " Transport %d ist nicht verfügbar\n"
 
-#: src/server/gnunet-transport-check.c:255
+#: src/server/gnunet-transport-check.c:256
 #, c-format
 msgid ""
 "\n"
@@ -2906,67 +3894,71 @@
 "\n"
 "Kontaktiere `%s'."
 
-#: src/server/gnunet-transport-check.c:280
+#: src/server/gnunet-transport-check.c:281
 #, c-format
 msgid " Connection failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/server/gnunet-transport-check.c:286
+#: src/server/gnunet-transport-check.c:287
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
-#: src/server/gnunet-transport-check.c:323
+#: src/server/gnunet-transport-check.c:325
 #, c-format
 msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:325
+#: src/server/gnunet-transport-check.c:327
 #, fuzzy, c-format
 msgid "OK!\n"
 msgstr "OK"
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:352
 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:354
+#: src/server/gnunet-transport-check.c:356
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr "Knoten aus HOSTLISTURL anpingen, deren Transports passen"
 
-#: src/server/gnunet-transport-check.c:357
+#: src/server/gnunet-transport-check.c:359
 msgid "send COUNT messages"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/server/gnunet-transport-check.c:360
+#: src/server/gnunet-transport-check.c:362
 msgid "send messages with SIZE bytes payload"
 msgstr "Nachrichten mit SIZE Bytes Nutzlast versenden"
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:365
 msgid "specifies which TRANSPORT should be tested"
 msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
 
-#: src/server/gnunet-transport-check.c:366
+#: src/server/gnunet-transport-check.c:368
 msgid "specifies after how many MS to time-out"
 msgstr "Gibt an, nach wievielen MS die Zeit abgelaufen sein soll"
 
-#: src/server/gnunet-transport-check.c:374
+#: src/server/gnunet-transport-check.c:371 src/server/gnunet-update.c:271
+msgid "run as user LOGIN"
+msgstr "als Benutzer LOGIN ausführen"
+
+#: src/server/gnunet-transport-check.c:376
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:435
+#: src/server/gnunet-transport-check.c:440
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/server/gnunet-transport-check.c:437
+#: src/server/gnunet-transport-check.c:442
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/server/gnunet-transport-check.c:478
+#: src/server/gnunet-transport-check.c:489
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2975,17 +3967,17 @@
 "%d von %d Knoten erfolgreich kontaktiert (%d mal war der Transport nicht "
 "verfügbar).\n"
 
-#: src/server/tcpserver.c:109
+#: src/server/tcpserver.c:111
 #, 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:324
+#: src/server/tcpserver.c:336
 #, 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:398
+#: src/server/tcpserver.c:411
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
@@ -2994,30 +3986,45 @@
 "Beschädigte Netzwerkangabe in der Konfigurationsdatei in Sektion `%s' für "
 "Eintrag `%s': %s\n"
 
-#: src/server/tcpserver.c:454
+#: src/server/tcpserver.c:468
 #, 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:428
+#: src/server/handler.c:431
 #, 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:141
-msgid ""
-"Failed to determine filename used to store GNUnet version information!\n"
+#: src/server/gnunet-update.c:146
+#, c-format
+msgid "Updating data for module `%s'\n"
+msgstr "Daten des Moduls `%s' werden aktualisiert\n"
+
+#: 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:267
+msgid "Updates GNUnet datastructures after version change."
+msgstr "GNUnet Datenstrukturen nach einer Versionsänderung aktualisieren."
+
+#: src/server/gnunet-update.c:275
+msgid "run in client mode (for getting client configuration values)"
 msgstr ""
+"Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
+"zu holen"
 
-#: src/server/gnunet-peer-info.c:53
+#: src/server/gnunet-peer-info.c:51
 msgid "Print information about GNUnet peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/server/gnunet-peer-info.c:57
+#: src/server/gnunet-peer-info.c:55
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:122 src/server/gnunet-peer-info.c:153
+#: src/server/gnunet-peer-info.c:120 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"
@@ -3036,42 +4043,55 @@
 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: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:96 src/util/network_client/tcpio.c:140
-msgid "Could not find valid value for HOST in section NETWORK."
+#: src/server/version.c:143
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
 
-#: 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/server/core.c:129
+#, c-format
+msgid "Application module `%s' already initialized!\n"
+msgstr "Anwendungsmodul `%s' ist bereits initialisiert!\n"
 
-#: 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/server/core.c:183
+#, 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/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/server/core.c:233
+#, c-format
+msgid "Could not shutdown `%s': application not loaded\n"
+msgstr "`%s' kann nicht heruntergefahren werden: Anwendung ist nicht geladen\n"
 
-#: 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/server/core.c:244
+#, c-format
+msgid "Could not shutdown application `%s': not initialized\n"
+msgstr ""
+"Anwendung `%s' kann nicht heruntergefahren werden: sie ist nicht "
+"initialisiert\n"
 
-#: src/util/network_client/tcpio.c:494
+#: src/server/core.c:254
 #, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "`%s' fehlgeschlagen, Antwort ist ungültig!\n"
+msgid "Could not find '%s%s' method in library `%s'.\n"
+msgstr "Methode '%s%s' kann in Bibliothek `%s' nicht gefunden werden.\n"
 
-#: src/util/crypto/hostkey_gcrypt.c:898
+#: src/server/core.c:400
 #, 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:509
+#, c-format
+msgid "Could not properly shutdown application `%s'.\n"
+msgstr "Anwendung `%s' konnte nicht ordentlich heruntergefahren werden.\n"
+
+#: src/server/core.c:646
+#, c-format
+msgid "Could not properly unload service `%s'!\n"
+msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
+
+#: src/util/crypto/hostkey_gcrypt.c:907
+#, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
@@ -3081,12 +4101,12 @@
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/os/statuscalls.c:195 src/util/os/statuscalls.c:336
+#: src/util/os/statuscalls.c:197 src/util/os/statuscalls.c:342
 #, 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:379 src/util/os/statuscalls.c:389
+#: src/util/os/statuscalls.c:387 src/util/os/statuscalls.c:397
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -3094,103 +4114,132 @@
 "Es sind keine Netzwerkgeräte in der Konfigurationsdatei in der Sektion `%s' "
 "unter `%s' definiert!\n"
 
-#: 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:124
+#: src/util/os/osconfig.c:127
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:391
+#: src/util/os/osconfig.c:402
 #, 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/user.c:136 src/util/os/user.c:181
+#, 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:137
+msgid "No such user"
+msgstr ""
+
+#: src/util/os/user.c:152
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
+
+#: src/util/os/priority.c:78
+#, fuzzy, c-format
+msgid "Invalid process priority `%s'\n"
+msgstr "Ungültige Antwort auf `%s'.\n"
+
+#: src/util/os/semaphore.c:223
+#, c-format
+msgid "Can't create semaphore: %i"
+msgstr "Semaphore konnte nicht angelegt werden: %i"
+
 #: 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:119
+#: src/util/os/dso.c:120
 #, 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:159
+#: src/util/os/dso.c:162
 #, 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:461
+#: src/util/os/cpustatus.c:466
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "CPU Nutzung kann nicht ermittelt werden (Windows NT).\n"
 
-#: src/util/os/cpustatus.c:483
+#: src/util/os/cpustatus.c:489
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "CPU Nutzung kann nicht ermittelt werden (Win 9x).\n"
 
-#: src/util/os/user.c:134 src/util/os/user.c:176
+#: src/util/network_client/tcpio.c:98 src/util/network_client/tcpio.c:144
+msgid "Could not find valid value for HOST in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:113
 #, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
+msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'"
+msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/os/user.c:135
-msgid "No such user"
-msgstr ""
+#: src/util/network_client/tcpio.c:302
+#, fuzzy, c-format
+msgid "Cannot connect to %s:%u: %s\n"
+msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: 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"
+#: src/util/network_client/tcpio.c:340
+#, fuzzy, c-format
+msgid "Error connecting to %s:%u\n"
+msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/util/os/priority.c:78
+#: src/util/network_client/tcpio.c:351
 #, fuzzy, c-format
-msgid "Invalid process priority `%s'\n"
-msgstr "Ungültige Antwort auf `%s'.\n"
+msgid "Failed to connect to %s:%u in %ds\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/network/select.c:304
+#: src/util/network_client/tcpio.c:516
+#, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr "`%s' fehlgeschlagen, Antwort ist ungültig!\n"
+
+#: src/util/network/select.c:310
 #, 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:473
+#: src/util/network/select.c:483
 #, c-format
 msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
 
-#: 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
+#: src/util/network/ipcheck.c:106 src/util/network/ipcheck.c:136
+#: src/util/network/ipcheck.c:186 src/util/network/ipcheck.c:211
+#: src/util/network/ipcheck.c:219
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/network/ipcheck.c:162
+#: src/util/network/ipcheck.c:167
 #, 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:259
+#: src/util/network/ipcheck.c:267
 #, 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:291
+#: src/util/network/ipcheck.c:300
 #, c-format
 msgid "Wrong format `%s' for netmask: %s\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/network/ipcheck.c:304
+#: src/util/network/ipcheck.c:314
 #, c-format
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
-#: src/util/network/ip.c:195
+#: src/util/network/ip.c:207
 #, fuzzy, c-format
 msgid ""
 "Could not find interface `%s' using `%s', trying to find another interface.\n"
@@ -3198,12 +4247,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:268
+#: src/util/network/ip.c:285
 #, 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:277
+#: src/util/network/ip.c:295
 #, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
@@ -3212,174 +4261,145 @@
 "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:297
+#: src/util/network/ip.c:317
 #, 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:326
+#: src/util/network/ip.c:350
 #, 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: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: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:290
+#: src/util/error/error.c:117
 #, 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:533
-#, c-format
-msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
-msgstr ""
-
-#: 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:589
-#, c-format
-msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
-msgstr ""
-
-#: 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:115
-#, c-format
-msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:187 src/util/error/error.c:222
+#: src/util/error/error.c:190 src/util/error/error.c:225
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/error/error.c:189 src/util/error/error.c:224
+#: src/util/error/error.c:192 src/util/error/error.c:227
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:191 src/util/error/error.c:228
+#: src/util/error/error.c:194 src/util/error/error.c:231
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/error/error.c:193 src/util/error/error.c:230
+#: src/util/error/error.c:196 src/util/error/error.c:233
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/error/error.c:195 src/util/error/error.c:232
+#: src/util/error/error.c:198 src/util/error/error.c:235
 msgid "FATAL"
 msgstr "SCHWERWIEGEND"
 
-#: src/util/error/error.c:197 src/util/error/error.c:234
+#: src/util/error/error.c:200 src/util/error/error.c:237
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:199 src/util/error/error.c:236
+#: src/util/error/error.c:202 src/util/error/error.c:239
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:201 src/util/error/error.c:238
+#: src/util/error/error.c:204 src/util/error/error.c:241
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:203 src/util/error/error.c:240
+#: src/util/error/error.c:206 src/util/error/error.c:243
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:205 src/util/error/error.c:242
+#: src/util/error/error.c:208 src/util/error/error.c:245
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:244
+#: src/util/error/error.c:210 src/util/error/error.c:247
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:209
+#: src/util/error/error.c:212
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:226
+#: src/util/error/error.c:229
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/error/error.c:245
+#: src/util/error/error.c:248
 msgid "NOTHING"
 msgstr "NICHTS"
 
-#: src/util/threads/mutex.c:144 src/util/threads/semaphore.c:166
-#: src/util/threads/pthread.c:154
+#: src/util/disk/storage.c:203
 #, 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:543
+#, fuzzy, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
+
+#: src/util/threads/mutex.c:146 src/util/threads/semaphore.c:168
+#: src/util/threads/pthread.c:157
+#, 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:152 src/util/threads/mutex.c:194
+#: src/util/threads/mutex.c:155 src/util/threads/mutex.c:201
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/threads/mutex.c:156
+#: src/util/threads/mutex.c:160
 #, fuzzy, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr "Durch `%s' ist ein Deadlock bei %s:%d entstanden\n"
 
-#: src/util/threads/mutex.c:181
+#: src/util/threads/mutex.c:187
 #, c-format
 msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:198
+#: src/util/threads/mutex.c:207
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/util/threads/pthread.c:165 src/util/threads/pthread.c:171
-#: src/util/threads/pthread.c:176 src/util/threads/pthread.c:264
+#: src/util/threads/pthread.c:169 src/util/threads/pthread.c:176
+#: src/util/threads/pthread.c:182 src/util/threads/pthread.c:276
 #, 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:181 src/util/threads/pthread.c:273
+#: src/util/threads/pthread.c:188 src/util/threads/pthread.c:286
 #, 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:229
+#: src/util/loggers/file.c:236
 #, fuzzy, c-format
 msgid "Failed to open log-file `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/loggers/file.c:248
+#: src/util/loggers/file.c:257
 #, fuzzy
 msgid "GNUnet error log"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: 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
+#: src/util/loggers/file.c:278 src/util/loggers/file.c:296
+#: src/include/gnunet_util_error.h:252 src/include/gnunet_util_error.h:259
+#: src/include/gnunet_util_error.h:266 src/include/gnunet_util_error.h:273
 #, 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
+#: src/util/loggers/memory.c:72
 msgid "Out of memory (for logging)"
 msgstr ""
 
@@ -3438,19 +4458,14 @@
 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
+#: src/util/getopt/setoption.c:59
 #, 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 ""
 "Setting option `%s' in section `%s' to `%s' when processing command line "
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:136 src/util/getopt/setoption.c:153
+#: src/util/getopt/setoption.c:138 src/util/getopt/setoption.c:155
 #, 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"
@@ -3463,838 +4478,122 @@
 "Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/string/string.c:120
-msgid "ms"
-msgstr "ms"
-
-#: src/util/string/string.c:126
-msgid "s"
-msgstr "s"
-
-#: src/util/string/string.c:130
-msgid "m"
-msgstr "m"
-
-#: src/util/string/string.c:134
-msgid "h"
-msgstr "h"
-
-#: src/util/string/string.c:138
-msgid " days"
-msgstr " Tage"
-
-#: src/util/string/string.c:154
-msgid "b"
-msgstr "b"
-
-#: src/util/string/string.c:160
-msgid "KiB"
-msgstr ""
-
-#: src/util/string/string.c:164
-msgid "MiB"
-msgstr ""
-
-#: src/util/string/string.c:168
-msgid "GiB"
-msgstr ""
-
-#: src/util/string/string.c:172
-msgid "TiB"
-msgstr ""
-
-#: src/util/string/string.c:284
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
-
-#: 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:61
-msgid "Tool to setup GNUnet."
-msgstr "Werkzeug für die Einrichtung von GNUnet."
-
-#: src/setup/gnunet-setup.c:176
+#: src/util/boot/startup.c:251
 #, fuzzy, c-format
-msgid "Too many arguments.\n"
-msgstr "Ungültige Kommandozeilen Parameter.\n"
+msgid "Failed to run %s: %s %d\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: 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:255
+#: src/util/config/config.c:295
 #, c-format
-msgid "`%s' is not available."
-msgstr "`%s' ist nicht verfügbar."
+msgid "Syntax error in configuration file `%s' at line %d.\n"
+msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/setup/gnunet-setup.c:272
+#: src/util/config/config.c:544
 #, c-format
-msgid "Unknown operation `%s'\n"
-msgstr "Unbekannte Operation `%s'\n"
-
-#: src/setup/gnunet-win-tool.c:55
-msgid "list all network adapters"
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:58
-msgid "install GNUnet as Windows service"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:61
-msgid "uninstall GNUnet service"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:64
-msgid "increase the maximum number of TCP/IP connections"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:67
-msgid "display a file's hash value"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:126
+#: src/util/config/config.c:592
 #, c-format
-msgid "GNUnet service installed successfully.\n"
-msgstr "Der GNUnet Dienst wurde erfolgreich installiert.\n"
-
-#: 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: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: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:141 src/setup/gnunet-win-tool.c:173
-#, c-format
-msgid "Unknown error.\n"
-msgstr "Unbekannter Fehler.\n"
-
-#: src/setup/gnunet-win-tool.c:154
-#, c-format
-msgid "Service deleted.\n"
-msgstr "Dienst gelöscht.\n"
-
-#: 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: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:387
-#, fuzzy
-msgid "Description"
-msgstr "Frage"
-
-#: src/setup/gtk/gconf.c:403
-msgid "Value"
-msgstr ""
-
-#: src/setup/gtk/gconf.c:427
-msgid "Default"
-msgstr ""
-
-#: src/setup/gtk/gconf.c:442 src/setup/ncurses/wizard_curs.c:73
-msgid "Help"
-msgstr "Hilfe"
-
-#: src/setup/gtk/gconf.c:456
-#, fuzzy
-msgid "Section"
-msgstr "Frage"
-
-#: src/setup/gtk/gconf.c:467
-#, fuzzy
-msgid "Option"
-msgstr "_Optionen"
-
-#: src/setup/gtk/gconf.c:490
-#, fuzzy
-msgid "Configuration saved."
-msgstr "GNUnet Konfiguration"
-
-#: src/setup/gtk/gconf.c:500
-#, fuzzy
-msgid "Failed to save configuration."
-msgstr "Fehler beim Speichern der Konfiguration!"
-
-#: 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:539
-#, fuzzy
-msgid "Error saving configuration."
-msgstr "Fehler beim Speichern der Konfiguration!"
-
-#: src/setup/gtk/wizard_gtk.c:144
-#, fuzzy
-msgid "(unknown connection)"
-msgstr "Netzwerkverbindung"
-
-#: 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:437
-#, fuzzy
-msgid "Do you want to save the new configuration?"
-msgstr "Möchten Sie Ihre Einstellungen speichern?"
-
-#: 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:477
-msgid "Unable to change startup process:"
-msgstr "Startprozeß konnte nicht geändert werden:"
-
-#: src/setup/gtk/wizard_gtk.c:492
 msgid ""
-"Running gnunet-update failed.\n"
-"This maybe due to insufficient permissions, please check your "
-"configuration.\n"
-"Finally, run gnunet-update manually."
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
 msgstr ""
 
-#: src/setup/text/conf.c:79
-#, fuzzy
-msgid "yes"
-msgstr "Ja"
-
-#: src/setup/text/conf.c:80
-msgid "no"
-msgstr ""
-
-#: src/setup/text/conf.c:105
+#: src/util/config/config.c:602
 #, c-format
-msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/setup/text/conf.c:114
-msgid "\tPossible choices:\n"
-msgstr ""
-
-#: src/setup/text/conf.c:122
-msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
-msgstr ""
-
-#: src/setup/text/conf.c:124
+#: src/util/config/config.c:688
 #, c-format
-msgid "\tEnter string (type '%s' for default value `%s'): "
-msgstr ""
-
-#: src/setup/text/conf.c:142
-#, c-format
-msgid "\t Enter choice (default is %c): "
-msgstr ""
-
-#: src/setup/text/conf.c:146
-#, c-format
-msgid "\tEnter floating point (type '%s' for default value %f): "
-msgstr ""
-
-#: src/setup/text/conf.c:152
-#, c-format
 msgid ""
-"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
-"value %llu): "
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/setup/text/conf.c:186
-#, fuzzy, c-format
-msgid "Yes\n"
-msgstr "Ja"
+#: src/util/string/string.c:55
+msgid "ms"
+msgstr "ms"
 
-#: src/setup/text/conf.c:191
-#, fuzzy, c-format
-msgid "No\n"
-msgstr "Nein"
+#: src/util/string/string.c:61
+msgid "s"
+msgstr "s"
 
-#: 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/util/string/string.c:65
+msgid "m"
+msgstr "m"
 
-#: 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/util/string/string.c:69
+msgid "h"
+msgstr "h"
 
-#: 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/util/string/string.c:73
+msgid " days"
+msgstr " Tage"
 
-#: src/setup/text/conf.c:421
-#, c-format
-msgid "Unknown kind %x (internal error).  Skipping option.\n"
-msgstr ""
+#: src/util/string/string.c:89
+msgid "b"
+msgstr "b"
 
-#: src/setup/text/conf.c:482
-msgid "\tDescend? (y/n/?) "
+#: src/util/string/string.c:95
+msgid "KiB"
 msgstr ""
 
-#: src/setup/text/conf.c:491
-msgid "Aborted.\n"
+#: src/util/string/string.c:99
+msgid "MiB"
 msgstr ""
 
-#: src/setup/text/conf.c:504
-#, fuzzy
-msgid "Invalid entry.\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/setup/text/conf.c:521
-#, c-format
-msgid "Unknown kind %x (internal error).  Aborting.\n"
+#: src/util/string/string.c:103
+msgid "GiB"
 msgstr ""
 
-#: src/setup/text/conf.c:552
-#, c-format
-msgid "You can always press ENTER to keep the current value.\n"
+#: src/util/string/string.c:107
+msgid "TiB"
 msgstr ""
 
-#: src/setup/text/conf.c:553
-#, c-format
-msgid "Use the '%s' key to abort.\n"
+#: src/util/string/string.c:226
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: 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:571
-#, c-format
-msgid ""
-"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
-"configuration. "
-msgstr ""
-
-#: 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:595
-#, fuzzy, c-format
-msgid "Configuration file `%s' written.\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/setup/ncurses/mconf.c:85
-msgid "Exit"
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:88
-msgid "Up"
-msgstr "Oben"
-
-#: src/setup/ncurses/mconf.c:91
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: 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:212 src/setup/ncurses/mconf.c:403
-msgid "Internal error! (Value invalid?)"
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:392
-msgid "Invalid input, expecting floating point value."
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:435
-msgid "Invalid input, expecting integer."
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:443
-msgid "Value is not in legal range."
-msgstr ""
-
-#: 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:517
-#, fuzzy
-msgid "Do you wish to save your new configuration?"
-msgstr "Möchten Sie Ihre Einstellungen speichern?"
-
-#: 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: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: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:80
-#, fuzzy
-msgid "Error!"
-msgstr "Fehler"
-
-#: src/setup/ncurses/wizard_curs.c:142
-#, fuzzy
-msgid "Abort"
-msgstr "_über"
-
-#: src/setup/ncurses/wizard_curs.c:143
-#, fuzzy
-msgid "Ok"
-msgstr "k"
-
-#: 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:211
-msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org/\n";
-"and join our community at\n"
-"\thttp://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"the GNUnet team"
-msgstr ""
-"Willkommen bei GNUnet!\n"
-"\n"
-"Dieser Assistent wird Ihnen einige grundlegende Fragen stellen, um GNUnet zu "
-"konfigurieren.\n"
-"\n"
-"Bitte besuchen Sie unsere Homepage\n"
-"\thttp://gnunet.org\n";
-"und schließen Sie sich unserer Community an:\n"
-"\thttps://gnunet.org/drupal/\n";
-"\n"
-"Viel Spaß,\n"
-"\n"
-"das GNUnet-Team"
-
-#: src/setup/ncurses/wizard_curs.c:277
-msgid ""
-"Choose the network interface that connects your computer to the internet "
-"from the list below."
-msgstr ""
-"Wählen Sie das Netzwerkgerät, das Ihren Computer mit dem Internet verbindet, "
-"aus unten stehender Liste."
-
-#: 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 ""
-"Das \"Netzwerkgerät\" ist das Gerät, das Ihren Computer mit dem Internet "
-"verbindet. Dies ist üblicherweise ein Modem, eine ISDN-Karte oder eine "
-"Netzwerkkarte falls Sie DSL nutzen."
-
-#: src/setup/ncurses/wizard_curs.c:306
-#, fuzzy
-msgid "Network configuration: interface"
-msgstr "Netzwerkgerät:"
-
-#: src/setup/ncurses/wizard_curs.c:308
-msgid ""
-"What is the name of the network interface that connects your computer to the "
-"Internet?"
-msgstr ""
-"Was ist der Name des Netzwerkgerätes, das Ihren Computer mit dem Internet "
-"verbindet?"
-
-#: src/setup/ncurses/wizard_curs.c:319
-#, fuzzy
-msgid "Network configuration: NAT"
-msgstr "GNUnet Konfiguration"
-
-#: src/setup/ncurses/wizard_curs.c:320
-msgid ""
-"Is this machine behind NAT?\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
-"connections through modems, ISDN cards and DNAT (also known as \"port "
-"forwarding\")."
-msgstr ""
-"Ist diese Maschine hinter NAT?\n"
-"\n"
-"Wenn Sie mit dem Internet über einen anderen Computer per SNAT, einem Router "
-"oder einer \"Hardware Firewall\" verbunden sind und andere Computer im "
-"Internet keine Verbindung zu diesem Computer herstellen können, so sagen Sie "
-"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:333
-#, fuzzy
-msgid "Network configuration: IP"
-msgstr "GNUnet Konfiguration"
-
-#: src/setup/ncurses/wizard_curs.c:335
-#, fuzzy
-msgid "What is this computer's public IP address or hostname?"
-msgstr ""
-"Wie heißt die öffentliche IP-Adresse oder der öffentliche Name dieses "
-"Computers?\n"
-"Wenn Sie nicht sicher sind, lassen Sie dieses Feld leer."
-
-#: src/setup/ncurses/wizard_curs.c:336
-#, fuzzy
-msgid ""
-"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
-"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If left empty, GNUnet will try to automatically detect the IP.\n"
-"You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
-"If in doubt, leave this empty."
-msgstr ""
-"Wenn Ihr Provider Ihnen immer die gleiche IP-Adresse zuweist (eine "
-"\"statische\" IP-Adresse), so geben Sie diese in das \"IP-Adresse\"-Feld "
-"ein. Wenn sich Ihre IP-Adresse immer wieder ändert (\"dynamische\" IP-"
-"Adresse), es jedoch einen Rechnernamen gibt, der immer auf Ihre aktuelle IP-"
-"Adresse verweist, so können Sie diesen ebenfalls eintragen.\n"
-"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:351
-#, fuzzy
-msgid "Bandwidth configuration: upload"
-msgstr "GNUnet Konfiguration"
-
-#: 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:354
-#, fuzzy
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"upstream\" is the data channel through which data is *sent* to the "
-"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
-"you have a flatrate, you can set it to the maximum speed of your internet "
-"connection. You should not use a value that is higher than what your actual "
-"connection allows."
-msgstr ""
-"Hier können Sie GNUnets Ressourcenverwendung einschränken.\n"
-"\n"
-"Der \"Upstream\" ist der Datenkanal, durch den Daten an das Internet "
-"*gesendet* werden. Das Limit ist entweder das gesamte Maximum für diesem "
-"Computer oder wieviel GNUnet selbst verwenden darf. Dies können Sie später "
-"festlegen. Wenn Sie eine Flatrate haben, können Sie die maximale "
-"Geschwindigkeit Ihrer Internetverbindung angeben."
-
-#: src/setup/ncurses/wizard_curs.c:366
-#, fuzzy
-msgid "Bandwidth configuration: download"
-msgstr "GNUnet Konfiguration"
-
-#: 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:369
-#, fuzzy
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"downstream\" is the data channel through which data is *received* from "
-"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
-"If you have a flatrate, you can set it to the maximum speed of your internet "
-"connection. You should not use a value that is higher than what your actual "
-"connection allows."
-msgstr ""
-"Hier können Sie GNUnets Ressourcenverwendung einschränken.\n"
-"\n"
-"Der \"Downstream\" ist der Datenkanal, durch den Daten vom Internet "
-"*empfangen* werden. Das Limit ist entweder das gesamte Maximum für diesem "
-"Computer oder wieviel GNUnet selbst verwenden darf. Dies können Sie später "
-"festlegen. Wenn Sie eine Flatrate haben, können Sie die maximale "
-"Geschwindigkeit Ihrer Internetverbindung angeben."
-
-#: src/setup/ncurses/wizard_curs.c:381
-#, fuzzy
-msgid "Quota configuration"
-msgstr "GNUnet Konfiguration"
-
-#: 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:383
-#, fuzzy
-msgid ""
-"The GNUnet datastore contains all content that GNUnet needs to store "
-"(indexed, inserted and migrated content)."
-msgstr ""
-"Was ist die maximale Größe des GNUnet Datenspeichers (in MB)?\n"
-"Der GNUnet Datenspeicher enthält alle Daten, die GNUnet erzeugt (Indexdaten, "
-"eingefügte und migrierte Inhalte)."
-
-#: 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:394
-msgid "As which user should gnunetd be run?"
-msgstr ""
-
-#: 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 "
-"account under which the GNUnet service is started at system startup.\n"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the field empty to run GNUnet with system privileges.\n"
-msgstr ""
-"Geben Sie den Benutzer an, dem der GNUnet Dienst gehören soll.\n"
-"\n"
-"Aus Sicherheitsgründen ist es eine gute Idee, dieses Setup ein neues "
-"Benutzerkonto anlegen zu lassen, unter dem der GNUnet Dienst beim "
-"Systemstart läuft.\n"
-"\n"
-"Natürlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies "
-"betrifft auch Dateien, die Sie im GNUnet veröffentlichen möchten. Sie müssen "
-"dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen geben.\n"
-"\n"
-"Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen "
-"lassen möchten.\n"
-"\n"
-"GNUnet Benutzer:"
-
-#: src/setup/ncurses/wizard_curs.c:411
-msgid "Daemon configuration: group account"
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:412
-msgid "As which group should gnunetd be run?"
-msgstr ""
-
-#: 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 "
-"for the chosen user account.\n"
-"\n"
-"You can also specify a already existant group here.\n"
-"\n"
-"Only members of this group will be allowed to start and stop the the GNUnet "
-"server and have access to GNUnet server data.\n"
-msgstr ""
-"Definieren Sie eine Gruppe, der der GNUnet Dienst gehört.\n"
-"\n"
-"Aus Sicherheitsgründen ist es eine gute Idee, dieses Setup eine neue Gruppe "
-"für das gewählte Benutzerkonto anlegen zu lassen.\n"
-"\n"
-"Sie können hier auch eine bestehende Gruppe angeben.\n"
-"\n"
-"Nur Mitglieder dieser Gruppe dürfen den GNUnet Server starten und anhalten "
-"und haben Zugriff auf die Daten des GNUnet Servers.\n"
-"\n"
-"GNUnet Gruppe:"
-
-#: 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:430
-#, fuzzy
-msgid ""
-"If you say \"yes\" here, the GNUnet background process will be automatically "
-"started when you turn on your computer. If you say \"no\" here, you have to "
-"launch GNUnet yourself each time you want to use it."
-msgstr ""
-"Möchten Sie GNUnet als Systemdienst starten?\n"
-"\n"
-"Wenn Sie hier \"Ja\" sagen, so wird der GNUnet Hintergrundprozess jedesmal "
-"automatisch gestartet, wenn Sie Ihren Computer einschalten. Wenn Sie hier "
-"\"Nein\" sagen, so müssen Sie GNUnet jedesmal selbst starten, wenn Sie es "
-"verwenden möchten."
-
-#: 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:478
-msgid "Unable to setup autostart for daemon."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:493
-#, fuzzy
-msgid "Save configuration?"
-msgstr "GNUnet Konfiguration"
-
-#: src/setup/ncurses/wizard_curs.c:494
-#, fuzzy
-msgid "Save configuration now?"
-msgstr "GNUnet Konfiguration"
-
-#: src/setup/ncurses/wizard_curs.c:538
-msgid "Back"
-msgstr "Zurück"
-
-#: src/setup/lib/gns.c:294
-#, fuzzy, c-format
-msgid ""
-"Configuration does not satisfy constraints of configuration specification "
-"file `%s'!\n"
-msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"für FS Daten angeben.\n"
-
-#: 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:110
-msgid "Can't open Service Control Manager"
-msgstr "Der Dienstemanager konnte nicht geöffnet werden"
-
-#: 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: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:125
-msgid "Cannot write to the regisitry"
-msgstr "Konnte nicht in die Registry schreiben"
-
-#: 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:131
-msgid "Can't delete the service"
-msgstr "Dienst konnte nicht gelöscht werden"
-
-#: src/setup/lib/wizard_util.c:134
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
-
-#: 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:174
-msgid "Error creating user"
-msgstr "Fehler beim Anlegen des Benutzers"
-
-#: 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:183
-msgid "Error granting service right to user"
-msgstr "Fehler beim Zuweisen des Dienstrechtes dem Benutzer"
-
-#: 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:153
+#: src/include/gnunet_util_getopt.h:154
 msgid "print this help"
 msgstr "Gibt diese Hilfe aus"
 
-#: src/include/gnunet_util_getopt.h:162
+#: src/include/gnunet_util_getopt.h:163
 msgid "print the version number"
 msgstr "Versionsnummer ausgeben"
 
-#: src/include/gnunet_util_getopt.h:168
+#: src/include/gnunet_util_getopt.h:169
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:174
+#: src/include/gnunet_util_getopt.h:175
 msgid "be verbose"
 msgstr "umfangreiche Meldungen ausgeben"
 
-#: src/include/gnunet_util_getopt.h:180
+#: src/include/gnunet_util_getopt.h:181
 msgid "use configuration file FILENAME"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/include/gnunet_util_getopt.h:186
+#: src/include/gnunet_util_getopt.h:187
 msgid "specify host on which gnunetd is running"
 msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
-#: 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:236
+#: src/include/gnunet_util_error.h:221 src/include/gnunet_util_error.h:223
+#: src/include/gnunet_util_error.h:229 src/include/gnunet_util_error.h:245
 #, 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:230
+#: src/include/gnunet_util_error.h:239
 #, c-format
 msgid ""
 "External protocol violation: assertion failed at %s:%d in %s (no need to "
 "panic, we can handle this).\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
+#: src/include/gnunet_util_error.h:280 src/include/gnunet_util_error.h:287
 #, 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"
@@ -4439,23 +4738,35 @@
 "configuration here.  Default is no proxy."
 msgstr ""
 
-#: contrib/config-daemon.scm:224 contrib/config-client.scm:144
+#: contrib/config-daemon.scm:210
+msgid ""
+"Name of the directory where gnunetd should store contact information about "
+"peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:212
+msgid ""
+"Unless you want to share the directory directly using a webserver, the "
+"default is most likely just fine."
+msgstr ""
+
+#: contrib/config-daemon.scm:238 contrib/config-client.scm:144
 msgid "How long should logs be kept?"
 msgstr ""
 
-#: contrib/config-daemon.scm:226 contrib/config-client.scm:146
+#: contrib/config-daemon.scm:240 contrib/config-client.scm:146
 msgid ""
 "How long should logs be kept? If you specify a value greater than zero, a "
 "log is created each day with the date appended to its filename. These logs "
 "are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
 msgstr ""
 
-#: contrib/config-daemon.scm:237
+#: contrib/config-daemon.scm:251
 msgid ""
 "What maximum number of open file descriptors should be requested from the OS?"
 msgstr ""
 
-#: contrib/config-daemon.scm:239
+#: contrib/config-daemon.scm:253
 msgid ""
 "The default of 1024 should be fine for most systems.  If your system can "
 "support more, increasing the number might help support additional clients on "
@@ -4467,62 +4778,66 @@
 "run with what it is given."
 msgstr ""
 
-#: contrib/config-daemon.scm:250
+#: contrib/config-daemon.scm:264
 msgid "Where should gnunetd write the logs?"
 msgstr ""
 
-#: contrib/config-daemon.scm:262 contrib/config-client.scm:169
+#: contrib/config-daemon.scm:276
+msgid "Enable for extra-verbose logging."
+msgstr ""
+
+#: contrib/config-daemon.scm:288 contrib/config-client.scm:169
 msgid "Logging"
 msgstr ""
 
-#: contrib/config-daemon.scm:263 contrib/config-client.scm:170
+#: contrib/config-daemon.scm:289 contrib/config-client.scm:170
 msgid "Specify which system messages should be logged how"
 msgstr ""
 
-#: contrib/config-daemon.scm:267 contrib/config-client.scm:174
+#: contrib/config-daemon.scm:294 contrib/config-client.scm:174
 msgid "Logging of events for users"
 msgstr ""
 
-#: contrib/config-daemon.scm:268 contrib/config-client.scm:175
+#: contrib/config-daemon.scm:295 contrib/config-client.scm:175
 msgid "Logging of events for the system administrator"
 msgstr ""
 
-#: contrib/config-daemon.scm:280
+#: contrib/config-daemon.scm:307
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:281
+#: contrib/config-daemon.scm:308
 msgid ""
 "The default is no longer /var/run/gnunetd.pid since we could not delete the "
 "file on shutdown at that location."
 msgstr ""
 
-#: contrib/config-daemon.scm:293
+#: contrib/config-daemon.scm:320
 msgid "As which user should gnunetd run?"
 msgstr ""
 
-#: contrib/config-daemon.scm:295
+#: contrib/config-daemon.scm:322
 msgid ""
 "Empty means \"current user\". On computer startup, it is root/SYSTEM.  Under "
 "Windows, this setting affects the creation of a new system service only."
 msgstr ""
 
-#: contrib/config-daemon.scm:308
+#: contrib/config-daemon.scm:335
 msgid "Should gnunetd be automatically started when the system boots?"
 msgstr ""
 
-#: contrib/config-daemon.scm:309
+#: contrib/config-daemon.scm:336
 msgid ""
 "Set to YES if gnunetd should be automatically started on boot.  If this "
 "option is set, gnunet-setup will install a script to start the daemon upon "
 "completion.  This option may not work on all systems."
 msgstr ""
 
-#: contrib/config-daemon.scm:321
+#: contrib/config-daemon.scm:348
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:323
+#: contrib/config-daemon.scm:350
 msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
 "available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
@@ -4536,11 +4851,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:337
+#: contrib/config-daemon.scm:364
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:339
+#: contrib/config-daemon.scm:366
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -4577,11 +4892,11 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:368
+#: contrib/config-daemon.scm:395
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:369
+#: contrib/config-daemon.scm:396
 msgid ""
 "This option can be used to tell gnunetd not to open the client port.  When "
 "run like this, gnunetd will participate as a peer in the network but not "
@@ -4590,11 +4905,11 @@
 "prevent you from running diagnostic tools like gnunet-stats!"
 msgstr ""
 
-#: contrib/config-daemon.scm:381
+#: contrib/config-daemon.scm:408
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:382
+#: contrib/config-daemon.scm:409
 msgid ""
 "The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
 "peer to peers of which the hostkey has been copied by hand to data/hosts;  "
@@ -4606,15 +4921,15 @@
 "lines above would need some minor editing :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:393
+#: contrib/config-daemon.scm:420
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:405
+#: contrib/config-daemon.scm:432
 msgid "Disable automatic establishment of connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:406
+#: contrib/config-daemon.scm:433
 msgid ""
 "If this option is enabled, GNUnet will not automatically establish "
 "connections to other peers, but instead wait for applications to "
@@ -4622,22 +4937,22 @@
 "connect to us)."
 msgstr ""
 
-#: contrib/config-daemon.scm:417
+#: contrib/config-daemon.scm:444
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:418
+#: contrib/config-daemon.scm:445
 msgid ""
 "This option maybe useful during testing, but turning it off is dangerous! If "
 "in any doubt, set it to YES (which is the default)."
 msgstr ""
 
-#: contrib/config-daemon.scm:429
+#: contrib/config-daemon.scm:456
 #, fuzzy
 msgid "Port for communication with GNUnet user interfaces"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: contrib/config-daemon.scm:430
+#: contrib/config-daemon.scm:457
 msgid ""
 "Which is the client-server port that is used between gnunetd and the clients "
 "(TCP only).  You may firewall this port for non-local machines (but you do "
@@ -4645,11 +4960,11 @@
 "connections from machines that are listed under TRUSTED)."
 msgstr ""
 
-#: contrib/config-daemon.scm:441
+#: contrib/config-daemon.scm:468
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:442
+#: contrib/config-daemon.scm:469
 msgid ""
 "This option specifies which hosts are trusted enough to connect as clients "
 "(to the TCP port).  This is useful if you run gnunetd on one host of your "
@@ -4660,71 +4975,71 @@
 "separated by a semicolon, spaces are not allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:481
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:455
+#: contrib/config-daemon.scm:482
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If it is set, "
 "only the specified peers are allowed. Specify the list of peer IDs (not IPs!)"
 msgstr ""
 
-#: contrib/config-daemon.scm:466
+#: contrib/config-daemon.scm:493
 #, fuzzy
 msgid "Run gnunetd as this group."
 msgstr "gnunet-update ausführen"
 
-#: contrib/config-daemon.scm:467
+#: contrib/config-daemon.scm:494
 msgid ""
 "When started as root, gnunetd will change permissions to the given group."
 msgstr ""
 
-#: contrib/config-daemon.scm:478
+#: contrib/config-daemon.scm:505
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:479
+#: contrib/config-daemon.scm:506
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If the ID of a "
 "peer is listed here, connections from that peer will be refused.  Specify "
 "the list of peer IDs (not IPs!)"
 msgstr ""
 
-#: contrib/config-daemon.scm:490
+#: contrib/config-daemon.scm:517
 msgid "Topology Maintenance"
 msgstr ""
 
-#: contrib/config-daemon.scm:491
+#: contrib/config-daemon.scm:518
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:511
+#: contrib/config-daemon.scm:538
 #, fuzzy
 msgid "General settings"
 msgstr "Weitere Einstellungen"
 
-#: contrib/config-daemon.scm:512
+#: contrib/config-daemon.scm:539
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:536
+#: contrib/config-daemon.scm:564
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:537
+#: contrib/config-daemon.scm:565
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:554
+#: contrib/config-daemon.scm:583
 msgid "Fundamentals"
 msgstr ""
 
-#: contrib/config-daemon.scm:574
+#: contrib/config-daemon.scm:603
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:576
+#: contrib/config-daemon.scm:605
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -4733,58 +5048,95 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:589
+#: contrib/config-daemon.scm:618 contrib/config-daemon.scm:631
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:591
+#: contrib/config-daemon.scm:619
+msgid "Which database should be used for the temporary datastore of the DHT?"
+msgstr ""
+
+#: contrib/config-daemon.scm:633
 msgid ""
-"Which topology should be used?  The only options at the moment are "
-"\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
-"to connect to a diverse set of peers, and welcome connections from anyone.  "
-"In f2f (friend-to-friend) mode, GNUnet will only allow connections from "
-"peers that are explicitly listed in a FRIENDS file.  Note that you can list "
-"peers in the FRIENDS file that run in default mode.\n"
-"\n"
-"Use f2f only if you have (trustworthy) friends that use GNUnet and are "
-"afraid of establishing (direct) connections to unknown peers."
+"Which topology should be used?  The only option at the moment is "
+"\"topology_default\""
 msgstr ""
 
-#: contrib/config-daemon.scm:607
+#: contrib/config-daemon.scm:647
+msgid ""
+"Minimum number of connected friends before this peer is allowed to connect "
+"to peers that are not listed as friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:648
+msgid ""
+"Note that this option does not guarantee that the peer will be able to "
+"connect to the specified number of friends.  Also, if the peer had connected "
+"to a sufficient number of friends and then established non-friend "
+"connections, some of the friends may drop out of the network, temporarily "
+"resulting in having fewer than the specified number of friends connected "
+"while being connected to non-friends.  However, it is guaranteed that the "
+"peer itself will never choose to drop a friend's connection if this would "
+"result in dropping below the specified number of friends (unless that number "
+"is higher than the overall connection target)."
+msgstr ""
+
+#: contrib/config-daemon.scm:659
+msgid ""
+"If set to YES, the peer is only allowed to connect to other peers that are "
+"explicitly specified as friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:660
+msgid ""
+"Use YES only if you have (trustworthy) friends that use GNUnet and are "
+"afraid of establishing (direct) connections to unknown peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:671
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:608
+#: contrib/config-daemon.scm:672
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:622
+#: contrib/config-daemon.scm:683
+msgid "Friend-to-Friend Topology Specification"
+msgstr ""
+
+#: contrib/config-daemon.scm:684
+#, fuzzy
+msgid "Settings for restricting connections to friends"
+msgstr "`%s' fehlgeschlagen. Beende Verbindung zu Client.\n"
+
+#: contrib/config-daemon.scm:701
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:634
+#: contrib/config-daemon.scm:713
 #, fuzzy
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: contrib/config-daemon.scm:646
+#: contrib/config-daemon.scm:725
 #, fuzzy
 msgid "Configuration of the MySQL database"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: contrib/config-daemon.scm:665
+#: contrib/config-daemon.scm:744
 #, fuzzy
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
-#: contrib/config-daemon.scm:667
+#: contrib/config-daemon.scm:746
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -4795,19 +5147,19 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:681
+#: contrib/config-daemon.scm:760
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:693
+#: contrib/config-daemon.scm:772
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:706
+#: contrib/config-daemon.scm:785
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:708
+#: contrib/config-daemon.scm:787
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -4819,13 +5171,13 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:722
+#: contrib/config-daemon.scm:801
 msgid ""
 "MB of diskspace GNUnet can use for caching DHT index data (the data will be "
 "stored in /tmp)"
 msgstr ""
 
-#: contrib/config-daemon.scm:723
+#: contrib/config-daemon.scm:802
 msgid ""
 "DHT index data is inherently small and expires comparatively quickly.  It is "
 "deleted whenever gnunetd is shut down.\n"
@@ -4833,21 +5185,21 @@
 "The size of the DSTORE QUOTA is specified in MB."
 msgstr ""
 
-#: contrib/config-daemon.scm:737
+#: contrib/config-daemon.scm:816
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
-#: contrib/config-daemon.scm:756
+#: contrib/config-daemon.scm:835
 #, fuzzy
 msgid "Applications"
 msgstr "_Optionen"
 
-#: contrib/config-daemon.scm:772
+#: contrib/config-daemon.scm:851
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:773
+#: contrib/config-daemon.scm:852
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port and that cannot be traversed using UPnP.  Note "
@@ -4857,18 +5209,21 @@
 "contact you directly.  You can use 'make check' in src/transports/upnp/ to "
 "find out if your NAT supports UPnP.  You can also use gnunet-transport-check "
 "with the '-p' option in order to determine which setting results in more "
-"connections.  Use YES only if you get no connections otherwise."
+"connections.  Use YES only if you get no connections otherwise.  Set to AUTO "
+"to use YES if the local IP is belongs to a private IP network and NO "
+"otherwise."
 msgstr ""
 
-#: contrib/config-daemon.scm:784
+#: contrib/config-daemon.scm:863
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:796 contrib/config-daemon.scm:901
+#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:941
+#: contrib/config-daemon.scm:1078
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:797
+#: contrib/config-daemon.scm:876
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP.  You should disable this option if you are sure that you are "
@@ -4876,30 +5231,38 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:808 contrib/config-daemon.scm:925
-#: contrib/config-daemon.scm:980 contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:887 contrib/config-daemon.scm:1102
+#: contrib/config-daemon.scm:1157 contrib/config-daemon.scm:1222
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:820
+#: contrib/config-daemon.scm:899
 msgid ""
 "Which IPs are allowed to connect? Leave empty to use the IP of your primary "
 "network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:832
+#: contrib/config-daemon.scm:911
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:850
+#: contrib/config-daemon.scm:929
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:862
+#: contrib/config-daemon.scm:942 contrib/config-daemon.scm:1079
+msgid ""
+"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
+"supports UPnP. You should disable this option if you are sure that you are "
+"not behind a NAT.  If your NAT box does not support UPnP, having this on "
+"will not do much harm (only cost a small amount of resources)."
+msgstr ""
+
+#: contrib/config-daemon.scm:953
 msgid "Which is the external port of the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:863
+#: contrib/config-daemon.scm:954
 msgid ""
 "Use this option if your firewall maps say port 80 to your real HTTP port.  "
 "This can be useful in making the HTTP messages appear even more legit "
@@ -4907,91 +5270,129 @@
 "priviledged port)."
 msgstr ""
 
-#: contrib/config-daemon.scm:874
+#: contrib/config-daemon.scm:965
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:889
-msgid "Which port should be used by the UDP IPv4 transport?"
+#: contrib/config-daemon.scm:984
+msgid "What is the maximum transfer unit for SMTP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:902
+#: contrib/config-daemon.scm:996
+msgid "Which e-mail address should be used to send e-mail to this peer?"
+msgstr ""
+
+#: contrib/config-daemon.scm:997
 msgid ""
-"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
-"supports UPnP. You should disable this option if you are sure that you are "
-"not behind a NAT.  If your NAT box does not support UPnP, having this on "
-"will not do much harm (only cost a small amount of resources)."
+"You must make sure that e-mail received at this address is forwarded to the "
+"PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with "
+"procmail and the PIPE option to set the name of the pipe."
 msgstr ""
 
-#: contrib/config-daemon.scm:913
+#: contrib/config-daemon.scm:1008
+msgid ""
+"Which header line should other peers include in e-mails to enable filtering?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1009
+msgid ""
+"You can specify a header line here which can then be used by procmail to "
+"filter GNUnet e-mail from your inbox and forward it to gnunetd."
+msgstr ""
+
+#: contrib/config-daemon.scm:1020
+msgid "What is the filename of the pipe where gnunetd can read its e-mail?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1021
+msgid "Have a look at contrib/dot-procmailrc for an example .procmailrc file."
+msgstr ""
+
+#: contrib/config-daemon.scm:1032
+msgid "What is the name and port of the server for outgoing e-mail?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1033
+msgid "The basic format is HOSTNAME:PORT."
+msgstr ""
+
+#: contrib/config-daemon.scm:1044
+msgid "SMTP transport"
+msgstr ""
+
+#: contrib/config-daemon.scm:1066
+msgid "Which port should be used by the UDP IPv4 transport?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1090
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:937
+#: contrib/config-daemon.scm:1114
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow connections from any "
 "IP."
 msgstr ""
 
-#: contrib/config-daemon.scm:949
+#: contrib/config-daemon.scm:1126
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:968
+#: contrib/config-daemon.scm:1145
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:992 contrib/config-daemon.scm:1057
+#: contrib/config-daemon.scm:1169 contrib/config-daemon.scm:1234
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow any IP to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:1004
+#: contrib/config-daemon.scm:1181
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1021
+#: contrib/config-daemon.scm:1198
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1033
+#: contrib/config-daemon.scm:1210
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1069
+#: contrib/config-daemon.scm:1246
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1087
+#: contrib/config-daemon.scm:1264
 #, fuzzy
 msgid "Network interface"
 msgstr "Netzwerkgerät:"
 
-#: contrib/config-daemon.scm:1099
+#: contrib/config-daemon.scm:1276
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1111
+#: contrib/config-daemon.scm:1288
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1123
+#: contrib/config-daemon.scm:1300
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1146
+#: contrib/config-daemon.scm:1324
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1158
+#: contrib/config-daemon.scm:1336
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1170
+#: contrib/config-daemon.scm:1348
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1172
+#: contrib/config-daemon.scm:1350
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -5001,11 +5402,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1183
+#: contrib/config-daemon.scm:1361
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1185
+#: contrib/config-daemon.scm:1363
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -5015,36 +5416,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1196
+#: contrib/config-daemon.scm:1374
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1197
+#: contrib/config-daemon.scm:1375
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1208
+#: contrib/config-daemon.scm:1386
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1209
+#: contrib/config-daemon.scm:1387
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1220
+#: contrib/config-daemon.scm:1398
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1232
+#: contrib/config-daemon.scm:1410
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1234
+#: contrib/config-daemon.scm:1412
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -5089,12 +5490,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1251
+#: contrib/config-daemon.scm:1429
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Netzwerkgerät:"
 
-#: contrib/config-daemon.scm:1252
+#: contrib/config-daemon.scm:1430
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -5105,12 +5506,12 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1263
+#: contrib/config-daemon.scm:1441
 #, fuzzy
 msgid "Load management"
 msgstr "Ungültige Kommandozeilen Parameter.\n"
 
-#: contrib/config-daemon.scm:1288 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1466 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -5247,457 +5648,750 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Configuration of the logging system"
-#~ msgstr ""
-#~ "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
-#~ "ausführen!\n"
+#: src/setup/gtk/gnunet-setup.glade:9 src/setup/gtk/gnunet-setup.glade:167
+#: src/setup/gtk/gnunet-setup.glade:435 src/setup/gtk/gnunet-setup.glade:845
+#: src/setup/gtk/gnunet-setup.glade:1178
+msgid "GNUnet configuration assistant"
+msgstr "GNUnet Konfigurationsassistent"
 
+#: src/setup/gtk/gnunet-setup.glade:34
 #, fuzzy
-#~ msgid "Run gnunetd as this user."
-#~ msgstr "gnunet-update ausführen"
+msgid ""
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org\n";
+"and join our community at\n"
+"\thttps://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"The GNUnet team"
+msgstr ""
+"Willkommen bei GNUnet!\n"
+"\n"
+"Dieser Assistent wird Ihnen einige grundlegende Fragen stellen, um GNUnet zu "
+"konfigurieren.\n"
+"\n"
+"Bitte besuchen Sie unsere Homepage\n"
+"\thttp://gnunet.org\n";
+"und schließen Sie sich unserer Community an:\n"
+"\thttps://gnunet.org/drupal/\n";
+"\n"
+"Viel Spaß,\n"
+"\n"
+"das GNUnet-Team"
 
-#, fuzzy
-#~ msgid "Run gnunetd during system startup?"
-#~ msgstr "gnunet-update ausführen"
+#: src/setup/gtk/gnunet-setup.glade:92 src/setup/gtk/gnunet-setup.glade:360
+#: src/setup/gtk/gnunet-setup.glade:767 src/setup/gtk/gnunet-setup.glade:1384
+msgid "Next"
+msgstr "Weiter"
 
-#, fuzzy
-#~ msgid "Path settings"
-#~ msgstr "Weitere Einstellungen"
+#: src/setup/gtk/gnunet-setup.glade:194
+msgid ""
+"Enter information about your network connection here.\n"
+"\n"
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL.\n"
+"\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address.\n"
+"\n"
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, check the last option on this page. Leave it "
+"unchecked on direct connections through modems, ISDN cards and DNAT (also "
+"known as \"port forwarding\")."
+msgstr ""
+"Geben Sie hier Ihre Netzwerkinformationen ein.\n"
+"\n"
+"Das \"Netzwerkgerät\" ist das Gerät, das Ihren Computer mit dem Internet "
+"verbindet. Dies ist normalerweise ein Modem, eine ISDN-Karte oder eine "
+"Netzwerkkarte für den Fall, dass Sie DSL benutzen.\n"
+"\n"
+"Wenn Ihnen Ihr Provider immer die gleiche IP-Adresse zuweist (eine "
+"\"statische\" IP-Adresse), geben Sie diese in das \"IP-Adresse\"-Feld ein. "
+"Wenn Ihre IP-Adresse sich hin und wieder ändert (\"dynamische\" IP-Adresse), "
+"es jedoch einen Hostnamen gibt, der immer auf Ihre aktuelle IP-Adresse zeigt "
+"(\"Dynamisches DNS\"), so können Sie ihn auch eingeben.\n"
+"Im Zweifel lassen Sie das Feld leer. GNUnet wird dann versuchen, die IP-"
+"Adresse automatisch zu bestimmen.\n"
+"\n"
+"Wenn Sie nicht direkt mit dem Internet verbunden sind, sondern dies über "
+"einen anderen Rechner mit SNAT, einem Router oder einer \"Hardware Firewall"
+"\" geschieht und andere Computer im Internet keine Verbindung mit diesem "
+"Computer herstellen können, so aktivieren Sie die letzte Option auf dieser "
+"Seite. Lassen Sie sie jedoch deaktiviert, wenn Sie eine direkte Verbindung "
+"über ein Modem, eine ISDN-Karte oder einen anderen Rechner mit DNAT (auch "
+"bekannt als \"Port forwarding\") zum Internet haben."
 
-#~ msgid "specify nickname"
-#~ msgstr "Spitznamen angeben"
+#: src/setup/gtk/gnunet-setup.glade:250
+msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+msgstr ""
+"Computer kann keine ankommenden Verbindungen akzeptieren (SNAT/Firewall)"
 
-#~ msgid "Start GNUnet chat client."
-#~ msgstr "GNUnet chat client starten"
+#: src/setup/gtk/gnunet-setup.glade:283
+msgid "IP-Address/Hostname:"
+msgstr "IP-Adresse/Hostname:"
 
-#~ 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"
-
+#: src/setup/gtk/gnunet-setup.glade:296
 #, 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 "Network interface:"
+msgstr "Netzwerkgerät:"
 
-#~ msgid "Database failed to delete `%s'.\n"
-#~ msgstr "Die Datenbank konnte `%s' nicht löschen.\n"
-
-#~ msgid "GNUnet configuration assistant"
-#~ msgstr "GNUnet Konfigurationsassistent"
-
+#: src/setup/gtk/gnunet-setup.glade:319
 #, fuzzy
-#~ msgid ""
-#~ "Welcome to GNUnet!\n"
-#~ "\n"
-#~ "This assistant will ask you a few basic questions in order to configure "
-#~ "GNUnet.\n"
-#~ "\n"
-#~ "Please visit our homepage at\n"
-#~ "\thttp://gnunet.org\n";
-#~ "and join our community at\n"
-#~ "\thttps://gnunet.org/drupal/\n";
-#~ "\n"
-#~ "Have a lot of fun,\n"
-#~ "\n"
-#~ "The GNUnet team"
-#~ msgstr ""
-#~ "Willkommen bei GNUnet!\n"
-#~ "\n"
-#~ "Dieser Assistent wird Ihnen einige grundlegende Fragen stellen, um GNUnet "
-#~ "zu konfigurieren.\n"
-#~ "\n"
-#~ "Bitte besuchen Sie unsere Homepage\n"
-#~ "\thttp://gnunet.org\n";
-#~ "und schließen Sie sich unserer Community an:\n"
-#~ "\thttps://gnunet.org/drupal/\n";
-#~ "\n"
-#~ "Viel Spaß,\n"
-#~ "\n"
-#~ "das GNUnet-Team"
+msgid "Network connection"
+msgstr "GNUnet Konfiguration"
 
-#~ msgid "Next"
-#~ msgstr "Weiter"
+#: src/setup/gtk/gnunet-setup.glade:462
+msgid ""
+"You can limit GNUnet's ressource usage here.\n"
+"\n"
+"\"Bandwidth limitation\" is how much data may be sent per second. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection.\n"
+"\n"
+"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
+"to use."
+msgstr ""
+"Hier können Sie GNUnet's Ressourcennutzung einschränken.\n"
+"\n"
+"\"Bandbreitenbeschränkung\" gibt an, wieviele Daten maximal pro Sekunde "
+"übetragen werden dürfen. Wenn Sie eine Flatrate haben, können Sie diese "
+"Werte auf die maximal erreichbare Geschwindigkeit Ihrer Internetverbindung "
+"setzen.\n"
+"\n"
+"Die \"Max. CPU Nutzung\" gibt den Prozentsatz an CPU-Zeit an, den GNUnet für "
+"sich verwenden darf."
 
-#~ msgid ""
-#~ "Enter information about your network connection here.\n"
-#~ "\n"
-#~ "The \"Network interface\" is the device that connects your computer to "
-#~ "the internet. This is usually a modem, an ISDN card or a network card in "
-#~ "case you are using DSL.\n"
-#~ "\n"
-#~ "If your provider always assigns the same IP-Address to you (a \"static\" "
-#~ "IP-Address), enter it into the \"IP-Address\" field. If your IP-Address "
-#~ "changes every now and then (\"dynamic\" IP-Address) but there's a "
-#~ "hostname that always points to your actual IP-Address (\"Dynamic DNS\"), "
-#~ "you can also enter it here.\n"
-#~ "If in doubt, leave the field empty. GNUnet will then try to determine "
-#~ "your IP-Address.\n"
-#~ "\n"
-#~ "If you are connected to the internet through another computer doing SNAT, "
-#~ "a router or a \"hardware firewall\" and other computers on the internet "
-#~ "cannot connect to this computer, check the last option on this page. "
-#~ "Leave it unchecked on direct connections through modems, ISDN cards and "
-#~ "DNAT (also known as \"port forwarding\")."
-#~ msgstr ""
-#~ "Geben Sie hier Ihre Netzwerkinformationen ein.\n"
-#~ "\n"
-#~ "Das \"Netzwerkgerät\" ist das Gerät, das Ihren Computer mit dem Internet "
-#~ "verbindet. Dies ist normalerweise ein Modem, eine ISDN-Karte oder eine "
-#~ "Netzwerkkarte für den Fall, dass Sie DSL benutzen.\n"
-#~ "\n"
-#~ "Wenn Ihnen Ihr Provider immer die gleiche IP-Adresse zuweist (eine "
-#~ "\"statische\" IP-Adresse), geben Sie diese in das \"IP-Adresse\"-Feld "
-#~ "ein. Wenn Ihre IP-Adresse sich hin und wieder ändert (\"dynamische\" IP-"
-#~ "Adresse), es jedoch einen Hostnamen gibt, der immer auf Ihre aktuelle IP-"
-#~ "Adresse zeigt (\"Dynamisches DNS\"), so können Sie ihn auch eingeben.\n"
-#~ "Im Zweifel lassen Sie das Feld leer. GNUnet wird dann versuchen, die IP-"
-#~ "Adresse automatisch zu bestimmen.\n"
-#~ "\n"
-#~ "Wenn Sie nicht direkt mit dem Internet verbunden sind, sondern dies über "
-#~ "einen anderen Rechner mit SNAT, einem Router oder einer \"Hardware "
-#~ "Firewall\" geschieht und andere Computer im Internet keine Verbindung mit "
-#~ "diesem Computer herstellen können, so aktivieren Sie die letzte Option "
-#~ "auf dieser Seite. Lassen Sie sie jedoch deaktiviert, wenn Sie eine "
-#~ "direkte Verbindung über ein Modem, eine ISDN-Karte oder einen anderen "
-#~ "Rechner mit DNAT (auch bekannt als \"Port forwarding\") zum Internet "
-#~ "haben."
+#: src/setup/gtk/gnunet-setup.glade:520
+msgid "Downstream (Bytes/s):"
+msgstr "Downstream (Bytes/s):"
 
-#, fuzzy
-#~ msgid "Network interface:"
-#~ msgstr "Netzwerkgerät:"
+#: src/setup/gtk/gnunet-setup.glade:547
+msgid "Upstream (Bytes/s):"
+msgstr "Upstream (Bytes/s):"
 
-#~ msgid "IP-Address/Hostname:"
-#~ msgstr "IP-Adresse/Hostname:"
+#: src/setup/gtk/gnunet-setup.glade:561
+msgid "Bandwidth limitation"
+msgstr "Bandbreitenbeschränkung"
 
-#~ msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
-#~ msgstr ""
-#~ "Computer kann keine ankommenden Verbindungen akzeptieren (SNAT/Firewall)"
+#: src/setup/gtk/gnunet-setup.glade:580
+msgid "Use denoted bandwidth for GNUnet"
+msgstr "Angegebene Bandbreite für GNUnet verwenden"
 
-#, fuzzy
-#~ msgid "Network connection"
-#~ msgstr "GNUnet Konfiguration"
+#: src/setup/gtk/gnunet-setup.glade:596
+msgid "Share denoted bandwidth with other applications"
+msgstr "Angegebene Bandbreite mit anderen Anwendungen teilen"
 
-#~ msgid ""
-#~ "You can limit GNUnet's ressource usage here.\n"
-#~ "\n"
-#~ "\"Bandwidth limitation\" is how much data may be sent per second. If you "
-#~ "have a flatrate you can set it to the maximum speed of your internet "
-#~ "connection.\n"
-#~ "\n"
-#~ "The \"Max. CPU usage\" is the percentage of processor time GNUnet is "
-#~ "allowed to use."
-#~ msgstr ""
-#~ "Hier können Sie GNUnet's Ressourcennutzung einschränken.\n"
-#~ "\n"
-#~ "\"Bandbreitenbeschränkung\" gibt an, wieviele Daten maximal pro Sekunde "
-#~ "übetragen werden dürfen. Wenn Sie eine Flatrate haben, können Sie diese "
-#~ "Werte auf die maximal erreichbare Geschwindigkeit Ihrer "
-#~ "Internetverbindung setzen.\n"
-#~ "\n"
-#~ "Die \"Max. CPU Nutzung\" gibt den Prozentsatz an CPU-Zeit an, den GNUnet "
-#~ "für sich verwenden darf."
+#: src/setup/gtk/gnunet-setup.glade:614
+msgid "Bandwidth sharing"
+msgstr "Aufteilung der Bandbreite"
 
-#~ msgid "Upstream (Bytes/s):"
-#~ msgstr "Upstream (Bytes/s):"
+#: src/setup/gtk/gnunet-setup.glade:636
+msgid "Max. CPU usage (%):"
+msgstr "Max. CPU Nutzung (%):"
 
-#~ msgid "Downstream (Bytes/s):"
-#~ msgstr "Downstream (Bytes/s):"
+#: src/setup/gtk/gnunet-setup.glade:659
+msgid "CPU usage"
+msgstr "CPU Nutzung"
 
-#~ msgid "Bandwidth limitation"
-#~ msgstr "Bandbreitenbeschränkung"
+#: src/setup/gtk/gnunet-setup.glade:682
+msgid "Load limitation"
+msgstr "Lastbeschränkung"
 
-#~ msgid "Use denoted bandwidth for GNUnet"
-#~ msgstr "Angegebene Bandbreite für GNUnet verwenden"
+#: src/setup/gtk/gnunet-setup.glade:872
+msgid ""
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability.\n"
+"\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content). Its maximum size can be specified below.\n"
+"\n"
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
+"\n"
+"After changing the configuration and/or updating GNUnet, it is sometimes "
+"required to run gnunet-update to update internal data structures. Depending "
+"on the changes made, this may take some time."
+msgstr ""
+"GNUnet ist in der Lage, Daten von anderen Knoten in Ihrem Datenspeicher zu "
+"speichern. Das ist nützlich, wenn ein Widersacher Zugriff auf Ihre "
+"eingefügten Inhalte erlangt und Sie abstreiten müssen, dass diese Daten "
+"Ihnen gehören. Mit \"Inhaltsmigration\" angeschaltet können die Inhalte über "
+"das Internet von einem anderen Knoten zu Ihrem Rechner ohne Ihr Wissen "
+"\"gewandert\" sein.\n"
+"Außerdem hilft es, beliebte Inhalte über verschiedene Netzteilnehmer zu "
+"verteilen, um so die Verfügbarkeit zu erhöhen.\n"
+"\n"
+"Der GNUnet Datenspeicher enthält alle Daten, die GNUnet erzeugt (Indexdaten, "
+"eingefügte und migrierte Inhalte). Seine maximale Größe kann unten angegeben "
+"werden.\n"
+"\n"
+"Wenn Sie ein fortgeschrittener Benutzer sind, möchten Sie vielleicht weitere "
+"Feinjustierungen an GNUnet über den \"erweiterten Konfigurator\" vornehmen.\n"
+"Nachdem die Konfiguration verändert und/oder GNUnet upgedated wurde ist es "
+"manchmal nötig, gnunet-update auszuführen, um interne Datenstrukturen zu "
+"aktualisieren. Abhängig von den gemachten Änderungen kann dies etwas Zeit in "
+"Anspruch nehmen."
 
-#~ msgid "Share denoted bandwidth with other applications"
-#~ msgstr "Angegebene Bandbreite mit anderen Anwendungen teilen"
+#: src/setup/gtk/gnunet-setup.glade:905
+msgid "Store migrated content"
+msgstr "Migrierte Inhalte speichern"
 
-#~ msgid "Bandwidth sharing"
-#~ msgstr "Aufteilung der Bandbreite"
+#: src/setup/gtk/gnunet-setup.glade:923
+msgid "Maximum datastore size (MB):"
+msgstr "Maximale Größe des Datenspeichers (MB):"
 
-#~ msgid "Max. CPU usage (%):"
-#~ msgstr "Max. CPU Nutzung (%):"
+#: src/setup/gtk/gnunet-setup.glade:952
+msgid "Start the GNUnet background process on computer startup"
+msgstr ""
+"GNUnet Hintergrundprozeß beim Starten des Computers automatisch starten"
 
-#~ msgid "CPU usage"
-#~ msgstr "CPU Nutzung"
+#: src/setup/gtk/gnunet-setup.glade:969
+msgid "Open the enhanced configurator"
+msgstr "Erweiterten Konfigurator starten"
 
-#~ msgid "Load limitation"
-#~ msgstr "Lastbeschränkung"
-
-#~ msgid ""
-#~ "GNUnet is able to store data from other peers in your datastore. This is "
-#~ "useful if an adversary has access to your inserted content and you need "
-#~ "to deny that the content is yours. With \"content migration\" on, the "
-#~ "content could have \"migrated\" over the internet to your node without "
-#~ "your knowledge.\n"
-#~ "It also helps to spread popular content over different peers to enhance "
-#~ "availability.\n"
-#~ "\n"
-#~ "The GNUnet datastore contains all data that GNUnet generates (index data, "
-#~ "inserted and migrated content). Its maximum size can be specified below.\n"
-#~ "\n"
-#~ "If you are an experienced user, you may want to tweak your GNUnet "
-#~ "installation using the enhanced configurator.\n"
-#~ "\n"
-#~ "After changing the configuration and/or updating GNUnet, it is sometimes "
-#~ "required to run gnunet-update to update internal data structures. "
-#~ "Depending on the changes made, this may take some time."
-#~ msgstr ""
-#~ "GNUnet ist in der Lage, Daten von anderen Knoten in Ihrem Datenspeicher "
-#~ "zu speichern. Das ist nützlich, wenn ein Widersacher Zugriff auf Ihre "
-#~ "eingefügten Inhalte erlangt und Sie abstreiten müssen, dass diese Daten "
-#~ "Ihnen gehören. Mit \"Inhaltsmigration\" angeschaltet können die Inhalte "
-#~ "über das Internet von einem anderen Knoten zu Ihrem Rechner ohne Ihr "
-#~ "Wissen \"gewandert\" sein.\n"
-#~ "Außerdem hilft es, beliebte Inhalte über verschiedene Netzteilnehmer zu "
-#~ "verteilen, um so die Verfügbarkeit zu erhöhen.\n"
-#~ "\n"
-#~ "Der GNUnet Datenspeicher enthält alle Daten, die GNUnet erzeugt "
-#~ "(Indexdaten, eingefügte und migrierte Inhalte). Seine maximale Größe kann "
-#~ "unten angegeben werden.\n"
-#~ "\n"
-#~ "Wenn Sie ein fortgeschrittener Benutzer sind, möchten Sie vielleicht "
-#~ "weitere Feinjustierungen an GNUnet über den \"erweiterten Konfigurator\" "
-#~ "vornehmen.\n"
-#~ "Nachdem die Konfiguration verändert und/oder GNUnet upgedated wurde ist "
-#~ "es manchmal nötig, gnunet-update auszuführen, um interne Datenstrukturen "
-#~ "zu aktualisieren. Abhängig von den gemachten Änderungen kann dies etwas "
-#~ "Zeit in Anspruch nehmen."
-
-#~ msgid "Store migrated content"
-#~ msgstr "Migrierte Inhalte speichern"
-
-#~ msgid "Maximum datastore size (MB):"
-#~ msgstr "Maximale Größe des Datenspeichers (MB):"
-
-#~ msgid "Start the GNUnet background process on computer startup"
-#~ msgstr ""
-#~ "GNUnet Hintergrundprozeß beim Starten des Computers automatisch starten"
-
-#~ msgid "Open the enhanced configurator"
-#~ msgstr "Erweiterten Konfigurator starten"
-
+#: src/setup/gtk/gnunet-setup.glade:986
 #, fuzzy
-#~ msgid "Run gnunet-update"
-#~ msgstr "gnunet-update schlug fehlt!"
+msgid "Run gnunet-update"
+msgstr "gnunet-update schlug fehlt!"
 
+#: src/setup/gtk/gnunet-setup.glade:1015 src/setup/gtk/gnunet-setup.glade:1299
 #, fuzzy
-#~ msgid "Other settings"
-#~ msgstr "Weitere Einstellungen"
+msgid "Other settings"
+msgstr "Weitere Einstellungen"
 
-#~ msgid "Finish"
-#~ msgstr "Fertigstellen"
+#: src/setup/gtk/gnunet-setup.glade:1100
+msgid "Finish"
+msgstr "Fertigstellen"
 
-#~ msgid ""
-#~ "Define the user and the group owning the GNUnet service here.\n"
-#~ "\n"
-#~ "For security reasons, it is a good idea to let this setup create a new "
-#~ "user account and a new group under which the GNUnet service is started at "
-#~ "system startup.\n"
-#~ "\n"
-#~ "However, GNUnet may not be able to access files other than its own. This "
-#~ "includes files you want to publish in GNUnet. You'll have to grant read "
-#~ "permissions to the user specified below.\n"
-#~ "\n"
-#~ "Leave the fields empty to run GNUnet with system privileges."
-#~ msgstr ""
-#~ "Geben Sie den Benutzer und die Gruppe an, der der GNUnet Dienst gehören "
-#~ "soll.\n"
-#~ "\n"
-#~ "Aus Sicherheitsgründen ist es eine gute Idee, dieses Setup ein neues "
-#~ "Benutzerkonto und eine neue Gruppe anlegen zu lassen, unter der der "
-#~ "GNUnet Dienst beim Systemstart läuft.\n"
-#~ "\n"
-#~ "Natürlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies "
-#~ "betrifft auch Dateien, die Sie im GNUnet veröffentlichen möchten. Sie "
-#~ "müssen dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen "
-#~ "geben.\n"
-#~ "\n"
-#~ "Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen "
-#~ "lassen möchten."
+#: src/setup/gtk/gnunet-setup.glade:1205
+msgid ""
+"Define the user and the group owning the GNUnet service here.\n"
+"\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account and a new group under which the GNUnet service is started at system "
+"startup.\n"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the fields empty to run GNUnet with system privileges."
+msgstr ""
+"Geben Sie den Benutzer und die Gruppe an, der der GNUnet Dienst gehören "
+"soll.\n"
+"\n"
+"Aus Sicherheitsgründen ist es eine gute Idee, dieses Setup ein neues "
+"Benutzerkonto und eine neue Gruppe anlegen zu lassen, unter der der GNUnet "
+"Dienst beim Systemstart läuft.\n"
+"\n"
+"Natürlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies "
+"betrifft auch Dateien, die Sie im GNUnet veröffentlichen möchten. Sie müssen "
+"dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen geben.\n"
+"\n"
+"Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen "
+"lassen möchten."
 
-#~ msgid "Group:"
-#~ msgstr "Gruppe:"
+#: src/setup/gtk/gnunet-setup.glade:1239
+msgid "User account:"
+msgstr "Benutzerkonto:"
 
-#~ msgid "User account:"
-#~ msgstr "Benutzerkonto:"
+#: src/setup/gtk/gnunet-setup.glade:1279
+msgid "Group:"
+msgstr "Gruppe:"
 
+#: src/setup/gtk/gnunet-setup.glade:1462
 #, fuzzy
-#~ msgid "gnunet-setup"
-#~ msgstr "gnunet-update ausführen"
+msgid "gnunet-setup"
+msgstr "gnunet-update ausführen"
 
+#: src/setup/gtk/gnunet-setup.glade:1481
 #, fuzzy
-#~ msgid "Save configuration"
-#~ msgstr "GNUnet Konfiguration"
+msgid "Save configuration"
+msgstr "GNUnet Konfiguration"
 
+#: src/setup/gtk/gnunet-setup.glade:1493
 #, fuzzy
-#~ msgid "Show copyright information for gnunet-setup."
-#~ msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
+msgid "Show copyright information for gnunet-setup."
+msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
 
-#~ msgid "Not for English ;-)"
-#~ msgstr "Nils Durner and Christian Grothoff"
+#: src/setup/gtk/gnunet-setup.glade:1526
+#, fuzzy
+msgid "About gnunet-setup"
+msgstr "gnunet-update ausführen"
 
-#~ msgid "Start GNUnet-testbed helper."
-#~ msgstr "GNUnet-testbed Helfer starten."
+#: src/setup/gtk/gnunet-setup.glade:1531
+msgid "(C) 2001-2007 Christian Grothoff (and other contributing authors)"
+msgstr ""
 
-#~ msgid "Cannot connect to LOOPBACK port %d: %s\n"
-#~ msgstr "Verbindung zum LOOPBACK port %d schlug fehl: %s\n"
+#: src/setup/gtk/gnunet-setup.glade:1532
+#, fuzzy
+msgid "This is the configuration tool for GNUnet."
+msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#~ msgid "Could not execute `%s': %s\n"
-#~ msgstr "`%s' konnte nicht ausgeführt werden: %s\n"
+#: src/setup/gtk/gnunet-setup.glade:1535
+msgid ""
+"\t\t    GNU GENERAL PUBLIC LICENSE\n"
+"\t\t       Version 2, June 1991\n"
+"\n"
+" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
+"     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+" Everyone is permitted to copy and distribute verbatim copies\n"
+" of this license document, but changing it is not allowed.\n"
+"\n"
+"\t\t\t    Preamble\n"
+"\n"
+"  The licenses for most software are designed to take away your\n"
+"freedom to share and change it.  By contrast, the GNU General Public\n"
+"License is intended to guarantee your freedom to share and change free\n"
+"software--to make sure the software is free for all its users.  This\n"
+"General Public License applies to most of the Free Software\n"
+"Foundation's software and to any other program whose authors commit to\n"
+"using it.  (Some other Free Software Foundation software is covered by\n"
+"the GNU Library General Public License instead.)  You can apply it to\n"
+"your programs, too.\n"
+"\n"
+"  When we speak of free software, we are referring to freedom, not\n"
+"price.  Our General Public Licenses are designed to make sure that you\n"
+"have the freedom to distribute copies of free software (and charge for\n"
+"this service if you wish), that you receive source code or can get it\n"
+"if you want it, that you can change the software or use pieces of it\n"
+"in new free programs; and that you know you can do these things.\n"
+"\n"
+"  To protect your rights, we need to make restrictions that forbid\n"
+"anyone to deny you these rights or to ask you to surrender the rights.\n"
+"These restrictions translate to certain responsibilities for you if you\n"
+"distribute copies of the software, or if you modify it.\n"
+"\n"
+"  For example, if you distribute copies of such a program, whether\n"
+"gratis or for a fee, you must give the recipients all the rights that\n"
+"you have.  You must make sure that they, too, receive or can get the\n"
+"source code.  And you must show them these terms so they know their\n"
+"rights.\n"
+"\n"
+"  We protect your rights with two steps: (1) copyright the software, and\n"
+"(2) offer you this license which gives you legal permission to copy,\n"
+"distribute and/or modify the software.\n"
+"\n"
+"  Also, for each author's protection and ours, we want to make certain\n"
+"that everyone understands that there is no warranty for this free\n"
+"software.  If the software is modified by someone else and passed on, we\n"
+"want its recipients to know that what they have is not the original, so\n"
+"that any problems introduced by others will not reflect on the original\n"
+"authors' reputations.\n"
+"\n"
+"  Finally, any free program is threatened constantly by software\n"
+"patents.  We wish to avoid the danger that redistributors of a free\n"
+"program will individually obtain patent licenses, in effect making the\n"
+"program proprietary.  To prevent this, we have made it clear that any\n"
+"patent must be licensed for everyone's free use or not licensed at all.\n"
+"\n"
+"  The precise terms and conditions for copying, distribution and\n"
+"modification follow.\n"
+"\n"
+"\t\t    GNU GENERAL PUBLIC LICENSE\n"
+"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
+"\n"
+"  0. This License applies to any program or other work which contains\n"
+"a notice placed by the copyright holder saying it may be distributed\n"
+"under the terms of this General Public License.  The \"Program\", below,\n"
+"refers to any such program or work, and a \"work based on the Program\"\n"
+"means either the Program or any derivative work under copyright law:\n"
+"that is to say, a work containing the Program or a portion of it,\n"
+"either verbatim or with modifications and/or translated into another\n"
+"language.  (Hereinafter, translation is included without limitation in\n"
+"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
+"\n"
+"Activities other than copying, distribution and modification are not\n"
+"covered by this License; they are outside its scope.  The act of\n"
+"running the Program is not restricted, and the output from the Program\n"
+"is covered only if its contents constitute a work based on the\n"
+"Program (independent of having been made by running the Program).\n"
+"Whether that is true depends on what the Program does.\n"
+"\n"
+"  1. You may copy and distribute verbatim copies of the Program's\n"
+"source code as you receive it, in any medium, provided that you\n"
+"conspicuously and appropriately publish on each copy an appropriate\n"
+"copyright notice and disclaimer of warranty; keep intact all the\n"
+"notices that refer to this License and to the absence of any warranty;\n"
+"and give any other recipients of the Program a copy of this License\n"
+"along with the Program.\n"
+"\n"
+"You may charge a fee for the physical act of transferring a copy, and\n"
+"you may at your option offer warranty protection in exchange for a fee.\n"
+"\n"
+"  2. You may modify your copy or copies of the Program or any portion\n"
+"of it, thus forming a work based on the Program, and copy and\n"
+"distribute such modifications or work under the terms of Section 1\n"
+"above, provided that you also meet all of these conditions:\n"
+"\n"
+"    a) You must cause the modified files to carry prominent notices\n"
+"    stating that you changed the files and the date of any change.\n"
+"\n"
+"    b) You must cause any work that you distribute or publish, that in\n"
+"    whole or in part contains or is derived from the Program or any\n"
+"    part thereof, to be licensed as a whole at no charge to all third\n"
+"    parties under the terms of this License.\n"
+"\n"
+"    c) If the modified program normally reads commands interactively\n"
+"    when run, you must cause it, when started running for such\n"
+"    interactive use in the most ordinary way, to print or display an\n"
+"    announcement including an appropriate copyright notice and a\n"
+"    notice that there is no warranty (or else, saying that you provide\n"
+"    a warranty) and that users may redistribute the program under\n"
+"    these conditions, and telling the user how to view a copy of this\n"
+"    License.  (Exception: if the Program itself is interactive but\n"
+"    does not normally print such an announcement, your work based on\n"
+"    the Program is not required to print an announcement.)\n"
+"\n"
+"These requirements apply to the modified work as a whole.  If\n"
+"identifiable sections of that work are not derived from the Program,\n"
+"and can be reasonably considered independent and separate works in\n"
+"themselves, then this License, and its terms, do not apply to those\n"
+"sections when you distribute them as separate works.  But when you\n"
+"distribute the same sections as part of a whole which is a work based\n"
+"on the Program, the distribution of the whole must be on the terms of\n"
+"this License, whose permissions for other licensees extend to the\n"
+"entire whole, and thus to each and every part regardless of who wrote it.\n"
+"\n"
+"Thus, it is not the intent of this section to claim rights or contest\n"
+"your rights to work written entirely by you; rather, the intent is to\n"
+"exercise the right to control the distribution of derivative or\n"
+"collective works based on the Program.\n"
+"\n"
+"In addition, mere aggregation of another work not based on the Program\n"
+"with the Program (or with a work based on the Program) on a volume of\n"
+"a storage or distribution medium does not bring the other work under\n"
+"the scope of this License.\n"
+"\n"
+"  3. You may copy and distribute the Program (or a work based on it,\n"
+"under Section 2) in object code or executable form under the terms of\n"
+"Sections 1 and 2 above provided that you also do one of the following:\n"
+"\n"
+"    a) Accompany it with the complete corresponding machine-readable\n"
+"    source code, which must be distributed under the terms of Sections\n"
+"    1 and 2 above on a medium customarily used for software interchange; "
+"or,\n"
+"\n"
+"    b) Accompany it with a written offer, valid for at least three\n"
+"    years, to give any third party, for a charge no more than your\n"
+"    cost of physically performing source distribution, a complete\n"
+"    machine-readable copy of the corresponding source code, to be\n"
+"    distributed under the terms of Sections 1 and 2 above on a medium\n"
+"    customarily used for software interchange; or,\n"
+"\n"
+"    c) Accompany it with the information you received as to the offer\n"
+"    to distribute corresponding source code.  (This alternative is\n"
+"    allowed only for noncommercial distribution and only if you\n"
+"    received the program in object code or executable form with such\n"
+"    an offer, in accord with Subsection b above.)\n"
+"\n"
+"The source code for a work means the preferred form of the work for\n"
+"making modifications to it.  For an executable work, complete source\n"
+"code means all the source code for all modules it contains, plus any\n"
+"associated interface definition files, plus the scripts used to\n"
+"control compilation and installation of the executable.  However, as a\n"
+"special exception, the source code distributed need not include\n"
+"anything that is normally distributed (in either source or binary\n"
+"form) with the major components (compiler, kernel, and so on) of the\n"
+"operating system on which the executable runs, unless that component\n"
+"itself accompanies the executable.\n"
+"\n"
+"If distribution of executable or object code is made by offering\n"
+"access to copy from a designated place, then offering equivalent\n"
+"access to copy the source code from the same place counts as\n"
+"distribution of the source code, even though third parties are not\n"
+"compelled to copy the source along with the object code.\n"
+"\n"
+"  4. You may not copy, modify, sublicense, or distribute the Program\n"
+"except as expressly provided under this License.  Any attempt\n"
+"otherwise to copy, modify, sublicense or distribute the Program is\n"
+"void, and will automatically terminate your rights under this License.\n"
+"However, parties who have received copies, or rights, from you under\n"
+"this License will not have their licenses terminated so long as such\n"
+"parties remain in full compliance.\n"
+"\n"
+"  5. You are not required to accept this License, since you have not\n"
+"signed it.  However, nothing else grants you permission to modify or\n"
+"distribute the Program or its derivative works.  These actions are\n"
+"prohibited by law if you do not accept this License.  Therefore, by\n"
+"modifying or distributing the Program (or any work based on the\n"
+"Program), you indicate your acceptance of this License to do so, and\n"
+"all its terms and conditions for copying, distributing or modifying\n"
+"the Program or works based on it.\n"
+"\n"
+"  6. Each time you redistribute the Program (or any work based on the\n"
+"Program), the recipient automatically receives a license from the\n"
+"original licensor to copy, distribute or modify the Program subject to\n"
+"these terms and conditions.  You may not impose any further\n"
+"restrictions on the recipients' exercise of the rights granted herein.\n"
+"You are not responsible for enforcing compliance by third parties to\n"
+"this License.\n"
+"\n"
+"  7. If, as a consequence of a court judgment or allegation of patent\n"
+"infringement or for any other reason (not limited to patent issues),\n"
+"conditions are imposed on you (whether by court order, agreement or\n"
+"otherwise) that contradict the conditions of this License, they do not\n"
+"excuse you from the conditions of this License.  If you cannot\n"
+"distribute so as to satisfy simultaneously your obligations under this\n"
+"License and any other pertinent obligations, then as a consequence you\n"
+"may not distribute the Program at all.  For example, if a patent\n"
+"license would not permit royalty-free redistribution of the Program by\n"
+"all those who receive copies directly or indirectly through you, then\n"
+"the only way you could satisfy both it and this License would be to\n"
+"refrain entirely from distribution of the Program.\n"
+"\n"
+"If any portion of this section is held invalid or unenforceable under\n"
+"any particular circumstance, the balance of the section is intended to\n"
+"apply and the section as a whole is intended to apply in other\n"
+"circumstances.\n"
+"\n"
+"It is not the purpose of this section to induce you to infringe any\n"
+"patents or other property right claims or to contest validity of any\n"
+"such claims; this section has the sole purpose of protecting the\n"
+"integrity of the free software distribution system, which is\n"
+"implemented by public license practices.  Many people have made\n"
+"generous contributions to the wide range of software distributed\n"
+"through that system in reliance on consistent application of that\n"
+"system; it is up to the author/donor to decide if he or she is willing\n"
+"to distribute software through any other system and a licensee cannot\n"
+"impose that choice.\n"
+"\n"
+"This section is intended to make thoroughly clear what is believed to\n"
+"be a consequence of the rest of this License.\n"
+"\n"
+"  8. If the distribution and/or use of the Program is restricted in\n"
+"certain countries either by patents or by copyrighted interfaces, the\n"
+"original copyright holder who places the Program under this License\n"
+"may add an explicit geographical distribution limitation excluding\n"
+"those countries, so that distribution is permitted only in or among\n"
+"countries not thus excluded.  In such case, this License incorporates\n"
+"the limitation as if written in the body of this License.\n"
+"\n"
+"  9. The Free Software Foundation may publish revised and/or new versions\n"
+"of the General Public License from time to time.  Such new versions will\n"
+"be similar in spirit to the present version, but may differ in detail to\n"
+"address new problems or concerns.\n"
+"\n"
+"Each version is given a distinguishing version number.  If the Program\n"
+"specifies a version number of this License which applies to it and \"any\n"
+"later version\", you have the option of following the terms and conditions\n"
+"either of that version or of any later version published by the Free\n"
+"Software Foundation.  If the Program does not specify a version number of\n"
+"this License, you may choose any version ever published by the Free "
+"Software\n"
+"Foundation.\n"
+"\n"
+"  10. If you wish to incorporate parts of the Program into other free\n"
+"programs whose distribution conditions are different, write to the author\n"
+"to ask for permission.  For software which is copyrighted by the Free\n"
+"Software Foundation, write to the Free Software Foundation; we sometimes\n"
+"make exceptions for this.  Our decision will be guided by the two goals\n"
+"of preserving the free status of all derivatives of our free software and\n"
+"of promoting the sharing and reuse of software generally.\n"
+"\n"
+"\t\t\t    NO WARRANTY\n"
+"\n"
+"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
+"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
+"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
+"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
+"EXPRESSED\n"
+"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
+"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
+"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
+"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
+"REPAIR OR CORRECTION.\n"
+"\n"
+"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
+"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
+"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
+"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
+"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
+"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
+"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
+"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
+"POSSIBILITY OF SUCH DAMAGES.\n"
+"\n"
+"\t\t     END OF TERMS AND CONDITIONS\n"
+"\n"
+"\t    How to Apply These Terms to Your New Programs\n"
+"\n"
+"  If you develop a new program, and you want it to be of the greatest\n"
+"possible use to the public, the best way to achieve this is to make it\n"
+"free software which everyone can redistribute and change under these terms.\n"
+"\n"
+"  To do so, attach the following notices to the program.  It is safest\n"
+"to attach them to the start of each source file to most effectively\n"
+"convey the exclusion of warranty; and each file should have at least\n"
+"the \"copyright\" line and a pointer to where the full notice is found.\n"
+"\n"
+"    <one line to give the program's name and a brief idea of what it does.>\n"
+"    Copyright (C) <year>  <name of author>\n"
+"\n"
+"    This program is free software; you can redistribute it and/or modify\n"
+"    it under the terms of the GNU General Public License as published by\n"
+"    the Free Software Foundation; either version 2 of the License, or\n"
+"    (at your option) any later version.\n"
+"\n"
+"    This program is distributed in the hope that it will be useful,\n"
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"    GNU General Public License for more details.\n"
+"\n"
+"    You should have received a copy of the GNU General Public License\n"
+"    along with this program; if not, write to the Free Software\n"
+"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+"USA\n"
+"\n"
+"\n"
+"Also add information on how to contact you by electronic and paper mail.\n"
+"\n"
+"If the program is interactive, make it output a short notice like this\n"
+"when it starts in an interactive mode:\n"
+"\n"
+"    Gnomovision version 69, Copyright (C) year  name of author\n"
+"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
+"w'.\n"
+"    This is free software, and you are welcome to redistribute it\n"
+"    under certain conditions; type `show c' for details.\n"
+"\n"
+"The hypothetical commands `show w' and `show c' should show the appropriate\n"
+"parts of the General Public License.  Of course, the commands you use may\n"
+"be called something other than `show w' and `show c'; they could even be\n"
+"mouse-clicks or menu items--whatever suits your program.\n"
+"\n"
+"You should also get your employer (if you work as a programmer) or your\n"
+"school, if any, to sign a \"copyright disclaimer\" for the program, if\n"
+"necessary.  Here is a sample; alter the names:\n"
+"\n"
+"  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
+"  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
+"\n"
+"  <signature of Ty Coon>, 1 April 1989\n"
+"  Ty Coon, President of Vice\n"
+"\n"
+"This General Public License does not permit incorporating your program into\n"
+"proprietary programs.  If your program is a subroutine library, you may\n"
+"consider it more useful to permit linking proprietary applications with the\n"
+"library.  If this is what you want to do, use the GNU Library General\n"
+"Public License instead of this License.\n"
+msgstr ""
 
-#~ msgid "No client service started. Trying again in 30 seconds.\n"
-#~ msgstr "Kein Client Dienst gestartet. Erneuter Versuch in 30 Sekunden.\n"
+#: src/setup/gtk/gnunet-setup.glade:1917
+msgid "Not for English ;-)"
+msgstr "Nils Durner and Christian Grothoff"
 
 #~ msgid ""
-#~ "Error (%s) binding the TCP listener to port %d. No proxy service "
-#~ "started.\n"
-#~ "Trying again in %d seconds...\n"
+#~ "You must specify the name of a pipe for the SMTP transport in section `%"
+#~ "s' under `%s'.\n"
 #~ msgstr ""
-#~ "Fehler (%s) beim Binden des TCP Listeners an den Port %d. Der Proxy "
-#~ "Dienst wurde nicht gestartet.\n"
-#~ "Erneuter Versuch in %d Sekunden...\n"
+#~ "Für den SMTP Transport müssen Sie den Namen einer Pipe in Sektion `%s', "
+#~ "Eintrag `%s' eintragen.\n"
 
-#~ msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
-#~ msgstr "Unauthorisierte Verbindung von %u.%u.%u.%u. wurde abgewiesen.\n"
+#, fuzzy
+#~ msgid "Failed to initialize libesmtp: %s.\n"
+#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#~ msgid "Protocol violation on socket. Expected command.\n"
-#~ msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
+#~ msgid "Sending E-mail to `%s' failed.\n"
+#~ msgstr "Das Senden einer E-Mail an `%s' schlug fehl.\n"
 
-#~ msgid "Command `%s' not found!\n"
-#~ msgstr "Kommando `%s' wurde nicht gefunden!\n"
+#~ msgid "%.*s filter %s (SMTP)"
+#~ msgstr "%.*s filter %s (SMTP)"
 
-#~ msgid "Start GNUnet testbed controller."
-#~ msgstr "GNUnet testbed Controller starten."
-
-#~ msgid "Malformed entry in the configuration in section %s under %s: %s\n"
+#~ msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 #~ msgstr ""
-#~ "Beschädigter Eintrag in der Konfigurationsdatei in Sektion %s unter %s: %"
-#~ "s\n"
+#~ "MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
+#~ "implementiert!)\n"
 
-#~ msgid "Could not send acknowledgement back to client.\n"
-#~ msgstr "Bestätigung konnte nicht an Client zurück gesendet werden.\n"
+#, fuzzy
+#~ msgid "Network configuration: NAT"
+#~ msgstr "GNUnet Konfiguration"
 
-#~ msgid "Received unknown testbed message of type %u.\n"
-#~ msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
-
-#~ msgid "size of `%s' message is too short. Ignoring.\n"
-#~ msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
-
-#~ msgid "size of `%s' message is wrong. Ignoring.\n"
-#~ msgstr "Größe der `%s' Nachricht ist falsch. Nachricht wird ignoriert.\n"
-
-#~ msgid "TESTBED could not generate hello message for protocol %u\n"
+#~ msgid ""
+#~ "Is this machine behind NAT?\n"
+#~ "\n"
+#~ "If you are connected to the internet through another computer doing SNAT, "
+#~ "a router or a \"hardware firewall\" and other computers on the internet "
+#~ "cannot connect to this computer, say \"yes\" here. Answer \"no\" on "
+#~ "direct connections through modems, ISDN cards and DNAT (also known as "
+#~ "\"port forwarding\")."
 #~ msgstr ""
-#~ "Das TESTBED konnte keine Hello Nachricht für das Protokoll %u erzeugen\n"
+#~ "Ist diese Maschine hinter NAT?\n"
+#~ "\n"
+#~ "Wenn Sie mit dem Internet über einen anderen Computer per SNAT, einem "
+#~ "Router oder einer \"Hardware Firewall\" verbunden sind und andere "
+#~ "Computer im Internet keine Verbindung zu diesem Computer herstellen "
+#~ "können, so sagen Sie hier \"Ja\". Antworten Sie \"Nein\" bei direkten "
+#~ "Verbindungen über Modem, ISDN-Karten und DNAT (auch bekannt als \"Port "
+#~ "forwarding\")."
 
-#~ msgid "received invalid `%s' message\n"
-#~ msgstr "ungültige `%s' Nachricht empfangen\n"
-
-#~ msgid "received invalid `%s' message (empty module name)\n"
-#~ msgstr "ungültige `%s' Nachricht empfangen (leerer Modulname)\n"
-
-#~ msgid "loading module `%s' failed.  Notifying client.\n"
-#~ msgstr "das Laden von Modul `%s' schlug fehl. Client wird benachrichtigt.\n"
-
-#~ msgid "unloading module failed.  Notifying client.\n"
-#~ msgstr "das Entladen des Moduls schlug fehl. Client wird benachrichtigt.\n"
-
-#~ msgid "`%s' %s failed: %s\n"
-#~ msgstr "`%s' %s schlug fehl: %s\n"
-
-#~ msgid "received invalid `%s' message: %s.\n"
-#~ msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
-
-#~ msgid "'..' is not allowed in file name (%s).\n"
-#~ msgstr "'..' ist nicht erlaubt in einem Dateinamen (%s).\n"
-
-#~ msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
-#~ msgstr "Leerer Dateiname für UPLOAD_FILE Nachricht ist ungültig!\n"
-
-#~ msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
+#, fuzzy
+#~ msgid "Configuration of the logging system"
 #~ msgstr ""
-#~ "Dateiname für UPLOAD_FILE Nachricht ist nicht Null-terminiert "
-#~ "(ungültig!)\n"
+#~ "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
+#~ "ausführen!\n"
 
-#~ msgid "Upload refused!"
-#~ msgstr "Upload abgewiesen!"
+#, fuzzy
+#~ msgid "Run gnunetd as this user."
+#~ msgstr "gnunet-update ausführen"
 
-#~ msgid "Invalid message received at %s:%d."
-#~ msgstr "Ungültige Nachricht empfangen bei %s:%d."
+#, fuzzy
+#~ msgid "Run gnunetd during system startup?"
+#~ msgstr "gnunet-update ausführen"
 
-#~ msgid "received invalid testbed message of size %u\n"
-#~ msgstr "ungültige Testbed Nachricht der Größe %u empfangen\n"
+#, fuzzy
+#~ msgid "Path settings"
+#~ msgstr "Weitere Einstellungen"
 
-#~ msgid ""
-#~ "Received testbed message of type %u but unexpected size %u, expected %u\n"
-#~ msgstr ""
-#~ "Empfangene Testbed Nachricht des Typs %u hat die unerwartete Größe %u, es "
-#~ "wurde %u erwartet\n"
+#~ msgid "specify nickname"
+#~ msgstr "Spitznamen angeben"
 
-#~ msgid "No testbed URL given, not registered.\n"
-#~ msgstr ""
-#~ "Keine Testbed URL angegeben, es wurde keine Registrierung vorgenommen.\n"
+#~ msgid "Start GNUnet chat client."
+#~ msgstr "GNUnet chat client starten"
 
-#~ msgid "Could not resolve name of HTTP proxy `%s'.\n"
-#~ msgstr "Der Name des HTTP Proxies `%s' konnte nicht aufgelöst werden.\n"
+#~ msgid "Could not connect to gnunetd.\n"
+#~ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#~ msgid "Invalid URL `%s' (must begin with `%s')\n"
-#~ msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
-
-#~ msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
+#~ msgid "You must specify a nickname (use option `%s').\n"
 #~ msgstr ""
-#~ "Beschädigte HTTP URL: `%s' bei `%s'. Testbed-Client wurde nicht "
-#~ "registriert.\n"
+#~ "Sie müssen einen Spitznamen angeben (verwenden Sie die Option `%s').\n"
 
-#~ msgid "Could not register testbed, host `%s' unknown\n"
-#~ msgstr ""
-#~ "Testbed konnte nicht registriert werden, Host `%s' ist nicht bekannt.\n"
+#~ msgid "Could not send join message to gnunetd\n"
+#~ msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#~ msgid "Failed to send HTTP request to host `%s': %s\n"
-#~ msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
+#~ msgid "Could not send message to gnunetd\n"
+#~ msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#~ msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
-#~ msgstr "Fehler beim Senden der HTTP Anfrage `%s' an Host `%s': %s\n"
+#~ msgid "mysql datastore"
+#~ msgstr "mysql Datenspeicher"
 
-#~ msgid "Exit register (error: no http response read).\n"
-#~ msgstr "Abbruch der Registrierung (Fehler: keine HTTP Antwort gelesen).\n"
-
-#~ msgid "allows construction of a P2P-testbed (incomplete)"
-#~ msgstr "Ermöglicht die Konstruktion einer P2P-Testumgebung (inkomplett)"
-
-#~ msgid "Using %u messages of size %u for %u times.\n"
-#~ msgstr "Verwende %u Nachrichten der Größe %u %umal.\n"
-
-#~ msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
-#~ msgstr "Zeiten:   Max %16llu  Min %16llu  Mittel %12.3f  Varianz %12.3f\n"
-
-#~ msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
-#~ msgstr "Verloren:  Max %16u  Min %16u  Mittel %12.3f  Varianz %12.3f\n"
-
+#, fuzzy
 #~ msgid ""
-#~ "\n"
-#~ "Failed to receive reply from gnunetd.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Fehler beim Empfangen der Antwort von gnunetd.\n"
+#~ "`%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 "Running benchmark...\n"
-#~ msgstr "Benchmark läuft...\n"
+#~ msgid "Database failed to delete `%s'.\n"
+#~ msgstr "Die Datenbank konnte `%s' nicht löschen.\n"
 
 #, fuzzy
 #~ msgid "Error log:\n"
@@ -5730,11 +6424,6 @@
 #~ msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 #~ msgstr "Warte auf den Start von gnunetd (%u Iterationen verbleiben)...\n"
 
-#~ msgid "Waiting for peers to connect (%u iterations left)...\n"
-#~ msgstr ""
-#~ "Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
-#~ "verbleiben)...\n"
-
 #, fuzzy
 #~ msgid "Deleting expired content.  This may take a while.\n"
 #~ msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
@@ -6269,10 +6958,6 @@
 #~ "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein "
 #~ "Verzeichnis angeben, in dem FS Daten gespeichert werden.\n"
 
-#, fuzzy
-#~ msgid "Unable to initialize SQLite KVStore.\n"
-#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-
 #~ msgid ""
 #~ "Configuration file must specify a directory for GNUnet to store per-peer "
 #~ "data under %s\\%s.\n"
@@ -6720,9 +7405,6 @@
 #~ "IP(v6) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
 #~ "in der Konfigurationsdatei an.\n"
 
-#~ msgid "`%s' failed: %s\n"
-#~ msgstr "`%s' schlug fehl: %s\n"
-
 #~ msgid "Save _as"
 #~ msgstr "Speichern _unter"
 

Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po     2007-12-10 02:47:03 UTC (rev 5850)
+++ GNUnet/po/es.po     2007-12-10 03:20:09 UTC (rev 5851)
@@ -5,12 +5,12 @@
 # Miguel Angel Arruga Vivas <address@hidden> 2006 
 # 
 # 
-#: contrib/config-daemon.scm:555
+#: contrib/config-daemon.scm:584
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-09-29 16:48-0600\n"
+"POT-Creation-Date: 2007-12-09 19:48-0700\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -19,716 +19,1171 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/transports/ip6.c:75 src/util/network/io.c:85
+#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:541
+#: src/transports/http.c:1320 src/transports/http.c:1413
+#: src/transports/http.c:1588 src/transports/http.c:2014
+#: src/transports/http.c:2075 src/applications/bootstrap_http/http.c:123
+#: src/applications/bootstrap_http/http.c:257
+#: src/applications/bootstrap_http/http.c:274
+#: src/applications/bootstrap_http/http.c:306
+#: src/applications/bootstrap_http/http.c:325
+#: src/applications/bootstrap_http/http.c:338
+#: src/applications/bootstrap_http/http.c:348
+#: src/applications/bootstrap_http/http.c:358
+#, fuzzy, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+
+#: src/transports/upnp/upnp.c:431
+#, 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:476
 #, c-format
+msgid "upnp: NAT Returned IP: %s\n"
+msgstr ""
+
+#: src/transports/ip6.c:77 src/util/network/io.c:86
+#, 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:84 src/util/network/ip.c:146
+#: src/transports/ip6.c:109 src/util/network/ip.c:87 src/util/network/ip.c:151
 #, 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:135 src/util/network/ip.c:115
-#: src/util/network/ip.c:221
+#: src/transports/ip6.c:140 src/util/network/ip.c:118
+#: src/util/network/ip.c:237
 #, 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:167
+#: src/transports/ip6.c:174
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/transports/ip6.c:219 src/transports/ip.c:60
+#: src/transports/ip6.c:228 src/transports/ip.c:61
 #, 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:123 src/transports/udp.c:129
+#: src/transports/tcp6.c:249
+msgid "Could not determine my public IPv6 address.\n"
+msgstr "Imposible determinar mi dirección IPv6 pública.\n"
+
+#: src/transports/tcp6.c:317
 #, c-format
+msgid "`%s': unknown service: %s\n"
+msgstr "'%s': servicio desconocido: %s\n"
+
+#: src/transports/tcp6.c:420 src/transports/tcp.c:462
+#, c-format
+msgid "Failed to start transport service on port %d.\n"
+msgstr ""
+
+#: src/transports/tcp6.c:531
+#, fuzzy
+msgid "# bytes received via TCP6"
+msgstr "# bytes recibidos por TCP"
+
+#: src/transports/tcp6.c:532
+#, fuzzy
+msgid "# bytes sent via TCP6"
+msgstr "# bytes enviados por TCP"
+
+#: src/transports/tcp6.c:534
+#, fuzzy
+msgid "# bytes dropped by TCP6 (outgoing)"
+msgstr "# bytes omitidos por TCP (salientes)"
+
+#: src/transports/udp6.c:131 src/transports/udp.c:135
+#, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr ""
 
-#: src/transports/udp6.c:264
+#: src/transports/udp6.c:277
 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:471 src/transports/udp.c:520
+#: src/transports/udp6.c:495 src/transports/udp.c:544
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/udp6.c:476
+#: src/transports/udp6.c:501
 #, fuzzy
 msgid "# bytes received via UDP6"
 msgstr "# bytes recibidos vía UDP"
 
-#: src/transports/udp6.c:477
+#: src/transports/udp6.c:502
 #, fuzzy
 msgid "# bytes sent via UDP6"
 msgstr "# bytes enviados vía UDP"
 
-#: src/transports/udp6.c:479
+#: src/transports/udp6.c:504
 #, fuzzy
 msgid "# bytes dropped by UDP6 (outgoing)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/transports/udp6.c:481
+#: src/transports/udp6.c:506
 msgid "# UDP6 connections (right now)"
 msgstr ""
 
-#: src/transports/http.c:824
+#: src/transports/http.c:875
 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:1235 src/transports/http.c:1309
-#: src/transports/http.c:1464 src/transports/http.c:1858
-#: src/transports/http.c:1894 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:540 src/applications/bootstrap_http/http.c:122
-#: src/applications/bootstrap_http/http.c:254
-#: src/applications/bootstrap_http/http.c:270
-#: src/applications/bootstrap_http/http.c:301
-#: src/applications/bootstrap_http/http.c:320
-#: src/applications/bootstrap_http/http.c:333
-#: src/applications/bootstrap_http/http.c:343
-#: src/applications/bootstrap_http/http.c:353
-#, 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:2080
+#: src/transports/http.c:2290
 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:2089
+#: src/transports/http.c:2299
 msgid "# bytes received via HTTP"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/transports/http.c:2090
+#: src/transports/http.c:2300
 msgid "# bytes sent via HTTP"
 msgstr "# bytes mandados vía HTTP"
 
-#: src/transports/http.c:2092
+#: src/transports/http.c:2302
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "#bytes omitidos vía HTTP (salientes)"
 
-#: 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:358
+#: src/transports/smtp.c:362
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/transports/smtp.c:463
-msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
+#: src/transports/smtp.c:454
+msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transports/smtp.c:471
+#: src/transports/smtp.c:464
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transports/smtp.c:571
+#: src/transports/smtp.c:552 src/transports/smtp.c:563
+#: src/transports/smtp.c:577 src/transports/smtp.c:597
+#: src/transports/smtp.c:622 src/transports/smtp.c:631
+#: src/transports/smtp.c:645 src/transports/smtp.c:657
 #, fuzzy, c-format
-msgid "Failed to initialize libesmtp: %s.\n"
-msgstr "Imposible inicializar SQLite.\n"
+msgid "SMTP: `%s' failed: %s.\n"
+msgstr "'%s' %s falló: %s\n"
 
-#: 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:702
-#, c-format
-msgid "%.*s filter %s (SMTP)"
+#: src/transports/smtp.c:802
+msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transports/smtp.c:730
-#, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
-msgstr ""
+#: src/transports/smtp.c:815
+#, fuzzy
+msgid "# bytes received via SMTP"
+msgstr "# bytes recibidos por TCP"
 
-#: src/transports/tcp.c:290
+#: src/transports/smtp.c:816
 #, fuzzy
+msgid "# bytes sent via SMTP"
+msgstr "# bytes enviados por TCP"
+
+#: src/transports/smtp.c:818
+#, fuzzy
+msgid "# bytes dropped by SMTP (outgoing)"
+msgstr "# bytes omitidos por TCP (salientes)"
+
+#: src/transports/tcp_helper.c:260
+#, 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:279
+#, fuzzy
+msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+
+#: src/transports/tcp.c:296
+#, 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:389
+#: src/transports/tcp.c:401
 #, 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:442 src/transports/tcp6.c:404
-#, c-format
-msgid "Failed to start transport service on port %d.\n"
-msgstr ""
-
-#: src/transports/tcp.c:561
+#: src/transports/tcp.c:584
 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:570
+#: src/transports/tcp.c:593
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/tcp.c:571
+#: src/transports/tcp.c:594
 msgid "# bytes sent via TCP"
 msgstr "# bytes enviados por TCP"
 
-#: src/transports/tcp.c:573
+#: src/transports/tcp.c:596
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transports/udp.c:288
+#: src/transports/udp.c:301
 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:384
+#: src/transports/udp.c:400
 #, 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:535
+#: src/transports/udp.c:560
 msgid "# bytes received via UDP"
 msgstr "# bytes recibidos vía UDP"
 
-#: src/transports/udp.c:536
+#: src/transports/udp.c:561
 msgid "# bytes sent via UDP"
 msgstr "# bytes enviados vía UDP"
 
-#: src/transports/udp.c:538
+#: src/transports/udp.c:563
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/transports/udp.c:540
+#: src/transports/udp.c:565
 msgid "# UDP connections (right now)"
 msgstr ""
 
-#: 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/udp_helper.c:96
+#, fuzzy
+msgid "Received malformed message from udp-peer connection. Closing.\n"
+msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/transports/tcp6.c:312
-#, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "'%s': servicio desconocido: %s\n"
+#: src/setup/ncurses/mconf.c:86
+msgid "Exit"
+msgstr ""
 
-#: src/transports/tcp6.c:512
+#: src/setup/ncurses/mconf.c:89
+msgid "Up"
+msgstr "Arriba"
+
+#: src/setup/ncurses/mconf.c:92 src/setup/gtk/gnunet-setup.glade:136
+#: src/setup/gtk/gnunet-setup.glade:404 src/setup/gtk/gnunet-setup.glade:814
+#: src/setup/gtk/gnunet-setup.glade:1147 src/setup/gtk/gnunet-setup.glade:1431
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/setup/ncurses/mconf.c:183 src/setup/ncurses/mconf.c:288
+#: src/setup/ncurses/mconf.c:371 src/setup/ncurses/mconf.c:471
+#: src/setup/ncurses/wizard_curs.c:111 src/setup/ncurses/wizard_curs.c:176
+#: src/setup/ncurses/wizard_curs.c:292
+msgid "Internal error! (Choice invalid?)"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:219 src/setup/ncurses/mconf.c:418
+msgid "Internal error! (Value invalid?)"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:404
+msgid "Invalid input, expecting floating point value."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:450
+msgid "Invalid input, expecting integer."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:458
+msgid "Value is not in legal range."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:527
 #, fuzzy
-msgid "# bytes received via TCP6"
-msgstr "# bytes recibidos por TCP"
+msgid "GNUnet Configuration"
+msgstr "Configuración de GNUnet"
 
-#: src/transports/tcp6.c:513
+#: src/setup/ncurses/mconf.c:527 src/setup/text/conf.c:569
+#, 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/ncurses/mconf.c:533
 #, fuzzy
-msgid "# bytes sent via TCP6"
-msgstr "# bytes enviados por TCP"
+msgid "Do you wish to save your new configuration?"
+msgstr "¿Quieres guardar tu configuración?"
 
-#: src/transports/tcp6.c:515
+#: src/setup/ncurses/mconf.c:547
+#, fuzzy, c-format
+msgid ""
+"\n"
+"End of configuration.\n"
+msgstr " gconfig\tConfiguración GTK\n"
+
+#: src/setup/ncurses/mconf.c:552
+#, 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:65 src/setup/lib/wizard_util.c:140
+#: src/setup/lib/wizard_util.c:195
+msgid "Error"
+msgstr "Error"
+
+#: src/setup/ncurses/wizard_curs.c:73 src/setup/gtk/gconf.c:444
+msgid "Help"
+msgstr "Ayuda"
+
+#: src/setup/ncurses/wizard_curs.c:80
 #, fuzzy
-msgid "# bytes dropped by TCP6 (outgoing)"
-msgstr "# bytes omitidos por TCP (salientes)"
+msgid "Error!"
+msgstr "Error"
 
-#: src/transports/tcp_helper.c:257
+#: src/setup/ncurses/wizard_curs.c:94 src/applications/vpn/vpn.c:1454
+msgid "No"
+msgstr "No"
+
+#: src/setup/ncurses/wizard_curs.c:95 src/applications/vpn/vpn.c:1454
+msgid "Yes"
+msgstr "Sí"
+
+#: src/setup/ncurses/wizard_curs.c:143
 #, fuzzy
-msgid "Received malformed message instead of welcome message. Closing.\n"
-msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+msgid "Abort"
+msgstr "_Acerca de"
 
-#: src/transports/tcp_helper.c:276
+#: src/setup/ncurses/wizard_curs.c:144
 #, fuzzy
-msgid "Received malformed message from tcp-peer connection. Closing.\n"
-msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+msgid "Ok"
+msgstr "k"
 
-#: 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/setup/ncurses/wizard_curs.c:211 src/setup/ncurses/wizard_curs.c:277
+#: src/setup/ncurses/wizard_curs.c:418
+msgid "GNUnet configuration"
+msgstr "Configuración de GNUnet"
 
-#: src/transports/upnp/upnp.c:475
-#, c-format
-msgid "upnp: NAT Returned IP: %s\n"
+#: src/setup/ncurses/wizard_curs.c:213
+msgid ""
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org/\n";
+"and join our community at\n"
+"\thttp://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"the GNUnet team"
 msgstr ""
+"¡Bienvenido a GNUnet!\n"
+"\n"
+"Este asistente te preguntará unas cuestiones básicas para configurar "
+"GNUnet.\n"
+"\n"
+"Por favor, visita nuestra página en\n"
+"\thttp://gnunet.org/\n";
+"y únete a nuestra comunidad en \n"
+"\thttp://gnunet.org/drupal/\n";
+"\n"
+"Diviertete,\n"
+"\n"
+"el equipo de GNUnet"
 
-#: src/transports/udp_helper.c:96
+#: src/setup/ncurses/wizard_curs.c:279
+msgid ""
+"Choose the network interface that connects your computer to the internet "
+"from the list below."
+msgstr ""
+"Escoge la interfaz de red que conecta tu ordenador a Internet de la lista de "
+"abajo."
+
+#: src/setup/ncurses/wizard_curs.c:297 src/setup/ncurses/wizard_curs.c:311
+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 ""
+"La \"Interfaz de red\" es el dispositivo que conecta tu ordenador a "
+"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:308
 #, fuzzy
-msgid "Received malformed message from udp-peer connection. Closing.\n"
-msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+msgid "Network configuration: interface"
+msgstr "Interfaz de red:"
 
-#: src/applications/dht/tools/dht-query.c:55
+#: src/setup/ncurses/wizard_curs.c:310
+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:321
 #, fuzzy
-msgid "Query (get KEY, put KEY VALUE) DHT table."
-msgstr "Pregunta (coje KEY, pone KEY VALUE, borra KEY VALUE) a una tabla DHT."
+msgid "Network configuration: IP"
+msgstr "Configuración de GNUnet"
 
-#: src/applications/dht/tools/dht-query.c:60
+#: src/setup/ncurses/wizard_curs.c:323
 #, fuzzy
+msgid "What is this computer's public IP address or hostname?"
+msgstr ""
+"¿Cuál es es la dirección pública IP o el nombre del dominio de éste "
+"ordenador?\n"
+"\n"
+"En caso de duda, dejar este campo en blanco."
+
+#: src/setup/ncurses/wizard_curs.c:324
+#, 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:99
-#, c-format
-msgid "%s(%s) operation returned no results.\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If left empty, GNUnet will try to automatically detect the IP.\n"
+"You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
+"If in doubt, leave this empty."
 msgstr ""
+"Si tu proveedor siempre te asigna la misma dirección IP (una IP \"estática"
+"\") introducela en el campo \"Dirección IP\". Si tu dirección IP cambia pero "
+"hay un nombre de dominio que siempre apunta a tu dirección IP actual (\"DNS "
+"dinámica\"), puedes introducirlo allí también.\n"
+"En caso de duda deja el campo en blanco. GNUnet intentará determinar tu "
+"dirección IP"
 
-#: src/applications/dht/tools/dht-query.c:116
-#, fuzzy, c-format
-msgid "Issuing '%s(%s,%s)' command.\n"
-msgstr "'%s(%s, %s)' falló.\n"
+#: src/setup/ncurses/wizard_curs.c:339
+#, fuzzy
+msgid "Bandwidth configuration: upload"
+msgstr "Configuración de GNUnet"
 
-#: src/applications/dht/tools/dht-query.c:123
-#, c-format
-msgid "'%s(%s,%s)' succeeded\n"
-msgstr "'%s (%s, %s)' logrado satisfactoriamente\n"
+#: src/setup/ncurses/wizard_curs.c:341
+#, fuzzy
+msgid "How much upstream bandwidth (in bytes/s) may be used?"
+msgstr "¿Cuánta subida (Bytes/s) será usada por GNUnet?"
 
-#: src/applications/dht/tools/dht-query.c:127
-#, c-format
-msgid "'%s(%s,%s)' failed.\n"
-msgstr "'%s(%s, %s)' falló.\n"
+#: src/setup/ncurses/wizard_curs.c:342
+#, fuzzy
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
+"you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
+msgstr ""
+"Puedes limitar el uso de recursos de GNUnet aquí.\n"
+"\n"
+"La \"subida\" es el canal de datos a través del cual los datos son "
+"*mandados* a Internet. El límite, o bien es el total máximo para este "
+"ordenador, o bien el que se le permita usar a GNUnet. Puedes especificar "
+"este valor más tarde. Si tienes una tarifa plana puedes configurarlo a la "
+"máxima velocidad de tu conexión a Internet."
 
-#: src/applications/dht/tools/dht-query.c:151
-#, c-format
-msgid "Failed to connect to gnunetd.\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+#: src/setup/ncurses/wizard_curs.c:354
+#, fuzzy
+msgid "Bandwidth configuration: download"
+msgstr "Configuración de GNUnet"
 
-#: src/applications/dht/tools/dht-query.c:164
-#, c-format
-msgid "Command `%s' requires an argument (`%s').\n"
-msgstr "El comando '%s' requiere un argumento ('%s').\n"
+#: src/setup/ncurses/wizard_curs.c:356
+#, fuzzy
+msgid "How much downstream bandwidth (in bytes/s) may be used?"
+msgstr "¿Cuánta bajada (Bytes/s) será usada por GNUnet?"
 
-#: src/applications/dht/tools/dht-query.c:181
-#, c-format
-msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
-msgstr "El comando '%s' requiere dos argumentos ('%s' y '%s').\n"
+#: src/setup/ncurses/wizard_curs.c:357
+#, fuzzy
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
+"If you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
+msgstr ""
+"Puedes limitar el uso de recursos de GNUnet aquí.\n"
+"\n"
+"La \"bajada\" es el canal de datos a través del cuál los datos son "
+"*recibidos* de Internet. El límite, o bien es el total máximo de este "
+"ordenador, o bien el que se le permita usar a GNUnet. Puedes especificar "
+"este valor más tarde. Si tienes una tarifa plana puedes configurarlo a la "
+"máxima velocidad de tu conexión a Internet."
 
-#: src/applications/dht/tools/dht-query.c:192
-#, c-format
-msgid "Unsupported command `%s'.  Aborting.\n"
-msgstr "Comando inesperado '%s'.   Abortando.\n"
+#: src/setup/ncurses/wizard_curs.c:369
+#, fuzzy
+msgid "Quota configuration"
+msgstr "Configuración de GNUnet"
 
-#: src/applications/dht/module/table.c:716
-msgid "# dht connections"
+#: src/setup/ncurses/wizard_curs.c:370
+msgid "What is the maximum size of the datastore in MB?"
 msgstr ""
 
-#: src/applications/dht/module/table.c:718
+#: src/setup/ncurses/wizard_curs.c:371
 #, fuzzy
-msgid "# dht discovery messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid ""
+"The GNUnet datastore contains all content that GNUnet needs to store "
+"(indexed, inserted and migrated content)."
+msgstr ""
+"¿Cuál es el tamaño máximo de almacenamiento en MB?\n"
+"\n"
+"El almacenamiento de GNUnet contiene todos los datos que GNUnet genera "
+"(datos del índice, contenido insertado y migrado)."
 
-#: src/applications/dht/module/table.c:720
-msgid "# dht route host lookups performed"
+#: src/setup/ncurses/wizard_curs.c:383
+#, fuzzy
+msgid "Daemon configuration: user account"
+msgstr "Imposible crear la cuenta de usuario:"
+
+#: src/setup/ncurses/wizard_curs.c:384
+msgid "As which user should gnunetd be run?"
 msgstr ""
 
-#: src/applications/dht/module/table.c:722
+#: src/setup/ncurses/wizard_curs.c:386
 #, fuzzy
-msgid "# dht discovery messages sent"
-msgstr "# mensajes PONG encriptados recibidos"
+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"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the field empty to run GNUnet with system privileges.\n"
+msgstr ""
+"Define el usuario bajo el que correrán los servicios de GNUnet.\n"
+"\n"
+"Por razones de seguridad, es una buena idea dejar que la configuración cree "
+"una nueva cuenta de usuario bajo el cual el servicio de GNUnet es arrancado "
+"al iniciar el sistema.\n"
+"\n"
+"Por consiguiente, GNUnet no tiene la posibilidad de acceder a otros ficheros "
+"que no sean los que posee. Ésto incluye los ficheros que quieras publicar en "
+"GNUnet. Tendrás que garantizar que el usuario especificado aquí posea "
+"permisos de lectura.\n"
+"\n"
+"Deja los campos vacíos para arrancar GNUnet con privilegios de sistema.\n"
+"Usuario de GNUnet:"
 
-#: 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/setup/ncurses/wizard_curs.c:403
+msgid "Daemon configuration: group account"
+msgstr ""
 
-#: 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/setup/ncurses/wizard_curs.c:404
+msgid "As which group should gnunetd be run?"
+msgstr ""
 
-#: src/applications/dht/module/cs.c:251
-msgid "Enables efficient non-anonymous routing"
+#: src/setup/ncurses/wizard_curs.c:406
+#, fuzzy
+msgid ""
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
+"\n"
+"You can also specify a already existant group here.\n"
+"\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
 msgstr ""
+"Define el grupo bajo el que correrán los servicios de GNUnet aquí.\n"
+"\n"
+"Por razones de seguridad, es una buena idea dejar que la configuración cree "
+"un nuevo grupo para la cuenta de usuario creada.\n"
+"\n"
+"Puedes especificar un grupo ya existente aquí.\n"
+"\n"
+"Sólo los miembros de este grupo esta autorizados a arrancar y parar el "
+"servidor de GNUnet y tener acceso a los datos del servidor de GNUnet.\n"
+"\n"
+"Grupo de GNUnet:"
 
-#: src/applications/dht/module/routing.c:736
-msgid "# dht replies routed"
+#: src/setup/ncurses/wizard_curs.c:420
+msgid "Do you want to automatically launch GNUnet as a system service?"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:738
-msgid "# dht requests routed"
+#: src/setup/ncurses/wizard_curs.c:422
+#, fuzzy
+msgid ""
+"If you say \"yes\" here, the GNUnet background process will be automatically "
+"started when you turn on your computer. If you say \"no\" here, you have to "
+"launch GNUnet yourself each time you want to use it."
 msgstr ""
+"¿Quieres arrancar GNUnet como un servicio de sistema?\n"
+"n\n"
+"Si dices \"sí\" aquí, el proceso en segundo plano de GNUnet sera "
+"automáticamente arrancado cuando enciendas tu ordenador. Si dices \"no\" "
+"aquí, tendrás que ejecutar GNUnet tu mismo cada vez que quieras usarlo."
 
-#: src/applications/dht/module/routing.c:740
+#: src/setup/ncurses/wizard_curs.c:445 src/setup/gtk/wizard_gtk.c:415
+#, c-format
+msgid "Unable to save configuration file `%s':"
+msgstr "Imposible guardar el fichero de configuración '%s':"
+
+#: src/setup/ncurses/wizard_curs.c:464
 #, fuzzy
-msgid "# dht get requests received"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "Unable to create user account for daemon."
+msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/applications/dht/module/routing.c:742
+#: src/setup/ncurses/wizard_curs.c:471
+msgid "Unable to setup autostart for daemon."
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:486
 #, fuzzy
-msgid "# dht put requests received"
-msgstr "# bytes recibidos por TCP"
+msgid "Save configuration?"
+msgstr "Configuración de GNUnet"
 
-#: src/applications/dht/module/routing.c:744
+#: src/setup/ncurses/wizard_curs.c:487
 #, fuzzy
-msgid "# dht results received"
-msgstr "# bytes recibidos por TCP"
+msgid "Save configuration now?"
+msgstr "Configuración de GNUnet"
 
-#: 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/setup/ncurses/wizard_curs.c:531 src/setup/gtk/gnunet-setup.glade:723
+#: src/setup/gtk/gnunet-setup.glade:1056 src/setup/gtk/gnunet-setup.glade:1340
+msgid "Back"
+msgstr "Atrás"
 
-#: 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/setup/text/conf.c:79
+#, fuzzy
+msgid "yes"
+msgstr "Bytes"
 
-#: 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/setup/text/conf.c:80
+msgid "no"
+msgstr ""
 
-#: 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"
-
-#: src/applications/chat/chat.c:160
+#: src/setup/text/conf.c:106
 #, c-format
-msgid "Now %d of %d chat clients at this node.\n"
-msgstr "Ahora hay %d de %d clientes de chat en este nodo.\n"
+msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgstr ""
 
-#: 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/setup/text/conf.c:115
+msgid "\tPossible choices:\n"
+msgstr ""
 
-#: src/applications/chat/chat.c:219
-msgid "enables P2P-chat (incomplete)"
-msgstr "Activa el chat P2P (incompleto)"
+#: src/setup/text/conf.c:123
+msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:45
-msgid "Join a chat on GNUnet."
+#: src/setup/text/conf.c:125
+#, c-format
+msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:49
-msgid "set the nickname to use (requred)"
+#: src/setup/text/conf.c:143
+#, c-format
+msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:52
-msgid "set the chat room to join (requred)"
+#: src/setup/text/conf.c:147
+#, c-format
+msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: 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:144
+#: src/setup/text/conf.c:153
 #, c-format
-msgid "Failed to join the room\n"
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:160
+#: src/setup/text/conf.c:187
 #, fuzzy, c-format
-msgid "Failed to send message.\n"
-msgstr "Falló al entregar el mensaje '%s'.\n"
+msgid "Yes\n"
+msgstr "Sí"
 
-#: src/applications/advertising/advertising.c:193
+#: src/setup/text/conf.c:192
 #, 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"
+msgid "No\n"
+msgstr "No"
 
-#: src/applications/advertising/advertising.c:203
-#, fuzzy
-msgid "HELLO message has expiration too far in the future. Dropping.\n"
+#: src/setup/text/conf.c:195 src/setup/text/conf.c:236
+#: src/setup/text/conf.c:266 src/setup/text/conf.c:329
+#: src/setup/text/conf.c:387
+#, fuzzy, c-format
+msgid "Help\n"
+msgstr "Ayuda"
+
+#: src/setup/text/conf.c:198 src/setup/text/conf.c:213
+#: src/setup/text/conf.c:276 src/setup/text/conf.c:307
+#: src/setup/text/conf.c:365
+#, fuzzy, c-format
+msgid "Abort\n"
+msgstr "_Acerca de"
+
+#: src/setup/text/conf.c:354 src/setup/text/conf.c:416
+#, c-format
+msgid ""
+"\n"
+"Invalid entry, try again (use '?' for help): "
 msgstr ""
-"mensaje de saludo recibido inválido (tiempo superior al límite). Omitiendo.\n"
 
-#: src/applications/advertising/advertising.c:374
+#: src/setup/text/conf.c:422
+#, c-format
+msgid "Unknown kind %x (internal error).  Skipping option.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:484
+msgid "\tDescend? (y/n/?) "
+msgstr ""
+
+#: src/setup/text/conf.c:493
+msgid "Aborted.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:506
 #, fuzzy
-msgid "Could not send HELLO+PING, ping buffer full.\n"
-msgstr "Imposible mandar ahora saludos+PING, buffer del ping lleno.\n"
+msgid "Invalid entry.\n"
+msgstr "Argumento no válido: '%s'\n"
 
-#: src/applications/advertising/advertising.c:396
-msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
+#: src/setup/text/conf.c:524
+#, c-format
+msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:544
+#: src/setup/text/conf.c:556
 #, c-format
-msgid "Advertising my transport %d to selected peers.\n"
-msgstr "Anunciando mi transporte %d a los pares seleccionados.\n"
+msgid "You can always press ENTER to keep the current value.\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:553
+#: src/setup/text/conf.c:557
+#, c-format
+msgid "Use the '%s' key to abort.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:575
+#, c-format
 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"
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
+msgstr ""
 
-#: src/applications/advertising/advertising.c:817
-msgid "# Peer advertisements received"
-msgstr "# Anuncios de los pares recibidos"
+#: src/setup/text/conf.c:590
+#, 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/applications/advertising/advertising.c:820
-#, fuzzy
-msgid "# Peer advertisements of type NAT received"
-msgstr "# Anuncios de los pares recibidos"
+#: src/setup/text/conf.c:599
+#, fuzzy, c-format
+msgid "Configuration file `%s' written.\n"
+msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/applications/advertising/advertising.c:823
+#: src/setup/gtk/wizard_gtk.c:141
 #, fuzzy
-msgid "# Peer advertisements confirmed via PONG"
-msgstr "# Anuncios de los pares recibidos"
+msgid "(unknown connection)"
+msgstr "Conexión de red"
 
-#: src/applications/advertising/advertising.c:827
+#: src/setup/gtk/wizard_gtk.c:439
 #, fuzzy
-msgid "# Peer advertisements updating earlier HELLOs"
-msgstr "# Anuncios de los pares recibidos"
+msgid "Do you want to save the new configuration?"
+msgstr "¿Quieres guardar tu configuración?"
 
-#: src/applications/advertising/advertising.c:830
+#: src/setup/gtk/wizard_gtk.c:471
+msgid "Unable to create user account:"
+msgstr "Imposible crear la cuenta de usuario:"
+
+#: src/setup/gtk/wizard_gtk.c:479
+msgid "Unable to change startup process:"
+msgstr "Imposible cambiar el proceso de arranque:"
+
+#: src/setup/gtk/wizard_gtk.c:494
+msgid ""
+"Running gnunet-update failed.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
+"Finally, run gnunet-update manually."
+msgstr ""
+
+#: src/setup/gtk/ngconf.c:383 src/setup/gtk/gconf.c:492
 #, fuzzy
-msgid "# Peer advertisements discarded due to load"
-msgstr "# Anuncios de los pares recibidos"
+msgid "Configuration saved."
+msgstr "Configuración de GNUnet"
 
-#: src/applications/advertising/advertising.c:834
+#: src/setup/gtk/ngconf.c:393 src/setup/gtk/gconf.c:502
 #, fuzzy
-msgid "# Peer advertisements for unsupported transport"
-msgstr "# Anuncios de los pares recibidos"
+msgid "Failed to save configuration."
+msgstr "Imposible guardar la configuración"
 
-#: src/applications/advertising/advertising.c:838
+#: src/setup/gtk/ngconf.c:418 src/setup/gtk/gconf.c:528
 #, fuzzy
-msgid "# Peer advertisements not confirmed due to ping busy"
-msgstr "# Anuncios de los pares recibidos"
+msgid "Configuration changed. Save?"
+msgstr ""
+"La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/applications/advertising/advertising.c:842
+#: src/setup/gtk/ngconf.c:431 src/setup/gtk/gconf.c:541
 #, fuzzy
-msgid "# Peer advertisements not confirmed due to lack of self ad"
-msgstr "# Anuncios de los pares recibidos"
+msgid "Error saving configuration."
+msgstr "Imposible guardar la configuración"
 
-#: src/applications/advertising/advertising.c:846
+#: src/setup/gtk/gconf.c:389
 #, fuzzy
-msgid "# Peer advertisements not confirmed due to send error"
-msgstr "# Anuncios de los pares recibidos"
+msgid "Description"
+msgstr "Pregunta"
 
-#: src/applications/advertising/advertising.c:848
-msgid "# Self advertisments transmitted"
-msgstr "# Auto-anuncios transmitidos"
+#: src/setup/gtk/gconf.c:405
+msgid "Value"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:850
-msgid "# Foreign advertisements forwarded"
-msgstr "# Anuncios a extraños mandados"
+#: src/setup/gtk/gconf.c:429
+msgid "Default"
+msgstr ""
 
-#: 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/setup/gtk/gconf.c:458
+#, fuzzy
+msgid "Section"
+msgstr "Pregunta"
 
-#: src/applications/advertising/advertising.c:857
-#: src/applications/session/connect.c:913
+#: src/setup/gtk/gconf.c:469
+#, fuzzy
+msgid "Option"
+msgstr "_Opciones"
+
+#: src/setup/lib/tree.c:191
 #, 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:872
 msgid ""
-"ensures that this peer is known by other peers and discovers other peers"
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
-"Asegura que este par es conocido por otros pares y descubre otros pares"
 
-#: src/applications/topology_default/topology.c:467
-msgid "maintains GNUnet default mesh topology"
+#: src/setup/lib/gns.c:315
+#, fuzzy, c-format
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
 msgstr ""
+"La configuración debe especificar un directorio para los datos FS en la "
+"sección '%s' bajo'%s'.\n"
 
-#: src/applications/pingpong/pingpong.c:132
-#: src/applications/pingpong/pingpong.c:199
-#: src/applications/pingpong/pingpong.c:264
-#: 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/setup/lib/wizard_util.c:111
+msgid "Can't open Service Control Manager"
+msgstr "Imposible abrir el Service Control Manager"
 
-#: src/applications/pingpong/pingpong.c:143
-msgid "Received ping for another peer. Dropping.\n"
-msgstr "Recibido ping de otro par. Omitiendo.\n"
+#: src/setup/lib/wizard_util.c:117
+msgid "Can't create service"
+msgstr "Imposible crear el servicio"
 
-#: src/applications/pingpong/pingpong.c:209
-msgid "Received PING not destined for us!\n"
-msgstr "¡Recibido PING no destinado a nosotros!\n"
+#: src/setup/lib/wizard_util.c:121
+msgid "Error changing the permissions of the GNUnet directory"
+msgstr "Error cambiando los permisos del directorio de GNUnet"
 
-#: src/applications/pingpong/pingpong.c:303
-#: src/applications/pingpong/pingpong.c:365
+#: src/setup/lib/wizard_util.c:126
+msgid "Cannot write to the regisitry"
+msgstr "Imposible escribir en el registro"
+
+#: src/setup/lib/wizard_util.c:129
+msgid "Can't access the service"
+msgstr "Imposible acceder al servicio"
+
+#: src/setup/lib/wizard_util.c:132
+msgid "Can't delete the service"
+msgstr "Imposible borrar el servicio"
+
+#: src/setup/lib/wizard_util.c:135
+msgid "Unknown error"
+msgstr "Error desconocido"
+
+#: src/setup/lib/wizard_util.c:171
+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:175
+msgid "Error creating user"
+msgstr "Error creando usuario"
+
+#: src/setup/lib/wizard_util.c:179
+msgid "Error accessing local security policy"
+msgstr "Error accediendo a la política de seguridad local"
+
+#: src/setup/lib/wizard_util.c:184
+msgid "Error granting service right to user"
+msgstr "Error garantizando el servicio correcto al usuario"
+
+#: src/setup/lib/wizard_util.c:189
+msgid "Unknown error while creating a new user"
+msgstr "Error desconocido mientras se creaba un nuevo usuario"
+
+#: src/setup/gnunet-setup.c:64
+#, c-format
+msgid "Can only set one option per invocation.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:72
+#, c-format
 msgid ""
-"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
-"constant.\n"
+"Invalid synatx, argument to 'set' must have the format SECTION:"
+"OPTION=VALUE.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:409
-msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
+#: src/setup/gnunet-setup.c:86
+#, c-format
+msgid "Can only display one option per invocation.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:499
-msgid "# encrypted PONG messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/setup/gnunet-setup.c:93
+#, c-format
+msgid ""
+"Invalid synatx, argument to 'get' must have the format SECTION:OPTION.\n"
+msgstr ""
 
-#: src/applications/pingpong/pingpong.c:501
-msgid "# plaintext PONG messages received"
+#: src/setup/gnunet-setup.c:107
+msgid "generate configuration for gnunetd, the GNUnet daemon"
+msgstr "genera configuración para gnunetd, el demonio de GNUnet"
+
+#: src/setup/gnunet-setup.c:110 src/server/gnunet-update.c:265
+#, fuzzy
+msgid "print a value from the configuration file to stdout"
+msgstr "Imposible guardar el fichero de configuración '%s':"
+
+#: src/setup/gnunet-setup.c:112
+msgid "Tool to setup GNUnet."
+msgstr "Herramienta de configuración de GNUnet."
+
+#: src/setup/gnunet-setup.c:114
+#, fuzzy
+msgid "update a value in the configuration file"
+msgstr "Imposible guardar el fichero de configuración '%s':"
+
+#: src/setup/gnunet-setup.c:257
+#, fuzzy, c-format
+msgid "Too many arguments.\n"
+msgstr "Argumentos en la linea de comandos inválidos.\n"
+
+#: src/setup/gnunet-setup.c:263
+msgid "No interface specified, using default\n"
+msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
+
+#: src/setup/gnunet-setup.c:340
+#, fuzzy, c-format
+msgid "Undefined option.\n"
+msgstr "Otras configuraciones"
+
+#: src/setup/gnunet-setup.c:391
+#, c-format
+msgid "`%s' is not available."
+msgstr "'%s' no esta disponible."
+
+#: src/setup/gnunet-setup.c:409
+#, c-format
+msgid "Unknown operation `%s'\n"
+msgstr "Operación desconocida '%s'\n"
+
+#: src/setup/gnunet-setup.c:410 src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:517 src/util/getopt/getopt.c:1072
+#, c-format
+msgid "Use --help to get a list of options.\n"
+msgstr "Usar --help para obtener una lista de opciones.\n"
+
+#: src/setup/gnunet-win-tool.c:52
+msgid "list all network adapters"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:503
-msgid "# encrypted PING messages received"
+#: src/setup/gnunet-win-tool.c:55
+msgid "install GNUnet as Windows service"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:505
-msgid "# PING messages created"
+#: src/setup/gnunet-win-tool.c:58
+msgid "uninstall GNUnet service"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:507
-#: src/applications/session/connect.c:908
-msgid "# encrypted PONG messages sent"
+#: src/setup/gnunet-win-tool.c:61
+msgid "increase the maximum number of TCP/IP connections"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:511
-#: src/applications/session/connect.c:906
-msgid "# encrypted PING messages sent"
+#: src/setup/gnunet-win-tool.c:64
+msgid "display a file's hash value"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:513
+#: src/setup/gnunet-win-tool.c:123
+#, c-format
+msgid "GNUnet service installed successfully.\n"
+msgstr "Servicio de GNUnet instalado satisfactoriamente.\n"
+
+#: src/setup/gnunet-win-tool.c:126 src/setup/gnunet-win-tool.c:154
+#, 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:130 src/setup/gnunet-win-tool.c:158
+#, 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:135
+#, c-format
+msgid "Error: can't create service: %s\n"
+msgstr "Error: imposible crear el servicio: %s\n"
+
+#: src/setup/gnunet-win-tool.c:138 src/setup/gnunet-win-tool.c:170
+#, c-format
+msgid "Unknown error.\n"
+msgstr "Error desconocido.\n"
+
+#: src/setup/gnunet-win-tool.c:151
+#, c-format
+msgid "Service deleted.\n"
+msgstr "Servicio eliminado.\n"
+
+#: src/setup/gnunet-win-tool.c:163
+#, c-format
+msgid "Error: can't access service: %s\n"
+msgstr "Error: imposible acceder al servicio: %s\n"
+
+#: src/setup/gnunet-win-tool.c:167
+#, c-format
+msgid "Error: can't delete service: %s\n"
+msgstr "Error: imposible borrar el servicio: %s\n"
+
+#: src/applications/dht/tools/dhttest.c:43
+#: src/applications/dht/tools/dhttest2.c:43
+#: src/applications/dht/module/table.c:734
+msgid "# dht connections"
+msgstr ""
+
+#: src/applications/dht/tools/dht-query.c:52
 #, fuzzy
-msgid "# plaintext PONG messages sent"
-msgstr "# mensajes de texto mandados por PING"
+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/pingpong/pingpong.c:517
+#: src/applications/dht/tools/dht-query.c:57
 #, fuzzy
-msgid "# plaintext PONG transmissions failed"
-msgstr "# mensajes de texto mandados por PING"
+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/pingpong/pingpong.c:526
+#: src/applications/dht/tools/dht-query.c:96
 #, c-format
-msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
-msgstr "'%s' registrando manejadores %d %d (texto plano e hipertexto)\n"
+msgid "%s(%s) operation returned no results.\n"
+msgstr ""
 
-#: 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:470
-#: src/applications/sqstore_mysql/mysql.c:480
-#: src/applications/sqstore_mysql/mysql.c:518
-#: src/applications/sqstore_mysql/mysql.c:528
-#: src/applications/sqstore_mysql/mysql.c:560
-#: src/applications/sqstore_mysql/mysql.c:571
-#: src/applications/sqstore_mysql/mysql.c:669
-#: src/applications/sqstore_mysql/mysql.c:681
-#: src/applications/sqstore_mysql/mysql.c:693
-#: src/applications/sqstore_mysql/mysql.c:707
-#: src/applications/sqstore_mysql/mysql.c:804
-#: src/applications/sqstore_mysql/mysql.c:818
-#: src/applications/sqstore_mysql/mysql.c:968
-#: src/applications/sqstore_mysql/mysql.c:980
-#: src/applications/sqstore_mysql/mysql.c:992
-#: src/applications/sqstore_mysql/mysql.c:1232
-#: src/applications/sqstore_mysql/mysql.c:1244
-#: src/applications/sqstore_mysql/mysql.c:1256
-#: src/applications/sqstore_mysql/mysql.c:1341
-#: src/applications/kvstore_sqlite/kv_sqlite.c:44
-#: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:99
-#: src/applications/dstore/dstore.c:195 src/applications/dstore/dstore.c:234
-#: src/applications/dstore/dstore.c:253 src/applications/dstore/dstore.c:308
-#: src/applications/dstore/dstore.c:326 src/applications/dstore/dstore.c:337
-#: src/applications/dstore/dstore.c:368 src/applications/dstore/dstore.c:459
-#: 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
+#: src/applications/dht/tools/dht-query.c:113
+#, fuzzy, c-format
+msgid "Issuing '%s(%s,%s)' command.\n"
+msgstr "'%s(%s, %s)' falló.\n"
+
+#: src/applications/dht/tools/dht-query.c:120
 #, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "'%s' falló en %s: %d con el error: %s\n"
+msgid "'%s(%s,%s)' succeeded\n"
+msgstr "'%s (%s, %s)' logrado satisfactoriamente\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:193
-#, fuzzy, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "Imposible inicializar SQLite.\n"
+#: src/applications/dht/tools/dht-query.c:124
+#, c-format
+msgid "'%s(%s,%s)' failed.\n"
+msgstr "'%s(%s, %s)' falló.\n"
 
-#: 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/dht/tools/dht-query.c:148
+#, c-format
+msgid "Failed to connect to gnunetd.\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:394
-#: src/applications/sqstore_sqlite/sqlite.c:431
-msgid "sqlite datastore"
-msgstr "base de datos sqlite"
+#: src/applications/dht/tools/dht-query.c:161
+#, c-format
+msgid "Command `%s' requires an argument (`%s').\n"
+msgstr "El comando '%s' requiere un argumento ('%s').\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:430
+#: src/applications/dht/tools/dht-query.c:178
 #, 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"
+msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
+msgstr "El comando '%s' requiere dos argumentos ('%s' y '%s').\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1276
-#: src/applications/sqstore_mysql/mysql.c:1449
-msgid "# bytes in datastore"
-msgstr "# bytes en la base de datos"
+#: src/applications/dht/tools/dht-query.c:189
+#, c-format
+msgid "Unsupported command `%s'.  Aborting.\n"
+msgstr "Comando inesperado '%s'.   Abortando.\n"
 
-#: src/applications/session/connect.c:256
-#: src/applications/session/connect.c:272
+#: src/applications/dht/module/cs.c:135
 #, 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"
+msgid "`%s' failed. Terminating connection to client.\n"
+msgstr "'%s' falló. Finalizando conexión con el cleinte.\n"
 
-#: src/applications/session/connect.c:313
+#: src/applications/dht/module/cs.c:242
 #, fuzzy, c-format
-msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
-msgstr "¡Imposible encriptar la clave de sesión, otro par desconocido!\n"
+msgid "`%s' registering client handlers: %d %d\n"
+msgstr "'%s' registrando un manejador de clientes %d\n"
 
-#: src/applications/session/connect.c:492
+#: src/applications/dht/module/cs.c:261
+msgid "Enables efficient non-anonymous routing"
+msgstr ""
+
+#: src/applications/dht/module/routing.c:747
+msgid "# dht replies routed"
+msgstr ""
+
+#: src/applications/dht/module/routing.c:749
+msgid "# dht requests routed"
+msgstr ""
+
+#: src/applications/dht/module/routing.c:751
 #, fuzzy
-msgid "Could not create any HELLO for myself!\n"
-msgstr "¡Imposible crear la clave local!\n"
+msgid "# dht get requests received"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: 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/dht/module/routing.c:753
+#, fuzzy
+msgid "# dht put requests received"
+msgstr "# bytes recibidos por TCP"
 
-#: src/applications/session/connect.c:624
+#: src/applications/dht/module/routing.c:755
+#, fuzzy
+msgid "# dht results received"
+msgstr "# bytes recibidos por TCP"
+
+#: src/applications/dht/module/routing.c:759
 #, 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"
+msgid "`%s' registering p2p handlers: %d %d %d\n"
+msgstr "'%s' registrando manejadores %d %d %d\n"
 
-#: src/applications/session/connect.c:656
+#: src/applications/dht/module/table.c:736
+#, fuzzy
+msgid "# dht discovery messages received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/applications/dht/module/table.c:738
+msgid "# dht route host lookups performed"
+msgstr ""
+
+#: src/applications/dht/module/table.c:740
+#, fuzzy
+msgid "# dht discovery messages sent"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/applications/topology_default/topology.c:545
 #, c-format
-msgid "Invalid `%s' message received from peer `%s'.\n"
-msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
+msgid "Failed to read friends list from `%s'\n"
+msgstr ""
 
-#: src/applications/session/connect.c:666
+#: src/applications/topology_default/topology.c:562
+msgid "Syntax error in topology specification, skipping bytes.\n"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:576
 #, c-format
-msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
+msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
-"el cambio de clave '%s' de '%s' falló al comprobar el CRC (dio: %u, esperado "
-"%u).\n"
 
-#: src/applications/session/connect.c:729
-#, fuzzy, c-format
+#: src/applications/topology_default/topology.c:588
 msgid ""
-"Error parsing encrypted session key from `%s', given message part size is "
-"invalid.\n"
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
 msgstr ""
-"Error pasando la clave de sesión encriptada, el mensaje dado del tamaño de "
-"las partes es inválido.\n"
 
-#: src/applications/session/connect.c:741
-#, 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/topology_default/topology.c:596
+msgid ""
+"More friendly connections required than target total number of connections.\n"
+msgstr ""
 
-#: src/applications/session/connect.c:898
-msgid "# session keys sent"
-msgstr "# claves de la sesión mandadas"
+#: src/applications/topology_default/topology.c:703
+msgid "maintains GNUnet default mesh topology"
+msgstr ""
 
-#: src/applications/session/connect.c:900
-msgid "# session keys rejected"
-msgstr "# claves de la sesión rechazadas"
-
-#: src/applications/session/connect.c:902
-msgid "# session keys accepted"
-msgstr "# claves de la sesión aceptadas"
-
-#: src/applications/session/connect.c:904
-msgid "# sessions established"
-msgstr "# sesiones establecidas"
-
-#: src/applications/rpc/rpc.c:134 src/applications/rpc/rpc.c:175
+#: src/applications/rpc/rpc.c:136 src/applications/rpc/rpc.c:181
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
@@ -737,7 +1192,7 @@
 "%s::%s - RPC %s:%p no pudo ser registrada: otro evento está actualmente "
 "usando este nombre (%p)\n"
 
-#: src/applications/rpc/rpc.c:218 src/applications/rpc/rpc.c:265
+#: src/applications/rpc/rpc.c:228 src/applications/rpc/rpc.c:281
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
@@ -746,743 +1201,506 @@
 "%s::%s - RPC %s:%p no pudo ser desregistrada: otro evento está actualmente "
 "registrado con este nombre (%p)\n"
 
-#: src/applications/rpc/rpc.c:237
+#: src/applications/rpc/rpc.c:250
 #, 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:285
+#: src/applications/rpc/rpc.c:303
 #, 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:909 src/applications/rpc/rpc.c:1043
-#: src/applications/rpc/rpc.c:1129
+#: src/applications/rpc/rpc.c:945 src/applications/rpc/rpc.c:1084
+#: src/applications/rpc/rpc.c:1174
 #, 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:975
+#: src/applications/rpc/rpc.c:1015
 #, 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:1307
+#: src/applications/rpc/rpc.c:1363
 #, 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:1421
+#: src/applications/rpc/rpc.c:1482
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "No fue desregistrada RPC: %s:%p\n"
 
-#: src/applications/rpc/rpc.c:1450
+#: src/applications/rpc/rpc.c:1511
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "'%s' registrando manejadores %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1466
+#: src/applications/rpc/rpc.c:1529
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/applications/rpc/rpc.c:1524
+#: src/applications/rpc/rpc.c:1592
 msgid "RPC async reply invalid.\n"
 msgstr "RPC respuesta asíncrona no válida.\n"
 
-#: src/applications/rpc/rpc.c:1592
+#: src/applications/rpc/rpc.c:1663
 msgid "async RPC reply not received.\n"
 msgstr "respuesta RPC asíncrona no recibida.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:421
-#, 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:1359
-#, fuzzy, c-format
-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:1471
-#: src/applications/sqstore_mysql/mysql.c:1618
+#: src/applications/datastore/datastore.c:170
+#: src/applications/datastore/datastore.c:184
 #, 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:1496
-#: src/applications/sqstore_mysql/mysql.c:1641
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
-msgstr ""
-"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: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:368
+#: src/applications/datastore/datastore.c:423
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:370
+#: src/applications/datastore/datastore.c:425
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:373
+#: src/applications/datastore/datastore.c:428
 #, fuzzy
 msgid "# bytes allowed in datastore"
 msgstr "# bytes en la base de datos"
 
-#: src/applications/datastore/datastore.c:388
+#: src/applications/datastore/datastore.c:445
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:513
+#: src/applications/datastore/datastore.c:586
 #, fuzzy
 msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr "Imposible guardar la configuración"
 
-#: 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/fragmentation/fragmentation.c:578
+msgid "# messages defragmented"
+msgstr "# mensajes defragmentados"
 
-#: src/applications/identity/hostkey.c:143
-#, c-format
-msgid ""
-"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
-msgstr ""
-"Se produjo un fallo al comprobar la clave local existente en el fichero '%"
-"s', creando nueva clave local.\n"
+#: src/applications/fragmentation/fragmentation.c:580
+msgid "# messages fragmented"
+msgstr "# mensajes fragmentados"
 
-#: 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/fragmentation/fragmentation.c:581
+msgid "# fragments discarded"
+msgstr "# fragmentos descartados"
 
-#: src/applications/identity/hostkey.c:162
-msgid "Done creating hostkey.\n"
-msgstr "Correcto al crear la clave local.\n"
-
-#: src/applications/identity/identity.c:345
+#: src/applications/fragmentation/fragmentation.c:592
 #, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
-"Eliminando.\n"
+msgid "`%s' registering handler %d\n"
+msgstr "'%s' registrando manejador %d\n"
 
-#: src/applications/identity/identity.c:358
-#, fuzzy, c-format
-msgid ""
-"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
+#: src/applications/vpn/gnunet-vpn.c:51
+#: src/applications/stats/gnunet-stats.c:83
+msgid "Print statistics about GNUnet operations."
+msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
+
+#: src/applications/vpn/gnunet-vpn.c:55
+msgid "Suppress display of asynchronous log messages"
 msgstr ""
-"El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
-"Eliminando.\n"
 
-#: 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/vpn/gnunet-vpn.c:149
+#: src/applications/stats/gnunet-stats.c:121
+#: src/applications/tbench/gnunet-tbench.c:126
+#: src/applications/tracekit/gnunet-tracekit.c:325
+#: src/applications/template/gnunet-template.c:95
+#, c-format
+msgid "Error establishing connection with gnunetd.\n"
+msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
 
-#: 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:776
+#: src/applications/vpn/vpn.c:368
 #, 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"
+msgid "Not storing route to myself from peer %d\n"
+msgstr ""
 
-#: 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:894
-#: src/applications/identity/identity.c:1014
+#: src/applications/vpn/vpn.c:379
 #, c-format
-msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
+msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/identity/identity.c:1017
+#: src/applications/vpn/vpn.c:412
 #, c-format
-msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
+msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:190
+#: src/applications/vpn/vpn.c:468
 #, c-format
-msgid ""
-"Converting peer address to string failed, transport type %d not supported\n"
+msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:244
+#: src/applications/vpn/vpn.c:475
 #, c-format
-msgid "Transport connection attempt failed, transport type %d not supported\n"
+msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:297
+#: src/applications/vpn/vpn.c:491
 #, c-format
-msgid ""
-"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
+msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:373
+#: src/applications/vpn/vpn.c:563
 #, c-format
-msgid "Transmission attempt failed, transport type %d unknown.\n"
+msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:494
+#: src/applications/vpn/vpn.c:569
 #, c-format
-msgid "No transport of type %d known.\n"
+msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/transport/transport.c:553
-msgid "No transport succeeded in creating a hello!\n"
+#: src/applications/vpn/vpn.c:606
+#, c-format
+msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: 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: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:781
+#: src/applications/vpn/vpn.c:621
 #, c-format
-msgid "Transport library `%s' did not provide required function '%s%s'.\n"
+msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
-"La biblioteca de transporte '%s' no provee la función '%s%s' requerida.\n"
 
-#: 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:819
+#: src/applications/vpn/vpn.c:631
 #, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Yo soy el par '%s'.\n"
+msgid "Configured tunnel name to %s\n"
+msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:575
-msgid "# messages defragmented"
-msgstr "# mensajes defragmentados"
-
-#: src/applications/fragmentation/fragmentation.c:577
-msgid "# messages fragmented"
-msgstr "# mensajes fragmentados"
-
-#: src/applications/fragmentation/fragmentation.c:578
-msgid "# fragments discarded"
-msgstr "# fragmentos descartados"
-
-#: src/applications/fragmentation/fragmentation.c:588
+#: src/applications/vpn/vpn.c:673
 #, c-format
-msgid "`%s' registering handler %d\n"
-msgstr "'%s' registrando manejador %d\n"
+msgid "Cannot get socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:62
+#: src/applications/vpn/vpn.c:683
 #, c-format
-msgid "Supported peer-to-peer messages:\n"
-msgstr "Mensajes P2P soportados:\n"
+msgid "Cannot set socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:65
+#: src/applications/vpn/vpn.c:693
 #, c-format
-msgid "Supported client-server messages:\n"
-msgstr "Mensajes cliente-servidor soportados:\n"
+msgid "Cannot set MTU for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:84
-#: src/applications/vpn/gnunet-vpn.c:53
-msgid "Print statistics about GNUnet operations."
-msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
-
-#: src/applications/stats/gnunet-stats.c:88
-msgid "prints supported protocol messages"
-msgstr "imprime los mensajes del protocolo"
-
-#: 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:149
+#: src/applications/vpn/vpn.c:701
 #, c-format
-msgid "Error establishing connection with gnunetd.\n"
-msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
+msgid "Cannot get interface index for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:134
+#: src/applications/vpn/vpn.c:715
 #, 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:330
-msgid "Uptime (seconds)"
+msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:223
+#: src/applications/vpn/vpn.c:730
 #, fuzzy, c-format
-msgid "% of allowed network load (up)"
-msgstr "% de red permitida para la subida"
+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/stats/statistics.c:225
-#, fuzzy, c-format
-msgid "% of allowed network load (down)"
-msgstr "% de red permitida para bajada"
+#: src/applications/vpn/vpn.c:746
+#, c-format
+msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:226
+#: src/applications/vpn/vpn.c:760
 #, fuzzy, c-format
-msgid "% of allowed cpu load"
-msgstr "% de CPU permitida para el uso"
+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/stats/statistics.c:227
-#, fuzzy, c-format
-msgid "% of allowed io load"
-msgstr "% de CPU permitida para el uso"
-
-#: src/applications/stats/statistics.c:228
-msgid "# of connected peers"
-msgstr "# de pares conectados"
-
-#: src/applications/stats/statistics.c:230
-msgid "# bytes of noise received"
-msgstr "# bytes de ruido recibidos"
-
-#: 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:421
-msgid "keeps statistics about gnunetd's operation"
+#: src/applications/vpn/vpn.c:803
+msgid ""
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:150
-msgid "# Any-Blocks"
+#: src/applications/vpn/vpn.c:853
+#, c-format
+msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:151
-msgid "# DBlocks"
+#: src/applications/vpn/vpn.c:932
+#, c-format
+msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:152
-msgid "# SBlocks"
+#: src/applications/vpn/vpn.c:941
+#, c-format
+msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:153
-msgid "# KBlocks"
+#: src/applications/vpn/vpn.c:961
+msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:154
-msgid "# NBlocks"
+#: src/applications/vpn/vpn.c:1010
+msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:155
-msgid "# KNBlocks"
+#: src/applications/vpn/vpn.c:1018
+msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:156
-msgid "# OnDemand-Blocks"
+#: src/applications/vpn/vpn.c:1027
+msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:157
-msgid "# Unknown-Blocks"
+#: src/applications/vpn/vpn.c:1032
+#, c-format
+msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:158
-msgid "# expired"
+#: src/applications/vpn/vpn.c:1043
+#, c-format
+msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:159
-msgid "# expire in 1h"
+#: src/applications/vpn/vpn.c:1071
+msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:160
-msgid "# expire in 24h"
+#: src/applications/vpn/vpn.c:1092
+msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:161
-msgid "# expire in 1 week"
+#: src/applications/vpn/vpn.c:1099
+#, c-format
+msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:162
-msgid "# expire in 1 month"
+#: src/applications/vpn/vpn.c:1117
+#, c-format
+msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:163
-msgid "# zero priority"
+#: src/applications/vpn/vpn.c:1123
+#, c-format
+msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:164
-msgid "# priority one"
+#: src/applications/vpn/vpn.c:1140
+msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:165
-msgid "# priority larger than one"
+#: src/applications/vpn/vpn.c:1146
+msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:166
-msgid "# no anonymity"
+#: src/applications/vpn/vpn.c:1152
+#, c-format
+msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:167
-msgid "# anonymity one"
-msgstr ""
-
-#: 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:55
-msgid "Start GNUnet transport benchmarking tool."
-msgstr ""
-
-#: src/applications/tbench/gnunet-tbench.c:66
-msgid "output in gnuplot format"
-msgstr "salida en formato de gnuplot"
-
-#: src/applications/tbench/gnunet-tbench.c:70
-msgid "number of iterations"
-msgstr "número de repeticiones"
-
-#: src/applications/tbench/gnunet-tbench.c:74
-msgid "number of messages to use per iteration"
-msgstr "número de mensajes a usar por iteración"
-
-#: src/applications/tbench/gnunet-tbench.c:77
-msgid "receiver host identifier (ENC file name)"
-msgstr ""
-
-#: src/applications/tbench/gnunet-tbench.c:80
-msgid "message size"
-msgstr "tamaño del mensaje"
-
-#: src/applications/tbench/gnunet-tbench.c:83
-msgid "sleep for SPACE ms after each a message block"
-msgstr "duerme durante SPACE ms después de cada bloque de mensajes"
-
-#: src/applications/tbench/gnunet-tbench.c:86
-msgid "time to wait for the completion of an iteration (in ms)"
-msgstr "tiempo para esperar hasta completar una iteración (en ms)"
-
-#: src/applications/tbench/gnunet-tbench.c:91
-msgid "number of messages in a message block"
-msgstr "número de mensajes en un bloque de mensajes"
-
-#: src/applications/tbench/gnunet-tbench.c:143
+#: src/applications/vpn/vpn.c:1173
 #, c-format
-msgid "You must specify a receiver!\n"
-msgstr "¡Debes especificar un receptor!\n"
-
-#: src/applications/tbench/gnunet-tbench.c:152
-#, c-format
-msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
+msgid "Request level %d from peer %d\n"
 msgstr ""
-"ID del par receptor especificada no válida ('%s' no es un nombre válido).\n"
 
-#: src/applications/tbench/gnunet-tbench.c:187
+#: src/applications/vpn/vpn.c:1191
 #, c-format
-msgid "Time:\n"
-msgstr "Tiempo:\n"
-
-#: src/applications/tbench/gnunet-tbench.c:188
-#, c-format
-msgid "\tmax      %llums\n"
-msgstr "\tmax      %llums\n"
-
-#: src/applications/tbench/gnunet-tbench.c:189
-#, c-format
-msgid "\tmin      %llums\n"
-msgstr "\tmin      %llums\n"
-
-#: 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:191
-#, c-format
-msgid "\tvariance %8.4fms\n"
-msgstr "\tvariance %8.4fms\n"
-
-#: src/applications/tbench/gnunet-tbench.c:193
-#, c-format
-msgid "Loss:\n"
-msgstr "Perdido:\n"
-
-#: src/applications/tbench/gnunet-tbench.c:194
-#, c-format
-msgid "\tmax      %u\n"
-msgstr "\tmax      %u\n"
-
-#: src/applications/tbench/gnunet-tbench.c:195
-#, c-format
-msgid "\tmin      %u\n"
-msgstr "\tmin      %u\n"
-
-#: 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:197
-#, c-format
-msgid "\tvariance %8.4f\n"
-msgstr "\tvariance %8.4f\n"
-
-#: 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:209
-#, c-format
-msgid ""
-"\n"
-"Did not receive the message from gnunetd. Is gnunetd running?\n"
+msgid "Receive table limit on peer reached %d\n"
 msgstr ""
-"\n"
-"No se recibió el mensaje de gnunetd. ¿Está gnunetd ejecutandose?\n"
 
-#: src/applications/tbench/tbench.c:412
-msgid "allows profiling of direct peer-to-peer connections"
+#: src/applications/vpn/vpn.c:1223
+msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:48
-msgid "probe network to the given DEPTH"
+#: src/applications/vpn/vpn.c:1244
+msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:52
-msgid ""
-"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+#: src/applications/vpn/vpn.c:1296
+msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:59
-msgid "use PRIO for the priority of the trace request"
+#: src/applications/vpn/vpn.c:1350
+msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:63
-msgid "wait DELAY seconds for replies"
+#: src/applications/vpn/vpn.c:1383
+msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:111
+#: src/applications/vpn/vpn.c:1723
+#, 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:1728
 #, c-format
-msgid ""
-"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
-"vcg.\n"
+msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: 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"
+#: src/applications/vpn/vpn.c:1817
+#, fuzzy
+msgid "enables IPv6 over GNUnet (incomplete)"
+msgstr "Activa el chat P2P (incompleto)"
 
-#: src/applications/tracekit/gnunet-tracekit.c:197
-#, c-format
-msgid "`%s' connected to `%s'.\n"
-msgstr "'%s' conectado a '%s'.\n"
-
-#: src/applications/tracekit/gnunet-tracekit.c:210
-#, c-format
-msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
+#: src/applications/vpn/vpn.c:1851
+msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:236
-#, c-format
-msgid "Peer `%s' did not report back.\n"
+#: src/applications/vpn/vpn.c:1866
+msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:336
-msgid "Could not send request to gnunetd.\n"
-msgstr ""
-
-#: src/applications/tracekit/tracekit.c:72
-#: src/applications/tracekit/tracekit.c:206
+#: src/applications/vpn/vpn.c:1884
 #, c-format
-msgid "Received invalid `%s' message from `%s'.\n"
+msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:269
-msgid "TRACEKIT: routing table full, trace request dropped\n"
+#: src/applications/gap/pid_table.c:177
+msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:346
-#, c-format
-msgid "TRACEKIT: received invalid `%s' message\n"
+#: src/applications/gap/pid_table.c:181
+msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:443
-msgid "allows mapping of the network topology"
-msgstr ""
-
-#: src/applications/gap/gap.c:1695
+#: src/applications/gap/gap.c:1723
 #, 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:1696
+#: src/applications/gap/gap.c:1724
 msgid "myself"
 msgstr "yo"
 
-#: src/applications/gap/gap.c:1883
+#: src/applications/gap/gap.c:1916
 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:1892 src/applications/fs/module/anonymity.c:65
+#: src/applications/gap/gap.c:1927 src/applications/fs/module/anonymity.c:66
 msgid "Failed to get traffic stats.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/applications/gap/gap.c:1902 src/applications/gap/gap.c:1910
-#: src/applications/gap/gap.c:1921
+#: src/applications/gap/gap.c:1938 src/applications/gap/gap.c:1947
+#: src/applications/gap/gap.c:1959
 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:2183
+#: src/applications/gap/gap.c:2231
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2234
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2188
+#: src/applications/gap/gap.c:2236
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2190
+#: src/applications/gap/gap.c:2238
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2194
+#: src/applications/gap/gap.c:2242
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2197
+#: src/applications/gap/gap.c:2245
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2199
+#: src/applications/gap/gap.c:2247
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2202
+#: src/applications/gap/gap.c:2250
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2206
+#: src/applications/gap/gap.c:2254
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2208
+#: src/applications/gap/gap.c:2256
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2211
+#: src/applications/gap/gap.c:2259
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2262
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2216
+#: src/applications/gap/gap.c:2264
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2218
+#: src/applications/gap/gap.c:2266
 msgid "# gap spurious replies (dropped)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2220
+#: src/applications/gap/gap.c:2268
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2223
+#: src/applications/gap/gap.c:2271
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2227
+#: src/applications/gap/gap.c:2275
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2229
+#: src/applications/gap/gap.c:2277
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2231
+#: src/applications/gap/gap.c:2279
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2246
+#: src/applications/gap/gap.c:2295
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2269
+#: src/applications/gap/gap.c:2319
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "'%s' registrando manejadores %d %d\n"
 
-#: src/applications/gap/pid_table.c:177
-msgid "# distinct interned peer IDs in pid table"
-msgstr ""
-
-#: src/applications/gap/pid_table.c:181
-msgid "# total RC of interned peer IDs in pid table"
-msgstr ""
-
-#: 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: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-pseudonym.c:70
 #: src/applications/fs/tools/gnunet-insert.c:268
-#: src/applications/fs/tools/gnunet-search.c:135
+#: src/applications/fs/tools/gnunet-search.c:136
 #: 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"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:74
+#: src/applications/fs/tools/gnunet-pseudonym.c:73
 msgid "automate creation of a namespace by starting a collection"
 msgstr "creación automática de un espacio al empezar una colección"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:78
+#: src/applications/fs/tools/gnunet-pseudonym.c:77
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "crea un nuevo pseudónimo bajo el APODO dado"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:81
+#: src/applications/fs/tools/gnunet-pseudonym.c:80
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "borra el pseudónimo con el APODO dado"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:84
+#: src/applications/fs/tools/gnunet-pseudonym.c:83
 msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 "finaliza la construcción automática de un espacio (finaliza la recolección)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:86
+#: src/applications/fs/tools/gnunet-pseudonym.c:85
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
 msgstr ""
 "Crea nuevos pseudónimos, borra pseudónimos o lista los pseudónimos "
 "existentes."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:90
+#: src/applications/fs/tools/gnunet-pseudonym.c:89
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
@@ -1490,13 +1708,13 @@
 "usa la clave dada para anunciar el espacio (úsalo cuando crees un nuevo "
 "pseudónimo)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:93
+#: src/applications/fs/tools/gnunet-pseudonym.c:92
 #, 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:97
+#: src/applications/fs/tools/gnunet-pseudonym.c:96
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
@@ -1504,11 +1722,11 @@
 "no genera un anuncio para este espacio (úsalo cuando crees un nuevo "
 "pseudónimo)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:100
+#: src/applications/fs/tools/gnunet-pseudonym.c:99
 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:104
+#: src/applications/fs/tools/gnunet-pseudonym.c:103
 msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
@@ -1516,71 +1734,71 @@
 "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:107
+#: src/applications/fs/tools/gnunet-pseudonym.c:106
 msgid "set the rating of a namespace"
 msgstr "cambia la valoración de un espacio"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:140
+#: src/applications/fs/tools/gnunet-pseudonym.c:139
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "El espacio '%s' ha sido valorado con un %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:142
+#: src/applications/fs/tools/gnunet-pseudonym.c:141
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr "El espacio '%s' (%s) ha sido valorado con un %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:171
+#: src/applications/fs/tools/gnunet-pseudonym.c:170
 #, 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:204
+#: src/applications/fs/tools/gnunet-pseudonym.c:203
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Colección detenida.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:206
+#: src/applications/fs/tools/gnunet-pseudonym.c:205
 #, 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:214
+#: src/applications/fs/tools/gnunet-pseudonym.c:213
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:219
+#: src/applications/fs/tools/gnunet-pseudonym.c:218
 #, 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:234
+#: src/applications/fs/tools/gnunet-pseudonym.c:233
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:238
+#: src/applications/fs/tools/gnunet-pseudonym.c:237
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:279
+#: src/applications/fs/tools/gnunet-pseudonym.c:280
 #, 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:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:287
 #, 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:301
+#: src/applications/fs/tools/gnunet-pseudonym.c:302
 #, 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:309
+#: src/applications/fs/tools/gnunet-pseudonym.c:310
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
@@ -1590,40 +1808,40 @@
 msgid "==> Directory `%s':\n"
 msgstr "==> Directorio '%s':\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:87
+#: src/applications/fs/tools/gnunet-directory.c:88
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr "=\tError leyendo el directorio.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:114
+#: src/applications/fs/tools/gnunet-directory.c:118
 #, 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:116
+#: src/applications/fs/tools/gnunet-directory.c:120
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr "%d ficheros encontrados en el directorio.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:131
+#: src/applications/fs/tools/gnunet-directory.c:135
 msgid "Perform directory related operations."
 msgstr "Realiza operaciones respecto al directorio."
 
-#: src/applications/fs/tools/gnunet-directory.c:134
+#: src/applications/fs/tools/gnunet-directory.c:138
 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:138
+#: src/applications/fs/tools/gnunet-directory.c:142
 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:141
+#: src/applications/fs/tools/gnunet-directory.c:145
 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:164
+#: src/applications/fs/tools/gnunet-directory.c:168
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "%d entradas encontradas.\n"
@@ -1809,43 +2027,43 @@
 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:418
+#: src/applications/fs/tools/gnunet-insert.c:420
 #, 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:437
+#: src/applications/fs/tools/gnunet-insert.c:440
 #, 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:464
-#: src/applications/fs/tools/gnunet-insert.c:472
-#: src/applications/fs/tools/gnunet-insert.c:480
+#: src/applications/fs/tools/gnunet-insert.c:451
+#: src/applications/fs/tools/gnunet-insert.c:459
+#: src/applications/fs/tools/gnunet-insert.c:467
+#: src/applications/fs/tools/gnunet-insert.c:475
+#: src/applications/fs/tools/gnunet-insert.c:483
 #, 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:138
+#: src/applications/fs/tools/gnunet-search.c:139
 msgid "Search GNUnet for files."
 msgstr "Buscar GNUnet en busca de ficheros."
 
-#: src/applications/fs/tools/gnunet-search.c:142
+#: src/applications/fs/tools/gnunet-search.c:143
 msgid "exit after receiving LIMIT results"
 msgstr "sale después de recibir LIMIT resultados"
 
-#: src/applications/fs/tools/gnunet-search.c:145
+#: src/applications/fs/tools/gnunet-search.c:146
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "escribe los resultados encontrados (desencriptados) a FILENAME"
 
-#: src/applications/fs/tools/gnunet-search.c:148
+#: src/applications/fs/tools/gnunet-search.c:149
 #, 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:183
+#: src/applications/fs/tools/gnunet-search.c:186
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
@@ -1896,46 +2114,46 @@
 "Descarga del fichero '%s' completada. La velocidad media fue %8.3fkilobytes "
 "por segundo.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:178
+#: src/applications/fs/tools/gnunet-download.c:180
 msgid "no name given"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:184
+#: src/applications/fs/tools/gnunet-download.c:186
 #, fuzzy, c-format
 msgid "Starting download `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:225
+#: src/applications/fs/tools/gnunet-download.c:228
 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:242
+#: src/applications/fs/tools/gnunet-download.c:246
 #, 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:279
+#: src/applications/fs/tools/gnunet-download.c:289
 #, 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:320
+#: src/applications/fs/tools/gnunet-download.c:331
 #, 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:338
+#: src/applications/fs/tools/gnunet-download.c:351
 #, fuzzy, c-format
 msgid "Downloading %d files from directory `%s'.\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/applications/fs/tools/gnunet-download.c:341
+#: src/applications/fs/tools/gnunet-download.c:354
 #, 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:377
+#: src/applications/fs/tools/gnunet-download.c:391
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Fichero almacenado en '%s'.\n"
@@ -1949,7 +2167,7 @@
 "%16llu de %16llu bytes desindexados (estimados %llu segundos para "
 "completar)          "
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:73
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1959,7 +2177,7 @@
 "El desindexado de '%s' se completó, %llu bytes tomaron %llu segundos (%8.3f "
 "kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:85
+#: src/applications/fs/tools/gnunet-unindex.c:88
 #, c-format
 msgid ""
 "\n"
@@ -1968,36 +2186,49 @@
 "\n"
 "Error desindexando el fichero: %s\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:105
+#: src/applications/fs/tools/gnunet-unindex.c:108
 msgid "Unindex files."
 msgstr "Desindexar los ficheros."
 
-#: src/applications/fs/tools/gnunet-unindex.c:142
+#: src/applications/fs/tools/gnunet-unindex.c:145
 #, 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:158
+#: src/applications/fs/tools/gnunet-unindex.c:163
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s' falló.  ¿Es '%s' un fichero?\n"
 
-#: src/applications/fs/module/querymanager.c:228
+#: src/applications/fs/uritrack/file_info.c:134
+msgid "Collecting file identifiers disabled.\n"
+msgstr "Recolección de identificadores de fichero desactivada.\n"
+
+#: src/applications/fs/uritrack/file_info.c:414
+#, c-format
+msgid "Deleted corrupt URI database in `%s'."
+msgstr "Borrada base de datos de URIs corrupta en '%s'."
+
+#: src/applications/fs/module/dht_push.c:138
+msgid "# blocks pushed into DHT"
+msgstr ""
+
+#: src/applications/fs/module/querymanager.c:234
 msgid "# FS currently tracked queries from clients"
 msgstr ""
 
-#: src/applications/fs/module/querymanager.c:230
+#: src/applications/fs/module/querymanager.c:236
 msgid "# FS replies passed to clients"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:323
+#: src/applications/fs/module/ondemand.c:330
 #, 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:418
+#: src/applications/fs/module/ondemand.c:431
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2008,7 +2239,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:444
+#: src/applications/fs/module/ondemand.c:457
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2017,18 +2248,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:495
+#: src/applications/fs/module/ondemand.c:514
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:647
+#: src/applications/fs/module/ondemand.c:668
 #, 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:1170
+#: src/applications/fs/module/fs.c:1204
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2037,86 +2268,93 @@
 "Debes especificar un número positivo para '%s' en la configuración en la "
 "sección '%s'.\n"
 
-#: src/applications/fs/module/fs.c:1185
+#: src/applications/fs/module/fs.c:1219
 msgid "# FS expired replies dropped"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1187
+#: src/applications/fs/module/fs.c:1221
 #, fuzzy
 msgid "# FS valid replies received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/applications/fs/module/fs.c:1220
+#: src/applications/fs/module/fs.c:1257
 #, 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:1266
+#: src/applications/fs/module/fs.c:1314
 msgid "enables (anonymous) file-sharing"
 msgstr "activa la compartición de ficheros anónima"
 
-#: src/applications/fs/module/migration.c:374
+#: src/applications/fs/module/migration.c:381
 msgid "# blocks migrated"
 msgstr "# blocks migrados"
 
-#: src/applications/fs/module/migration.c:376
+#: src/applications/fs/module/migration.c:383
 #, fuzzy
 msgid "# blocks fetched for migration"
 msgstr "# blocks migrados"
 
-#: src/applications/fs/module/migration.c:379
+#: src/applications/fs/module/migration.c:386
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/module/dht_push.c:138
-msgid "# blocks pushed into DHT"
+#: src/applications/fs/fsui/deserialize.c:772
+#, c-format
+msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
+"Fichero del estado de FSUI '%s' tiene un error de sintáxis en la asignación %"
+"u.\n"
 
-#: src/applications/fs/fsui/search.c:234
+#: src/applications/fs/fsui/searchtest.c:154
+#: src/applications/fs/fsui/fsuitest.c:173
+#: src/applications/fs/fsui/downloadtest.c:289
+#: src/applications/fs/fsui/serializetest2.c:391
+#: src/applications/fs/fsui/serializetest3.c:163
+#: src/applications/fs/fsui/serializetest4.c:358
+#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
+#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
+msgid "AND"
+msgstr "Y"
+
+#: src/applications/fs/fsui/search.c:241
 #, 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:294
+#: src/applications/fs/fsui/download.c:311
 #, fuzzy
 msgid "Download failed (no reason given)"
 msgstr "La descarga del ERCS falló (vea los logs)."
 
-#: src/applications/fs/fsui/unindex.c:109
+#: src/applications/fs/fsui/unindex.c:114
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:278
+#: src/applications/fs/fsui/upload.c:328
 #, 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: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:168
 msgid "CHK URI not allowed for search.\n"
 msgstr "CHK URI no autorizado para buscar.\n"
 
-#: src/applications/fs/ecrs/search.c:214
+#: src/applications/fs/ecrs/search.c:217
 msgid "LOC URI not allowed for search.\n"
 msgstr "LOC URI no autorizado para buscar.\n"
 
-#: src/applications/fs/ecrs/download.c:131
+#: src/applications/fs/ecrs/download.c:132
 #, 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:271
+#: src/applications/fs/ecrs/download.c:272
 #, 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:1001
+#: src/applications/fs/ecrs/download.c:1010
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2124,7 +2362,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:1184
+#: src/applications/fs/ecrs/download.c:1205
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -2132,91 +2370,86 @@
 "El contenido '%s' parece no estar disponible en la red (intentado %u "
 "veces).\n"
 
-#: src/applications/fs/ecrs/upload.c:155
+#: src/applications/fs/ecrs/helper.c:75
+msgid "No keywords specified!\n"
+msgstr "¡Ninguna clave especificada!\n"
+
+#: src/applications/fs/ecrs/upload.c:156
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "'%s' no es un fichero.\n"
 
-#: src/applications/fs/ecrs/upload.c:162
+#: src/applications/fs/ecrs/upload.c:164
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Imposible determinar el tamaño del fichero '%s'"
 
-#: src/applications/fs/ecrs/upload.c:171
+#: src/applications/fs/ecrs/upload.c:173
 msgid "Failed to connect to gnunetd."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/applications/fs/ecrs/upload.c:183
+#: src/applications/fs/ecrs/upload.c:185
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Imposible hallar el hash de '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:202
+#: src/applications/fs/ecrs/upload.c:204
 #, 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:209
+#: src/applications/fs/ecrs/upload.c:212
 #, 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:223
+#: src/applications/fs/ecrs/upload.c:226
 #, 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:296
+#: src/applications/fs/ecrs/upload.c:309
 #, 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:876
+#: src/applications/fs/ecrs/meta.c:883
 #, 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:884
+#: src/applications/fs/ecrs/meta.c:893
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "Imposible renombrar el fichero '%s' a '%s': el fichero ya existe\n"
 
-#: src/applications/fs/ecrs/namespace.c:154
+#: src/applications/fs/ecrs/namespace.c:157
 #, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Imposible crear el pseudónimo '%s', el fichero '%s' ya existe.\n"
 
-#: src/applications/fs/ecrs/namespace.c:325
-#: src/applications/fs/ecrs/namespace.c:404
-#: src/applications/fs/ecrs/namespace.c:545
+#: src/applications/fs/ecrs/namespace.c:339
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:571
 #, 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:337
-#: src/applications/fs/ecrs/namespace.c:415
+#: src/applications/fs/ecrs/namespace.c:352
+#: src/applications/fs/ecrs/namespace.c:432
 #, 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:556
-#: src/applications/fs/ecrs/namespace.c:567
+#: src/applications/fs/ecrs/namespace.c:583
+#: src/applications/fs/ecrs/namespace.c:594
 #, 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:74
-msgid "No keywords specified!\n"
-msgstr "¡Ninguna clave especificada!\n"
-
-#: 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:120
+#: src/applications/fs/ecrs/parser.c:124
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2225,20 +2458,11 @@
 "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:126
-msgid "Collecting file identifiers disabled.\n"
-msgstr "Recolección de identificadores de fichero desactivada.\n"
-
-#: 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:655
+#: src/applications/fs/namespace/namespace_info.c:685
 msgid "Publication interval for periodic publication changed."
 msgstr "Intervalo de publicación periódica cambiado."
 
-#: src/applications/fs/namespace/namespace_info.c:675
+#: src/applications/fs/namespace/namespace_info.c:708
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -2246,472 +2470,1267 @@
 "publicaciones actualizadas para contenido actualizado periódicamente más de "
 "una semana antes de la tarea planificada.\n"
 
-#: src/applications/topology_f2f/topology.c:373
+#: src/applications/testing/testing.c:247
+#, fuzzy, c-format
+msgid "Waiting for peers to connect"
+msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
+
+#: src/applications/kvstore_sqlite/kv_sqlite.c:44
+#: src/applications/kvstore_sqlite/kv_sqlite.c:51
+#: 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:476
+#: src/applications/sqstore_mysql/mysql.c:487
+#: src/applications/sqstore_mysql/mysql.c:526
+#: src/applications/sqstore_mysql/mysql.c:537
+#: src/applications/sqstore_mysql/mysql.c:571
+#: src/applications/sqstore_mysql/mysql.c:582
+#: src/applications/sqstore_mysql/mysql.c:680
+#: src/applications/sqstore_mysql/mysql.c:693
+#: src/applications/sqstore_mysql/mysql.c:706
+#: src/applications/sqstore_mysql/mysql.c:721
+#: src/applications/sqstore_mysql/mysql.c:821
+#: src/applications/sqstore_mysql/mysql.c:836
+#: src/applications/sqstore_mysql/mysql.c:988
+#: src/applications/sqstore_mysql/mysql.c:1000
+#: src/applications/sqstore_mysql/mysql.c:1012
+#: src/applications/sqstore_mysql/mysql.c:1260
+#: src/applications/sqstore_mysql/mysql.c:1272
+#: src/applications/sqstore_mysql/mysql.c:1284
+#: src/applications/sqstore_mysql/mysql.c:1369
+#: src/applications/kvstore_mysql/kv_mysql.c:44
+#: src/applications/kvstore_mysql/kv_mysql.c:51
+#: src/applications/dstore_mysql/dstore_mysql.c:107
+#: src/applications/dstore_mysql/dstore_mysql.c:114
+#: src/applications/dstore_mysql/dstore_mysql.c:286
+#: src/applications/dstore_mysql/dstore_mysql.c:301
+#: src/applications/dstore_mysql/dstore_mysql.c:315
+#: src/applications/dstore_mysql/dstore_mysql.c:329
+#: src/applications/dstore_mysql/dstore_mysql.c:342
+#: src/applications/dstore_mysql/dstore_mysql.c:412
+#: src/applications/dstore_mysql/dstore_mysql.c:434
+#: src/applications/dstore_mysql/dstore_mysql.c:446
+#: src/applications/dstore_mysql/dstore_mysql.c:521
+#: src/applications/dstore_mysql/dstore_mysql.c:533
+#: src/applications/dstore_mysql/dstore_mysql.c:554
+#: src/applications/dstore_sqlite/dstore.c:91
+#: src/applications/dstore_sqlite/dstore.c:98
+#: src/applications/dstore_sqlite/dstore.c:194
+#: src/applications/dstore_sqlite/dstore.c:236
+#: src/applications/dstore_sqlite/dstore.c:257
+#: src/applications/dstore_sqlite/dstore.c:313
+#: src/applications/dstore_sqlite/dstore.c:331
+#: src/applications/dstore_sqlite/dstore.c:343
+#: src/applications/dstore_sqlite/dstore.c:375
+#: src/applications/dstore_sqlite/dstore.c:467
+#: src/util/crypto/hostkey_gcrypt.c:64 src/util/crypto/hostkey_gcrypt.c:71
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "'%s' falló en %s: %d con el error: %s\n"
+
+#: src/applications/advertising/advertising_test.c:47
+#: src/applications/session/sessiontest_http.c:40
+#: src/applications/session/sessiontest.c:40
+#: src/applications/session/sessiontest2.c:40
+#: src/applications/stats/statistics.c:233
+msgid "# of connected peers"
+msgstr "# de pares conectados"
+
+#: src/applications/advertising/advertising.c:194
+#, 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:205
+#, 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/topology_f2f/topology.c:390
-msgid "Syntax error in topology specification, skipping bytes.\n"
+#: src/applications/advertising/advertising.c:407
+#, 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:429
+msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:404
+#: src/applications/advertising/advertising.c:601
 #, c-format
-msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
-msgstr ""
+msgid "Advertising my transport %d to selected peers.\n"
+msgstr "Anunciando mi transporte %d a los pares seleccionados.\n"
 
-#: src/applications/topology_f2f/topology.c:511
-msgid "maintains a friend-to-friend restricted topology"
+#: src/applications/advertising/advertising.c:610
+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:887
+msgid "# Peer advertisements received"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:890
+#, fuzzy
+msgid "# Peer advertisements of type NAT received"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:893
+#, fuzzy
+msgid "# Peer advertisements confirmed via PONG"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:897
+#, fuzzy
+msgid "# Peer advertisements updating earlier HELLOs"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:900
+#, fuzzy
+msgid "# Peer advertisements discarded due to load"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:904
+#, fuzzy
+msgid "# Peer advertisements for unsupported transport"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:908
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to ping busy"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:912
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to lack of self ad"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:916
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to send error"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:918
+msgid "# Self advertisments transmitted"
+msgstr "# Auto-anuncios transmitidos"
+
+#: src/applications/advertising/advertising.c:920
+msgid "# Foreign advertisements forwarded"
+msgstr "# Anuncios a extraños mandados"
+
+#: src/applications/advertising/advertising.c:922
+#: src/applications/pingpong/pingpong.c:527
+msgid "# plaintext PING messages sent"
+msgstr "# mensajes de texto mandados por PING"
+
+#: src/applications/advertising/advertising.c:928
+#: src/applications/session/connect.c:953
+#, 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:944
+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/template/template.c:68
+#: src/applications/chat/chat.c:91
+msgid "Message received from peer is invalid.\n"
+msgstr "El mensaje recibido del par es inválido.\n"
+
+#: src/applications/chat/chat.c:140
+msgid "Message received from client is invalid\n"
+msgstr "El mensaje recibido del cliente es inválido\n"
+
+#: src/applications/chat/chat.c:161
+msgid "Maximum number of chat clients reached.\n"
+msgstr "Número máximo de clientes en el chat alcanzado.\n"
+
+#: src/applications/chat/chat.c:167
 #, c-format
-msgid "`%s' registering client handler %d and %d\n"
-msgstr "'%s' registrando manejador de clientes %d y %d\n"
+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/template/gnunet-template.c:43
-msgid "Template description."
+#: src/applications/chat/chat.c:211
+#, c-format
+msgid "`%s' registering handlers %d and %d\n"
+msgstr "'%s' registrando manejadores %d y %d\n"
+
+#: src/applications/chat/chat.c:230
+msgid "enables P2P-chat (incomplete)"
+msgstr "Activa el chat P2P (incompleto)"
+
+#: src/applications/chat/gnunet-chat.c:45
+msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:109
-#, 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/chat/gnunet-chat.c:49
+msgid "set the nickname to use (requred)"
+msgstr ""
 
-#: src/applications/bootstrap_http/http.c:177
-msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
+#: src/applications/chat/gnunet-chat.c:52
+msgid "set the chat room to join (requred)"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:217
+#: src/applications/chat/gnunet-chat.c:135
+#, fuzzy, c-format
+msgid "You must specify a nickname\n"
+msgstr "¡Debes especificar un receptor!\n"
+
+#: src/applications/chat/gnunet-chat.c:145
 #, c-format
-msgid "Bootstrapping using `%s'.\n"
+msgid "Failed to join the room\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:231
+#: src/applications/chat/gnunet-chat.c:162
+#, fuzzy, c-format
+msgid "Failed to send message.\n"
+msgstr "Falló al entregar el mensaje '%s'.\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:238
+#, fuzzy, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "Imposible inicializar SQLite.\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:442
+#, 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:443
+#: src/applications/sqstore_sqlite/sqlite.c:482
+msgid "sqlite datastore"
+msgstr "base de datos sqlite"
+
+#: src/applications/sqstore_sqlite/sqlite.c:481
 #, c-format
-msgid "Trying to download hostlist from `%s'\n"
+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:1336
+#: src/applications/sqstore_mysql/mysql.c:1483
+msgid "# bytes in datastore"
+msgstr "# bytes en la base de datos"
+
+#: src/applications/pingpong/pingpong.c:134
+#: src/applications/pingpong/pingpong.c:205
+#: src/applications/pingpong/pingpong.c:273
+#: src/applications/pingpong/pingpong.c:345
+#, 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:146
+msgid "Received ping for another peer. Dropping.\n"
+msgstr "Recibido ping de otro par. Omitiendo.\n"
+
+#: src/applications/pingpong/pingpong.c:216
+msgid "Received PING not destined for us!\n"
+msgstr "¡Recibido PING no destinado a nosotros!\n"
+
+#: src/applications/pingpong/pingpong.c:315
+#: src/applications/pingpong/pingpong.c:381
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:359
-#, fuzzy, c-format
-msgid "Downloaded %llu bytes from `%s'.\n"
-msgstr "Descarga los ficheros de GNUnet"
+#: src/applications/pingpong/pingpong.c:425
+msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
+msgstr ""
 
-#: src/applications/bootstrap_http/http.c:392
+#: src/applications/pingpong/pingpong.c:517
+msgid "# encrypted PONG messages received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/applications/pingpong/pingpong.c:519
+msgid "# plaintext PONG messages received"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:521
+msgid "# encrypted PING messages received"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:523
+msgid "# PING messages created"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:525
+#: src/applications/session/connect.c:947
+msgid "# encrypted PONG messages sent"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:529
+#: src/applications/session/connect.c:945
+msgid "# encrypted PING messages sent"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:531
 #, fuzzy
-msgid "# HELLOs downloaded via http"
-msgstr "# saludos descargados vía HTTP"
+msgid "# plaintext PONG messages sent"
+msgstr "# mensajes de texto mandados por PING"
 
-#: src/applications/traffic/traffic.c:454
+#: src/applications/pingpong/pingpong.c:535
+#, fuzzy
+msgid "# plaintext PONG transmissions failed"
+msgstr "# mensajes de texto mandados por PING"
+
+#: src/applications/pingpong/pingpong.c:545
 #, c-format
-msgid "# bytes transmitted of type %d"
-msgstr ""
+msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
+msgstr "'%s' registrando manejadores %d %d (texto plano e hipertexto)\n"
 
-#: src/applications/traffic/traffic.c:470
+#: src/applications/session/connect.c:260
+#: src/applications/session/connect.c:279
 #, c-format
-msgid "# bytes received of type %d"
-msgstr ""
+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/traffic/traffic.c:489
+#: src/applications/session/connect.c:323
 #, fuzzy, c-format
-msgid "# bytes received in plaintext of type %d"
-msgstr "# bytes recibidos por TCP"
+msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
+msgstr "¡Imposible encriptar la clave de sesión, otro par desconocido!\n"
 
-#: src/applications/traffic/traffic.c:644
-msgid "tracks bandwidth utilization by gnunetd"
+#: src/applications/session/connect.c:512
+#, fuzzy
+msgid "Could not create any HELLO for myself!\n"
+msgstr "¡Imposible crear la clave local!\n"
+
+#: src/applications/session/connect.c:615
+#, 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:649
+#, 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:683
+#, 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:694
+#, 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/vpn/gnunet-vpn.c:57
-msgid "Suppress display of asynchronous log messages"
+#: src/applications/session/connect.c:763
+#, fuzzy, c-format
+msgid ""
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
 msgstr ""
+"Error pasando la clave de sesión encriptada, el mensaje dado del tamaño de "
+"las partes es inválido.\n"
 
-#: src/applications/vpn/vpn.c:366
+#: src/applications/session/connect.c:776
+#, 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:937
+msgid "# session keys sent"
+msgstr "# claves de la sesión mandadas"
+
+#: src/applications/session/connect.c:939
+msgid "# session keys rejected"
+msgstr "# claves de la sesión rechazadas"
+
+#: src/applications/session/connect.c:941
+msgid "# session keys accepted"
+msgstr "# claves de la sesión aceptadas"
+
+#: src/applications/session/connect.c:943
+msgid "# sessions established"
+msgstr "# sesiones establecidas"
+
+#: src/applications/sqstore_mysql/mysql.c:427
+#: src/applications/dstore_mysql/dstore_mysql.c:220
+#, 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:1388
+#, fuzzy, c-format
+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:1508
+#: src/applications/sqstore_mysql/mysql.c:1661
+#: src/applications/dstore_mysql/dstore_mysql.c:627
 #, c-format
-msgid "Not storing route to myself from peer %d\n"
+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:1535
+#: src/applications/sqstore_mysql/mysql.c:1686
+msgid ""
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
 msgstr ""
+"Falló al cargar el modulo de la base de datos MySQL.  ¡Comprueba que MySQL "
+"esta ejecutandose y esta configurada correctamente!\n"
 
-#: src/applications/vpn/vpn.c:377
+#: src/applications/identity/hostkey.c:122
+#, 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:155
 #, c-format
-msgid "Duplicate route to node from peer %d, choosing minimum hops"
+msgid ""
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr ""
+"Se produjo un fallo al comprobar la clave local existente en el fichero '%"
+"s', creando nueva clave local.\n"
 
-#: src/applications/vpn/vpn.c:410
+#: src/applications/identity/hostkey.c:164
+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:176
+msgid "Done creating hostkey.\n"
+msgstr "Correcto al crear la clave local.\n"
+
+#: src/applications/identity/identity.c:352
 #, c-format
-msgid "Inserting route from peer %d in route table at location %d\n"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
+"El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
+"Eliminando.\n"
 
-#: src/applications/vpn/vpn.c:466
+#: src/applications/identity/identity.c:366
+#, fuzzy, c-format
+msgid ""
+"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
+"Eliminando.\n"
+
+#: src/applications/identity/identity.c:402
+#, fuzzy, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
+
+#: src/applications/identity/identity.c:731
+#: src/applications/identity/identity.c:757
+#, 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:809
 #, c-format
-msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
+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:819
+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:935
+#: src/applications/identity/identity.c:1058
+#, c-format
+msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:472
+#: src/applications/identity/identity.c:1061
 #, c-format
-msgid "RFC4193 Frame length %d too small\n"
+msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:488
+#: src/applications/testbed/commands.c:1179
+#: src/applications/stats/gnunet-stats.c:61
 #, c-format
-msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
+msgid "Supported peer-to-peer messages:\n"
+msgstr "Mensajes P2P soportados:\n"
+
+#: src/applications/testbed/commands.c:1181
+#: src/applications/stats/gnunet-stats.c:64
+#, c-format
+msgid "Supported client-server messages:\n"
+msgstr "Mensajes cliente-servidor soportados:\n"
+
+#: src/applications/testbed/gnunet-testbed.c:118
+#, fuzzy
+msgid "Start GNUnet-testbed helper."
+msgstr "Arranca el cliente de chat de GNUnet"
+
+#: src/applications/testbed/gnunet-testbed.c:176
+#, c-format
+msgid "Cannot connect to LOOPBACK port %d: %s\n"
+msgstr "Imposible conectar al puerto de LOOPBACK %d: %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:268
+#, c-format
+msgid "Could not execute `%s': %s\n"
+msgstr "Imposible ejecutar '%s': %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:314
+msgid "No client service started. Trying again in 30 seconds.\n"
 msgstr ""
+"No hay ningún servicio de cliente ejecutandose. Se volverá a intentar en 30 "
+"segundos.\n"
 
-#: src/applications/vpn/vpn.c:556
+#: src/applications/testbed/gnunet-testbed.c:329
+#, fuzzy, c-format
+msgid ""
+"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
+"Trying again in %d seconds...\n"
+msgstr ""
+"No hay ningún servicio de cliente ejecutandose. Se volverá a intentar en 30 "
+"segundos.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:392
 #, c-format
-msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
+msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
+msgstr "Rechazada conexión no autorizada de %u.%u.%u.%u.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:406
+#, c-format
+msgid "Protocol violation on socket. Expected command.\n"
+msgstr "Violación del protocolo en el socket. Esperando comando.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:446
+#, c-format
+msgid "Command `%s' not found!\n"
+msgstr "¡Comando '%s' no encontrado!\n"
+
+#: src/applications/testbed/gnunet-testbed.c:510
+#, fuzzy
+msgid "Start GNUnet testbed controller."
+msgstr "Arranca el cliente de chat de GNUnet"
+
+#: src/applications/testbed/gnunet-testbed.c:572
+#, c-format
+msgid "Malformed entry in the configuration in section %s under %s: %s\n"
+msgstr "Entrada mal formada en la configuración en la sección %s bajo %s: %s\n"
+
+#: src/applications/testbed/testbed.c:53
+#, fuzzy
+msgid "Could not send acknowledgement back to client.\n"
+msgstr "Imposible mandar el mensaje a gnunetd\n"
+
+#: src/applications/testbed/testbed.c:64
+#, fuzzy, c-format
+msgid "Received unknown testbed message of type %u.\n"
+msgstr "Recibida petición de tipo desconocido %d en %s: %d\n"
+
+#: src/applications/testbed/testbed.c:82
+#: src/applications/testbed/testbed.c:848
+#, c-format
+msgid "size of `%s' message is too short. Ignoring.\n"
+msgstr "el tamaño del '%s' mensaje es demasiado corto. Ignorandolo.\n"
+
+#: src/applications/testbed/testbed.c:90
+#, c-format
+msgid "size of `%s' message is wrong. Ignoring.\n"
+msgstr "el tamaño del mensaje '%s' es erroneo. Se ignora.\n"
+
+#: src/applications/testbed/testbed.c:145
+#, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
+msgstr "TESTBED no puede generar el mensaje de saludo para el protocolo %u\n"
+
+#: src/applications/testbed/testbed.c:223
+#: src/applications/testbed/testbed.c:268
+#: src/applications/testbed/testbed.c:381
+#: src/applications/testbed/testbed.c:390
+#: src/applications/testbed/testbed.c:434
+#: src/applications/testbed/testbed.c:443
+#, c-format
+msgid "received invalid `%s' message\n"
+msgstr "recibido mensaje '%s' no válido\n"
+
+#: src/applications/testbed/testbed.c:240
+#: src/applications/testbed/testbed.c:284
+#, c-format
+msgid "received invalid `%s' message (empty module name)\n"
+msgstr "recibido mensaje '%s' no válido (nombre del módulo vacío)\n"
+
+#: src/applications/testbed/testbed.c:247
+#, c-format
+msgid "loading module `%s' failed.  Notifying client.\n"
 msgstr ""
+"se produjo un fallo al cargar el módulo '%s'.  Notificando al cliente.\n"
 
-#: src/applications/vpn/vpn.c:562
+#: src/applications/testbed/testbed.c:291
+msgid "unloading module failed.  Notifying client.\n"
+msgstr "se produjo un fallo al descargar el módulo.  Notificando al cliente.\n"
+
+#: src/applications/testbed/testbed.c:576
 #, c-format
-msgid "Cannot open tunnel device because of %s"
+msgid "`%s' %s failed: %s\n"
+msgstr "'%s' %s falló: %s\n"
+
+#: src/applications/testbed/testbed.c:658
+#, c-format
+msgid "received invalid `%s' message: %s.\n"
+msgstr "recibido mensaje '%s' no válido: %s.\n"
+
+#: src/applications/testbed/testbed.c:861
+#, c-format
+msgid "'..' is not allowed in file name (%s).\n"
+msgstr "'..' no esta permitido en el nombre del fichero(%s).\n"
+
+#: src/applications/testbed/testbed.c:872
+msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
+msgstr "¡Nombre del fichero vacío para el mensaje UPLOAD_FILE es inválido!\n"
+
+#: src/applications/testbed/testbed.c:881
+msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
 msgstr ""
+"Nombre del fichero para el mensaje UPLOAD_FILE no esta terminado en null "
+"(¡inválido!)\n"
 
-#: src/applications/vpn/vpn.c:594
+#: src/applications/testbed/testbed.c:889
+msgid "Upload refused!"
+msgstr "¡Subida rechazada!"
+
+#: src/applications/testbed/testbed.c:919
 #, c-format
-msgid "RFC4193 Create skips gnu%d as we are already using it\n"
+msgid "Invalid message received at %s:%d."
+msgstr "Mensaje inválido recibido en %s:%d."
+
+#: src/applications/testbed/testbed.c:1041
+#, fuzzy, c-format
+msgid "received invalid testbed message of size %u\n"
+msgstr "recibido mensaje '%s' no válido: %s.\n"
+
+#: src/applications/testbed/testbed.c:1064
+#, c-format
+msgid ""
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:606
+#: src/applications/testbed/testbed.c:1110
+msgid "No testbed URL given, not registered.\n"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:1121
 #, c-format
-msgid "Cannot set tunnel name to %s because of %s\n"
+msgid "Could not resolve name of HTTP proxy `%s'.\n"
+msgstr "Imposible resolver el nombre del proxy HTTP '%s'.\n"
+
+#: src/applications/testbed/testbed.c:1151
+#, c-format
+msgid "Invalid URL `%s' (must begin with `%s')\n"
+msgstr "URL invalida '%s' (debe comenzar por '%s')\n"
+
+#: src/applications/testbed/testbed.c:1194
+#, c-format
+msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:614
+#: src/applications/testbed/testbed.c:1229
+#, fuzzy, c-format
+msgid "Could not register testbed, host `%s' unknown\n"
+msgstr "Imposible descargar lista de contactos, servidor '%s' desconocido.\n"
+
+#: src/applications/testbed/testbed.c:1251
 #, c-format
-msgid "Configured tunnel name to %s\n"
+msgid "Failed to send HTTP request to host `%s': %s\n"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+
+#: src/applications/testbed/testbed.c:1289
+#, c-format
+msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
+msgstr "Falló al mandar la petición HTTP '%s' al host '%s': %s\n"
+
+#: src/applications/testbed/testbed.c:1327
+msgid "Exit register (error: no http response read).\n"
+msgstr "Saliendo del registro (error: no se leyó una respuesta de http).\n"
+
+#: src/applications/testbed/testbed.c:1434
+msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:655
+#: src/applications/transport/transport.c:192
 #, c-format
-msgid "Cannot get socket flags for gnu%d because %s\n"
+msgid ""
+"Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:664
+#: src/applications/transport/transport.c:247
 #, c-format
-msgid "Cannot set socket flags for gnu%d because %s\n"
+msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:674
+#: src/applications/transport/transport.c:300
 #, c-format
-msgid "Cannot set MTU for gnu%d because %s\n"
+msgid ""
+"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:682
+#: src/applications/transport/transport.c:377
 #, c-format
-msgid "Cannot get interface index for gnu%d because %s\n"
+msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:694
+#: src/applications/transport/transport.c:500
 #, c-format
-msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgid "No transport of type %d known.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:707
+#: src/applications/transport/transport.c:559
+msgid "No transport succeeded in creating a hello!\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:760
 #, 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"
+msgid "Loading transports `%s'\n"
+msgstr "Probando transporte(s) %s\n"
 
-#: src/applications/vpn/vpn.c:721
+#: src/applications/transport/transport.c:780
+#, fuzzy, c-format
+msgid "Could not load transport plugin `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#: src/applications/transport/transport.c:794
 #, c-format
-msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+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/vpn/vpn.c:733
+#: src/applications/transport/transport.c:823
 #, 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"
+msgid "Loaded transport `%s'\n"
+msgstr "Transporte(s) disponible(s): %s\n"
 
-#: 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"
+#: src/applications/transport/transport.c:835
+#, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Yo soy el par '%s'.\n"
+
+#: src/applications/stats/sqstats.c:151
+msgid "# Any-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:822
-#, c-format
-msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
+#: src/applications/stats/sqstats.c:152
+msgid "# DBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:895
-#, c-format
-msgid "VPN dropping connection %x\n"
+#: src/applications/stats/sqstats.c:153
+msgid "# SBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:902
-#, c-format
-msgid "VPN cannot drop connection %x\n"
+#: src/applications/stats/sqstats.c:154
+msgid "# KBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:921
-msgid "RFC4193 Thread exiting\n"
+#: src/applications/stats/sqstats.c:155
+msgid "# NBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:968
-msgid "VPN IP src not anonymous. drop..\n"
+#: src/applications/stats/sqstats.c:156
+msgid "# KNBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:974
-msgid "VPN IP not anonymous, drop.\n"
+#: src/applications/stats/sqstats.c:157
+msgid "# OnDemand-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:981
-msgid "VPN Received, not anonymous, drop.\n"
+#: src/applications/stats/sqstats.c:158
+msgid "# Unknown-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:985
-#, c-format
-msgid "VPN Received unknown IP version %d...\n"
+#: src/applications/stats/sqstats.c:159
+msgid "# expired"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:996
-#, c-format
-msgid "<- GNUnet(%d) : %s\n"
+#: src/applications/stats/sqstats.c:160
+msgid "# expire in 1h"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1022
-msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
+#: src/applications/stats/sqstats.c:161
+msgid "# expire in 24h"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1043
-msgid "Receive route request\n"
+#: src/applications/stats/sqstats.c:162
+msgid "# expire in 1 week"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1050
+#: src/applications/stats/sqstats.c:163
+msgid "# expire in 1 month"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:164
+msgid "# zero priority"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:165
+msgid "# priority one"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:166
+msgid "# priority larger than one"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:167
+msgid "# no anonymity"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:168
+msgid "# anonymity one"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:169
+msgid "# anonymity larger than one"
+msgstr ""
+
+#: src/applications/stats/clientapi.c:333
+msgid "Uptime (seconds)"
+msgstr ""
+
+#: src/applications/stats/statistics.c:228
+#, fuzzy, c-format
+msgid "% of allowed network load (up)"
+msgstr "% de red permitida para la subida"
+
+#: src/applications/stats/statistics.c:230
+#, fuzzy, c-format
+msgid "% of allowed network load (down)"
+msgstr "% de red permitida para bajada"
+
+#: src/applications/stats/statistics.c:231
+#, fuzzy, c-format
+msgid "% of allowed cpu load"
+msgstr "% de CPU permitida para el uso"
+
+#: src/applications/stats/statistics.c:232
+#, fuzzy, c-format
+msgid "% of allowed io load"
+msgstr "% de CPU permitida para el uso"
+
+#: src/applications/stats/statistics.c:235
+msgid "# bytes of noise received"
+msgstr "# bytes de ruido recibidos"
+
+#: src/applications/stats/statistics.c:237
+msgid "# plibc handles"
+msgstr ""
+
+#: src/applications/stats/statistics.c:421
+#, 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:445
+msgid "keeps statistics about gnunetd's operation"
+msgstr ""
+
+#: src/applications/stats/gnunet-stats.c:87
+msgid "prints supported protocol messages"
+msgstr "imprime los mensajes del protocolo"
+
+#: src/applications/stats/gnunet-stats.c:136
 #, c-format
-msgid "Prepare route announcement level %d\n"
+msgid "Error reading information from gnunetd.\n"
+msgstr "Se produjo un error leyendo información de gnunetd.\n"
+
+#: src/applications/tbench/gnunet-tbench.c:63
+#: src/applications/tracekit/gnunet-tracekit.c:54
+msgid "Start GNUnet transport benchmarking tool."
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1065
+#: src/applications/tbench/gnunet-tbench.c:65
+msgid "output in gnuplot format"
+msgstr "salida en formato de gnuplot"
+
+#: src/applications/tbench/gnunet-tbench.c:69
+msgid "number of iterations"
+msgstr "número de repeticiones"
+
+#: src/applications/tbench/gnunet-tbench.c:73
+msgid "number of messages to use per iteration"
+msgstr "número de mensajes a usar por iteración"
+
+#: src/applications/tbench/gnunet-tbench.c:76
+msgid "receiver host identifier (ENC file name)"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:79
+msgid "message size"
+msgstr "tamaño del mensaje"
+
+#: src/applications/tbench/gnunet-tbench.c:82
+msgid "sleep for SPACE ms after each a message block"
+msgstr "duerme durante SPACE ms después de cada bloque de mensajes"
+
+#: src/applications/tbench/gnunet-tbench.c:85
+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
+msgid "number of messages in a message block"
+msgstr "número de mensajes en un bloque de mensajes"
+
+#: src/applications/tbench/gnunet-tbench.c:142
 #, c-format
-msgid "Send route announcement %d with route announce\n"
+msgid "You must specify a receiver!\n"
+msgstr "¡Debes especificar un receptor!\n"
+
+#: src/applications/tbench/gnunet-tbench.c:152
+#, c-format
+msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
+"ID del par receptor especificada no válida ('%s' no es un nombre válido).\n"
 
-#: src/applications/vpn/vpn.c:1071
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
-msgid "Send outside table info %d\n"
+msgid "Time:\n"
+msgstr "Tiempo:\n"
+
+#: src/applications/tbench/gnunet-tbench.c:190
+#, c-format
+msgid "\tmax      %llums\n"
+msgstr "\tmax      %llums\n"
+
+#: src/applications/tbench/gnunet-tbench.c:191
+#, c-format
+msgid "\tmin      %llums\n"
+msgstr "\tmin      %llums\n"
+
+#: src/applications/tbench/gnunet-tbench.c:192
+#, c-format
+msgid "\tmean     %8.4fms\n"
+msgstr "\tmean     %8.4fms\n"
+
+#: src/applications/tbench/gnunet-tbench.c:193
+#, c-format
+msgid "\tvariance %8.4fms\n"
+msgstr "\tvariance %8.4fms\n"
+
+#: src/applications/tbench/gnunet-tbench.c:195
+#, c-format
+msgid "Loss:\n"
+msgstr "Perdido:\n"
+
+#: src/applications/tbench/gnunet-tbench.c:196
+#, c-format
+msgid "\tmax      %u\n"
+msgstr "\tmax      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:197
+#, c-format
+msgid "\tmin      %u\n"
+msgstr "\tmin      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:198
+#, c-format
+msgid "\tmean     %8.4f\n"
+msgstr "\tmean     %8.4f\n"
+
+#: src/applications/tbench/gnunet-tbench.c:199
+#, c-format
+msgid "\tvariance %8.4f\n"
+msgstr "\tvariance %8.4f\n"
+
+#: src/applications/tbench/gnunet-tbench.c:205
+#, 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:211
+#, c-format
+msgid ""
+"\n"
+"Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
+"\n"
+"No se recibió el mensaje de gnunetd. ¿Está gnunetd ejecutandose?\n"
 
-#: src/applications/vpn/vpn.c:1088
-msgid "Receive route announce.\n"
+#: src/applications/tbench/tbench.c:420
+msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1094
-msgid "Going to try insert route into local table.\n"
+#: src/applications/tbench/tbenchtest.c:53
+#, c-format
+msgid "Using %u messages of size %u for %u times.\n"
+msgstr "Usando %u mensajes de un tamaño de %u durante %u veces.\n"
+
+#: src/applications/tbench/tbenchtest.c:85
+#, c-format
+msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1100
+#: src/applications/tbench/tbenchtest.c:89
 #, c-format
-msgid "Inserting with hops %d\n"
+msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1119
+#: src/applications/tbench/tbenchtest.c:95
 #, c-format
-msgid "Request level %d from peer %d\n"
+msgid ""
+"\n"
+"Failed to receive reply from gnunetd.\n"
 msgstr ""
+"\n"
+"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/applications/vpn/vpn.c:1137
+#: src/applications/tbench/tbenchtest.c:151
 #, c-format
-msgid "Receive table limit on peer reached %d\n"
+msgid "Running benchmark...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1168
-msgid "realise alloc ram\n"
+#: src/applications/tracekit/gnunet-tracekit.c:47
+msgid "probe network to the given DEPTH"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1188
-msgid "realise add routes\n"
+#: src/applications/tracekit/gnunet-tracekit.c:51
+msgid ""
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1239
-msgid "realise pull routes\n"
+#: src/applications/tracekit/gnunet-tracekit.c:58
+msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1292
-msgid "realise copy table\n"
+#: src/applications/tracekit/gnunet-tracekit.c:62
+msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1324
-msgid "Cannot store client info\n"
+#: src/applications/tracekit/gnunet-tracekit.c:110
+#, c-format
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:95
-msgid "Yes"
-msgstr "Sí"
+#: src/applications/tracekit/gnunet-tracekit.c:164
+#, c-format
+msgid "`%s' is not connected to any peer.\n"
+msgstr "'%s' no esta conectado a ningún par.\n"
 
-#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:94
-msgid "No"
-msgstr "No"
+#: src/applications/tracekit/gnunet-tracekit.c:207
+#, c-format
+msgid "`%s' connected to `%s'.\n"
+msgstr "'%s' conectado a '%s'.\n"
 
-#: src/applications/vpn/vpn.c:1651
-#, fuzzy, c-format
-msgid "`%s' initialising RFC4913 module  %d and %d\n"
-msgstr "'%s' registrando manejadores %d y %d\n"
+#: src/applications/tracekit/gnunet-tracekit.c:220
+#, c-format
+msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
+msgstr ""
 
-#: src/applications/vpn/vpn.c:1654
+#: src/applications/tracekit/gnunet-tracekit.c:246
 #, c-format
-msgid "RFC4193 my First 4 hex digits of host id are %x\n"
+msgid "Peer `%s' did not report back.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1727
-#, fuzzy
-msgid "enables IPv6 over GNUnet (incomplete)"
-msgstr "Activa el chat P2P (incompleto)"
+#: src/applications/tracekit/gnunet-tracekit.c:348
+msgid "Could not send request to gnunetd.\n"
+msgstr ""
 
-#: src/applications/vpn/vpn.c:1761
-msgid "RFC4193 Waiting for tun thread to end\n"
+#: src/applications/tracekit/tracekit.c:74
+#: src/applications/tracekit/tracekit.c:216
+#, c-format
+msgid "Received invalid `%s' message from `%s'.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1775
-msgid "RFC4193 The tun thread has ended\n"
+#: src/applications/tracekit/tracekit.c:283
+msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1792
+#: src/applications/tracekit/tracekit.c:362
 #, c-format
-msgid "RFC4193 Closing tunnel %d fd %d\n"
+msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr ""
 
-#: src/applications/dstore/dstore.c:525
-#, fuzzy
-msgid "# bytes in dstore"
-msgstr "# bytes en la base de datos"
+#: src/applications/tracekit/tracekit.c:462
+msgid "allows mapping of the network topology"
+msgstr ""
 
-#: src/server/gnunet-update.c:147
+#: src/applications/getoption/getoption.c:78
 #, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Actualizando los datos del módulo '%s'\n"
+msgid "`%s' registering client handler %d\n"
+msgstr "'%s' registrando un manejador de clientes %d\n"
 
-#: src/server/gnunet-update.c:151
+#: src/applications/getoption/getoption.c:88
+msgid "allows clients to determine gnunetd's configuration"
+msgstr "permite a los clientes determinar la configuración de gnunetd"
+
+#: src/applications/template/gnunet-template.c:42
+msgid "Template description."
+msgstr ""
+
+#: src/applications/template/template.c:70
 #, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr "Falló al actualizar los datos del módulo '%s'\n"
+msgid "`%s' registering client handler %d and %d\n"
+msgstr "'%s' registrando manejador de clientes %d y %d\n"
 
-#: src/server/gnunet-update.c:198 src/server/gnunetd.c:136
-#, fuzzy
-msgid "Core initialization failed.\n"
-msgstr "Conexión fallida\n"
+#: src/applications/bootstrap_http/http.c:110
+#, fuzzy, c-format
+msgid "Bootstrap data obtained from `%s' is invalid.\n"
+msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
-#: src/server/gnunet-update.c:239
+#: src/applications/bootstrap_http/http.c:178
+msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:219
+#, c-format
+msgid "Bootstrapping using `%s'.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:234
+#, c-format
+msgid "Trying to download hostlist from `%s'\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:364
+#, fuzzy, c-format
+msgid "Downloaded %llu bytes from `%s'.\n"
+msgstr "Descarga los ficheros de GNUnet"
+
+#: src/applications/bootstrap_http/http.c:397
 #, fuzzy
-msgid "print a value from the configuration file to stdout"
-msgstr "Imposible guardar el fichero de configuración '%s':"
+msgid "# HELLOs downloaded via http"
+msgstr "# saludos descargados vía HTTP"
 
-#: src/server/gnunet-update.c:241
-msgid "Updates GNUnet datastructures after version change."
+#: src/applications/traffic/traffic.c:454
+#, c-format
+msgid "# bytes transmitted of type %d"
 msgstr ""
 
-#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:369
-msgid "run as user LOGIN"
-msgstr "ejecuta como el usuario LOGIN"
+#: src/applications/traffic/traffic.c:470
+#, c-format
+msgid "# bytes received of type %d"
+msgstr ""
 
-#: src/server/gnunet-update.c:249
-msgid "run in client mode (for getting client configuration values)"
+#: 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:650
+msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/server/connection.c:1202
+#: src/applications/dstore_mysql/dstore_mysql.c:636
+#, fuzzy
+msgid "Failed to initialize MySQL database connection for dstore.\n"
+msgstr "Imposible inicializar SQLite.\n"
+
+#: src/applications/dstore_mysql/dstore_mysql.c:661
+#: src/applications/dstore_sqlite/dstore.c:535
+#, fuzzy
+msgid "# bytes in dstore"
+msgstr "# bytes en la base de datos"
+
+#: src/server/connection.c:1214
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/server/connection.c:1211
+#: src/server/connection.c:1224
 #, 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:2897
+#: src/server/connection.c:2986
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Mensaje de '%s' descartado: formato inválido.\n"
 
-#: src/server/connection.c:2982
+#: src/server/connection.c:3075
 #, 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:3004
+#: src/server/connection.c:3097
 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:3500
+#: src/server/connection.c:3608
 msgid "# outgoing messages dropped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/server/connection.c:3503
+#: src/server/connection.c:3611
 msgid "# bytes of outgoing messages dropped"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/server/connection.c:3505
+#: src/server/connection.c:3613
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3509
+#: src/server/connection.c:3617
 msgid "# connections closed (transport issue)"
 msgstr ""
 
-#: src/server/connection.c:3512
+#: src/server/connection.c:3620
 msgid "# bytes encrypted"
 msgstr "# bytes encriptados"
 
-#: src/server/connection.c:3516
+#: src/server/connection.c:3624
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:3520
+#: src/server/connection.c:3628
 #, fuzzy
 msgid "# bytes received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/server/connection.c:3522
+#: src/server/connection.c:3630
 msgid "# bytes decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:3523
+#: src/server/connection.c:3631
 msgid "# bytes noise sent"
 msgstr "# \"bytes-ruido\" mandados"
 
-#: src/server/connection.c:3526
+#: src/server/connection.c:3634
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3529
+#: src/server/connection.c:3637
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "# bytes de ruido recibidos"
 
-#: src/server/connection.c:3532
+#: src/server/connection.c:3640
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "número de mensajes en un bloque de mensajes"
 
-#: src/server/connection.c:3536
+#: src/server/connection.c:3644
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3540
+#: src/server/connection.c:3648
 #, 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:3544
+#: src/server/connection.c:3652
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
-#: src/server/connection.c:3547
+#: src/server/connection.c:3655
 msgid "# transports switched to stream transport"
 msgstr ""
 
-#: src/server/startup.c:206
+#: src/server/startup.c:215
 #, 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:223
+#: src/server/startup.c:233
 #, c-format
 msgid ""
 "Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
 "address@hidden"
 msgstr ""
 
-#: src/server/startup.c:237
+#: src/server/startup.c:248
 #, c-format
 msgid ""
 "Limiting datastore size to %llu GB, because the `%s' filesystem does not "
@@ -2719,22 +3738,27 @@
 "partition!\n"
 msgstr ""
 
-#: src/server/startup.c:274
+#: src/server/startup.c:287
 #, c-format
 msgid "Insufficient access permissions for `%s': %s\n"
 msgstr ""
 
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:83
 #, c-format
 msgid "`%s' startup complete.\n"
 msgstr "'%s' comienzo completo.\n"
 
-#: src/server/gnunetd.c:89
+#: src/server/gnunetd.c:87
 #, c-format
 msgid "`%s' is shutting down.\n"
 msgstr "'%s' se esta cerrando.\n"
 
-#: src/server/gnunetd.c:192
+#: src/server/gnunetd.c:121 src/server/gnunet-update.c:222
+#, fuzzy
+msgid "Core initialization failed.\n"
+msgstr "Conexión fallida\n"
+
+#: src/server/gnunetd.c:176
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
@@ -2742,95 +3766,55 @@
 "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:196
+#: src/server/gnunetd.c:180
 msgid "Starts the gnunetd daemon."
 msgstr "Arranca el demonio de gnunetd."
 
-#: src/server/gnunetd.c:199
+#: src/server/gnunetd.c:183
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:203
+#: src/server/gnunetd.c:187
 msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:207
+#: src/server/gnunetd.c:191
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "especifica el host en el que gnunetd esta ejecutandose"
 
-#: src/server/gnunetd.c:271
+#: src/server/gnunetd.c:272
 #, 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:126
+#: src/server/gnunet-transport-check.c:121
 #, 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: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: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: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: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:386
-#, c-format
-msgid "Could not release %p: service not loaded\n"
-msgstr ""
-
-#: 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: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:122
-#, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "'%s': Imposible crear saludo.\n"
 
-#: src/server/gnunet-transport-check.c:129
+#: 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:160
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr "'%s': Imposible mandar.\n"
 
-#: src/server/gnunet-transport-check.c:176
+#: src/server/gnunet-transport-check.c:175
 #, 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:189
+#: src/server/gnunet-transport-check.c:188
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "'%s': Imposible desconectar.\n"
 
-#: src/server/gnunet-transport-check.c:196
+#: src/server/gnunet-transport-check.c:195
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -2843,7 +3827,7 @@
 msgid " Transport %d is not being tested\n"
 msgstr " El transporte %d no esta siendo probado\n"
 
-#: src/server/gnunet-transport-check.c:255
+#: src/server/gnunet-transport-check.c:256
 #, c-format
 msgid ""
 "\n"
@@ -2852,113 +3836,130 @@
 "\n"
 "Contactando '%s'."
 
-#: src/server/gnunet-transport-check.c:280
+#: src/server/gnunet-transport-check.c:281
 #, c-format
 msgid " Connection failed\n"
 msgstr "Conexión fallida\n"
 
-#: src/server/gnunet-transport-check.c:286
+#: src/server/gnunet-transport-check.c:287
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr "Conexión fallida (¿bug?)\n"
 
-#: src/server/gnunet-transport-check.c:323
+#: src/server/gnunet-transport-check.c:325
 #, c-format
 msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:325
+#: src/server/gnunet-transport-check.c:327
 #, fuzzy, c-format
 msgid "OK!\n"
 msgstr "OK"
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:352
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-transport-check.c:356
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:357
+#: src/server/gnunet-transport-check.c:359
 msgid "send COUNT messages"
 msgstr "envia COUNT mensajes"
 
-#: src/server/gnunet-transport-check.c:360
+#: src/server/gnunet-transport-check.c:362
 msgid "send messages with SIZE bytes payload"
 msgstr "manda mensajes con SIZE bytes payload"
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:365
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:366
+#: src/server/gnunet-transport-check.c:368
 msgid "specifies after how many MS to time-out"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:374
+#: src/server/gnunet-transport-check.c:371 src/server/gnunet-update.c:271
+msgid "run as user LOGIN"
+msgstr "ejecuta como el usuario LOGIN"
+
+#: src/server/gnunet-transport-check.c:376
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:435
+#: src/server/gnunet-transport-check.c:440
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/server/gnunet-transport-check.c:437
+#: src/server/gnunet-transport-check.c:442
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/server/gnunet-transport-check.c:478
+#: src/server/gnunet-transport-check.c:489
 #, c-format
 msgid ""
 "\n"
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
-#: src/server/tcpserver.c:109
+#: src/server/tcpserver.c:111
 #, 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:324
+#: src/server/tcpserver.c:336
 #, 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:398
+#: src/server/tcpserver.c:411
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:454
+#: src/server/tcpserver.c:468
 #, 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:428
+#: src/server/handler.c:431
 #, 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:141
-msgid ""
-"Failed to determine filename used to store GNUnet version information!\n"
+#: src/server/gnunet-update.c:146
+#, c-format
+msgid "Updating data for module `%s'\n"
+msgstr "Actualizando los datos del módulo '%s'\n"
+
+#: 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:267
+msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:53
+#: src/server/gnunet-update.c:275
+msgid "run in client mode (for getting client configuration values)"
+msgstr ""
+
+#: src/server/gnunet-peer-info.c:51
 msgid "Print information about GNUnet peers."
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/server/gnunet-peer-info.c:57
+#: src/server/gnunet-peer-info.c:55
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:122 src/server/gnunet-peer-info.c:153
+#: src/server/gnunet-peer-info.c:120 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"
@@ -2977,43 +3978,53 @@
 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: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:96 src/util/network_client/tcpio.c:140
-msgid "Could not find valid value for HOST in section NETWORK."
+#: src/server/version.c:143
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
 msgstr ""
 
-#: 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/server/core.c:129
+#, c-format
+msgid "Application module `%s' already initialized!\n"
+msgstr "¡El módulo de la aplicación '%s' ya esta inicializado!\n"
 
-#: 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/server/core.c:183
+#, 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/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/server/core.c:233
+#, c-format
+msgid "Could not shutdown `%s': application not loaded\n"
+msgstr "Imposible apagar '%s': aplicación no cargada\n"
 
-#: 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/server/core.c:244
+#, c-format
+msgid "Could not shutdown application `%s': not initialized\n"
+msgstr "Imposible apagar la aplicación '%s': no inicializada\n"
 
-#: src/util/network_client/tcpio.c:494
+#: src/server/core.c:254
 #, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "¡'%s' falló, respuesta no válida!\n"
+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/util/crypto/hostkey_gcrypt.c:898
+#: src/server/core.c:400
 #, c-format
+msgid "Could not release %p: service not loaded\n"
+msgstr ""
+
+#: src/server/core.c:509
+#, c-format
+msgid "Could not properly shutdown application `%s'.\n"
+msgstr "Imposible apagar la aplicación '%s' adecuadamente.\n"
+
+#: src/server/core.c:646
+#, c-format
+msgid "Could not properly unload service `%s'!\n"
+msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
+
+#: src/util/crypto/hostkey_gcrypt.c:907
+#, 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"
 
@@ -3023,122 +4034,152 @@
 msgstr ""
 "libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/os/statuscalls.c:195 src/util/os/statuscalls.c:336
+#: src/util/os/statuscalls.c:197 src/util/os/statuscalls.c:342
 #, 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:379 src/util/os/statuscalls.c:389
+#: src/util/os/statuscalls.c:387 src/util/os/statuscalls.c:397
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
 msgstr ""
 
-#: 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:124
+#: src/util/os/osconfig.c:127
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:391
+#: src/util/os/osconfig.c:402
 #, 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/user.c:136 src/util/os/user.c:181
+#, 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:137
+msgid "No such user"
+msgstr ""
+
+#: src/util/os/user.c:152
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
+
+#: src/util/os/priority.c:78
+#, fuzzy, c-format
+msgid "Invalid process priority `%s'\n"
+msgstr "Respuesta inválida a '%s'.\n"
+
+#: src/util/os/semaphore.c:223
+#, c-format
+msgid "Can't create semaphore: %i"
+msgstr "Imposible crear un semáforo: %i"
+
 #: 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:119
+#: src/util/os/dso.c:120
 #, 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:159
+#: src/util/os/dso.c:162
 #, 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:461
+#: src/util/os/cpustatus.c:466
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr ""
 
-#: src/util/os/cpustatus.c:483
+#: src/util/os/cpustatus.c:489
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr ""
 
-#: src/util/os/user.c:134 src/util/os/user.c:176
+#: src/util/network_client/tcpio.c:98 src/util/network_client/tcpio.c:144
+msgid "Could not find valid value for HOST in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:113
 #, 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:135
-msgid "No such user"
+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/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"
+#: src/util/network_client/tcpio.c:302
+#, fuzzy, c-format
+msgid "Cannot connect to %s:%u: %s\n"
+msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/os/priority.c:78
+#: src/util/network_client/tcpio.c:340
 #, fuzzy, c-format
-msgid "Invalid process priority `%s'\n"
-msgstr "Respuesta inválida a '%s'.\n"
+msgid "Error connecting to %s:%u\n"
+msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/network/select.c:304
+#: src/util/network_client/tcpio.c:351
+#, 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:516
+#, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr "¡'%s' falló, respuesta no válida!\n"
+
+#: src/util/network/select.c:310
 #, 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:473
+#: src/util/network/select.c:483
 #, c-format
 msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
 
-#: 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
+#: src/util/network/ipcheck.c:106 src/util/network/ipcheck.c:136
+#: src/util/network/ipcheck.c:186 src/util/network/ipcheck.c:211
+#: src/util/network/ipcheck.c:219
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: '%s'\n"
 
-#: src/util/network/ipcheck.c:162
+#: src/util/network/ipcheck.c:167
 #, 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:259
+#: src/util/network/ipcheck.c:267
 #, 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:291
+#: src/util/network/ipcheck.c:300
 #, 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:304
+#: src/util/network/ipcheck.c:314
 #, 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:195
+#: src/util/network/ip.c:207
 #, 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:268
+#: src/util/network/ip.c:285
 #, 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:277
+#: src/util/network/ip.c:295
 #, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
@@ -3147,173 +4188,143 @@
 "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:297
+#: src/util/network/ip.c:317
 #, 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:326
+#: src/util/network/ip.c:350
 #, 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: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: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:290
+#: src/util/error/error.c:117
 #, 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:533
-#, c-format
-msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
-msgstr ""
-
-#: 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:589
-#, c-format
-msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
-msgstr ""
-
-#: 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:115
-#, c-format
-msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:187 src/util/error/error.c:222
+#: src/util/error/error.c:190 src/util/error/error.c:225
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/error/error.c:189 src/util/error/error.c:224
+#: src/util/error/error.c:192 src/util/error/error.c:227
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:191 src/util/error/error.c:228
+#: src/util/error/error.c:194 src/util/error/error.c:231
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/error/error.c:193 src/util/error/error.c:230
+#: src/util/error/error.c:196 src/util/error/error.c:233
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/error/error.c:195 src/util/error/error.c:232
+#: src/util/error/error.c:198 src/util/error/error.c:235
 msgid "FATAL"
 msgstr "FATAL"
 
-#: src/util/error/error.c:197 src/util/error/error.c:234
+#: src/util/error/error.c:200 src/util/error/error.c:237
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:199 src/util/error/error.c:236
+#: src/util/error/error.c:202 src/util/error/error.c:239
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:201 src/util/error/error.c:238
+#: src/util/error/error.c:204 src/util/error/error.c:241
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:203 src/util/error/error.c:240
+#: src/util/error/error.c:206 src/util/error/error.c:243
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:205 src/util/error/error.c:242
+#: src/util/error/error.c:208 src/util/error/error.c:245
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:244
+#: src/util/error/error.c:210 src/util/error/error.c:247
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:209
+#: src/util/error/error.c:212
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:226
+#: src/util/error/error.c:229
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/error/error.c:245
+#: src/util/error/error.c:248
 msgid "NOTHING"
 msgstr "NADA"
 
-#: src/util/threads/mutex.c:144 src/util/threads/semaphore.c:166
-#: src/util/threads/pthread.c:154
+#: src/util/disk/storage.c:203
+#, 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:543
+#, fuzzy, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
+
+#: src/util/threads/mutex.c:146 src/util/threads/semaphore.c:168
+#: src/util/threads/pthread.c:157
 #, c-format
 msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:152 src/util/threads/mutex.c:194
+#: src/util/threads/mutex.c:155 src/util/threads/mutex.c:201
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/util/threads/mutex.c:156
+#: src/util/threads/mutex.c:160
 #, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:181
+#: src/util/threads/mutex.c:187
 #, c-format
 msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:198
+#: src/util/threads/mutex.c:207
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/util/threads/pthread.c:165 src/util/threads/pthread.c:171
-#: src/util/threads/pthread.c:176 src/util/threads/pthread.c:264
+#: src/util/threads/pthread.c:169 src/util/threads/pthread.c:176
+#: src/util/threads/pthread.c:182 src/util/threads/pthread.c:276
 #, 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:181 src/util/threads/pthread.c:273
+#: src/util/threads/pthread.c:188 src/util/threads/pthread.c:286
 #, 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:229
+#: src/util/loggers/file.c:236
 #, fuzzy, c-format
 msgid "Failed to open log-file `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/util/loggers/file.c:248
+#: src/util/loggers/file.c:257
 msgid "GNUnet error log"
 msgstr ""
 
-#: 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
+#: src/util/loggers/file.c:278 src/util/loggers/file.c:296
+#: src/include/gnunet_util_error.h:252 src/include/gnunet_util_error.h:259
+#: src/include/gnunet_util_error.h:266 src/include/gnunet_util_error.h:273
 #, 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
+#: src/util/loggers/memory.c:72
 msgid "Out of memory (for logging)"
 msgstr ""
 
@@ -3372,19 +4383,14 @@
 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
+#: src/util/getopt/setoption.c:59
 #, 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 ""
 "Setting option `%s' in section `%s' to `%s' when processing command line "
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:136 src/util/getopt/setoption.c:153
+#: src/util/getopt/setoption.c:138 src/util/getopt/setoption.c:155
 #, 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"
@@ -3395,836 +4401,126 @@
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/string/string.c:120
+#: src/util/boot/startup.c:251
+#, fuzzy, c-format
+msgid "Failed to run %s: %s %d\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/util/config/config.c:295
+#, 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/config.c:544
+#, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgstr ""
+
+#: src/util/config/config.c:592
+#, c-format
+msgid ""
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
+msgstr ""
+
+#: src/util/config/config.c:602
+#, c-format
+msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
+msgstr ""
+
+#: src/util/config/config.c:688
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
+msgstr ""
+
+#: src/util/string/string.c:55
 msgid "ms"
 msgstr "ms"
 
-#: src/util/string/string.c:126
+#: src/util/string/string.c:61
 msgid "s"
 msgstr "s"
 
-#: src/util/string/string.c:130
+#: src/util/string/string.c:65
 msgid "m"
 msgstr "m"
 
-#: src/util/string/string.c:134
+#: src/util/string/string.c:69
 msgid "h"
 msgstr "h"
 
-#: src/util/string/string.c:138
+#: src/util/string/string.c:73
 msgid " days"
 msgstr " días"
 
-#: src/util/string/string.c:154
+#: src/util/string/string.c:89
 msgid "b"
 msgstr "b"
 
-#: src/util/string/string.c:160
+#: src/util/string/string.c:95
 msgid "KiB"
 msgstr "KiB"
 
-#: src/util/string/string.c:164
+#: src/util/string/string.c:99
 msgid "MiB"
 msgstr "MiB"
 
-#: src/util/string/string.c:168
+#: src/util/string/string.c:103
 msgid "GiB"
 msgstr "GiB"
 
-#: src/util/string/string.c:172
+#: src/util/string/string.c:107
 #, fuzzy
 msgid "TiB"
 msgstr "KiB"
 
-#: src/util/string/string.c:284
+#: src/util/string/string.c:226
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: 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:61
-msgid "Tool to setup GNUnet."
-msgstr "Herramienta de configuración de GNUnet."
-
-#: 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:181
-msgid "No interface specified, using default\n"
-msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
-
-#: src/setup/gnunet-setup.c:255
-#, c-format
-msgid "`%s' is not available."
-msgstr "'%s' no esta disponible."
-
-#: 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:55
-msgid "list all network adapters"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:58
-msgid "install GNUnet as Windows service"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:61
-msgid "uninstall GNUnet service"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:64
-msgid "increase the maximum number of TCP/IP connections"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:67
-msgid "display a file's hash value"
-msgstr ""
-
-#: 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: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: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: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:141 src/setup/gnunet-win-tool.c:173
-#, c-format
-msgid "Unknown error.\n"
-msgstr "Error desconocido.\n"
-
-#: src/setup/gnunet-win-tool.c:154
-#, c-format
-msgid "Service deleted.\n"
-msgstr "Servicio eliminado.\n"
-
-#: 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:170
-#, c-format
-msgid "Error: can't delete service: %s\n"
-msgstr "Error: imposible borrar el servicio: %s\n"
-
-#: src/setup/gtk/gconf.c:387
-#, fuzzy
-msgid "Description"
-msgstr "Pregunta"
-
-#: src/setup/gtk/gconf.c:403
-msgid "Value"
-msgstr ""
-
-#: src/setup/gtk/gconf.c:427
-msgid "Default"
-msgstr ""
-
-#: src/setup/gtk/gconf.c:442 src/setup/ncurses/wizard_curs.c:73
-msgid "Help"
-msgstr "Ayuda"
-
-#: src/setup/gtk/gconf.c:456
-#, fuzzy
-msgid "Section"
-msgstr "Pregunta"
-
-#: src/setup/gtk/gconf.c:467
-#, fuzzy
-msgid "Option"
-msgstr "_Opciones"
-
-#: src/setup/gtk/gconf.c:490
-#, fuzzy
-msgid "Configuration saved."
-msgstr "Configuración de GNUnet"
-
-#: src/setup/gtk/gconf.c:500
-#, fuzzy
-msgid "Failed to save configuration."
-msgstr "Imposible guardar la configuración"
-
-#: 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:539
-#, fuzzy
-msgid "Error saving configuration."
-msgstr "Imposible guardar la configuración"
-
-#: src/setup/gtk/wizard_gtk.c:144
-#, fuzzy
-msgid "(unknown connection)"
-msgstr "Conexión de red"
-
-#: 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:437
-#, fuzzy
-msgid "Do you want to save the new configuration?"
-msgstr "¿Quieres guardar tu configuración?"
-
-#: 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:477
-msgid "Unable to change startup process:"
-msgstr "Imposible cambiar el proceso de arranque:"
-
-#: src/setup/gtk/wizard_gtk.c:492
-msgid ""
-"Running gnunet-update failed.\n"
-"This maybe due to insufficient permissions, please check your "
-"configuration.\n"
-"Finally, run gnunet-update manually."
-msgstr ""
-
-#: src/setup/text/conf.c:79
-#, fuzzy
-msgid "yes"
-msgstr "Bytes"
-
-#: src/setup/text/conf.c:80
-msgid "no"
-msgstr ""
-
-#: src/setup/text/conf.c:105
-#, c-format
-msgid "\tEnter yes (%s), no (%s) or help (%s): "
-msgstr ""
-
-#: src/setup/text/conf.c:114
-msgid "\tPossible choices:\n"
-msgstr ""
-
-#: src/setup/text/conf.c:122
-msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
-msgstr ""
-
-#: src/setup/text/conf.c:124
-#, c-format
-msgid "\tEnter string (type '%s' for default value `%s'): "
-msgstr ""
-
-#: src/setup/text/conf.c:142
-#, c-format
-msgid "\t Enter choice (default is %c): "
-msgstr ""
-
-#: src/setup/text/conf.c:146
-#, c-format
-msgid "\tEnter floating point (type '%s' for default value %f): "
-msgstr ""
-
-#: 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:186
-#, fuzzy, c-format
-msgid "Yes\n"
-msgstr "Sí"
-
-#: src/setup/text/conf.c:191
-#, fuzzy, c-format
-msgid "No\n"
-msgstr "No"
-
-#: 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: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:353 src/setup/text/conf.c:415
-#, c-format
-msgid ""
-"\n"
-"Invalid entry, try again (use '?' for help): "
-msgstr ""
-
-#: src/setup/text/conf.c:421
-#, c-format
-msgid "Unknown kind %x (internal error).  Skipping option.\n"
-msgstr ""
-
-#: src/setup/text/conf.c:482
-msgid "\tDescend? (y/n/?) "
-msgstr ""
-
-#: src/setup/text/conf.c:491
-msgid "Aborted.\n"
-msgstr ""
-
-#: src/setup/text/conf.c:504
-#, fuzzy
-msgid "Invalid entry.\n"
-msgstr "Argumento no válido: '%s'\n"
-
-#: src/setup/text/conf.c:521
-#, c-format
-msgid "Unknown kind %x (internal error).  Aborting.\n"
-msgstr ""
-
-#: 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:553
-#, c-format
-msgid "Use the '%s' key to abort.\n"
-msgstr ""
-
-#: 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:571
-#, c-format
-msgid ""
-"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
-"configuration. "
-msgstr ""
-
-#: 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:595
-#, fuzzy, c-format
-msgid "Configuration file `%s' written.\n"
-msgstr "Fichero de configuración '%s' creado.\n"
-
-#: src/setup/ncurses/mconf.c:85
-msgid "Exit"
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:88
-msgid "Up"
-msgstr "Arriba"
-
-#: src/setup/ncurses/mconf.c:91
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: 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:212 src/setup/ncurses/mconf.c:403
-msgid "Internal error! (Value invalid?)"
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:392
-msgid "Invalid input, expecting floating point value."
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:435
-msgid "Invalid input, expecting integer."
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:443
-msgid "Value is not in legal range."
-msgstr ""
-
-#: 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:517
-#, fuzzy
-msgid "Do you wish to save your new configuration?"
-msgstr "¿Quieres guardar tu configuración?"
-
-#: 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: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: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:80
-#, fuzzy
-msgid "Error!"
-msgstr "Error"
-
-#: src/setup/ncurses/wizard_curs.c:142
-#, fuzzy
-msgid "Abort"
-msgstr "_Acerca de"
-
-#: src/setup/ncurses/wizard_curs.c:143
-#, fuzzy
-msgid "Ok"
-msgstr "k"
-
-#: 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:211
-msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org/\n";
-"and join our community at\n"
-"\thttp://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"the GNUnet team"
-msgstr ""
-"¡Bienvenido a GNUnet!\n"
-"\n"
-"Este asistente te preguntará unas cuestiones básicas para configurar "
-"GNUnet.\n"
-"\n"
-"Por favor, visita nuestra página en\n"
-"\thttp://gnunet.org/\n";
-"y únete a nuestra comunidad en \n"
-"\thttp://gnunet.org/drupal/\n";
-"\n"
-"Diviertete,\n"
-"\n"
-"el equipo de GNUnet"
-
-#: src/setup/ncurses/wizard_curs.c:277
-msgid ""
-"Choose the network interface that connects your computer to the internet "
-"from the list below."
-msgstr ""
-"Escoge la interfaz de red que conecta tu ordenador a Internet de la lista de "
-"abajo."
-
-#: 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 ""
-"La \"Interfaz de red\" es el dispositivo que conecta tu ordenador a "
-"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:306
-#, fuzzy
-msgid "Network configuration: interface"
-msgstr "Interfaz de red:"
-
-#: 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:319
-#, fuzzy
-msgid "Network configuration: NAT"
-msgstr "Configuración de GNUnet"
-
-#: src/setup/ncurses/wizard_curs.c:320
-msgid ""
-"Is this machine behind NAT?\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
-"connections through modems, ISDN cards and DNAT (also known as \"port "
-"forwarding\")."
-msgstr ""
-"¿Tu máquina esta detrás de un NAT?\n"
-"\n"
-"Si tu estás conectado a Internet a través de otro ordenador haciendo SNAT, "
-"un router o un \"cortafuegos de hardware\" y otros ordenadores no pueden "
-"conectarse al tuyo a través de Internet directamente, responde \"si\" aquí. "
-"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:333
-#, fuzzy
-msgid "Network configuration: IP"
-msgstr "Configuración de GNUnet"
-
-#: src/setup/ncurses/wizard_curs.c:335
-#, fuzzy
-msgid "What is this computer's public IP address or hostname?"
-msgstr ""
-"¿Cuál es es la dirección pública IP o el nombre del dominio de éste "
-"ordenador?\n"
-"\n"
-"En caso de duda, dejar este campo en blanco."
-
-#: src/setup/ncurses/wizard_curs.c:336
-#, fuzzy
-msgid ""
-"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
-"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If left empty, GNUnet will try to automatically detect the IP.\n"
-"You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
-"If in doubt, leave this empty."
-msgstr ""
-"Si tu proveedor siempre te asigna la misma dirección IP (una IP \"estática"
-"\") introducela en el campo \"Dirección IP\". Si tu dirección IP cambia pero "
-"hay un nombre de dominio que siempre apunta a tu dirección IP actual (\"DNS "
-"dinámica\"), puedes introducirlo allí también.\n"
-"En caso de duda deja el campo en blanco. GNUnet intentará determinar tu "
-"dirección IP"
-
-#: src/setup/ncurses/wizard_curs.c:351
-#, fuzzy
-msgid "Bandwidth configuration: upload"
-msgstr "Configuración de GNUnet"
-
-#: 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:354
-#, fuzzy
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"upstream\" is the data channel through which data is *sent* to the "
-"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
-"you have a flatrate, you can set it to the maximum speed of your internet "
-"connection. You should not use a value that is higher than what your actual "
-"connection allows."
-msgstr ""
-"Puedes limitar el uso de recursos de GNUnet aquí.\n"
-"\n"
-"La \"subida\" es el canal de datos a través del cual los datos son "
-"*mandados* a Internet. El límite, o bien es el total máximo para este "
-"ordenador, o bien el que se le permita usar a GNUnet. Puedes especificar "
-"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:366
-#, fuzzy
-msgid "Bandwidth configuration: download"
-msgstr "Configuración de GNUnet"
-
-#: 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:369
-#, fuzzy
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"downstream\" is the data channel through which data is *received* from "
-"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
-"If you have a flatrate, you can set it to the maximum speed of your internet "
-"connection. You should not use a value that is higher than what your actual "
-"connection allows."
-msgstr ""
-"Puedes limitar el uso de recursos de GNUnet aquí.\n"
-"\n"
-"La \"bajada\" es el canal de datos a través del cuál los datos son "
-"*recibidos* de Internet. El límite, o bien es el total máximo de este "
-"ordenador, o bien el que se le permita usar a GNUnet. Puedes especificar "
-"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:381
-#, fuzzy
-msgid "Quota configuration"
-msgstr "Configuración de GNUnet"
-
-#: 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:383
-#, fuzzy
-msgid ""
-"The GNUnet datastore contains all content that GNUnet needs to store "
-"(indexed, inserted and migrated content)."
-msgstr ""
-"¿Cuál es el tamaño máximo de almacenamiento en MB?\n"
-"\n"
-"El almacenamiento de GNUnet contiene todos los datos que GNUnet genera "
-"(datos del índice, contenido insertado y migrado)."
-
-#: 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:394
-msgid "As which user should gnunetd be run?"
-msgstr ""
-
-#: 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 "
-"account under which the GNUnet service is started at system startup.\n"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the field empty to run GNUnet with system privileges.\n"
-msgstr ""
-"Define el usuario bajo el que correrán los servicios de GNUnet.\n"
-"\n"
-"Por razones de seguridad, es una buena idea dejar que la configuración cree "
-"una nueva cuenta de usuario bajo el cual el servicio de GNUnet es arrancado "
-"al iniciar el sistema.\n"
-"\n"
-"Por consiguiente, GNUnet no tiene la posibilidad de acceder a otros ficheros "
-"que no sean los que posee. Ésto incluye los ficheros que quieras publicar en "
-"GNUnet. Tendrás que garantizar que el usuario especificado aquí posea "
-"permisos de lectura.\n"
-"\n"
-"Deja los campos vacíos para arrancar GNUnet con privilegios de sistema.\n"
-"Usuario de GNUnet:"
-
-#: src/setup/ncurses/wizard_curs.c:411
-msgid "Daemon configuration: group account"
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:412
-msgid "As which group should gnunetd be run?"
-msgstr ""
-
-#: 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 "
-"for the chosen user account.\n"
-"\n"
-"You can also specify a already existant group here.\n"
-"\n"
-"Only members of this group will be allowed to start and stop the the GNUnet "
-"server and have access to GNUnet server data.\n"
-msgstr ""
-"Define el grupo bajo el que correrán los servicios de GNUnet aquí.\n"
-"\n"
-"Por razones de seguridad, es una buena idea dejar que la configuración cree "
-"un nuevo grupo para la cuenta de usuario creada.\n"
-"\n"
-"Puedes especificar un grupo ya existente aquí.\n"
-"\n"
-"Sólo los miembros de este grupo esta autorizados a arrancar y parar el "
-"servidor de GNUnet y tener acceso a los datos del servidor de GNUnet.\n"
-"\n"
-"Grupo de GNUnet:"
-
-#: 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:430
-#, fuzzy
-msgid ""
-"If you say \"yes\" here, the GNUnet background process will be automatically "
-"started when you turn on your computer. If you say \"no\" here, you have to "
-"launch GNUnet yourself each time you want to use it."
-msgstr ""
-"¿Quieres arrancar GNUnet como un servicio de sistema?\n"
-"n\n"
-"Si dices \"sí\" aquí, el proceso en segundo plano de GNUnet sera "
-"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:471
-#, fuzzy
-msgid "Unable to create user account for daemon."
-msgstr "Imposible crear la cuenta de usuario:"
-
-#: src/setup/ncurses/wizard_curs.c:478
-msgid "Unable to setup autostart for daemon."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:493
-#, fuzzy
-msgid "Save configuration?"
-msgstr "Configuración de GNUnet"
-
-#: src/setup/ncurses/wizard_curs.c:494
-#, fuzzy
-msgid "Save configuration now?"
-msgstr "Configuración de GNUnet"
-
-#: src/setup/ncurses/wizard_curs.c:538
-msgid "Back"
-msgstr "Atrás"
-
-#: src/setup/lib/gns.c:294
-#, fuzzy, c-format
-msgid ""
-"Configuration does not satisfy constraints of configuration specification "
-"file `%s'!\n"
-msgstr ""
-"La configuración debe especificar un directorio para los datos FS en la "
-"sección '%s' bajo'%s'.\n"
-
-#: 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:110
-msgid "Can't open Service Control Manager"
-msgstr "Imposible abrir el Service Control Manager"
-
-#: src/setup/lib/wizard_util.c:116
-msgid "Can't create service"
-msgstr "Imposible crear el servicio"
-
-#: 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:125
-msgid "Cannot write to the regisitry"
-msgstr "Imposible escribir en el registro"
-
-#: src/setup/lib/wizard_util.c:128
-msgid "Can't access the service"
-msgstr "Imposible acceder al servicio"
-
-#: src/setup/lib/wizard_util.c:131
-msgid "Can't delete the service"
-msgstr "Imposible borrar el servicio"
-
-#: src/setup/lib/wizard_util.c:134
-msgid "Unknown error"
-msgstr "Error desconocido"
-
-#: 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:174
-msgid "Error creating user"
-msgstr "Error creando usuario"
-
-#: 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:183
-msgid "Error granting service right to user"
-msgstr "Error garantizando el servicio correcto al usuario"
-
-#: 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:153
+#: src/include/gnunet_util_getopt.h:154
 msgid "print this help"
 msgstr "imprime esta ayuda"
 
-#: src/include/gnunet_util_getopt.h:162
+#: src/include/gnunet_util_getopt.h:163
 msgid "print the version number"
 msgstr "imprime el número de versión"
 
-#: src/include/gnunet_util_getopt.h:168
+#: src/include/gnunet_util_getopt.h:169
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:174
+#: src/include/gnunet_util_getopt.h:175
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:180
+#: src/include/gnunet_util_getopt.h:181
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "usa el fichero de configuración FILENAME"
 
-#: src/include/gnunet_util_getopt.h:186
+#: src/include/gnunet_util_getopt.h:187
 #, 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:212 src/include/gnunet_util_error.h:214
-#: src/include/gnunet_util_error.h:220 src/include/gnunet_util_error.h:236
+#: src/include/gnunet_util_error.h:221 src/include/gnunet_util_error.h:223
+#: src/include/gnunet_util_error.h:229 src/include/gnunet_util_error.h:245
 #, 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:230
+#: src/include/gnunet_util_error.h:239
 #, c-format
 msgid ""
 "External protocol violation: assertion failed at %s:%d in %s (no need to "
 "panic, we can handle this).\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
+#: src/include/gnunet_util_error.h:280 src/include/gnunet_util_error.h:287
 #, 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"
@@ -4369,23 +4665,35 @@
 "configuration here.  Default is no proxy."
 msgstr ""
 
-#: contrib/config-daemon.scm:224 contrib/config-client.scm:144
+#: contrib/config-daemon.scm:210
+msgid ""
+"Name of the directory where gnunetd should store contact information about "
+"peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:212
+msgid ""
+"Unless you want to share the directory directly using a webserver, the "
+"default is most likely just fine."
+msgstr ""
+
+#: contrib/config-daemon.scm:238 contrib/config-client.scm:144
 msgid "How long should logs be kept?"
 msgstr ""
 
-#: contrib/config-daemon.scm:226 contrib/config-client.scm:146
+#: contrib/config-daemon.scm:240 contrib/config-client.scm:146
 msgid ""
 "How long should logs be kept? If you specify a value greater than zero, a "
 "log is created each day with the date appended to its filename. These logs "
 "are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
 msgstr ""
 
-#: contrib/config-daemon.scm:237
+#: contrib/config-daemon.scm:251
 msgid ""
 "What maximum number of open file descriptors should be requested from the OS?"
 msgstr ""
 
-#: contrib/config-daemon.scm:239
+#: contrib/config-daemon.scm:253
 msgid ""
 "The default of 1024 should be fine for most systems.  If your system can "
 "support more, increasing the number might help support additional clients on "
@@ -4397,62 +4705,66 @@
 "run with what it is given."
 msgstr ""
 
-#: contrib/config-daemon.scm:250
+#: contrib/config-daemon.scm:264
 msgid "Where should gnunetd write the logs?"
 msgstr ""
 
-#: contrib/config-daemon.scm:262 contrib/config-client.scm:169
+#: contrib/config-daemon.scm:276
+msgid "Enable for extra-verbose logging."
+msgstr ""
+
+#: contrib/config-daemon.scm:288 contrib/config-client.scm:169
 msgid "Logging"
 msgstr ""
 
-#: contrib/config-daemon.scm:263 contrib/config-client.scm:170
+#: contrib/config-daemon.scm:289 contrib/config-client.scm:170
 msgid "Specify which system messages should be logged how"
 msgstr ""
 
-#: contrib/config-daemon.scm:267 contrib/config-client.scm:174
+#: contrib/config-daemon.scm:294 contrib/config-client.scm:174
 msgid "Logging of events for users"
 msgstr ""
 
-#: contrib/config-daemon.scm:268 contrib/config-client.scm:175
+#: contrib/config-daemon.scm:295 contrib/config-client.scm:175
 msgid "Logging of events for the system administrator"
 msgstr ""
 
-#: contrib/config-daemon.scm:280
+#: contrib/config-daemon.scm:307
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:281
+#: contrib/config-daemon.scm:308
 msgid ""
 "The default is no longer /var/run/gnunetd.pid since we could not delete the "
 "file on shutdown at that location."
 msgstr ""
 
-#: contrib/config-daemon.scm:293
+#: contrib/config-daemon.scm:320
 msgid "As which user should gnunetd run?"
 msgstr ""
 
-#: contrib/config-daemon.scm:295
+#: contrib/config-daemon.scm:322
 msgid ""
 "Empty means \"current user\". On computer startup, it is root/SYSTEM.  Under "
 "Windows, this setting affects the creation of a new system service only."
 msgstr ""
 
-#: contrib/config-daemon.scm:308
+#: contrib/config-daemon.scm:335
 msgid "Should gnunetd be automatically started when the system boots?"
 msgstr ""
 
-#: contrib/config-daemon.scm:309
+#: contrib/config-daemon.scm:336
 msgid ""
 "Set to YES if gnunetd should be automatically started on boot.  If this "
 "option is set, gnunet-setup will install a script to start the daemon upon "
 "completion.  This option may not work on all systems."
 msgstr ""
 
-#: contrib/config-daemon.scm:321
+#: contrib/config-daemon.scm:348
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:323
+#: contrib/config-daemon.scm:350
 msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
 "available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
@@ -4466,11 +4778,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:337
+#: contrib/config-daemon.scm:364
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:339
+#: contrib/config-daemon.scm:366
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -4507,11 +4819,11 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:368
+#: contrib/config-daemon.scm:395
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:369
+#: contrib/config-daemon.scm:396
 msgid ""
 "This option can be used to tell gnunetd not to open the client port.  When "
 "run like this, gnunetd will participate as a peer in the network but not "
@@ -4520,11 +4832,11 @@
 "prevent you from running diagnostic tools like gnunet-stats!"
 msgstr ""
 
-#: contrib/config-daemon.scm:381
+#: contrib/config-daemon.scm:408
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:382
+#: contrib/config-daemon.scm:409
 msgid ""
 "The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
 "peer to peers of which the hostkey has been copied by hand to data/hosts;  "
@@ -4536,15 +4848,15 @@
 "lines above would need some minor editing :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:393
+#: contrib/config-daemon.scm:420
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:405
+#: contrib/config-daemon.scm:432
 msgid "Disable automatic establishment of connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:406
+#: contrib/config-daemon.scm:433
 msgid ""
 "If this option is enabled, GNUnet will not automatically establish "
 "connections to other peers, but instead wait for applications to "
@@ -4552,22 +4864,22 @@
 "connect to us)."
 msgstr ""
 
-#: contrib/config-daemon.scm:417
+#: contrib/config-daemon.scm:444
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:418
+#: contrib/config-daemon.scm:445
 msgid ""
 "This option maybe useful during testing, but turning it off is dangerous! If "
 "in any doubt, set it to YES (which is the default)."
 msgstr ""
 
-#: contrib/config-daemon.scm:429
+#: contrib/config-daemon.scm:456
 #, fuzzy
 msgid "Port for communication with GNUnet user interfaces"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: contrib/config-daemon.scm:430
+#: contrib/config-daemon.scm:457
 msgid ""
 "Which is the client-server port that is used between gnunetd and the clients "
 "(TCP only).  You may firewall this port for non-local machines (but you do "
@@ -4575,11 +4887,11 @@
 "connections from machines that are listed under TRUSTED)."
 msgstr ""
 
-#: contrib/config-daemon.scm:441
+#: contrib/config-daemon.scm:468
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:442
+#: contrib/config-daemon.scm:469
 msgid ""
 "This option specifies which hosts are trusted enough to connect as clients "
 "(to the TCP port).  This is useful if you run gnunetd on one host of your "
@@ -4590,71 +4902,71 @@
 "separated by a semicolon, spaces are not allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:481
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:455
+#: contrib/config-daemon.scm:482
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If it is set, "
 "only the specified peers are allowed. Specify the list of peer IDs (not IPs!)"
 msgstr ""
 
-#: contrib/config-daemon.scm:466
+#: contrib/config-daemon.scm:493
 #, fuzzy
 msgid "Run gnunetd as this group."
 msgstr "Ejecutar gnunet-update"
 
-#: contrib/config-daemon.scm:467
+#: contrib/config-daemon.scm:494
 msgid ""
 "When started as root, gnunetd will change permissions to the given group."
 msgstr ""
 
-#: contrib/config-daemon.scm:478
+#: contrib/config-daemon.scm:505
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:479
+#: contrib/config-daemon.scm:506
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If the ID of a "
 "peer is listed here, connections from that peer will be refused.  Specify "
 "the list of peer IDs (not IPs!)"
 msgstr ""
 
-#: contrib/config-daemon.scm:490
+#: contrib/config-daemon.scm:517
 msgid "Topology Maintenance"
 msgstr ""
 
-#: contrib/config-daemon.scm:491
+#: contrib/config-daemon.scm:518
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:511
+#: contrib/config-daemon.scm:538
 #, fuzzy
 msgid "General settings"
 msgstr "Otras configuraciones"
 
-#: contrib/config-daemon.scm:512
+#: contrib/config-daemon.scm:539
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:536
+#: contrib/config-daemon.scm:564
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:537
+#: contrib/config-daemon.scm:565
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:554
+#: contrib/config-daemon.scm:583
 msgid "Fundamentals"
 msgstr ""
 
-#: contrib/config-daemon.scm:574
+#: contrib/config-daemon.scm:603
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:576
+#: contrib/config-daemon.scm:605
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -4663,56 +4975,93 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:589
+#: contrib/config-daemon.scm:618 contrib/config-daemon.scm:631
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:591
+#: contrib/config-daemon.scm:619
+msgid "Which database should be used for the temporary datastore of the DHT?"
+msgstr ""
+
+#: contrib/config-daemon.scm:633
 msgid ""
-"Which topology should be used?  The only options at the moment are "
-"\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
-"to connect to a diverse set of peers, and welcome connections from anyone.  "
-"In f2f (friend-to-friend) mode, GNUnet will only allow connections from "
-"peers that are explicitly listed in a FRIENDS file.  Note that you can list "
-"peers in the FRIENDS file that run in default mode.\n"
-"\n"
-"Use f2f only if you have (trustworthy) friends that use GNUnet and are "
-"afraid of establishing (direct) connections to unknown peers."
+"Which topology should be used?  The only option at the moment is "
+"\"topology_default\""
 msgstr ""
 
-#: contrib/config-daemon.scm:607
+#: contrib/config-daemon.scm:647
+msgid ""
+"Minimum number of connected friends before this peer is allowed to connect "
+"to peers that are not listed as friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:648
+msgid ""
+"Note that this option does not guarantee that the peer will be able to "
+"connect to the specified number of friends.  Also, if the peer had connected "
+"to a sufficient number of friends and then established non-friend "
+"connections, some of the friends may drop out of the network, temporarily "
+"resulting in having fewer than the specified number of friends connected "
+"while being connected to non-friends.  However, it is guaranteed that the "
+"peer itself will never choose to drop a friend's connection if this would "
+"result in dropping below the specified number of friends (unless that number "
+"is higher than the overall connection target)."
+msgstr ""
+
+#: contrib/config-daemon.scm:659
+msgid ""
+"If set to YES, the peer is only allowed to connect to other peers that are "
+"explicitly specified as friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:660
+msgid ""
+"Use YES only if you have (trustworthy) friends that use GNUnet and are "
+"afraid of establishing (direct) connections to unknown peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:671
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:608
+#: contrib/config-daemon.scm:672
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:622
+#: contrib/config-daemon.scm:683
+msgid "Friend-to-Friend Topology Specification"
+msgstr ""
+
+#: contrib/config-daemon.scm:684
+#, fuzzy
+msgid "Settings for restricting connections to friends"
+msgstr "'%s' falló. Finalizando conexión con el cleinte.\n"
+
+#: contrib/config-daemon.scm:701
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:634
+#: contrib/config-daemon.scm:713
 #, fuzzy
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: contrib/config-daemon.scm:646
+#: contrib/config-daemon.scm:725
 #, fuzzy
 msgid "Configuration of the MySQL database"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: contrib/config-daemon.scm:665
+#: contrib/config-daemon.scm:744
 #, fuzzy
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr "activa la compartición de ficheros anónima"
 
-#: contrib/config-daemon.scm:667
+#: contrib/config-daemon.scm:746
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -4723,19 +5072,19 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:681
+#: contrib/config-daemon.scm:760
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:693
+#: contrib/config-daemon.scm:772
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:706
+#: contrib/config-daemon.scm:785
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:708
+#: contrib/config-daemon.scm:787
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -4747,13 +5096,13 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:722
+#: contrib/config-daemon.scm:801
 msgid ""
 "MB of diskspace GNUnet can use for caching DHT index data (the data will be "
 "stored in /tmp)"
 msgstr ""
 
-#: contrib/config-daemon.scm:723
+#: contrib/config-daemon.scm:802
 msgid ""
 "DHT index data is inherently small and expires comparatively quickly.  It is "
 "deleted whenever gnunetd is shut down.\n"
@@ -4761,21 +5110,21 @@
 "The size of the DSTORE QUOTA is specified in MB."
 msgstr ""
 
-#: contrib/config-daemon.scm:737
+#: contrib/config-daemon.scm:816
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "activa la compartición de ficheros anónima"
 
-#: contrib/config-daemon.scm:756
+#: contrib/config-daemon.scm:835
 #, fuzzy
 msgid "Applications"
 msgstr "_Opciones"
 
-#: contrib/config-daemon.scm:772
+#: contrib/config-daemon.scm:851
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:773
+#: contrib/config-daemon.scm:852
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port and that cannot be traversed using UPnP.  Note "
@@ -4785,18 +5134,21 @@
 "contact you directly.  You can use 'make check' in src/transports/upnp/ to "
 "find out if your NAT supports UPnP.  You can also use gnunet-transport-check "
 "with the '-p' option in order to determine which setting results in more "
-"connections.  Use YES only if you get no connections otherwise."
+"connections.  Use YES only if you get no connections otherwise.  Set to AUTO "
+"to use YES if the local IP is belongs to a private IP network and NO "
+"otherwise."
 msgstr ""
 
-#: contrib/config-daemon.scm:784
+#: contrib/config-daemon.scm:863
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:796 contrib/config-daemon.scm:901
+#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:941
+#: contrib/config-daemon.scm:1078
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:797
+#: contrib/config-daemon.scm:876
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP.  You should disable this option if you are sure that you are "
@@ -4804,30 +5156,38 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:808 contrib/config-daemon.scm:925
-#: contrib/config-daemon.scm:980 contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:887 contrib/config-daemon.scm:1102
+#: contrib/config-daemon.scm:1157 contrib/config-daemon.scm:1222
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:820
+#: contrib/config-daemon.scm:899
 msgid ""
 "Which IPs are allowed to connect? Leave empty to use the IP of your primary "
 "network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:832
+#: contrib/config-daemon.scm:911
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:850
+#: contrib/config-daemon.scm:929
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:862
+#: contrib/config-daemon.scm:942 contrib/config-daemon.scm:1079
+msgid ""
+"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
+"supports UPnP. You should disable this option if you are sure that you are "
+"not behind a NAT.  If your NAT box does not support UPnP, having this on "
+"will not do much harm (only cost a small amount of resources)."
+msgstr ""
+
+#: contrib/config-daemon.scm:953
 msgid "Which is the external port of the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:863
+#: contrib/config-daemon.scm:954
 msgid ""
 "Use this option if your firewall maps say port 80 to your real HTTP port.  "
 "This can be useful in making the HTTP messages appear even more legit "
@@ -4835,91 +5195,129 @@
 "priviledged port)."
 msgstr ""
 
-#: contrib/config-daemon.scm:874
+#: contrib/config-daemon.scm:965
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:889
-msgid "Which port should be used by the UDP IPv4 transport?"
+#: contrib/config-daemon.scm:984
+msgid "What is the maximum transfer unit for SMTP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:902
+#: contrib/config-daemon.scm:996
+msgid "Which e-mail address should be used to send e-mail to this peer?"
+msgstr ""
+
+#: contrib/config-daemon.scm:997
 msgid ""
-"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
-"supports UPnP. You should disable this option if you are sure that you are "
-"not behind a NAT.  If your NAT box does not support UPnP, having this on "
-"will not do much harm (only cost a small amount of resources)."
+"You must make sure that e-mail received at this address is forwarded to the "
+"PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with "
+"procmail and the PIPE option to set the name of the pipe."
 msgstr ""
 
-#: contrib/config-daemon.scm:913
+#: contrib/config-daemon.scm:1008
+msgid ""
+"Which header line should other peers include in e-mails to enable filtering?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1009
+msgid ""
+"You can specify a header line here which can then be used by procmail to "
+"filter GNUnet e-mail from your inbox and forward it to gnunetd."
+msgstr ""
+
+#: contrib/config-daemon.scm:1020
+msgid "What is the filename of the pipe where gnunetd can read its e-mail?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1021
+msgid "Have a look at contrib/dot-procmailrc for an example .procmailrc file."
+msgstr ""
+
+#: contrib/config-daemon.scm:1032
+msgid "What is the name and port of the server for outgoing e-mail?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1033
+msgid "The basic format is HOSTNAME:PORT."
+msgstr ""
+
+#: contrib/config-daemon.scm:1044
+msgid "SMTP transport"
+msgstr ""
+
+#: contrib/config-daemon.scm:1066
+msgid "Which port should be used by the UDP IPv4 transport?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1090
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:937
+#: contrib/config-daemon.scm:1114
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow connections from any "
 "IP."
 msgstr ""
 
-#: contrib/config-daemon.scm:949
+#: contrib/config-daemon.scm:1126
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:968
+#: contrib/config-daemon.scm:1145
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:992 contrib/config-daemon.scm:1057
+#: contrib/config-daemon.scm:1169 contrib/config-daemon.scm:1234
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow any IP to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:1004
+#: contrib/config-daemon.scm:1181
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1021
+#: contrib/config-daemon.scm:1198
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1033
+#: contrib/config-daemon.scm:1210
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1069
+#: contrib/config-daemon.scm:1246
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1087
+#: contrib/config-daemon.scm:1264
 #, fuzzy
 msgid "Network interface"
 msgstr "Interfaz de red:"
 
-#: contrib/config-daemon.scm:1099
+#: contrib/config-daemon.scm:1276
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1111
+#: contrib/config-daemon.scm:1288
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1123
+#: contrib/config-daemon.scm:1300
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1146
+#: contrib/config-daemon.scm:1324
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1158
+#: contrib/config-daemon.scm:1336
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1170
+#: contrib/config-daemon.scm:1348
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1172
+#: contrib/config-daemon.scm:1350
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -4929,11 +5327,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1183
+#: contrib/config-daemon.scm:1361
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1185
+#: contrib/config-daemon.scm:1363
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4943,36 +5341,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1196
+#: contrib/config-daemon.scm:1374
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1197
+#: contrib/config-daemon.scm:1375
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1208
+#: contrib/config-daemon.scm:1386
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1209
+#: contrib/config-daemon.scm:1387
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1220
+#: contrib/config-daemon.scm:1398
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1232
+#: contrib/config-daemon.scm:1410
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1234
+#: contrib/config-daemon.scm:1412
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -5017,12 +5415,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1251
+#: contrib/config-daemon.scm:1429
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Interfaz de red:"
 
-#: contrib/config-daemon.scm:1252
+#: contrib/config-daemon.scm:1430
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -5033,12 +5431,12 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1263
+#: contrib/config-daemon.scm:1441
 #, fuzzy
 msgid "Load management"
 msgstr "Argumentos en la linea de comandos inválidos.\n"
 
-#: contrib/config-daemon.scm:1288 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1466 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -5172,399 +5570,718 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Configuration of the logging system"
-#~ msgstr ""
-#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%"
-#~ "s'!\n"
+#: src/setup/gtk/gnunet-setup.glade:9 src/setup/gtk/gnunet-setup.glade:167
+#: src/setup/gtk/gnunet-setup.glade:435 src/setup/gtk/gnunet-setup.glade:845
+#: src/setup/gtk/gnunet-setup.glade:1178
+msgid "GNUnet configuration assistant"
+msgstr "Asistente de configuración de GNUnet"
 
-#, fuzzy
-#~ msgid "Run gnunetd as this user."
-#~ msgstr "Ejecutar gnunet-update"
+#: src/setup/gtk/gnunet-setup.glade:34
+msgid ""
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org\n";
+"and join our community at\n"
+"\thttps://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"The GNUnet team"
+msgstr ""
+"¡Bienvenido a GNUnet!\n"
+"\n"
+"Este asistente le preguntará unos datos básicos para configurar GNUnet.\n"
+"\n"
+"Por favor, visite nuestra página en\n"
+"\thttps://gnunet.org/drupal/\n";
+"\n"
+"Diviertase,\n"
+"\n"
+"El equipo de GNUnet"
 
-#, fuzzy
-#~ msgid "Run gnunetd during system startup?"
-#~ msgstr "Ejecutar gnunet-update"
+#: src/setup/gtk/gnunet-setup.glade:92 src/setup/gtk/gnunet-setup.glade:360
+#: src/setup/gtk/gnunet-setup.glade:767 src/setup/gtk/gnunet-setup.glade:1384
+msgid "Next"
+msgstr "Siguiente"
 
-#, fuzzy
-#~ msgid "Path settings"
-#~ msgstr "Otras configuraciones"
+#: src/setup/gtk/gnunet-setup.glade:194
+msgid ""
+"Enter information about your network connection here.\n"
+"\n"
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL.\n"
+"\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address.\n"
+"\n"
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, check the last option on this page. Leave it "
+"unchecked on direct connections through modems, ISDN cards and DNAT (also "
+"known as \"port forwarding\")."
+msgstr ""
+"Introduce información acerca de tu conexión aquí.\n"
+"\n"
+"La \"Interfaz de red\" es el dispositivo que conecta tu ordenador a "
+"Internet. Normalmente es un módem, una tarjeta de RDSI, un módem ADSL o una "
+"tarjeta de red en el caso de un router.\n"
+"\n"
+"Si tu proveedor siempre te da la misma dirección IP (una dirección IP "
+"\"estática\") introducelo en el campo \"Dirección IP\". Si tu dirección IP "
+"cambia (una dirección IP \"dinámica\") pero hay un nombre de dominio que "
+"siempre apunta a tu dirección IP actual (\"DNS dinámica\") también puedes "
+"introducirla aquí.\n"
+"En caso de duda deja el campo vacío. GNUnet intentara determinar tu "
+"dirección IP automaticamente.\n"
+"\n"
+"Si tu estas conectado a Internet a través de otro ordenador haciendo SNAT, a "
+"un router o a un \"cortafuegos de hardware\" y otros ordenadores no pueden "
+"conectar con tu ordenador marca la última opción en ésta página. Déjala sin "
+"marcar en conexiones directas a través de modems, tarjetas de RDSI y DNAT "
+"(también conocido como \"seguimiento de puertos\")."
 
-#~ msgid "specify nickname"
-#~ msgstr "especifica el apodo"
+#: src/setup/gtk/gnunet-setup.glade:250
+msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+msgstr "El ordenador no puede recibir conexiones entrantes (SNAT/Cortafuegos)"
 
-#~ msgid "Start GNUnet chat client."
-#~ msgstr "Arranca el cliente de chat de GNUnet"
+#: src/setup/gtk/gnunet-setup.glade:283
+msgid "IP-Address/Hostname:"
+msgstr "Dirección IP/Nombre del dominio"
 
-#~ 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"
-
+#: src/setup/gtk/gnunet-setup.glade:296
 #, 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 "Network interface:"
+msgstr "Interfaz de red:"
 
-#~ 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"
-
-#~ msgid ""
-#~ "Welcome to GNUnet!\n"
-#~ "\n"
-#~ "This assistant will ask you a few basic questions in order to configure "
-#~ "GNUnet.\n"
-#~ "\n"
-#~ "Please visit our homepage at\n"
-#~ "\thttp://gnunet.org\n";
-#~ "and join our community at\n"
-#~ "\thttps://gnunet.org/drupal/\n";
-#~ "\n"
-#~ "Have a lot of fun,\n"
-#~ "\n"
-#~ "The GNUnet team"
-#~ msgstr ""
-#~ "¡Bienvenido a GNUnet!\n"
-#~ "\n"
-#~ "Este asistente le preguntará unos datos básicos para configurar GNUnet.\n"
-#~ "\n"
-#~ "Por favor, visite nuestra página en\n"
-#~ "\thttps://gnunet.org/drupal/\n";
-#~ "\n"
-#~ "Diviertase,\n"
-#~ "\n"
-#~ "El equipo de GNUnet"
-
-#~ msgid "Next"
-#~ msgstr "Siguiente"
-
-#~ msgid ""
-#~ "Enter information about your network connection here.\n"
-#~ "\n"
-#~ "The \"Network interface\" is the device that connects your computer to "
-#~ "the internet. This is usually a modem, an ISDN card or a network card in "
-#~ "case you are using DSL.\n"
-#~ "\n"
-#~ "If your provider always assigns the same IP-Address to you (a \"static\" "
-#~ "IP-Address), enter it into the \"IP-Address\" field. If your IP-Address "
-#~ "changes every now and then (\"dynamic\" IP-Address) but there's a "
-#~ "hostname that always points to your actual IP-Address (\"Dynamic DNS\"), "
-#~ "you can also enter it here.\n"
-#~ "If in doubt, leave the field empty. GNUnet will then try to determine "
-#~ "your IP-Address.\n"
-#~ "\n"
-#~ "If you are connected to the internet through another computer doing SNAT, "
-#~ "a router or a \"hardware firewall\" and other computers on the internet "
-#~ "cannot connect to this computer, check the last option on this page. "
-#~ "Leave it unchecked on direct connections through modems, ISDN cards and "
-#~ "DNAT (also known as \"port forwarding\")."
-#~ msgstr ""
-#~ "Introduce información acerca de tu conexión aquí.\n"
-#~ "\n"
-#~ "La \"Interfaz de red\" es el dispositivo que conecta tu ordenador a "
-#~ "Internet. Normalmente es un módem, una tarjeta de RDSI, un módem ADSL o "
-#~ "una tarjeta de red en el caso de un router.\n"
-#~ "\n"
-#~ "Si tu proveedor siempre te da la misma dirección IP (una dirección IP "
-#~ "\"estática\") introducelo en el campo \"Dirección IP\". Si tu dirección "
-#~ "IP cambia (una dirección IP \"dinámica\") pero hay un nombre de dominio "
-#~ "que siempre apunta a tu dirección IP actual (\"DNS dinámica\") también "
-#~ "puedes introducirla aquí.\n"
-#~ "En caso de duda deja el campo vacío. GNUnet intentara determinar tu "
-#~ "dirección IP automaticamente.\n"
-#~ "\n"
-#~ "Si tu estas conectado a Internet a través de otro ordenador haciendo "
-#~ "SNAT, a un router o a un \"cortafuegos de hardware\" y otros ordenadores "
-#~ "no pueden conectar con tu ordenador marca la última opción en ésta "
-#~ "página. Déjala sin marcar en conexiones directas a través de modems, "
-#~ "tarjetas de RDSI y DNAT (también conocido como \"seguimiento de puertos"
-#~ "\")."
-
+#: src/setup/gtk/gnunet-setup.glade:319
 #, fuzzy
-#~ msgid "Network interface:"
-#~ msgstr "Interfaz de red:"
+msgid "Network connection"
+msgstr "Configuración de GNUnet"
 
-#~ msgid "IP-Address/Hostname:"
-#~ msgstr "Dirección IP/Nombre del dominio"
+#: src/setup/gtk/gnunet-setup.glade:462
+msgid ""
+"You can limit GNUnet's ressource usage here.\n"
+"\n"
+"\"Bandwidth limitation\" is how much data may be sent per second. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection.\n"
+"\n"
+"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
+"to use."
+msgstr ""
+"Puedes limitar el uso de recursos de GNUnet aquí.\n"
+"\n"
+"\"Limitación de ancho de banda\" es cuantos datos pueden ser mandados por "
+"segundo. Si tienes una tarifa plana puedes seleccionar la velocidad máxima "
+"de tu conexión a Internet.\n"
+"\n"
+"El \"Uso máximo de CPU\" es el porcentaje del tiempo de procesado que GNUnet "
+"puede usar."
 
-#~ msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
-#~ msgstr ""
-#~ "El ordenador no puede recibir conexiones entrantes (SNAT/Cortafuegos)"
+#: src/setup/gtk/gnunet-setup.glade:520
+msgid "Downstream (Bytes/s):"
+msgstr "Bajada (Bytes/s):"
 
-#, fuzzy
-#~ msgid "Network connection"
-#~ msgstr "Configuración de GNUnet"
+#: src/setup/gtk/gnunet-setup.glade:547
+msgid "Upstream (Bytes/s):"
+msgstr "Subida (Bytes/s):"
 
-#~ msgid ""
-#~ "You can limit GNUnet's ressource usage here.\n"
-#~ "\n"
-#~ "\"Bandwidth limitation\" is how much data may be sent per second. If you "
-#~ "have a flatrate you can set it to the maximum speed of your internet "
-#~ "connection.\n"
-#~ "\n"
-#~ "The \"Max. CPU usage\" is the percentage of processor time GNUnet is "
-#~ "allowed to use."
-#~ msgstr ""
-#~ "Puedes limitar el uso de recursos de GNUnet aquí.\n"
-#~ "\n"
-#~ "\"Limitación de ancho de banda\" es cuantos datos pueden ser mandados por "
-#~ "segundo. Si tienes una tarifa plana puedes seleccionar la velocidad "
-#~ "máxima de tu conexión a Internet.\n"
-#~ "\n"
-#~ "El \"Uso máximo de CPU\" es el porcentaje del tiempo de procesado que "
-#~ "GNUnet puede usar."
+#: src/setup/gtk/gnunet-setup.glade:561
+msgid "Bandwidth limitation"
+msgstr "Limitación del ancho de banda"
 
-#~ msgid "Upstream (Bytes/s):"
-#~ msgstr "Subida (Bytes/s):"
+#: src/setup/gtk/gnunet-setup.glade:580
+msgid "Use denoted bandwidth for GNUnet"
+msgstr "Usa el ancho de banda marcado para GNUnet"
 
-#~ msgid "Downstream (Bytes/s):"
-#~ msgstr "Bajada (Bytes/s):"
+#: src/setup/gtk/gnunet-setup.glade:596
+msgid "Share denoted bandwidth with other applications"
+msgstr "Comparte el ancho de banda marcado con otras aplicaciones"
 
-#~ msgid "Bandwidth limitation"
-#~ msgstr "Limitación del ancho de banda"
+#: src/setup/gtk/gnunet-setup.glade:614
+msgid "Bandwidth sharing"
+msgstr "Ancho de banda compartido"
 
-#~ msgid "Use denoted bandwidth for GNUnet"
-#~ msgstr "Usa el ancho de banda marcado para GNUnet"
+#: src/setup/gtk/gnunet-setup.glade:636
+msgid "Max. CPU usage (%):"
+msgstr "Uso máximo de la CPU (%):"
 
-#~ msgid "Share denoted bandwidth with other applications"
-#~ msgstr "Comparte el ancho de banda marcado con otras aplicaciones"
+#: src/setup/gtk/gnunet-setup.glade:659
+msgid "CPU usage"
+msgstr "Uso de CPU"
 
-#~ msgid "Bandwidth sharing"
-#~ msgstr "Ancho de banda compartido"
+#: src/setup/gtk/gnunet-setup.glade:682
+msgid "Load limitation"
+msgstr "Limitación de carga"
 
-#~ msgid "Max. CPU usage (%):"
-#~ msgstr "Uso máximo de la CPU (%):"
+#: src/setup/gtk/gnunet-setup.glade:872
+msgid ""
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability.\n"
+"\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content). Its maximum size can be specified below.\n"
+"\n"
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
+"\n"
+"After changing the configuration and/or updating GNUnet, it is sometimes "
+"required to run gnunet-update to update internal data structures. Depending "
+"on the changes made, this may take some time."
+msgstr ""
+"GNUnet es capaz de almacenar datos de otros pares en tu base de datos. Ésto "
+"es útil si un adversario tiene acceso a tu contenido y tu necesitas negar "
+"que ese contenido sea tuyo. Con la \"migración de contenido\" activada, tu "
+"contenido puede haber \"migrado\" por Internet hasta tu nodo sin tu "
+"conocimiento.\n"
+"Ésto también ayuda a difundir contenidos populares por diferentes pares para "
+"facilitar su disponibilidad.\n"
+"\n"
+"La base de datos de GNUnet contiene todos los datos que GNUnet genera "
+"(índices, contenido insertado y descargado). Su máximo tamaño puede ser "
+"especificado debajo.\n"
+"\n"
+"Si eres un usuario experimentado, puedes desear exprimir tu instalación de "
+"GNUnet usando la herramienta de configuración avanzada.\n"
+"\n"
+"Después de cambiar la configuración y/o actualizar GNUnet, a veces "
+"esnecesario ejecutar gnunet-update para actualizar las estructuras de datos "
+"internas. Dependiendo de los cambios que se hayan hecho, ésto podrá tomar "
+"algún tiempo."
 
-#~ msgid "CPU usage"
-#~ msgstr "Uso de CPU"
+#: src/setup/gtk/gnunet-setup.glade:905
+msgid "Store migrated content"
+msgstr "Almacena contenido migrado"
 
-#~ msgid "Load limitation"
-#~ msgstr "Limitación de carga"
+#: src/setup/gtk/gnunet-setup.glade:923
+msgid "Maximum datastore size (MB):"
+msgstr "Máximo tamaño de almacenamiento (MB):"
 
-#~ msgid ""
-#~ "GNUnet is able to store data from other peers in your datastore. This is "
-#~ "useful if an adversary has access to your inserted content and you need "
-#~ "to deny that the content is yours. With \"content migration\" on, the "
-#~ "content could have \"migrated\" over the internet to your node without "
-#~ "your knowledge.\n"
-#~ "It also helps to spread popular content over different peers to enhance "
-#~ "availability.\n"
-#~ "\n"
-#~ "The GNUnet datastore contains all data that GNUnet generates (index data, "
-#~ "inserted and migrated content). Its maximum size can be specified below.\n"
-#~ "\n"
-#~ "If you are an experienced user, you may want to tweak your GNUnet "
-#~ "installation using the enhanced configurator.\n"
-#~ "\n"
-#~ "After changing the configuration and/or updating GNUnet, it is sometimes "
-#~ "required to run gnunet-update to update internal data structures. "
-#~ "Depending on the changes made, this may take some time."
-#~ msgstr ""
-#~ "GNUnet es capaz de almacenar datos de otros pares en tu base de datos. "
-#~ "Ésto es útil si un adversario tiene acceso a tu contenido y tu necesitas "
-#~ "negar que ese contenido sea tuyo. Con la \"migración de contenido\" "
-#~ "activada, tu contenido puede haber \"migrado\" por Internet hasta tu nodo "
-#~ "sin tu conocimiento.\n"
-#~ "Ésto también ayuda a difundir contenidos populares por diferentes pares "
-#~ "para facilitar su disponibilidad.\n"
-#~ "\n"
-#~ "La base de datos de GNUnet contiene todos los datos que GNUnet genera "
-#~ "(índices, contenido insertado y descargado). Su máximo tamaño puede ser "
-#~ "especificado debajo.\n"
-#~ "\n"
-#~ "Si eres un usuario experimentado, puedes desear exprimir tu instalación "
-#~ "de GNUnet usando la herramienta de configuración avanzada.\n"
-#~ "\n"
-#~ "Después de cambiar la configuración y/o actualizar GNUnet, a veces "
-#~ "esnecesario ejecutar gnunet-update para actualizar las estructuras de "
-#~ "datos internas. Dependiendo de los cambios que se hayan hecho, ésto podrá "
-#~ "tomar algún tiempo."
+#: src/setup/gtk/gnunet-setup.glade:952
+msgid "Start the GNUnet background process on computer startup"
+msgstr "Arranca el demonio de GNUnet al encender el ordenador"
 
-#~ msgid "Store migrated content"
-#~ msgstr "Almacena contenido migrado"
+#: src/setup/gtk/gnunet-setup.glade:969
+msgid "Open the enhanced configurator"
+msgstr "Abre el editor de configuración avanzado"
 
-#~ msgid "Maximum datastore size (MB):"
-#~ msgstr "Máximo tamaño de almacenamiento (MB):"
-
-#~ msgid "Start the GNUnet background process on computer startup"
-#~ msgstr "Arranca el demonio de GNUnet al encender el ordenador"
-
-#~ msgid "Open the enhanced configurator"
-#~ msgstr "Abre el editor de configuración avanzado"
-
+#: src/setup/gtk/gnunet-setup.glade:986
 #, fuzzy
-#~ msgid "Run gnunet-update"
-#~ msgstr "¡gnunet-update falló!"
+msgid "Run gnunet-update"
+msgstr "¡gnunet-update falló!"
 
+#: src/setup/gtk/gnunet-setup.glade:1015 src/setup/gtk/gnunet-setup.glade:1299
 #, fuzzy
-#~ msgid "Other settings"
-#~ msgstr "Otras configuraciones"
+msgid "Other settings"
+msgstr "Otras configuraciones"
 
-#~ msgid "Finish"
-#~ msgstr "Finalizar"
+#: src/setup/gtk/gnunet-setup.glade:1100
+msgid "Finish"
+msgstr "Finalizar"
 
-#~ msgid ""
-#~ "Define the user and the group owning the GNUnet service here.\n"
-#~ "\n"
-#~ "For security reasons, it is a good idea to let this setup create a new "
-#~ "user account and a new group under which the GNUnet service is started at "
-#~ "system startup.\n"
-#~ "\n"
-#~ "However, GNUnet may not be able to access files other than its own. This "
-#~ "includes files you want to publish in GNUnet. You'll have to grant read "
-#~ "permissions to the user specified below.\n"
-#~ "\n"
-#~ "Leave the fields empty to run GNUnet with system privileges."
-#~ msgstr ""
-#~ "Define el usuario y el grupo bajo el que correrán los servicios de GNUnet "
-#~ "aquí.\n"
-#~ "\n"
-#~ "Por razones de seguridad, es una buena idea dejar que la configuración "
-#~ "cree una nueva cuenta de usuario y un nuevo grupo bajo el cual el "
-#~ "servicio de GNUnet es arrancado al iniciar el sistema.\n"
-#~ "\n"
-#~ "Por consiguiente, GNUnet no tiene la posibilidad de acceder a otros "
-#~ "ficheros que no sean los que posee. Ésto incluye los ficheros que quieras "
-#~ "publicar en GNUnet. Tendrás que garantizar que el usuario especificado "
-#~ "aquí posea permisos de lectura.\n"
-#~ "\n"
-#~ "Deja los campos vacíos para arrancar GNUnet con privilegios de sistema."
+#: src/setup/gtk/gnunet-setup.glade:1205
+msgid ""
+"Define the user and the group owning the GNUnet service here.\n"
+"\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account and a new group under which the GNUnet service is started at system "
+"startup.\n"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the fields empty to run GNUnet with system privileges."
+msgstr ""
+"Define el usuario y el grupo bajo el que correrán los servicios de GNUnet "
+"aquí.\n"
+"\n"
+"Por razones de seguridad, es una buena idea dejar que la configuración cree "
+"una nueva cuenta de usuario y un nuevo grupo bajo el cual el servicio de "
+"GNUnet es arrancado al iniciar el sistema.\n"
+"\n"
+"Por consiguiente, GNUnet no tiene la posibilidad de acceder a otros ficheros "
+"que no sean los que posee. Ésto incluye los ficheros que quieras publicar en "
+"GNUnet. Tendrás que garantizar que el usuario especificado aquí posea "
+"permisos de lectura.\n"
+"\n"
+"Deja los campos vacíos para arrancar GNUnet con privilegios de sistema."
 
-#~ msgid "Group:"
-#~ msgstr "Grupo:"
+#: src/setup/gtk/gnunet-setup.glade:1239
+msgid "User account:"
+msgstr "Cuenta de usuario:"
 
-#~ msgid "User account:"
-#~ msgstr "Cuenta de usuario:"
+#: src/setup/gtk/gnunet-setup.glade:1279
+msgid "Group:"
+msgstr "Grupo:"
 
-#~ msgid "gnunet-setup"
-#~ msgstr "gnunet-setup"
+#: src/setup/gtk/gnunet-setup.glade:1462
+msgid "gnunet-setup"
+msgstr "gnunet-setup"
 
+#: src/setup/gtk/gnunet-setup.glade:1481
 #, fuzzy
-#~ msgid "Save configuration"
-#~ msgstr "Configuración de GNUnet"
+msgid "Save configuration"
+msgstr "Configuración de GNUnet"
 
+#: src/setup/gtk/gnunet-setup.glade:1493
 #, fuzzy
-#~ msgid "Show copyright information for gnunet-setup."
-#~ msgstr "Se produjo un error leyendo información de gnunetd.\n"
+msgid "Show copyright information for gnunet-setup."
+msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
-#~ msgid "(C) 2001-2006 Christian Grothoff (and other contributing authors)"
-#~ msgstr ""
-#~ "C) 2001-2006 Christian Grothoff (y otros autores que han contribuido)"
+#: src/setup/gtk/gnunet-setup.glade:1526
+#, fuzzy
+msgid "About gnunet-setup"
+msgstr "gnunet-setup"
 
-#~ msgid "This is the configuration tool for GNUnet."
-#~ msgstr "Esta es la herramienta de configuración de GNUnet."
+#: src/setup/gtk/gnunet-setup.glade:1531
+#, fuzzy
+msgid "(C) 2001-2007 Christian Grothoff (and other contributing authors)"
+msgstr "C) 2001-2006 Christian Grothoff (y otros autores que han contribuido)"
 
-#~ msgid "Cannot connect to LOOPBACK port %d: %s\n"
-#~ msgstr "Imposible conectar al puerto de LOOPBACK %d: %s\n"
+#: src/setup/gtk/gnunet-setup.glade:1532
+msgid "This is the configuration tool for GNUnet."
+msgstr "Esta es la herramienta de configuración de GNUnet."
 
-#~ msgid "Could not execute `%s': %s\n"
-#~ msgstr "Imposible ejecutar '%s': %s\n"
+#: src/setup/gtk/gnunet-setup.glade:1535
+msgid ""
+"\t\t    GNU GENERAL PUBLIC LICENSE\n"
+"\t\t       Version 2, June 1991\n"
+"\n"
+" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
+"     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+" Everyone is permitted to copy and distribute verbatim copies\n"
+" of this license document, but changing it is not allowed.\n"
+"\n"
+"\t\t\t    Preamble\n"
+"\n"
+"  The licenses for most software are designed to take away your\n"
+"freedom to share and change it.  By contrast, the GNU General Public\n"
+"License is intended to guarantee your freedom to share and change free\n"
+"software--to make sure the software is free for all its users.  This\n"
+"General Public License applies to most of the Free Software\n"
+"Foundation's software and to any other program whose authors commit to\n"
+"using it.  (Some other Free Software Foundation software is covered by\n"
+"the GNU Library General Public License instead.)  You can apply it to\n"
+"your programs, too.\n"
+"\n"
+"  When we speak of free software, we are referring to freedom, not\n"
+"price.  Our General Public Licenses are designed to make sure that you\n"
+"have the freedom to distribute copies of free software (and charge for\n"
+"this service if you wish), that you receive source code or can get it\n"
+"if you want it, that you can change the software or use pieces of it\n"
+"in new free programs; and that you know you can do these things.\n"
+"\n"
+"  To protect your rights, we need to make restrictions that forbid\n"
+"anyone to deny you these rights or to ask you to surrender the rights.\n"
+"These restrictions translate to certain responsibilities for you if you\n"
+"distribute copies of the software, or if you modify it.\n"
+"\n"
+"  For example, if you distribute copies of such a program, whether\n"
+"gratis or for a fee, you must give the recipients all the rights that\n"
+"you have.  You must make sure that they, too, receive or can get the\n"
+"source code.  And you must show them these terms so they know their\n"
+"rights.\n"
+"\n"
+"  We protect your rights with two steps: (1) copyright the software, and\n"
+"(2) offer you this license which gives you legal permission to copy,\n"
+"distribute and/or modify the software.\n"
+"\n"
+"  Also, for each author's protection and ours, we want to make certain\n"
+"that everyone understands that there is no warranty for this free\n"
+"software.  If the software is modified by someone else and passed on, we\n"
+"want its recipients to know that what they have is not the original, so\n"
+"that any problems introduced by others will not reflect on the original\n"
+"authors' reputations.\n"
+"\n"
+"  Finally, any free program is threatened constantly by software\n"
+"patents.  We wish to avoid the danger that redistributors of a free\n"
+"program will individually obtain patent licenses, in effect making the\n"
+"program proprietary.  To prevent this, we have made it clear that any\n"
+"patent must be licensed for everyone's free use or not licensed at all.\n"
+"\n"
+"  The precise terms and conditions for copying, distribution and\n"
+"modification follow.\n"
+"\n"
+"\t\t    GNU GENERAL PUBLIC LICENSE\n"
+"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
+"\n"
+"  0. This License applies to any program or other work which contains\n"
+"a notice placed by the copyright holder saying it may be distributed\n"
+"under the terms of this General Public License.  The \"Program\", below,\n"
+"refers to any such program or work, and a \"work based on the Program\"\n"
+"means either the Program or any derivative work under copyright law:\n"
+"that is to say, a work containing the Program or a portion of it,\n"
+"either verbatim or with modifications and/or translated into another\n"
+"language.  (Hereinafter, translation is included without limitation in\n"
+"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
+"\n"
+"Activities other than copying, distribution and modification are not\n"
+"covered by this License; they are outside its scope.  The act of\n"
+"running the Program is not restricted, and the output from the Program\n"
+"is covered only if its contents constitute a work based on the\n"
+"Program (independent of having been made by running the Program).\n"
+"Whether that is true depends on what the Program does.\n"
+"\n"
+"  1. You may copy and distribute verbatim copies of the Program's\n"
+"source code as you receive it, in any medium, provided that you\n"
+"conspicuously and appropriately publish on each copy an appropriate\n"
+"copyright notice and disclaimer of warranty; keep intact all the\n"
+"notices that refer to this License and to the absence of any warranty;\n"
+"and give any other recipients of the Program a copy of this License\n"
+"along with the Program.\n"
+"\n"
+"You may charge a fee for the physical act of transferring a copy, and\n"
+"you may at your option offer warranty protection in exchange for a fee.\n"
+"\n"
+"  2. You may modify your copy or copies of the Program or any portion\n"
+"of it, thus forming a work based on the Program, and copy and\n"
+"distribute such modifications or work under the terms of Section 1\n"
+"above, provided that you also meet all of these conditions:\n"
+"\n"
+"    a) You must cause the modified files to carry prominent notices\n"
+"    stating that you changed the files and the date of any change.\n"
+"\n"
+"    b) You must cause any work that you distribute or publish, that in\n"
+"    whole or in part contains or is derived from the Program or any\n"
+"    part thereof, to be licensed as a whole at no charge to all third\n"
+"    parties under the terms of this License.\n"
+"\n"
+"    c) If the modified program normally reads commands interactively\n"
+"    when run, you must cause it, when started running for such\n"
+"    interactive use in the most ordinary way, to print or display an\n"
+"    announcement including an appropriate copyright notice and a\n"
+"    notice that there is no warranty (or else, saying that you provide\n"
+"    a warranty) and that users may redistribute the program under\n"
+"    these conditions, and telling the user how to view a copy of this\n"
+"    License.  (Exception: if the Program itself is interactive but\n"
+"    does not normally print such an announcement, your work based on\n"
+"    the Program is not required to print an announcement.)\n"
+"\n"
+"These requirements apply to the modified work as a whole.  If\n"
+"identifiable sections of that work are not derived from the Program,\n"
+"and can be reasonably considered independent and separate works in\n"
+"themselves, then this License, and its terms, do not apply to those\n"
+"sections when you distribute them as separate works.  But when you\n"
+"distribute the same sections as part of a whole which is a work based\n"
+"on the Program, the distribution of the whole must be on the terms of\n"
+"this License, whose permissions for other licensees extend to the\n"
+"entire whole, and thus to each and every part regardless of who wrote it.\n"
+"\n"
+"Thus, it is not the intent of this section to claim rights or contest\n"
+"your rights to work written entirely by you; rather, the intent is to\n"
+"exercise the right to control the distribution of derivative or\n"
+"collective works based on the Program.\n"
+"\n"
+"In addition, mere aggregation of another work not based on the Program\n"
+"with the Program (or with a work based on the Program) on a volume of\n"
+"a storage or distribution medium does not bring the other work under\n"
+"the scope of this License.\n"
+"\n"
+"  3. You may copy and distribute the Program (or a work based on it,\n"
+"under Section 2) in object code or executable form under the terms of\n"
+"Sections 1 and 2 above provided that you also do one of the following:\n"
+"\n"
+"    a) Accompany it with the complete corresponding machine-readable\n"
+"    source code, which must be distributed under the terms of Sections\n"
+"    1 and 2 above on a medium customarily used for software interchange; "
+"or,\n"
+"\n"
+"    b) Accompany it with a written offer, valid for at least three\n"
+"    years, to give any third party, for a charge no more than your\n"
+"    cost of physically performing source distribution, a complete\n"
+"    machine-readable copy of the corresponding source code, to be\n"
+"    distributed under the terms of Sections 1 and 2 above on a medium\n"
+"    customarily used for software interchange; or,\n"
+"\n"
+"    c) Accompany it with the information you received as to the offer\n"
+"    to distribute corresponding source code.  (This alternative is\n"
+"    allowed only for noncommercial distribution and only if you\n"
+"    received the program in object code or executable form with such\n"
+"    an offer, in accord with Subsection b above.)\n"
+"\n"
+"The source code for a work means the preferred form of the work for\n"
+"making modifications to it.  For an executable work, complete source\n"
+"code means all the source code for all modules it contains, plus any\n"
+"associated interface definition files, plus the scripts used to\n"
+"control compilation and installation of the executable.  However, as a\n"
+"special exception, the source code distributed need not include\n"
+"anything that is normally distributed (in either source or binary\n"
+"form) with the major components (compiler, kernel, and so on) of the\n"
+"operating system on which the executable runs, unless that component\n"
+"itself accompanies the executable.\n"
+"\n"
+"If distribution of executable or object code is made by offering\n"
+"access to copy from a designated place, then offering equivalent\n"
+"access to copy the source code from the same place counts as\n"
+"distribution of the source code, even though third parties are not\n"
+"compelled to copy the source along with the object code.\n"
+"\n"
+"  4. You may not copy, modify, sublicense, or distribute the Program\n"
+"except as expressly provided under this License.  Any attempt\n"
+"otherwise to copy, modify, sublicense or distribute the Program is\n"
+"void, and will automatically terminate your rights under this License.\n"
+"However, parties who have received copies, or rights, from you under\n"
+"this License will not have their licenses terminated so long as such\n"
+"parties remain in full compliance.\n"
+"\n"
+"  5. You are not required to accept this License, since you have not\n"
+"signed it.  However, nothing else grants you permission to modify or\n"
+"distribute the Program or its derivative works.  These actions are\n"
+"prohibited by law if you do not accept this License.  Therefore, by\n"
+"modifying or distributing the Program (or any work based on the\n"
+"Program), you indicate your acceptance of this License to do so, and\n"
+"all its terms and conditions for copying, distributing or modifying\n"
+"the Program or works based on it.\n"
+"\n"
+"  6. Each time you redistribute the Program (or any work based on the\n"
+"Program), the recipient automatically receives a license from the\n"
+"original licensor to copy, distribute or modify the Program subject to\n"
+"these terms and conditions.  You may not impose any further\n"
+"restrictions on the recipients' exercise of the rights granted herein.\n"
+"You are not responsible for enforcing compliance by third parties to\n"
+"this License.\n"
+"\n"
+"  7. If, as a consequence of a court judgment or allegation of patent\n"
+"infringement or for any other reason (not limited to patent issues),\n"
+"conditions are imposed on you (whether by court order, agreement or\n"
+"otherwise) that contradict the conditions of this License, they do not\n"
+"excuse you from the conditions of this License.  If you cannot\n"
+"distribute so as to satisfy simultaneously your obligations under this\n"
+"License and any other pertinent obligations, then as a consequence you\n"
+"may not distribute the Program at all.  For example, if a patent\n"
+"license would not permit royalty-free redistribution of the Program by\n"
+"all those who receive copies directly or indirectly through you, then\n"
+"the only way you could satisfy both it and this License would be to\n"
+"refrain entirely from distribution of the Program.\n"
+"\n"
+"If any portion of this section is held invalid or unenforceable under\n"
+"any particular circumstance, the balance of the section is intended to\n"
+"apply and the section as a whole is intended to apply in other\n"
+"circumstances.\n"
+"\n"
+"It is not the purpose of this section to induce you to infringe any\n"
+"patents or other property right claims or to contest validity of any\n"
+"such claims; this section has the sole purpose of protecting the\n"
+"integrity of the free software distribution system, which is\n"
+"implemented by public license practices.  Many people have made\n"
+"generous contributions to the wide range of software distributed\n"
+"through that system in reliance on consistent application of that\n"
+"system; it is up to the author/donor to decide if he or she is willing\n"
+"to distribute software through any other system and a licensee cannot\n"
+"impose that choice.\n"
+"\n"
+"This section is intended to make thoroughly clear what is believed to\n"
+"be a consequence of the rest of this License.\n"
+"\n"
+"  8. If the distribution and/or use of the Program is restricted in\n"
+"certain countries either by patents or by copyrighted interfaces, the\n"
+"original copyright holder who places the Program under this License\n"
+"may add an explicit geographical distribution limitation excluding\n"
+"those countries, so that distribution is permitted only in or among\n"
+"countries not thus excluded.  In such case, this License incorporates\n"
+"the limitation as if written in the body of this License.\n"
+"\n"
+"  9. The Free Software Foundation may publish revised and/or new versions\n"
+"of the General Public License from time to time.  Such new versions will\n"
+"be similar in spirit to the present version, but may differ in detail to\n"
+"address new problems or concerns.\n"
+"\n"
+"Each version is given a distinguishing version number.  If the Program\n"
+"specifies a version number of this License which applies to it and \"any\n"
+"later version\", you have the option of following the terms and conditions\n"
+"either of that version or of any later version published by the Free\n"
+"Software Foundation.  If the Program does not specify a version number of\n"
+"this License, you may choose any version ever published by the Free "
+"Software\n"
+"Foundation.\n"
+"\n"
+"  10. If you wish to incorporate parts of the Program into other free\n"
+"programs whose distribution conditions are different, write to the author\n"
+"to ask for permission.  For software which is copyrighted by the Free\n"
+"Software Foundation, write to the Free Software Foundation; we sometimes\n"
+"make exceptions for this.  Our decision will be guided by the two goals\n"
+"of preserving the free status of all derivatives of our free software and\n"
+"of promoting the sharing and reuse of software generally.\n"
+"\n"
+"\t\t\t    NO WARRANTY\n"
+"\n"
+"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
+"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
+"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
+"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
+"EXPRESSED\n"
+"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
+"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
+"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
+"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
+"REPAIR OR CORRECTION.\n"
+"\n"
+"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
+"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
+"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
+"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
+"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
+"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
+"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
+"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
+"POSSIBILITY OF SUCH DAMAGES.\n"
+"\n"
+"\t\t     END OF TERMS AND CONDITIONS\n"
+"\n"
+"\t    How to Apply These Terms to Your New Programs\n"
+"\n"
+"  If you develop a new program, and you want it to be of the greatest\n"
+"possible use to the public, the best way to achieve this is to make it\n"
+"free software which everyone can redistribute and change under these terms.\n"
+"\n"
+"  To do so, attach the following notices to the program.  It is safest\n"
+"to attach them to the start of each source file to most effectively\n"
+"convey the exclusion of warranty; and each file should have at least\n"
+"the \"copyright\" line and a pointer to where the full notice is found.\n"
+"\n"
+"    <one line to give the program's name and a brief idea of what it does.>\n"
+"    Copyright (C) <year>  <name of author>\n"
+"\n"
+"    This program is free software; you can redistribute it and/or modify\n"
+"    it under the terms of the GNU General Public License as published by\n"
+"    the Free Software Foundation; either version 2 of the License, or\n"
+"    (at your option) any later version.\n"
+"\n"
+"    This program is distributed in the hope that it will be useful,\n"
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"    GNU General Public License for more details.\n"
+"\n"
+"    You should have received a copy of the GNU General Public License\n"
+"    along with this program; if not, write to the Free Software\n"
+"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+"USA\n"
+"\n"
+"\n"
+"Also add information on how to contact you by electronic and paper mail.\n"
+"\n"
+"If the program is interactive, make it output a short notice like this\n"
+"when it starts in an interactive mode:\n"
+"\n"
+"    Gnomovision version 69, Copyright (C) year  name of author\n"
+"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
+"w'.\n"
+"    This is free software, and you are welcome to redistribute it\n"
+"    under certain conditions; type `show c' for details.\n"
+"\n"
+"The hypothetical commands `show w' and `show c' should show the appropriate\n"
+"parts of the General Public License.  Of course, the commands you use may\n"
+"be called something other than `show w' and `show c'; they could even be\n"
+"mouse-clicks or menu items--whatever suits your program.\n"
+"\n"
+"You should also get your employer (if you work as a programmer) or your\n"
+"school, if any, to sign a \"copyright disclaimer\" for the program, if\n"
+"necessary.  Here is a sample; alter the names:\n"
+"\n"
+"  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
+"  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
+"\n"
+"  <signature of Ty Coon>, 1 April 1989\n"
+"  Ty Coon, President of Vice\n"
+"\n"
+"This General Public License does not permit incorporating your program into\n"
+"proprietary programs.  If your program is a subroutine library, you may\n"
+"consider it more useful to permit linking proprietary applications with the\n"
+"library.  If this is what you want to do, use the GNU Library General\n"
+"Public License instead of this License.\n"
+msgstr ""
 
-#~ msgid "No client service started. Trying again in 30 seconds.\n"
-#~ msgstr ""
-#~ "No hay ningún servicio de cliente ejecutandose. Se volverá a intentar en "
-#~ "30 segundos.\n"
+#: src/setup/gtk/gnunet-setup.glade:1917
+msgid "Not for English ;-)"
+msgstr ""
 
-#~ msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
-#~ msgstr "Rechazada conexión no autorizada de %u.%u.%u.%u.\n"
+#, fuzzy
+#~ msgid "Failed to initialize libesmtp: %s.\n"
+#~ msgstr "Imposible inicializar SQLite.\n"
 
-#~ msgid "Protocol violation on socket. Expected command.\n"
-#~ msgstr "Violación del protocolo en el socket. Esperando comando.\n"
+#~ msgid "Sending E-mail to `%s' failed.\n"
+#~ msgstr "Enviando un correo electrónico a '%s' se produjo un fallo.\n"
 
-#~ msgid "Command `%s' not found!\n"
-#~ msgstr "¡Comando '%s' no encontrado!\n"
+#, fuzzy
+#~ msgid "Network configuration: NAT"
+#~ msgstr "Configuración de GNUnet"
 
-#~ msgid "Malformed entry in the configuration in section %s under %s: %s\n"
+#~ msgid ""
+#~ "Is this machine behind NAT?\n"
+#~ "\n"
+#~ "If you are connected to the internet through another computer doing SNAT, "
+#~ "a router or a \"hardware firewall\" and other computers on the internet "
+#~ "cannot connect to this computer, say \"yes\" here. Answer \"no\" on "
+#~ "direct connections through modems, ISDN cards and DNAT (also known as "
+#~ "\"port forwarding\")."
 #~ msgstr ""
-#~ "Entrada mal formada en la configuración en la sección %s bajo %s: %s\n"
+#~ "¿Tu máquina esta detrás de un NAT?\n"
+#~ "\n"
+#~ "Si tu estás conectado a Internet a través de otro ordenador haciendo "
+#~ "SNAT, un router o un \"cortafuegos de hardware\" y otros ordenadores no "
+#~ "pueden conectarse al tuyo a través de Internet directamente, responde \"si"
+#~ "\" aquí. Responde \"no\" en conexiones directas a través de módems, "
+#~ "tarjetas de RDSI y DNAT (también conocido como \"seguimiento de puertos"
+#~ "\")."
 
-#~ msgid "size of `%s' message is too short. Ignoring.\n"
-#~ msgstr "el tamaño del '%s' mensaje es demasiado corto. Ignorandolo.\n"
-
-#~ msgid "size of `%s' message is wrong. Ignoring.\n"
-#~ msgstr "el tamaño del mensaje '%s' es erroneo. Se ignora.\n"
-
-#~ msgid "TESTBED could not generate hello message for protocol %u\n"
+#, fuzzy
+#~ msgid "Configuration of the logging system"
 #~ msgstr ""
-#~ "TESTBED no puede generar el mensaje de saludo para el protocolo %u\n"
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%"
+#~ "s'!\n"
 
-#~ msgid "received invalid `%s' message\n"
-#~ msgstr "recibido mensaje '%s' no válido\n"
+#, fuzzy
+#~ msgid "Run gnunetd as this user."
+#~ msgstr "Ejecutar gnunet-update"
 
-#~ msgid "received invalid `%s' message (empty module name)\n"
-#~ msgstr "recibido mensaje '%s' no válido (nombre del módulo vacío)\n"
+#, fuzzy
+#~ msgid "Run gnunetd during system startup?"
+#~ msgstr "Ejecutar gnunet-update"
 
-#~ msgid "loading module `%s' failed.  Notifying client.\n"
-#~ msgstr ""
-#~ "se produjo un fallo al cargar el módulo '%s'.  Notificando al cliente.\n"
+#, fuzzy
+#~ msgid "Path settings"
+#~ msgstr "Otras configuraciones"
 
-#~ msgid "unloading module failed.  Notifying client.\n"
-#~ msgstr ""
-#~ "se produjo un fallo al descargar el módulo.  Notificando al cliente.\n"
+#~ msgid "specify nickname"
+#~ msgstr "especifica el apodo"
 
-#~ msgid "`%s' %s failed: %s\n"
-#~ msgstr "'%s' %s falló: %s\n"
+#~ msgid "Could not connect to gnunetd.\n"
+#~ msgstr "Imposible conectar con gnunetd.\n"
 
-#~ msgid "received invalid `%s' message: %s.\n"
-#~ msgstr "recibido mensaje '%s' no válido: %s.\n"
+#~ msgid "You must specify a nickname (use option `%s').\n"
+#~ msgstr "Debes especificar un apodo (use la opción '%s').\n"
 
-#~ msgid "'..' is not allowed in file name (%s).\n"
-#~ msgstr "'..' no esta permitido en el nombre del fichero(%s).\n"
+#~ msgid "Could not send join message to gnunetd\n"
+#~ msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#~ msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
-#~ msgstr ""
-#~ "¡Nombre del fichero vacío para el mensaje UPLOAD_FILE es inválido!\n"
+#~ msgid "mysql datastore"
+#~ msgstr "base de datos mysql"
 
-#~ msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
-#~ msgstr ""
-#~ "Nombre del fichero para el mensaje UPLOAD_FILE no esta terminado en null "
-#~ "(¡inválido!)\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' falló en %s: %d con el error: %s\n"
 
-#~ msgid "Upload refused!"
-#~ msgstr "¡Subida rechazada!"
+#~ msgid "Database failed to delete `%s'.\n"
+#~ msgstr "Falló al borrar de la base de datos %s.\n"
 
-#~ msgid "Invalid message received at %s:%d."
-#~ msgstr "Mensaje inválido recibido en %s:%d."
-
-#~ msgid "Could not resolve name of HTTP proxy `%s'.\n"
-#~ msgstr "Imposible resolver el nombre del proxy HTTP '%s'.\n"
-
-#~ msgid "Invalid URL `%s' (must begin with `%s')\n"
-#~ msgstr "URL invalida '%s' (debe comenzar por '%s')\n"
-
-#~ msgid "Failed to send HTTP request to host `%s': %s\n"
-#~ msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
-
-#~ msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
-#~ msgstr "Falló al mandar la petición HTTP '%s' al host '%s': %s\n"
-
-#~ msgid "Exit register (error: no http response read).\n"
-#~ msgstr "Saliendo del registro (error: no se leyó una respuesta de http).\n"
-
-#~ msgid "Using %u messages of size %u for %u times.\n"
-#~ msgstr "Usando %u mensajes de un tamaño de %u durante %u veces.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Failed to receive reply from gnunetd.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Fallo al recibir la respuesta de gnunetd.\n"
-
 #, fuzzy
 #~ msgid "Error log:\n"
 #~ msgstr "Error"
@@ -5596,9 +6313,6 @@
 #~ msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 #~ msgstr "Esperando a gnunetd para empezar (%u ciclos restantes)...\n"
 
-#~ msgid "Waiting for peers to connect (%u iterations left)...\n"
-#~ msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
-
 #, fuzzy
 #~ msgid "Deleting expired content.  This may take a while.\n"
 #~ msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
@@ -5738,9 +6452,6 @@
 #~ msgid "Received invalid `%s' request (wrong table)\n"
 #~ msgstr "Recibida petición '%s' no válida (tabla errónea)\n"
 
-#~ msgid "Received unknown request type %d at %s:%d\n"
-#~ msgstr "Recibida petición de tipo desconocido %d en %s: %d\n"
-
 #~ msgid "This client already participates in the given DHT!\n"
 #~ msgstr "Este cliente ya participa en el DHT dado\n"
 
@@ -5987,10 +6698,6 @@
 #~ "Puerto inválido \"%s\" en la especificación de la lista local, probando "
 #~ "el puerto %d.\n"
 
-#~ msgid "Could not download list of peer contacts, host `%s' unknown.\n"
-#~ msgstr ""
-#~ "Imposible descargar lista de contactos, servidor '%s' desconocido.\n"
-
 #~ msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
 #~ msgstr "'%s' a '%s' falló en %s: %d con error %s\n"
 
@@ -6013,10 +6720,6 @@
 #~ "El fichero de configuración debe especificar el directorio para almacenar "
 #~ "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#, fuzzy
-#~ msgid "Unable to initialize SQLite KVStore.\n"
-#~ msgstr "Imposible inicializar SQLite.\n"
-
 #~ msgid "Option `%s' makes no sense without option `%s'."
 #~ msgstr "La opción '%s' no tiene ningún sentido sin la opción '%s'."
 

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2007-12-10 02:47:03 UTC (rev 5850)
+++ GNUnet/po/rw.po     2007-12-10 03:20:09 UTC (rev 5851)
@@ -12,12 +12,12 @@
 # Donatien NSENGIYUMVA <address@hidden>, 2005.
 # Antoine Bigirimana <address@hidden>, 2005.
 #
-#: contrib/config-daemon.scm:555
+#: contrib/config-daemon.scm:584
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-09-29 16:48-0600\n"
+"POT-Creation-Date: 2007-12-09 19:48-0700\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <address@hidden>\n"
 "Language-Team: Kinyarwanda <address@hidden>\n"
@@ -25,161 +25,202 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/transports/ip6.c:75 src/util/network/io.c:85
+#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:541
+#: src/transports/http.c:1320 src/transports/http.c:1413
+#: src/transports/http.c:1588 src/transports/http.c:2014
+#: src/transports/http.c:2075 src/applications/bootstrap_http/http.c:123
+#: src/applications/bootstrap_http/http.c:257
+#: src/applications/bootstrap_http/http.c:274
+#: src/applications/bootstrap_http/http.c:306
+#: src/applications/bootstrap_http/http.c:325
+#: src/applications/bootstrap_http/http.c:338
+#: src/applications/bootstrap_http/http.c:348
+#: src/applications/bootstrap_http/http.c:358
 #, fuzzy, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "'%s'Byanze ku Na: Ikosa"
+
+#: src/transports/upnp/upnp.c:431
+#, 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:476
+#, c-format
+msgid "upnp: NAT Returned IP: %s\n"
+msgstr ""
+
+#: src/transports/ip6.c:77 src/util/network/io.c:86
+#, 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:84 src/util/network/ip.c:146
+#: src/transports/ip6.c:109 src/util/network/ip.c:87 src/util/network/ip.c:151
 #, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr "urusobe in Iboneza Icyiciro"
 
-#: src/transports/ip6.c:135 src/util/network/ip.c:115
-#: src/util/network/ip.c:221
+#: src/transports/ip6.c:140 src/util/network/ip.c:118
+#: src/util/network/ip.c:237
 #, fuzzy, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr "OYA kugirango ikoresha"
 
-#: src/transports/ip6.c:167
+#: src/transports/ip6.c:174
 #, fuzzy, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "OYA"
 
-#: src/transports/ip6.c:219 src/transports/ip.c:60
+#: src/transports/ip6.c:228 src/transports/ip.c:61
 #, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr ""
 
-#: src/transports/udp6.c:123 src/transports/udp.c:129
+#: src/transports/tcp6.c:249
+#, fuzzy
+msgid "Could not determine my public IPv6 address.\n"
+msgstr "OYA Rusange Aderesi"
+
+#: src/transports/tcp6.c:317
 #, fuzzy, c-format
+msgid "`%s': unknown service: %s\n"
+msgstr "'%s':Kitazwi Serivisi"
+
+#: src/transports/tcp6.c:420 src/transports/tcp.c:462
+#, fuzzy, c-format
+msgid "Failed to start transport service on port %d.\n"
+msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
+
+#: src/transports/tcp6.c:531
+#, fuzzy
+msgid "# bytes received via TCP6"
+msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+
+#: src/transports/tcp6.c:532
+#, fuzzy
+msgid "# bytes sent via TCP6"
+msgstr "#Bayite Yoherejwe:"
+
+#: src/transports/tcp6.c:534
+msgid "# bytes dropped by TCP6 (outgoing)"
+msgstr ""
+
+#: src/transports/udp6.c:131 src/transports/udp.c:135
+#, fuzzy, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr "Kuri Kuri Umuyoboro"
 
-#: src/transports/udp6.c:264
+#: src/transports/udp6.c:277
 #, fuzzy
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp6.c:471 src/transports/udp.c:520
+#: src/transports/udp6.c:495 src/transports/udp.c:544
 #, fuzzy, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr "kugirango ni Byo hasi OYA"
 
-#: src/transports/udp6.c:476
+#: src/transports/udp6.c:501
 #, fuzzy
 msgid "# bytes received via UDP6"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/udp6.c:477
+#: src/transports/udp6.c:502
 #, fuzzy
 msgid "# bytes sent via UDP6"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/udp6.c:479
+#: src/transports/udp6.c:504
 msgid "# bytes dropped by UDP6 (outgoing)"
 msgstr ""
 
-#: src/transports/udp6.c:481
+#: src/transports/udp6.c:506
 msgid "# UDP6 connections (right now)"
 msgstr ""
 
-#: src/transports/http.c:824
+#: src/transports/http.c:875
 #, fuzzy
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/http.c:1235 src/transports/http.c:1309
-#: src/transports/http.c:1464 src/transports/http.c:1858
-#: src/transports/http.c:1894 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:540 src/applications/bootstrap_http/http.c:122
-#: src/applications/bootstrap_http/http.c:254
-#: src/applications/bootstrap_http/http.c:270
-#: src/applications/bootstrap_http/http.c:301
-#: src/applications/bootstrap_http/http.c:320
-#: src/applications/bootstrap_http/http.c:333
-#: src/applications/bootstrap_http/http.c:343
-#: src/applications/bootstrap_http/http.c:353
-#, fuzzy, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr "'%s'Byanze ku Na: Ikosa"
-
-#: src/transports/http.c:2080
+#: src/transports/http.c:2290
 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:2089
+#: src/transports/http.c:2299
 #, fuzzy
 msgid "# bytes received via HTTP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/http.c:2090
+#: src/transports/http.c:2300
 #, fuzzy
 msgid "# bytes sent via HTTP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/http.c:2092
+#: src/transports/http.c:2302
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: 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:358
+#: src/transports/smtp.c:362
 #, fuzzy
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr "Ubutumwa Biturutse Ingano"
 
-#: src/transports/smtp.c:463
+#: src/transports/smtp.c:454
 #, fuzzy
-msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
-msgstr "Muyunguruzi... kugirango E Ubutumwa Kurema"
+msgid "SMTP filter string to invalid, lacks ': '\n"
+msgstr "Muyunguruzi... Ikurikiranyanyuguti Kuri Kuri"
 
-#: src/transports/smtp.c:471
+#: src/transports/smtp.c:464
 #, fuzzy, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "Muyunguruzi... Ikurikiranyanyuguti Kuri Kuri"
 
-#: src/transports/smtp.c:571
+#: src/transports/smtp.c:552 src/transports/smtp.c:563
+#: src/transports/smtp.c:577 src/transports/smtp.c:597
+#: src/transports/smtp.c:622 src/transports/smtp.c:631
+#: src/transports/smtp.c:645 src/transports/smtp.c:657
 #, fuzzy, c-format
-msgid "Failed to initialize libesmtp: %s.\n"
-msgstr "Kuri gutangiza Serivisi"
+msgid "SMTP: `%s' failed: %s.\n"
+msgstr "'%s'%sByanze"
 
-#: 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:802
+#, fuzzy
+msgid "No email-address specified, can not start SMTP transport.\n"
+msgstr "Muyunguruzi... kugirango E Ubutumwa Kurema"
 
-#: src/transports/smtp.c:702
-#, fuzzy, c-format
-msgid "%.*s filter %s (SMTP)"
+#: src/transports/smtp.c:815
+#, fuzzy
+msgid "# bytes received via SMTP"
+msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+
+#: src/transports/smtp.c:816
+#, fuzzy
+msgid "# bytes sent via SMTP"
+msgstr "#Bayite Yoherejwe:"
+
+#: src/transports/smtp.c:818
+msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
-"%.*Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
 
-#: 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_helper.c:260
+#, fuzzy
+msgid "Received malformed message instead of welcome message. Closing.\n"
+msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/transports/tcp.c:290
+#: src/transports/tcp_helper.c:279
 #, fuzzy
+msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgstr "Ubutumwa Bivuye Ukwihuza"
+
+#: src/transports/tcp.c:296
+#, fuzzy
 msgid "TCP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/tcp.c:389
+#: src/transports/tcp.c:401
 #, fuzzy, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
@@ -199,37 +240,32 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/tcp.c:442 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:561
+#: src/transports/tcp.c:584
 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:570
+#: src/transports/tcp.c:593
 #, fuzzy
 msgid "# bytes received via TCP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/tcp.c:571
+#: src/transports/tcp.c:594
 #, fuzzy
 msgid "# bytes sent via TCP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/tcp.c:573
+#: src/transports/tcp.c:596
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:288
+#: src/transports/udp.c:301
 #, fuzzy
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp.c:384
+#: src/transports/udp.c:400
 #, fuzzy, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
@@ -249,1395 +285,1442 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/udp.c:535
+#: src/transports/udp.c:560
 #, fuzzy
 msgid "# bytes received via UDP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/udp.c:536
+#: src/transports/udp.c:561
 #, fuzzy
 msgid "# bytes sent via UDP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/udp.c:538
+#: src/transports/udp.c:563
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:540
+#: src/transports/udp.c:565
 msgid "# UDP connections (right now)"
 msgstr ""
 
-#: src/transports/tcp6.c:245
+#: src/transports/udp_helper.c:96
 #, fuzzy
-msgid "Could not determine my public IPv6 address.\n"
-msgstr "OYA Rusange Aderesi"
+msgid "Received malformed message from udp-peer connection. Closing.\n"
+msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/transports/tcp6.c:312
-#, fuzzy, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "'%s':Kitazwi Serivisi"
+#: src/setup/ncurses/mconf.c:86
+msgid "Exit"
+msgstr ""
 
-#: src/transports/tcp6.c:512
-#, fuzzy
-msgid "# bytes received via TCP6"
-msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+#: src/setup/ncurses/mconf.c:89
+msgid "Up"
+msgstr ""
 
-#: src/transports/tcp6.c:513
-#, fuzzy
-msgid "# bytes sent via TCP6"
-msgstr "#Bayite Yoherejwe:"
+#: src/setup/ncurses/mconf.c:92 src/setup/gtk/gnunet-setup.glade:136
+#: src/setup/gtk/gnunet-setup.glade:404 src/setup/gtk/gnunet-setup.glade:814
+#: src/setup/gtk/gnunet-setup.glade:1147 src/setup/gtk/gnunet-setup.glade:1431
+msgid "Cancel"
+msgstr "Kureka"
 
-#: src/transports/tcp6.c:515
-msgid "# bytes dropped by TCP6 (outgoing)"
+#: src/setup/ncurses/mconf.c:183 src/setup/ncurses/mconf.c:288
+#: src/setup/ncurses/mconf.c:371 src/setup/ncurses/mconf.c:471
+#: src/setup/ncurses/wizard_curs.c:111 src/setup/ncurses/wizard_curs.c:176
+#: src/setup/ncurses/wizard_curs.c:292
+msgid "Internal error! (Choice invalid?)"
 msgstr ""
 
-#: src/transports/tcp_helper.c:257
-#, fuzzy
-msgid "Received malformed message instead of welcome message. Closing.\n"
-msgstr "Ubutumwa Bivuye Ukwihuza"
+#: src/setup/ncurses/mconf.c:219 src/setup/ncurses/mconf.c:418
+msgid "Internal error! (Value invalid?)"
+msgstr ""
 
-#: src/transports/tcp_helper.c:276
+#: src/setup/ncurses/mconf.c:404
+msgid "Invalid input, expecting floating point value."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:450
+msgid "Invalid input, expecting integer."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:458
+msgid "Value is not in legal range."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:527
 #, fuzzy
-msgid "Received malformed message from tcp-peer connection. Closing.\n"
-msgstr "Ubutumwa Bivuye Ukwihuza"
+msgid "GNUnet Configuration"
+msgstr "Umubare Bya Amasubiramo"
 
-#: src/transports/upnp/upnp.c:429
+#: src/setup/ncurses/mconf.c:527 src/setup/text/conf.c:569
 #, 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"
+msgid "Configuration unchanged, no need to save.\n"
+msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: src/transports/upnp/upnp.c:475
+#: src/setup/ncurses/mconf.c:533
+msgid "Do you wish to save your new configuration?"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:547
+#, fuzzy, c-format
+msgid ""
+"\n"
+"End of configuration.\n"
+msgstr "Gufungura Iboneza IDOSIYE"
+
+#: src/setup/ncurses/mconf.c:552
 #, c-format
-msgid "upnp: NAT Returned IP: %s\n"
+msgid ""
+"\n"
+"Your configuration changes were NOT saved.\n"
 msgstr ""
 
-#: src/transports/udp_helper.c:96
+#: src/setup/ncurses/wizard_curs.c:65 src/setup/lib/wizard_util.c:140
+#: src/setup/lib/wizard_util.c:195
+msgid "Error"
+msgstr ""
+
+# sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
+#: src/setup/ncurses/wizard_curs.c:73 src/setup/gtk/gconf.c:444
 #, fuzzy
-msgid "Received malformed message from udp-peer connection. Closing.\n"
-msgstr "Ubutumwa Bivuye Ukwihuza"
+msgid "Help"
+msgstr "/Kugoboka"
 
-#: src/applications/dht/tools/dht-query.c:55
+#: src/setup/ncurses/wizard_curs.c:80
+msgid "Error!"
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:94 src/applications/vpn/vpn.c:1454
 #, fuzzy
-msgid "Query (get KEY, put KEY VALUE) DHT table."
-msgstr "Kubona Gushyira Gukuraho... a imbonerahamwe#"
+msgid "No"
+msgstr "Oya."
 
-#: src/applications/dht/tools/dht-query.c:60
+#: src/setup/ncurses/wizard_curs.c:95 src/applications/vpn/vpn.c:1454
 #, fuzzy
+msgid "Yes"
+msgstr "Yego"
+
+# offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
+#: src/setup/ncurses/wizard_curs.c:143
+#, fuzzy
+msgid "Abort"
+msgstr "Ibyerekeye"
+
+#: src/setup/ncurses/wizard_curs.c:144
+msgid "Ok"
+msgstr "Oke"
+
+#: src/setup/ncurses/wizard_curs.c:211 src/setup/ncurses/wizard_curs.c:277
+#: src/setup/ncurses/wizard_curs.c:418
+#, fuzzy
+msgid "GNUnet configuration"
+msgstr "Umubare Bya Amasubiramo"
+
+#: src/setup/ncurses/wizard_curs.c:213
 msgid ""
-"allow TIME ms to process a GET command or expire PUT content after ms TIME"
-msgstr "Kwemerera Kuri Komandi:"
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org/\n";
+"and join our community at\n"
+"\thttp://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"the GNUnet team"
+msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:99
-#, c-format
-msgid "%s(%s) operation returned no results.\n"
+#: src/setup/ncurses/wizard_curs.c:279
+msgid ""
+"Choose the network interface that connects your computer to the internet "
+"from the list below."
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:116
-#, fuzzy, c-format
-msgid "Issuing '%s(%s,%s)' command.\n"
-msgstr "'%s(%s,%s)'Byanze"
+#: src/setup/ncurses/wizard_curs.c:297 src/setup/ncurses/wizard_curs.c:311
+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/applications/dht/tools/dht-query.c:123
-#, c-format
-msgid "'%s(%s,%s)' succeeded\n"
+#: src/setup/ncurses/wizard_curs.c:308
+msgid "Network configuration: interface"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:127
-#, fuzzy, c-format
-msgid "'%s(%s,%s)' failed.\n"
-msgstr "'%s(%s,%s)'Byanze"
+#: src/setup/ncurses/wizard_curs.c:310
+msgid ""
+"What is the name of the network interface that connects your computer to the "
+"Internet?"
+msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:151
-#, fuzzy, c-format
-msgid "Failed to connect to gnunetd.\n"
-msgstr "Kuri Kwihuza Kuri"
+#: src/setup/ncurses/wizard_curs.c:321
+#, fuzzy
+msgid "Network configuration: IP"
+msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/applications/dht/tools/dht-query.c:164
-#, fuzzy, c-format
-msgid "Command `%s' requires an argument (`%s').\n"
-msgstr "Komandi:"
+#: src/setup/ncurses/wizard_curs.c:323
+msgid "What is this computer's public IP address or hostname?"
+msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:181
-#, fuzzy, c-format
-msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
-msgstr "Komandi: ingingo Na"
+#: src/setup/ncurses/wizard_curs.c:324
+msgid ""
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If left empty, GNUnet will try to automatically detect the IP.\n"
+"You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
+"If in doubt, leave this empty."
+msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:192
-#, fuzzy, c-format
-msgid "Unsupported command `%s'.  Aborting.\n"
-msgstr "Komandi:"
+#: src/setup/ncurses/wizard_curs.c:339
+msgid "Bandwidth configuration: upload"
+msgstr ""
 
-#: src/applications/dht/module/table.c:716
-msgid "# dht connections"
+#: src/setup/ncurses/wizard_curs.c:341
+msgid "How much upstream bandwidth (in bytes/s) may be used?"
 msgstr ""
 
-#: src/applications/dht/module/table.c:718
+#: src/setup/ncurses/wizard_curs.c:342
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
+"you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:354
+msgid "Bandwidth configuration: download"
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:356
+msgid "How much downstream bandwidth (in bytes/s) may be used?"
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:357
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
+"If you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:369
 #, fuzzy
-msgid "# dht discovery messages received"
-msgstr "#hejuru Ibibazo BYAKIRIWE"
+msgid "Quota configuration"
+msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/applications/dht/module/table.c:720
-msgid "# dht route host lookups performed"
+#: src/setup/ncurses/wizard_curs.c:370
+msgid "What is the maximum size of the datastore in MB?"
 msgstr ""
 
-#: src/applications/dht/module/table.c:722
-msgid "# dht discovery messages sent"
+#: src/setup/ncurses/wizard_curs.c:371
+msgid ""
+"The GNUnet datastore contains all content that GNUnet needs to store "
+"(indexed, inserted and migrated content)."
 msgstr ""
 
-#: src/applications/dht/module/cs.c:128
-#, fuzzy, c-format
-msgid "`%s' failed. Terminating connection to client.\n"
-msgstr "'%s'Byanze."
+#: src/setup/ncurses/wizard_curs.c:383
+msgid "Daemon configuration: user account"
+msgstr ""
 
-#: src/applications/dht/module/cs.c:233
-#, c-format
-msgid "`%s' registering client handlers: %d %d\n"
+#: src/setup/ncurses/wizard_curs.c:384
+msgid "As which user should gnunetd be run?"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:251
-msgid "Enables efficient non-anonymous routing"
+#: src/setup/ncurses/wizard_curs.c:386
+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"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the field empty to run GNUnet with system privileges.\n"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:736
-msgid "# dht replies routed"
+#: src/setup/ncurses/wizard_curs.c:403
+msgid "Daemon configuration: group account"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:738
-#, fuzzy
-msgid "# dht requests routed"
-msgstr "#BYAKIRIWE"
+#: src/setup/ncurses/wizard_curs.c:404
+msgid "As which group should gnunetd be run?"
+msgstr ""
 
-#: src/applications/dht/module/routing.c:740
-#, fuzzy
-msgid "# dht get requests received"
-msgstr "#BYAKIRIWE"
+#: src/setup/ncurses/wizard_curs.c:406
+msgid ""
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
+"\n"
+"You can also specify a already existant group here.\n"
+"\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
+msgstr ""
 
-#: src/applications/dht/module/routing.c:742
-#, fuzzy
-msgid "# dht put requests received"
-msgstr "#BYAKIRIWE"
+#: src/setup/ncurses/wizard_curs.c:420
+msgid "Do you want to automatically launch GNUnet as a system service?"
+msgstr ""
 
-#: src/applications/dht/module/routing.c:744
-#, fuzzy
-msgid "# dht results received"
-msgstr "#Gushaka Ibisubizo ku BYAKIRIWE KB"
+#: src/setup/ncurses/wizard_curs.c:422
+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/applications/dht/module/routing.c:748
-#, c-format
-msgid "`%s' registering p2p handlers: %d %d %d\n"
+#: src/setup/ncurses/wizard_curs.c:445 src/setup/gtk/wizard_gtk.c:415
+#, fuzzy, c-format
+msgid "Unable to save configuration file `%s':"
+msgstr "OYA Iboneza IDOSIYE"
+
+#: src/setup/ncurses/wizard_curs.c:464
+msgid "Unable to create user account for daemon."
 msgstr ""
 
-#: src/applications/chat/chat.c:88
-#, fuzzy
-msgid "Message received from peer is invalid.\n"
-msgstr "BYAKIRIWE Bivuye ni Sibyo"
+#: src/setup/ncurses/wizard_curs.c:471
+msgid "Unable to setup autostart for daemon."
+msgstr ""
 
-#: src/applications/chat/chat.c:135
+#: src/setup/ncurses/wizard_curs.c:486
 #, fuzzy
-msgid "Message received from client is invalid\n"
-msgstr "BYAKIRIWE Bivuye Umukiriya ni"
+msgid "Save configuration?"
+msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/applications/chat/chat.c:155
-#, fuzzy
-msgid "Maximum number of chat clients reached.\n"
-msgstr "Umubare Bya"
+#: src/setup/ncurses/wizard_curs.c:487
+msgid "Save configuration now?"
+msgstr ""
 
-#: src/applications/chat/chat.c:160
-#, fuzzy, c-format
-msgid "Now %d of %d chat clients at this node.\n"
-msgstr "Bya ku iyi"
+#: src/setup/ncurses/wizard_curs.c:531 src/setup/gtk/gnunet-setup.glade:723
+#: src/setup/gtk/gnunet-setup.glade:1056 src/setup/gtk/gnunet-setup.glade:1340
+msgid "Back"
+msgstr ""
 
-#: src/applications/chat/chat.c:202
+#: src/setup/text/conf.c:79
+msgid "yes"
+msgstr ""
+
+#: src/setup/text/conf.c:80
+msgid "no"
+msgstr ""
+
+#: src/setup/text/conf.c:106
 #, c-format
-msgid "`%s' registering handlers %d and %d\n"
+msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/applications/chat/chat.c:219
-msgid "enables P2P-chat (incomplete)"
+#: src/setup/text/conf.c:115
+msgid "\tPossible choices:\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:45
-msgid "Join a chat on GNUnet."
+#: src/setup/text/conf.c:123
+msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:49
-msgid "set the nickname to use (requred)"
+#: src/setup/text/conf.c:125
+#, c-format
+msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:52
-msgid "set the chat room to join (requred)"
+#: src/setup/text/conf.c:143
+#, c-format
+msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:134
-#, fuzzy, c-format
-msgid "You must specify a nickname\n"
-msgstr "a Ijambo- banze"
+#: src/setup/text/conf.c:147
+#, c-format
+msgid "\tEnter floating point (type '%s' for default value %f): "
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:144
+#: src/setup/text/conf.c:153
+#, c-format
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
+msgstr ""
+
+#: src/setup/text/conf.c:187
 #, fuzzy, c-format
-msgid "Failed to join the room\n"
-msgstr "Kuri Kuri Umuyoboro"
+msgid "Yes\n"
+msgstr "Yego"
 
-#: src/applications/chat/gnunet-chat.c:160
+#: src/setup/text/conf.c:192
 #, fuzzy, c-format
-msgid "Failed to send message.\n"
-msgstr "Kuri Kohereza Ubutumwa Kuri"
+msgid "No\n"
+msgstr "Oya."
 
-#: src/applications/advertising/advertising.c:193
+# sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
+#: src/setup/text/conf.c:195 src/setup/text/conf.c:236
+#: src/setup/text/conf.c:266 src/setup/text/conf.c:329
+#: src/setup/text/conf.c:387
 #, fuzzy, c-format
-msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
-msgstr "Ubutumwa Bivuye Sibyo Isinya Sibyo"
+msgid "Help\n"
+msgstr "/Kugoboka"
 
-#: 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/setup/text/conf.c:198 src/setup/text/conf.c:213
+#: src/setup/text/conf.c:276 src/setup/text/conf.c:307
+#: src/setup/text/conf.c:365
+#, c-format
+msgid "Abort\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:374
+#: src/setup/text/conf.c:354 src/setup/text/conf.c:416
+#, c-format
+msgid ""
+"\n"
+"Invalid entry, try again (use '?' for help): "
+msgstr ""
+
+#: src/setup/text/conf.c:422
+#, c-format
+msgid "Unknown kind %x (internal error).  Skipping option.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:484
+msgid "\tDescend? (y/n/?) "
+msgstr ""
+
+#: src/setup/text/conf.c:493
+msgid "Aborted.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:506
 #, fuzzy
-msgid "Could not send HELLO+PING, ping buffer full.\n"
-msgstr "OYA Kohereza"
+msgid "Invalid entry.\n"
+msgstr "ingingo"
 
-#: src/applications/advertising/advertising.c:396
-msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
+#: src/setup/text/conf.c:524
+#, c-format
+msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:544
+#: src/setup/text/conf.c:556
+#, c-format
+msgid "You can always press ENTER to keep the current value.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:557
+#, c-format
+msgid "Use the '%s' key to abort.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:575
+#, c-format
+msgid ""
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
+msgstr ""
+
+#: src/setup/text/conf.c:590
 #, fuzzy, c-format
-msgid "Advertising my transport %d to selected peers.\n"
-msgstr "Kuri Byahiswemo"
+msgid "Configuration was unchanged, no need to save.\n"
+msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: src/applications/advertising/advertising.c:553
-#, fuzzy
+#: src/setup/text/conf.c:599
+#, fuzzy, c-format
+msgid "Configuration file `%s' written.\n"
+msgstr "Gufungura Iboneza IDOSIYE"
+
+#: src/setup/gtk/wizard_gtk.c:141
+msgid "(unknown connection)"
+msgstr ""
+
+#: src/setup/gtk/wizard_gtk.c:439
+msgid "Do you want to save the new configuration?"
+msgstr ""
+
+#: src/setup/gtk/wizard_gtk.c:471
+msgid "Unable to create user account:"
+msgstr ""
+
+#: src/setup/gtk/wizard_gtk.c:479
+msgid "Unable to change startup process:"
+msgstr ""
+
+#: src/setup/gtk/wizard_gtk.c:494
 msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
-msgstr "Oya Ikindi Kuri RW"
+"Running gnunet-update failed.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
+"Finally, run gnunet-update manually."
+msgstr ""
 
-#: src/applications/advertising/advertising.c:817
-#, fuzzy
-msgid "# Peer advertisements received"
-msgstr "#BYAKIRIWE"
+#: src/setup/gtk/ngconf.c:383 src/setup/gtk/gconf.c:492
+msgid "Configuration saved."
+msgstr ""
 
-#: src/applications/advertising/advertising.c:820
+#: src/setup/gtk/ngconf.c:393 src/setup/gtk/gconf.c:502
 #, fuzzy
-msgid "# Peer advertisements of type NAT received"
-msgstr "#BYAKIRIWE"
+msgid "Failed to save configuration."
+msgstr "OYA Iboneza IDOSIYE"
 
-#: src/applications/advertising/advertising.c:823
-#, fuzzy
-msgid "# Peer advertisements confirmed via PONG"
-msgstr "#BYAKIRIWE"
+#: src/setup/gtk/ngconf.c:418 src/setup/gtk/gconf.c:528
+msgid "Configuration changed. Save?"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:827
+#: src/setup/gtk/ngconf.c:431 src/setup/gtk/gconf.c:541
 #, fuzzy
-msgid "# Peer advertisements updating earlier HELLOs"
-msgstr "#BYAKIRIWE"
+msgid "Error saving configuration."
+msgstr "Zimya Iyemeza Bivuye"
 
-#: src/applications/advertising/advertising.c:830
-#, fuzzy
-msgid "# Peer advertisements discarded due to load"
-msgstr "#BYAKIRIWE"
+#: src/setup/gtk/gconf.c:389
+msgid "Description"
+msgstr "Insobanuramiterere"
 
-#: src/applications/advertising/advertising.c:834
-#, fuzzy
-msgid "# Peer advertisements for unsupported transport"
-msgstr "#BYAKIRIWE"
+#: src/setup/gtk/gconf.c:405
+msgid "Value"
+msgstr "Agaciro"
 
-#: src/applications/advertising/advertising.c:838
-#, fuzzy
-msgid "# Peer advertisements not confirmed due to ping busy"
-msgstr "#BYAKIRIWE"
+#: src/setup/gtk/gconf.c:429
+msgid "Default"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:842
+#: src/setup/gtk/gconf.c:458
 #, fuzzy
-msgid "# Peer advertisements not confirmed due to lack of self ad"
-msgstr "#BYAKIRIWE"
+msgid "Section"
+msgstr "Insobanuramiterere"
 
-#: src/applications/advertising/advertising.c:846
+#: src/setup/gtk/gconf.c:469
 #, fuzzy
-msgid "# Peer advertisements not confirmed due to send error"
-msgstr "#BYAKIRIWE"
+msgid "Option"
+msgstr "ibirindiro"
 
-#: src/applications/advertising/advertising.c:848
-msgid "# Self advertisments transmitted"
+#: src/setup/lib/tree.c:191
+#, c-format
+msgid ""
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:850
-msgid "# Foreign advertisements forwarded"
+#: src/setup/lib/gns.c:315
+#, c-format
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:852
-#: src/applications/pingpong/pingpong.c:509
-msgid "# plaintext PING messages sent"
+#: src/setup/lib/wizard_util.c:111
+msgid "Can't open Service Control Manager"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:857
-#: src/applications/session/connect.c:913
-#, c-format
-msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
+#: src/setup/lib/wizard_util.c:117
+msgid "Can't create service"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:872
-msgid ""
-"ensures that this peer is known by other peers and discovers other peers"
+#: src/setup/lib/wizard_util.c:121
+msgid "Error changing the permissions of the GNUnet directory"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:467
-msgid "maintains GNUnet default mesh topology"
+#: src/setup/lib/wizard_util.c:126
+msgid "Cannot write to the regisitry"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:132
-#: src/applications/pingpong/pingpong.c:199
-#: src/applications/pingpong/pingpong.c:264
-#: src/applications/pingpong/pingpong.c:331
-#, fuzzy, c-format
-msgid "Received malformed `%s' message. Dropping.\n"
-msgstr "Ubutumwa"
+#: src/setup/lib/wizard_util.c:129
+msgid "Can't access the service"
+msgstr ""
 
-#: src/applications/pingpong/pingpong.c:143
+#: src/setup/lib/wizard_util.c:132
+msgid "Can't delete the service"
+msgstr ""
+
+#: src/setup/lib/wizard_util.c:135
 #, fuzzy
-msgid "Received ping for another peer. Dropping.\n"
-msgstr "kugirango"
+msgid "Unknown error"
+msgstr "itazwi"
 
-#: src/applications/pingpong/pingpong.c:209
+#: src/setup/lib/wizard_util.c:171
+msgid "This version of Windows does not support multiple users."
+msgstr ""
+
+#: src/setup/lib/wizard_util.c:175
 #, fuzzy
-msgid "Received PING not destined for us!\n"
-msgstr "OYA kugirango RW"
+msgid "Error creating user"
+msgstr "Ivugurura Verisiyo"
 
-#: src/applications/pingpong/pingpong.c:303
-#: src/applications/pingpong/pingpong.c:365
+#: src/setup/lib/wizard_util.c:179
+msgid "Error accessing local security policy"
+msgstr ""
+
+#: src/setup/lib/wizard_util.c:184
+msgid "Error granting service right to user"
+msgstr ""
+
+#: src/setup/lib/wizard_util.c:189
+msgid "Unknown error while creating a new user"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:64
+#, c-format
+msgid "Can only set one option per invocation.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:72
+#, c-format
 msgid ""
-"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
-"constant.\n"
+"Invalid synatx, argument to 'set' must have the format SECTION:"
+"OPTION=VALUE.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:409
-msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
+#: src/setup/gnunet-setup.c:86
+#, c-format
+msgid "Can only display one option per invocation.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:499
-#, fuzzy
-msgid "# encrypted PONG messages received"
-msgstr "#Bayite Bya BYAKIRIWE"
+#: src/setup/gnunet-setup.c:93
+#, c-format
+msgid ""
+"Invalid synatx, argument to 'get' must have the format SECTION:OPTION.\n"
+msgstr ""
 
-#: src/applications/pingpong/pingpong.c:501
-#, fuzzy
-msgid "# plaintext PONG messages received"
-msgstr "#Umukiriya Ibibazo BYAKIRIWE"
+#: src/setup/gnunet-setup.c:107
+msgid "generate configuration for gnunetd, the GNUnet daemon"
+msgstr ""
 
-#: src/applications/pingpong/pingpong.c:503
+#: src/setup/gnunet-setup.c:110 src/server/gnunet-update.c:265
 #, fuzzy
-msgid "# encrypted PING messages received"
-msgstr "#Bayite Bya BYAKIRIWE"
+msgid "print a value from the configuration file to stdout"
+msgstr "Gucapa a Agaciro Bivuye i Iboneza IDOSIYE Kuri"
 
-#: src/applications/pingpong/pingpong.c:505
-#, fuzzy
-msgid "# PING messages created"
-msgstr "#Ubutumwa"
+#: src/setup/gnunet-setup.c:112
+msgid "Tool to setup GNUnet."
+msgstr ""
 
-#: src/applications/pingpong/pingpong.c:507
-#: src/applications/session/connect.c:908
+#: src/setup/gnunet-setup.c:114
 #, fuzzy
-msgid "# encrypted PONG messages sent"
-msgstr "#Bishunzwe: Bayite Yoherejwe:"
+msgid "update a value in the configuration file"
+msgstr "Gucapa a Agaciro Bivuye i Iboneza IDOSIYE Kuri"
 
-#: src/applications/pingpong/pingpong.c:511
-#: src/applications/session/connect.c:906
-#, fuzzy
-msgid "# encrypted PING messages sent"
-msgstr "#Bishunzwe: Bayite Yoherejwe:"
+#: src/setup/gnunet-setup.c:257
+#, fuzzy, c-format
+msgid "Too many arguments.\n"
+msgstr "Komandi: Umurongo ingingo"
 
-#: src/applications/pingpong/pingpong.c:513
+#: src/setup/gnunet-setup.c:263
 #, fuzzy
-msgid "# plaintext PONG messages sent"
-msgstr "#Umukiriya Ibibazo BYAKIRIWE"
+msgid "No interface specified, using default\n"
+msgstr "imbonerahamwe# Izina: ikoresha"
 
-#: src/applications/pingpong/pingpong.c:517
-#, fuzzy
-msgid "# plaintext PONG transmissions failed"
-msgstr "#Umukiriya Ibibazo BYAKIRIWE"
-
-#: src/applications/pingpong/pingpong.c:526
+#: src/setup/gnunet-setup.c:340
 #, c-format
-msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
+msgid "Undefined option.\n"
 msgstr ""
 
-#: 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:470
-#: src/applications/sqstore_mysql/mysql.c:480
-#: src/applications/sqstore_mysql/mysql.c:518
-#: src/applications/sqstore_mysql/mysql.c:528
-#: src/applications/sqstore_mysql/mysql.c:560
-#: src/applications/sqstore_mysql/mysql.c:571
-#: src/applications/sqstore_mysql/mysql.c:669
-#: src/applications/sqstore_mysql/mysql.c:681
-#: src/applications/sqstore_mysql/mysql.c:693
-#: src/applications/sqstore_mysql/mysql.c:707
-#: src/applications/sqstore_mysql/mysql.c:804
-#: src/applications/sqstore_mysql/mysql.c:818
-#: src/applications/sqstore_mysql/mysql.c:968
-#: src/applications/sqstore_mysql/mysql.c:980
-#: src/applications/sqstore_mysql/mysql.c:992
-#: src/applications/sqstore_mysql/mysql.c:1232
-#: src/applications/sqstore_mysql/mysql.c:1244
-#: src/applications/sqstore_mysql/mysql.c:1256
-#: src/applications/sqstore_mysql/mysql.c:1341
-#: src/applications/kvstore_sqlite/kv_sqlite.c:44
-#: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:99
-#: src/applications/dstore/dstore.c:195 src/applications/dstore/dstore.c:234
-#: src/applications/dstore/dstore.c:253 src/applications/dstore/dstore.c:308
-#: src/applications/dstore/dstore.c:326 src/applications/dstore/dstore.c:337
-#: src/applications/dstore/dstore.c:368 src/applications/dstore/dstore.c:459
-#: 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
+# 
uui/source\ids.src:RID_UUI_ERRHDL.(ERRCODE_UUI_IO_NOTAFILE_&_ERRCODE_RES_MASK).text
+#: src/setup/gnunet-setup.c:391
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "'%s'Byanze ku Na: Ikosa"
+msgid "`%s' is not available."
+msgstr "'%s'ntabwo ari idosiye"
 
-#: src/applications/sqstore_sqlite/sqlite.c:193
+#: src/setup/gnunet-setup.c:409
 #, fuzzy, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "Kuri gutangiza"
+msgid "Unknown operation `%s'\n"
+msgstr "Imiterere Verisiyo"
 
-#: src/applications/sqstore_sqlite/sqlite.c:393
+#: src/setup/gnunet-setup.c:410 src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:517 src/util/getopt/getopt.c:1072
+#, fuzzy, c-format
+msgid "Use --help to get a list of options.\n"
+msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
+
+#: src/setup/gnunet-win-tool.c:52
+msgid "list all network adapters"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:55
+msgid "install GNUnet as Windows service"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:58
+msgid "uninstall GNUnet service"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:61
+msgid "increase the maximum number of TCP/IP connections"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:64
+msgid "display a file's hash value"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:123
 #, c-format
-msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
+msgid "GNUnet service installed successfully.\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:394
-#: src/applications/sqstore_sqlite/sqlite.c:431
-msgid "sqlite datastore"
+#: src/setup/gnunet-win-tool.c:126 src/setup/gnunet-win-tool.c:154
+#, c-format
+msgid "This version of Windows doesn't support services.\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:430
+#: src/setup/gnunet-win-tool.c:130 src/setup/gnunet-win-tool.c:158
 #, c-format
-msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
+msgid "Error: can't open Service Control Manager: %s\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1276
-#: src/applications/sqstore_mysql/mysql.c:1449
-#, fuzzy
-msgid "# bytes in datastore"
-msgstr "#Bayite Yoherejwe:"
+#: src/setup/gnunet-win-tool.c:135
+#, c-format
+msgid "Error: can't create service: %s\n"
+msgstr ""
 
-#: src/applications/session/connect.c:256
-#: src/applications/session/connect.c:272
+#: src/setup/gnunet-win-tool.c:138 src/setup/gnunet-win-tool.c:170
 #, fuzzy, c-format
-msgid "Session key from peer `%s' could not be verified.\n"
-msgstr "Urufunguzo Bivuye OYA Byagenzuwe"
+msgid "Unknown error.\n"
+msgstr "Verisiyo"
 
-#: src/applications/session/connect.c:313
+#: src/setup/gnunet-win-tool.c:151
 #, fuzzy, c-format
-msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
-msgstr "Shyiraho Umutekano Ikindi OYA"
+msgid "Service deleted.\n"
+msgstr "/Byahiswemo"
 
-#: src/applications/session/connect.c:492
-msgid "Could not create any HELLO for myself!\n"
+#: src/setup/gnunet-win-tool.c:163
+#, c-format
+msgid "Error: can't access service: %s\n"
 msgstr ""
 
-#: src/applications/session/connect.c:592
+#: src/setup/gnunet-win-tool.c:167
+#, c-format
+msgid "Error: can't delete service: %s\n"
+msgstr ""
+
+#: src/applications/dht/tools/dhttest.c:43
+#: src/applications/dht/tools/dhttest2.c:43
+#: src/applications/dht/module/table.c:734
+msgid "# dht connections"
+msgstr ""
+
+#: src/applications/dht/tools/dht-query.c:52
+#, fuzzy
+msgid "Query (get KEY, put KEY VALUE) DHT table."
+msgstr "Kubona Gushyira Gukuraho... a imbonerahamwe#"
+
+#: src/applications/dht/tools/dht-query.c:57
+#, 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:96
+#, c-format
+msgid "%s(%s) operation returned no results.\n"
+msgstr ""
+
+#: src/applications/dht/tools/dht-query.c:113
 #, fuzzy, c-format
-msgid "Session key received from peer `%s' has invalid format (discarded).\n"
-msgstr "'%s'Ubutumwa BYAKIRIWE Bivuye"
+msgid "Issuing '%s(%s,%s)' command.\n"
+msgstr "'%s(%s,%s)'Byanze"
 
-#: src/applications/session/connect.c:624
+#: src/applications/dht/tools/dht-query.c:120
+#, c-format
+msgid "'%s(%s,%s)' succeeded\n"
+msgstr ""
+
+#: src/applications/dht/tools/dht-query.c:124
 #, fuzzy, c-format
-msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
-msgstr "'%s'Ubutumwa BYAKIRIWE Bivuye"
+msgid "'%s(%s,%s)' failed.\n"
+msgstr "'%s(%s,%s)'Byanze"
 
-#: src/applications/session/connect.c:656
+#: src/applications/dht/tools/dht-query.c:148
 #, fuzzy, c-format
-msgid "Invalid `%s' message received from peer `%s'.\n"
-msgstr "Ubutumwa BYAKIRIWE Bivuye"
+msgid "Failed to connect to gnunetd.\n"
+msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/session/connect.c:666
+#: src/applications/dht/tools/dht-query.c:161
+#, fuzzy, c-format
+msgid "Command `%s' requires an argument (`%s').\n"
+msgstr "Komandi:"
+
+#: src/applications/dht/tools/dht-query.c:178
+#, fuzzy, c-format
+msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
+msgstr "Komandi: ingingo Na"
+
+#: src/applications/dht/tools/dht-query.c:189
+#, fuzzy, c-format
+msgid "Unsupported command `%s'.  Aborting.\n"
+msgstr "Komandi:"
+
+#: src/applications/dht/module/cs.c:135
+#, fuzzy, c-format
+msgid "`%s' failed. Terminating connection to client.\n"
+msgstr "'%s'Byanze."
+
+#: src/applications/dht/module/cs.c:242
 #, c-format
-msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
+msgid "`%s' registering client handlers: %d %d\n"
 msgstr ""
 
-#: src/applications/session/connect.c:729
-#, 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/dht/module/cs.c:261
+msgid "Enables efficient non-anonymous routing"
+msgstr ""
 
-#: src/applications/session/connect.c:741
+#: src/applications/dht/module/routing.c:747
+msgid "# dht replies routed"
+msgstr ""
+
+#: src/applications/dht/module/routing.c:749
+#, fuzzy
+msgid "# dht requests routed"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/dht/module/routing.c:751
+#, fuzzy
+msgid "# dht get requests received"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/dht/module/routing.c:753
+#, fuzzy
+msgid "# dht put requests received"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/dht/module/routing.c:755
+#, fuzzy
+msgid "# dht results received"
+msgstr "#Gushaka Ibisubizo ku BYAKIRIWE KB"
+
+#: src/applications/dht/module/routing.c:759
 #, c-format
-msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
+msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr ""
 
-#: src/applications/session/connect.c:898
-msgid "# session keys sent"
+#: src/applications/dht/module/table.c:736
+#, fuzzy
+msgid "# dht discovery messages received"
+msgstr "#hejuru Ibibazo BYAKIRIWE"
+
+#: src/applications/dht/module/table.c:738
+msgid "# dht route host lookups performed"
 msgstr ""
 
-#: src/applications/session/connect.c:900
-msgid "# session keys rejected"
+#: src/applications/dht/module/table.c:740
+msgid "# dht discovery messages sent"
 msgstr ""
 
-#: src/applications/session/connect.c:902
-msgid "# session keys accepted"
+#: src/applications/topology_default/topology.c:545
+#, fuzzy, c-format
+msgid "Failed to read friends list from `%s'\n"
+msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
+
+#: src/applications/topology_default/topology.c:562
+msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:904
-msgid "# sessions established"
+#: src/applications/topology_default/topology.c:576
+#, c-format
+msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:134 src/applications/rpc/rpc.c:175
+#: src/applications/topology_default/topology.c:588
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:596
+msgid ""
+"More friendly connections required than target total number of connections.\n"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:703
+msgid "maintains GNUnet default mesh topology"
+msgstr ""
+
+#: src/applications/rpc/rpc.c:136 src/applications/rpc/rpc.c:181
 #, 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:218 src/applications/rpc/rpc.c:265
+#: src/applications/rpc/rpc.c:228 src/applications/rpc/rpc.c:281
 #, 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:237
+#: src/applications/rpc/rpc.c:250
 #, 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:285
+#: src/applications/rpc/rpc.c:303
 #, 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:909 src/applications/rpc/rpc.c:1043
-#: src/applications/rpc/rpc.c:1129
+#: src/applications/rpc/rpc.c:945 src/applications/rpc/rpc.c:1084
+#: src/applications/rpc/rpc.c:1174
 #, fuzzy, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr "Ubutumwa Bya Ubwoko BYAKIRIWE"
 
-#: src/applications/rpc/rpc.c:975
+#: src/applications/rpc/rpc.c:1015
 #, fuzzy, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "Kubaza... Ubutumwa"
 
-#: src/applications/rpc/rpc.c:1307
+#: src/applications/rpc/rpc.c:1363
 #, 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:1421
+#: src/applications/rpc/rpc.c:1482
 #, fuzzy, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "OYA"
 
-#: src/applications/rpc/rpc.c:1450
+#: src/applications/rpc/rpc.c:1511
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1466
+#: src/applications/rpc/rpc.c:1529
 #, fuzzy, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Kuri gutangiza Serivisi"
 
-#: src/applications/rpc/rpc.c:1524
+#: src/applications/rpc/rpc.c:1592
 #, fuzzy
 msgid "RPC async reply invalid.\n"
 msgstr "Subiza Sibyo"
 
-#: src/applications/rpc/rpc.c:1592
+#: src/applications/rpc/rpc.c:1663
 #, fuzzy
 msgid "async RPC reply not received.\n"
 msgstr "Subiza OYA BYAKIRIWE"
 
-#: src/applications/sqstore_mysql/mysql.c:421
+#: src/applications/datastore/datastore.c:170
+#: src/applications/datastore/datastore.c:184
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s"
-msgstr "'%s'Byanze ku Na: Ikosa"
-
-#: src/applications/sqstore_mysql/mysql.c:1359
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
-msgstr "'%s'Byanze ku Na: Ikosa"
-
-#: src/applications/sqstore_mysql/mysql.c:1471
-#: src/applications/sqstore_mysql/mysql.c:1618
-#, 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:1496
-#: src/applications/sqstore_mysql/mysql.c:1641
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
-msgstr ""
-
-#: 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:368
+#: src/applications/datastore/datastore.c:423
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:370
+#: src/applications/datastore/datastore.c:425
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:373
+#: src/applications/datastore/datastore.c:428
 msgid "# bytes allowed in datastore"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:388
+#: src/applications/datastore/datastore.c:445
 #, fuzzy
 msgid "Failed to load state service. Trying to do without.\n"
 msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
 
-#: src/applications/datastore/datastore.c:513
+#: src/applications/datastore/datastore.c:586
 #, fuzzy
 msgid "Failed to load sqstore service.  Check your configuration!\n"
 msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
 
-#: src/applications/identity/hostkey.c:116
-#, fuzzy, c-format
-msgid "Failed to access GNUnet home directory `%s'\n"
-msgstr "OYA bushyinguro"
+#: src/applications/fragmentation/fragmentation.c:578
+#, fuzzy
+msgid "# messages defragmented"
+msgstr "#Ubutumwa"
 
-#: 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:152
+#: src/applications/fragmentation/fragmentation.c:580
 #, fuzzy
-msgid "Creating new hostkey (this may take a while).\n"
-msgstr "Gishya iyi Gicurasi a"
+msgid "# messages fragmented"
+msgstr "#Ubutumwa"
 
-#: src/applications/identity/hostkey.c:162
-msgid "Done creating hostkey.\n"
+#: src/applications/fragmentation/fragmentation.c:581
+msgid "# fragments discarded"
 msgstr ""
 
-#: 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/fragmentation/fragmentation.c:592
+#, c-format
+msgid "`%s' registering handler %d\n"
+msgstr ""
 
-#: 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/vpn/gnunet-vpn.c:51
+#: src/applications/stats/gnunet-stats.c:83
+#, fuzzy
+msgid "Print statistics about GNUnet operations."
+msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
 
-#: src/applications/identity/identity.c:393
-#, c-format
-msgid "Still no peers found in `%s'!\n"
+#: src/applications/vpn/gnunet-vpn.c:55
+msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/identity/identity.c:708
-#: src/applications/identity/identity.c:729
+#: src/applications/vpn/gnunet-vpn.c:149
+#: src/applications/stats/gnunet-stats.c:121
+#: src/applications/tbench/gnunet-tbench.c:126
+#: src/applications/tracekit/gnunet-tracekit.c:325
+#: src/applications/template/gnunet-template.c:95
 #, fuzzy, c-format
-msgid "Removed file `%s' containing invalid HELLO data.\n"
-msgstr "IDOSIYE Sibyo Ibyatanzwe"
+msgid "Error establishing connection with gnunetd.\n"
+msgstr "Zimya Iyemeza Bivuye"
 
-#: src/applications/identity/identity.c:776
+#: src/applications/vpn/vpn.c:368
 #, c-format
-msgid "Signature failed verification: peer `%s' not known.\n"
+msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:785
-msgid "Signature failed verification: signature invalid.\n"
+#: src/applications/vpn/vpn.c:379
+#, c-format
+msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/identity/identity.c:894
-#: src/applications/identity/identity.c:1014
+#: src/applications/vpn/vpn.c:412
 #, c-format
-msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
+msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:1017
+#: src/applications/vpn/vpn.c:468
 #, c-format
-msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
+msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:190
+#: src/applications/vpn/vpn.c:475
 #, c-format
-msgid ""
-"Converting peer address to string failed, transport type %d not supported\n"
+msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:244
+#: src/applications/vpn/vpn.c:491
 #, c-format
-msgid "Transport connection attempt failed, transport type %d not supported\n"
+msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:297
+#: src/applications/vpn/vpn.c:563
 #, c-format
-msgid ""
-"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
+msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:373
-#, fuzzy, c-format
-msgid "Transmission attempt failed, transport type %d unknown.\n"
-msgstr "Bya Ubwoko"
+#: src/applications/vpn/vpn.c:569
+#, c-format
+msgid "Cannot open tunnel device because of %s"
+msgstr ""
 
-#: src/applications/transport/transport.c:494
-#, fuzzy, c-format
-msgid "No transport of type %d known.\n"
-msgstr "Bya Ubwoko"
+#: src/applications/vpn/vpn.c:606
+#, c-format
+msgid "RFC4193 Create skips gnu%d as we are already using it\n"
+msgstr ""
 
-#: src/applications/transport/transport.c:553
-msgid "No transport succeeded in creating a hello!\n"
+#: src/applications/vpn/vpn.c:621
+#, c-format
+msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:752
-#, fuzzy, c-format
-msgid "Loading transports `%s'\n"
-msgstr "S"
+#: src/applications/vpn/vpn.c:631
+#, c-format
+msgid "Configured tunnel name to %s\n"
+msgstr ""
 
-#: src/applications/transport/transport.c:771
-#, fuzzy, c-format
-msgid "Could not load transport plugin `%s'\n"
-msgstr "OYA gutangiza Porogaramu"
+#: src/applications/vpn/vpn.c:673
+#, c-format
+msgid "Cannot get socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: 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/vpn/vpn.c:683
+#, c-format
+msgid "Cannot set socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/transport/transport.c:808
-#, fuzzy, c-format
-msgid "Loaded transport `%s'\n"
-msgstr "S"
-
-#: src/applications/transport/transport.c:819
+#: src/applications/vpn/vpn.c:693
 #, c-format
-msgid "I am peer `%s'.\n"
+msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:575
-#, fuzzy
-msgid "# messages defragmented"
-msgstr "#Ubutumwa"
-
-#: src/applications/fragmentation/fragmentation.c:577
-#, fuzzy
-msgid "# messages fragmented"
-msgstr "#Ubutumwa"
-
-#: src/applications/fragmentation/fragmentation.c:578
-msgid "# fragments discarded"
+#: src/applications/vpn/vpn.c:701
+#, c-format
+msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:588
+#: src/applications/vpn/vpn.c:715
 #, c-format
-msgid "`%s' registering handler %d\n"
+msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:62
+#: src/applications/vpn/vpn.c:730
 #, fuzzy, c-format
-msgid "Supported peer-to-peer messages:\n"
-msgstr "Kuri Ubutumwa"
+msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
+msgstr "OYA Gushaka Aderesi kugirango"
 
-#: src/applications/stats/gnunet-stats.c:65
+#: src/applications/vpn/vpn.c:746
+#, c-format
+msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:760
 #, fuzzy, c-format
-msgid "Supported client-server messages:\n"
-msgstr "Umukiriya Seriveri Ubutumwa"
+msgid "Cannot add route IPv6 address for gnu%s because %s\n"
+msgstr "OYA Gushaka Aderesi kugirango"
 
-#: src/applications/stats/gnunet-stats.c:84
-#: src/applications/vpn/gnunet-vpn.c:53
-#, fuzzy
-msgid "Print statistics about GNUnet operations."
-msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
+#: src/applications/vpn/vpn.c:803
+msgid ""
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:88
-#, fuzzy
-msgid "prints supported protocol messages"
-msgstr "Porotokole Ubutumwa"
+#: src/applications/vpn/vpn.c:853
+#, c-format
+msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
+msgstr ""
 
-#: 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:149
-#, fuzzy, c-format
-msgid "Error establishing connection with gnunetd.\n"
-msgstr "Zimya Iyemeza Bivuye"
+#: src/applications/vpn/vpn.c:932
+#, c-format
+msgid "VPN dropping connection %x\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:134
-#, fuzzy, c-format
-msgid "Error reading information from gnunetd.\n"
-msgstr "Zimya Iyemeza Bivuye"
+#: src/applications/vpn/vpn.c:941
+#, c-format
+msgid "VPN cannot drop connection %x\n"
+msgstr ""
 
-#: src/applications/stats/clientapi.c:330
-#, fuzzy
-msgid "Uptime (seconds)"
-msgstr "amasogonda"
+#: src/applications/vpn/vpn.c:961
+msgid "RFC4193 Thread exiting\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:223
-#, fuzzy, c-format
-msgid "% of allowed network load (up)"
-msgstr "%Bya urusobe Ibirimo Hejuru"
+#: src/applications/vpn/vpn.c:1010
+msgid "VPN IP src not anonymous. drop..\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:225
-#, fuzzy, c-format
-msgid "% of allowed network load (down)"
-msgstr "%Bya urusobe Ibirimo Hasi"
+#: src/applications/vpn/vpn.c:1018
+msgid "VPN IP not anonymous, drop.\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:226
-#, fuzzy, c-format
-msgid "% of allowed cpu load"
-msgstr "%Bya CPU Ibirimo"
+#: src/applications/vpn/vpn.c:1027
+msgid "VPN Received, not anonymous, drop.\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:227
+#: src/applications/vpn/vpn.c:1032
 #, fuzzy, c-format
-msgid "% of allowed io load"
-msgstr "%Bya CPU Ibirimo"
+msgid "VPN Received unknown IP version %d...\n"
+msgstr "Subiza Bya Kitazwi Ubwoko"
 
-#: src/applications/stats/statistics.c:228
-#, fuzzy
-msgid "# of connected peers"
-msgstr "#Bya"
-
-#: src/applications/stats/statistics.c:230
-#, fuzzy
-msgid "# bytes of noise received"
-msgstr "#Bayite Bya BYAKIRIWE"
-
-#: src/applications/stats/statistics.c:401
+#: src/applications/vpn/vpn.c:1043
 #, c-format
-msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
+msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:421
+#: src/applications/vpn/vpn.c:1071
+msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1092
 #, fuzzy
-msgid "keeps statistics about gnunetd's operation"
-msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
+msgid "Receive route request\n"
+msgstr "Gikora"
 
-#: src/applications/stats/sqstats.c:150
-msgid "# Any-Blocks"
+#: src/applications/vpn/vpn.c:1099
+#, c-format
+msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:151
-msgid "# DBlocks"
+#: src/applications/vpn/vpn.c:1117
+#, c-format
+msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:152
-msgid "# SBlocks"
+#: src/applications/vpn/vpn.c:1123
+#, c-format
+msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:153
-msgid "# KBlocks"
-msgstr ""
+#: src/applications/vpn/vpn.c:1140
+#, fuzzy
+msgid "Receive route announce.\n"
+msgstr "Subiza Bya Kitazwi Ubwoko"
 
-#: src/applications/stats/sqstats.c:154
-msgid "# NBlocks"
+#: src/applications/vpn/vpn.c:1146
+msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:155
-msgid "# KNBlocks"
-msgstr ""
+#: src/applications/vpn/vpn.c:1152
+#, fuzzy, c-format
+msgid "Inserting with hops %d\n"
+msgstr "Uburyo"
 
-#: src/applications/stats/sqstats.c:156
-msgid "# OnDemand-Blocks"
+#: src/applications/vpn/vpn.c:1173
+#, c-format
+msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:157
-msgid "# Unknown-Blocks"
+#: src/applications/vpn/vpn.c:1191
+#, c-format
+msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:158
-msgid "# expired"
+#: src/applications/vpn/vpn.c:1223
+msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:159
-msgid "# expire in 1h"
+#: src/applications/vpn/vpn.c:1244
+msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:160
-msgid "# expire in 24h"
+#: src/applications/vpn/vpn.c:1296
+msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:161
-msgid "# expire in 1 week"
+#: src/applications/vpn/vpn.c:1350
+msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:162
-msgid "# expire in 1 month"
+#: src/applications/vpn/vpn.c:1383
+msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:163
-msgid "# zero priority"
+#: src/applications/vpn/vpn.c:1723
+#, c-format
+msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:164
-msgid "# priority one"
+#: src/applications/vpn/vpn.c:1728
+#, c-format
+msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:165
-msgid "# priority larger than one"
+#: src/applications/vpn/vpn.c:1817
+msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:166
-msgid "# no anonymity"
+#: src/applications/vpn/vpn.c:1851
+msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:167
-msgid "# anonymity one"
+#: src/applications/vpn/vpn.c:1866
+msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: 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:55
-#, fuzzy
-msgid "Start GNUnet transport benchmarking tool."
-msgstr "Gutangira"
-
-#: src/applications/tbench/gnunet-tbench.c:66
-#, fuzzy
-msgid "output in gnuplot format"
-msgstr "Ibisohoka in Imiterere"
-
-#: src/applications/tbench/gnunet-tbench.c:70
-#, fuzzy
-msgid "number of iterations"
-msgstr "Umubare Bya Amasubiramo"
-
-#: src/applications/tbench/gnunet-tbench.c:74
-#, fuzzy
-msgid "number of messages to use per iteration"
-msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
-
-#: src/applications/tbench/gnunet-tbench.c:77
-#, fuzzy
-msgid "receiver host identifier (ENC file name)"
-msgstr "Mwakirizi Ubuturo Ikiranga IDOSIYE Izina:"
-
-#: src/applications/tbench/gnunet-tbench.c:80
-#, fuzzy
-msgid "message size"
-msgstr "Ubutumwa Ingano"
-
-#: src/applications/tbench/gnunet-tbench.c:83
-#, fuzzy
-msgid "sleep for SPACE ms after each a message block"
-msgstr "kugirango Nyuma Ubutumwa"
-
-#: src/applications/tbench/gnunet-tbench.c:86
-#, fuzzy
-msgid "time to wait for the completion of an iteration (in ms)"
-msgstr "Igihe Kuri Tegereza kugirango i Bya a"
-
-#: src/applications/tbench/gnunet-tbench.c:91
-#, fuzzy
-msgid "number of messages in a message block"
-msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
-
-#: src/applications/tbench/gnunet-tbench.c:143
-#, fuzzy, c-format
-msgid "You must specify a receiver!\n"
-msgstr "a Mwakirizi"
-
-#: src/applications/tbench/gnunet-tbench.c:152
-#, fuzzy, c-format
-msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
-msgstr "Mwakirizi ni OYA Byemewe Izina:"
-
-#: src/applications/tbench/gnunet-tbench.c: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: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: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:190
-#, fuzzy, c-format
-msgid "\tmean     %8.4fms\n"
-msgstr "Impuzandengo-"
-
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# 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:191
-#, fuzzy, c-format
-msgid "\tvariance %8.4fms\n"
-msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
-
-#: src/applications/tbench/gnunet-tbench.c:193
+#: src/applications/vpn/vpn.c:1884
 #, c-format
-msgid "Loss:\n"
+msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MAX.text
-#: src/applications/tbench/gnunet-tbench.c:194
-#, fuzzy, c-format
-msgid "\tmax      %u\n"
-msgstr "Kinini-"
-
-# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MIN.text
-#: src/applications/tbench/gnunet-tbench.c:195
-#, fuzzy, c-format
-msgid "\tmin      %u\n"
-msgstr "Gito-"
-
-# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_AVG.text
-#: src/applications/tbench/gnunet-tbench.c:196
-#, fuzzy, c-format
-msgid "\tmean     %8.4f\n"
-msgstr "Impuzandengo-"
-
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# 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:197
-#, fuzzy, c-format
-msgid "\tvariance %8.4f\n"
-msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
-
-#: 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: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:412
-msgid "allows profiling of direct peer-to-peer connections"
+#: src/applications/gap/pid_table.c:177
+msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:48
-#, fuzzy
-msgid "probe network to the given DEPTH"
-msgstr "urusobe Kuri i"
-
-#: src/applications/tracekit/gnunet-tracekit.c:52
-#, fuzzy
-msgid ""
-"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+#: src/applications/gap/pid_table.c:181
+msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
-"Ibisohoka Imiterere 0 kugirango Ibisohoka 1. kugirango Akadomo 2. kugirango"
 
-#: 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:63
-#, fuzzy
-msgid "wait DELAY seconds for replies"
-msgstr "Tegereza amasogonda kugirango"
-
-#: src/applications/tracekit/gnunet-tracekit.c:111
+#: src/applications/gap/gap.c:1723
 #, 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:160
-#, fuzzy, c-format
-msgid "`%s' is not connected to any peer.\n"
-msgstr "'%s'ni OYA Kuri"
-
-#: src/applications/tracekit/gnunet-tracekit.c:197
-#, fuzzy, c-format
-msgid "`%s' connected to `%s'.\n"
-msgstr "'%s'Kuri"
-
-#: 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:236
-#, fuzzy, c-format
-msgid "Peer `%s' did not report back.\n"
-msgstr "OYA Icyegeranyo Inyuma"
-
-#: 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: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:269
-#, fuzzy
-msgid "TRACEKIT: routing table full, trace request dropped\n"
-msgstr "imbonerahamwe# Kubaza..."
-
-#: src/applications/tracekit/tracekit.c:346
-#, fuzzy, c-format
-msgid "TRACEKIT: received invalid `%s' message\n"
-msgstr "BYAKIRIWE Sibyo"
-
-#: src/applications/tracekit/tracekit.c:443
-#, fuzzy
-msgid "allows mapping of the network topology"
-msgstr "urusobe"
-
-#: 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:1696
+#: src/applications/gap/gap.c:1724
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1883
+#: src/applications/gap/gap.c:1916
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1892 src/applications/fs/module/anonymity.c:65
+#: src/applications/gap/gap.c:1927 src/applications/fs/module/anonymity.c:66
 #, fuzzy
 msgid "Failed to get traffic stats.\n"
 msgstr "Kuri Ikibazo# Ibyerekeye"
 
-#: src/applications/gap/gap.c:1902 src/applications/gap/gap.c:1910
-#: src/applications/gap/gap.c:1921
+#: src/applications/gap/gap.c:1938 src/applications/gap/gap.c:1947
+#: src/applications/gap/gap.c:1959
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2183
+#: src/applications/gap/gap.c:2231
 #, fuzzy
 msgid "# gap requests total received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2234
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2188
+#: src/applications/gap/gap.c:2236
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2190
+#: src/applications/gap/gap.c:2238
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2194
+#: src/applications/gap/gap.c:2242
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2197
+#: src/applications/gap/gap.c:2245
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2199
+#: src/applications/gap/gap.c:2247
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2202
+#: src/applications/gap/gap.c:2250
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2206
+#: src/applications/gap/gap.c:2254
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2208
+#: src/applications/gap/gap.c:2256
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2211
+#: src/applications/gap/gap.c:2259
 #, fuzzy
 msgid "# gap duplicate requests that were re-tried"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2262
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2216
+#: src/applications/gap/gap.c:2264
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2218
+#: src/applications/gap/gap.c:2266
 #, fuzzy
 msgid "# gap spurious replies (dropped)"
 msgstr "#hejuru Ibibazo BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2220
+#: src/applications/gap/gap.c:2268
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2223
+#: src/applications/gap/gap.c:2271
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2227
+#: src/applications/gap/gap.c:2275
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2229
+#: src/applications/gap/gap.c:2277
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2231
+#: src/applications/gap/gap.c:2279
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2246
+#: src/applications/gap/gap.c:2295
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2269
+#: src/applications/gap/gap.c:2319
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:177
-msgid "# distinct interned peer IDs in pid table"
-msgstr ""
-
-#: src/applications/gap/pid_table.c:181
-msgid "# total RC of interned peer IDs in pid table"
-msgstr ""
-
-#: src/applications/getoption/getoption.c:75
-#, c-format
-msgid "`%s' registering client handler %d\n"
-msgstr ""
-
-#: 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-pseudonym.c:70
 #: src/applications/fs/tools/gnunet-insert.c:268
-#: src/applications/fs/tools/gnunet-search.c:135
+#: src/applications/fs/tools/gnunet-search.c:136
 #: src/applications/fs/tools/gnunet-download.c:69
 #, fuzzy
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gushyiraho i Bya Mwakirizi"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:74
+#: src/applications/fs/tools/gnunet-pseudonym.c:73
 #, fuzzy
 msgid "automate creation of a namespace by starting a collection"
 msgstr "Bya a ku a"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:78
+#: src/applications/fs/tools/gnunet-pseudonym.c:77
 #, fuzzy
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "Gusiba i Na: i"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:81
+#: src/applications/fs/tools/gnunet-pseudonym.c:80
 #, fuzzy
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "Gusiba i Na: i"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:84
+#: src/applications/fs/tools/gnunet-pseudonym.c:83
 #, fuzzy
 msgid "end automated building of a namespace (ends collection)"
 msgstr "Impera Bya a"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:86
+#: src/applications/fs/tools/gnunet-pseudonym.c:85
 #, fuzzy
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
 msgstr "Gishya Gusiba Cyangwa Urutonde"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:90
+#: src/applications/fs/tools/gnunet-pseudonym.c:89
 #, 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:93
+#: src/applications/fs/tools/gnunet-pseudonym.c:92
 #, fuzzy
 msgid "specify metadata describing the namespace or collection"
 msgstr "Impera Bya a"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:97
+#: src/applications/fs/tools/gnunet-pseudonym.c:96
 #, 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:100
+#: src/applications/fs/tools/gnunet-pseudonym.c:99
 #, 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:104
+#: src/applications/fs/tools/gnunet-pseudonym.c:103
 #, 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:107
+#: src/applications/fs/tools/gnunet-pseudonym.c:106
 msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:140
+#: src/applications/fs/tools/gnunet-pseudonym.c:139
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:142
+#: src/applications/fs/tools/gnunet-pseudonym.c:141
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:171
+#: src/applications/fs/tools/gnunet-pseudonym.c:170
 #, fuzzy, c-format
 msgid "\tRating (after update): %d\n"
 msgstr "Nyuma"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:204
+#: src/applications/fs/tools/gnunet-pseudonym.c:203
 #, fuzzy, c-format
 msgid "Collection stopped.\n"
 msgstr "Kyahagariswe"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:206
+#: src/applications/fs/tools/gnunet-pseudonym.c:205
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:214
+#: src/applications/fs/tools/gnunet-pseudonym.c:213
 #, fuzzy, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Cyasibwe"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:219
+#: src/applications/fs/tools/gnunet-pseudonym.c:218
 #, fuzzy, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr ""
@@ -1650,17 +1733,17 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:234
+#: src/applications/fs/tools/gnunet-pseudonym.c:233
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:238
+#: src/applications/fs/tools/gnunet-pseudonym.c:237
 #, fuzzy, c-format
 msgid "Failed to start collection.\n"
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:279
+#: src/applications/fs/tools/gnunet-pseudonym.c:280
 #, fuzzy, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr ""
@@ -1673,17 +1756,17 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:287
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:301
+#: src/applications/fs/tools/gnunet-pseudonym.c:302
 #, 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:309
+#: src/applications/fs/tools/gnunet-pseudonym.c:310
 #, fuzzy, c-format
 msgid "Could not access namespace information.\n"
 msgstr "OYA bushyinguro"
@@ -1693,42 +1776,42 @@
 msgid "==> Directory `%s':\n"
 msgstr "==>ububiko"
 
-#: src/applications/fs/tools/gnunet-directory.c:87
+#: src/applications/fs/tools/gnunet-directory.c:88
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:114
+#: src/applications/fs/tools/gnunet-directory.c:118
 #, 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:116
+#: src/applications/fs/tools/gnunet-directory.c:120
 #, fuzzy, c-format
 msgid "%d files found in directory.\n"
 msgstr "IDOSIYE Kuri bushyinguro"
 
-#: src/applications/fs/tools/gnunet-directory.c:131
+#: src/applications/fs/tools/gnunet-directory.c:135
 #, fuzzy
 msgid "Perform directory related operations."
 msgstr "bushyinguro Ibikorwa:"
 
-#: src/applications/fs/tools/gnunet-directory.c:134
+#: src/applications/fs/tools/gnunet-directory.c:138
 #, 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:138
+#: src/applications/fs/tools/gnunet-directory.c:142
 #, fuzzy
 msgid "list entries from the directory database"
 msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-directory.c:141
+#: src/applications/fs/tools/gnunet-directory.c:145
 #, fuzzy
 msgid "start tracking entries for the directory database"
 msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-directory.c:164
+#: src/applications/fs/tools/gnunet-directory.c:168
 #, fuzzy, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "Ibyinjijwe"
@@ -1910,7 +1993,7 @@
 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:418
+#: src/applications/fs/tools/gnunet-insert.c:420
 #, fuzzy, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
@@ -1923,41 +2006,41 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-insert.c:437
+#: src/applications/fs/tools/gnunet-insert.c:440
 #, 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:464
-#: src/applications/fs/tools/gnunet-insert.c:472
-#: src/applications/fs/tools/gnunet-insert.c:480
+#: src/applications/fs/tools/gnunet-insert.c:451
+#: src/applications/fs/tools/gnunet-insert.c:459
+#: src/applications/fs/tools/gnunet-insert.c:467
+#: src/applications/fs/tools/gnunet-insert.c:475
+#: src/applications/fs/tools/gnunet-insert.c:483
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Oya Ihitamo"
 
-#: src/applications/fs/tools/gnunet-search.c:138
+#: src/applications/fs/tools/gnunet-search.c:139
 #, fuzzy
 msgid "Search GNUnet for files."
 msgstr "kugirango Idosiye"
 
-#: src/applications/fs/tools/gnunet-search.c:142
+#: src/applications/fs/tools/gnunet-search.c:143
 #, fuzzy
 msgid "exit after receiving LIMIT results"
 msgstr "Gusohoka Nyuma Ibisubizo ku"
 
-#: src/applications/fs/tools/gnunet-search.c:145
+#: src/applications/fs/tools/gnunet-search.c:146
 #, fuzzy
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "Kwandika Gushaka Ibisubizo ku Kuri i IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-search.c:148
+#: src/applications/fs/tools/gnunet-search.c:149
 #, 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:183
+#: src/applications/fs/tools/gnunet-search.c:186
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
@@ -2009,46 +2092,46 @@
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr "ISEGONDA"
 
-#: src/applications/fs/tools/gnunet-download.c:178
+#: src/applications/fs/tools/gnunet-download.c:180
 msgid "no name given"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:184
+#: src/applications/fs/tools/gnunet-download.c:186
 #, c-format
 msgid "Starting download `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:225
+#: src/applications/fs/tools/gnunet-download.c:228
 #, fuzzy
 msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 msgstr "ingingo a"
 
-#: src/applications/fs/tools/gnunet-download.c:242
+#: src/applications/fs/tools/gnunet-download.c:246
 #, fuzzy, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr "Sibyo"
 
-#: src/applications/fs/tools/gnunet-download.c:279
+#: src/applications/fs/tools/gnunet-download.c:289
 #, fuzzy, c-format
 msgid "No filename specified, using `%s' instead (for now).\n"
 msgstr "imbonerahamwe# Izina: ikoresha"
 
-#: src/applications/fs/tools/gnunet-download.c:320
+#: src/applications/fs/tools/gnunet-download.c:331
 #, fuzzy, c-format
 msgid "Could not access gnunet-directory file `%s'\n"
 msgstr "OYA bushyinguro"
 
-#: src/applications/fs/tools/gnunet-download.c:338
+#: src/applications/fs/tools/gnunet-download.c:351
 #, fuzzy, c-format
 msgid "Downloading %d files from directory `%s'.\n"
 msgstr "Idosiye Bivuye"
 
-#: src/applications/fs/tools/gnunet-download.c:341
+#: src/applications/fs/tools/gnunet-download.c:354
 #, fuzzy, c-format
 msgid "Did not find any files in directory `%s'\n"
 msgstr "OYA Gufungura bushyinguro"
 
-#: src/applications/fs/tools/gnunet-download.c:377
+#: src/applications/fs/tools/gnunet-download.c:391
 #, fuzzy, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Idosiye Nka"
@@ -2060,51 +2143,64 @@
 "completion)                "
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:73
 #, 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:85
+#: src/applications/fs/tools/gnunet-unindex.c:88
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error unindexing file: %s\n"
 msgstr "Kuri IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-unindex.c:105
+#: src/applications/fs/tools/gnunet-unindex.c:108
 #, fuzzy
 msgid "Unindex files."
 msgstr "#Idosiye"
 
-#: src/applications/fs/tools/gnunet-unindex.c:142
+#: src/applications/fs/tools/gnunet-unindex.c:145
 #, 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:158
+#: src/applications/fs/tools/gnunet-unindex.c:163
 #, fuzzy, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s'ntabwo ari idosiye"
 
-#: src/applications/fs/module/querymanager.c:228
+#: src/applications/fs/uritrack/file_info.c:134
+msgid "Collecting file identifiers disabled.\n"
+msgstr ""
+
+#: src/applications/fs/uritrack/file_info.c:414
+#, c-format
+msgid "Deleted corrupt URI database in `%s'."
+msgstr ""
+
+#: src/applications/fs/module/dht_push.c:138
+msgid "# blocks pushed into DHT"
+msgstr ""
+
+#: src/applications/fs/module/querymanager.c:234
 #, fuzzy
 msgid "# FS currently tracked queries from clients"
 msgstr "#Umukiriya Yoherejwe:"
 
-#: src/applications/fs/module/querymanager.c:230
+#: src/applications/fs/module/querymanager.c:236
 msgid "# FS replies passed to clients"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:323
+#: src/applications/fs/module/ondemand.c:330
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:418
+#: src/applications/fs/module/ondemand.c:431
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2112,706 +2208,1555 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:444
+#: src/applications/fs/module/ondemand.c:457
 #, 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:495
+#: src/applications/fs/module/ondemand.c:514
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:647
+#: src/applications/fs/module/ondemand.c:668
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1170
+#: src/applications/fs/module/fs.c:1204
 #, 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:1185
+#: src/applications/fs/module/fs.c:1219
 msgid "# FS expired replies dropped"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1187
+#: src/applications/fs/module/fs.c:1221
 #, fuzzy
 msgid "# FS valid replies received"
 msgstr "#Gushaka Ibisubizo ku BYAKIRIWE KB"
 
-#: src/applications/fs/module/fs.c:1220
+#: src/applications/fs/module/fs.c:1257
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1266
+#: src/applications/fs/module/fs.c:1314
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:374
+#: src/applications/fs/module/migration.c:381
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:376
+#: src/applications/fs/module/migration.c:383
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:379
+#: src/applications/fs/module/migration.c:386
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/module/dht_push.c:138
-msgid "# blocks pushed into DHT"
+#: src/applications/fs/fsui/deserialize.c:772
+#, c-format
+msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:234
+#: src/applications/fs/fsui/searchtest.c:154
+#: src/applications/fs/fsui/fsuitest.c:173
+#: src/applications/fs/fsui/downloadtest.c:289
+#: src/applications/fs/fsui/serializetest2.c:391
+#: src/applications/fs/fsui/serializetest3.c:163
+#: src/applications/fs/fsui/serializetest4.c:358
+#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
+#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
+msgid "AND"
+msgstr ""
+
+#: src/applications/fs/fsui/search.c:241
 msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:294
+#: src/applications/fs/fsui/download.c:311
 #, fuzzy
 msgid "Download failed (no reason given)"
 msgstr "Idosiye Bivuye"
 
-#: src/applications/fs/fsui/unindex.c:109
+#: src/applications/fs/fsui/unindex.c:114
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:278
+#: src/applications/fs/fsui/upload.c:328
 #, fuzzy
 msgid "Failed to create temporary directory."
 msgstr "Kuri Kurema"
 
-#: 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:168
 msgid "CHK URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:214
+#: src/applications/fs/ecrs/search.c:217
 msgid "LOC URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:131
+#: src/applications/fs/ecrs/download.c:132
 #, fuzzy, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "OYA Kwandika Kuri IDOSIYE"
 
-#: src/applications/fs/ecrs/download.c:271
+#: src/applications/fs/ecrs/download.c:272
 #, fuzzy, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "'%s'%sByanze"
 
-#: src/applications/fs/ecrs/download.c:1001
+#: src/applications/fs/ecrs/download.c:1010
 #, 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:1184
+#: src/applications/fs/ecrs/download.c:1205
 #, fuzzy, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr "Kuri OYA Bihari ku i urusobe"
 
+#: src/applications/fs/ecrs/helper.c:75
+#, fuzzy
+msgid "No keywords specified!\n"
+msgstr "Amagambo fatizo"
+
 # 
uui/source\ids.src:RID_UUI_ERRHDL.(ERRCODE_UUI_IO_NOTAFILE_&_ERRCODE_RES_MASK).text
-#: src/applications/fs/ecrs/upload.c:155
+#: src/applications/fs/ecrs/upload.c:156
 #, fuzzy, c-format
 msgid "`%s' is not a file.\n"
 msgstr "'%s'ntabwo ari idosiye"
 
-#: src/applications/fs/ecrs/upload.c:162
+#: src/applications/fs/ecrs/upload.c:164
 #, fuzzy, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:171
+#: src/applications/fs/ecrs/upload.c:173
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/fs/ecrs/upload.c:183
+#: src/applications/fs/ecrs/upload.c:185
 #, fuzzy, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Ibirimo"
 
-#: src/applications/fs/ecrs/upload.c:202
+#: src/applications/fs/ecrs/upload.c:204
 #, fuzzy, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Bya in IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:209
+#: src/applications/fs/ecrs/upload.c:212
 #, 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:223
+#: src/applications/fs/ecrs/upload.c:226
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:296
+#: src/applications/fs/ecrs/upload.c:309
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:876
+#: src/applications/fs/ecrs/meta.c:883
 #, fuzzy, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Bya IDOSIYE Kuri Byanze"
 
-#: src/applications/fs/ecrs/meta.c:884
+#: src/applications/fs/ecrs/meta.c:893
 #, fuzzy, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "OYA Guhindura izina IDOSIYE Kuri IDOSIYE"
 
-#: src/applications/fs/ecrs/namespace.c:154
+#: src/applications/fs/ecrs/namespace.c:157
 #, fuzzy, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Kurema IDOSIYE"
 
-#: src/applications/fs/ecrs/namespace.c:325
-#: src/applications/fs/ecrs/namespace.c:404
-#: src/applications/fs/ecrs/namespace.c:545
+#: src/applications/fs/ecrs/namespace.c:339
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:571
 #, fuzzy, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Idosiye OYA a"
 
-#: src/applications/fs/ecrs/namespace.c:337
-#: src/applications/fs/ecrs/namespace.c:415
+#: src/applications/fs/ecrs/namespace.c:352
+#: src/applications/fs/ecrs/namespace.c:432
 #, fuzzy, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/fs/ecrs/namespace.c:556
-#: src/applications/fs/ecrs/namespace.c:567
+#: src/applications/fs/ecrs/namespace.c:583
+#: src/applications/fs/ecrs/namespace.c:594
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/fs/ecrs/helper.c:74
-#, fuzzy
-msgid "No keywords specified!\n"
-msgstr "Amagambo fatizo"
-
-#: 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:120
+#: src/applications/fs/ecrs/parser.c:124
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:126
-msgid "Collecting file identifiers disabled.\n"
-msgstr ""
-
-#: 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:655
+#: src/applications/fs/namespace/namespace_info.c:685
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/applications/fs/namespace/namespace_info.c:675
+#: src/applications/fs/namespace/namespace_info.c:708
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:373
+#: src/applications/testing/testing.c:247
+#, c-format
+msgid "Waiting for peers to connect"
+msgstr ""
+
+#: src/applications/kvstore_sqlite/kv_sqlite.c:44
+#: src/applications/kvstore_sqlite/kv_sqlite.c:51
+#: 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:476
+#: src/applications/sqstore_mysql/mysql.c:487
+#: src/applications/sqstore_mysql/mysql.c:526
+#: src/applications/sqstore_mysql/mysql.c:537
+#: src/applications/sqstore_mysql/mysql.c:571
+#: src/applications/sqstore_mysql/mysql.c:582
+#: src/applications/sqstore_mysql/mysql.c:680
+#: src/applications/sqstore_mysql/mysql.c:693
+#: src/applications/sqstore_mysql/mysql.c:706
+#: src/applications/sqstore_mysql/mysql.c:721
+#: src/applications/sqstore_mysql/mysql.c:821
+#: src/applications/sqstore_mysql/mysql.c:836
+#: src/applications/sqstore_mysql/mysql.c:988
+#: src/applications/sqstore_mysql/mysql.c:1000
+#: src/applications/sqstore_mysql/mysql.c:1012
+#: src/applications/sqstore_mysql/mysql.c:1260
+#: src/applications/sqstore_mysql/mysql.c:1272
+#: src/applications/sqstore_mysql/mysql.c:1284
+#: src/applications/sqstore_mysql/mysql.c:1369
+#: src/applications/kvstore_mysql/kv_mysql.c:44
+#: src/applications/kvstore_mysql/kv_mysql.c:51
+#: src/applications/dstore_mysql/dstore_mysql.c:107
+#: src/applications/dstore_mysql/dstore_mysql.c:114
+#: src/applications/dstore_mysql/dstore_mysql.c:286
+#: src/applications/dstore_mysql/dstore_mysql.c:301
+#: src/applications/dstore_mysql/dstore_mysql.c:315
+#: src/applications/dstore_mysql/dstore_mysql.c:329
+#: src/applications/dstore_mysql/dstore_mysql.c:342
+#: src/applications/dstore_mysql/dstore_mysql.c:412
+#: src/applications/dstore_mysql/dstore_mysql.c:434
+#: src/applications/dstore_mysql/dstore_mysql.c:446
+#: src/applications/dstore_mysql/dstore_mysql.c:521
+#: src/applications/dstore_mysql/dstore_mysql.c:533
+#: src/applications/dstore_mysql/dstore_mysql.c:554
+#: src/applications/dstore_sqlite/dstore.c:91
+#: src/applications/dstore_sqlite/dstore.c:98
+#: src/applications/dstore_sqlite/dstore.c:194
+#: src/applications/dstore_sqlite/dstore.c:236
+#: src/applications/dstore_sqlite/dstore.c:257
+#: src/applications/dstore_sqlite/dstore.c:313
+#: src/applications/dstore_sqlite/dstore.c:331
+#: src/applications/dstore_sqlite/dstore.c:343
+#: src/applications/dstore_sqlite/dstore.c:375
+#: src/applications/dstore_sqlite/dstore.c:467
+#: src/util/crypto/hostkey_gcrypt.c:64 src/util/crypto/hostkey_gcrypt.c:71
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
 #, fuzzy, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/applications/topology_f2f/topology.c:390
-msgid "Syntax error in topology specification, skipping bytes.\n"
+#: src/applications/advertising/advertising_test.c:47
+#: src/applications/session/sessiontest_http.c:40
+#: src/applications/session/sessiontest.c:40
+#: src/applications/session/sessiontest2.c:40
+#: src/applications/stats/statistics.c:233
+#, fuzzy
+msgid "# of connected peers"
+msgstr "#Bya"
+
+#: src/applications/advertising/advertising.c:194
+#, 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:205
+#, fuzzy
+msgid "HELLO message has expiration too far in the future. Dropping.\n"
+msgstr "Ubutumwa BYAKIRIWE Sibyo Igihe KURI"
+
+#: src/applications/advertising/advertising.c:407
+#, fuzzy
+msgid "Could not send HELLO+PING, ping buffer full.\n"
+msgstr "OYA Kohereza"
+
+#: src/applications/advertising/advertising.c:429
+msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:404
-#, c-format
-msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+#: src/applications/advertising/advertising.c:601
+#, fuzzy, c-format
+msgid "Advertising my transport %d to selected peers.\n"
+msgstr "Kuri Byahiswemo"
+
+#: src/applications/advertising/advertising.c:610
+#, 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:887
+#, fuzzy
+msgid "# Peer advertisements received"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:890
+#, fuzzy
+msgid "# Peer advertisements of type NAT received"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:893
+#, fuzzy
+msgid "# Peer advertisements confirmed via PONG"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:897
+#, fuzzy
+msgid "# Peer advertisements updating earlier HELLOs"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:900
+#, fuzzy
+msgid "# Peer advertisements discarded due to load"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:904
+#, fuzzy
+msgid "# Peer advertisements for unsupported transport"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:908
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to ping busy"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:912
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to lack of self ad"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:916
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to send error"
+msgstr "#BYAKIRIWE"
+
+#: src/applications/advertising/advertising.c:918
+msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:511
-msgid "maintains a friend-to-friend restricted topology"
+#: src/applications/advertising/advertising.c:920
+msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/template/template.c:68
+#: src/applications/advertising/advertising.c:922
+#: src/applications/pingpong/pingpong.c:527
+msgid "# plaintext PING messages sent"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:928
+#: src/applications/session/connect.c:953
 #, c-format
-msgid "`%s' registering client handler %d and %d\n"
+msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/template/gnunet-template.c:43
+#: src/applications/advertising/advertising.c:944
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
+msgstr ""
+
+#: src/applications/chat/chat.c:91
 #, fuzzy
-msgid "Template description."
-msgstr "/ku Isobanuramiterere"
+msgid "Message received from peer is invalid.\n"
+msgstr "BYAKIRIWE Bivuye ni Sibyo"
 
-#: src/applications/bootstrap_http/http.c:109
+#: src/applications/chat/chat.c:140
+#, fuzzy
+msgid "Message received from client is invalid\n"
+msgstr "BYAKIRIWE Bivuye Umukiriya ni"
+
+#: src/applications/chat/chat.c:161
+#, fuzzy
+msgid "Maximum number of chat clients reached.\n"
+msgstr "Umubare Bya"
+
+#: src/applications/chat/chat.c:167
+#, fuzzy, c-format
+msgid "Now %d of %d chat clients at this node.\n"
+msgstr "Bya ku iyi"
+
+#: src/applications/chat/chat.c:211
 #, c-format
-msgid "Bootstrap data obtained from `%s' is invalid.\n"
+msgid "`%s' registering handlers %d and %d\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:177
-msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
+#: src/applications/chat/chat.c:230
+msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:217
-#, c-format
-msgid "Bootstrapping using `%s'.\n"
+#: src/applications/chat/gnunet-chat.c:45
+msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:231
-#, c-format
-msgid "Trying to download hostlist from `%s'\n"
+#: src/applications/chat/gnunet-chat.c:49
+msgid "set the nickname to use (requred)"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:359
-#, fuzzy, c-format
-msgid "Downloaded %llu bytes from `%s'.\n"
-msgstr "Idosiye Bivuye"
-
-#: src/applications/bootstrap_http/http.c:392
-msgid "# HELLOs downloaded via http"
+#: src/applications/chat/gnunet-chat.c:52
+msgid "set the chat room to join (requred)"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:454
+#: src/applications/chat/gnunet-chat.c:135
 #, fuzzy, c-format
-msgid "# bytes transmitted of type %d"
-msgstr "#Bayite Bya Ubwoko"
+msgid "You must specify a nickname\n"
+msgstr "a Ijambo- banze"
 
-#: src/applications/traffic/traffic.c:470
+#: src/applications/chat/gnunet-chat.c:145
 #, fuzzy, c-format
-msgid "# bytes received of type %d"
-msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+msgid "Failed to join the room\n"
+msgstr "Kuri Kuri Umuyoboro"
 
-#: src/applications/traffic/traffic.c:489
+#: src/applications/chat/gnunet-chat.c:162
 #, fuzzy, c-format
-msgid "# bytes received in plaintext of type %d"
-msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+msgid "Failed to send message.\n"
+msgstr "Kuri Kohereza Ubutumwa Kuri"
 
-#: src/applications/traffic/traffic.c:644
-msgid "tracks bandwidth utilization by gnunetd"
+#: src/applications/sqstore_sqlite/sqlite.c:238
+#, fuzzy, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "Kuri gutangiza"
+
+#: src/applications/sqstore_sqlite/sqlite.c:442
+#, c-format
+msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:57
-msgid "Suppress display of asynchronous log messages"
+#: src/applications/sqstore_sqlite/sqlite.c:443
+#: src/applications/sqstore_sqlite/sqlite.c:482
+msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:366
+#: src/applications/sqstore_sqlite/sqlite.c:481
 #, c-format
-msgid "Not storing route to myself from peer %d\n"
+msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:377
-#, c-format
-msgid "Duplicate route to node from peer %d, choosing minimum hops"
+#: src/applications/sqstore_sqlite/sqlite.c:1336
+#: src/applications/sqstore_mysql/mysql.c:1483
+#, fuzzy
+msgid "# bytes in datastore"
+msgstr "#Bayite Yoherejwe:"
+
+#: src/applications/pingpong/pingpong.c:134
+#: src/applications/pingpong/pingpong.c:205
+#: src/applications/pingpong/pingpong.c:273
+#: src/applications/pingpong/pingpong.c:345
+#, fuzzy, c-format
+msgid "Received malformed `%s' message. Dropping.\n"
+msgstr "Ubutumwa"
+
+#: src/applications/pingpong/pingpong.c:146
+#, fuzzy
+msgid "Received ping for another peer. Dropping.\n"
+msgstr "kugirango"
+
+#: src/applications/pingpong/pingpong.c:216
+#, fuzzy
+msgid "Received PING not destined for us!\n"
+msgstr "OYA kugirango RW"
+
+#: src/applications/pingpong/pingpong.c:315
+#: src/applications/pingpong/pingpong.c:381
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:410
-#, c-format
-msgid "Inserting route from peer %d in route table at location %d\n"
+#: src/applications/pingpong/pingpong.c:425
+msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:466
+#: src/applications/pingpong/pingpong.c:517
+#, fuzzy
+msgid "# encrypted PONG messages received"
+msgstr "#Bayite Bya BYAKIRIWE"
+
+#: src/applications/pingpong/pingpong.c:519
+#, fuzzy
+msgid "# plaintext PONG messages received"
+msgstr "#Umukiriya Ibibazo BYAKIRIWE"
+
+#: src/applications/pingpong/pingpong.c:521
+#, fuzzy
+msgid "# encrypted PING messages received"
+msgstr "#Bayite Bya BYAKIRIWE"
+
+#: src/applications/pingpong/pingpong.c:523
+#, fuzzy
+msgid "# PING messages created"
+msgstr "#Ubutumwa"
+
+#: src/applications/pingpong/pingpong.c:525
+#: src/applications/session/connect.c:947
+#, fuzzy
+msgid "# encrypted PONG messages sent"
+msgstr "#Bishunzwe: Bayite Yoherejwe:"
+
+#: src/applications/pingpong/pingpong.c:529
+#: src/applications/session/connect.c:945
+#, fuzzy
+msgid "# encrypted PING messages sent"
+msgstr "#Bishunzwe: Bayite Yoherejwe:"
+
+#: src/applications/pingpong/pingpong.c:531
+#, fuzzy
+msgid "# plaintext PONG messages sent"
+msgstr "#Umukiriya Ibibazo BYAKIRIWE"
+
+#: src/applications/pingpong/pingpong.c:535
+#, fuzzy
+msgid "# plaintext PONG transmissions failed"
+msgstr "#Umukiriya Ibibazo BYAKIRIWE"
+
+#: src/applications/pingpong/pingpong.c:545
 #, c-format
-msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
+msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:472
-#, c-format
-msgid "RFC4193 Frame length %d too small\n"
+#: src/applications/session/connect.c:260
+#: src/applications/session/connect.c:279
+#, fuzzy, c-format
+msgid "Session key from peer `%s' could not be verified.\n"
+msgstr "Urufunguzo Bivuye OYA Byagenzuwe"
+
+#: src/applications/session/connect.c:323
+#, fuzzy, c-format
+msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
+msgstr "Shyiraho Umutekano Ikindi OYA"
+
+#: src/applications/session/connect.c:512
+msgid "Could not create any HELLO for myself!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:488
+#: src/applications/session/connect.c:615
+#, 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:649
+#, 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:683
+#, fuzzy, c-format
+msgid "Invalid `%s' message received from peer `%s'.\n"
+msgstr "Ubutumwa BYAKIRIWE Bivuye"
+
+#: src/applications/session/connect.c:694
 #, c-format
-msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
+msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:556
+#: src/applications/session/connect.c:763
+#, 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:776
 #, c-format
-msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
+msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:562
-#, c-format
-msgid "Cannot open tunnel device because of %s"
+#: src/applications/session/connect.c:937
+msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:594
-#, c-format
-msgid "RFC4193 Create skips gnu%d as we are already using it\n"
+#: src/applications/session/connect.c:939
+msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:606
-#, c-format
-msgid "Cannot set tunnel name to %s because of %s\n"
+#: src/applications/session/connect.c:941
+msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:614
-#, c-format
-msgid "Configured tunnel name to %s\n"
+#: src/applications/session/connect.c:943
+msgid "# sessions established"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:655
-#, c-format
-msgid "Cannot get socket flags for gnu%d because %s\n"
+#: src/applications/sqstore_mysql/mysql.c:427
+#: src/applications/dstore_mysql/dstore_mysql.c:220
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s"
+msgstr "'%s'Byanze ku Na: Ikosa"
+
+#: src/applications/sqstore_mysql/mysql.c:1388
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
+msgstr "'%s'Byanze ku Na: Ikosa"
+
+#: src/applications/sqstore_mysql/mysql.c:1508
+#: src/applications/sqstore_mysql/mysql.c:1661
+#: src/applications/dstore_mysql/dstore_mysql.c:627
+#, 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:1535
+#: src/applications/sqstore_mysql/mysql.c:1686
+msgid ""
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:664
+#: src/applications/identity/hostkey.c:122
+#, fuzzy, c-format
+msgid "Failed to access GNUnet home directory `%s'\n"
+msgstr "OYA bushyinguro"
+
+#: src/applications/identity/hostkey.c:155
+#, fuzzy, c-format
+msgid ""
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+msgstr "in IDOSIYE Byanze Imiterere Kugenzura... Gishya"
+
+#: src/applications/identity/hostkey.c:164
+#, fuzzy
+msgid "Creating new hostkey (this may take a while).\n"
+msgstr "Gishya iyi Gicurasi a"
+
+#: src/applications/identity/hostkey.c:176
+msgid "Done creating hostkey.\n"
+msgstr ""
+
+#: src/applications/identity/identity.c:352
+#, 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:366
+#, 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:402
 #, c-format
-msgid "Cannot set socket flags for gnu%d because %s\n"
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:674
+#: src/applications/identity/identity.c:731
+#: src/applications/identity/identity.c:757
+#, fuzzy, c-format
+msgid "Removed file `%s' containing invalid HELLO data.\n"
+msgstr "IDOSIYE Sibyo Ibyatanzwe"
+
+#: src/applications/identity/identity.c:809
 #, c-format
-msgid "Cannot set MTU for gnu%d because %s\n"
+msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:682
+#: src/applications/identity/identity.c:819
+msgid "Signature failed verification: signature invalid.\n"
+msgstr ""
+
+#: src/applications/identity/identity.c:935
+#: src/applications/identity/identity.c:1058
 #, c-format
-msgid "Cannot get interface index for gnu%d because %s\n"
+msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:694
+#: src/applications/identity/identity.c:1061
 #, c-format
-msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:707
+#: src/applications/testbed/commands.c:1179
+#: src/applications/stats/gnunet-stats.c:61
 #, fuzzy, c-format
-msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
-msgstr "OYA Gushaka Aderesi kugirango"
+msgid "Supported peer-to-peer messages:\n"
+msgstr "Kuri Ubutumwa"
 
-#: src/applications/vpn/vpn.c:721
-#, c-format
-msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+#: src/applications/testbed/commands.c:1181
+#: src/applications/stats/gnunet-stats.c:64
+#, fuzzy, c-format
+msgid "Supported client-server messages:\n"
+msgstr "Umukiriya Seriveri Ubutumwa"
+
+#: src/applications/testbed/gnunet-testbed.c:118
+#, fuzzy
+msgid "Start GNUnet-testbed helper."
+msgstr "Gutangira"
+
+#: src/applications/testbed/gnunet-testbed.c:176
+#, fuzzy, c-format
+msgid "Cannot connect to LOOPBACK port %d: %s\n"
+msgstr "Kwihuza Kuri Umuyoboro"
+
+#: src/applications/testbed/gnunet-testbed.c:268
+#, fuzzy, c-format
+msgid "Could not execute `%s': %s\n"
+msgstr "OYA Gukora"
+
+#: src/applications/testbed/gnunet-testbed.c:314
+#, fuzzy
+msgid "No client service started. Trying again in 30 seconds.\n"
+msgstr "Umukiriya Serivisi in amasogonda"
+
+#: src/applications/testbed/gnunet-testbed.c:329
+#, fuzzy, c-format
+msgid ""
+"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
+"Trying again in %d seconds...\n"
+msgstr "Bifatanya i Kuri Umuyoboro Porogisi Serivisi in amasogonda"
+
+#: src/applications/testbed/gnunet-testbed.c:392
+#, fuzzy, c-format
+msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
 msgstr ""
+"Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+". Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+". Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
 
-#: src/applications/vpn/vpn.c:733
+#: src/applications/testbed/gnunet-testbed.c:406
 #, fuzzy, c-format
-msgid "Cannot add route IPv6 address for gnu%s because %s\n"
-msgstr "OYA Gushaka Aderesi kugirango"
+msgid "Protocol violation on socket. Expected command.\n"
+msgstr "ku Itegerejwe Komandi:"
 
-#: src/applications/vpn/vpn.c:774
+#: src/applications/testbed/gnunet-testbed.c:446
+#, fuzzy, c-format
+msgid "Command `%s' not found!\n"
+msgstr "OYA Byabonetse"
+
+#: src/applications/testbed/gnunet-testbed.c:510
+#, fuzzy
+msgid "Start GNUnet testbed controller."
+msgstr "Gutangira"
+
+#: src/applications/testbed/gnunet-testbed.c:572
+#, fuzzy, c-format
+msgid "Malformed entry in the configuration in section %s under %s: %s\n"
+msgstr "Icyinjijwe in i Iboneza in Icyiciro"
+
+#: src/applications/testbed/testbed.c:53
+#, fuzzy
+msgid "Could not send acknowledgement back to client.\n"
+msgstr "OYA Kohereza Inyuma Kuri Umukiriya"
+
+#: src/applications/testbed/testbed.c:64
+#, fuzzy, c-format
+msgid "Received unknown testbed message of type %u.\n"
+msgstr "Kitazwi Ubutumwa Bya Ubwoko"
+
+#: src/applications/testbed/testbed.c:82
+#: src/applications/testbed/testbed.c:848
+#, fuzzy, c-format
+msgid "size of `%s' message is too short. Ignoring.\n"
+msgstr "Kwirengagiza."
+
+#: src/applications/testbed/testbed.c:90
+#, fuzzy, c-format
+msgid "size of `%s' message is wrong. Ignoring.\n"
+msgstr "Kwirengagiza."
+
+#: src/applications/testbed/testbed.c:145
+#, fuzzy, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
+msgstr "OYA Ubutumwa kugirango Porotokole"
+
+#: src/applications/testbed/testbed.c:223
+#: src/applications/testbed/testbed.c:268
+#: src/applications/testbed/testbed.c:381
+#: src/applications/testbed/testbed.c:390
+#: src/applications/testbed/testbed.c:434
+#: src/applications/testbed/testbed.c:443
+#, fuzzy, c-format
+msgid "received invalid `%s' message\n"
+msgstr "BYAKIRIWE Sibyo"
+
+#: src/applications/testbed/testbed.c:240
+#: src/applications/testbed/testbed.c:284
+#, fuzzy, c-format
+msgid "received invalid `%s' message (empty module name)\n"
+msgstr "BYAKIRIWE Sibyo Ubutumwa ubusa Modire Izina:"
+
+#: src/applications/testbed/testbed.c:247
+#, fuzzy, c-format
+msgid "loading module `%s' failed.  Notifying client.\n"
+msgstr "Itangira... Modire Byanze Umukiriya"
+
+#: src/applications/testbed/testbed.c:291
+#, fuzzy
+msgid "unloading module failed.  Notifying client.\n"
+msgstr "Modire Byanze Umukiriya"
+
+#: src/applications/testbed/testbed.c:576
+#, fuzzy, c-format
+msgid "`%s' %s failed: %s\n"
+msgstr "'%s'%sByanze"
+
+#: src/applications/testbed/testbed.c:658
+#, fuzzy, c-format
+msgid "received invalid `%s' message: %s.\n"
+msgstr "BYAKIRIWE Sibyo Ubutumwa"
+
+#: src/applications/testbed/testbed.c:861
+#, fuzzy, c-format
+msgid "'..' is not allowed in file name (%s).\n"
+msgstr ""
+"'..'Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+". Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
+
+#: src/applications/testbed/testbed.c:872
+#, fuzzy
+msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
+msgstr "Izina ry'idosiye: kugirango Ubutumwa ni Sibyo"
+
+#: src/applications/testbed/testbed.c:881
+#, fuzzy
+msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
+msgstr "kugirango Ubutumwa ni OYA NTAGIHARI Sibyo"
+
+#: src/applications/testbed/testbed.c:889
+msgid "Upload refused!"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:919
+#, fuzzy, c-format
+msgid "Invalid message received at %s:%d."
+msgstr "Ubutumwa BYAKIRIWE ku"
+
+#: src/applications/testbed/testbed.c:1041
+#, fuzzy, c-format
+msgid "received invalid testbed message of size %u\n"
+msgstr "BYAKIRIWE Sibyo Ubutumwa Bya Ingano"
+
+#: src/applications/testbed/testbed.c:1064
+#, fuzzy, c-format
 msgid ""
-"RFC4193 We have run out of memory and so I can't store a tunnel for this "
-"peer.\n"
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
+msgstr "Ubutumwa Bya Ubwoko Ingano Ikitezwe:"
+
+#: src/applications/testbed/testbed.c:1110
+#, fuzzy
+msgid "No testbed URL given, not registered.\n"
+msgstr "OYA"
+
+#: src/applications/testbed/testbed.c:1121
+#, fuzzy, c-format
+msgid "Could not resolve name of HTTP proxy `%s'.\n"
+msgstr "OYA Izina: Bya Porogisi"
+
+#: src/applications/testbed/testbed.c:1151
+#, fuzzy, c-format
+msgid "Invalid URL `%s' (must begin with `%s')\n"
+msgstr "Na:"
+
+#: src/applications/testbed/testbed.c:1194
+#, fuzzy, c-format
+msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
+msgstr "HTTP ku Umukiriya OYA"
+
+#: src/applications/testbed/testbed.c:1229
+#, fuzzy, c-format
+msgid "Could not register testbed, host `%s' unknown\n"
+msgstr "OYA Kwiyandikisha Ubuturo"
+
+#: src/applications/testbed/testbed.c:1251
+#, fuzzy, c-format
+msgid "Failed to send HTTP request to host `%s': %s\n"
+msgstr "Kuri Kohereza Kubaza... Kuri Ubuturo"
+
+#: src/applications/testbed/testbed.c:1289
+#, fuzzy, c-format
+msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
+msgstr "Kohereza Kubaza... Kuri Ubuturo"
+
+#: src/applications/testbed/testbed.c:1327
+#, fuzzy
+msgid "Exit register (error: no http response read).\n"
+msgstr "Kwiyandikisha Ikosa Oya HTTP Gusoma"
+
+#: src/applications/testbed/testbed.c:1434
+msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:822
+#: src/applications/transport/transport.c:192
 #, c-format
-msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
+msgid ""
+"Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:895
+#: src/applications/transport/transport.c:247
 #, c-format
-msgid "VPN dropping connection %x\n"
+msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:902
+#: src/applications/transport/transport.c:300
 #, c-format
-msgid "VPN cannot drop connection %x\n"
+msgid ""
+"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:921
-msgid "RFC4193 Thread exiting\n"
+#: src/applications/transport/transport.c:377
+#, fuzzy, c-format
+msgid "Transmission attempt failed, transport type %d unknown.\n"
+msgstr "Bya Ubwoko"
+
+#: src/applications/transport/transport.c:500
+#, fuzzy, c-format
+msgid "No transport of type %d known.\n"
+msgstr "Bya Ubwoko"
+
+#: src/applications/transport/transport.c:559
+msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:968
-msgid "VPN IP src not anonymous. drop..\n"
+#: src/applications/transport/transport.c:760
+#, fuzzy, c-format
+msgid "Loading transports `%s'\n"
+msgstr "S"
+
+#: src/applications/transport/transport.c:780
+#, fuzzy, c-format
+msgid "Could not load transport plugin `%s'\n"
+msgstr "OYA gutangiza Porogaramu"
+
+#: src/applications/transport/transport.c:794
+#, 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:823
+#, fuzzy, c-format
+msgid "Loaded transport `%s'\n"
+msgstr "S"
+
+#: src/applications/transport/transport.c:835
+#, c-format
+msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:974
-msgid "VPN IP not anonymous, drop.\n"
+#: src/applications/stats/sqstats.c:151
+msgid "# Any-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:981
-msgid "VPN Received, not anonymous, drop.\n"
+#: src/applications/stats/sqstats.c:152
+msgid "# DBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:985
-#, fuzzy, c-format
-msgid "VPN Received unknown IP version %d...\n"
-msgstr "Subiza Bya Kitazwi Ubwoko"
+#: src/applications/stats/sqstats.c:153
+msgid "# SBlocks"
+msgstr ""
 
-#: src/applications/vpn/vpn.c:996
-#, c-format
-msgid "<- GNUnet(%d) : %s\n"
+#: src/applications/stats/sqstats.c:154
+msgid "# KBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1022
-msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
+#: src/applications/stats/sqstats.c:155
+msgid "# NBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1043
-#, fuzzy
-msgid "Receive route request\n"
-msgstr "Gikora"
+#: src/applications/stats/sqstats.c:156
+msgid "# KNBlocks"
+msgstr ""
 
-#: src/applications/vpn/vpn.c:1050
-#, c-format
-msgid "Prepare route announcement level %d\n"
+#: src/applications/stats/sqstats.c:157
+msgid "# OnDemand-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1065
-#, c-format
-msgid "Send route announcement %d with route announce\n"
+#: src/applications/stats/sqstats.c:158
+msgid "# Unknown-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1071
-#, c-format
-msgid "Send outside table info %d\n"
+#: src/applications/stats/sqstats.c:159
+msgid "# expired"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1088
-#, fuzzy
-msgid "Receive route announce.\n"
-msgstr "Subiza Bya Kitazwi Ubwoko"
+#: src/applications/stats/sqstats.c:160
+msgid "# expire in 1h"
+msgstr ""
 
-#: src/applications/vpn/vpn.c:1094
-msgid "Going to try insert route into local table.\n"
+#: src/applications/stats/sqstats.c:161
+msgid "# expire in 24h"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1100
-#, fuzzy, c-format
-msgid "Inserting with hops %d\n"
-msgstr "Uburyo"
+#: src/applications/stats/sqstats.c:162
+msgid "# expire in 1 week"
+msgstr ""
 
-#: src/applications/vpn/vpn.c:1119
-#, c-format
-msgid "Request level %d from peer %d\n"
+#: src/applications/stats/sqstats.c:163
+msgid "# expire in 1 month"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1137
-#, c-format
-msgid "Receive table limit on peer reached %d\n"
+#: src/applications/stats/sqstats.c:164
+msgid "# zero priority"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1168
-msgid "realise alloc ram\n"
+#: src/applications/stats/sqstats.c:165
+msgid "# priority one"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1188
-msgid "realise add routes\n"
+#: src/applications/stats/sqstats.c:166
+msgid "# priority larger than one"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1239
-msgid "realise pull routes\n"
+#: src/applications/stats/sqstats.c:167
+msgid "# no anonymity"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1292
-msgid "realise copy table\n"
+#: src/applications/stats/sqstats.c:168
+msgid "# anonymity one"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1324
-msgid "Cannot store client info\n"
+#: src/applications/stats/sqstats.c:169
+msgid "# anonymity larger than one"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:95
+#: src/applications/stats/clientapi.c:333
 #, fuzzy
-msgid "Yes"
-msgstr "Yego"
+msgid "Uptime (seconds)"
+msgstr "amasogonda"
 
-#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:94
+#: src/applications/stats/statistics.c:228
+#, fuzzy, c-format
+msgid "% of allowed network load (up)"
+msgstr "%Bya urusobe Ibirimo Hejuru"
+
+#: src/applications/stats/statistics.c:230
+#, fuzzy, c-format
+msgid "% of allowed network load (down)"
+msgstr "%Bya urusobe Ibirimo Hasi"
+
+#: src/applications/stats/statistics.c:231
+#, fuzzy, c-format
+msgid "% of allowed cpu load"
+msgstr "%Bya CPU Ibirimo"
+
+#: src/applications/stats/statistics.c:232
+#, fuzzy, c-format
+msgid "% of allowed io load"
+msgstr "%Bya CPU Ibirimo"
+
+#: src/applications/stats/statistics.c:235
 #, fuzzy
-msgid "No"
-msgstr "Oya."
+msgid "# bytes of noise received"
+msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/vpn/vpn.c:1651
+#: src/applications/stats/statistics.c:237
+msgid "# plibc handles"
+msgstr ""
+
+#: src/applications/stats/statistics.c:421
 #, c-format
-msgid "`%s' initialising RFC4913 module  %d and %d\n"
+msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1654
+#: src/applications/stats/statistics.c:445
+#, fuzzy
+msgid "keeps statistics about gnunetd's operation"
+msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
+
+#: src/applications/stats/gnunet-stats.c:87
+#, fuzzy
+msgid "prints supported protocol messages"
+msgstr "Porotokole Ubutumwa"
+
+#: src/applications/stats/gnunet-stats.c:136
+#, fuzzy, c-format
+msgid "Error reading information from gnunetd.\n"
+msgstr "Zimya Iyemeza Bivuye"
+
+#: src/applications/tbench/gnunet-tbench.c:63
+#: src/applications/tracekit/gnunet-tracekit.c:54
+#, fuzzy
+msgid "Start GNUnet transport benchmarking tool."
+msgstr "Gutangira"
+
+#: src/applications/tbench/gnunet-tbench.c:65
+#, fuzzy
+msgid "output in gnuplot format"
+msgstr "Ibisohoka in Imiterere"
+
+#: src/applications/tbench/gnunet-tbench.c:69
+#, fuzzy
+msgid "number of iterations"
+msgstr "Umubare Bya Amasubiramo"
+
+#: src/applications/tbench/gnunet-tbench.c:73
+#, fuzzy
+msgid "number of messages to use per iteration"
+msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
+
+#: src/applications/tbench/gnunet-tbench.c:76
+#, fuzzy
+msgid "receiver host identifier (ENC file name)"
+msgstr "Mwakirizi Ubuturo Ikiranga IDOSIYE Izina:"
+
+#: src/applications/tbench/gnunet-tbench.c:79
+#, fuzzy
+msgid "message size"
+msgstr "Ubutumwa Ingano"
+
+#: src/applications/tbench/gnunet-tbench.c:82
+#, fuzzy
+msgid "sleep for SPACE ms after each a message block"
+msgstr "kugirango Nyuma Ubutumwa"
+
+#: src/applications/tbench/gnunet-tbench.c:85
+#, fuzzy
+msgid "time to wait for the completion of an iteration (in ms)"
+msgstr "Igihe Kuri Tegereza kugirango i Bya a"
+
+#: src/applications/tbench/gnunet-tbench.c:90
+#, fuzzy
+msgid "number of messages in a message block"
+msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
+
+#: src/applications/tbench/gnunet-tbench.c:142
+#, fuzzy, c-format
+msgid "You must specify a receiver!\n"
+msgstr "a Mwakirizi"
+
+#: src/applications/tbench/gnunet-tbench.c:152
+#, fuzzy, c-format
+msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
+msgstr "Mwakirizi ni OYA Byemewe Izina:"
+
+#: src/applications/tbench/gnunet-tbench.c:189
+#, fuzzy, c-format
+msgid "Time:\n"
+msgstr "Igihe:"
+
+# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MAX.text
+#: src/applications/tbench/gnunet-tbench.c:190
+#, 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:191
+#, 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:192
+#, fuzzy, c-format
+msgid "\tmean     %8.4fms\n"
+msgstr "Impuzandengo-"
+
+# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
+# 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:193
+#, fuzzy, c-format
+msgid "\tvariance %8.4fms\n"
+msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
+
+#: src/applications/tbench/gnunet-tbench.c:195
 #, c-format
-msgid "RFC4193 my First 4 hex digits of host id are %x\n"
+msgid "Loss:\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1727
-msgid "enables IPv6 over GNUnet (incomplete)"
+# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MAX.text
+#: src/applications/tbench/gnunet-tbench.c:196
+#, fuzzy, c-format
+msgid "\tmax      %u\n"
+msgstr "Kinini-"
+
+# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MIN.text
+#: src/applications/tbench/gnunet-tbench.c:197
+#, fuzzy, c-format
+msgid "\tmin      %u\n"
+msgstr "Gito-"
+
+# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_AVG.text
+#: src/applications/tbench/gnunet-tbench.c:198
+#, fuzzy, c-format
+msgid "\tmean     %8.4f\n"
+msgstr "Impuzandengo-"
+
+# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
+# 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
+#, fuzzy, c-format
+msgid "\tvariance %8.4f\n"
+msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
+
+#: src/applications/tbench/gnunet-tbench.c:205
+#, fuzzy, c-format
+msgid "Output format not known, this should not happen.\n"
+msgstr "Imiterere OYA iyi OYA"
+
+#: src/applications/tbench/gnunet-tbench.c:211
+#, 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:420
+msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1761
-msgid "RFC4193 Waiting for tun thread to end\n"
+#: src/applications/tbench/tbenchtest.c:53
+#, c-format
+msgid "Using %u messages of size %u for %u times.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1775
-msgid "RFC4193 The tun thread has ended\n"
+#: src/applications/tbench/tbenchtest.c:85
+#, c-format
+msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1792
+#: src/applications/tbench/tbenchtest.c:89
 #, c-format
-msgid "RFC4193 Closing tunnel %d fd %d\n"
+msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/applications/dstore/dstore.c:525
+#: src/applications/tbench/tbenchtest.c:95
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Failed to receive reply from gnunetd.\n"
+msgstr "Kuri Akira Kuri Ubutumwa Bivuye"
+
+#: src/applications/tbench/tbenchtest.c:151
+#, c-format
+msgid "Running benchmark...\n"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:47
 #, fuzzy
-msgid "# bytes in dstore"
-msgstr "#Bayite Yoherejwe:"
+msgid "probe network to the given DEPTH"
+msgstr "urusobe Kuri i"
 
-#: src/server/gnunet-update.c:147
+#: src/applications/tracekit/gnunet-tracekit.c:51
+#, fuzzy
+msgid ""
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+msgstr ""
+"Ibisohoka Imiterere 0 kugirango Ibisohoka 1. kugirango Akadomo 2. kugirango"
+
+#: src/applications/tracekit/gnunet-tracekit.c:58
+#, fuzzy
+msgid "use PRIO for the priority of the trace request"
+msgstr "Gukoresha kugirango i By'ibanze Bya i Kubaza..."
+
+#: src/applications/tracekit/gnunet-tracekit.c:62
+#, fuzzy
+msgid "wait DELAY seconds for replies"
+msgstr "Tegereza amasogonda kugirango"
+
+#: src/applications/tracekit/gnunet-tracekit.c:110
 #, fuzzy, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Ibyatanzwe kugirango Modire"
+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/server/gnunet-update.c:151
+#: src/applications/tracekit/gnunet-tracekit.c:164
 #, fuzzy, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr "Kuri Kuvugurura Ibyatanzwe kugirango Modire"
+msgid "`%s' is not connected to any peer.\n"
+msgstr "'%s'ni OYA Kuri"
 
-#: src/server/gnunet-update.c:198 src/server/gnunetd.c:136
+#: src/applications/tracekit/gnunet-tracekit.c:207
+#, fuzzy, c-format
+msgid "`%s' connected to `%s'.\n"
+msgstr "'%s'Kuri"
+
+#: src/applications/tracekit/gnunet-tracekit.c:220
+#, 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:246
+#, fuzzy, c-format
+msgid "Peer `%s' did not report back.\n"
+msgstr "OYA Icyegeranyo Inyuma"
+
+#: src/applications/tracekit/gnunet-tracekit.c:348
 #, fuzzy
-msgid "Core initialization failed.\n"
-msgstr "OYA Iyinjizamo Byanze"
+msgid "Could not send request to gnunetd.\n"
+msgstr "OYA Kohereza Kubaza... Kuri"
 
-#: src/server/gnunet-update.c:239
+#: src/applications/tracekit/tracekit.c:74
+#: src/applications/tracekit/tracekit.c:216
+#, fuzzy, c-format
+msgid "Received invalid `%s' message from `%s'.\n"
+msgstr "Sibyo Ubutumwa Bivuye"
+
+#: src/applications/tracekit/tracekit.c:283
 #, fuzzy
-msgid "print a value from the configuration file to stdout"
-msgstr "Gucapa a Agaciro Bivuye i Iboneza IDOSIYE Kuri"
+msgid "TRACEKIT: routing table full, trace request dropped\n"
+msgstr "imbonerahamwe# Kubaza..."
 
-#: src/server/gnunet-update.c:241
+#: src/applications/tracekit/tracekit.c:362
+#, fuzzy, c-format
+msgid "TRACEKIT: received invalid `%s' message\n"
+msgstr "BYAKIRIWE Sibyo"
+
+#: src/applications/tracekit/tracekit.c:462
 #, fuzzy
-msgid "Updates GNUnet datastructures after version change."
-msgstr "Nyuma Verisiyo Guhindura>>"
+msgid "allows mapping of the network topology"
+msgstr "urusobe"
 
-#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:369
+#: src/applications/getoption/getoption.c:78
+#, c-format
+msgid "`%s' registering client handler %d\n"
+msgstr ""
+
+#: src/applications/getoption/getoption.c:88
 #, fuzzy
-msgid "run as user LOGIN"
-msgstr "Gukoresha Nka Ukoresha:"
+msgid "allows clients to determine gnunetd's configuration"
+msgstr "Porogaramu in Iboneza"
 
-#: src/server/gnunet-update.c:249
+#: src/applications/template/gnunet-template.c:42
 #, fuzzy
-msgid "run in client mode (for getting client configuration values)"
-msgstr "Gukoresha in Ukoresha: Ubwoko kugirango Ukoresha: Iboneza Uduciro"
+msgid "Template description."
+msgstr "/ku Isobanuramiterere"
 
-#: src/server/connection.c:1202
+#: src/applications/template/template.c:70
+#, c-format
+msgid "`%s' registering client handler %d and %d\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:110
+#, c-format
+msgid "Bootstrap data obtained from `%s' is invalid.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:178
+msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:219
+#, c-format
+msgid "Bootstrapping using `%s'.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:234
+#, c-format
+msgid "Trying to download hostlist from `%s'\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:364
 #, fuzzy, c-format
+msgid "Downloaded %llu bytes from `%s'.\n"
+msgstr "Idosiye Bivuye"
+
+#: src/applications/bootstrap_http/http.c:397
+msgid "# HELLOs downloaded via http"
+msgstr ""
+
+#: src/applications/traffic/traffic.c:454
+#, fuzzy, c-format
+msgid "# bytes transmitted of type %d"
+msgstr "#Bayite Bya Ubwoko"
+
+#: 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:489
+#, fuzzy, c-format
+msgid "# bytes received in plaintext of type %d"
+msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+
+#: src/applications/traffic/traffic.c:650
+msgid "tracks bandwidth utilization by gnunetd"
+msgstr ""
+
+#: src/applications/dstore_mysql/dstore_mysql.c:636
+#, fuzzy
+msgid "Failed to initialize MySQL database connection for dstore.\n"
+msgstr "Kuri gutangiza Ububikoshingiro"
+
+#: src/applications/dstore_mysql/dstore_mysql.c:661
+#: src/applications/dstore_sqlite/dstore.c:535
+#, fuzzy
+msgid "# bytes in dstore"
+msgstr "#Bayite Yoherejwe:"
+
+#: src/server/connection.c:1214
+#, fuzzy, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "'%s'Byahiswemo Inyuma Bya Ubutumwa"
 
-#: src/server/connection.c:1211
+#: src/server/connection.c:1224
 #, fuzzy, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Birambuye Uburebure By'ibanze"
 
-#: src/server/connection.c:2897
+#: src/server/connection.c:2986
 #, fuzzy, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bivuye Sibyo Imiterere"
 
-#: src/server/connection.c:2982
+#: src/server/connection.c:3075
 #, fuzzy, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Umubare Bya"
 
-#: src/server/connection.c:3004
+#: src/server/connection.c:3097
 #, fuzzy
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
 
-#: src/server/connection.c:3500
+#: src/server/connection.c:3608
 #, fuzzy
 msgid "# outgoing messages dropped"
 msgstr "#Ubutumwa"
 
-#: src/server/connection.c:3503
+#: src/server/connection.c:3611
 #, fuzzy
 msgid "# bytes of outgoing messages dropped"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:3505
+#: src/server/connection.c:3613
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3509
+#: src/server/connection.c:3617
 msgid "# connections closed (transport issue)"
 msgstr ""
 
-#: src/server/connection.c:3512
+#: src/server/connection.c:3620
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:3516
+#: src/server/connection.c:3624
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "#Bayite Bya Ubwoko"
 
-#: src/server/connection.c:3520
+#: src/server/connection.c:3628
 #, fuzzy
 msgid "# bytes received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:3522
+#: src/server/connection.c:3630
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:3523
+#: src/server/connection.c:3631
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/server/connection.c:3526
+#: src/server/connection.c:3634
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3529
+#: src/server/connection.c:3637
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:3532
+#: src/server/connection.c:3640
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
 
-#: src/server/connection.c:3536
+#: src/server/connection.c:3644
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3540
+#: src/server/connection.c:3648
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3544
+#: src/server/connection.c:3652
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
-#: src/server/connection.c:3547
+#: src/server/connection.c:3655
 msgid "# transports switched to stream transport"
 msgstr ""
 
-#: src/server/startup.c:206
+#: src/server/startup.c:215
 #, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
 msgstr ""
 
-#: src/server/startup.c:223
+#: src/server/startup.c:233
 #, c-format
 msgid ""
 "Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
 "address@hidden"
 msgstr ""
 
-#: src/server/startup.c:237
+#: src/server/startup.c:248
 #, c-format
 msgid ""
 "Limiting datastore size to %llu GB, because the `%s' filesystem does not "
@@ -2819,117 +3764,82 @@
 "partition!\n"
 msgstr ""
 
-#: src/server/startup.c:274
+#: src/server/startup.c:287
 #, c-format
 msgid "Insufficient access permissions for `%s': %s\n"
 msgstr ""
 
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:83
 #, fuzzy, c-format
 msgid "`%s' startup complete.\n"
 msgstr "'%s'Byuzuye"
 
-#: src/server/gnunetd.c:89
+#: src/server/gnunetd.c:87
 #, fuzzy, c-format
 msgid "`%s' is shutting down.\n"
 msgstr "'%s'ni Hasi"
 
-#: src/server/gnunetd.c:192
+#: src/server/gnunetd.c:121 src/server/gnunet-update.c:222
 #, fuzzy
+msgid "Core initialization failed.\n"
+msgstr "OYA Iyinjizamo Byanze"
+
+#: src/server/gnunetd.c:176
+#, 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:196
+#: src/server/gnunetd.c:180
 #, fuzzy
 msgid "Starts the gnunetd daemon."
 msgstr "i"
 
-#: src/server/gnunetd.c:199
+#: src/server/gnunetd.c:183
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:203
+#: src/server/gnunetd.c:187
 msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:207
+#: src/server/gnunetd.c:191
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "Ubuturo ku ni"
 
-#: src/server/gnunetd.c:271
+#: src/server/gnunetd.c:272
 #, 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:126
+#: src/server/gnunet-transport-check.c:121
 #, fuzzy, c-format
-msgid "Application module `%s' already initialized!\n"
-msgstr "Modire"
-
-#: src/server/core.c:177
-#, c-format
-msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
-msgstr ""
-
-#: 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:234
-#, fuzzy, c-format
-msgid "Could not shutdown application `%s': not initialized\n"
-msgstr "OYA Zimya Porogaramu OYA"
-
-#: 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:386
-#, fuzzy, c-format
-msgid "Could not release %p: service not loaded\n"
-msgstr "OYA Serivisi OYA"
-
-#: src/server/core.c:492
-#, fuzzy, c-format
-msgid "Could not properly shutdown application `%s'.\n"
-msgstr "OYA Zimya Porogaramu"
-
-#: 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:122
-#, fuzzy, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "'%s':OYA Kurema"
 
-#: src/server/gnunet-transport-check.c:129
+#: 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:160
 #, fuzzy, c-format
 msgid "`%s': Could not send.\n"
 msgstr "'%s':OYA Kohereza"
 
-#: src/server/gnunet-transport-check.c:176
+#: src/server/gnunet-transport-check.c:175
 #, 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:189
+#: src/server/gnunet-transport-check.c:188
 #, fuzzy, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "'%s':OYA Gucomora"
 
-#: src/server/gnunet-transport-check.c:196
+#: src/server/gnunet-transport-check.c:195
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -2941,125 +3851,145 @@
 msgid " Transport %d is not being tested\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:255
+#: src/server/gnunet-transport-check.c:256
 #, c-format
 msgid ""
 "\n"
 "Contacting `%s'."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:280
+#: src/server/gnunet-transport-check.c:281
 #, fuzzy, c-format
 msgid " Connection failed\n"
 msgstr "OYA Iyinjizamo Byanze"
 
-#: src/server/gnunet-transport-check.c:286
+#: src/server/gnunet-transport-check.c:287
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:323
+#: src/server/gnunet-transport-check.c:325
 #, c-format
 msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:325
+#: src/server/gnunet-transport-check.c:327
 #, c-format
 msgid "OK!\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:352
 #, fuzzy
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr "Kuri Igerageza NIBA"
 
-#: src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-transport-check.c:356
 #, fuzzy
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr "Bivuye BIHUYE"
 
-#: src/server/gnunet-transport-check.c:357
+#: src/server/gnunet-transport-check.c:359
 #, fuzzy
 msgid "send COUNT messages"
 msgstr "Kohereza Ubutumwa"
 
-#: src/server/gnunet-transport-check.c:360
+#: src/server/gnunet-transport-check.c:362
 #, fuzzy
 msgid "send messages with SIZE bytes payload"
 msgstr "Kohereza Ubutumwa Na: Bayite"
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:365
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:366
+#: src/server/gnunet-transport-check.c:368
 #, fuzzy
 msgid "specifies after how many MS to time-out"
 msgstr "Nyuma Kuri Igihe Inyuma"
 
-#: src/server/gnunet-transport-check.c:374
+#: src/server/gnunet-transport-check.c:371 src/server/gnunet-update.c:271
+#, fuzzy
+msgid "run as user LOGIN"
+msgstr "Gukoresha Nka Ukoresha:"
+
+#: src/server/gnunet-transport-check.c:376
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:435
+#: src/server/gnunet-transport-check.c:440
 #, fuzzy, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "S"
 
-#: src/server/gnunet-transport-check.c:437
+#: src/server/gnunet-transport-check.c:442
 #, fuzzy, c-format
 msgid "Available transport(s): %s\n"
 msgstr "S"
 
-#: src/server/gnunet-transport-check.c:478
+#: src/server/gnunet-transport-check.c:489
 #, 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:109
+#: src/server/tcpserver.c:111
 #, fuzzy, c-format
 msgid "The `%s' request received from client is malformed.\n"
 msgstr "Kubaza... BYAKIRIWE Bivuye Umukiriya ni"
 
-#: src/server/tcpserver.c:324
+#: src/server/tcpserver.c:336
 #, fuzzy, c-format
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr "OYA Kuri Umuyoboro"
 
-#: src/server/tcpserver.c:398
+#: src/server/tcpserver.c:411
 #, 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:454
+#: src/server/tcpserver.c:468
 #, fuzzy, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%sByanze Ubutumwa Ubwoko in Gukoresha"
 
-#: src/server/handler.c:428
+#: src/server/handler.c:431
 #, fuzzy, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Ubutumwa Bivuye in"
 
-#: src/server/version.c:141
-msgid ""
-"Failed to determine filename used to store GNUnet version information!\n"
-msgstr ""
+#: src/server/gnunet-update.c:146
+#, fuzzy, c-format
+msgid "Updating data for module `%s'\n"
+msgstr "Ibyatanzwe kugirango Modire"
 
-#: src/server/gnunet-peer-info.c:53
+#: 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:267
 #, fuzzy
+msgid "Updates GNUnet datastructures after version change."
+msgstr "Nyuma Verisiyo Guhindura>>"
+
+#: src/server/gnunet-update.c:275
+#, fuzzy
+msgid "run in client mode (for getting client configuration values)"
+msgstr "Gukoresha in Ukoresha: Ubwoko kugirango Ukoresha: Iboneza Uduciro"
+
+#: src/server/gnunet-peer-info.c:51
+#, fuzzy
 msgid "Print information about GNUnet peers."
 msgstr "Ibisobanuro Ibyerekeye"
 
-#: src/server/gnunet-peer-info.c:57
+#: src/server/gnunet-peer-info.c:55
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:122 src/server/gnunet-peer-info.c:153
+#: src/server/gnunet-peer-info.c:120 src/server/gnunet-peer-info.c:153
 #, fuzzy, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr "OYA Kubona Aderesi Bya"
@@ -3079,57 +4009,53 @@
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Na: Na Aderesi"
 
-#: src/util/boot/startup.c:199
+#: src/server/version.c:143
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
+msgstr ""
+
+#: src/server/core.c:129
 #, fuzzy, c-format
-msgid "Failed to run %s: %s %d\n"
-msgstr "Byanze Kuri Kwihuza Kuri"
+msgid "Application module `%s' already initialized!\n"
+msgstr "Modire"
 
-#: 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."
+#: src/server/core.c:183
+#, c-format
+msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:111
+#: src/server/core.c:233
 #, fuzzy, c-format
-msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'"
-msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
+msgid "Could not shutdown `%s': application not loaded\n"
+msgstr "OYA Zimya Porogaramu OYA"
 
-#: src/util/network_client/tcpio.c:290
+#: src/server/core.c:244
 #, fuzzy, c-format
-msgid "Cannot connect to %s:%u: %s\n"
-msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-". Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
+msgid "Could not shutdown application `%s': not initialized\n"
+msgstr "OYA Zimya Porogaramu OYA"
 
-#: src/util/network_client/tcpio.c:327
+#: src/server/core.c:254
 #, fuzzy, c-format
-msgid "Error connecting to %s:%u\n"
-msgstr "'%s'Kuri"
+msgid "Could not find '%s%s' method in library `%s'.\n"
+msgstr "OYA Gushaka Uburyo in Isomero"
 
-#: src/util/network_client/tcpio.c:338
+#: src/server/core.c:400
 #, fuzzy, c-format
-msgid "Failed to connect to %s:%u in %ds\n"
-msgstr "Byanze Kuri Kwihuza Kuri"
+msgid "Could not release %p: service not loaded\n"
+msgstr "OYA Serivisi OYA"
 
-#: src/util/network_client/tcpio.c:494
+#: src/server/core.c:509
 #, fuzzy, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "'%s'Byanze Subiza Sibyo"
+msgid "Could not properly shutdown application `%s'.\n"
+msgstr "OYA Zimya Porogaramu"
 
-#: src/util/crypto/hostkey_gcrypt.c:898
+#: src/server/core.c:646
 #, fuzzy, c-format
+msgid "Could not properly unload service `%s'!\n"
+msgstr "OYA Kureka gufungura Serivisi"
+
+#: src/util/crypto/hostkey_gcrypt.c:907
+#, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Isinya Byanze ku"
 
@@ -3138,124 +4064,168 @@
 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:195 src/util/os/statuscalls.c:336
+#: src/util/os/statuscalls.c:197 src/util/os/statuscalls.c:342
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Kuri Ibyatanzwe Bivuye ku"
 
-#: src/util/os/statuscalls.c:379 src/util/os/statuscalls.c:389
+#: src/util/os/statuscalls.c:387 src/util/os/statuscalls.c:397
 #, 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:218
-#, c-format
-msgid "Can't create semaphore: %i"
-msgstr ""
-
-#: src/util/os/osconfig.c:124
+#: src/util/os/osconfig.c:127
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:391
+#: src/util/os/osconfig.c:402
 #, fuzzy, c-format
 msgid "Command `%s' failed with error code %u\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
+#: src/util/os/user.c:136 src/util/os/user.c:181
+#, fuzzy, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Gufungura Iboneza IDOSIYE"
+
+#: src/util/os/user.c:137
+msgid "No such user"
+msgstr ""
+
+#: src/util/os/user.c:152
+#, fuzzy, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Guhindura>> Ukoresha: Itsinda Kuri"
+
+#: src/util/os/priority.c:78
+#, fuzzy, c-format
+msgid "Invalid process priority `%s'\n"
+msgstr "Kuri"
+
+#: src/util/os/semaphore.c:223
+#, c-format
+msgid "Can't create semaphore: %i"
+msgstr ""
+
 #: 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:119
+#: src/util/os/dso.c:120
 #, 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:159
+#: src/util/os/dso.c:162
 #, 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:461
+#: src/util/os/cpustatus.c:466
 #, fuzzy
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "Ikibazo# i Ikoresha:"
 
-#: src/util/os/cpustatus.c:483
+#: src/util/os/cpustatus.c:489
 #, fuzzy
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Ikibazo# i Ikoresha:"
 
-#: src/util/os/user.c:134 src/util/os/user.c:176
+#: src/util/network_client/tcpio.c:98 src/util/network_client/tcpio.c:144
+msgid "Could not find valid value for HOST in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:113
 #, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Gufungura Iboneza IDOSIYE"
+msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'"
+msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
 
-#: src/util/os/user.c:135
-msgid "No such user"
+#: src/util/network_client/tcpio.c:302
+#, fuzzy, c-format
+msgid "Cannot connect to %s:%u: %s\n"
 msgstr ""
+"Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+". Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
 
-#: src/util/os/user.c:149
+#: src/util/network_client/tcpio.c:340
 #, fuzzy, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Guhindura>> Ukoresha: Itsinda Kuri"
+msgid "Error connecting to %s:%u\n"
+msgstr "'%s'Kuri"
 
-#: src/util/os/priority.c:78
+#: src/util/network_client/tcpio.c:351
 #, fuzzy, c-format
-msgid "Invalid process priority `%s'\n"
-msgstr "Kuri"
+msgid "Failed to connect to %s:%u in %ds\n"
+msgstr "Byanze Kuri Kwihuza Kuri"
 
-#: src/util/network/select.c:304
+#: src/util/network_client/tcpio.c:516
+#, fuzzy, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr "'%s'Byanze Subiza Sibyo"
+
+#: src/util/network/select.c:310
 #, fuzzy
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/util/network/select.c:473
+#: src/util/network/select.c:483
 #, c-format
 msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
 
-#: 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
+#: src/util/network/ipcheck.c:106 src/util/network/ipcheck.c:136
+#: src/util/network/ipcheck.c:186 src/util/network/ipcheck.c:211
+#: src/util/network/ipcheck.c:219
 #, fuzzy, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Imiterere kugirango"
 
-#: src/util/network/ipcheck.c:162
+#: src/util/network/ipcheck.c:167
 #, 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:259
+#: src/util/network/ipcheck.c:267
 #, fuzzy, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "urusobe OYA Impera Na:"
 
-#: src/util/network/ipcheck.c:291
+#: src/util/network/ipcheck.c:300
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask: %s\n"
 msgstr "Imiterere kugirango"
 
-#: src/util/network/ipcheck.c:304
+#: src/util/network/ipcheck.c:314
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Imiterere kugirango urusobe"
 
-#: src/util/network/ip.c:195
+#: src/util/network/ip.c:207
 #, 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:268
+#: src/util/network/ip.c:285
 #, fuzzy, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr "OYA Gushaka Aderesi kugirango"
 
-#: src/util/network/ip.c:277
+#: src/util/network/ip.c:295
 #, fuzzy, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
@@ -3284,173 +4254,144 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/util/network/ip.c:297
+#: src/util/network/ip.c:317
 #, fuzzy, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr "OYA Kuri Aderesi"
 
-#: src/util/network/ip.c:326
+#: src/util/network/ip.c:350
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr ""
 
-#: 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:526
-#, fuzzy, c-format
-msgid "Expected `%s' to be a directory!\n"
-msgstr "'%s'Ikitezwe: Kuri a bushyinguro"
-
-#: 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:533
+#: src/util/error/error.c:117
 #, c-format
-msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
-msgstr ""
-
-#: 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:589
-#, c-format
-msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
-msgstr ""
-
-#: 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:115
-#, c-format
-msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:187 src/util/error/error.c:222
+#: src/util/error/error.c:190 src/util/error/error.c:225
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/error/error.c:189 src/util/error/error.c:224
+#: src/util/error/error.c:192 src/util/error/error.c:227
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:191 src/util/error/error.c:228
+#: src/util/error/error.c:194 src/util/error/error.c:231
 msgid "WARNING"
 msgstr ""
 
-#: src/util/error/error.c:193 src/util/error/error.c:230
+#: src/util/error/error.c:196 src/util/error/error.c:233
 msgid "ERROR"
 msgstr ""
 
-#: src/util/error/error.c:195 src/util/error/error.c:232
+#: src/util/error/error.c:198 src/util/error/error.c:235
 msgid "FATAL"
 msgstr ""
 
-#: src/util/error/error.c:197 src/util/error/error.c:234
+#: src/util/error/error.c:200 src/util/error/error.c:237
 #, fuzzy
 msgid "USER"
 msgstr "Umubare"
 
-#: src/util/error/error.c:199 src/util/error/error.c:236
+#: src/util/error/error.c:202 src/util/error/error.c:239
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:201 src/util/error/error.c:238
+#: src/util/error/error.c:204 src/util/error/error.c:241
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:203 src/util/error/error.c:240
+#: src/util/error/error.c:206 src/util/error/error.c:243
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:205 src/util/error/error.c:242
+#: src/util/error/error.c:208 src/util/error/error.c:245
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:244
+#: src/util/error/error.c:210 src/util/error/error.c:247
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:209
+#: src/util/error/error.c:212
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:226
+#: src/util/error/error.c:229
 msgid "INFO"
 msgstr ""
 
-#: src/util/error/error.c:245
+#: src/util/error/error.c:248
 msgid "NOTHING"
 msgstr ""
 
-#: src/util/threads/mutex.c:144 src/util/threads/semaphore.c:166
-#: src/util/threads/pthread.c:154
+#: src/util/disk/storage.c:203
 #, fuzzy, c-format
+msgid "`%s' failed for drive `%s': %u\n"
+msgstr "'%s'Byanze kugirango Porogaramu- shoboza"
+
+#: src/util/disk/storage.c:543
+#, fuzzy, c-format
+msgid "Expected `%s' to be a directory!\n"
+msgstr "'%s'Ikitezwe: Kuri a bushyinguro"
+
+#: src/util/threads/mutex.c:146 src/util/threads/semaphore.c:168
+#: src/util/threads/pthread.c:157
+#, fuzzy, c-format
 msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 msgstr "Binini Bayite ku"
 
-#: src/util/threads/mutex.c:152 src/util/threads/mutex.c:194
+#: src/util/threads/mutex.c:155 src/util/threads/mutex.c:201
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Inkoresha siyo"
 
-#: src/util/threads/mutex.c:156
+#: src/util/threads/mutex.c:160
 #, fuzzy, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr "Kuri ku"
 
-#: src/util/threads/mutex.c:181
+#: src/util/threads/mutex.c:187
 #, c-format
 msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:198
+#: src/util/threads/mutex.c:207
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "kugirango ku"
 
-#: src/util/threads/pthread.c:165 src/util/threads/pthread.c:171
-#: src/util/threads/pthread.c:176 src/util/threads/pthread.c:264
+#: src/util/threads/pthread.c:169 src/util/threads/pthread.c:176
+#: src/util/threads/pthread.c:182 src/util/threads/pthread.c:276
 #, fuzzy, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/util/threads/pthread.c:181 src/util/threads/pthread.c:273
+#: src/util/threads/pthread.c:188 src/util/threads/pthread.c:286
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/util/loggers/file.c:229
+#: src/util/loggers/file.c:236
 #, fuzzy, c-format
 msgid "Failed to open log-file `%s': %s\n"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/util/loggers/file.c:248
+#: src/util/loggers/file.c:257
 msgid "GNUnet error log"
 msgstr ""
 
-#: 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
+#: src/util/loggers/file.c:278 src/util/loggers/file.c:296
+#: src/include/gnunet_util_error.h:252 src/include/gnunet_util_error.h:259
+#: src/include/gnunet_util_error.h:266 src/include/gnunet_util_error.h:273
 #, 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
+#: src/util/loggers/memory.c:72
 msgid "Out of memory (for logging)"
 msgstr ""
 
@@ -3509,19 +4450,14 @@
 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
+#: src/util/getopt/setoption.c:59
 #, c-format
 msgid ""
 "Setting option `%s' in section `%s' to `%s' when processing command line "
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:136 src/util/getopt/setoption.c:153
+#: src/util/getopt/setoption.c:138 src/util/getopt/setoption.c:155
 #, fuzzy, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "a Umubare Kuri i Ihitamo"
@@ -3532,734 +4468,127 @@
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "kugirango Amahitamo kugirango Amahitamo"
 
-#: src/util/string/string.c:120
-msgid "ms"
-msgstr ""
-
-#: src/util/string/string.c:126
-msgid "s"
-msgstr ""
-
-#: src/util/string/string.c:130
-msgid "m"
-msgstr ""
-
-#: src/util/string/string.c:134
-msgid "h"
-msgstr ""
-
-#: src/util/string/string.c:138
-#, fuzzy
-msgid " days"
-msgstr "7 Iminsi"
-
-#: src/util/string/string.c:154
-msgid "b"
-msgstr ""
-
-#: src/util/string/string.c:160
-msgid "KiB"
-msgstr ""
-
-#: src/util/string/string.c:164
-msgid "MiB"
-msgstr ""
-
-#: src/util/string/string.c:168
-msgid "GiB"
-msgstr ""
-
-#: src/util/string/string.c:172
-msgid "TiB"
-msgstr ""
-
-#: src/util/string/string.c:284
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:59
-msgid "generate configuration for gnunetd, the GNUnet daemon"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:61
-msgid "Tool to setup GNUnet."
-msgstr ""
-
-#: src/setup/gnunet-setup.c:176
+#: src/util/boot/startup.c:251
 #, fuzzy, c-format
-msgid "Too many arguments.\n"
-msgstr "Komandi: Umurongo ingingo"
+msgid "Failed to run %s: %s %d\n"
+msgstr "Byanze Kuri Kwihuza Kuri"
 
-#: 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:255
+#: src/util/config/config.c:295
 #, fuzzy, c-format
-msgid "`%s' is not available."
-msgstr "'%s'ntabwo ari idosiye"
+msgid "Syntax error in configuration file `%s' at line %d.\n"
+msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
 
-#: src/setup/gnunet-setup.c:272
-#, fuzzy, c-format
-msgid "Unknown operation `%s'\n"
-msgstr "Imiterere Verisiyo"
-
-#: src/setup/gnunet-win-tool.c:55
-msgid "list all network adapters"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:58
-msgid "install GNUnet as Windows service"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:61
-msgid "uninstall GNUnet service"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:64
-msgid "increase the maximum number of TCP/IP connections"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:67
-msgid "display a file's hash value"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:126
+#: src/util/config/config.c:544
 #, c-format
-msgid "GNUnet service installed successfully.\n"
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:129 src/setup/gnunet-win-tool.c:157
+#: src/util/config/config.c:592
 #, c-format
-msgid "This version of Windows doesn't support services.\n"
-msgstr ""
-
-#: 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:138
-#, c-format
-msgid "Error: can't create service: %s\n"
-msgstr ""
-
-#: 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:154
-#, fuzzy, c-format
-msgid "Service deleted.\n"
-msgstr "/Byahiswemo"
-
-#: src/setup/gnunet-win-tool.c:166
-#, c-format
-msgid "Error: can't access service: %s\n"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:170
-#, c-format
-msgid "Error: can't delete service: %s\n"
-msgstr ""
-
-#: src/setup/gtk/gconf.c:387
-msgid "Description"
-msgstr "Insobanuramiterere"
-
-#: src/setup/gtk/gconf.c:403
-msgid "Value"
-msgstr "Agaciro"
-
-#: src/setup/gtk/gconf.c:427
-msgid "Default"
-msgstr ""
-
-# sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: src/setup/gtk/gconf.c:442 src/setup/ncurses/wizard_curs.c:73
-#, fuzzy
-msgid "Help"
-msgstr "/Kugoboka"
-
-#: src/setup/gtk/gconf.c:456
-#, fuzzy
-msgid "Section"
-msgstr "Insobanuramiterere"
-
-#: src/setup/gtk/gconf.c:467
-#, fuzzy
-msgid "Option"
-msgstr "ibirindiro"
-
-#: src/setup/gtk/gconf.c:490
-msgid "Configuration saved."
-msgstr ""
-
-#: src/setup/gtk/gconf.c:500
-#, fuzzy
-msgid "Failed to save configuration."
-msgstr "OYA Iboneza IDOSIYE"
-
-#: src/setup/gtk/gconf.c:526
-msgid "Configuration changed. Save?"
-msgstr ""
-
-#: src/setup/gtk/gconf.c:539
-#, fuzzy
-msgid "Error saving configuration."
-msgstr "Zimya Iyemeza Bivuye"
-
-#: src/setup/gtk/wizard_gtk.c:144
-msgid "(unknown connection)"
-msgstr ""
-
-#: 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:437
-msgid "Do you want to save the new configuration?"
-msgstr ""
-
-#: src/setup/gtk/wizard_gtk.c:469
-msgid "Unable to create user account:"
-msgstr ""
-
-#: src/setup/gtk/wizard_gtk.c:477
-msgid "Unable to change startup process:"
-msgstr ""
-
-#: src/setup/gtk/wizard_gtk.c:492
 msgid ""
-"Running gnunet-update failed.\n"
-"This maybe due to insufficient permissions, please check your "
-"configuration.\n"
-"Finally, run gnunet-update manually."
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
 msgstr ""
 
-#: src/setup/text/conf.c:79
-msgid "yes"
-msgstr ""
-
-#: src/setup/text/conf.c:80
-msgid "no"
-msgstr ""
-
-#: src/setup/text/conf.c:105
+#: src/util/config/config.c:602
 #, c-format
-msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/setup/text/conf.c:114
-msgid "\tPossible choices:\n"
-msgstr ""
-
-#: src/setup/text/conf.c:122
-msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
-msgstr ""
-
-#: src/setup/text/conf.c:124
+#: src/util/config/config.c:688
 #, c-format
-msgid "\tEnter string (type '%s' for default value `%s'): "
-msgstr ""
-
-#: src/setup/text/conf.c:142
-#, c-format
-msgid "\t Enter choice (default is %c): "
-msgstr ""
-
-#: src/setup/text/conf.c:146
-#, c-format
-msgid "\tEnter floating point (type '%s' for default value %f): "
-msgstr ""
-
-#: src/setup/text/conf.c:152
-#, c-format
 msgid ""
-"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
-"value %llu): "
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/setup/text/conf.c:186
-#, fuzzy, c-format
-msgid "Yes\n"
-msgstr "Yego"
-
-#: 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: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: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"
+#: src/util/string/string.c:55
+msgid "ms"
 msgstr ""
 
-#: src/setup/text/conf.c:353 src/setup/text/conf.c:415
-#, c-format
-msgid ""
-"\n"
-"Invalid entry, try again (use '?' for help): "
+#: src/util/string/string.c:61
+msgid "s"
 msgstr ""
 
-#: src/setup/text/conf.c:421
-#, c-format
-msgid "Unknown kind %x (internal error).  Skipping option.\n"
+#: src/util/string/string.c:65
+msgid "m"
 msgstr ""
 
-#: src/setup/text/conf.c:482
-msgid "\tDescend? (y/n/?) "
+#: src/util/string/string.c:69
+msgid "h"
 msgstr ""
 
-#: src/setup/text/conf.c:491
-msgid "Aborted.\n"
-msgstr ""
-
-#: src/setup/text/conf.c:504
+#: src/util/string/string.c:73
 #, fuzzy
-msgid "Invalid entry.\n"
-msgstr "ingingo"
+msgid " days"
+msgstr "7 Iminsi"
 
-#: src/setup/text/conf.c:521
-#, c-format
-msgid "Unknown kind %x (internal error).  Aborting.\n"
+#: src/util/string/string.c:89
+msgid "b"
 msgstr ""
 
-#: src/setup/text/conf.c:552
-#, c-format
-msgid "You can always press ENTER to keep the current value.\n"
+#: src/util/string/string.c:95
+msgid "KiB"
 msgstr ""
 
-#: src/setup/text/conf.c:553
-#, c-format
-msgid "Use the '%s' key to abort.\n"
+#: src/util/string/string.c:99
+msgid "MiB"
 msgstr ""
 
-#: 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:571
-#, c-format
-msgid ""
-"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
-"configuration. "
+#: src/util/string/string.c:103
+msgid "GiB"
 msgstr ""
 
-#: 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:595
-#, fuzzy, c-format
-msgid "Configuration file `%s' written.\n"
-msgstr "Gufungura Iboneza IDOSIYE"
-
-#: src/setup/ncurses/mconf.c:85
-msgid "Exit"
+#: src/util/string/string.c:107
+msgid "TiB"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:88
-msgid "Up"
+#: src/util/string/string.c:226
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:91
-msgid "Cancel"
-msgstr "Kureka"
-
-#: 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:212 src/setup/ncurses/mconf.c:403
-msgid "Internal error! (Value invalid?)"
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:392
-msgid "Invalid input, expecting floating point value."
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:435
-msgid "Invalid input, expecting integer."
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:443
-msgid "Value is not in legal range."
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:499 src/setup/ncurses/wizard_curs.c:534
+#: src/include/gnunet_util_getopt.h:154
 #, fuzzy
-msgid "GNUnet Configuration"
-msgstr "Umubare Bya Amasubiramo"
-
-#: src/setup/ncurses/mconf.c:517
-msgid "Do you wish to save your new configuration?"
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:531
-#, fuzzy, c-format
-msgid ""
-"\n"
-"End of configuration.\n"
-msgstr "Gufungura Iboneza IDOSIYE"
-
-#: src/setup/ncurses/mconf.c:536
-#, c-format
-msgid ""
-"\n"
-"Your configuration changes were NOT saved.\n"
-msgstr ""
-
-#: 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:80
-msgid "Error!"
-msgstr ""
-
-# offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
-#: src/setup/ncurses/wizard_curs.c:142
-#, fuzzy
-msgid "Abort"
-msgstr "Ibyerekeye"
-
-#: src/setup/ncurses/wizard_curs.c:143
-msgid "Ok"
-msgstr "Oke"
-
-#: 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:211
-msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org/\n";
-"and join our community at\n"
-"\thttp://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"the GNUnet team"
-msgstr ""
-
-#: 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: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:306
-msgid "Network configuration: interface"
-msgstr ""
-
-#: 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:319
-#, fuzzy
-msgid "Network configuration: NAT"
-msgstr "Gukoresha Iboneza IDOSIYE"
-
-#: src/setup/ncurses/wizard_curs.c:320
-msgid ""
-"Is this machine behind NAT?\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
-"connections through modems, ISDN cards and DNAT (also known as \"port "
-"forwarding\")."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:333
-#, fuzzy
-msgid "Network configuration: IP"
-msgstr "Gukoresha Iboneza IDOSIYE"
-
-#: 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: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 "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If left empty, GNUnet will try to automatically detect the IP.\n"
-"You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
-"If in doubt, leave this empty."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:351
-msgid "Bandwidth configuration: upload"
-msgstr ""
-
-#: 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:354
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"upstream\" is the data channel through which data is *sent* to the "
-"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
-"you have a flatrate, you can set it to the maximum speed of your internet "
-"connection. You should not use a value that is higher than what your actual "
-"connection allows."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:366
-msgid "Bandwidth configuration: download"
-msgstr ""
-
-#: 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:369
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"downstream\" is the data channel through which data is *received* from "
-"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
-"If you have a flatrate, you can set it to the maximum speed of your internet "
-"connection. You should not use a value that is higher than what your actual "
-"connection allows."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:381
-#, fuzzy
-msgid "Quota configuration"
-msgstr "Gukoresha Iboneza IDOSIYE"
-
-#: 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: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:393
-msgid "Daemon configuration: user account"
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:394
-msgid "As which user should gnunetd be run?"
-msgstr ""
-
-#: 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"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the field empty to run GNUnet with system privileges.\n"
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:411
-msgid "Daemon configuration: group account"
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:412
-msgid "As which group should gnunetd be run?"
-msgstr ""
-
-#: 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"
-"\n"
-"You can also specify a already existant group here.\n"
-"\n"
-"Only members of this group will be allowed to start and stop the the GNUnet "
-"server and have access to GNUnet server data.\n"
-msgstr ""
-
-#: 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: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:471
-msgid "Unable to create user account for daemon."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:478
-msgid "Unable to setup autostart for daemon."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:493
-#, fuzzy
-msgid "Save configuration?"
-msgstr "Gukoresha Iboneza IDOSIYE"
-
-#: src/setup/ncurses/wizard_curs.c:494
-msgid "Save configuration now?"
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:538
-msgid "Back"
-msgstr ""
-
-#: 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:190
-#, c-format
-msgid ""
-"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
-msgstr ""
-
-#: src/setup/lib/wizard_util.c:110
-msgid "Can't open Service Control Manager"
-msgstr ""
-
-#: src/setup/lib/wizard_util.c:116
-msgid "Can't create service"
-msgstr ""
-
-#: src/setup/lib/wizard_util.c:120
-msgid "Error changing the permissions of the GNUnet directory"
-msgstr ""
-
-#: src/setup/lib/wizard_util.c:125
-msgid "Cannot write to the regisitry"
-msgstr ""
-
-#: src/setup/lib/wizard_util.c:128
-msgid "Can't access the service"
-msgstr ""
-
-#: src/setup/lib/wizard_util.c:131
-msgid "Can't delete the service"
-msgstr ""
-
-#: src/setup/lib/wizard_util.c:134
-#, fuzzy
-msgid "Unknown error"
-msgstr "itazwi"
-
-#: src/setup/lib/wizard_util.c:170
-msgid "This version of Windows does not support multiple users."
-msgstr ""
-
-#: src/setup/lib/wizard_util.c:174
-#, fuzzy
-msgid "Error creating user"
-msgstr "Ivugurura Verisiyo"
-
-#: src/setup/lib/wizard_util.c:178
-msgid "Error accessing local security policy"
-msgstr ""
-
-#: src/setup/lib/wizard_util.c:183
-msgid "Error granting service right to user"
-msgstr ""
-
-#: src/setup/lib/wizard_util.c:188
-msgid "Unknown error while creating a new user"
-msgstr ""
-
-#: src/include/gnunet_util_getopt.h:153
-#, fuzzy
 msgid "print this help"
 msgstr "Gucapa iyi Ifashayobora"
 
-#: src/include/gnunet_util_getopt.h:162
+#: src/include/gnunet_util_getopt.h:163
 #, fuzzy
 msgid "print the version number"
 msgstr "Gucapa i Verisiyo Umubare"
 
-#: src/include/gnunet_util_getopt.h:168
+#: src/include/gnunet_util_getopt.h:169
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:174
+#: src/include/gnunet_util_getopt.h:175
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:180
+#: src/include/gnunet_util_getopt.h:181
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/include/gnunet_util_getopt.h:186
+#: src/include/gnunet_util_getopt.h:187
 #, fuzzy
 msgid "specify host on which gnunetd is running"
 msgstr "Ubuturo ku ni"
 
-#: 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:236
+#: src/include/gnunet_util_error.h:221 src/include/gnunet_util_error.h:223
+#: src/include/gnunet_util_error.h:229 src/include/gnunet_util_error.h:245
 #, fuzzy, c-format
 msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr "Byanze ku"
 
-#: src/include/gnunet_util_error.h:230
+#: src/include/gnunet_util_error.h:239
 #, c-format
 msgid ""
 "External protocol violation: assertion failed at %s:%d in %s (no need to "
 "panic, we can handle this).\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
+#: src/include/gnunet_util_error.h:280 src/include/gnunet_util_error.h:287
 #, 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"
@@ -4399,23 +4728,35 @@
 "configuration here.  Default is no proxy."
 msgstr ""
 
-#: contrib/config-daemon.scm:224 contrib/config-client.scm:144
+#: contrib/config-daemon.scm:210
+msgid ""
+"Name of the directory where gnunetd should store contact information about "
+"peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:212
+msgid ""
+"Unless you want to share the directory directly using a webserver, the "
+"default is most likely just fine."
+msgstr ""
+
+#: contrib/config-daemon.scm:238 contrib/config-client.scm:144
 msgid "How long should logs be kept?"
 msgstr ""
 
-#: contrib/config-daemon.scm:226 contrib/config-client.scm:146
+#: contrib/config-daemon.scm:240 contrib/config-client.scm:146
 msgid ""
 "How long should logs be kept? If you specify a value greater than zero, a "
 "log is created each day with the date appended to its filename. These logs "
 "are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
 msgstr ""
 
-#: contrib/config-daemon.scm:237
+#: contrib/config-daemon.scm:251
 msgid ""
 "What maximum number of open file descriptors should be requested from the OS?"
 msgstr ""
 
-#: contrib/config-daemon.scm:239
+#: contrib/config-daemon.scm:253
 msgid ""
 "The default of 1024 should be fine for most systems.  If your system can "
 "support more, increasing the number might help support additional clients on "
@@ -4427,62 +4768,66 @@
 "run with what it is given."
 msgstr ""
 
-#: contrib/config-daemon.scm:250
+#: contrib/config-daemon.scm:264
 msgid "Where should gnunetd write the logs?"
 msgstr ""
 
-#: contrib/config-daemon.scm:262 contrib/config-client.scm:169
+#: contrib/config-daemon.scm:276
+msgid "Enable for extra-verbose logging."
+msgstr ""
+
+#: contrib/config-daemon.scm:288 contrib/config-client.scm:169
 msgid "Logging"
 msgstr ""
 
-#: contrib/config-daemon.scm:263 contrib/config-client.scm:170
+#: contrib/config-daemon.scm:289 contrib/config-client.scm:170
 msgid "Specify which system messages should be logged how"
 msgstr ""
 
-#: contrib/config-daemon.scm:267 contrib/config-client.scm:174
+#: contrib/config-daemon.scm:294 contrib/config-client.scm:174
 msgid "Logging of events for users"
 msgstr ""
 
-#: contrib/config-daemon.scm:268 contrib/config-client.scm:175
+#: contrib/config-daemon.scm:295 contrib/config-client.scm:175
 msgid "Logging of events for the system administrator"
 msgstr ""
 
-#: contrib/config-daemon.scm:280
+#: contrib/config-daemon.scm:307
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:281
+#: contrib/config-daemon.scm:308
 msgid ""
 "The default is no longer /var/run/gnunetd.pid since we could not delete the "
 "file on shutdown at that location."
 msgstr ""
 
-#: contrib/config-daemon.scm:293
+#: contrib/config-daemon.scm:320
 msgid "As which user should gnunetd run?"
 msgstr ""
 
-#: contrib/config-daemon.scm:295
+#: contrib/config-daemon.scm:322
 msgid ""
 "Empty means \"current user\". On computer startup, it is root/SYSTEM.  Under "
 "Windows, this setting affects the creation of a new system service only."
 msgstr ""
 
-#: contrib/config-daemon.scm:308
+#: contrib/config-daemon.scm:335
 msgid "Should gnunetd be automatically started when the system boots?"
 msgstr ""
 
-#: contrib/config-daemon.scm:309
+#: contrib/config-daemon.scm:336
 msgid ""
 "Set to YES if gnunetd should be automatically started on boot.  If this "
 "option is set, gnunet-setup will install a script to start the daemon upon "
 "completion.  This option may not work on all systems."
 msgstr ""
 
-#: contrib/config-daemon.scm:321
+#: contrib/config-daemon.scm:348
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:323
+#: contrib/config-daemon.scm:350
 msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
 "available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
@@ -4496,11 +4841,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:337
+#: contrib/config-daemon.scm:364
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:339
+#: contrib/config-daemon.scm:366
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -4537,11 +4882,11 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:368
+#: contrib/config-daemon.scm:395
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:369
+#: contrib/config-daemon.scm:396
 msgid ""
 "This option can be used to tell gnunetd not to open the client port.  When "
 "run like this, gnunetd will participate as a peer in the network but not "
@@ -4550,11 +4895,11 @@
 "prevent you from running diagnostic tools like gnunet-stats!"
 msgstr ""
 
-#: contrib/config-daemon.scm:381
+#: contrib/config-daemon.scm:408
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:382
+#: contrib/config-daemon.scm:409
 msgid ""
 "The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
 "peer to peers of which the hostkey has been copied by hand to data/hosts;  "
@@ -4566,16 +4911,16 @@
 "lines above would need some minor editing :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:393
+#: contrib/config-daemon.scm:420
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:405
+#: contrib/config-daemon.scm:432
 #, fuzzy
 msgid "Disable automatic establishment of connections"
 msgstr "Byikoresha"
 
-#: contrib/config-daemon.scm:406
+#: contrib/config-daemon.scm:433
 msgid ""
 "If this option is enabled, GNUnet will not automatically establish "
 "connections to other peers, but instead wait for applications to "
@@ -4583,22 +4928,22 @@
 "connect to us)."
 msgstr ""
 
-#: contrib/config-daemon.scm:417
+#: contrib/config-daemon.scm:444
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:418
+#: contrib/config-daemon.scm:445
 msgid ""
 "This option maybe useful during testing, but turning it off is dangerous! If "
 "in any doubt, set it to YES (which is the default)."
 msgstr ""
 
-#: contrib/config-daemon.scm:429
+#: contrib/config-daemon.scm:456
 #, fuzzy
 msgid "Port for communication with GNUnet user interfaces"
 msgstr "i Ukoresha:"
 
-#: contrib/config-daemon.scm:430
+#: contrib/config-daemon.scm:457
 msgid ""
 "Which is the client-server port that is used between gnunetd and the clients "
 "(TCP only).  You may firewall this port for non-local machines (but you do "
@@ -4606,11 +4951,11 @@
 "connections from machines that are listed under TRUSTED)."
 msgstr ""
 
-#: contrib/config-daemon.scm:441
+#: contrib/config-daemon.scm:468
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:442
+#: contrib/config-daemon.scm:469
 msgid ""
 "This option specifies which hosts are trusted enough to connect as clients "
 "(to the TCP port).  This is useful if you run gnunetd on one host of your "
@@ -4621,70 +4966,70 @@
 "separated by a semicolon, spaces are not allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:481
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:455
+#: contrib/config-daemon.scm:482
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If it is set, "
 "only the specified peers are allowed. Specify the list of peer IDs (not IPs!)"
 msgstr ""
 
-#: contrib/config-daemon.scm:466
+#: contrib/config-daemon.scm:493
 #, fuzzy
 msgid "Run gnunetd as this group."
 msgstr "ni OYA"
 
-#: contrib/config-daemon.scm:467
+#: contrib/config-daemon.scm:494
 msgid ""
 "When started as root, gnunetd will change permissions to the given group."
 msgstr ""
 
-#: contrib/config-daemon.scm:478
+#: contrib/config-daemon.scm:505
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:479
+#: contrib/config-daemon.scm:506
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If the ID of a "
 "peer is listed here, connections from that peer will be refused.  Specify "
 "the list of peer IDs (not IPs!)"
 msgstr ""
 
-#: contrib/config-daemon.scm:490
+#: contrib/config-daemon.scm:517
 msgid "Topology Maintenance"
 msgstr ""
 
-#: contrib/config-daemon.scm:491
+#: contrib/config-daemon.scm:518
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:511
+#: contrib/config-daemon.scm:538
 msgid "General settings"
 msgstr ""
 
-#: contrib/config-daemon.scm:512
+#: contrib/config-daemon.scm:539
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:536
+#: contrib/config-daemon.scm:564
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:537
+#: contrib/config-daemon.scm:565
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:554
+#: contrib/config-daemon.scm:583
 msgid "Fundamentals"
 msgstr ""
 
-#: contrib/config-daemon.scm:574
+#: contrib/config-daemon.scm:603
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:576
+#: contrib/config-daemon.scm:605
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -4693,51 +5038,88 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:589
+#: contrib/config-daemon.scm:618 contrib/config-daemon.scm:631
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:591
+#: contrib/config-daemon.scm:619
+msgid "Which database should be used for the temporary datastore of the DHT?"
+msgstr ""
+
+#: contrib/config-daemon.scm:633
 msgid ""
-"Which topology should be used?  The only options at the moment are "
-"\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
-"to connect to a diverse set of peers, and welcome connections from anyone.  "
-"In f2f (friend-to-friend) mode, GNUnet will only allow connections from "
-"peers that are explicitly listed in a FRIENDS file.  Note that you can list "
-"peers in the FRIENDS file that run in default mode.\n"
-"\n"
-"Use f2f only if you have (trustworthy) friends that use GNUnet and are "
-"afraid of establishing (direct) connections to unknown peers."
+"Which topology should be used?  The only option at the moment is "
+"\"topology_default\""
 msgstr ""
 
-#: contrib/config-daemon.scm:607
+#: contrib/config-daemon.scm:647
+msgid ""
+"Minimum number of connected friends before this peer is allowed to connect "
+"to peers that are not listed as friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:648
+msgid ""
+"Note that this option does not guarantee that the peer will be able to "
+"connect to the specified number of friends.  Also, if the peer had connected "
+"to a sufficient number of friends and then established non-friend "
+"connections, some of the friends may drop out of the network, temporarily "
+"resulting in having fewer than the specified number of friends connected "
+"while being connected to non-friends.  However, it is guaranteed that the "
+"peer itself will never choose to drop a friend's connection if this would "
+"result in dropping below the specified number of friends (unless that number "
+"is higher than the overall connection target)."
+msgstr ""
+
+#: contrib/config-daemon.scm:659
+msgid ""
+"If set to YES, the peer is only allowed to connect to other peers that are "
+"explicitly specified as friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:660
+msgid ""
+"Use YES only if you have (trustworthy) friends that use GNUnet and are "
+"afraid of establishing (direct) connections to unknown peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:671
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:608
+#: contrib/config-daemon.scm:672
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:622
+#: contrib/config-daemon.scm:683
+msgid "Friend-to-Friend Topology Specification"
+msgstr ""
+
+#: contrib/config-daemon.scm:684
+#, fuzzy
+msgid "Settings for restricting connections to friends"
+msgstr "'%s'Byanze."
+
+#: contrib/config-daemon.scm:701
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:634
+#: contrib/config-daemon.scm:713
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:646
+#: contrib/config-daemon.scm:725
 msgid "Configuration of the MySQL database"
 msgstr ""
 
-#: contrib/config-daemon.scm:665
+#: contrib/config-daemon.scm:744
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:667
+#: contrib/config-daemon.scm:746
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -4748,19 +5130,19 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:681
+#: contrib/config-daemon.scm:760
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:693
+#: contrib/config-daemon.scm:772
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:706
+#: contrib/config-daemon.scm:785
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:708
+#: contrib/config-daemon.scm:787
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -4772,13 +5154,13 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:722
+#: contrib/config-daemon.scm:801
 msgid ""
 "MB of diskspace GNUnet can use for caching DHT index data (the data will be "
 "stored in /tmp)"
 msgstr ""
 
-#: contrib/config-daemon.scm:723
+#: contrib/config-daemon.scm:802
 msgid ""
 "DHT index data is inherently small and expires comparatively quickly.  It is "
 "deleted whenever gnunetd is shut down.\n"
@@ -4786,20 +5168,20 @@
 "The size of the DSTORE QUOTA is specified in MB."
 msgstr ""
 
-#: contrib/config-daemon.scm:737
+#: contrib/config-daemon.scm:816
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:756
+#: contrib/config-daemon.scm:835
 #, fuzzy
 msgid "Applications"
 msgstr "ibirindiro"
 
-#: contrib/config-daemon.scm:772
+#: contrib/config-daemon.scm:851
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:773
+#: contrib/config-daemon.scm:852
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port and that cannot be traversed using UPnP.  Note "
@@ -4809,18 +5191,21 @@
 "contact you directly.  You can use 'make check' in src/transports/upnp/ to "
 "find out if your NAT supports UPnP.  You can also use gnunet-transport-check "
 "with the '-p' option in order to determine which setting results in more "
-"connections.  Use YES only if you get no connections otherwise."
+"connections.  Use YES only if you get no connections otherwise.  Set to AUTO "
+"to use YES if the local IP is belongs to a private IP network and NO "
+"otherwise."
 msgstr ""
 
-#: contrib/config-daemon.scm:784
+#: contrib/config-daemon.scm:863
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:796 contrib/config-daemon.scm:901
+#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:941
+#: contrib/config-daemon.scm:1078
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:797
+#: contrib/config-daemon.scm:876
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP.  You should disable this option if you are sure that you are "
@@ -4828,30 +5213,38 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:808 contrib/config-daemon.scm:925
-#: contrib/config-daemon.scm:980 contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:887 contrib/config-daemon.scm:1102
+#: contrib/config-daemon.scm:1157 contrib/config-daemon.scm:1222
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:820
+#: contrib/config-daemon.scm:899
 msgid ""
 "Which IPs are allowed to connect? Leave empty to use the IP of your primary "
 "network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:832
+#: contrib/config-daemon.scm:911
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:850
+#: contrib/config-daemon.scm:929
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:862
+#: contrib/config-daemon.scm:942 contrib/config-daemon.scm:1079
+msgid ""
+"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
+"supports UPnP. You should disable this option if you are sure that you are "
+"not behind a NAT.  If your NAT box does not support UPnP, having this on "
+"will not do much harm (only cost a small amount of resources)."
+msgstr ""
+
+#: contrib/config-daemon.scm:953
 msgid "Which is the external port of the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:863
+#: contrib/config-daemon.scm:954
 msgid ""
 "Use this option if your firewall maps say port 80 to your real HTTP port.  "
 "This can be useful in making the HTTP messages appear even more legit "
@@ -4859,90 +5252,128 @@
 "priviledged port)."
 msgstr ""
 
-#: contrib/config-daemon.scm:874
+#: contrib/config-daemon.scm:965
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:889
-msgid "Which port should be used by the UDP IPv4 transport?"
+#: contrib/config-daemon.scm:984
+msgid "What is the maximum transfer unit for SMTP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:902
+#: contrib/config-daemon.scm:996
+msgid "Which e-mail address should be used to send e-mail to this peer?"
+msgstr ""
+
+#: contrib/config-daemon.scm:997
 msgid ""
-"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
-"supports UPnP. You should disable this option if you are sure that you are "
-"not behind a NAT.  If your NAT box does not support UPnP, having this on "
-"will not do much harm (only cost a small amount of resources)."
+"You must make sure that e-mail received at this address is forwarded to the "
+"PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with "
+"procmail and the PIPE option to set the name of the pipe."
 msgstr ""
 
-#: contrib/config-daemon.scm:913
+#: contrib/config-daemon.scm:1008
+msgid ""
+"Which header line should other peers include in e-mails to enable filtering?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1009
+msgid ""
+"You can specify a header line here which can then be used by procmail to "
+"filter GNUnet e-mail from your inbox and forward it to gnunetd."
+msgstr ""
+
+#: contrib/config-daemon.scm:1020
+msgid "What is the filename of the pipe where gnunetd can read its e-mail?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1021
+msgid "Have a look at contrib/dot-procmailrc for an example .procmailrc file."
+msgstr ""
+
+#: contrib/config-daemon.scm:1032
+msgid "What is the name and port of the server for outgoing e-mail?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1033
+msgid "The basic format is HOSTNAME:PORT."
+msgstr ""
+
+#: contrib/config-daemon.scm:1044
+msgid "SMTP transport"
+msgstr ""
+
+#: contrib/config-daemon.scm:1066
+msgid "Which port should be used by the UDP IPv4 transport?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1090
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:937
+#: contrib/config-daemon.scm:1114
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow connections from any "
 "IP."
 msgstr ""
 
-#: contrib/config-daemon.scm:949
+#: contrib/config-daemon.scm:1126
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:968
+#: contrib/config-daemon.scm:1145
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:992 contrib/config-daemon.scm:1057
+#: contrib/config-daemon.scm:1169 contrib/config-daemon.scm:1234
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow any IP to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:1004
+#: contrib/config-daemon.scm:1181
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1021
+#: contrib/config-daemon.scm:1198
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1033
+#: contrib/config-daemon.scm:1210
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1069
+#: contrib/config-daemon.scm:1246
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1087
+#: contrib/config-daemon.scm:1264
 msgid "Network interface"
 msgstr ""
 
-#: contrib/config-daemon.scm:1099
+#: contrib/config-daemon.scm:1276
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1111
+#: contrib/config-daemon.scm:1288
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1123
+#: contrib/config-daemon.scm:1300
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1146
+#: contrib/config-daemon.scm:1324
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1158
+#: contrib/config-daemon.scm:1336
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1170
+#: contrib/config-daemon.scm:1348
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1172
+#: contrib/config-daemon.scm:1350
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -4952,11 +5383,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1183
+#: contrib/config-daemon.scm:1361
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1185
+#: contrib/config-daemon.scm:1363
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4966,36 +5397,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1196
+#: contrib/config-daemon.scm:1374
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1197
+#: contrib/config-daemon.scm:1375
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1208
+#: contrib/config-daemon.scm:1386
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1209
+#: contrib/config-daemon.scm:1387
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1220
+#: contrib/config-daemon.scm:1398
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1232
+#: contrib/config-daemon.scm:1410
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1234
+#: contrib/config-daemon.scm:1412
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -5040,11 +5471,11 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1251
+#: contrib/config-daemon.scm:1429
 msgid "Network interface to monitor"
 msgstr ""
 
-#: contrib/config-daemon.scm:1252
+#: contrib/config-daemon.scm:1430
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -5055,11 +5486,11 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1263
+#: contrib/config-daemon.scm:1441
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1288 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1466 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -5191,244 +5622,647 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
+#: src/setup/gtk/gnunet-setup.glade:9 src/setup/gtk/gnunet-setup.glade:167
+#: src/setup/gtk/gnunet-setup.glade:435 src/setup/gtk/gnunet-setup.glade:845
+#: src/setup/gtk/gnunet-setup.glade:1178
 #, fuzzy
-#~ msgid "Run gnunetd as this user."
-#~ msgstr "Sitatisitiki"
+msgid "GNUnet configuration assistant"
+msgstr "Umubare Bya Amasubiramo"
 
-#, fuzzy
-#~ msgid "specify nickname"
-#~ msgstr "Irihimbano"
+#: src/setup/gtk/gnunet-setup.glade:34
+msgid ""
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org\n";
+"and join our community at\n"
+"\thttps://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"The GNUnet team"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Start GNUnet chat client."
-#~ msgstr "Gutangira Umukiriya"
+#: src/setup/gtk/gnunet-setup.glade:92 src/setup/gtk/gnunet-setup.glade:360
+#: src/setup/gtk/gnunet-setup.glade:767 src/setup/gtk/gnunet-setup.glade:1384
+msgid "Next"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Could not connect to gnunetd.\n"
-#~ msgstr "OYA Kwihuza Kuri"
+#: src/setup/gtk/gnunet-setup.glade:194
+msgid ""
+"Enter information about your network connection here.\n"
+"\n"
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL.\n"
+"\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address.\n"
+"\n"
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, check the last option on this page. Leave it "
+"unchecked on direct connections through modems, ISDN cards and DNAT (also "
+"known as \"port forwarding\")."
+msgstr ""
 
-#, fuzzy
-#~ msgid "You must specify a nickname (use option `%s').\n"
-#~ msgstr "a Irihimbano Gukoresha Ihitamo"
+#: src/setup/gtk/gnunet-setup.glade:250
+msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Could not send join message to gnunetd\n"
-#~ msgstr "OYA Kohereza Ubutumwa Kuri"
+#: src/setup/gtk/gnunet-setup.glade:283
+msgid "IP-Address/Hostname:"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Could not send message to gnunetd\n"
-#~ msgstr "OYA Kohereza Ubutumwa Kuri"
+#: src/setup/gtk/gnunet-setup.glade:296
+msgid "Network interface:"
+msgstr ""
 
+#: src/setup/gtk/gnunet-setup.glade:319
 #, 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"
+msgid "Network connection"
+msgstr "Gukoresha Iboneza IDOSIYE"
 
-#, fuzzy
-#~ msgid "Database failed to delete `%s'.\n"
-#~ msgstr "Kuri IDOSIYE"
+#: src/setup/gtk/gnunet-setup.glade:462
+msgid ""
+"You can limit GNUnet's ressource usage here.\n"
+"\n"
+"\"Bandwidth limitation\" is how much data may be sent per second. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection.\n"
+"\n"
+"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
+"to use."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Store migrated content"
-#~ msgstr "#GUSHAKISHA Byinjijwemo Cyangwa Ibikubiyemo"
+#: src/setup/gtk/gnunet-setup.glade:520
+msgid "Downstream (Bytes/s):"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Save configuration"
-#~ msgstr "Gukoresha Iboneza IDOSIYE"
+#: src/setup/gtk/gnunet-setup.glade:547
+msgid "Upstream (Bytes/s):"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Show copyright information for gnunet-setup."
-#~ msgstr "Ibisobanuro kugirango i Porogaramu"
+#: src/setup/gtk/gnunet-setup.glade:561
+msgid "Bandwidth limitation"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Start GNUnet-testbed helper."
-#~ msgstr "Gutangira"
+#: src/setup/gtk/gnunet-setup.glade:580
+msgid "Use denoted bandwidth for GNUnet"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Cannot connect to LOOPBACK port %d: %s\n"
-#~ msgstr "Kwihuza Kuri Umuyoboro"
+#: src/setup/gtk/gnunet-setup.glade:596
+msgid "Share denoted bandwidth with other applications"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Could not execute `%s': %s\n"
-#~ msgstr "OYA Gukora"
+#: src/setup/gtk/gnunet-setup.glade:614
+msgid "Bandwidth sharing"
+msgstr ""
 
-#, fuzzy
-#~ msgid "No client service started. Trying again in 30 seconds.\n"
-#~ msgstr "Umukiriya Serivisi in amasogonda"
+#: src/setup/gtk/gnunet-setup.glade:636
+msgid "Max. CPU usage (%):"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "Error (%s) binding the TCP listener to port %d. No proxy service "
-#~ "started.\n"
-#~ "Trying again in %d seconds...\n"
-#~ msgstr "Bifatanya i Kuri Umuyoboro Porogisi Serivisi in amasogonda"
+#: src/setup/gtk/gnunet-setup.glade:659
+msgid "CPU usage"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
-#~ msgstr ""
-#~ "Project- Id- Version: basctl\n"
-#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-#~ "Content- Type: text/ plain; charset= UTF- 8\n"
-#~ "Content- Transfer- Encoding: 8bit\n"
-#~ "X- Generator: KBabel 1. 0\n"
-#~ ". Project- Id- Version: basctl\n"
-#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-#~ "Content- Type: text/ plain; charset= UTF- 8\n"
-#~ "Content- Transfer- Encoding: 8bit\n"
-#~ "X- Generator: KBabel 1. 0\n"
-#~ ". Project- Id- Version: basctl\n"
-#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-#~ "Content- Type: text/ plain; charset= UTF- 8\n"
-#~ "Content- Transfer- Encoding: 8bit\n"
-#~ "X- Generator: KBabel 1. 0\n"
-#~ "."
+#: src/setup/gtk/gnunet-setup.glade:682
+msgid "Load limitation"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Protocol violation on socket. Expected command.\n"
-#~ msgstr "ku Itegerejwe Komandi:"
+#: src/setup/gtk/gnunet-setup.glade:872
+msgid ""
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability.\n"
+"\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content). Its maximum size can be specified below.\n"
+"\n"
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
+"\n"
+"After changing the configuration and/or updating GNUnet, it is sometimes "
+"required to run gnunet-update to update internal data structures. Depending "
+"on the changes made, this may take some time."
+msgstr ""
 
+#: src/setup/gtk/gnunet-setup.glade:905
 #, fuzzy
-#~ msgid "Command `%s' not found!\n"
-#~ msgstr "OYA Byabonetse"
+msgid "Store migrated content"
+msgstr "#GUSHAKISHA Byinjijwemo Cyangwa Ibikubiyemo"
 
-#, fuzzy
-#~ msgid "Start GNUnet testbed controller."
-#~ msgstr "Gutangira"
+#: src/setup/gtk/gnunet-setup.glade:923
+msgid "Maximum datastore size (MB):"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Malformed entry in the configuration in section %s under %s: %s\n"
-#~ msgstr "Icyinjijwe in i Iboneza in Icyiciro"
+#: src/setup/gtk/gnunet-setup.glade:952
+msgid "Start the GNUnet background process on computer startup"
+msgstr ""
 
+#: src/setup/gtk/gnunet-setup.glade:969
 #, fuzzy
-#~ msgid "Could not send acknowledgement back to client.\n"
-#~ msgstr "OYA Kohereza Inyuma Kuri Umukiriya"
+msgid "Open the enhanced configurator"
+msgstr "OYA Iboneza IDOSIYE"
 
+#: src/setup/gtk/gnunet-setup.glade:986
 #, fuzzy
-#~ msgid "Received unknown testbed message of type %u.\n"
-#~ msgstr "Kitazwi Ubutumwa Bya Ubwoko"
+msgid "Run gnunet-update"
+msgstr "Sitatisitiki"
 
-#, fuzzy
-#~ msgid "size of `%s' message is too short. Ignoring.\n"
-#~ msgstr "Kwirengagiza."
+#: src/setup/gtk/gnunet-setup.glade:1015 src/setup/gtk/gnunet-setup.glade:1299
+msgid "Other settings"
+msgstr ""
 
-#, fuzzy
-#~ msgid "size of `%s' message is wrong. Ignoring.\n"
-#~ msgstr "Kwirengagiza."
+#: src/setup/gtk/gnunet-setup.glade:1100
+msgid "Finish"
+msgstr ""
 
-#, fuzzy
-#~ msgid "TESTBED could not generate hello message for protocol %u\n"
-#~ msgstr "OYA Ubutumwa kugirango Porotokole"
+#: src/setup/gtk/gnunet-setup.glade:1205
+msgid ""
+"Define the user and the group owning the GNUnet service here.\n"
+"\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account and a new group under which the GNUnet service is started at system "
+"startup.\n"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the fields empty to run GNUnet with system privileges."
+msgstr ""
 
+#: src/setup/gtk/gnunet-setup.glade:1239
+msgid "User account:"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1279
+msgid "Group:"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1462
+msgid "gnunet-setup"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1481
 #, fuzzy
-#~ msgid "received invalid `%s' message\n"
-#~ msgstr "BYAKIRIWE Sibyo"
+msgid "Save configuration"
+msgstr "Gukoresha Iboneza IDOSIYE"
 
+#: src/setup/gtk/gnunet-setup.glade:1493
 #, fuzzy
-#~ msgid "received invalid `%s' message (empty module name)\n"
-#~ msgstr "BYAKIRIWE Sibyo Ubutumwa ubusa Modire Izina:"
+msgid "Show copyright information for gnunet-setup."
+msgstr "Ibisobanuro kugirango i Porogaramu"
 
+#: src/setup/gtk/gnunet-setup.glade:1526
+msgid "About gnunet-setup"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1531
+msgid "(C) 2001-2007 Christian Grothoff (and other contributing authors)"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1532
 #, fuzzy
-#~ msgid "loading module `%s' failed.  Notifying client.\n"
-#~ msgstr "Itangira... Modire Byanze Umukiriya"
+msgid "This is the configuration tool for GNUnet."
+msgstr "Gucapa a Agaciro Bivuye i Iboneza IDOSIYE Kuri"
 
+#: src/setup/gtk/gnunet-setup.glade:1535
+msgid ""
+"\t\t    GNU GENERAL PUBLIC LICENSE\n"
+"\t\t       Version 2, June 1991\n"
+"\n"
+" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
+"     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+" Everyone is permitted to copy and distribute verbatim copies\n"
+" of this license document, but changing it is not allowed.\n"
+"\n"
+"\t\t\t    Preamble\n"
+"\n"
+"  The licenses for most software are designed to take away your\n"
+"freedom to share and change it.  By contrast, the GNU General Public\n"
+"License is intended to guarantee your freedom to share and change free\n"
+"software--to make sure the software is free for all its users.  This\n"
+"General Public License applies to most of the Free Software\n"
+"Foundation's software and to any other program whose authors commit to\n"
+"using it.  (Some other Free Software Foundation software is covered by\n"
+"the GNU Library General Public License instead.)  You can apply it to\n"
+"your programs, too.\n"
+"\n"
+"  When we speak of free software, we are referring to freedom, not\n"
+"price.  Our General Public Licenses are designed to make sure that you\n"
+"have the freedom to distribute copies of free software (and charge for\n"
+"this service if you wish), that you receive source code or can get it\n"
+"if you want it, that you can change the software or use pieces of it\n"
+"in new free programs; and that you know you can do these things.\n"
+"\n"
+"  To protect your rights, we need to make restrictions that forbid\n"
+"anyone to deny you these rights or to ask you to surrender the rights.\n"
+"These restrictions translate to certain responsibilities for you if you\n"
+"distribute copies of the software, or if you modify it.\n"
+"\n"
+"  For example, if you distribute copies of such a program, whether\n"
+"gratis or for a fee, you must give the recipients all the rights that\n"
+"you have.  You must make sure that they, too, receive or can get the\n"
+"source code.  And you must show them these terms so they know their\n"
+"rights.\n"
+"\n"
+"  We protect your rights with two steps: (1) copyright the software, and\n"
+"(2) offer you this license which gives you legal permission to copy,\n"
+"distribute and/or modify the software.\n"
+"\n"
+"  Also, for each author's protection and ours, we want to make certain\n"
+"that everyone understands that there is no warranty for this free\n"
+"software.  If the software is modified by someone else and passed on, we\n"
+"want its recipients to know that what they have is not the original, so\n"
+"that any problems introduced by others will not reflect on the original\n"
+"authors' reputations.\n"
+"\n"
+"  Finally, any free program is threatened constantly by software\n"
+"patents.  We wish to avoid the danger that redistributors of a free\n"
+"program will individually obtain patent licenses, in effect making the\n"
+"program proprietary.  To prevent this, we have made it clear that any\n"
+"patent must be licensed for everyone's free use or not licensed at all.\n"
+"\n"
+"  The precise terms and conditions for copying, distribution and\n"
+"modification follow.\n"
+"\n"
+"\t\t    GNU GENERAL PUBLIC LICENSE\n"
+"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
+"\n"
+"  0. This License applies to any program or other work which contains\n"
+"a notice placed by the copyright holder saying it may be distributed\n"
+"under the terms of this General Public License.  The \"Program\", below,\n"
+"refers to any such program or work, and a \"work based on the Program\"\n"
+"means either the Program or any derivative work under copyright law:\n"
+"that is to say, a work containing the Program or a portion of it,\n"
+"either verbatim or with modifications and/or translated into another\n"
+"language.  (Hereinafter, translation is included without limitation in\n"
+"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
+"\n"
+"Activities other than copying, distribution and modification are not\n"
+"covered by this License; they are outside its scope.  The act of\n"
+"running the Program is not restricted, and the output from the Program\n"
+"is covered only if its contents constitute a work based on the\n"
+"Program (independent of having been made by running the Program).\n"
+"Whether that is true depends on what the Program does.\n"
+"\n"
+"  1. You may copy and distribute verbatim copies of the Program's\n"
+"source code as you receive it, in any medium, provided that you\n"
+"conspicuously and appropriately publish on each copy an appropriate\n"
+"copyright notice and disclaimer of warranty; keep intact all the\n"
+"notices that refer to this License and to the absence of any warranty;\n"
+"and give any other recipients of the Program a copy of this License\n"
+"along with the Program.\n"
+"\n"
+"You may charge a fee for the physical act of transferring a copy, and\n"
+"you may at your option offer warranty protection in exchange for a fee.\n"
+"\n"
+"  2. You may modify your copy or copies of the Program or any portion\n"
+"of it, thus forming a work based on the Program, and copy and\n"
+"distribute such modifications or work under the terms of Section 1\n"
+"above, provided that you also meet all of these conditions:\n"
+"\n"
+"    a) You must cause the modified files to carry prominent notices\n"
+"    stating that you changed the files and the date of any change.\n"
+"\n"
+"    b) You must cause any work that you distribute or publish, that in\n"
+"    whole or in part contains or is derived from the Program or any\n"
+"    part thereof, to be licensed as a whole at no charge to all third\n"
+"    parties under the terms of this License.\n"
+"\n"
+"    c) If the modified program normally reads commands interactively\n"
+"    when run, you must cause it, when started running for such\n"
+"    interactive use in the most ordinary way, to print or display an\n"
+"    announcement including an appropriate copyright notice and a\n"
+"    notice that there is no warranty (or else, saying that you provide\n"
+"    a warranty) and that users may redistribute the program under\n"
+"    these conditions, and telling the user how to view a copy of this\n"
+"    License.  (Exception: if the Program itself is interactive but\n"
+"    does not normally print such an announcement, your work based on\n"
+"    the Program is not required to print an announcement.)\n"
+"\n"
+"These requirements apply to the modified work as a whole.  If\n"
+"identifiable sections of that work are not derived from the Program,\n"
+"and can be reasonably considered independent and separate works in\n"
+"themselves, then this License, and its terms, do not apply to those\n"
+"sections when you distribute them as separate works.  But when you\n"
+"distribute the same sections as part of a whole which is a work based\n"
+"on the Program, the distribution of the whole must be on the terms of\n"
+"this License, whose permissions for other licensees extend to the\n"
+"entire whole, and thus to each and every part regardless of who wrote it.\n"
+"\n"
+"Thus, it is not the intent of this section to claim rights or contest\n"
+"your rights to work written entirely by you; rather, the intent is to\n"
+"exercise the right to control the distribution of derivative or\n"
+"collective works based on the Program.\n"
+"\n"
+"In addition, mere aggregation of another work not based on the Program\n"
+"with the Program (or with a work based on the Program) on a volume of\n"
+"a storage or distribution medium does not bring the other work under\n"
+"the scope of this License.\n"
+"\n"
+"  3. You may copy and distribute the Program (or a work based on it,\n"
+"under Section 2) in object code or executable form under the terms of\n"
+"Sections 1 and 2 above provided that you also do one of the following:\n"
+"\n"
+"    a) Accompany it with the complete corresponding machine-readable\n"
+"    source code, which must be distributed under the terms of Sections\n"
+"    1 and 2 above on a medium customarily used for software interchange; "
+"or,\n"
+"\n"
+"    b) Accompany it with a written offer, valid for at least three\n"
+"    years, to give any third party, for a charge no more than your\n"
+"    cost of physically performing source distribution, a complete\n"
+"    machine-readable copy of the corresponding source code, to be\n"
+"    distributed under the terms of Sections 1 and 2 above on a medium\n"
+"    customarily used for software interchange; or,\n"
+"\n"
+"    c) Accompany it with the information you received as to the offer\n"
+"    to distribute corresponding source code.  (This alternative is\n"
+"    allowed only for noncommercial distribution and only if you\n"
+"    received the program in object code or executable form with such\n"
+"    an offer, in accord with Subsection b above.)\n"
+"\n"
+"The source code for a work means the preferred form of the work for\n"
+"making modifications to it.  For an executable work, complete source\n"
+"code means all the source code for all modules it contains, plus any\n"
+"associated interface definition files, plus the scripts used to\n"
+"control compilation and installation of the executable.  However, as a\n"
+"special exception, the source code distributed need not include\n"
+"anything that is normally distributed (in either source or binary\n"
+"form) with the major components (compiler, kernel, and so on) of the\n"
+"operating system on which the executable runs, unless that component\n"
+"itself accompanies the executable.\n"
+"\n"
+"If distribution of executable or object code is made by offering\n"
+"access to copy from a designated place, then offering equivalent\n"
+"access to copy the source code from the same place counts as\n"
+"distribution of the source code, even though third parties are not\n"
+"compelled to copy the source along with the object code.\n"
+"\n"
+"  4. You may not copy, modify, sublicense, or distribute the Program\n"
+"except as expressly provided under this License.  Any attempt\n"
+"otherwise to copy, modify, sublicense or distribute the Program is\n"
+"void, and will automatically terminate your rights under this License.\n"
+"However, parties who have received copies, or rights, from you under\n"
+"this License will not have their licenses terminated so long as such\n"
+"parties remain in full compliance.\n"
+"\n"
+"  5. You are not required to accept this License, since you have not\n"
+"signed it.  However, nothing else grants you permission to modify or\n"
+"distribute the Program or its derivative works.  These actions are\n"
+"prohibited by law if you do not accept this License.  Therefore, by\n"
+"modifying or distributing the Program (or any work based on the\n"
+"Program), you indicate your acceptance of this License to do so, and\n"
+"all its terms and conditions for copying, distributing or modifying\n"
+"the Program or works based on it.\n"
+"\n"
+"  6. Each time you redistribute the Program (or any work based on the\n"
+"Program), the recipient automatically receives a license from the\n"
+"original licensor to copy, distribute or modify the Program subject to\n"
+"these terms and conditions.  You may not impose any further\n"
+"restrictions on the recipients' exercise of the rights granted herein.\n"
+"You are not responsible for enforcing compliance by third parties to\n"
+"this License.\n"
+"\n"
+"  7. If, as a consequence of a court judgment or allegation of patent\n"
+"infringement or for any other reason (not limited to patent issues),\n"
+"conditions are imposed on you (whether by court order, agreement or\n"
+"otherwise) that contradict the conditions of this License, they do not\n"
+"excuse you from the conditions of this License.  If you cannot\n"
+"distribute so as to satisfy simultaneously your obligations under this\n"
+"License and any other pertinent obligations, then as a consequence you\n"
+"may not distribute the Program at all.  For example, if a patent\n"
+"license would not permit royalty-free redistribution of the Program by\n"
+"all those who receive copies directly or indirectly through you, then\n"
+"the only way you could satisfy both it and this License would be to\n"
+"refrain entirely from distribution of the Program.\n"
+"\n"
+"If any portion of this section is held invalid or unenforceable under\n"
+"any particular circumstance, the balance of the section is intended to\n"
+"apply and the section as a whole is intended to apply in other\n"
+"circumstances.\n"
+"\n"
+"It is not the purpose of this section to induce you to infringe any\n"
+"patents or other property right claims or to contest validity of any\n"
+"such claims; this section has the sole purpose of protecting the\n"
+"integrity of the free software distribution system, which is\n"
+"implemented by public license practices.  Many people have made\n"
+"generous contributions to the wide range of software distributed\n"
+"through that system in reliance on consistent application of that\n"
+"system; it is up to the author/donor to decide if he or she is willing\n"
+"to distribute software through any other system and a licensee cannot\n"
+"impose that choice.\n"
+"\n"
+"This section is intended to make thoroughly clear what is believed to\n"
+"be a consequence of the rest of this License.\n"
+"\n"
+"  8. If the distribution and/or use of the Program is restricted in\n"
+"certain countries either by patents or by copyrighted interfaces, the\n"
+"original copyright holder who places the Program under this License\n"
+"may add an explicit geographical distribution limitation excluding\n"
+"those countries, so that distribution is permitted only in or among\n"
+"countries not thus excluded.  In such case, this License incorporates\n"
+"the limitation as if written in the body of this License.\n"
+"\n"
+"  9. The Free Software Foundation may publish revised and/or new versions\n"
+"of the General Public License from time to time.  Such new versions will\n"
+"be similar in spirit to the present version, but may differ in detail to\n"
+"address new problems or concerns.\n"
+"\n"
+"Each version is given a distinguishing version number.  If the Program\n"
+"specifies a version number of this License which applies to it and \"any\n"
+"later version\", you have the option of following the terms and conditions\n"
+"either of that version or of any later version published by the Free\n"
+"Software Foundation.  If the Program does not specify a version number of\n"
+"this License, you may choose any version ever published by the Free "
+"Software\n"
+"Foundation.\n"
+"\n"
+"  10. If you wish to incorporate parts of the Program into other free\n"
+"programs whose distribution conditions are different, write to the author\n"
+"to ask for permission.  For software which is copyrighted by the Free\n"
+"Software Foundation, write to the Free Software Foundation; we sometimes\n"
+"make exceptions for this.  Our decision will be guided by the two goals\n"
+"of preserving the free status of all derivatives of our free software and\n"
+"of promoting the sharing and reuse of software generally.\n"
+"\n"
+"\t\t\t    NO WARRANTY\n"
+"\n"
+"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
+"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
+"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
+"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
+"EXPRESSED\n"
+"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
+"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
+"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
+"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
+"REPAIR OR CORRECTION.\n"
+"\n"
+"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
+"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
+"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
+"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
+"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
+"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
+"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
+"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
+"POSSIBILITY OF SUCH DAMAGES.\n"
+"\n"
+"\t\t     END OF TERMS AND CONDITIONS\n"
+"\n"
+"\t    How to Apply These Terms to Your New Programs\n"
+"\n"
+"  If you develop a new program, and you want it to be of the greatest\n"
+"possible use to the public, the best way to achieve this is to make it\n"
+"free software which everyone can redistribute and change under these terms.\n"
+"\n"
+"  To do so, attach the following notices to the program.  It is safest\n"
+"to attach them to the start of each source file to most effectively\n"
+"convey the exclusion of warranty; and each file should have at least\n"
+"the \"copyright\" line and a pointer to where the full notice is found.\n"
+"\n"
+"    <one line to give the program's name and a brief idea of what it does.>\n"
+"    Copyright (C) <year>  <name of author>\n"
+"\n"
+"    This program is free software; you can redistribute it and/or modify\n"
+"    it under the terms of the GNU General Public License as published by\n"
+"    the Free Software Foundation; either version 2 of the License, or\n"
+"    (at your option) any later version.\n"
+"\n"
+"    This program is distributed in the hope that it will be useful,\n"
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"    GNU General Public License for more details.\n"
+"\n"
+"    You should have received a copy of the GNU General Public License\n"
+"    along with this program; if not, write to the Free Software\n"
+"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+"USA\n"
+"\n"
+"\n"
+"Also add information on how to contact you by electronic and paper mail.\n"
+"\n"
+"If the program is interactive, make it output a short notice like this\n"
+"when it starts in an interactive mode:\n"
+"\n"
+"    Gnomovision version 69, Copyright (C) year  name of author\n"
+"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
+"w'.\n"
+"    This is free software, and you are welcome to redistribute it\n"
+"    under certain conditions; type `show c' for details.\n"
+"\n"
+"The hypothetical commands `show w' and `show c' should show the appropriate\n"
+"parts of the General Public License.  Of course, the commands you use may\n"
+"be called something other than `show w' and `show c'; they could even be\n"
+"mouse-clicks or menu items--whatever suits your program.\n"
+"\n"
+"You should also get your employer (if you work as a programmer) or your\n"
+"school, if any, to sign a \"copyright disclaimer\" for the program, if\n"
+"necessary.  Here is a sample; alter the names:\n"
+"\n"
+"  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
+"  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
+"\n"
+"  <signature of Ty Coon>, 1 April 1989\n"
+"  Ty Coon, President of Vice\n"
+"\n"
+"This General Public License does not permit incorporating your program into\n"
+"proprietary programs.  If your program is a subroutine library, you may\n"
+"consider it more useful to permit linking proprietary applications with the\n"
+"library.  If this is what you want to do, use the GNU Library General\n"
+"Public License instead of this License.\n"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1917
+msgid "Not for English ;-)"
+msgstr ""
+
 #, fuzzy
-#~ msgid "unloading module failed.  Notifying client.\n"
-#~ msgstr "Modire Byanze Umukiriya"
+#~ 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"
 
 #, fuzzy
-#~ msgid "`%s' %s failed: %s\n"
-#~ msgstr "'%s'%sByanze"
+#~ msgid "Failed to initialize libesmtp: %s.\n"
+#~ msgstr "Kuri gutangiza Serivisi"
 
 #, fuzzy
-#~ msgid "received invalid `%s' message: %s.\n"
-#~ msgstr "BYAKIRIWE Sibyo Ubutumwa"
+#~ msgid "Sending E-mail to `%s' failed.\n"
+#~ msgstr "E Ubutumwa Kuri Byanze"
 
 #, fuzzy
-#~ msgid "'..' is not allowed in file name (%s).\n"
+#~ msgid "%.*s filter %s (SMTP)"
 #~ msgstr ""
-#~ "'..'Project- Id- Version: basctl\n"
+#~ "%.*Project- Id- Version: basctl\n"
 #~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
 #~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
 #~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
 #~ "Content- Type: text/ plain; charset= UTF- 8\n"
 #~ "Content- Transfer- Encoding: 8bit\n"
 #~ "X- Generator: KBabel 1. 0\n"
-#~ ". Project- Id- Version: basctl\n"
-#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-#~ "Content- Type: text/ plain; charset= UTF- 8\n"
-#~ "Content- Transfer- Encoding: 8bit\n"
-#~ "X- Generator: KBabel 1. 0\n"
 #~ "."
 
 #, fuzzy
-#~ msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
-#~ msgstr "Izina ry'idosiye: kugirango Ubutumwa ni Sibyo"
+#~ msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+#~ msgstr "kugirango ni Byo hasi OYA"
 
 #, fuzzy
-#~ msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
-#~ msgstr "kugirango Ubutumwa ni OYA NTAGIHARI Sibyo"
+#~ msgid "Network configuration: NAT"
+#~ msgstr "Gukoresha Iboneza IDOSIYE"
 
 #, fuzzy
-#~ msgid "Invalid message received at %s:%d."
-#~ msgstr "Ubutumwa BYAKIRIWE ku"
+#~ msgid "specify nickname"
+#~ msgstr "Irihimbano"
 
 #, fuzzy
-#~ msgid "received invalid testbed message of size %u\n"
-#~ msgstr "BYAKIRIWE Sibyo Ubutumwa Bya Ingano"
+#~ msgid "Start GNUnet chat client."
+#~ msgstr "Gutangira Umukiriya"
 
 #, fuzzy
-#~ msgid ""
-#~ "Received testbed message of type %u but unexpected size %u, expected %u\n"
-#~ msgstr "Ubutumwa Bya Ubwoko Ingano Ikitezwe:"
+#~ msgid "Could not connect to gnunetd.\n"
+#~ msgstr "OYA Kwihuza Kuri"
 
 #, fuzzy
-#~ msgid "No testbed URL given, not registered.\n"
-#~ msgstr "OYA"
+#~ msgid "You must specify a nickname (use option `%s').\n"
+#~ msgstr "a Irihimbano Gukoresha Ihitamo"
 
 #, fuzzy
-#~ msgid "Could not resolve name of HTTP proxy `%s'.\n"
-#~ msgstr "OYA Izina: Bya Porogisi"
+#~ msgid "Could not send join message to gnunetd\n"
+#~ msgstr "OYA Kohereza Ubutumwa Kuri"
 
 #, fuzzy
-#~ msgid "Invalid URL `%s' (must begin with `%s')\n"
-#~ msgstr "Na:"
+#~ msgid "Could not send message to gnunetd\n"
+#~ msgstr "OYA Kohereza Ubutumwa Kuri"
 
 #, fuzzy
-#~ msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
-#~ msgstr "HTTP ku Umukiriya OYA"
+#~ 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 "Could not register testbed, host `%s' unknown\n"
-#~ msgstr "OYA Kwiyandikisha Ubuturo"
+#~ msgid "Database failed to delete `%s'.\n"
+#~ msgstr "Kuri IDOSIYE"
 
 #, fuzzy
-#~ msgid "Failed to send HTTP request to host `%s': %s\n"
-#~ msgstr "Kuri Kohereza Kubaza... Kuri Ubuturo"
-
-#, fuzzy
-#~ msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
-#~ msgstr "Kohereza Kubaza... Kuri Ubuturo"
-
-#, fuzzy
-#~ msgid "Exit register (error: no http response read).\n"
-#~ msgstr "Kwiyandikisha Ikosa Oya HTTP Gusoma"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Failed to receive reply from gnunetd.\n"
-#~ msgstr "Kuri Akira Kuri Ubutumwa Bivuye"
-
-#, fuzzy
 #~ msgid "# bytes received via TCP-OLD"
 #~ msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
@@ -6916,10 +7750,6 @@
 #~ msgstr "Ububikoshingiro Ubwoko Byahinduwe Gukoresha GUHINDURA"
 
 #, fuzzy
-#~ msgid "Failed to initialize AFS database %u.\n"
-#~ msgstr "Kuri gutangiza Ububikoshingiro"
-
-#, fuzzy
 #~ msgid "# lookup (SBlock, search results)"
 #~ msgstr "#GUSHAKISHA Gushaka Ibisubizo ku"
 

Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po     2007-12-10 02:47:03 UTC (rev 5850)
+++ GNUnet/po/sv.po     2007-12-10 03:20:09 UTC (rev 5851)
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the GNUnet package.
 # Daniel Nylander <address@hidden>, 2006.
 #
-#: contrib/config-daemon.scm:555
+#: contrib/config-daemon.scm:584
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-09-29 16:48-0600\n"
+"POT-Creation-Date: 2007-12-09 19:48-0700\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -16,1527 +16,1695 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/transports/ip6.c:75 src/util/network/io.c:85
+#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:541
+#: src/transports/http.c:1320 src/transports/http.c:1413
+#: src/transports/http.c:1588 src/transports/http.c:2014
+#: src/transports/http.c:2075 src/applications/bootstrap_http/http.c:123
+#: src/applications/bootstrap_http/http.c:257
+#: src/applications/bootstrap_http/http.c:274
+#: src/applications/bootstrap_http/http.c:306
+#: src/applications/bootstrap_http/http.c:325
+#: src/applications/bootstrap_http/http.c:338
+#: src/applications/bootstrap_http/http.c:348
+#: src/applications/bootstrap_http/http.c:358
+#, fuzzy, c-format
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/transports/upnp/upnp.c:431
+#, 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:476
 #, c-format
+msgid "upnp: NAT Returned IP: %s\n"
+msgstr ""
+
+#: src/transports/ip6.c:77 src/util/network/io.c:86
+#, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:104 src/util/network/ip.c:84 src/util/network/ip.c:146
+#: src/transports/ip6.c:109 src/util/network/ip.c:87 src/util/network/ip.c:151
 #, 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:135 src/util/network/ip.c:115
-#: src/util/network/ip.c:221
+#: src/transports/ip6.c:140 src/util/network/ip.c:118
+#: src/util/network/ip.c:237
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 
-#: src/transports/ip6.c:167
+#: src/transports/ip6.c:174
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transports/ip6.c:219 src/transports/ip.c:60
+#: src/transports/ip6.c:228 src/transports/ip.c:61
 #, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr ""
 
-#: src/transports/udp6.c:123 src/transports/udp.c:129
+#: src/transports/tcp6.c:249
+msgid "Could not determine my public IPv6 address.\n"
+msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
+
+#: src/transports/tcp6.c:317
 #, c-format
+msgid "`%s': unknown service: %s\n"
+msgstr "\"%s\": okänd tjänst: %s\n"
+
+#: src/transports/tcp6.c:420 src/transports/tcp.c:462
+#, c-format
+msgid "Failed to start transport service on port %d.\n"
+msgstr ""
+
+#: src/transports/tcp6.c:531
+#, fuzzy
+msgid "# bytes received via TCP6"
+msgstr "# byte mottogs via TCP"
+
+#: src/transports/tcp6.c:532
+#, fuzzy
+msgid "# bytes sent via TCP6"
+msgstr "# byte skickades via TCP"
+
+#: src/transports/tcp6.c:534
+#, fuzzy
+msgid "# bytes dropped by TCP6 (outgoing)"
+msgstr "# byte kastade via TCP (utgående)"
+
+#: src/transports/udp6.c:131 src/transports/udp.c:135
+#, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transports/udp6.c:264
+#: src/transports/udp6.c:277
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/udp6.c:471 src/transports/udp.c:520
+#: src/transports/udp6.c:495 src/transports/udp.c:544
 #, c-format
 msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/udp6.c:476
+#: src/transports/udp6.c:501
 #, fuzzy
 msgid "# bytes received via UDP6"
 msgstr "# byte mottagna via UDP"
 
-#: src/transports/udp6.c:477
+#: src/transports/udp6.c:502
 #, fuzzy
 msgid "# bytes sent via UDP6"
 msgstr "# byte skickade via UDP"
 
-#: src/transports/udp6.c:479
+#: src/transports/udp6.c:504
 #, fuzzy
 msgid "# bytes dropped by UDP6 (outgoing)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/transports/udp6.c:481
+#: src/transports/udp6.c:506
 msgid "# UDP6 connections (right now)"
 msgstr ""
 
-#: src/transports/http.c:824
+#: src/transports/http.c:875
 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:1235 src/transports/http.c:1309
-#: src/transports/http.c:1464 src/transports/http.c:1858
-#: src/transports/http.c:1894 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:540 src/applications/bootstrap_http/http.c:122
-#: src/applications/bootstrap_http/http.c:254
-#: src/applications/bootstrap_http/http.c:270
-#: src/applications/bootstrap_http/http.c:301
-#: src/applications/bootstrap_http/http.c:320
-#: src/applications/bootstrap_http/http.c:333
-#: src/applications/bootstrap_http/http.c:343
-#: src/applications/bootstrap_http/http.c:353
-#, 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:2080
+#: src/transports/http.c:2290
 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:2089
+#: src/transports/http.c:2299
 msgid "# bytes received via HTTP"
 msgstr "# byte mottagna via HTTP"
 
-#: src/transports/http.c:2090
+#: src/transports/http.c:2300
 msgid "# bytes sent via HTTP"
 msgstr "# byte skickade via HTTP"
 
-#: src/transports/http.c:2092
+#: src/transports/http.c:2302
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte kastade via HTTP (utgående)"
 
-#: 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 ""
-"Du måste ange ett namn på röret för SMTP-transporten i sektion \"%s\" under "
-"\"%s\".\n"
-
-#: src/transports/smtp.c:358
+#: src/transports/smtp.c:362
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: 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:454
+#, fuzzy
+msgid "SMTP filter string to invalid, lacks ': '\n"
+msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
 # capped är inte ett bra ord IMHO
-#: src/transports/smtp.c:471
+#: src/transports/smtp.c:464
 #, 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:571
+#: src/transports/smtp.c:552 src/transports/smtp.c:563
+#: src/transports/smtp.c:577 src/transports/smtp.c:597
+#: src/transports/smtp.c:622 src/transports/smtp.c:631
+#: src/transports/smtp.c:645 src/transports/smtp.c:657
 #, fuzzy, c-format
-msgid "Failed to initialize libesmtp: %s.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+msgid "SMTP: `%s' failed: %s.\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: 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:802
+msgid "No email-address specified, can not start SMTP transport.\n"
+msgstr ""
 
-#: src/transports/smtp.c:702
-#, c-format
-msgid "%.*s filter %s (SMTP)"
-msgstr "%.*s filter %s (SMTP)"
+#: src/transports/smtp.c:815
+#, fuzzy
+msgid "# bytes received via SMTP"
+msgstr "# byte mottogs via TCP"
 
-#: src/transports/smtp.c:730
-#, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+#: src/transports/smtp.c:816
+#, fuzzy
+msgid "# bytes sent via SMTP"
+msgstr "# byte skickades via TCP"
+
+#: src/transports/smtp.c:818
+#, fuzzy
+msgid "# bytes dropped by SMTP (outgoing)"
+msgstr "# byte kastade via TCP (utgående)"
+
+#: src/transports/tcp_helper.c:260
+msgid "Received malformed message instead of welcome message. Closing.\n"
 msgstr ""
 
-#: src/transports/tcp.c:290
+#: src/transports/tcp_helper.c:279
 #, 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/tcp.c:296
+#, 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:389
+#: src/transports/tcp.c:401
 #, 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:442 src/transports/tcp6.c:404
-#, c-format
-msgid "Failed to start transport service on port %d.\n"
-msgstr ""
-
-#: src/transports/tcp.c:561
+#: src/transports/tcp.c:584
 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:570
+#: src/transports/tcp.c:593
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transports/tcp.c:571
+#: src/transports/tcp.c:594
 msgid "# bytes sent via TCP"
 msgstr "# byte skickades via TCP"
 
-#: src/transports/tcp.c:573
+#: src/transports/tcp.c:596
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transports/udp.c:288
+#: src/transports/udp.c:301
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/udp.c:384
+#: src/transports/udp.c:400
 #, 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:535
+#: src/transports/udp.c:560
 msgid "# bytes received via UDP"
 msgstr "# byte mottagna via UDP"
 
-#: src/transports/udp.c:536
+#: src/transports/udp.c:561
 msgid "# bytes sent via UDP"
 msgstr "# byte skickade via UDP"
 
-#: src/transports/udp.c:538
+#: src/transports/udp.c:563
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/transports/udp.c:540
+#: src/transports/udp.c:565
 #, fuzzy
 msgid "# UDP connections (right now)"
 msgstr "Nätverksanslutning"
 
-#: 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/udp_helper.c:96
+#, fuzzy
+msgid "Received malformed message from udp-peer connection. Closing.\n"
+msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/transports/tcp6.c:312
-#, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "\"%s\": okänd tjänst: %s\n"
+#: src/setup/ncurses/mconf.c:86
+msgid "Exit"
+msgstr ""
 
-#: src/transports/tcp6.c:512
-#, fuzzy
-msgid "# bytes received via TCP6"
-msgstr "# byte mottogs via TCP"
+#: src/setup/ncurses/mconf.c:89
+msgid "Up"
+msgstr "Upp"
 
-#: src/transports/tcp6.c:513
-#, fuzzy
-msgid "# bytes sent via TCP6"
-msgstr "# byte skickades via TCP"
+#: src/setup/ncurses/mconf.c:92 src/setup/gtk/gnunet-setup.glade:136
+#: src/setup/gtk/gnunet-setup.glade:404 src/setup/gtk/gnunet-setup.glade:814
+#: src/setup/gtk/gnunet-setup.glade:1147 src/setup/gtk/gnunet-setup.glade:1431
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: src/transports/tcp6.c:515
+#: src/setup/ncurses/mconf.c:183 src/setup/ncurses/mconf.c:288
+#: src/setup/ncurses/mconf.c:371 src/setup/ncurses/mconf.c:471
+#: src/setup/ncurses/wizard_curs.c:111 src/setup/ncurses/wizard_curs.c:176
+#: src/setup/ncurses/wizard_curs.c:292
+msgid "Internal error! (Choice invalid?)"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:219 src/setup/ncurses/mconf.c:418
+msgid "Internal error! (Value invalid?)"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:404
+msgid "Invalid input, expecting floating point value."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:450
+msgid "Invalid input, expecting integer."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:458
+msgid "Value is not in legal range."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:527
 #, fuzzy
-msgid "# bytes dropped by TCP6 (outgoing)"
-msgstr "# byte kastade via TCP (utgående)"
+msgid "GNUnet Configuration"
+msgstr "GNUnet-konfiguration"
 
-#: src/transports/tcp_helper.c:257
-msgid "Received malformed message instead of welcome message. Closing.\n"
+#: src/setup/ncurses/mconf.c:527 src/setup/text/conf.c:569
+#, 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/transports/tcp_helper.c:276
+#: src/setup/ncurses/mconf.c:533
 #, fuzzy
-msgid "Received malformed message from tcp-peer connection. Closing.\n"
-msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
+msgid "Do you wish to save your new configuration?"
+msgstr "Vill du spara dina inställningar?"
 
-#: src/transports/upnp/upnp.c:429
+#: src/setup/ncurses/mconf.c:547
 #, 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"
+msgid ""
+"\n"
+"End of configuration.\n"
+msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transports/upnp/upnp.c:475
+#: src/setup/ncurses/mconf.c:552
 #, c-format
-msgid "upnp: NAT Returned IP: %s\n"
+msgid ""
+"\n"
+"Your configuration changes were NOT saved.\n"
 msgstr ""
 
-#: src/transports/udp_helper.c:96
+#: src/setup/ncurses/wizard_curs.c:65 src/setup/lib/wizard_util.c:140
+#: src/setup/lib/wizard_util.c:195
+msgid "Error"
+msgstr "Fel"
+
+#: src/setup/ncurses/wizard_curs.c:73 src/setup/gtk/gconf.c:444
+msgid "Help"
+msgstr "Hjälp"
+
+#: src/setup/ncurses/wizard_curs.c:80
 #, fuzzy
-msgid "Received malformed message from udp-peer connection. Closing.\n"
-msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
+msgid "Error!"
+msgstr "Fel"
 
-#: src/applications/dht/tools/dht-query.c:55
-msgid "Query (get KEY, put KEY VALUE) DHT table."
-msgstr ""
+#: src/setup/ncurses/wizard_curs.c:94 src/applications/vpn/vpn.c:1454
+msgid "No"
+msgstr "Nej"
 
-#: src/applications/dht/tools/dht-query.c:60
+#: src/setup/ncurses/wizard_curs.c:95 src/applications/vpn/vpn.c:1454
+msgid "Yes"
+msgstr "Ja"
+
+#: src/setup/ncurses/wizard_curs.c:143
 #, fuzzy
+msgid "Abort"
+msgstr "_Om"
+
+#: src/setup/ncurses/wizard_curs.c:144
+#, fuzzy
+msgid "Ok"
+msgstr "k"
+
+#: src/setup/ncurses/wizard_curs.c:211 src/setup/ncurses/wizard_curs.c:277
+#: src/setup/ncurses/wizard_curs.c:418
+msgid "GNUnet configuration"
+msgstr "GNUnet-konfiguration"
+
+#: src/setup/ncurses/wizard_curs.c:213
 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"
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org/\n";
+"and join our community at\n"
+"\thttp://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"the GNUnet team"
+msgstr ""
+"Välkommen till GNUnet!\n"
+"\n"
+"Denna assistant kommer att fråga dig några enkla frågor för att konfigurera "
+"GNUnet.\n"
+"\n"
+"Vänligen besök på webbplats på\n"
+"\thttp://gnunet.org/\n";
+"och gå med i vår gemenskap på\n"
+"\thttp://gnunet.org/drupal/\n";
+"\n"
+"Ha det så kul,\n"
+"\n"
+"the GNUnet team"
 
-#: src/applications/dht/tools/dht-query.c:99
-#, c-format
-msgid "%s(%s) operation returned no results.\n"
+#: src/setup/ncurses/wizard_curs.c:279
+msgid ""
+"Choose the network interface that connects your computer to the internet "
+"from the list below."
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:116
-#, fuzzy, c-format
-msgid "Issuing '%s(%s,%s)' command.\n"
-msgstr "\"%s(%s,%s)\" misslyckades.\n"
+#: src/setup/ncurses/wizard_curs.c:297 src/setup/ncurses/wizard_curs.c:311
+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/applications/dht/tools/dht-query.c:123
-#, c-format
-msgid "'%s(%s,%s)' succeeded\n"
-msgstr "\"%s(%s,%s)\" lyckades\n"
+#: src/setup/ncurses/wizard_curs.c:308
+#, fuzzy
+msgid "Network configuration: interface"
+msgstr "Nätverksgränssnitt:"
 
-#: src/applications/dht/tools/dht-query.c:127
-#, c-format
-msgid "'%s(%s,%s)' failed.\n"
-msgstr "\"%s(%s,%s)\" misslyckades.\n"
+#: src/setup/ncurses/wizard_curs.c:310
+msgid ""
+"What is the name of the network interface that connects your computer to the "
+"Internet?"
+msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:151
-#, c-format
-msgid "Failed to connect to gnunetd.\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/setup/ncurses/wizard_curs.c:321
+#, fuzzy
+msgid "Network configuration: IP"
+msgstr "GNUnet-konfiguration"
 
-#: src/applications/dht/tools/dht-query.c:164
-#, c-format
-msgid "Command `%s' requires an argument (`%s').\n"
-msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
+#: src/setup/ncurses/wizard_curs.c:323
+msgid "What is this computer's public IP address or hostname?"
+msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:181
-#, c-format
-msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
-msgstr "Kommando \"%s\" kräver två argument (\"%s\" och \"%s\").\n"
+#: src/setup/ncurses/wizard_curs.c:324
+msgid ""
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If left empty, GNUnet will try to automatically detect the IP.\n"
+"You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
+"If in doubt, leave this empty."
+msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:192
-#, c-format
-msgid "Unsupported command `%s'.  Aborting.\n"
-msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+#: src/setup/ncurses/wizard_curs.c:339
+#, fuzzy
+msgid "Bandwidth configuration: upload"
+msgstr "Bandbreddsbegränsning"
 
-#: src/applications/dht/module/table.c:716
+#: src/setup/ncurses/wizard_curs.c:341
 #, fuzzy
-msgid "# dht connections"
-msgstr "Nätverksanslutning"
+msgid "How much upstream bandwidth (in bytes/s) may be used?"
+msgstr "Hur mycket CPU (i %) får användas?"
 
-#: src/applications/dht/module/table.c:718
+#: src/setup/ncurses/wizard_curs.c:342
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
+"you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:354
 #, fuzzy
-msgid "# dht discovery messages received"
-msgstr "# krypterade PING-meddelanden mottagna"
+msgid "Bandwidth configuration: download"
+msgstr "Bandbreddsbegränsning"
 
-#: src/applications/dht/module/table.c:720
-msgid "# dht route host lookups performed"
+#: src/setup/ncurses/wizard_curs.c:356
+#, 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:357
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
+"If you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
 msgstr ""
 
-#: src/applications/dht/module/table.c:722
+#: src/setup/ncurses/wizard_curs.c:369
 #, fuzzy
-msgid "# dht discovery messages sent"
-msgstr "# krypterade PING-meddelanden skickade"
+msgid "Quota configuration"
+msgstr "GNUnet-konfiguration"
 
-#: 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/setup/ncurses/wizard_curs.c:370
+msgid "What is the maximum size of the datastore in MB?"
+msgstr ""
 
-#: 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/setup/ncurses/wizard_curs.c:371
+msgid ""
+"The GNUnet datastore contains all content that GNUnet needs to store "
+"(indexed, inserted and migrated content)."
+msgstr ""
 
-#: src/applications/dht/module/cs.c:251
-msgid "Enables efficient non-anonymous routing"
+#: src/setup/ncurses/wizard_curs.c:383
+#, fuzzy
+msgid "Daemon configuration: user account"
+msgstr "Kunde inte skapa användarkonto:"
+
+#: src/setup/ncurses/wizard_curs.c:384
+msgid "As which user should gnunetd be run?"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:736
-msgid "# dht replies routed"
+#: src/setup/ncurses/wizard_curs.c:386
+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"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the field empty to run GNUnet with system privileges.\n"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:738
-msgid "# dht requests routed"
+#: src/setup/ncurses/wizard_curs.c:403
+msgid "Daemon configuration: group account"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:740
-msgid "# dht get requests received"
+#: src/setup/ncurses/wizard_curs.c:404
+msgid "As which group should gnunetd be run?"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:742
-msgid "# dht put requests received"
+#: src/setup/ncurses/wizard_curs.c:406
+msgid ""
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
+"\n"
+"You can also specify a already existant group here.\n"
+"\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:744
+#: src/setup/ncurses/wizard_curs.c:420
+msgid "Do you want to automatically launch GNUnet as a system service?"
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:422
+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:445 src/setup/gtk/wizard_gtk.c:415
+#, c-format
+msgid "Unable to save configuration file `%s':"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/setup/ncurses/wizard_curs.c:464
 #, fuzzy
-msgid "# dht results received"
-msgstr "# byte mottogs via TCP"
+msgid "Unable to create user account for daemon."
+msgstr "Kunde inte skapa användarkonto:"
 
-#: 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/setup/ncurses/wizard_curs.c:471
+msgid "Unable to setup autostart for daemon."
+msgstr ""
 
-#: src/applications/chat/chat.c:88
-msgid "Message received from peer is invalid.\n"
-msgstr "Meddelande mottaget från motpart är ogiltig.\n"
+#: src/setup/ncurses/wizard_curs.c:486
+#, fuzzy
+msgid "Save configuration?"
+msgstr "GNUnet-konfiguration"
 
-#: src/applications/chat/chat.c:135
-msgid "Message received from client is invalid\n"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
+#: src/setup/ncurses/wizard_curs.c:487
+#, fuzzy
+msgid "Save configuration now?"
+msgstr "GNUnet-konfiguration"
 
-#: src/applications/chat/chat.c:155
-msgid "Maximum number of chat clients reached.\n"
-msgstr "Maximalt antal chattklienter uppnått.\n"
+#: src/setup/ncurses/wizard_curs.c:531 src/setup/gtk/gnunet-setup.glade:723
+#: src/setup/gtk/gnunet-setup.glade:1056 src/setup/gtk/gnunet-setup.glade:1340
+msgid "Back"
+msgstr "Tillbaka"
 
-#: src/applications/chat/chat.c:160
-#, c-format
-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/setup/text/conf.c:79
+#, fuzzy
+msgid "yes"
+msgstr "Ja"
 
-#: src/applications/chat/chat.c:202
+#: src/setup/text/conf.c:80
+msgid "no"
+msgstr ""
+
+#: src/setup/text/conf.c:106
 #, c-format
-msgid "`%s' registering handlers %d and %d\n"
-msgstr "\"%s\" registrerar handtagen %d och %d\n"
+msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgstr ""
 
-#: src/applications/chat/chat.c:219
-msgid "enables P2P-chat (incomplete)"
-msgstr "aktiverar P2P-chatt (ej komplett)"
+#: src/setup/text/conf.c:115
+msgid "\tPossible choices:\n"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:45
-msgid "Join a chat on GNUnet."
+#: src/setup/text/conf.c:123
+msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:49
-msgid "set the nickname to use (requred)"
+#: src/setup/text/conf.c:125
+#, c-format
+msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:52
-msgid "set the chat room to join (requred)"
+#: src/setup/text/conf.c:143
+#, c-format
+msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:134
+#: src/setup/text/conf.c:147
+#, c-format
+msgid "\tEnter floating point (type '%s' for default value %f): "
+msgstr ""
+
+#: src/setup/text/conf.c:153
+#, c-format
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
+msgstr ""
+
+#: src/setup/text/conf.c:187
 #, fuzzy, c-format
-msgid "You must specify a nickname\n"
-msgstr "Du måste ange en mottagare!\n"
+msgid "Yes\n"
+msgstr "Ja"
 
-#: src/applications/chat/gnunet-chat.c:144
+#: src/setup/text/conf.c:192
 #, fuzzy, c-format
-msgid "Failed to join the room\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
+msgid "No\n"
+msgstr "Nej"
 
-#: src/applications/chat/gnunet-chat.c:160
+#: src/setup/text/conf.c:195 src/setup/text/conf.c:236
+#: src/setup/text/conf.c:266 src/setup/text/conf.c:329
+#: src/setup/text/conf.c:387
 #, fuzzy, c-format
-msgid "Failed to send message.\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Help\n"
+msgstr "Hjälp"
 
-#: src/applications/advertising/advertising.c:193
+#: src/setup/text/conf.c:198 src/setup/text/conf.c:213
+#: src/setup/text/conf.c:276 src/setup/text/conf.c:307
+#: src/setup/text/conf.c:365
 #, fuzzy, c-format
-msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
-msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
+msgid "Abort\n"
+msgstr "_Om"
 
-#: src/applications/advertising/advertising.c:203
-msgid "HELLO message has expiration too far in the future. Dropping.\n"
+#: src/setup/text/conf.c:354 src/setup/text/conf.c:416
+#, c-format
+msgid ""
+"\n"
+"Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/applications/advertising/advertising.c:374
-msgid "Could not send HELLO+PING, ping buffer full.\n"
+#: src/setup/text/conf.c:422
+#, c-format
+msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:396
-msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
+#: src/setup/text/conf.c:484
+msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/applications/advertising/advertising.c:544
+#: src/setup/text/conf.c:493
+msgid "Aborted.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:506
+#, fuzzy
+msgid "Invalid entry.\n"
+msgstr "Ogiltiga argument: "
+
+#: src/setup/text/conf.c:524
 #, 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:553
-msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
+msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:817
-msgid "# Peer advertisements received"
+#: src/setup/text/conf.c:556
+#, c-format
+msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:820
-msgid "# Peer advertisements of type NAT received"
+#: src/setup/text/conf.c:557
+#, c-format
+msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:823
-msgid "# Peer advertisements confirmed via PONG"
+#: src/setup/text/conf.c:575
+#, c-format
+msgid ""
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
 msgstr ""
 
-#: src/applications/advertising/advertising.c:827
-msgid "# Peer advertisements updating earlier HELLOs"
+#: src/setup/text/conf.c:590
+#, 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/applications/advertising/advertising.c:830
+#: src/setup/text/conf.c:599
+#, fuzzy, c-format
+msgid "Configuration file `%s' written.\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/setup/gtk/wizard_gtk.c:141
 #, fuzzy
-msgid "# Peer advertisements discarded due to load"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+msgid "(unknown connection)"
+msgstr "Nätverksanslutning"
 
-#: src/applications/advertising/advertising.c:834
-msgid "# Peer advertisements for unsupported transport"
-msgstr ""
+#: src/setup/gtk/wizard_gtk.c:439
+#, fuzzy
+msgid "Do you want to save the new configuration?"
+msgstr "Vill du spara dina inställningar?"
 
-#: src/applications/advertising/advertising.c:838
-msgid "# Peer advertisements not confirmed due to ping busy"
-msgstr ""
+#: src/setup/gtk/wizard_gtk.c:471
+msgid "Unable to create user account:"
+msgstr "Kunde inte skapa användarkonto:"
 
-#: src/applications/advertising/advertising.c:842
-msgid "# Peer advertisements not confirmed due to lack of self ad"
+#: src/setup/gtk/wizard_gtk.c:479
+msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:846
-msgid "# Peer advertisements not confirmed due to send error"
+#: src/setup/gtk/wizard_gtk.c:494
+msgid ""
+"Running gnunet-update failed.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
+"Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/applications/advertising/advertising.c:848
-msgid "# Self advertisments transmitted"
-msgstr ""
+#: src/setup/gtk/ngconf.c:383 src/setup/gtk/gconf.c:492
+#, fuzzy
+msgid "Configuration saved."
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/applications/advertising/advertising.c:850
-msgid "# Foreign advertisements forwarded"
-msgstr ""
+#: src/setup/gtk/ngconf.c:393 src/setup/gtk/gconf.c:502
+#, fuzzy
+msgid "Failed to save configuration."
+msgstr "Kunde inte spara konfiguration!"
 
-#: src/applications/advertising/advertising.c:852
-#: src/applications/pingpong/pingpong.c:509
-msgid "# plaintext PING messages sent"
-msgstr "# PING-meddelanden i klartext skickade"
+#: src/setup/gtk/ngconf.c:418 src/setup/gtk/gconf.c:528
+#, fuzzy
+msgid "Configuration changed. Save?"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/applications/advertising/advertising.c:857
-#: src/applications/session/connect.c:913
-#, c-format
-msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
-msgstr "\"%s\" registrerar handtag %d (klartext och kryptotext)\n"
+#: src/setup/gtk/ngconf.c:431 src/setup/gtk/gconf.c:541
+#, fuzzy
+msgid "Error saving configuration."
+msgstr "Kunde inte spara konfiguration!"
 
-#: src/applications/advertising/advertising.c:872
-msgid ""
-"ensures that this peer is known by other peers and discovers other peers"
+#: src/setup/gtk/gconf.c:389
+#, fuzzy
+msgid "Description"
+msgstr "Fråga"
+
+#: src/setup/gtk/gconf.c:405
+msgid "Value"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:467
-msgid "maintains GNUnet default mesh topology"
+#: src/setup/gtk/gconf.c:429
+msgid "Default"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:132
-#: src/applications/pingpong/pingpong.c:199
-#: src/applications/pingpong/pingpong.c:264
-#: src/applications/pingpong/pingpong.c:331
+#: src/setup/gtk/gconf.c:458
+#, fuzzy
+msgid "Section"
+msgstr "Fråga"
+
+#: src/setup/gtk/gconf.c:469
+#, fuzzy
+msgid "Option"
+msgstr "_Alternativ"
+
+#: src/setup/lib/tree.c:191
 #, c-format
-msgid "Received malformed `%s' message. Dropping.\n"
+msgid ""
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:143
-msgid "Received ping for another peer. Dropping.\n"
+#: src/setup/lib/gns.c:315
+#, c-format
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
 msgstr ""
 
-#: 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:303
-#: src/applications/pingpong/pingpong.c:365
-msgid ""
-"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
-"constant.\n"
+#: src/setup/lib/wizard_util.c:111
+msgid "Can't open Service Control Manager"
 msgstr ""
 
-#: 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/setup/lib/wizard_util.c:117
+msgid "Can't create service"
+msgstr "Kan inte skapa tjänst"
 
-#: src/applications/pingpong/pingpong.c:499
-msgid "# encrypted PONG messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/setup/lib/wizard_util.c:121
+msgid "Error changing the permissions of the GNUnet directory"
+msgstr "Fel vid ändring av rättigheterna på GNUnet-katalogen"
 
-#: src/applications/pingpong/pingpong.c:501
-msgid "# plaintext PONG messages received"
-msgstr "# klartext PONG-meddelanden mottagna"
+#: src/setup/lib/wizard_util.c:126
+msgid "Cannot write to the regisitry"
+msgstr "Kan inte skriva till registret"
 
-#: src/applications/pingpong/pingpong.c:503
-msgid "# encrypted PING messages received"
-msgstr "# krypterade PING-meddelanden mottagna"
+#: src/setup/lib/wizard_util.c:129
+msgid "Can't access the service"
+msgstr "Kan inte tillgå tjänsten"
 
-#: src/applications/pingpong/pingpong.c:505
-msgid "# PING messages created"
-msgstr "# PING-meddelanden skapade"
+#: src/setup/lib/wizard_util.c:132
+msgid "Can't delete the service"
+msgstr "Kan inte ta bort tjänsten"
 
-#: src/applications/pingpong/pingpong.c:507
-#: src/applications/session/connect.c:908
-msgid "# encrypted PONG messages sent"
-msgstr "# krypterade PONG-meddelanden skickade"
+#: src/setup/lib/wizard_util.c:135
+msgid "Unknown error"
+msgstr "Okänt fel"
 
-#: src/applications/pingpong/pingpong.c:511
-#: src/applications/session/connect.c:906
-msgid "# encrypted PING messages sent"
-msgstr "# krypterade PING-meddelanden skickade"
+#: src/setup/lib/wizard_util.c:171
+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/applications/pingpong/pingpong.c:513
-#, fuzzy
-msgid "# plaintext PONG messages sent"
-msgstr "# PING-meddelanden i klartext skickade"
+#: src/setup/lib/wizard_util.c:175
+msgid "Error creating user"
+msgstr "Fel vid skapandet av användare"
 
-#: src/applications/pingpong/pingpong.c:517
-#, fuzzy
-msgid "# plaintext PONG transmissions failed"
-msgstr "# klartext PONG-meddelanden mottagna"
+#: src/setup/lib/wizard_util.c:179
+msgid "Error accessing local security policy"
+msgstr "Fel vid åtkomst av lokal säkerhetspolicy"
 
-#: 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/setup/lib/wizard_util.c:184
+msgid "Error granting service right to user"
+msgstr ""
 
-#: 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:470
-#: src/applications/sqstore_mysql/mysql.c:480
-#: src/applications/sqstore_mysql/mysql.c:518
-#: src/applications/sqstore_mysql/mysql.c:528
-#: src/applications/sqstore_mysql/mysql.c:560
-#: src/applications/sqstore_mysql/mysql.c:571
-#: src/applications/sqstore_mysql/mysql.c:669
-#: src/applications/sqstore_mysql/mysql.c:681
-#: src/applications/sqstore_mysql/mysql.c:693
-#: src/applications/sqstore_mysql/mysql.c:707
-#: src/applications/sqstore_mysql/mysql.c:804
-#: src/applications/sqstore_mysql/mysql.c:818
-#: src/applications/sqstore_mysql/mysql.c:968
-#: src/applications/sqstore_mysql/mysql.c:980
-#: src/applications/sqstore_mysql/mysql.c:992
-#: src/applications/sqstore_mysql/mysql.c:1232
-#: src/applications/sqstore_mysql/mysql.c:1244
-#: src/applications/sqstore_mysql/mysql.c:1256
-#: src/applications/sqstore_mysql/mysql.c:1341
-#: src/applications/kvstore_sqlite/kv_sqlite.c:44
-#: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:99
-#: src/applications/dstore/dstore.c:195 src/applications/dstore/dstore.c:234
-#: src/applications/dstore/dstore.c:253 src/applications/dstore/dstore.c:308
-#: src/applications/dstore/dstore.c:326 src/applications/dstore/dstore.c:337
-#: src/applications/dstore/dstore.c:368 src/applications/dstore/dstore.c:459
-#: 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/setup/lib/wizard_util.c:189
+msgid "Unknown error while creating a new user"
+msgstr "Okänt fel vid skapandet av ny användare"
 
-#: 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:393
+#: src/setup/gnunet-setup.c:64
 #, c-format
-msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
+msgid "Can only set one option per invocation.\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:394
-#: src/applications/sqstore_sqlite/sqlite.c:431
-msgid "sqlite datastore"
+#: src/setup/gnunet-setup.c:72
+#, c-format
+msgid ""
+"Invalid synatx, argument to 'set' must have the format SECTION:"
+"OPTION=VALUE.\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:430
+#: src/setup/gnunet-setup.c:86
 #, c-format
-msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
+msgid "Can only display one option per invocation.\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1276
-#: src/applications/sqstore_mysql/mysql.c:1449
-msgid "# bytes in datastore"
+#: src/setup/gnunet-setup.c:93
+#, c-format
+msgid ""
+"Invalid synatx, argument to 'get' must have the format SECTION:OPTION.\n"
 msgstr ""
 
-#: 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"
+#: src/setup/gnunet-setup.c:107
+msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: 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/setup/gnunet-setup.c:110 src/server/gnunet-update.c:265
+msgid "print a value from the configuration file to stdout"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/applications/session/connect.c:492
+#: src/setup/gnunet-setup.c:112
+msgid "Tool to setup GNUnet."
+msgstr "Verktyg för att ställa in GNUnet."
+
+#: src/setup/gnunet-setup.c:114
 #, fuzzy
-msgid "Could not create any HELLO for myself!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+msgid "update a value in the configuration file"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/applications/session/connect.c:592
+#: src/setup/gnunet-setup.c:257
 #, fuzzy, c-format
-msgid "Session key received from peer `%s' has invalid format (discarded).\n"
-msgstr "Meddelande mottaget från motpart är ogiltig.\n"
+msgid "Too many arguments.\n"
+msgstr "Ogiltiga kommandoradsargument.\n"
 
-#: src/applications/session/connect.c:624
-#, c-format
-msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
+#: src/setup/gnunet-setup.c:263
+msgid "No interface specified, using default\n"
 msgstr ""
 
-#: src/applications/session/connect.c:656
+#: src/setup/gnunet-setup.c:340
+#, fuzzy, c-format
+msgid "Undefined option.\n"
+msgstr "Visa alla alternativ"
+
+#: src/setup/gnunet-setup.c:391
 #, c-format
-msgid "Invalid `%s' message received from peer `%s'.\n"
-msgstr ""
+msgid "`%s' is not available."
+msgstr "\"%s\" är inte tillgänglig."
 
-#: src/applications/session/connect.c:666
+#: src/setup/gnunet-setup.c:409
 #, c-format
-msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
-msgstr ""
+msgid "Unknown operation `%s'\n"
+msgstr "Okänd operation \"%s\"\n"
 
-#: src/applications/session/connect.c:729
+#: src/setup/gnunet-setup.c:410 src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:517 src/util/getopt/getopt.c:1072
 #, c-format
-msgid ""
-"Error parsing encrypted session key from `%s', given message part size is "
-"invalid.\n"
+msgid "Use --help to get a list of options.\n"
+msgstr "Använd --help för att få en lista på flaggor.\n"
+
+#: src/setup/gnunet-win-tool.c:52
+msgid "list all network adapters"
 msgstr ""
 
-#: src/applications/session/connect.c:741
-#, c-format
-msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
+#: src/setup/gnunet-win-tool.c:55
+msgid "install GNUnet as Windows service"
 msgstr ""
 
-#: src/applications/session/connect.c:898
-msgid "# session keys sent"
-msgstr "# sessionsnycklar skickade"
+#: src/setup/gnunet-win-tool.c:58
+msgid "uninstall GNUnet service"
+msgstr ""
 
-#: src/applications/session/connect.c:900
-msgid "# session keys rejected"
-msgstr "# sessionnycklar vägrade"
+#: src/setup/gnunet-win-tool.c:61
+msgid "increase the maximum number of TCP/IP connections"
+msgstr ""
 
-#: src/applications/session/connect.c:902
-msgid "# session keys accepted"
-msgstr "# sessionsnycklar accepterade"
-
-#: src/applications/session/connect.c:904
-msgid "# sessions established"
-msgstr "# sessioner etablerade"
-
-#: 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"
+#: src/setup/gnunet-win-tool.c:64
+msgid "display a file's hash value"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:218 src/applications/rpc/rpc.c:265
+#: src/setup/gnunet-win-tool.c:123
 #, c-format
-msgid ""
-"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
-"under that name: %p\n"
+msgid "GNUnet service installed successfully.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:237
+#: src/setup/gnunet-win-tool.c:126 src/setup/gnunet-win-tool.c:154
 #, 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"
+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/applications/rpc/rpc.c:285
+#: src/setup/gnunet-win-tool.c:130 src/setup/gnunet-win-tool.c:158
 #, c-format
-msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
+msgid "Error: can't open Service Control Manager: %s\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:909 src/applications/rpc/rpc.c:1043
-#: src/applications/rpc/rpc.c:1129
+#: src/setup/gnunet-win-tool.c:135
 #, c-format
-msgid "Invalid message of type %u received.  Dropping.\n"
-msgstr ""
+msgid "Error: can't create service: %s\n"
+msgstr "Fel: kan inte skapa tjänst: %s\n"
 
-#: src/applications/rpc/rpc.c:975
+#: src/setup/gnunet-win-tool.c:138 src/setup/gnunet-win-tool.c:170
 #, c-format
-msgid "Dropping RPC request %u: message malformed.\n"
-msgstr ""
+msgid "Unknown error.\n"
+msgstr "Okänt fel.\n"
 
-#: src/applications/rpc/rpc.c:1307
+#: src/setup/gnunet-win-tool.c:151
 #, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
-msgstr "\"%s\" anropad med timeout över 1 timma (fel?)\n"
+msgid "Service deleted.\n"
+msgstr "Tjänst borttagen.\n"
 
-#: src/applications/rpc/rpc.c:1421
+#: src/setup/gnunet-win-tool.c:163
 #, c-format
-msgid "RPC not unregistered: %s:%p\n"
+msgid "Error: can't access service: %s\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1450
+#: src/setup/gnunet-win-tool.c:167
 #, c-format
-msgid "`%s' registering handlers %d %d %d\n"
-msgstr "\"%s\" registrerar handtag %d %d %d\n"
+msgid "Error: can't delete service: %s\n"
+msgstr "Fel: kan inte ta bort tjänst: %s\n"
 
-#: 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/dht/tools/dhttest.c:43
+#: src/applications/dht/tools/dhttest2.c:43
+#: src/applications/dht/module/table.c:734
+#, fuzzy
+msgid "# dht connections"
+msgstr "Nätverksanslutning"
 
-#: src/applications/rpc/rpc.c:1524
-msgid "RPC async reply invalid.\n"
+#: src/applications/dht/tools/dht-query.c:52
+msgid "Query (get KEY, put KEY VALUE) DHT table."
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1592
-msgid "async RPC reply not received.\n"
+#: src/applications/dht/tools/dht-query.c:57
+#, 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:96
+#, c-format
+msgid "%s(%s) operation returned no results.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:421
+#: src/applications/dht/tools/dht-query.c:113
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+msgid "Issuing '%s(%s,%s)' command.\n"
+msgstr "\"%s(%s,%s)\" misslyckades.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1359
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+#: src/applications/dht/tools/dht-query.c:120
+#, c-format
+msgid "'%s(%s,%s)' succeeded\n"
+msgstr "\"%s(%s,%s)\" lyckades\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1471
-#: src/applications/sqstore_mysql/mysql.c:1618
+#: src/applications/dht/tools/dht-query.c:124
 #, 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"
+msgid "'%s(%s,%s)' failed.\n"
+msgstr "\"%s(%s,%s)\" misslyckades.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1496
-#: src/applications/sqstore_mysql/mysql.c:1641
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
-msgstr ""
+#: src/applications/dht/tools/dht-query.c:148
+#, c-format
+msgid "Failed to connect to gnunetd.\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/applications/datastore/datastore.c:146
+#: src/applications/dht/tools/dht-query.c:161
 #, c-format
-msgid "Availability test failed for `%s' at %s:%d.\n"
-msgstr "Tillgänglighetstest misslyckades för \"%s\" vid %s:%d.\n"
+msgid "Command `%s' requires an argument (`%s').\n"
+msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/applications/datastore/datastore.c:368
-msgid "# requests filtered by bloom filter"
+#: src/applications/dht/tools/dht-query.c:178
+#, 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:189
+#, c-format
+msgid "Unsupported command `%s'.  Aborting.\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/applications/dht/module/cs.c:135
+#, c-format
+msgid "`%s' failed. Terminating connection to client.\n"
+msgstr "\"%s\" misslyckades. Terminerar anslutning till klient.\n"
+
+#: src/applications/dht/module/cs.c:242
+#, fuzzy, c-format
+msgid "`%s' registering client handlers: %d %d\n"
+msgstr "\"%s\" registrerar klienthandtag %d\n"
+
+#: src/applications/dht/module/cs.c:261
+msgid "Enables efficient non-anonymous routing"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:370
-msgid "# bloom filter false positives"
+#: src/applications/dht/module/routing.c:747
+msgid "# dht replies routed"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:373
-msgid "# bytes allowed in datastore"
+#: src/applications/dht/module/routing.c:749
+msgid "# dht requests routed"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:388
-msgid "Failed to load state service. Trying to do without.\n"
+#: src/applications/dht/module/routing.c:751
+msgid "# dht get requests received"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:513
+#: src/applications/dht/module/routing.c:753
+msgid "# dht put requests received"
+msgstr ""
+
+#: src/applications/dht/module/routing.c:755
 #, fuzzy
-msgid "Failed to load sqstore service.  Check your configuration!\n"
-msgstr "Kunde inte spara konfiguration!"
+msgid "# dht results received"
+msgstr "# byte mottogs via TCP"
 
-#: src/applications/identity/hostkey.c:116
+#: src/applications/dht/module/routing.c:759
 #, fuzzy, c-format
-msgid "Failed to access GNUnet home directory `%s'\n"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+msgid "`%s' registering p2p handlers: %d %d %d\n"
+msgstr "\"%s\" registrerar handtag %d %d %d\n"
 
-#: src/applications/identity/hostkey.c:143
+#: src/applications/dht/module/table.c:736
+#, fuzzy
+msgid "# dht discovery messages received"
+msgstr "# krypterade PING-meddelanden mottagna"
+
+#: src/applications/dht/module/table.c:738
+msgid "# dht route host lookups performed"
+msgstr ""
+
+#: src/applications/dht/module/table.c:740
+#, fuzzy
+msgid "# dht discovery messages sent"
+msgstr "# krypterade PING-meddelanden skickade"
+
+#: src/applications/topology_default/topology.c:545
 #, c-format
+msgid "Failed to read friends list from `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/applications/topology_default/topology.c:562
+msgid "Syntax error in topology specification, skipping bytes.\n"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:576
+#, c-format
+msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:588
 msgid ""
-"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
 msgstr ""
-"Existerande värdnyckel i filen \"%s\" felade vid formatkontroll, skapar en "
-"ny värdnyckel.\n"
 
-#: 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/topology_default/topology.c:596
+msgid ""
+"More friendly connections required than target total number of connections.\n"
+msgstr ""
 
-#: src/applications/identity/hostkey.c:162
-msgid "Done creating hostkey.\n"
-msgstr "Klar med skapandet av värdnyckel.\n"
+#: src/applications/topology_default/topology.c:703
+msgid "maintains GNUnet default mesh topology"
+msgstr ""
 
-#: src/applications/identity/identity.c:345
+#: src/applications/rpc/rpc.c:136 src/applications/rpc/rpc.c:181
 #, c-format
 msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:358
+#: src/applications/rpc/rpc.c:228 src/applications/rpc/rpc.c:281
 #, c-format
 msgid ""
-"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:393
+#: src/applications/rpc/rpc.c:250
 #, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
+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/identity/identity.c:708
-#: src/applications/identity/identity.c:729
+#: src/applications/rpc/rpc.c:303
 #, c-format
-msgid "Removed file `%s' containing invalid HELLO data.\n"
+msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:776
+#: src/applications/rpc/rpc.c:945 src/applications/rpc/rpc.c:1084
+#: src/applications/rpc/rpc.c:1174
 #, c-format
-msgid "Signature failed verification: peer `%s' not known.\n"
+msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:785
-msgid "Signature failed verification: signature invalid.\n"
+#: src/applications/rpc/rpc.c:1015
+#, c-format
+msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:894
-#: src/applications/identity/identity.c:1014
+#: src/applications/rpc/rpc.c:1363
 #, c-format
-msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
-msgstr ""
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgstr "\"%s\" anropad med timeout över 1 timma (fel?)\n"
 
-#: src/applications/identity/identity.c:1017
+#: src/applications/rpc/rpc.c:1482
 #, c-format
-msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
+msgid "RPC not unregistered: %s:%p\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:190
+#: src/applications/rpc/rpc.c:1511
 #, c-format
-msgid ""
-"Converting peer address to string failed, transport type %d not supported\n"
-msgstr ""
+msgid "`%s' registering handlers %d %d %d\n"
+msgstr "\"%s\" registrerar handtag %d %d %d\n"
 
-#: src/applications/transport/transport.c:244
+#: src/applications/rpc/rpc.c:1529
 #, c-format
-msgid "Transport connection attempt failed, transport type %d not supported\n"
+msgid "Failed to initialize `%s' service.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/applications/rpc/rpc.c:1592
+msgid "RPC async reply invalid.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:297
-#, c-format
-msgid ""
-"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
+#: src/applications/rpc/rpc.c:1663
+msgid "async RPC reply not received.\n"
 msgstr ""
 
-#: 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:494
+#: src/applications/datastore/datastore.c:170
+#: src/applications/datastore/datastore.c:184
 #, c-format
-msgid "No transport of type %d known.\n"
-msgstr "Ingen transport av typ %d är känd.\n"
+msgid "Availability test failed for `%s' at %s:%d.\n"
+msgstr "Tillgänglighetstest misslyckades för \"%s\" vid %s:%d.\n"
 
-#: src/applications/transport/transport.c:553
-msgid "No transport succeeded in creating a hello!\n"
+#: src/applications/datastore/datastore.c:423
+msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/transport/transport.c:752
-#, fuzzy, c-format
-msgid "Loading transports `%s'\n"
-msgstr "Testar transport(er) %s\n"
+#: src/applications/datastore/datastore.c:425
+msgid "# bloom filter false positives"
+msgstr ""
 
-#: 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/datastore/datastore.c:428
+msgid "# bytes allowed in datastore"
+msgstr ""
 
-#: src/applications/transport/transport.c:781
-#, c-format
-msgid "Transport library `%s' did not provide required function '%s%s'.\n"
+#: src/applications/datastore/datastore.c:445
+msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:808
-#, fuzzy, c-format
-msgid "Loaded transport `%s'\n"
-msgstr "Tillgängliga transport(er): %s\n"
+#: src/applications/datastore/datastore.c:586
+#, fuzzy
+msgid "Failed to load sqstore service.  Check your configuration!\n"
+msgstr "Kunde inte spara konfiguration!"
 
-#: 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:575
+#: src/applications/fragmentation/fragmentation.c:578
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:577
+#: src/applications/fragmentation/fragmentation.c:580
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:578
+#: src/applications/fragmentation/fragmentation.c:581
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:588
+#: src/applications/fragmentation/fragmentation.c:592
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr "\"%s\" registrerar handtag %d\n"
 
-#: src/applications/stats/gnunet-stats.c:62
-#, c-format
-msgid "Supported peer-to-peer messages:\n"
-msgstr ""
-
-#: src/applications/stats/gnunet-stats.c:65
-#, c-format
-msgid "Supported client-server messages:\n"
-msgstr ""
-
-#: src/applications/stats/gnunet-stats.c:84
-#: src/applications/vpn/gnunet-vpn.c:53
+#: src/applications/vpn/gnunet-vpn.c:51
+#: src/applications/stats/gnunet-stats.c:83
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
-#: src/applications/stats/gnunet-stats.c:88
-msgid "prints supported protocol messages"
-msgstr "skriver ut stödda protokollmeddelanden"
+#: src/applications/vpn/gnunet-vpn.c:55
+msgid "Suppress display of asynchronous log messages"
+msgstr ""
 
-#: 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:149
+#: src/applications/stats/gnunet-stats.c:121
+#: src/applications/tbench/gnunet-tbench.c:126
+#: src/applications/tracekit/gnunet-tracekit.c:325
+#: src/applications/template/gnunet-template.c:95
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:134
+#: src/applications/vpn/vpn.c:368
 #, c-format
-msgid "Error reading information from gnunetd.\n"
+msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/stats/clientapi.c:330
-msgid "Uptime (seconds)"
-msgstr "Upptid (sekunder)"
+#: src/applications/vpn/vpn.c:379
+#, c-format
+msgid "Duplicate route to node from peer %d, choosing minimum hops"
+msgstr ""
 
-#: src/applications/stats/statistics.c:223
+#: src/applications/vpn/vpn.c:412
 #, c-format
-msgid "% of allowed network load (up)"
+msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:225
+#: src/applications/vpn/vpn.c:468
 #, c-format
-msgid "% of allowed network load (down)"
+msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:226
+#: src/applications/vpn/vpn.c:475
 #, c-format
-msgid "% of allowed cpu load"
+msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:227
+#: src/applications/vpn/vpn.c:491
 #, c-format
-msgid "% of allowed io load"
+msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:228
-msgid "# of connected peers"
-msgstr "# av anslutna parter"
+#: src/applications/vpn/vpn.c:563
+#, c-format
+msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:230
-msgid "# bytes of noise received"
+#: src/applications/vpn/vpn.c:569
+#, c-format
+msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: 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:421
-msgid "keeps statistics about gnunetd's operation"
-msgstr "behåller statistik om gnunetds operation"
-
-#: src/applications/stats/sqstats.c:150
-msgid "# Any-Blocks"
+#: src/applications/vpn/vpn.c:606
+#, c-format
+msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:151
-msgid "# DBlocks"
+#: src/applications/vpn/vpn.c:621
+#, c-format
+msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:152
-msgid "# SBlocks"
+#: src/applications/vpn/vpn.c:631
+#, c-format
+msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:153
-msgid "# KBlocks"
+#: src/applications/vpn/vpn.c:673
+#, c-format
+msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:154
-msgid "# NBlocks"
+#: src/applications/vpn/vpn.c:683
+#, c-format
+msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:155
-msgid "# KNBlocks"
+#: src/applications/vpn/vpn.c:693
+#, c-format
+msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:156
-msgid "# OnDemand-Blocks"
+#: src/applications/vpn/vpn.c:701
+#, c-format
+msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:157
-msgid "# Unknown-Blocks"
+#: src/applications/vpn/vpn.c:715
+#, c-format
+msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:158
-msgid "# expired"
+#: src/applications/vpn/vpn.c:730
+#, c-format
+msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:159
-msgid "# expire in 1h"
+#: src/applications/vpn/vpn.c:746
+#, c-format
+msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:160
-msgid "# expire in 24h"
+#: src/applications/vpn/vpn.c:760
+#, c-format
+msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:161
-msgid "# expire in 1 week"
+#: src/applications/vpn/vpn.c:803
+msgid ""
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:162
-msgid "# expire in 1 month"
+#: src/applications/vpn/vpn.c:853
+#, c-format
+msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:163
-msgid "# zero priority"
+#: src/applications/vpn/vpn.c:932
+#, c-format
+msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:164
-msgid "# priority one"
+#: src/applications/vpn/vpn.c:941
+#, c-format
+msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:165
-msgid "# priority larger than one"
+#: src/applications/vpn/vpn.c:961
+msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:166
-msgid "# no anonymity"
+#: src/applications/vpn/vpn.c:1010
+msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:167
-msgid "# anonymity one"
+#: src/applications/vpn/vpn.c:1018
+msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:168
-msgid "# anonymity larger than one"
+#: src/applications/vpn/vpn.c:1027
+msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:64
-#: src/applications/tracekit/gnunet-tracekit.c:55
-msgid "Start GNUnet transport benchmarking tool."
+#: src/applications/vpn/vpn.c:1032
+#, c-format
+msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:66
-msgid "output in gnuplot format"
-msgstr "utdata i gnuplot-format"
-
-#: src/applications/tbench/gnunet-tbench.c:70
-msgid "number of iterations"
-msgstr "antal iterationer"
-
-#: src/applications/tbench/gnunet-tbench.c:74
-msgid "number of messages to use per iteration"
-msgstr "antal meddelanden att använda per iteration"
-
-#: src/applications/tbench/gnunet-tbench.c:77
-msgid "receiver host identifier (ENC file name)"
+#: src/applications/vpn/vpn.c:1043
+#, c-format
+msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:80
-msgid "message size"
-msgstr "meddelandestorlek"
-
-#: src/applications/tbench/gnunet-tbench.c:83
-msgid "sleep for SPACE ms after each a message block"
+#: src/applications/vpn/vpn.c:1071
+msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:86
-msgid "time to wait for the completion of an iteration (in ms)"
+#: src/applications/vpn/vpn.c:1092
+msgid "Receive route request\n"
 msgstr ""
 
-#: 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:143
+#: src/applications/vpn/vpn.c:1099
 #, c-format
-msgid "You must specify a receiver!\n"
-msgstr "Du måste ange en mottagare!\n"
+msgid "Prepare route announcement level %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:152
+#: src/applications/vpn/vpn.c:1117
 #, c-format
-msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
+msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:187
+#: src/applications/vpn/vpn.c:1123
 #, c-format
-msgid "Time:\n"
-msgstr "Tid:\n"
-
-#: src/applications/tbench/gnunet-tbench.c:188
-#, c-format
-msgid "\tmax      %llums\n"
-msgstr "\tmax      %llums\n"
-
-#: src/applications/tbench/gnunet-tbench.c:189
-#, c-format
-msgid "\tmin      %llums\n"
-msgstr "\tmin      %llums\n"
-
-#: src/applications/tbench/gnunet-tbench.c:190
-#, c-format
-msgid "\tmean     %8.4fms\n"
+msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:191
-#, c-format
-msgid "\tvariance %8.4fms\n"
+#: src/applications/vpn/vpn.c:1140
+msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:193
-#, c-format
-msgid "Loss:\n"
+#: src/applications/vpn/vpn.c:1146
+msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:194
+#: src/applications/vpn/vpn.c:1152
 #, c-format
-msgid "\tmax      %u\n"
-msgstr "\tmax      %u\n"
-
-#: src/applications/tbench/gnunet-tbench.c:195
-#, c-format
-msgid "\tmin      %u\n"
-msgstr "\tmin      %u\n"
-
-#: src/applications/tbench/gnunet-tbench.c:196
-#, c-format
-msgid "\tmean     %8.4f\n"
+msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:197
+#: src/applications/vpn/vpn.c:1173
 #, c-format
-msgid "\tvariance %8.4f\n"
+msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:203
+#: src/applications/vpn/vpn.c:1191
 #, 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:209
-#, c-format
-msgid ""
-"\n"
-"Did not receive the message from gnunetd. Is gnunetd running?\n"
+msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:412
-msgid "allows profiling of direct peer-to-peer connections"
+#: src/applications/vpn/vpn.c:1223
+msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:48
-msgid "probe network to the given DEPTH"
+#: src/applications/vpn/vpn.c:1244
+msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:52
-msgid ""
-"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+#: src/applications/vpn/vpn.c:1296
+msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:59
-msgid "use PRIO for the priority of the trace request"
+#: src/applications/vpn/vpn.c:1350
+msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:63
-msgid "wait DELAY seconds for replies"
+#: src/applications/vpn/vpn.c:1383
+msgid "Cannot store client info\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:111
+#: src/applications/vpn/vpn.c:1723
+#, 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:1728
 #, c-format
-msgid ""
-"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
-"vcg.\n"
+msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: 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"
+#: src/applications/vpn/vpn.c:1817
+#, fuzzy
+msgid "enables IPv6 over GNUnet (incomplete)"
+msgstr "aktiverar P2P-chatt (ej komplett)"
 
-#: src/applications/tracekit/gnunet-tracekit.c:197
-#, c-format
-msgid "`%s' connected to `%s'.\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
+#: src/applications/vpn/vpn.c:1851
+msgid "RFC4193 Waiting for tun thread to end\n"
+msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:210
-#, c-format
-msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
+#: src/applications/vpn/vpn.c:1866
+msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:236
+#: src/applications/vpn/vpn.c:1884
 #, c-format
-msgid "Peer `%s' did not report back.\n"
-msgstr "Motpart \"%s\" rapporterade inte tillbaka.\n"
+msgid "RFC4193 Closing tunnel %d fd %d\n"
+msgstr ""
 
-#: 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: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:269
-msgid "TRACEKIT: routing table full, trace request dropped\n"
+#: src/applications/gap/pid_table.c:177
+msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:346
-#, c-format
-msgid "TRACEKIT: received invalid `%s' message\n"
+#: src/applications/gap/pid_table.c:181
+msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: 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:1695
+#: src/applications/gap/gap.c:1723
 #, 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:1696
+#: src/applications/gap/gap.c:1724
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1883
+#: src/applications/gap/gap.c:1916
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1892 src/applications/fs/module/anonymity.c:65
+#: src/applications/gap/gap.c:1927 src/applications/fs/module/anonymity.c:66
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1902 src/applications/gap/gap.c:1910
-#: src/applications/gap/gap.c:1921
+#: src/applications/gap/gap.c:1938 src/applications/gap/gap.c:1947
+#: src/applications/gap/gap.c:1959
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2183
+#: src/applications/gap/gap.c:2231
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2234
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2188
+#: src/applications/gap/gap.c:2236
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2190
+#: src/applications/gap/gap.c:2238
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2194
+#: src/applications/gap/gap.c:2242
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2197
+#: src/applications/gap/gap.c:2245
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2199
+#: src/applications/gap/gap.c:2247
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2202
+#: src/applications/gap/gap.c:2250
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2206
+#: src/applications/gap/gap.c:2254
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2208
+#: src/applications/gap/gap.c:2256
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2211
+#: src/applications/gap/gap.c:2259
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2262
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2216
+#: src/applications/gap/gap.c:2264
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2218
+#: src/applications/gap/gap.c:2266
 msgid "# gap spurious replies (dropped)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2220
+#: src/applications/gap/gap.c:2268
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2223
+#: src/applications/gap/gap.c:2271
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2227
+#: src/applications/gap/gap.c:2275
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2229
+#: src/applications/gap/gap.c:2277
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2231
+#: src/applications/gap/gap.c:2279
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2246
+#: src/applications/gap/gap.c:2295
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2269
+#: src/applications/gap/gap.c:2319
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "\"%s\" registrerar handtag %d %d\n"
 
-#: src/applications/gap/pid_table.c:177
-msgid "# distinct interned peer IDs in pid table"
-msgstr ""
-
-#: src/applications/gap/pid_table.c:181
-msgid "# total RC of interned peer IDs in pid table"
-msgstr ""
-
-#: 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: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-pseudonym.c:70
 #: src/applications/fs/tools/gnunet-insert.c:268
-#: src/applications/fs/tools/gnunet-search.c:135
+#: src/applications/fs/tools/gnunet-search.c:136
 #: src/applications/fs/tools/gnunet-download.c:69
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:74
+#: src/applications/fs/tools/gnunet-pseudonym.c:73
 msgid "automate creation of a namespace by starting a collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:78
+#: src/applications/fs/tools/gnunet-pseudonym.c:77
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "skapa en ny pseudonym under angivet SMEKNAMN"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:81
+#: src/applications/fs/tools/gnunet-pseudonym.c:80
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "ta bort pseudonymen med angivet SMEKNAMN"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:84
+#: src/applications/fs/tools/gnunet-pseudonym.c:83
 msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:86
+#: src/applications/fs/tools/gnunet-pseudonym.c:85
 msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
 msgstr ""
 "Skapa nya pseudonymer, ta bort pseudonymer eller lista existerande "
 "pseudonymer."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:90
+#: src/applications/fs/tools/gnunet-pseudonym.c:89
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:93
+#: src/applications/fs/tools/gnunet-pseudonym.c:92
 msgid "specify metadata describing the namespace or collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:97
+#: src/applications/fs/tools/gnunet-pseudonym.c:96
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:100
+#: src/applications/fs/tools/gnunet-pseudonym.c:99
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:104
+#: src/applications/fs/tools/gnunet-pseudonym.c:103
 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:107
+#: src/applications/fs/tools/gnunet-pseudonym.c:106
 msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:140
+#: src/applications/fs/tools/gnunet-pseudonym.c:139
 #, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:142
+#: src/applications/fs/tools/gnunet-pseudonym.c:141
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:171
+#: src/applications/fs/tools/gnunet-pseudonym.c:170
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:204
+#: src/applications/fs/tools/gnunet-pseudonym.c:203
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Samling stoppad.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:206
+#: src/applications/fs/tools/gnunet-pseudonym.c:205
 #, 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:214
+#: src/applications/fs/tools/gnunet-pseudonym.c:213
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:219
+#: src/applications/fs/tools/gnunet-pseudonym.c:218
 #, 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:234
+#: src/applications/fs/tools/gnunet-pseudonym.c:233
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:238
+#: src/applications/fs/tools/gnunet-pseudonym.c:237
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:279
+#: src/applications/fs/tools/gnunet-pseudonym.c:280
 #, 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:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:287
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:301
+#: src/applications/fs/tools/gnunet-pseudonym.c:302
 #, 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:309
+#: src/applications/fs/tools/gnunet-pseudonym.c:310
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -1546,38 +1714,38 @@
 msgid "==> Directory `%s':\n"
 msgstr "==> Katalog \"%s\":\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:87
+#: src/applications/fs/tools/gnunet-directory.c:88
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:114
+#: src/applications/fs/tools/gnunet-directory.c:118
 #, 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:116
+#: src/applications/fs/tools/gnunet-directory.c:120
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:131
+#: src/applications/fs/tools/gnunet-directory.c:135
 msgid "Perform directory related operations."
 msgstr "Genomför katalogrelaterade operationer."
 
-#: src/applications/fs/tools/gnunet-directory.c:134
+#: src/applications/fs/tools/gnunet-directory.c:138
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:138
+#: src/applications/fs/tools/gnunet-directory.c:142
 msgid "list entries from the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:141
+#: src/applications/fs/tools/gnunet-directory.c:145
 msgid "start tracking entries for the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:164
+#: src/applications/fs/tools/gnunet-directory.c:168
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "Listade %d matchande poster.\n"
@@ -1741,42 +1909,42 @@
 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:418
+#: src/applications/fs/tools/gnunet-insert.c:420
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:437
+#: src/applications/fs/tools/gnunet-insert.c:440
 #, 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:464
-#: src/applications/fs/tools/gnunet-insert.c:472
-#: src/applications/fs/tools/gnunet-insert.c:480
+#: src/applications/fs/tools/gnunet-insert.c:451
+#: src/applications/fs/tools/gnunet-insert.c:459
+#: src/applications/fs/tools/gnunet-insert.c:467
+#: src/applications/fs/tools/gnunet-insert.c:475
+#: src/applications/fs/tools/gnunet-insert.c:483
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:138
+#: src/applications/fs/tools/gnunet-search.c:139
 msgid "Search GNUnet for files."
 msgstr "Sök GNUnet efter filer."
 
-#: src/applications/fs/tools/gnunet-search.c:142
+#: src/applications/fs/tools/gnunet-search.c:143
 msgid "exit after receiving LIMIT results"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:145
+#: src/applications/fs/tools/gnunet-search.c:146
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:148
+#: src/applications/fs/tools/gnunet-search.c:149
 msgid "wait DELAY seconds for search results before aborting"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:183
+#: src/applications/fs/tools/gnunet-search.c:186
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
@@ -1826,46 +1994,46 @@
 msgstr ""
 "Hämtning av fil \"%s\" färdig.  Hastigheten var %8.3f kilobyte per sekund.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:178
+#: src/applications/fs/tools/gnunet-download.c:180
 msgid "no name given"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:184
+#: src/applications/fs/tools/gnunet-download.c:186
 #, fuzzy, c-format
 msgid "Starting download `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-download.c:225
+#: src/applications/fs/tools/gnunet-download.c:228
 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:242
+#: src/applications/fs/tools/gnunet-download.c:246
 #, 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:279
+#: src/applications/fs/tools/gnunet-download.c:289
 #, 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:320
+#: src/applications/fs/tools/gnunet-download.c:331
 #, 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:338
+#: src/applications/fs/tools/gnunet-download.c:351
 #, 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:341
+#: src/applications/fs/tools/gnunet-download.c:354
 #, 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:377
+#: src/applications/fs/tools/gnunet-download.c:391
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Fil lagrad som \"%s\".\n"
@@ -1879,7 +2047,7 @@
 "%16llu av %16llu byte avindexerat (uppskattar %llu sekunder till "
 "färdigställd)                "
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:73
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1888,7 +2056,7 @@
 "\n"
 "Avindexering av \"%s\" klar, %llu byte tog %llu sekunder (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:85
+#: src/applications/fs/tools/gnunet-unindex.c:88
 #, c-format
 msgid ""
 "\n"
@@ -1897,35 +2065,48 @@
 "\n"
 "Fel vid avindexering av fil: %s\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:105
+#: src/applications/fs/tools/gnunet-unindex.c:108
 msgid "Unindex files."
 msgstr "Avindexera filer."
 
-#: src/applications/fs/tools/gnunet-unindex.c:142
+#: src/applications/fs/tools/gnunet-unindex.c:145
 #, 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:158
+#: src/applications/fs/tools/gnunet-unindex.c:163
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "\"%s\" misslyckades.  Är \"%s\" en fil?\n"
 
-#: src/applications/fs/module/querymanager.c:228
+#: src/applications/fs/uritrack/file_info.c:134
+msgid "Collecting file identifiers disabled.\n"
+msgstr ""
+
+#: src/applications/fs/uritrack/file_info.c:414
+#, c-format
+msgid "Deleted corrupt URI database in `%s'."
+msgstr ""
+
+#: src/applications/fs/module/dht_push.c:138
+msgid "# blocks pushed into DHT"
+msgstr ""
+
+#: src/applications/fs/module/querymanager.c:234
 msgid "# FS currently tracked queries from clients"
 msgstr ""
 
-#: src/applications/fs/module/querymanager.c:230
+#: src/applications/fs/module/querymanager.c:236
 msgid "# FS replies passed to clients"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:323
+#: src/applications/fs/module/ondemand.c:330
 #, 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:418
+#: src/applications/fs/module/ondemand.c:431
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -1933,24 +2114,24 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:444
+#: src/applications/fs/module/ondemand.c:457
 #, 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:495
+#: src/applications/fs/module/ondemand.c:514
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:647
+#: src/applications/fs/module/ondemand.c:668
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1170
+#: src/applications/fs/module/fs.c:1204
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -1959,81 +2140,88 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/applications/fs/module/fs.c:1185
+#: src/applications/fs/module/fs.c:1219
 msgid "# FS expired replies dropped"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1187
+#: src/applications/fs/module/fs.c:1221
 #, fuzzy
 msgid "# FS valid replies received"
 msgstr "# byte mottogs via TCP"
 
-#: src/applications/fs/module/fs.c:1220
+#: src/applications/fs/module/fs.c:1257
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1266
+#: src/applications/fs/module/fs.c:1314
 msgid "enables (anonymous) file-sharing"
 msgstr "aktiverar (anonym) fildelning"
 
-#: src/applications/fs/module/migration.c:374
+#: src/applications/fs/module/migration.c:381
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:376
+#: src/applications/fs/module/migration.c:383
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:379
+#: src/applications/fs/module/migration.c:386
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/module/dht_push.c:138
-msgid "# blocks pushed into DHT"
+#: src/applications/fs/fsui/deserialize.c:772
+#, c-format
+msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:234
+#: src/applications/fs/fsui/searchtest.c:154
+#: src/applications/fs/fsui/fsuitest.c:173
+#: src/applications/fs/fsui/downloadtest.c:289
+#: src/applications/fs/fsui/serializetest2.c:391
+#: src/applications/fs/fsui/serializetest3.c:163
+#: src/applications/fs/fsui/serializetest4.c:358
+#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
+#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
+msgid "AND"
+msgstr "OCH"
+
+#: src/applications/fs/fsui/search.c:241
 msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:294
+#: src/applications/fs/fsui/download.c:311
 #, fuzzy
 msgid "Download failed (no reason given)"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/applications/fs/fsui/unindex.c:109
+#: src/applications/fs/fsui/unindex.c:114
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:278
+#: src/applications/fs/fsui/upload.c:328
 msgid "Failed to create temporary directory."
 msgstr ""
 
-#: 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: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:214
+#: src/applications/fs/ecrs/search.c:217
 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:131
+#: src/applications/fs/ecrs/download.c:132
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:271
+#: src/applications/fs/ecrs/download.c:272
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Skrivning(%d, %p, %d) misslyckades: %s\n"
 
-#: src/applications/fs/ecrs/download.c:1001
+#: src/applications/fs/ecrs/download.c:1010
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2041,583 +2229,1331 @@
 "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:1184
+#: src/applications/fs/ecrs/download.c:1205
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:155
+#: src/applications/fs/ecrs/helper.c:75
+msgid "No keywords specified!\n"
+msgstr "Inga nyckelord angivna!\n"
+
+#: src/applications/fs/ecrs/upload.c:156
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/applications/fs/ecrs/upload.c:162
+#: src/applications/fs/ecrs/upload.c:164
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Kan inte hämta storlek på fil \"%s\""
 
-#: src/applications/fs/ecrs/upload.c:171
+#: src/applications/fs/ecrs/upload.c:173
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/applications/fs/ecrs/upload.c:183
+#: src/applications/fs/ecrs/upload.c:185
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:202
+#: src/applications/fs/ecrs/upload.c:204
 #, 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:209
+#: src/applications/fs/ecrs/upload.c:212
 #, 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:223
+#: src/applications/fs/ecrs/upload.c:226
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/applications/fs/ecrs/upload.c:296
+#: src/applications/fs/ecrs/upload.c:309
 #, 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:876
+#: src/applications/fs/ecrs/meta.c:883
 #, 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:884
+#: src/applications/fs/ecrs/meta.c:893
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "Kunde inte byta namn på fil \"%s\" till \"%s\": filen existerar\n"
 
-#: src/applications/fs/ecrs/namespace.c:154
+#: src/applications/fs/ecrs/namespace.c:157
 #, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Kan inte skapa pseudonym \"%s\", filen \"%s\" existerar.\n"
 
-#: src/applications/fs/ecrs/namespace.c:325
-#: src/applications/fs/ecrs/namespace.c:404
-#: src/applications/fs/ecrs/namespace.c:545
+#: src/applications/fs/ecrs/namespace.c:339
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:571
 #, 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:337
-#: src/applications/fs/ecrs/namespace.c:415
+#: src/applications/fs/ecrs/namespace.c:352
+#: src/applications/fs/ecrs/namespace.c:432
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:556
-#: src/applications/fs/ecrs/namespace.c:567
+#: src/applications/fs/ecrs/namespace.c:583
+#: src/applications/fs/ecrs/namespace.c:594
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Formatet på filen \"%s\" är ogiltig.\n"
 
-#: src/applications/fs/ecrs/helper.c:74
-msgid "No keywords specified!\n"
-msgstr "Inga nyckelord angivna!\n"
-
-#: 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:120
+#: src/applications/fs/ecrs/parser.c:124
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:126
-msgid "Collecting file identifiers disabled.\n"
-msgstr ""
-
-#: 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:655
+#: src/applications/fs/namespace/namespace_info.c:685
 msgid "Publication interval for periodic publication changed."
 msgstr "Publiseringsintervall för periodisk publisering har ändrats."
 
-#: src/applications/fs/namespace/namespace_info.c:675
+#: src/applications/fs/namespace/namespace_info.c:708
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:373
+#: src/applications/testing/testing.c:247
+#, fuzzy, c-format
+msgid "Waiting for peers to connect"
+msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
+
+#: src/applications/kvstore_sqlite/kv_sqlite.c:44
+#: src/applications/kvstore_sqlite/kv_sqlite.c:51
+#: 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:476
+#: src/applications/sqstore_mysql/mysql.c:487
+#: src/applications/sqstore_mysql/mysql.c:526
+#: src/applications/sqstore_mysql/mysql.c:537
+#: src/applications/sqstore_mysql/mysql.c:571
+#: src/applications/sqstore_mysql/mysql.c:582
+#: src/applications/sqstore_mysql/mysql.c:680
+#: src/applications/sqstore_mysql/mysql.c:693
+#: src/applications/sqstore_mysql/mysql.c:706
+#: src/applications/sqstore_mysql/mysql.c:721
+#: src/applications/sqstore_mysql/mysql.c:821
+#: src/applications/sqstore_mysql/mysql.c:836
+#: src/applications/sqstore_mysql/mysql.c:988
+#: src/applications/sqstore_mysql/mysql.c:1000
+#: src/applications/sqstore_mysql/mysql.c:1012
+#: src/applications/sqstore_mysql/mysql.c:1260
+#: src/applications/sqstore_mysql/mysql.c:1272
+#: src/applications/sqstore_mysql/mysql.c:1284
+#: src/applications/sqstore_mysql/mysql.c:1369
+#: src/applications/kvstore_mysql/kv_mysql.c:44
+#: src/applications/kvstore_mysql/kv_mysql.c:51
+#: src/applications/dstore_mysql/dstore_mysql.c:107
+#: src/applications/dstore_mysql/dstore_mysql.c:114
+#: src/applications/dstore_mysql/dstore_mysql.c:286
+#: src/applications/dstore_mysql/dstore_mysql.c:301
+#: src/applications/dstore_mysql/dstore_mysql.c:315
+#: src/applications/dstore_mysql/dstore_mysql.c:329
+#: src/applications/dstore_mysql/dstore_mysql.c:342
+#: src/applications/dstore_mysql/dstore_mysql.c:412
+#: src/applications/dstore_mysql/dstore_mysql.c:434
+#: src/applications/dstore_mysql/dstore_mysql.c:446
+#: src/applications/dstore_mysql/dstore_mysql.c:521
+#: src/applications/dstore_mysql/dstore_mysql.c:533
+#: src/applications/dstore_mysql/dstore_mysql.c:554
+#: src/applications/dstore_sqlite/dstore.c:91
+#: src/applications/dstore_sqlite/dstore.c:98
+#: src/applications/dstore_sqlite/dstore.c:194
+#: src/applications/dstore_sqlite/dstore.c:236
+#: src/applications/dstore_sqlite/dstore.c:257
+#: src/applications/dstore_sqlite/dstore.c:313
+#: src/applications/dstore_sqlite/dstore.c:331
+#: src/applications/dstore_sqlite/dstore.c:343
+#: src/applications/dstore_sqlite/dstore.c:375
+#: src/applications/dstore_sqlite/dstore.c:467
+#: src/util/crypto/hostkey_gcrypt.c:64 src/util/crypto/hostkey_gcrypt.c:71
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/applications/topology_f2f/topology.c:390
-msgid "Syntax error in topology specification, skipping bytes.\n"
+#: src/applications/advertising/advertising_test.c:47
+#: src/applications/session/sessiontest_http.c:40
+#: src/applications/session/sessiontest.c:40
+#: src/applications/session/sessiontest2.c:40
+#: src/applications/stats/statistics.c:233
+msgid "# of connected peers"
+msgstr "# av anslutna parter"
+
+#: src/applications/advertising/advertising.c:194
+#, 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:205
+msgid "HELLO message has expiration too far in the future. Dropping.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:404
+#: src/applications/advertising/advertising.c:407
+msgid "Could not send HELLO+PING, ping buffer full.\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:429
+msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:601
 #, c-format
-msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+msgid "Advertising my transport %d to selected peers.\n"
+msgstr "Annonserar min transport %d till valda ändpunkter.\n"
+
+#: src/applications/advertising/advertising.c:610
+msgid ""
+"Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:511
-msgid "maintains a friend-to-friend restricted topology"
+#: src/applications/advertising/advertising.c:887
+msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/template/template.c:68
+#: src/applications/advertising/advertising.c:890
+msgid "# Peer advertisements of type NAT received"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:893
+msgid "# Peer advertisements confirmed via PONG"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:897
+msgid "# Peer advertisements updating earlier HELLOs"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:900
+#, fuzzy
+msgid "# Peer advertisements discarded due to load"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/applications/advertising/advertising.c:904
+msgid "# Peer advertisements for unsupported transport"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:908
+msgid "# Peer advertisements not confirmed due to ping busy"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:912
+msgid "# Peer advertisements not confirmed due to lack of self ad"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:916
+msgid "# Peer advertisements not confirmed due to send error"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:918
+msgid "# Self advertisments transmitted"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:920
+msgid "# Foreign advertisements forwarded"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:922
+#: src/applications/pingpong/pingpong.c:527
+msgid "# plaintext PING messages sent"
+msgstr "# PING-meddelanden i klartext skickade"
+
+#: src/applications/advertising/advertising.c:928
+#: src/applications/session/connect.c:953
 #, c-format
-msgid "`%s' registering client handler %d and %d\n"
-msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
+msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
+msgstr "\"%s\" registrerar handtag %d (klartext och kryptotext)\n"
 
-#: src/applications/template/gnunet-template.c:43
-msgid "Template description."
+#: src/applications/advertising/advertising.c:944
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:109
+#: src/applications/chat/chat.c:91
+msgid "Message received from peer is invalid.\n"
+msgstr "Meddelande mottaget från motpart är ogiltig.\n"
+
+#: src/applications/chat/chat.c:140
+msgid "Message received from client is invalid\n"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/applications/chat/chat.c:161
+msgid "Maximum number of chat clients reached.\n"
+msgstr "Maximalt antal chattklienter uppnått.\n"
+
+#: src/applications/chat/chat.c:167
+#, c-format
+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:211
+#, c-format
+msgid "`%s' registering handlers %d and %d\n"
+msgstr "\"%s\" registrerar handtagen %d och %d\n"
+
+#: src/applications/chat/chat.c:230
+msgid "enables P2P-chat (incomplete)"
+msgstr "aktiverar P2P-chatt (ej komplett)"
+
+#: src/applications/chat/gnunet-chat.c:45
+msgid "Join a chat on GNUnet."
+msgstr ""
+
+#: src/applications/chat/gnunet-chat.c:49
+msgid "set the nickname to use (requred)"
+msgstr ""
+
+#: src/applications/chat/gnunet-chat.c:52
+msgid "set the chat room to join (requred)"
+msgstr ""
+
+#: src/applications/chat/gnunet-chat.c:135
 #, fuzzy, c-format
-msgid "Bootstrap data obtained from `%s' is invalid.\n"
-msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
+msgid "You must specify a nickname\n"
+msgstr "Du måste ange en mottagare!\n"
 
-#: src/applications/bootstrap_http/http.c:177
-msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
+#: src/applications/chat/gnunet-chat.c:145
+#, 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:162
+#, fuzzy, c-format
+msgid "Failed to send message.\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:238
+#, fuzzy, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:442
+#, c-format
+msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:217
+#: src/applications/sqstore_sqlite/sqlite.c:443
+#: src/applications/sqstore_sqlite/sqlite.c:482
+msgid "sqlite datastore"
+msgstr ""
+
+#: src/applications/sqstore_sqlite/sqlite.c:481
 #, c-format
-msgid "Bootstrapping using `%s'.\n"
+msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:231
+#: src/applications/sqstore_sqlite/sqlite.c:1336
+#: src/applications/sqstore_mysql/mysql.c:1483
+msgid "# bytes in datastore"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:134
+#: src/applications/pingpong/pingpong.c:205
+#: src/applications/pingpong/pingpong.c:273
+#: src/applications/pingpong/pingpong.c:345
+#, c-format
+msgid "Received malformed `%s' message. Dropping.\n"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:146
+msgid "Received ping for another peer. Dropping.\n"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:216
+msgid "Received PING not destined for us!\n"
+msgstr "Mottog PING som ej var ämnat för oss!\n"
+
+#: src/applications/pingpong/pingpong.c:315
+#: src/applications/pingpong/pingpong.c:381
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:425
+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:517
+msgid "# encrypted PONG messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/applications/pingpong/pingpong.c:519
+msgid "# plaintext PONG messages received"
+msgstr "# klartext PONG-meddelanden mottagna"
+
+#: src/applications/pingpong/pingpong.c:521
+msgid "# encrypted PING messages received"
+msgstr "# krypterade PING-meddelanden mottagna"
+
+#: src/applications/pingpong/pingpong.c:523
+msgid "# PING messages created"
+msgstr "# PING-meddelanden skapade"
+
+#: src/applications/pingpong/pingpong.c:525
+#: src/applications/session/connect.c:947
+msgid "# encrypted PONG messages sent"
+msgstr "# krypterade PONG-meddelanden skickade"
+
+#: src/applications/pingpong/pingpong.c:529
+#: src/applications/session/connect.c:945
+msgid "# encrypted PING messages sent"
+msgstr "# krypterade PING-meddelanden skickade"
+
+#: src/applications/pingpong/pingpong.c:531
+#, fuzzy
+msgid "# plaintext PONG messages sent"
+msgstr "# PING-meddelanden i klartext skickade"
+
+#: src/applications/pingpong/pingpong.c:535
+#, fuzzy
+msgid "# plaintext PONG transmissions failed"
+msgstr "# klartext PONG-meddelanden mottagna"
+
+#: src/applications/pingpong/pingpong.c:545
+#, c-format
+msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
+msgstr "\"%s\" registrerar handtag %d %d (klartext och kryptotext)\n"
+
+#: src/applications/session/connect.c:260
+#: src/applications/session/connect.c:279
+#, c-format
+msgid "Session key from peer `%s' could not be verified.\n"
+msgstr ""
+
+#: src/applications/session/connect.c:323
 #, fuzzy, c-format
-msgid "Trying to download hostlist from `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
+msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
 
-#: src/applications/bootstrap_http/http.c:359
+#: src/applications/session/connect.c:512
+#, fuzzy
+msgid "Could not create any HELLO for myself!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/applications/session/connect.c:615
 #, fuzzy, c-format
-msgid "Downloaded %llu bytes from `%s'.\n"
-msgstr "Ladda ner filer från GNUnet."
+msgid "Session key received from peer `%s' has invalid format (discarded).\n"
+msgstr "Meddelande mottaget från motpart är ogiltig.\n"
 
-#: src/applications/bootstrap_http/http.c:392
-msgid "# HELLOs downloaded via http"
+#: src/applications/session/connect.c:649
+#, c-format
+msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:454
+#: src/applications/session/connect.c:683
 #, c-format
-msgid "# bytes transmitted of type %d"
-msgstr "# byte skickade av typen %d"
+msgid "Invalid `%s' message received from peer `%s'.\n"
+msgstr ""
 
-#: src/applications/traffic/traffic.c:470
+#: src/applications/session/connect.c:694
 #, c-format
-msgid "# bytes received of type %d"
-msgstr "# byte mottagna av typen %d"
+msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
+msgstr ""
 
-#: src/applications/traffic/traffic.c:489
+#: src/applications/session/connect.c:763
+#, c-format
+msgid ""
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
+msgstr ""
+
+#: src/applications/session/connect.c:776
+#, c-format
+msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
+msgstr ""
+
+#: src/applications/session/connect.c:937
+msgid "# session keys sent"
+msgstr "# sessionsnycklar skickade"
+
+#: src/applications/session/connect.c:939
+msgid "# session keys rejected"
+msgstr "# sessionnycklar vägrade"
+
+#: src/applications/session/connect.c:941
+msgid "# session keys accepted"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/applications/session/connect.c:943
+msgid "# sessions established"
+msgstr "# sessioner etablerade"
+
+#: src/applications/sqstore_mysql/mysql.c:427
+#: src/applications/dstore_mysql/dstore_mysql.c:220
 #, fuzzy, c-format
-msgid "# bytes received in plaintext of type %d"
-msgstr "# byte mottagna av typen %d"
+msgid "`%s' failed at %s:%d with error: %s"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/applications/traffic/traffic.c:644
-msgid "tracks bandwidth utilization by gnunetd"
+#: src/applications/sqstore_mysql/mysql.c:1388
+#, fuzzy, c-format
+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:1508
+#: src/applications/sqstore_mysql/mysql.c:1661
+#: src/applications/dstore_mysql/dstore_mysql.c:627
+#, 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:1535
+#: src/applications/sqstore_mysql/mysql.c:1686
+msgid ""
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:57
-msgid "Suppress display of asynchronous log messages"
+#: src/applications/identity/hostkey.c:122
+#, fuzzy, c-format
+msgid "Failed to access GNUnet home directory `%s'\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/applications/identity/hostkey.c:155
+#, c-format
+msgid ""
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr ""
+"Existerande värdnyckel i filen \"%s\" felade vid formatkontroll, skapar en "
+"ny värdnyckel.\n"
 
-#: src/applications/vpn/vpn.c:366
+#: src/applications/identity/hostkey.c:164
+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:176
+msgid "Done creating hostkey.\n"
+msgstr "Klar med skapandet av värdnyckel.\n"
+
+#: src/applications/identity/identity.c:352
 #, c-format
-msgid "Not storing route to myself from peer %d\n"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:377
+#: src/applications/identity/identity.c:366
 #, c-format
-msgid "Duplicate route to node from peer %d, choosing minimum hops"
+msgid ""
+"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:410
+#: src/applications/identity/identity.c:402
 #, c-format
-msgid "Inserting route from peer %d in route table at location %d\n"
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:466
+#: src/applications/identity/identity.c:731
+#: src/applications/identity/identity.c:757
 #, c-format
-msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
+msgid "Removed file `%s' containing invalid HELLO data.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:472
+#: src/applications/identity/identity.c:809
 #, c-format
-msgid "RFC4193 Frame length %d too small\n"
+msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:488
+#: src/applications/identity/identity.c:819
+msgid "Signature failed verification: signature invalid.\n"
+msgstr ""
+
+#: src/applications/identity/identity.c:935
+#: src/applications/identity/identity.c:1058
 #, c-format
-msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
+msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:556
+#: src/applications/identity/identity.c:1061
 #, c-format
-msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
+msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:562
+#: src/applications/testbed/commands.c:1179
+#: src/applications/stats/gnunet-stats.c:61
 #, c-format
-msgid "Cannot open tunnel device because of %s"
+msgid "Supported peer-to-peer messages:\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:594
+#: src/applications/testbed/commands.c:1181
+#: src/applications/stats/gnunet-stats.c:64
 #, c-format
-msgid "RFC4193 Create skips gnu%d as we are already using it\n"
+msgid "Supported client-server messages:\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:606
+#: src/applications/testbed/gnunet-testbed.c:118
+msgid "Start GNUnet-testbed helper."
+msgstr "Starta hjälpprogrammet GNUnet-testbed."
+
+#: src/applications/testbed/gnunet-testbed.c:176
+#, fuzzy, c-format
+msgid "Cannot connect to LOOPBACK port %d: %s\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:268
 #, c-format
-msgid "Cannot set tunnel name to %s because of %s\n"
+msgid "Could not execute `%s': %s\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:314
+msgid "No client service started. Trying again in 30 seconds.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:614
+#: src/applications/testbed/gnunet-testbed.c:329
 #, c-format
-msgid "Configured tunnel name to %s\n"
+msgid ""
+"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
+"Trying again in %d seconds...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:655
+#: src/applications/testbed/gnunet-testbed.c:392
+#, fuzzy, c-format
+msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
+msgstr "%s: Vägrade anslutning från svartlistad adress %u.%u.%u.%u.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:406
 #, c-format
-msgid "Cannot get socket flags for gnu%d because %s\n"
+msgid "Protocol violation on socket. Expected command.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:664
+#: src/applications/testbed/gnunet-testbed.c:446
 #, c-format
-msgid "Cannot set socket flags for gnu%d because %s\n"
+msgid "Command `%s' not found!\n"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/applications/testbed/gnunet-testbed.c:510
+#, fuzzy
+msgid "Start GNUnet testbed controller."
+msgstr "Starta hjälpprogrammet GNUnet-testbed."
+
+#: src/applications/testbed/gnunet-testbed.c:572
+#, fuzzy, c-format
+msgid "Malformed entry in the configuration in section %s under %s: %s\n"
 msgstr ""
+"Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%s"
+"\"!\n"
 
-#: src/applications/vpn/vpn.c:674
+#: src/applications/testbed/testbed.c:53
+#, fuzzy
+msgid "Could not send acknowledgement back to client.\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#: src/applications/testbed/testbed.c:64
+#, fuzzy, c-format
+msgid "Received unknown testbed message of type %u.\n"
+msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
+
+#: src/applications/testbed/testbed.c:82
+#: src/applications/testbed/testbed.c:848
 #, c-format
-msgid "Cannot set MTU for gnu%d because %s\n"
+msgid "size of `%s' message is too short. Ignoring.\n"
+msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
+
+#: src/applications/testbed/testbed.c:90
+#, c-format
+msgid "size of `%s' message is wrong. Ignoring.\n"
+msgstr "storlek på \"%s\" meddelande är fel. Ignorerar.\n"
+
+#: src/applications/testbed/testbed.c:145
+#, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:682
+#: src/applications/testbed/testbed.c:223
+#: src/applications/testbed/testbed.c:268
+#: src/applications/testbed/testbed.c:381
+#: src/applications/testbed/testbed.c:390
+#: src/applications/testbed/testbed.c:434
+#: src/applications/testbed/testbed.c:443
 #, c-format
-msgid "Cannot get interface index for gnu%d because %s\n"
+msgid "received invalid `%s' message\n"
+msgstr "mottog ogiltigt \"%s\" meddelande\n"
+
+#: src/applications/testbed/testbed.c:240
+#: src/applications/testbed/testbed.c:284
+#, fuzzy, c-format
+msgid "received invalid `%s' message (empty module name)\n"
+msgstr "mottog ogiltigt \"%s\" meddelande\n"
+
+#: src/applications/testbed/testbed.c:247
+#, fuzzy, c-format
+msgid "loading module `%s' failed.  Notifying client.\n"
+msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
+
+#: src/applications/testbed/testbed.c:291
+msgid "unloading module failed.  Notifying client.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:694
+#: src/applications/testbed/testbed.c:576
 #, c-format
-msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgid "`%s' %s failed: %s\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
+
+#: src/applications/testbed/testbed.c:658
+#, c-format
+msgid "received invalid `%s' message: %s.\n"
+msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
+
+#: src/applications/testbed/testbed.c:861
+#, c-format
+msgid "'..' is not allowed in file name (%s).\n"
+msgstr "\"..\" tillåts inte i filnamn (%s).\n"
+
+#: src/applications/testbed/testbed.c:872
+msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:707
+#: src/applications/testbed/testbed.c:881
+msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:889
+msgid "Upload refused!"
+msgstr "Uppladdning vägrades!"
+
+#: src/applications/testbed/testbed.c:919
 #, c-format
-msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
+msgid "Invalid message received at %s:%d."
+msgstr "Ogiltigt meddelande mottogs den %s:%d."
+
+#: src/applications/testbed/testbed.c:1041
+#, fuzzy, c-format
+msgid "received invalid testbed message of size %u\n"
+msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
+
+#: src/applications/testbed/testbed.c:1064
+#, c-format
+msgid ""
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:721
+#: src/applications/testbed/testbed.c:1110
+msgid "No testbed URL given, not registered.\n"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:1121
 #, c-format
-msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgid "Could not resolve name of HTTP proxy `%s'.\n"
+msgstr "Kunde inte slå upp namn för HTTP-proxy \"%s\".\n"
+
+#: src/applications/testbed/testbed.c:1151
+#, c-format
+msgid "Invalid URL `%s' (must begin with `%s')\n"
+msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
+
+#: src/applications/testbed/testbed.c:1194
+#, c-format
+msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:733
+#: src/applications/testbed/testbed.c:1229
 #, c-format
-msgid "Cannot add route IPv6 address for gnu%s because %s\n"
+msgid "Could not register testbed, host `%s' unknown\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:774
+#: src/applications/testbed/testbed.c:1251
+#, c-format
+msgid "Failed to send HTTP request to host `%s': %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/applications/testbed/testbed.c:1289
+#, c-format
+msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran \"%s\" till värd \"%s\": %s\n"
+
+#: src/applications/testbed/testbed.c:1327
+msgid "Exit register (error: no http response read).\n"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:1434
+msgid "allows construction of a P2P-testbed (incomplete)"
+msgstr ""
+
+#: src/applications/transport/transport.c:192
+#, c-format
 msgid ""
-"RFC4193 We have run out of memory and so I can't store a tunnel for this "
-"peer.\n"
+"Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:822
+#: src/applications/transport/transport.c:247
 #, c-format
-msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
+msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:895
+#: src/applications/transport/transport.c:300
 #, c-format
-msgid "VPN dropping connection %x\n"
+msgid ""
+"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:902
+#: src/applications/transport/transport.c:377
+#, 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:500
 #, c-format
-msgid "VPN cannot drop connection %x\n"
+msgid "No transport of type %d known.\n"
+msgstr "Ingen transport av typ %d är känd.\n"
+
+#: src/applications/transport/transport.c:559
+msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:921
-msgid "RFC4193 Thread exiting\n"
+#: src/applications/transport/transport.c:760
+#, fuzzy, c-format
+msgid "Loading transports `%s'\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/applications/transport/transport.c:780
+#, fuzzy, c-format
+msgid "Could not load transport plugin `%s'\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/applications/transport/transport.c:794
+#, c-format
+msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:968
-msgid "VPN IP src not anonymous. drop..\n"
+#: src/applications/transport/transport.c:823
+#, fuzzy, c-format
+msgid "Loaded transport `%s'\n"
+msgstr "Tillgängliga transport(er): %s\n"
+
+#: src/applications/transport/transport.c:835
+#, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
+
+#: src/applications/stats/sqstats.c:151
+msgid "# Any-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:974
-msgid "VPN IP not anonymous, drop.\n"
+#: src/applications/stats/sqstats.c:152
+msgid "# DBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:981
-msgid "VPN Received, not anonymous, drop.\n"
+#: src/applications/stats/sqstats.c:153
+msgid "# SBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:985
+#: src/applications/stats/sqstats.c:154
+msgid "# KBlocks"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:155
+msgid "# NBlocks"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:156
+msgid "# KNBlocks"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:157
+msgid "# OnDemand-Blocks"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:158
+msgid "# Unknown-Blocks"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:159
+msgid "# expired"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:160
+msgid "# expire in 1h"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:161
+msgid "# expire in 24h"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:162
+msgid "# expire in 1 week"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:163
+msgid "# expire in 1 month"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:164
+msgid "# zero priority"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:165
+msgid "# priority one"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:166
+msgid "# priority larger than one"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:167
+msgid "# no anonymity"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:168
+msgid "# anonymity one"
+msgstr ""
+
+#: src/applications/stats/sqstats.c:169
+msgid "# anonymity larger than one"
+msgstr ""
+
+#: src/applications/stats/clientapi.c:333
+msgid "Uptime (seconds)"
+msgstr "Upptid (sekunder)"
+
+#: src/applications/stats/statistics.c:228
 #, c-format
-msgid "VPN Received unknown IP version %d...\n"
+msgid "% of allowed network load (up)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:996
+#: src/applications/stats/statistics.c:230
 #, c-format
-msgid "<- GNUnet(%d) : %s\n"
+msgid "% of allowed network load (down)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1022
-msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
+#: src/applications/stats/statistics.c:231
+#, c-format
+msgid "% of allowed cpu load"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1043
-msgid "Receive route request\n"
+#: src/applications/stats/statistics.c:232
+#, c-format
+msgid "% of allowed io load"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1050
+#: src/applications/stats/statistics.c:235
+msgid "# bytes of noise received"
+msgstr ""
+
+#: src/applications/stats/statistics.c:237
+msgid "# plibc handles"
+msgstr ""
+
+#: src/applications/stats/statistics.c:421
+#, 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:445
+msgid "keeps statistics about gnunetd's operation"
+msgstr "behåller statistik om gnunetds operation"
+
+#: src/applications/stats/gnunet-stats.c:87
+msgid "prints supported protocol messages"
+msgstr "skriver ut stödda protokollmeddelanden"
+
+#: src/applications/stats/gnunet-stats.c:136
 #, c-format
-msgid "Prepare route announcement level %d\n"
+msgid "Error reading information from gnunetd.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1065
+#: src/applications/tbench/gnunet-tbench.c:63
+#: src/applications/tracekit/gnunet-tracekit.c:54
+msgid "Start GNUnet transport benchmarking tool."
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:65
+msgid "output in gnuplot format"
+msgstr "utdata i gnuplot-format"
+
+#: src/applications/tbench/gnunet-tbench.c:69
+msgid "number of iterations"
+msgstr "antal iterationer"
+
+#: src/applications/tbench/gnunet-tbench.c:73
+msgid "number of messages to use per iteration"
+msgstr "antal meddelanden att använda per iteration"
+
+#: src/applications/tbench/gnunet-tbench.c:76
+msgid "receiver host identifier (ENC file name)"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:79
+msgid "message size"
+msgstr "meddelandestorlek"
+
+#: src/applications/tbench/gnunet-tbench.c:82
+msgid "sleep for SPACE ms after each a message block"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:85
+msgid "time to wait for the completion of an iteration (in ms)"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:90
+msgid "number of messages in a message block"
+msgstr "antal meddelanden i ett meddelandeblock"
+
+#: src/applications/tbench/gnunet-tbench.c:142
 #, c-format
-msgid "Send route announcement %d with route announce\n"
+msgid "You must specify a receiver!\n"
+msgstr "Du måste ange en mottagare!\n"
+
+#: src/applications/tbench/gnunet-tbench.c:152
+#, c-format
+msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1071
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
-msgid "Send outside table info %d\n"
+msgid "Time:\n"
+msgstr "Tid:\n"
+
+#: src/applications/tbench/gnunet-tbench.c:190
+#, c-format
+msgid "\tmax      %llums\n"
+msgstr "\tmax      %llums\n"
+
+#: src/applications/tbench/gnunet-tbench.c:191
+#, c-format
+msgid "\tmin      %llums\n"
+msgstr "\tmin      %llums\n"
+
+#: src/applications/tbench/gnunet-tbench.c:192
+#, c-format
+msgid "\tmean     %8.4fms\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1088
-msgid "Receive route announce.\n"
+#: src/applications/tbench/gnunet-tbench.c:193
+#, c-format
+msgid "\tvariance %8.4fms\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1094
-msgid "Going to try insert route into local table.\n"
+#: src/applications/tbench/gnunet-tbench.c:195
+#, c-format
+msgid "Loss:\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1100
+#: src/applications/tbench/gnunet-tbench.c:196
 #, c-format
-msgid "Inserting with hops %d\n"
+msgid "\tmax      %u\n"
+msgstr "\tmax      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:197
+#, c-format
+msgid "\tmin      %u\n"
+msgstr "\tmin      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:198
+#, c-format
+msgid "\tmean     %8.4f\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1119
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
-msgid "Request level %d from peer %d\n"
+msgid "\tvariance %8.4f\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1137
+#: src/applications/tbench/gnunet-tbench.c:205
 #, c-format
-msgid "Receive table limit on peer reached %d\n"
+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:211
+#, c-format
+msgid ""
+"\n"
+"Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1168
-msgid "realise alloc ram\n"
+#: src/applications/tbench/tbench.c:420
+msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1188
-msgid "realise add routes\n"
+#: src/applications/tbench/tbenchtest.c:53
+#, c-format
+msgid "Using %u messages of size %u for %u times.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1239
-msgid "realise pull routes\n"
+#: src/applications/tbench/tbenchtest.c:85
+#, c-format
+msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1292
-msgid "realise copy table\n"
+#: src/applications/tbench/tbenchtest.c:89
+#, c-format
+msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1324
-msgid "Cannot store client info\n"
+#: src/applications/tbench/tbenchtest.c:95
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Failed to receive reply from gnunetd.\n"
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#: src/applications/tbench/tbenchtest.c:151
+#, c-format
+msgid "Running benchmark...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:95
-msgid "Yes"
-msgstr "Ja"
+#: src/applications/tracekit/gnunet-tracekit.c:47
+msgid "probe network to the given DEPTH"
+msgstr ""
 
-#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:94
-msgid "No"
-msgstr "Nej"
+#: src/applications/tracekit/gnunet-tracekit.c:51
+msgid ""
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+msgstr ""
 
-#: src/applications/vpn/vpn.c:1651
-#, fuzzy, c-format
-msgid "`%s' initialising RFC4913 module  %d and %d\n"
-msgstr "\"%s\" registrerar handtagen %d och %d\n"
+#: src/applications/tracekit/gnunet-tracekit.c:58
+msgid "use PRIO for the priority of the trace request"
+msgstr ""
 
-#: src/applications/vpn/vpn.c:1654
+#: src/applications/tracekit/gnunet-tracekit.c:62
+msgid "wait DELAY seconds for replies"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:110
 #, c-format
-msgid "RFC4193 my First 4 hex digits of host id are %x\n"
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1727
-#, fuzzy
-msgid "enables IPv6 over GNUnet (incomplete)"
-msgstr "aktiverar P2P-chatt (ej komplett)"
+#: src/applications/tracekit/gnunet-tracekit.c:164
+#, c-format
+msgid "`%s' is not connected to any peer.\n"
+msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
-#: src/applications/vpn/vpn.c:1761
-msgid "RFC4193 Waiting for tun thread to end\n"
+#: src/applications/tracekit/gnunet-tracekit.c:207
+#, c-format
+msgid "`%s' connected to `%s'.\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:220
+#, c-format
+msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1775
-msgid "RFC4193 The tun thread has ended\n"
+#: src/applications/tracekit/gnunet-tracekit.c:246
+#, c-format
+msgid "Peer `%s' did not report back.\n"
+msgstr "Motpart \"%s\" rapporterade inte tillbaka.\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:348
+msgid "Could not send request to gnunetd.\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#: src/applications/tracekit/tracekit.c:74
+#: src/applications/tracekit/tracekit.c:216
+#, c-format
+msgid "Received invalid `%s' message from `%s'.\n"
+msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+
+#: src/applications/tracekit/tracekit.c:283
+msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1792
+#: src/applications/tracekit/tracekit.c:362
 #, c-format
-msgid "RFC4193 Closing tunnel %d fd %d\n"
+msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr ""
 
-#: src/applications/dstore/dstore.c:525
-#, fuzzy
-msgid "# bytes in dstore"
-msgstr "# byte krypterade"
+#: src/applications/tracekit/tracekit.c:462
+msgid "allows mapping of the network topology"
+msgstr "tillåter kartläggning av nätverkstopologin"
 
-#: src/server/gnunet-update.c:147
+#: src/applications/getoption/getoption.c:78
 #, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Uppdaterar data för modul \"%s\"\n"
+msgid "`%s' registering client handler %d\n"
+msgstr "\"%s\" registrerar klienthandtag %d\n"
 
-#: src/server/gnunet-update.c:151
+#: src/applications/getoption/getoption.c:88
+msgid "allows clients to determine gnunetd's configuration"
+msgstr "tillåter klienter att fastställa gnunetds konfiguration"
+
+#: src/applications/template/gnunet-template.c:42
+msgid "Template description."
+msgstr ""
+
+#: src/applications/template/template.c:70
 #, c-format
-msgid "Failed to update data for module `%s'\n"
+msgid "`%s' registering client handler %d and %d\n"
+msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
+
+#: src/applications/bootstrap_http/http.c:110
+#, 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:178
+msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:198 src/server/gnunetd.c:136
-#, fuzzy
-msgid "Core initialization failed.\n"
-msgstr " Anslutning misslyckades\n"
+#: src/applications/bootstrap_http/http.c:219
+#, c-format
+msgid "Bootstrapping using `%s'.\n"
+msgstr ""
 
-#: 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/applications/bootstrap_http/http.c:234
+#, fuzzy, c-format
+msgid "Trying to download hostlist from `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/server/gnunet-update.c:241
-msgid "Updates GNUnet datastructures after version change."
-msgstr "Uppdaterar GNUnets datastruktur efter versionsändring."
+#: src/applications/bootstrap_http/http.c:364
+#, fuzzy, c-format
+msgid "Downloaded %llu bytes from `%s'.\n"
+msgstr "Ladda ner filer från GNUnet."
 
-#: src/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:369
-msgid "run as user LOGIN"
-msgstr "kör som användare LOGIN"
+#: src/applications/bootstrap_http/http.c:397
+msgid "# HELLOs downloaded via http"
+msgstr ""
 
-#: 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/applications/traffic/traffic.c:454
+#, c-format
+msgid "# bytes transmitted of type %d"
+msgstr "# byte skickade av typen %d"
 
-#: src/server/connection.c:1202
+#: 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:489
+#, fuzzy, c-format
+msgid "# bytes received in plaintext of type %d"
+msgstr "# byte mottagna av typen %d"
+
+#: src/applications/traffic/traffic.c:650
+msgid "tracks bandwidth utilization by gnunetd"
+msgstr ""
+
+#: src/applications/dstore_mysql/dstore_mysql.c:636
+msgid "Failed to initialize MySQL database connection for dstore.\n"
+msgstr ""
+
+#: src/applications/dstore_mysql/dstore_mysql.c:661
+#: src/applications/dstore_sqlite/dstore.c:535
+#, fuzzy
+msgid "# bytes in dstore"
+msgstr "# byte krypterade"
+
+#: src/server/connection.c:1214
+#, 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:1211
+#: src/server/connection.c:1224
 #, 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:2897
+#: src/server/connection.c:2986
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
 
-#: src/server/connection.c:2982
+#: src/server/connection.c:3075
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:3004
+#: src/server/connection.c:3097
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:3500
+#: src/server/connection.c:3608
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3503
+#: src/server/connection.c:3611
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3505
+#: src/server/connection.c:3613
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3509
+#: src/server/connection.c:3617
 msgid "# connections closed (transport issue)"
 msgstr ""
 
-#: src/server/connection.c:3512
+#: src/server/connection.c:3620
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/server/connection.c:3516
+#: src/server/connection.c:3624
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/server/connection.c:3520
+#: src/server/connection.c:3628
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/server/connection.c:3522
+#: src/server/connection.c:3630
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/server/connection.c:3523
+#: src/server/connection.c:3631
 msgid "# bytes noise sent"
 msgstr ""
 
-#: src/server/connection.c:3526
+#: src/server/connection.c:3634
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3529
+#: src/server/connection.c:3637
 msgid "# total bytes per second receive limit"
 msgstr ""
 
-#: src/server/connection.c:3532
+#: src/server/connection.c:3640
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "antal meddelanden i ett meddelandeblock"
 
-#: src/server/connection.c:3536
+#: src/server/connection.c:3644
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3540
+#: src/server/connection.c:3648
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3544
+#: src/server/connection.c:3652
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
-#: src/server/connection.c:3547
+#: src/server/connection.c:3655
 msgid "# transports switched to stream transport"
 msgstr ""
 
-#: src/server/startup.c:206
+#: src/server/startup.c:215
 #, fuzzy, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/server/startup.c:223
+#: src/server/startup.c:233
 #, c-format
 msgid ""
 "Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
 "address@hidden"
 msgstr ""
 
-#: src/server/startup.c:237
+#: src/server/startup.c:248
 #, c-format
 msgid ""
 "Limiting datastore size to %llu GB, because the `%s' filesystem does not "
@@ -2625,116 +3561,81 @@
 "partition!\n"
 msgstr ""
 
-#: src/server/startup.c:274
+#: src/server/startup.c:287
 #, c-format
 msgid "Insufficient access permissions for `%s': %s\n"
 msgstr ""
 
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:83
 #, c-format
 msgid "`%s' startup complete.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/server/gnunetd.c:89
+#: src/server/gnunetd.c:87
 #, c-format
 msgid "`%s' is shutting down.\n"
 msgstr ""
 
-#: src/server/gnunetd.c:192
+#: src/server/gnunetd.c:121 src/server/gnunet-update.c:222
+#, fuzzy
+msgid "Core initialization failed.\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/server/gnunetd.c:176
 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:196
+#: src/server/gnunetd.c:180
 msgid "Starts the gnunetd daemon."
 msgstr "Startar gnunetd-demonen."
 
-#: src/server/gnunetd.c:199
+#: src/server/gnunetd.c:183
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:203
+#: src/server/gnunetd.c:187
 msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:207
+#: src/server/gnunetd.c:191
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: src/server/gnunetd.c:271
+#: src/server/gnunetd.c:272
 #, 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:126
+#: src/server/gnunet-transport-check.c:121
 #, c-format
-msgid "Application module `%s' already initialized!\n"
-msgstr ""
-
-#: src/server/core.c:177
-#, c-format
-msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
-msgstr ""
-
-#: src/server/core.c:226
-#, c-format
-msgid "Could not shutdown `%s': application not loaded\n"
-msgstr ""
-
-#: src/server/core.c:234
-#, c-format
-msgid "Could not shutdown application `%s': not initialized\n"
-msgstr ""
-
-#: src/server/core.c:243
-#, c-format
-msgid "Could not find '%s%s' method in library `%s'.\n"
-msgstr ""
-
-#: src/server/core.c:386
-#, c-format
-msgid "Could not release %p: service not loaded\n"
-msgstr ""
-
-#: src/server/core.c:492
-#, c-format
-msgid "Could not properly shutdown application `%s'.\n"
-msgstr ""
-
-#: src/server/core.c:628
-#, c-format
-msgid "Could not properly unload service `%s'!\n"
-msgstr ""
-
-#: src/server/gnunet-transport-check.c:122
-#, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:129
+#: 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:160
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr "\"%s\": Kunde inte skicka.\n"
 
-#: src/server/gnunet-transport-check.c:176
+#: src/server/gnunet-transport-check.c:175
 #, 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:189
+#: src/server/gnunet-transport-check.c:188
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "\"%s\": Kunde inte koppla ned.\n"
 
-#: src/server/gnunet-transport-check.c:196
+#: src/server/gnunet-transport-check.c:195
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -2748,7 +3649,7 @@
 msgid " Transport %d is not being tested\n"
 msgstr " Transport %d ej tillgänglig\n"
 
-#: src/server/gnunet-transport-check.c:255
+#: src/server/gnunet-transport-check.c:256
 #, c-format
 msgid ""
 "\n"
@@ -2757,112 +3658,129 @@
 "\n"
 "Kontaktar \"%s\"."
 
-#: src/server/gnunet-transport-check.c:280
+#: src/server/gnunet-transport-check.c:281
 #, c-format
 msgid " Connection failed\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/server/gnunet-transport-check.c:286
+#: src/server/gnunet-transport-check.c:287
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/server/gnunet-transport-check.c:323
+#: src/server/gnunet-transport-check.c:325
 #, c-format
 msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:325
+#: src/server/gnunet-transport-check.c:327
 #, fuzzy, c-format
 msgid "OK!\n"
 msgstr "OK"
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:352
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:354
+#: src/server/gnunet-transport-check.c:356
 msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:357
+#: src/server/gnunet-transport-check.c:359
 msgid "send COUNT messages"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/server/gnunet-transport-check.c:360
+#: src/server/gnunet-transport-check.c:362
 msgid "send messages with SIZE bytes payload"
 msgstr "skicka meddelanden med STORLEK bytes nyttolast"
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:365
 msgid "specifies which TRANSPORT should be tested"
 msgstr "anger vilken TRANSPORT som ska testas"
 
-#: src/server/gnunet-transport-check.c:366
+#: src/server/gnunet-transport-check.c:368
 msgid "specifies after how many MS to time-out"
 msgstr "anger timeout efter antal MS"
 
-#: src/server/gnunet-transport-check.c:374
+#: src/server/gnunet-transport-check.c:371 src/server/gnunet-update.c:271
+msgid "run as user LOGIN"
+msgstr "kör som användare LOGIN"
+
+#: src/server/gnunet-transport-check.c:376
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:435
+#: src/server/gnunet-transport-check.c:440
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/server/gnunet-transport-check.c:437
+#: src/server/gnunet-transport-check.c:442
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/server/gnunet-transport-check.c:478
+#: src/server/gnunet-transport-check.c:489
 #, c-format
 msgid ""
 "\n"
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
-#: src/server/tcpserver.c:109
+#: src/server/tcpserver.c:111
 #, c-format
 msgid "The `%s' request received from client is malformed.\n"
 msgstr ""
 
-#: src/server/tcpserver.c:324
+#: src/server/tcpserver.c:336
 #, 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:398
+#: src/server/tcpserver.c:411
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:454
+#: src/server/tcpserver.c:468
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr ""
 
-#: src/server/handler.c:428
+#: src/server/handler.c:431
 #, 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:141
-msgid ""
-"Failed to determine filename used to store GNUnet version information!\n"
+#: src/server/gnunet-update.c:146
+#, c-format
+msgid "Updating data for module `%s'\n"
+msgstr "Uppdaterar data för modul \"%s\"\n"
+
+#: src/server/gnunet-update.c:151
+#, c-format
+msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:53
+#: src/server/gnunet-update.c:267
+msgid "Updates GNUnet datastructures after version change."
+msgstr "Uppdaterar GNUnets datastruktur efter versionsändring."
+
+#: src/server/gnunet-update.c:275
+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/gnunet-peer-info.c:51
 msgid "Print information about GNUnet peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/server/gnunet-peer-info.c:57
+#: src/server/gnunet-peer-info.c:55
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:122 src/server/gnunet-peer-info.c:153
+#: src/server/gnunet-peer-info.c:120 src/server/gnunet-peer-info.c:153
 #, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr ""
@@ -2881,44 +3799,53 @@
 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:199
-#, fuzzy, c-format
-msgid "Failed to run %s: %s %d\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/server/version.c:143
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
+msgstr ""
 
-#: 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."
+#: src/server/core.c:129
+#, c-format
+msgid "Application module `%s' already initialized!\n"
 msgstr ""
 
-#: 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/server/core.c:183
+#, c-format
+msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
+msgstr ""
 
-#: 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/server/core.c:233
+#, c-format
+msgid "Could not shutdown `%s': application not loaded\n"
+msgstr ""
 
-#: src/util/network_client/tcpio.c:327
-#, fuzzy, c-format
-msgid "Error connecting to %s:%u\n"
+#: src/server/core.c:244
+#, c-format
+msgid "Could not shutdown application `%s': not initialized\n"
 msgstr ""
-"\n"
-"Fel vid avindexering av fil: %s\n"
 
-#: 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/server/core.c:254
+#, c-format
+msgid "Could not find '%s%s' method in library `%s'.\n"
+msgstr ""
 
-#: src/util/network_client/tcpio.c:494
+#: src/server/core.c:400
 #, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "\"%s\" misslyckades, svar ogiltigt!\n"
+msgid "Could not release %p: service not loaded\n"
+msgstr ""
 
-#: src/util/crypto/hostkey_gcrypt.c:898
+#: src/server/core.c:509
 #, c-format
+msgid "Could not properly shutdown application `%s'.\n"
+msgstr ""
+
+#: src/server/core.c:646
+#, c-format
+msgid "Could not properly unload service `%s'!\n"
+msgstr ""
+
+#: src/util/crypto/hostkey_gcrypt.c:907
+#, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
@@ -2927,12 +3854,12 @@
 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:195 src/util/os/statuscalls.c:336
+#: src/util/os/statuscalls.c:197 src/util/os/statuscalls.c:342
 #, 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:379 src/util/os/statuscalls.c:389
+#: src/util/os/statuscalls.c:387 src/util/os/statuscalls.c:397
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -2940,284 +3867,286 @@
 "Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%s"
 "\"!\n"
 
-#: 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:124
+#: src/util/os/osconfig.c:127
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:391
+#: src/util/os/osconfig.c:402
 #, 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/user.c:136 src/util/os/user.c:181
+#, fuzzy, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/util/os/user.c:137
+msgid "No such user"
+msgstr ""
+
+#: src/util/os/user.c:152
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
+
+#: src/util/os/priority.c:78
+#, fuzzy, c-format
+msgid "Invalid process priority `%s'\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
+
+#: src/util/os/semaphore.c:223
+#, c-format
+msgid "Can't create semaphore: %i"
+msgstr "Kan inte skapa semafor: %i"
+
 #: 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:119
+#: src/util/os/dso.c:120
 #, 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:159
+#: src/util/os/dso.c:162
 #, 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:461
+#: src/util/os/cpustatus.c:466
 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:483
+#: src/util/os/cpustatus.c:489
 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:134 src/util/os/user.c:176
+#: src/util/network_client/tcpio.c:98 src/util/network_client/tcpio.c:144
+msgid "Could not find valid value for HOST in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:113
 #, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'"
+msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/os/user.c:135
-msgid "No such user"
+#: src/util/network_client/tcpio.c:302
+#, 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:340
+#, fuzzy, c-format
+msgid "Error connecting to %s:%u\n"
 msgstr ""
+"\n"
+"Fel vid avindexering av fil: %s\n"
 
-#: src/util/os/user.c:149
+#: src/util/network_client/tcpio.c:351
+#, 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:516
 #, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
+msgid "`%s' failed, reply invalid!\n"
+msgstr "\"%s\" misslyckades, svar ogiltigt!\n"
 
-#: src/util/os/priority.c:78
-#, fuzzy, c-format
-msgid "Invalid process priority `%s'\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
-
-#: src/util/network/select.c:304
+#: src/util/network/select.c:310
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 
-#: src/util/network/select.c:473
+#: src/util/network/select.c:483
 #, c-format
 msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
 
-#: 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
+#: src/util/network/ipcheck.c:106 src/util/network/ipcheck.c:136
+#: src/util/network/ipcheck.c:186 src/util/network/ipcheck.c:211
+#: src/util/network/ipcheck.c:219
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/network/ipcheck.c:162
+#: src/util/network/ipcheck.c:167
 #, 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:259
+#: src/util/network/ipcheck.c:267
 #, 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:291
+#: src/util/network/ipcheck.c:300
 #, 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:304
+#: src/util/network/ipcheck.c:314
 #, 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:195
+#: src/util/network/ip.c:207
 #, c-format
 msgid ""
 "Could not find interface `%s' using `%s', trying to find another interface.\n"
 msgstr ""
 
-#: src/util/network/ip.c:268
+#: src/util/network/ip.c:285
 #, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr ""
 
-#: src/util/network/ip.c:277
+#: src/util/network/ip.c:295
 #, 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:297
+#: src/util/network/ip.c:317
 #, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr ""
 
-#: src/util/network/ip.c:326
+#: src/util/network/ip.c:350
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr ""
 
-# drive = hard drive ?
-#: 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: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:290
+#: src/util/error/error.c:117
 #, 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:533
-#, c-format
-msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
-msgstr ""
-
-#: 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:589
-#, c-format
-msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
-msgstr ""
-
-#: 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:115
-#, c-format
-msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:187 src/util/error/error.c:222
+#: src/util/error/error.c:190 src/util/error/error.c:225
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/error/error.c:189 src/util/error/error.c:224
+#: src/util/error/error.c:192 src/util/error/error.c:227
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:191 src/util/error/error.c:228
+#: src/util/error/error.c:194 src/util/error/error.c:231
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/error/error.c:193 src/util/error/error.c:230
+#: src/util/error/error.c:196 src/util/error/error.c:233
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/error/error.c:195 src/util/error/error.c:232
+#: src/util/error/error.c:198 src/util/error/error.c:235
 msgid "FATAL"
 msgstr "ÖDESDIGER"
 
-#: src/util/error/error.c:197 src/util/error/error.c:234
+#: src/util/error/error.c:200 src/util/error/error.c:237
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:199 src/util/error/error.c:236
+#: src/util/error/error.c:202 src/util/error/error.c:239
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:201 src/util/error/error.c:238
+#: src/util/error/error.c:204 src/util/error/error.c:241
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:203 src/util/error/error.c:240
+#: src/util/error/error.c:206 src/util/error/error.c:243
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:205 src/util/error/error.c:242
+#: src/util/error/error.c:208 src/util/error/error.c:245
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:244
+#: src/util/error/error.c:210 src/util/error/error.c:247
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:209
+#: src/util/error/error.c:212
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:226
+#: src/util/error/error.c:229
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/error/error.c:245
+#: src/util/error/error.c:248
 msgid "NOTHING"
 msgstr "INGET"
 
-#: src/util/threads/mutex.c:144 src/util/threads/semaphore.c:166
-#: src/util/threads/pthread.c:154
+# drive = hard drive ?
+#: src/util/disk/storage.c:203
 #, 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:543
+#, 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/threads/mutex.c:146 src/util/threads/semaphore.c:168
+#: src/util/threads/pthread.c:157
+#, 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:152 src/util/threads/mutex.c:194
+#: src/util/threads/mutex.c:155 src/util/threads/mutex.c:201
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/util/threads/mutex.c:156
+#: src/util/threads/mutex.c:160
 #, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:181
+#: src/util/threads/mutex.c:187
 #, c-format
 msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:198
+#: src/util/threads/mutex.c:207
 #, fuzzy, c-format
 msgid "Permission denied for `%s'.\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/threads/pthread.c:165 src/util/threads/pthread.c:171
-#: src/util/threads/pthread.c:176 src/util/threads/pthread.c:264
+#: src/util/threads/pthread.c:169 src/util/threads/pthread.c:176
+#: src/util/threads/pthread.c:182 src/util/threads/pthread.c:276
 #, 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:181 src/util/threads/pthread.c:273
+#: src/util/threads/pthread.c:188 src/util/threads/pthread.c:286
 #, 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:229
+#: src/util/loggers/file.c:236
 #, fuzzy, c-format
 msgid "Failed to open log-file `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/loggers/file.c:248
+#: src/util/loggers/file.c:257
 #, fuzzy
 msgid "GNUnet error log"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: 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
+#: src/util/loggers/file.c:278 src/util/loggers/file.c:296
+#: src/include/gnunet_util_error.h:252 src/include/gnunet_util_error.h:259
+#: src/include/gnunet_util_error.h:266 src/include/gnunet_util_error.h:273
 #, 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
+#: src/util/loggers/memory.c:72
 msgid "Out of memory (for logging)"
 msgstr ""
 
@@ -3276,19 +4205,14 @@
 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
+#: src/util/getopt/setoption.c:59
 #, 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 ""
 "Setting option `%s' in section `%s' to `%s' when processing command line "
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:136 src/util/getopt/setoption.c:153
+#: src/util/getopt/setoption.c:138 src/util/getopt/setoption.c:155
 #, 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"
@@ -3301,752 +4225,122 @@
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/string/string.c:120
-msgid "ms"
-msgstr "ms"
-
-#: src/util/string/string.c:126
-msgid "s"
-msgstr "s"
-
-#: src/util/string/string.c:130
-msgid "m"
-msgstr "m"
-
-#: src/util/string/string.c:134
-msgid "h"
-msgstr "h"
-
-#: src/util/string/string.c:138
-msgid " days"
-msgstr " dagar"
-
-#: src/util/string/string.c:154
-msgid "b"
-msgstr "b"
-
-#: src/util/string/string.c:160
-msgid "KiB"
-msgstr ""
-
-#: src/util/string/string.c:164
-msgid "MiB"
-msgstr ""
-
-#: src/util/string/string.c:168
-msgid "GiB"
-msgstr ""
-
-#: src/util/string/string.c:172
-msgid "TiB"
-msgstr ""
-
-#: src/util/string/string.c:284
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:59
-msgid "generate configuration for gnunetd, the GNUnet daemon"
-msgstr ""
-
-#: 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:176
+#: src/util/boot/startup.c:251
 #, fuzzy, c-format
-msgid "Too many arguments.\n"
-msgstr "Ogiltiga kommandoradsargument.\n"
+msgid "Failed to run %s: %s %d\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/setup/gnunet-setup.c:181
-msgid "No interface specified, using default\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:255
+#: src/util/config/config.c:295
 #, c-format
-msgid "`%s' is not available."
-msgstr "\"%s\" är inte tillgänglig."
+msgid "Syntax error in configuration file `%s' at line %d.\n"
+msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/setup/gnunet-setup.c:272
+#: src/util/config/config.c:544
 #, c-format
-msgid "Unknown operation `%s'\n"
-msgstr "Okänd operation \"%s\"\n"
-
-#: src/setup/gnunet-win-tool.c:55
-msgid "list all network adapters"
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:58
-msgid "install GNUnet as Windows service"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:61
-msgid "uninstall GNUnet service"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:64
-msgid "increase the maximum number of TCP/IP connections"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:67
-msgid "display a file's hash value"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:126
+#: src/util/config/config.c:592
 #, c-format
-msgid "GNUnet service installed successfully.\n"
-msgstr ""
-
-#: 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: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: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: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:154
-#, c-format
-msgid "Service deleted.\n"
-msgstr "Tjänst borttagen.\n"
-
-#: src/setup/gnunet-win-tool.c:166
-#, c-format
-msgid "Error: can't access service: %s\n"
-msgstr ""
-
-#: 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:387
-#, fuzzy
-msgid "Description"
-msgstr "Fråga"
-
-#: src/setup/gtk/gconf.c:403
-msgid "Value"
-msgstr ""
-
-#: src/setup/gtk/gconf.c:427
-msgid "Default"
-msgstr ""
-
-#: src/setup/gtk/gconf.c:442 src/setup/ncurses/wizard_curs.c:73
-msgid "Help"
-msgstr "Hjälp"
-
-#: src/setup/gtk/gconf.c:456
-#, fuzzy
-msgid "Section"
-msgstr "Fråga"
-
-#: src/setup/gtk/gconf.c:467
-#, fuzzy
-msgid "Option"
-msgstr "_Alternativ"
-
-#: src/setup/gtk/gconf.c:490
-#, fuzzy
-msgid "Configuration saved."
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/setup/gtk/gconf.c:500
-#, fuzzy
-msgid "Failed to save configuration."
-msgstr "Kunde inte spara konfiguration!"
-
-#: src/setup/gtk/gconf.c:526
-#, fuzzy
-msgid "Configuration changed. Save?"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/setup/gtk/gconf.c:539
-#, fuzzy
-msgid "Error saving configuration."
-msgstr "Kunde inte spara konfiguration!"
-
-#: src/setup/gtk/wizard_gtk.c:144
-#, fuzzy
-msgid "(unknown connection)"
-msgstr "Nätverksanslutning"
-
-#: 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:437
-#, fuzzy
-msgid "Do you want to save the new configuration?"
-msgstr "Vill du spara dina inställningar?"
-
-#: 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:477
-msgid "Unable to change startup process:"
-msgstr ""
-
-#: src/setup/gtk/wizard_gtk.c:492
 msgid ""
-"Running gnunet-update failed.\n"
-"This maybe due to insufficient permissions, please check your "
-"configuration.\n"
-"Finally, run gnunet-update manually."
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
 msgstr ""
 
-#: src/setup/text/conf.c:79
-#, fuzzy
-msgid "yes"
-msgstr "Ja"
-
-#: src/setup/text/conf.c:80
-msgid "no"
-msgstr ""
-
-#: src/setup/text/conf.c:105
+#: src/util/config/config.c:602
 #, c-format
-msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/setup/text/conf.c:114
-msgid "\tPossible choices:\n"
-msgstr ""
-
-#: src/setup/text/conf.c:122
-msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
-msgstr ""
-
-#: src/setup/text/conf.c:124
+#: src/util/config/config.c:688
 #, c-format
-msgid "\tEnter string (type '%s' for default value `%s'): "
-msgstr ""
-
-#: src/setup/text/conf.c:142
-#, c-format
-msgid "\t Enter choice (default is %c): "
-msgstr ""
-
-#: src/setup/text/conf.c:146
-#, c-format
-msgid "\tEnter floating point (type '%s' for default value %f): "
-msgstr ""
-
-#: src/setup/text/conf.c:152
-#, c-format
 msgid ""
-"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
-"value %llu): "
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/setup/text/conf.c:186
-#, fuzzy, c-format
-msgid "Yes\n"
-msgstr "Ja"
+#: src/util/string/string.c:55
+msgid "ms"
+msgstr "ms"
 
-#: src/setup/text/conf.c:191
-#, fuzzy, c-format
-msgid "No\n"
-msgstr "Nej"
+#: src/util/string/string.c:61
+msgid "s"
+msgstr "s"
 
-#: 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/util/string/string.c:65
+msgid "m"
+msgstr "m"
 
-#: 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/util/string/string.c:69
+msgid "h"
+msgstr "h"
 
-#: 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/util/string/string.c:73
+msgid " days"
+msgstr " dagar"
 
-#: src/setup/text/conf.c:421
-#, c-format
-msgid "Unknown kind %x (internal error).  Skipping option.\n"
-msgstr ""
+#: src/util/string/string.c:89
+msgid "b"
+msgstr "b"
 
-#: src/setup/text/conf.c:482
-msgid "\tDescend? (y/n/?) "
+#: src/util/string/string.c:95
+msgid "KiB"
 msgstr ""
 
-#: src/setup/text/conf.c:491
-msgid "Aborted.\n"
+#: src/util/string/string.c:99
+msgid "MiB"
 msgstr ""
 
-#: src/setup/text/conf.c:504
-#, fuzzy
-msgid "Invalid entry.\n"
-msgstr "Ogiltiga argument: "
-
-#: src/setup/text/conf.c:521
-#, c-format
-msgid "Unknown kind %x (internal error).  Aborting.\n"
+#: src/util/string/string.c:103
+msgid "GiB"
 msgstr ""
 
-#: src/setup/text/conf.c:552
-#, c-format
-msgid "You can always press ENTER to keep the current value.\n"
+#: src/util/string/string.c:107
+msgid "TiB"
 msgstr ""
 
-#: src/setup/text/conf.c:553
-#, c-format
-msgid "Use the '%s' key to abort.\n"
+#: src/util/string/string.c:226
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: 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:571
-#, c-format
-msgid ""
-"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
-"configuration. "
-msgstr ""
-
-#: 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:595
-#, fuzzy, c-format
-msgid "Configuration file `%s' written.\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/setup/ncurses/mconf.c:85
-msgid "Exit"
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:88
-msgid "Up"
-msgstr "Upp"
-
-#: src/setup/ncurses/mconf.c:91
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: 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:212 src/setup/ncurses/mconf.c:403
-msgid "Internal error! (Value invalid?)"
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:392
-msgid "Invalid input, expecting floating point value."
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:435
-msgid "Invalid input, expecting integer."
-msgstr ""
-
-#: src/setup/ncurses/mconf.c:443
-msgid "Value is not in legal range."
-msgstr ""
-
-#: 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:517
-#, fuzzy
-msgid "Do you wish to save your new configuration?"
-msgstr "Vill du spara dina inställningar?"
-
-#: 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:536
-#, c-format
-msgid ""
-"\n"
-"Your configuration changes were NOT saved.\n"
-msgstr ""
-
-#: 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:80
-#, fuzzy
-msgid "Error!"
-msgstr "Fel"
-
-#: src/setup/ncurses/wizard_curs.c:142
-#, fuzzy
-msgid "Abort"
-msgstr "_Om"
-
-#: src/setup/ncurses/wizard_curs.c:143
-#, fuzzy
-msgid "Ok"
-msgstr "k"
-
-#: 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:211
-msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org/\n";
-"and join our community at\n"
-"\thttp://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"the GNUnet team"
-msgstr ""
-"Välkommen till GNUnet!\n"
-"\n"
-"Denna assistant kommer att fråga dig några enkla frågor för att konfigurera "
-"GNUnet.\n"
-"\n"
-"Vänligen besök på webbplats på\n"
-"\thttp://gnunet.org/\n";
-"och gå med i vår gemenskap på\n"
-"\thttp://gnunet.org/drupal/\n";
-"\n"
-"Ha det så kul,\n"
-"\n"
-"the GNUnet team"
-
-#: 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: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:306
-#, fuzzy
-msgid "Network configuration: interface"
-msgstr "Nätverksgränssnitt:"
-
-#: 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:319
-#, fuzzy
-msgid "Network configuration: NAT"
-msgstr "GNUnet-konfiguration"
-
-#: src/setup/ncurses/wizard_curs.c:320
-msgid ""
-"Is this machine behind NAT?\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
-"connections through modems, ISDN cards and DNAT (also known as \"port "
-"forwarding\")."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:333
-#, fuzzy
-msgid "Network configuration: IP"
-msgstr "GNUnet-konfiguration"
-
-#: 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: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 "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If left empty, GNUnet will try to automatically detect the IP.\n"
-"You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
-"If in doubt, leave this empty."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:351
-#, fuzzy
-msgid "Bandwidth configuration: upload"
-msgstr "Bandbreddsbegränsning"
-
-#: 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:354
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"upstream\" is the data channel through which data is *sent* to the "
-"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
-"you have a flatrate, you can set it to the maximum speed of your internet "
-"connection. You should not use a value that is higher than what your actual "
-"connection allows."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:366
-#, fuzzy
-msgid "Bandwidth configuration: download"
-msgstr "Bandbreddsbegränsning"
-
-#: 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:369
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"downstream\" is the data channel through which data is *received* from "
-"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
-"If you have a flatrate, you can set it to the maximum speed of your internet "
-"connection. You should not use a value that is higher than what your actual "
-"connection allows."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:381
-#, fuzzy
-msgid "Quota configuration"
-msgstr "GNUnet-konfiguration"
-
-#: 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: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:393
-#, fuzzy
-msgid "Daemon configuration: user account"
-msgstr "Kunde inte skapa användarkonto:"
-
-#: src/setup/ncurses/wizard_curs.c:394
-msgid "As which user should gnunetd be run?"
-msgstr ""
-
-#: 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"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the field empty to run GNUnet with system privileges.\n"
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:411
-msgid "Daemon configuration: group account"
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:412
-msgid "As which group should gnunetd be run?"
-msgstr ""
-
-#: 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"
-"\n"
-"You can also specify a already existant group here.\n"
-"\n"
-"Only members of this group will be allowed to start and stop the the GNUnet "
-"server and have access to GNUnet server data.\n"
-msgstr ""
-
-#: 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: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:471
-#, fuzzy
-msgid "Unable to create user account for daemon."
-msgstr "Kunde inte skapa användarkonto:"
-
-#: src/setup/ncurses/wizard_curs.c:478
-msgid "Unable to setup autostart for daemon."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:493
-#, fuzzy
-msgid "Save configuration?"
-msgstr "GNUnet-konfiguration"
-
-#: src/setup/ncurses/wizard_curs.c:494
-#, fuzzy
-msgid "Save configuration now?"
-msgstr "GNUnet-konfiguration"
-
-#: src/setup/ncurses/wizard_curs.c:538
-msgid "Back"
-msgstr "Tillbaka"
-
-#: 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:190
-#, c-format
-msgid ""
-"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
-msgstr ""
-
-#: src/setup/lib/wizard_util.c:110
-msgid "Can't open Service Control Manager"
-msgstr ""
-
-#: src/setup/lib/wizard_util.c:116
-msgid "Can't create service"
-msgstr "Kan inte skapa tjänst"
-
-#: 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:125
-msgid "Cannot write to the regisitry"
-msgstr "Kan inte skriva till registret"
-
-#: 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:131
-msgid "Can't delete the service"
-msgstr "Kan inte ta bort tjänsten"
-
-#: src/setup/lib/wizard_util.c:134
-msgid "Unknown error"
-msgstr "Okänt fel"
-
-#: 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:174
-msgid "Error creating user"
-msgstr "Fel vid skapandet av användare"
-
-#: 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:183
-msgid "Error granting service right to user"
-msgstr ""
-
-#: 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:153
+#: src/include/gnunet_util_getopt.h:154
 msgid "print this help"
 msgstr "skriv ut denna hjälp"
 
-#: src/include/gnunet_util_getopt.h:162
+#: src/include/gnunet_util_getopt.h:163
 msgid "print the version number"
 msgstr "skriv ut versionsnummer"
 
-#: src/include/gnunet_util_getopt.h:168
+#: src/include/gnunet_util_getopt.h:169
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:174
+#: src/include/gnunet_util_getopt.h:175
 msgid "be verbose"
 msgstr "var informativ"
 
-#: src/include/gnunet_util_getopt.h:180
+#: src/include/gnunet_util_getopt.h:181
 msgid "use configuration file FILENAME"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/include/gnunet_util_getopt.h:186
+#: src/include/gnunet_util_getopt.h:187
 msgid "specify host on which gnunetd is running"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: 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:236
+#: src/include/gnunet_util_error.h:221 src/include/gnunet_util_error.h:223
+#: src/include/gnunet_util_error.h:229 src/include/gnunet_util_error.h:245
 #, c-format
 msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:230
+#: src/include/gnunet_util_error.h:239
 #, c-format
 msgid ""
 "External protocol violation: assertion failed at %s:%d in %s (no need to "
 "panic, we can handle this).\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
+#: src/include/gnunet_util_error.h:280 src/include/gnunet_util_error.h:287
 #, 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"
@@ -4188,23 +4482,35 @@
 "configuration here.  Default is no proxy."
 msgstr ""
 
-#: contrib/config-daemon.scm:224 contrib/config-client.scm:144
+#: contrib/config-daemon.scm:210
+msgid ""
+"Name of the directory where gnunetd should store contact information about "
+"peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:212
+msgid ""
+"Unless you want to share the directory directly using a webserver, the "
+"default is most likely just fine."
+msgstr ""
+
+#: contrib/config-daemon.scm:238 contrib/config-client.scm:144
 msgid "How long should logs be kept?"
 msgstr ""
 
-#: contrib/config-daemon.scm:226 contrib/config-client.scm:146
+#: contrib/config-daemon.scm:240 contrib/config-client.scm:146
 msgid ""
 "How long should logs be kept? If you specify a value greater than zero, a "
 "log is created each day with the date appended to its filename. These logs "
 "are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
 msgstr ""
 
-#: contrib/config-daemon.scm:237
+#: contrib/config-daemon.scm:251
 msgid ""
 "What maximum number of open file descriptors should be requested from the OS?"
 msgstr ""
 
-#: contrib/config-daemon.scm:239
+#: contrib/config-daemon.scm:253
 msgid ""
 "The default of 1024 should be fine for most systems.  If your system can "
 "support more, increasing the number might help support additional clients on "
@@ -4216,62 +4522,66 @@
 "run with what it is given."
 msgstr ""
 
-#: contrib/config-daemon.scm:250
+#: contrib/config-daemon.scm:264
 msgid "Where should gnunetd write the logs?"
 msgstr ""
 
-#: contrib/config-daemon.scm:262 contrib/config-client.scm:169
+#: contrib/config-daemon.scm:276
+msgid "Enable for extra-verbose logging."
+msgstr ""
+
+#: contrib/config-daemon.scm:288 contrib/config-client.scm:169
 msgid "Logging"
 msgstr ""
 
-#: contrib/config-daemon.scm:263 contrib/config-client.scm:170
+#: contrib/config-daemon.scm:289 contrib/config-client.scm:170
 msgid "Specify which system messages should be logged how"
 msgstr ""
 
-#: contrib/config-daemon.scm:267 contrib/config-client.scm:174
+#: contrib/config-daemon.scm:294 contrib/config-client.scm:174
 msgid "Logging of events for users"
 msgstr ""
 
-#: contrib/config-daemon.scm:268 contrib/config-client.scm:175
+#: contrib/config-daemon.scm:295 contrib/config-client.scm:175
 msgid "Logging of events for the system administrator"
 msgstr ""
 
-#: contrib/config-daemon.scm:280
+#: contrib/config-daemon.scm:307
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:281
+#: contrib/config-daemon.scm:308
 msgid ""
 "The default is no longer /var/run/gnunetd.pid since we could not delete the "
 "file on shutdown at that location."
 msgstr ""
 
-#: contrib/config-daemon.scm:293
+#: contrib/config-daemon.scm:320
 msgid "As which user should gnunetd run?"
 msgstr ""
 
-#: contrib/config-daemon.scm:295
+#: contrib/config-daemon.scm:322
 msgid ""
 "Empty means \"current user\". On computer startup, it is root/SYSTEM.  Under "
 "Windows, this setting affects the creation of a new system service only."
 msgstr ""
 
-#: contrib/config-daemon.scm:308
+#: contrib/config-daemon.scm:335
 msgid "Should gnunetd be automatically started when the system boots?"
 msgstr ""
 
-#: contrib/config-daemon.scm:309
+#: contrib/config-daemon.scm:336
 msgid ""
 "Set to YES if gnunetd should be automatically started on boot.  If this "
 "option is set, gnunet-setup will install a script to start the daemon upon "
 "completion.  This option may not work on all systems."
 msgstr ""
 
-#: contrib/config-daemon.scm:321
+#: contrib/config-daemon.scm:348
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:323
+#: contrib/config-daemon.scm:350
 msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
 "available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
@@ -4285,11 +4595,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:337
+#: contrib/config-daemon.scm:364
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:339
+#: contrib/config-daemon.scm:366
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -4326,11 +4636,11 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:368
+#: contrib/config-daemon.scm:395
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:369
+#: contrib/config-daemon.scm:396
 msgid ""
 "This option can be used to tell gnunetd not to open the client port.  When "
 "run like this, gnunetd will participate as a peer in the network but not "
@@ -4339,11 +4649,11 @@
 "prevent you from running diagnostic tools like gnunet-stats!"
 msgstr ""
 
-#: contrib/config-daemon.scm:381
+#: contrib/config-daemon.scm:408
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:382
+#: contrib/config-daemon.scm:409
 msgid ""
 "The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
 "peer to peers of which the hostkey has been copied by hand to data/hosts;  "
@@ -4355,15 +4665,15 @@
 "lines above would need some minor editing :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:393
+#: contrib/config-daemon.scm:420
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:405
+#: contrib/config-daemon.scm:432
 msgid "Disable automatic establishment of connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:406
+#: contrib/config-daemon.scm:433
 msgid ""
 "If this option is enabled, GNUnet will not automatically establish "
 "connections to other peers, but instead wait for applications to "
@@ -4371,22 +4681,22 @@
 "connect to us)."
 msgstr ""
 
-#: contrib/config-daemon.scm:417
+#: contrib/config-daemon.scm:444
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:418
+#: contrib/config-daemon.scm:445
 msgid ""
 "This option maybe useful during testing, but turning it off is dangerous! If "
 "in any doubt, set it to YES (which is the default)."
 msgstr ""
 
-#: contrib/config-daemon.scm:429
+#: contrib/config-daemon.scm:456
 #, fuzzy
 msgid "Port for communication with GNUnet user interfaces"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: contrib/config-daemon.scm:430
+#: contrib/config-daemon.scm:457
 msgid ""
 "Which is the client-server port that is used between gnunetd and the clients "
 "(TCP only).  You may firewall this port for non-local machines (but you do "
@@ -4394,11 +4704,11 @@
 "connections from machines that are listed under TRUSTED)."
 msgstr ""
 
-#: contrib/config-daemon.scm:441
+#: contrib/config-daemon.scm:468
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:442
+#: contrib/config-daemon.scm:469
 msgid ""
 "This option specifies which hosts are trusted enough to connect as clients "
 "(to the TCP port).  This is useful if you run gnunetd on one host of your "
@@ -4409,71 +4719,71 @@
 "separated by a semicolon, spaces are not allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:481
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:455
+#: contrib/config-daemon.scm:482
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If it is set, "
 "only the specified peers are allowed. Specify the list of peer IDs (not IPs!)"
 msgstr ""
 
-#: contrib/config-daemon.scm:466
+#: contrib/config-daemon.scm:493
 #, fuzzy
 msgid "Run gnunetd as this group."
 msgstr "Kör gnunet-update"
 
-#: contrib/config-daemon.scm:467
+#: contrib/config-daemon.scm:494
 msgid ""
 "When started as root, gnunetd will change permissions to the given group."
 msgstr ""
 
-#: contrib/config-daemon.scm:478
+#: contrib/config-daemon.scm:505
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:479
+#: contrib/config-daemon.scm:506
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If the ID of a "
 "peer is listed here, connections from that peer will be refused.  Specify "
 "the list of peer IDs (not IPs!)"
 msgstr ""
 
-#: contrib/config-daemon.scm:490
+#: contrib/config-daemon.scm:517
 msgid "Topology Maintenance"
 msgstr ""
 
-#: contrib/config-daemon.scm:491
+#: contrib/config-daemon.scm:518
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:511
+#: contrib/config-daemon.scm:538
 #, fuzzy
 msgid "General settings"
 msgstr "Andra inställningar"
 
-#: contrib/config-daemon.scm:512
+#: contrib/config-daemon.scm:539
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:536
+#: contrib/config-daemon.scm:564
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:537
+#: contrib/config-daemon.scm:565
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:554
+#: contrib/config-daemon.scm:583
 msgid "Fundamentals"
 msgstr ""
 
-#: contrib/config-daemon.scm:574
+#: contrib/config-daemon.scm:603
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:576
+#: contrib/config-daemon.scm:605
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -4482,52 +4792,89 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:589
+#: contrib/config-daemon.scm:618 contrib/config-daemon.scm:631
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:591
+#: contrib/config-daemon.scm:619
+msgid "Which database should be used for the temporary datastore of the DHT?"
+msgstr ""
+
+#: contrib/config-daemon.scm:633
 msgid ""
-"Which topology should be used?  The only options at the moment are "
-"\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
-"to connect to a diverse set of peers, and welcome connections from anyone.  "
-"In f2f (friend-to-friend) mode, GNUnet will only allow connections from "
-"peers that are explicitly listed in a FRIENDS file.  Note that you can list "
-"peers in the FRIENDS file that run in default mode.\n"
-"\n"
-"Use f2f only if you have (trustworthy) friends that use GNUnet and are "
-"afraid of establishing (direct) connections to unknown peers."
+"Which topology should be used?  The only option at the moment is "
+"\"topology_default\""
 msgstr ""
 
-#: contrib/config-daemon.scm:607
+#: contrib/config-daemon.scm:647
+msgid ""
+"Minimum number of connected friends before this peer is allowed to connect "
+"to peers that are not listed as friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:648
+msgid ""
+"Note that this option does not guarantee that the peer will be able to "
+"connect to the specified number of friends.  Also, if the peer had connected "
+"to a sufficient number of friends and then established non-friend "
+"connections, some of the friends may drop out of the network, temporarily "
+"resulting in having fewer than the specified number of friends connected "
+"while being connected to non-friends.  However, it is guaranteed that the "
+"peer itself will never choose to drop a friend's connection if this would "
+"result in dropping below the specified number of friends (unless that number "
+"is higher than the overall connection target)."
+msgstr ""
+
+#: contrib/config-daemon.scm:659
+msgid ""
+"If set to YES, the peer is only allowed to connect to other peers that are "
+"explicitly specified as friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:660
+msgid ""
+"Use YES only if you have (trustworthy) friends that use GNUnet and are "
+"afraid of establishing (direct) connections to unknown peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:671
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:608
+#: contrib/config-daemon.scm:672
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:622
+#: contrib/config-daemon.scm:683
+msgid "Friend-to-Friend Topology Specification"
+msgstr ""
+
+#: contrib/config-daemon.scm:684
+#, fuzzy
+msgid "Settings for restricting connections to friends"
+msgstr "\"%s\" misslyckades. Terminerar anslutning till klient.\n"
+
+#: contrib/config-daemon.scm:701
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:634
+#: contrib/config-daemon.scm:713
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:646
+#: contrib/config-daemon.scm:725
 #, fuzzy
 msgid "Configuration of the MySQL database"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: contrib/config-daemon.scm:665
+#: contrib/config-daemon.scm:744
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:667
+#: contrib/config-daemon.scm:746
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -4538,19 +4885,19 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:681
+#: contrib/config-daemon.scm:760
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:693
+#: contrib/config-daemon.scm:772
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:706
+#: contrib/config-daemon.scm:785
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:708
+#: contrib/config-daemon.scm:787
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -4562,13 +4909,13 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:722
+#: contrib/config-daemon.scm:801
 msgid ""
 "MB of diskspace GNUnet can use for caching DHT index data (the data will be "
 "stored in /tmp)"
 msgstr ""
 
-#: contrib/config-daemon.scm:723
+#: contrib/config-daemon.scm:802
 msgid ""
 "DHT index data is inherently small and expires comparatively quickly.  It is "
 "deleted whenever gnunetd is shut down.\n"
@@ -4576,21 +4923,21 @@
 "The size of the DSTORE QUOTA is specified in MB."
 msgstr ""
 
-#: contrib/config-daemon.scm:737
+#: contrib/config-daemon.scm:816
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "aktiverar (anonym) fildelning"
 
-#: contrib/config-daemon.scm:756
+#: contrib/config-daemon.scm:835
 #, fuzzy
 msgid "Applications"
 msgstr "_Alternativ"
 
-#: contrib/config-daemon.scm:772
+#: contrib/config-daemon.scm:851
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:773
+#: contrib/config-daemon.scm:852
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port and that cannot be traversed using UPnP.  Note "
@@ -4600,18 +4947,21 @@
 "contact you directly.  You can use 'make check' in src/transports/upnp/ to "
 "find out if your NAT supports UPnP.  You can also use gnunet-transport-check "
 "with the '-p' option in order to determine which setting results in more "
-"connections.  Use YES only if you get no connections otherwise."
+"connections.  Use YES only if you get no connections otherwise.  Set to AUTO "
+"to use YES if the local IP is belongs to a private IP network and NO "
+"otherwise."
 msgstr ""
 
-#: contrib/config-daemon.scm:784
+#: contrib/config-daemon.scm:863
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:796 contrib/config-daemon.scm:901
+#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:941
+#: contrib/config-daemon.scm:1078
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:797
+#: contrib/config-daemon.scm:876
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP.  You should disable this option if you are sure that you are "
@@ -4619,30 +4969,38 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:808 contrib/config-daemon.scm:925
-#: contrib/config-daemon.scm:980 contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:887 contrib/config-daemon.scm:1102
+#: contrib/config-daemon.scm:1157 contrib/config-daemon.scm:1222
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:820
+#: contrib/config-daemon.scm:899
 msgid ""
 "Which IPs are allowed to connect? Leave empty to use the IP of your primary "
 "network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:832
+#: contrib/config-daemon.scm:911
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:850
+#: contrib/config-daemon.scm:929
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:862
+#: contrib/config-daemon.scm:942 contrib/config-daemon.scm:1079
+msgid ""
+"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
+"supports UPnP. You should disable this option if you are sure that you are "
+"not behind a NAT.  If your NAT box does not support UPnP, having this on "
+"will not do much harm (only cost a small amount of resources)."
+msgstr ""
+
+#: contrib/config-daemon.scm:953
 msgid "Which is the external port of the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:863
+#: contrib/config-daemon.scm:954
 msgid ""
 "Use this option if your firewall maps say port 80 to your real HTTP port.  "
 "This can be useful in making the HTTP messages appear even more legit "
@@ -4650,91 +5008,129 @@
 "priviledged port)."
 msgstr ""
 
-#: contrib/config-daemon.scm:874
+#: contrib/config-daemon.scm:965
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:889
-msgid "Which port should be used by the UDP IPv4 transport?"
+#: contrib/config-daemon.scm:984
+msgid "What is the maximum transfer unit for SMTP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:902
+#: contrib/config-daemon.scm:996
+msgid "Which e-mail address should be used to send e-mail to this peer?"
+msgstr ""
+
+#: contrib/config-daemon.scm:997
 msgid ""
-"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
-"supports UPnP. You should disable this option if you are sure that you are "
-"not behind a NAT.  If your NAT box does not support UPnP, having this on "
-"will not do much harm (only cost a small amount of resources)."
+"You must make sure that e-mail received at this address is forwarded to the "
+"PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with "
+"procmail and the PIPE option to set the name of the pipe."
 msgstr ""
 
-#: contrib/config-daemon.scm:913
+#: contrib/config-daemon.scm:1008
+msgid ""
+"Which header line should other peers include in e-mails to enable filtering?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1009
+msgid ""
+"You can specify a header line here which can then be used by procmail to "
+"filter GNUnet e-mail from your inbox and forward it to gnunetd."
+msgstr ""
+
+#: contrib/config-daemon.scm:1020
+msgid "What is the filename of the pipe where gnunetd can read its e-mail?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1021
+msgid "Have a look at contrib/dot-procmailrc for an example .procmailrc file."
+msgstr ""
+
+#: contrib/config-daemon.scm:1032
+msgid "What is the name and port of the server for outgoing e-mail?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1033
+msgid "The basic format is HOSTNAME:PORT."
+msgstr ""
+
+#: contrib/config-daemon.scm:1044
+msgid "SMTP transport"
+msgstr ""
+
+#: contrib/config-daemon.scm:1066
+msgid "Which port should be used by the UDP IPv4 transport?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1090
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:937
+#: contrib/config-daemon.scm:1114
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow connections from any "
 "IP."
 msgstr ""
 
-#: contrib/config-daemon.scm:949
+#: contrib/config-daemon.scm:1126
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:968
+#: contrib/config-daemon.scm:1145
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:992 contrib/config-daemon.scm:1057
+#: contrib/config-daemon.scm:1169 contrib/config-daemon.scm:1234
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow any IP to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:1004
+#: contrib/config-daemon.scm:1181
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1021
+#: contrib/config-daemon.scm:1198
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1033
+#: contrib/config-daemon.scm:1210
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1069
+#: contrib/config-daemon.scm:1246
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1087
+#: contrib/config-daemon.scm:1264
 #, fuzzy
 msgid "Network interface"
 msgstr "Nätverksgränssnitt:"
 
-#: contrib/config-daemon.scm:1099
+#: contrib/config-daemon.scm:1276
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1111
+#: contrib/config-daemon.scm:1288
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1123
+#: contrib/config-daemon.scm:1300
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1146
+#: contrib/config-daemon.scm:1324
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1158
+#: contrib/config-daemon.scm:1336
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1170
+#: contrib/config-daemon.scm:1348
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1172
+#: contrib/config-daemon.scm:1350
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -4744,11 +5140,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1183
+#: contrib/config-daemon.scm:1361
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1185
+#: contrib/config-daemon.scm:1363
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4758,36 +5154,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1196
+#: contrib/config-daemon.scm:1374
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1197
+#: contrib/config-daemon.scm:1375
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1208
+#: contrib/config-daemon.scm:1386
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1209
+#: contrib/config-daemon.scm:1387
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1220
+#: contrib/config-daemon.scm:1398
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1232
+#: contrib/config-daemon.scm:1410
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1234
+#: contrib/config-daemon.scm:1412
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -4832,12 +5228,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1251
+#: contrib/config-daemon.scm:1429
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Nätverksgränssnitt:"
 
-#: contrib/config-daemon.scm:1252
+#: contrib/config-daemon.scm:1430
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -4848,11 +5244,11 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1263
+#: contrib/config-daemon.scm:1441
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1288 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1466 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -4986,160 +5382,644 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
+#: src/setup/gtk/gnunet-setup.glade:9 src/setup/gtk/gnunet-setup.glade:167
+#: src/setup/gtk/gnunet-setup.glade:435 src/setup/gtk/gnunet-setup.glade:845
+#: src/setup/gtk/gnunet-setup.glade:1178
 #, fuzzy
-#~ msgid "Run gnunetd as this user."
-#~ msgstr "Kör gnunet-update"
+msgid "GNUnet configuration assistant"
+msgstr "GNUnet-konfiguration"
 
+#: src/setup/gtk/gnunet-setup.glade:34
 #, fuzzy
-#~ msgid "Path settings"
-#~ msgstr "Andra inställningar"
+msgid ""
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org\n";
+"and join our community at\n"
+"\thttps://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"The GNUnet team"
+msgstr ""
+"Välkommen till GNUnet!\n"
+"\n"
+"Denna assistant kommer att fråga dig några enkla frågor för att konfigurera "
+"GNUnet.\n"
+"\n"
+"Vänligen besök på webbplats på\n"
+"\thttp://gnunet.org/\n";
+"och gå med i vår gemenskap på\n"
+"\thttp://gnunet.org/drupal/\n";
+"\n"
+"Ha det så kul,\n"
+"\n"
+"the GNUnet team"
 
-#~ msgid "specify nickname"
-#~ msgstr "ange smeknamn"
+#: src/setup/gtk/gnunet-setup.glade:92 src/setup/gtk/gnunet-setup.glade:360
+#: src/setup/gtk/gnunet-setup.glade:767 src/setup/gtk/gnunet-setup.glade:1384
+msgid "Next"
+msgstr "Nästa"
 
-#~ msgid "Start GNUnet chat client."
-#~ msgstr "Starta GNUnets chattklient."
+#: src/setup/gtk/gnunet-setup.glade:194
+msgid ""
+"Enter information about your network connection here.\n"
+"\n"
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL.\n"
+"\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address.\n"
+"\n"
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, check the last option on this page. Leave it "
+"unchecked on direct connections through modems, ISDN cards and DNAT (also "
+"known as \"port forwarding\")."
+msgstr ""
 
-#~ msgid "Could not connect to gnunetd.\n"
-#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+#: src/setup/gtk/gnunet-setup.glade:250
+msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+msgstr ""
 
-#~ msgid "You must specify a nickname (use option `%s').\n"
-#~ msgstr "Du måste ange ett smeknamn (använd flagga \"%s\").\n"
+#: src/setup/gtk/gnunet-setup.glade:283
+msgid "IP-Address/Hostname:"
+msgstr "IP-adress/Värdnamn:"
 
-#~ msgid "Could not send message to gnunetd\n"
-#~ msgstr "Kunde inte skicka meddelande till gnunetd\n"
+#: src/setup/gtk/gnunet-setup.glade:296
+msgid "Network interface:"
+msgstr "Nätverksgränssnitt:"
 
-#, 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"
+#: src/setup/gtk/gnunet-setup.glade:319
+msgid "Network connection"
+msgstr "Nätverksanslutning"
 
-#~ msgid "Database failed to delete `%s'.\n"
-#~ msgstr "Databas misslyckades att ta bort \"%s\".\n"
+#: src/setup/gtk/gnunet-setup.glade:462
+msgid ""
+"You can limit GNUnet's ressource usage here.\n"
+"\n"
+"\"Bandwidth limitation\" is how much data may be sent per second. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection.\n"
+"\n"
+"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
+"to use."
+msgstr ""
 
+#: src/setup/gtk/gnunet-setup.glade:520
+msgid "Downstream (Bytes/s):"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:547
+msgid "Upstream (Bytes/s):"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:561
+msgid "Bandwidth limitation"
+msgstr "Bandbreddsbegränsning"
+
+#: src/setup/gtk/gnunet-setup.glade:580
+msgid "Use denoted bandwidth for GNUnet"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:596
+msgid "Share denoted bandwidth with other applications"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:614
+msgid "Bandwidth sharing"
+msgstr "Bandbreddsdelning"
+
+#: src/setup/gtk/gnunet-setup.glade:636
+msgid "Max. CPU usage (%):"
+msgstr "Max. CPU-användning (%):"
+
+#: src/setup/gtk/gnunet-setup.glade:659
+msgid "CPU usage"
+msgstr "CPU-användning"
+
+#: src/setup/gtk/gnunet-setup.glade:682
 #, fuzzy
-#~ msgid ""
-#~ "Welcome to GNUnet!\n"
-#~ "\n"
-#~ "This assistant will ask you a few basic questions in order to configure "
-#~ "GNUnet.\n"
-#~ "\n"
-#~ "Please visit our homepage at\n"
-#~ "\thttp://gnunet.org\n";
-#~ "and join our community at\n"
-#~ "\thttps://gnunet.org/drupal/\n";
-#~ "\n"
-#~ "Have a lot of fun,\n"
-#~ "\n"
-#~ "The GNUnet team"
-#~ msgstr ""
-#~ "Välkommen till GNUnet!\n"
-#~ "\n"
-#~ "Denna assistant kommer att fråga dig några enkla frågor för att "
-#~ "konfigurera GNUnet.\n"
-#~ "\n"
-#~ "Vänligen besök på webbplats på\n"
-#~ "\thttp://gnunet.org/\n";
-#~ "och gå med i vår gemenskap på\n"
-#~ "\thttp://gnunet.org/drupal/\n";
-#~ "\n"
-#~ "Ha det så kul,\n"
-#~ "\n"
-#~ "the GNUnet team"
+msgid "Load limitation"
+msgstr "Bandbreddsbegränsning"
 
-#~ msgid "Next"
-#~ msgstr "Nästa"
+#: src/setup/gtk/gnunet-setup.glade:872
+msgid ""
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability.\n"
+"\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content). Its maximum size can be specified below.\n"
+"\n"
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
+"\n"
+"After changing the configuration and/or updating GNUnet, it is sometimes "
+"required to run gnunet-update to update internal data structures. Depending "
+"on the changes made, this may take some time."
+msgstr ""
 
-#~ msgid "Network interface:"
-#~ msgstr "Nätverksgränssnitt:"
+#: src/setup/gtk/gnunet-setup.glade:905
+msgid "Store migrated content"
+msgstr ""
 
-#~ msgid "IP-Address/Hostname:"
-#~ msgstr "IP-adress/Värdnamn:"
+#: src/setup/gtk/gnunet-setup.glade:923
+msgid "Maximum datastore size (MB):"
+msgstr ""
 
-#~ msgid "Network connection"
-#~ msgstr "Nätverksanslutning"
+#: src/setup/gtk/gnunet-setup.glade:952
+msgid "Start the GNUnet background process on computer startup"
+msgstr ""
 
-#~ msgid "Bandwidth limitation"
-#~ msgstr "Bandbreddsbegränsning"
+#: src/setup/gtk/gnunet-setup.glade:969
+#, fuzzy
+msgid "Open the enhanced configurator"
+msgstr "Kunde inte spara konfiguration!"
 
-#~ msgid "Bandwidth sharing"
-#~ msgstr "Bandbreddsdelning"
+#: src/setup/gtk/gnunet-setup.glade:986
+msgid "Run gnunet-update"
+msgstr "Kör gnunet-update"
 
-#~ msgid "Max. CPU usage (%):"
-#~ msgstr "Max. CPU-användning (%):"
+#: src/setup/gtk/gnunet-setup.glade:1015 src/setup/gtk/gnunet-setup.glade:1299
+msgid "Other settings"
+msgstr "Andra inställningar"
 
-#~ msgid "CPU usage"
-#~ msgstr "CPU-användning"
+#: src/setup/gtk/gnunet-setup.glade:1100
+msgid "Finish"
+msgstr "Slutför"
 
-#~ msgid "Run gnunet-update"
-#~ msgstr "Kör gnunet-update"
+#: src/setup/gtk/gnunet-setup.glade:1205
+msgid ""
+"Define the user and the group owning the GNUnet service here.\n"
+"\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account and a new group under which the GNUnet service is started at system "
+"startup.\n"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the fields empty to run GNUnet with system privileges."
+msgstr ""
 
-#~ msgid "Other settings"
-#~ msgstr "Andra inställningar"
+#: src/setup/gtk/gnunet-setup.glade:1239
+msgid "User account:"
+msgstr "Användarkonto:"
 
-#~ msgid "Finish"
-#~ msgstr "Slutför"
+#: src/setup/gtk/gnunet-setup.glade:1279
+msgid "Group:"
+msgstr "Grupp:"
 
-#~ msgid "Group:"
-#~ msgstr "Grupp:"
+#: src/setup/gtk/gnunet-setup.glade:1462
+#, fuzzy
+msgid "gnunet-setup"
+msgstr "Kör gnunet-update"
 
-#~ msgid "User account:"
-#~ msgstr "Användarkonto:"
+#: src/setup/gtk/gnunet-setup.glade:1481
+#, fuzzy
+msgid "Save configuration"
+msgstr "GNUnet-konfiguration"
 
+#: src/setup/gtk/gnunet-setup.glade:1493
+msgid "Show copyright information for gnunet-setup."
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1526
 #, fuzzy
-#~ msgid "gnunet-setup"
-#~ msgstr "Kör gnunet-update"
+msgid "About gnunet-setup"
+msgstr "Kör gnunet-update"
 
+#: src/setup/gtk/gnunet-setup.glade:1531
+msgid "(C) 2001-2007 Christian Grothoff (and other contributing authors)"
+msgstr ""
+
+#: src/setup/gtk/gnunet-setup.glade:1532
 #, fuzzy
-#~ msgid "Save configuration"
-#~ msgstr "GNUnet-konfiguration"
+msgid "This is the configuration tool for GNUnet."
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#~ msgid "Start GNUnet-testbed helper."
-#~ msgstr "Starta hjälpprogrammet GNUnet-testbed."
+#: src/setup/gtk/gnunet-setup.glade:1535
+msgid ""
+"\t\t    GNU GENERAL PUBLIC LICENSE\n"
+"\t\t       Version 2, June 1991\n"
+"\n"
+" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
+"     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+" Everyone is permitted to copy and distribute verbatim copies\n"
+" of this license document, but changing it is not allowed.\n"
+"\n"
+"\t\t\t    Preamble\n"
+"\n"
+"  The licenses for most software are designed to take away your\n"
+"freedom to share and change it.  By contrast, the GNU General Public\n"
+"License is intended to guarantee your freedom to share and change free\n"
+"software--to make sure the software is free for all its users.  This\n"
+"General Public License applies to most of the Free Software\n"
+"Foundation's software and to any other program whose authors commit to\n"
+"using it.  (Some other Free Software Foundation software is covered by\n"
+"the GNU Library General Public License instead.)  You can apply it to\n"
+"your programs, too.\n"
+"\n"
+"  When we speak of free software, we are referring to freedom, not\n"
+"price.  Our General Public Licenses are designed to make sure that you\n"
+"have the freedom to distribute copies of free software (and charge for\n"
+"this service if you wish), that you receive source code or can get it\n"
+"if you want it, that you can change the software or use pieces of it\n"
+"in new free programs; and that you know you can do these things.\n"
+"\n"
+"  To protect your rights, we need to make restrictions that forbid\n"
+"anyone to deny you these rights or to ask you to surrender the rights.\n"
+"These restrictions translate to certain responsibilities for you if you\n"
+"distribute copies of the software, or if you modify it.\n"
+"\n"
+"  For example, if you distribute copies of such a program, whether\n"
+"gratis or for a fee, you must give the recipients all the rights that\n"
+"you have.  You must make sure that they, too, receive or can get the\n"
+"source code.  And you must show them these terms so they know their\n"
+"rights.\n"
+"\n"
+"  We protect your rights with two steps: (1) copyright the software, and\n"
+"(2) offer you this license which gives you legal permission to copy,\n"
+"distribute and/or modify the software.\n"
+"\n"
+"  Also, for each author's protection and ours, we want to make certain\n"
+"that everyone understands that there is no warranty for this free\n"
+"software.  If the software is modified by someone else and passed on, we\n"
+"want its recipients to know that what they have is not the original, so\n"
+"that any problems introduced by others will not reflect on the original\n"
+"authors' reputations.\n"
+"\n"
+"  Finally, any free program is threatened constantly by software\n"
+"patents.  We wish to avoid the danger that redistributors of a free\n"
+"program will individually obtain patent licenses, in effect making the\n"
+"program proprietary.  To prevent this, we have made it clear that any\n"
+"patent must be licensed for everyone's free use or not licensed at all.\n"
+"\n"
+"  The precise terms and conditions for copying, distribution and\n"
+"modification follow.\n"
+"\n"
+"\t\t    GNU GENERAL PUBLIC LICENSE\n"
+"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
+"\n"
+"  0. This License applies to any program or other work which contains\n"
+"a notice placed by the copyright holder saying it may be distributed\n"
+"under the terms of this General Public License.  The \"Program\", below,\n"
+"refers to any such program or work, and a \"work based on the Program\"\n"
+"means either the Program or any derivative work under copyright law:\n"
+"that is to say, a work containing the Program or a portion of it,\n"
+"either verbatim or with modifications and/or translated into another\n"
+"language.  (Hereinafter, translation is included without limitation in\n"
+"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
+"\n"
+"Activities other than copying, distribution and modification are not\n"
+"covered by this License; they are outside its scope.  The act of\n"
+"running the Program is not restricted, and the output from the Program\n"
+"is covered only if its contents constitute a work based on the\n"
+"Program (independent of having been made by running the Program).\n"
+"Whether that is true depends on what the Program does.\n"
+"\n"
+"  1. You may copy and distribute verbatim copies of the Program's\n"
+"source code as you receive it, in any medium, provided that you\n"
+"conspicuously and appropriately publish on each copy an appropriate\n"
+"copyright notice and disclaimer of warranty; keep intact all the\n"
+"notices that refer to this License and to the absence of any warranty;\n"
+"and give any other recipients of the Program a copy of this License\n"
+"along with the Program.\n"
+"\n"
+"You may charge a fee for the physical act of transferring a copy, and\n"
+"you may at your option offer warranty protection in exchange for a fee.\n"
+"\n"
+"  2. You may modify your copy or copies of the Program or any portion\n"
+"of it, thus forming a work based on the Program, and copy and\n"
+"distribute such modifications or work under the terms of Section 1\n"
+"above, provided that you also meet all of these conditions:\n"
+"\n"
+"    a) You must cause the modified files to carry prominent notices\n"
+"    stating that you changed the files and the date of any change.\n"
+"\n"
+"    b) You must cause any work that you distribute or publish, that in\n"
+"    whole or in part contains or is derived from the Program or any\n"
+"    part thereof, to be licensed as a whole at no charge to all third\n"
+"    parties under the terms of this License.\n"
+"\n"
+"    c) If the modified program normally reads commands interactively\n"
+"    when run, you must cause it, when started running for such\n"
+"    interactive use in the most ordinary way, to print or display an\n"
+"    announcement including an appropriate copyright notice and a\n"
+"    notice that there is no warranty (or else, saying that you provide\n"
+"    a warranty) and that users may redistribute the program under\n"
+"    these conditions, and telling the user how to view a copy of this\n"
+"    License.  (Exception: if the Program itself is interactive but\n"
+"    does not normally print such an announcement, your work based on\n"
+"    the Program is not required to print an announcement.)\n"
+"\n"
+"These requirements apply to the modified work as a whole.  If\n"
+"identifiable sections of that work are not derived from the Program,\n"
+"and can be reasonably considered independent and separate works in\n"
+"themselves, then this License, and its terms, do not apply to those\n"
+"sections when you distribute them as separate works.  But when you\n"
+"distribute the same sections as part of a whole which is a work based\n"
+"on the Program, the distribution of the whole must be on the terms of\n"
+"this License, whose permissions for other licensees extend to the\n"
+"entire whole, and thus to each and every part regardless of who wrote it.\n"
+"\n"
+"Thus, it is not the intent of this section to claim rights or contest\n"
+"your rights to work written entirely by you; rather, the intent is to\n"
+"exercise the right to control the distribution of derivative or\n"
+"collective works based on the Program.\n"
+"\n"
+"In addition, mere aggregation of another work not based on the Program\n"
+"with the Program (or with a work based on the Program) on a volume of\n"
+"a storage or distribution medium does not bring the other work under\n"
+"the scope of this License.\n"
+"\n"
+"  3. You may copy and distribute the Program (or a work based on it,\n"
+"under Section 2) in object code or executable form under the terms of\n"
+"Sections 1 and 2 above provided that you also do one of the following:\n"
+"\n"
+"    a) Accompany it with the complete corresponding machine-readable\n"
+"    source code, which must be distributed under the terms of Sections\n"
+"    1 and 2 above on a medium customarily used for software interchange; "
+"or,\n"
+"\n"
+"    b) Accompany it with a written offer, valid for at least three\n"
+"    years, to give any third party, for a charge no more than your\n"
+"    cost of physically performing source distribution, a complete\n"
+"    machine-readable copy of the corresponding source code, to be\n"
+"    distributed under the terms of Sections 1 and 2 above on a medium\n"
+"    customarily used for software interchange; or,\n"
+"\n"
+"    c) Accompany it with the information you received as to the offer\n"
+"    to distribute corresponding source code.  (This alternative is\n"
+"    allowed only for noncommercial distribution and only if you\n"
+"    received the program in object code or executable form with such\n"
+"    an offer, in accord with Subsection b above.)\n"
+"\n"
+"The source code for a work means the preferred form of the work for\n"
+"making modifications to it.  For an executable work, complete source\n"
+"code means all the source code for all modules it contains, plus any\n"
+"associated interface definition files, plus the scripts used to\n"
+"control compilation and installation of the executable.  However, as a\n"
+"special exception, the source code distributed need not include\n"
+"anything that is normally distributed (in either source or binary\n"
+"form) with the major components (compiler, kernel, and so on) of the\n"
+"operating system on which the executable runs, unless that component\n"
+"itself accompanies the executable.\n"
+"\n"
+"If distribution of executable or object code is made by offering\n"
+"access to copy from a designated place, then offering equivalent\n"
+"access to copy the source code from the same place counts as\n"
+"distribution of the source code, even though third parties are not\n"
+"compelled to copy the source along with the object code.\n"
+"\n"
+"  4. You may not copy, modify, sublicense, or distribute the Program\n"
+"except as expressly provided under this License.  Any attempt\n"
+"otherwise to copy, modify, sublicense or distribute the Program is\n"
+"void, and will automatically terminate your rights under this License.\n"
+"However, parties who have received copies, or rights, from you under\n"
+"this License will not have their licenses terminated so long as such\n"
+"parties remain in full compliance.\n"
+"\n"
+"  5. You are not required to accept this License, since you have not\n"
+"signed it.  However, nothing else grants you permission to modify or\n"
+"distribute the Program or its derivative works.  These actions are\n"
+"prohibited by law if you do not accept this License.  Therefore, by\n"
+"modifying or distributing the Program (or any work based on the\n"
+"Program), you indicate your acceptance of this License to do so, and\n"
+"all its terms and conditions for copying, distributing or modifying\n"
+"the Program or works based on it.\n"
+"\n"
+"  6. Each time you redistribute the Program (or any work based on the\n"
+"Program), the recipient automatically receives a license from the\n"
+"original licensor to copy, distribute or modify the Program subject to\n"
+"these terms and conditions.  You may not impose any further\n"
+"restrictions on the recipients' exercise of the rights granted herein.\n"
+"You are not responsible for enforcing compliance by third parties to\n"
+"this License.\n"
+"\n"
+"  7. If, as a consequence of a court judgment or allegation of patent\n"
+"infringement or for any other reason (not limited to patent issues),\n"
+"conditions are imposed on you (whether by court order, agreement or\n"
+"otherwise) that contradict the conditions of this License, they do not\n"
+"excuse you from the conditions of this License.  If you cannot\n"
+"distribute so as to satisfy simultaneously your obligations under this\n"
+"License and any other pertinent obligations, then as a consequence you\n"
+"may not distribute the Program at all.  For example, if a patent\n"
+"license would not permit royalty-free redistribution of the Program by\n"
+"all those who receive copies directly or indirectly through you, then\n"
+"the only way you could satisfy both it and this License would be to\n"
+"refrain entirely from distribution of the Program.\n"
+"\n"
+"If any portion of this section is held invalid or unenforceable under\n"
+"any particular circumstance, the balance of the section is intended to\n"
+"apply and the section as a whole is intended to apply in other\n"
+"circumstances.\n"
+"\n"
+"It is not the purpose of this section to induce you to infringe any\n"
+"patents or other property right claims or to contest validity of any\n"
+"such claims; this section has the sole purpose of protecting the\n"
+"integrity of the free software distribution system, which is\n"
+"implemented by public license practices.  Many people have made\n"
+"generous contributions to the wide range of software distributed\n"
+"through that system in reliance on consistent application of that\n"
+"system; it is up to the author/donor to decide if he or she is willing\n"
+"to distribute software through any other system and a licensee cannot\n"
+"impose that choice.\n"
+"\n"
+"This section is intended to make thoroughly clear what is believed to\n"
+"be a consequence of the rest of this License.\n"
+"\n"
+"  8. If the distribution and/or use of the Program is restricted in\n"
+"certain countries either by patents or by copyrighted interfaces, the\n"
+"original copyright holder who places the Program under this License\n"
+"may add an explicit geographical distribution limitation excluding\n"
+"those countries, so that distribution is permitted only in or among\n"
+"countries not thus excluded.  In such case, this License incorporates\n"
+"the limitation as if written in the body of this License.\n"
+"\n"
+"  9. The Free Software Foundation may publish revised and/or new versions\n"
+"of the General Public License from time to time.  Such new versions will\n"
+"be similar in spirit to the present version, but may differ in detail to\n"
+"address new problems or concerns.\n"
+"\n"
+"Each version is given a distinguishing version number.  If the Program\n"
+"specifies a version number of this License which applies to it and \"any\n"
+"later version\", you have the option of following the terms and conditions\n"
+"either of that version or of any later version published by the Free\n"
+"Software Foundation.  If the Program does not specify a version number of\n"
+"this License, you may choose any version ever published by the Free "
+"Software\n"
+"Foundation.\n"
+"\n"
+"  10. If you wish to incorporate parts of the Program into other free\n"
+"programs whose distribution conditions are different, write to the author\n"
+"to ask for permission.  For software which is copyrighted by the Free\n"
+"Software Foundation, write to the Free Software Foundation; we sometimes\n"
+"make exceptions for this.  Our decision will be guided by the two goals\n"
+"of preserving the free status of all derivatives of our free software and\n"
+"of promoting the sharing and reuse of software generally.\n"
+"\n"
+"\t\t\t    NO WARRANTY\n"
+"\n"
+"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
+"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
+"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
+"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
+"EXPRESSED\n"
+"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
+"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
+"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
+"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
+"REPAIR OR CORRECTION.\n"
+"\n"
+"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
+"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
+"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
+"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
+"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
+"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
+"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
+"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
+"POSSIBILITY OF SUCH DAMAGES.\n"
+"\n"
+"\t\t     END OF TERMS AND CONDITIONS\n"
+"\n"
+"\t    How to Apply These Terms to Your New Programs\n"
+"\n"
+"  If you develop a new program, and you want it to be of the greatest\n"
+"possible use to the public, the best way to achieve this is to make it\n"
+"free software which everyone can redistribute and change under these terms.\n"
+"\n"
+"  To do so, attach the following notices to the program.  It is safest\n"
+"to attach them to the start of each source file to most effectively\n"
+"convey the exclusion of warranty; and each file should have at least\n"
+"the \"copyright\" line and a pointer to where the full notice is found.\n"
+"\n"
+"    <one line to give the program's name and a brief idea of what it does.>\n"
+"    Copyright (C) <year>  <name of author>\n"
+"\n"
+"    This program is free software; you can redistribute it and/or modify\n"
+"    it under the terms of the GNU General Public License as published by\n"
+"    the Free Software Foundation; either version 2 of the License, or\n"
+"    (at your option) any later version.\n"
+"\n"
+"    This program is distributed in the hope that it will be useful,\n"
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"    GNU General Public License for more details.\n"
+"\n"
+"    You should have received a copy of the GNU General Public License\n"
+"    along with this program; if not, write to the Free Software\n"
+"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+"USA\n"
+"\n"
+"\n"
+"Also add information on how to contact you by electronic and paper mail.\n"
+"\n"
+"If the program is interactive, make it output a short notice like this\n"
+"when it starts in an interactive mode:\n"
+"\n"
+"    Gnomovision version 69, Copyright (C) year  name of author\n"
+"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
+"w'.\n"
+"    This is free software, and you are welcome to redistribute it\n"
+"    under certain conditions; type `show c' for details.\n"
+"\n"
+"The hypothetical commands `show w' and `show c' should show the appropriate\n"
+"parts of the General Public License.  Of course, the commands you use may\n"
+"be called something other than `show w' and `show c'; they could even be\n"
+"mouse-clicks or menu items--whatever suits your program.\n"
+"\n"
+"You should also get your employer (if you work as a programmer) or your\n"
+"school, if any, to sign a \"copyright disclaimer\" for the program, if\n"
+"necessary.  Here is a sample; alter the names:\n"
+"\n"
+"  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
+"  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
+"\n"
+"  <signature of Ty Coon>, 1 April 1989\n"
+"  Ty Coon, President of Vice\n"
+"\n"
+"This General Public License does not permit incorporating your program into\n"
+"proprietary programs.  If your program is a subroutine library, you may\n"
+"consider it more useful to permit linking proprietary applications with the\n"
+"library.  If this is what you want to do, use the GNU Library General\n"
+"Public License instead of this License.\n"
+msgstr ""
 
-#~ msgid "Could not execute `%s': %s\n"
-#~ msgstr "Kunde inte köra \"%s\": %s\n"
+#: src/setup/gtk/gnunet-setup.glade:1917
+msgid "Not for English ;-)"
+msgstr ""
 
-#~ msgid "Command `%s' not found!\n"
-#~ msgstr "Kommando \"%s\" hittades inte!\n"
+#~ msgid ""
+#~ "You must specify the name of a pipe for the SMTP transport in section `%"
+#~ "s' under `%s'.\n"
+#~ msgstr ""
+#~ "Du måste ange ett namn på röret för SMTP-transporten i sektion \"%s\" "
+#~ "under \"%s\".\n"
 
-#~ msgid "size of `%s' message is too short. Ignoring.\n"
-#~ msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
+#, fuzzy
+#~ msgid "Failed to initialize libesmtp: %s.\n"
+#~ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#~ msgid "size of `%s' message is wrong. Ignoring.\n"
-#~ msgstr "storlek på \"%s\" meddelande är fel. Ignorerar.\n"
+#~ msgid "Sending E-mail to `%s' failed.\n"
+#~ msgstr "Sändning av e-post till \"%s\" misslyckades.\n"
 
-#~ msgid "received invalid `%s' message\n"
-#~ msgstr "mottog ogiltigt \"%s\" meddelande\n"
+#~ msgid "%.*s filter %s (SMTP)"
+#~ msgstr "%.*s filter %s (SMTP)"
 
-#~ msgid "`%s' %s failed: %s\n"
-#~ msgstr "\"%s\" %s misslyckades: %s\n"
+#, fuzzy
+#~ msgid "Network configuration: NAT"
+#~ msgstr "GNUnet-konfiguration"
 
-#~ msgid "received invalid `%s' message: %s.\n"
-#~ msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
+#, fuzzy
+#~ msgid "Run gnunetd as this user."
+#~ msgstr "Kör gnunet-update"
 
-#~ msgid "'..' is not allowed in file name (%s).\n"
-#~ msgstr "\"..\" tillåts inte i filnamn (%s).\n"
+#, fuzzy
+#~ msgid "Path settings"
+#~ msgstr "Andra inställningar"
 
-#~ msgid "Upload refused!"
-#~ msgstr "Uppladdning vägrades!"
+#~ msgid "specify nickname"
+#~ msgstr "ange smeknamn"
 
-#~ msgid "Invalid message received at %s:%d."
-#~ msgstr "Ogiltigt meddelande mottogs den %s:%d."
+#~ msgid "Start GNUnet chat client."
+#~ msgstr "Starta GNUnets chattklient."
 
-#~ msgid "Could not resolve name of HTTP proxy `%s'.\n"
-#~ msgstr "Kunde inte slå upp namn för HTTP-proxy \"%s\".\n"
+#~ msgid "Could not connect to gnunetd.\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#~ msgid "Invalid URL `%s' (must begin with `%s')\n"
-#~ msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
+#~ msgid "You must specify a nickname (use option `%s').\n"
+#~ msgstr "Du måste ange ett smeknamn (använd flagga \"%s\").\n"
 
-#~ msgid "Failed to send HTTP request to host `%s': %s\n"
-#~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+#~ msgid "Could not send message to gnunetd\n"
+#~ msgstr "Kunde inte skicka meddelande till gnunetd\n"
 
-#~ msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
-#~ msgstr "Misslyckades att skicka HTTP-begäran \"%s\" till värd \"%s\": %s\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 "Error log:\n"
 #~ msgstr "Fel"
@@ -5159,9 +6039,6 @@
 #~ msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 #~ msgstr "Väntar på att gnunetd ska starta (%u iterationer kvar)...\n"
 
-#~ msgid "Waiting for peers to connect (%u iterations left)...\n"
-#~ msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
-
 #~ msgid "`%s' failed (%d, %u). Will not send PING.\n"
 #~ msgstr "\"%s\" misslyckades (%d, %u). Kommer inte skicka PING.\n"
 
@@ -5236,15 +6113,9 @@
 #~ msgid "Received invalid `%s' request (wrong table)\n"
 #~ msgstr "Mottog ogiltig \"%s\" begäran (fel tabell)\n"
 
-#~ msgid "Received unknown request type %d at %s:%d\n"
-#~ msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
-
 #~ msgid "gnunetd signaled error in response to `%s' message\n"
 #~ msgstr "gnunetd signalerade fel i svar till \"%s\" meddelande\n"
 
-#~ msgid "Failed to receive response to `%s' message from gnunetd\n"
-#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
 #~ msgid "Failed to send `%s' message to gnunetd\n"
 #~ msgstr "Misslyckades att skicka \"%s\" meddelande till gnunetd\n"
 
@@ -5518,9 +6389,6 @@
 #~ msgid "Argument %d: `%s'\n"
 #~ msgstr "Argument %d: \"%s\"\n"
 
-#~ msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
-#~ msgstr "%s: Vägrade anslutning från svartlistad adress %u.%u.%u.%u.\n"
-
 #~ msgid "Could not resolve name of SMTP server `%s': %s"
 #~ msgstr "Kunde inte slå upp namnet för SMTP-server \"%s\": %s"
 

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2007-12-10 02:47:03 UTC (rev 5850)
+++ GNUnet/po/vi.po     2007-12-10 03:20:09 UTC (rev 5851)
@@ -2,12 +2,12 @@
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # Copyright (C) YEAR Christian Grothoff.
 # Phan Vinh Thinh <address@hidden>, 2005.
-#: contrib/config-daemon.scm:555
+#: contrib/config-daemon.scm:584
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-09-29 16:48-0600\n"
+"POT-Creation-Date: 2007-12-09 19:48-0700\n"
 "PO-Revision-Date: 2005-07-05 21:18+0400\n"
 "Last-Translator: Phan Vinh Thinh <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -16,732 +16,1171 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: src/transports/ip6.c:75 src/util/network/io.c:85
+#: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:541
+#: src/transports/http.c:1320 src/transports/http.c:1413
+#: src/transports/http.c:1588 src/transports/http.c:2014
+#: src/transports/http.c:2075 src/applications/bootstrap_http/http.c:123
+#: src/applications/bootstrap_http/http.c:257
+#: src/applications/bootstrap_http/http.c:274
+#: src/applications/bootstrap_http/http.c:306
+#: src/applications/bootstrap_http/http.c:325
+#: src/applications/bootstrap_http/http.c:338
+#: src/applications/bootstrap_http/http.c:348
+#: src/applications/bootstrap_http/http.c:358
 #, 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/upnp/upnp.c:431
+#, 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:476
+#, c-format
+msgid "upnp: NAT Returned IP: %s\n"
+msgstr ""
+
+#: src/transports/ip6.c:77 src/util/network/io.c:86
+#, 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:84 src/util/network/ip.c:146
+#: src/transports/ip6.c:109 src/util/network/ip.c:87 src/util/network/ip.c:151
 #, 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:135 src/util/network/ip.c:115
-#: src/util/network/ip.c:221
+#: src/transports/ip6.c:140 src/util/network/ip.c:118
+#: src/util/network/ip.c:237
 #, 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:167
+#: src/transports/ip6.c:174
 #, fuzzy, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Không tìm thấy '%s': %s\n"
 
-#: src/transports/ip6.c:219 src/transports/ip.c:60
+#: src/transports/ip6.c:228 src/transports/ip.c:61
 #, 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:123 src/transports/udp.c:129
+#: src/transports/tcp6.c:249
+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:317
+#, fuzzy, c-format
+msgid "`%s': unknown service: %s\n"
+msgstr "'%s': không rõ dịch vụ: %s\n"
+
+#: src/transports/tcp6.c:420 src/transports/tcp.c:462
 #, 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/tcp6.c:531
+#, fuzzy
+msgid "# bytes received via TCP6"
+msgstr "# byte nhận được qua TCP"
+
+#: src/transports/tcp6.c:532
+#, fuzzy
+msgid "# bytes sent via TCP6"
+msgstr "# Byte gửi qua TCP"
+
+#: src/transports/tcp6.c:534
+#, fuzzy
+msgid "# bytes dropped by TCP6 (outgoing)"
+msgstr "# byte loại đi bởi TCP (đi ra)"
+
+#: src/transports/udp6.c:131 src/transports/udp.c:135
+#, 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:264
+#: src/transports/udp6.c:277
 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:471 src/transports/udp.c:520
+#: src/transports/udp6.c:495 src/transports/udp.c:544
 #, 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/udp6.c:476
+#: src/transports/udp6.c:501
 #, fuzzy
 msgid "# bytes received via UDP6"
 msgstr "# byte nhận được qua UDP"
 
-#: src/transports/udp6.c:477
+#: src/transports/udp6.c:502
 #, fuzzy
 msgid "# bytes sent via UDP6"
 msgstr "# byte gửi qua UDP"
 
-#: src/transports/udp6.c:479
+#: src/transports/udp6.c:504
 #, fuzzy
 msgid "# bytes dropped by UDP6 (outgoing)"
 msgstr "# byte loại bỏ bởi UDP (đi ra)"
 
-#: src/transports/udp6.c:481
+#: src/transports/udp6.c:506
 msgid "# UDP6 connections (right now)"
 msgstr ""
 
-#: src/transports/http.c:824
+#: src/transports/http.c:875
 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:1235 src/transports/http.c:1309
-#: src/transports/http.c:1464 src/transports/http.c:1858
-#: src/transports/http.c:1894 src/transports/upnp/upnp.c:356
-#: src/transports/upnp/upnp.c:540 src/applications/bootstrap_http/http.c:122
-#: src/applications/bootstrap_http/http.c:254
-#: src/applications/bootstrap_http/http.c:270
-#: src/applications/bootstrap_http/http.c:301
-#: src/applications/bootstrap_http/http.c:320
-#: src/applications/bootstrap_http/http.c:333
-#: src/applications/bootstrap_http/http.c:343
-#: src/applications/bootstrap_http/http.c:353
-#, 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:2080
+#: src/transports/http.c:2290
 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:2089
+#: src/transports/http.c:2299
 msgid "# bytes received via HTTP"
 msgstr "# byte nhận được qua HTTP"
 
-#: src/transports/http.c:2090
+#: src/transports/http.c:2300
 msgid "# bytes sent via HTTP"
 msgstr "# byte gửi qua HTTP"
 
-#: src/transports/http.c:2092
+#: src/transports/http.c:2302
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte loại bỏ bởi HTTP (đi ra)"
 
-#: 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 ""
-"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:358
+#: src/transports/smtp.c:362
 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: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:454
+#, fuzzy
+msgid "SMTP filter string to invalid, lacks ': '\n"
+msgstr "Đầu lọc SMTP quá dài, đổi thành '%s'\n"
 
-#: src/transports/smtp.c:471
+#: src/transports/smtp.c:464
 #, 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:571
+#: src/transports/smtp.c:552 src/transports/smtp.c:563
+#: src/transports/smtp.c:577 src/transports/smtp.c:597
+#: src/transports/smtp.c:622 src/transports/smtp.c:631
+#: src/transports/smtp.c:645 src/transports/smtp.c:657
 #, fuzzy, c-format
-msgid "Failed to initialize libesmtp: %s.\n"
-msgstr "Chạy dịch vụ '%s' không thành công.\n"
+msgid "SMTP: `%s' failed: %s.\n"
+msgstr "'%s' %s không thành công: %s\n"
 
-#: 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:802
+#, fuzzy
+msgid "No email-address specified, can not start SMTP transport.\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:702
-#, c-format
-msgid "%.*s filter %s (SMTP)"
-msgstr "%.*s đầu lọc %s (SMTP)"
+#: src/transports/smtp.c:815
+#, fuzzy
+msgid "# bytes received via SMTP"
+msgstr "# byte nhận được qua TCP"
 
-#: 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/smtp.c:816
+#, fuzzy
+msgid "# bytes sent via SMTP"
+msgstr "# Byte gửi qua TCP"
 
-#: src/transports/tcp.c:290
+#: src/transports/smtp.c:818
 #, fuzzy
+msgid "# bytes dropped by SMTP (outgoing)"
+msgstr "# byte loại đi bởi TCP (đi ra)"
+
+#: src/transports/tcp_helper.c:260
+#, 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:279
+#, 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/tcp.c:296
+#, 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:389
+#: src/transports/tcp.c:401
 #, 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:442 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:561
+#: src/transports/tcp.c:584
 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:570
+#: src/transports/tcp.c:593
 msgid "# bytes received via TCP"
 msgstr "# byte nhận được qua TCP"
 
-#: src/transports/tcp.c:571
+#: src/transports/tcp.c:594
 msgid "# bytes sent via TCP"
 msgstr "# Byte gửi qua TCP"
 
-#: src/transports/tcp.c:573
+#: src/transports/tcp.c:596
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte loại đi bởi TCP (đi ra)"
 
-#: src/transports/udp.c:288
+#: src/transports/udp.c:301
 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:384
+#: src/transports/udp.c:400
 #, 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:535
+#: src/transports/udp.c:560
 msgid "# bytes received via UDP"
 msgstr "# byte nhận được qua UDP"
 
-#: src/transports/udp.c:536
+#: src/transports/udp.c:561
 msgid "# bytes sent via UDP"
 msgstr "# byte gửi qua UDP"
 
-#: src/transports/udp.c:538
+#: src/transports/udp.c:563
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte loại bỏ bởi UDP (đi ra)"
 
-#: src/transports/udp.c:540
+#: src/transports/udp.c:565
 #, fuzzy
 msgid "# UDP connections (right now)"
 msgstr "Kết nối mạng"
 
-#: 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/udp_helper.c:96
+#, fuzzy
+msgid "Received malformed message from udp-peer connection. Closing.\n"
+msgstr ""
+"Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
+"đóng.\n"
 
-#: src/transports/tcp6.c:312
+#: src/setup/ncurses/mconf.c:86
+msgid "Exit"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:89
+msgid "Up"
+msgstr "Lên"
+
+#: src/setup/ncurses/mconf.c:92 src/setup/gtk/gnunet-setup.glade:136
+#: src/setup/gtk/gnunet-setup.glade:404 src/setup/gtk/gnunet-setup.glade:814
+#: src/setup/gtk/gnunet-setup.glade:1147 src/setup/gtk/gnunet-setup.glade:1431
+msgid "Cancel"
+msgstr "Dừng"
+
+#: src/setup/ncurses/mconf.c:183 src/setup/ncurses/mconf.c:288
+#: src/setup/ncurses/mconf.c:371 src/setup/ncurses/mconf.c:471
+#: src/setup/ncurses/wizard_curs.c:111 src/setup/ncurses/wizard_curs.c:176
+#: src/setup/ncurses/wizard_curs.c:292
+msgid "Internal error! (Choice invalid?)"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:219 src/setup/ncurses/mconf.c:418
+msgid "Internal error! (Value invalid?)"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:404
+msgid "Invalid input, expecting floating point value."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:450
+msgid "Invalid input, expecting integer."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:458
+msgid "Value is not in legal range."
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:527
+#, fuzzy
+msgid "GNUnet Configuration"
+msgstr "Cấu hình GNUnet"
+
+#: src/setup/ncurses/mconf.c:527 src/setup/text/conf.c:569
 #, fuzzy, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "'%s': không rõ dịch vụ: %s\n"
+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/transports/tcp6.c:512
+#: src/setup/ncurses/mconf.c:533
 #, fuzzy
-msgid "# bytes received via TCP6"
-msgstr "# byte nhận được qua TCP"
+msgid "Do you wish to save your new configuration?"
+msgstr "Ghi thiết lập?"
 
-#: src/transports/tcp6.c:513
+#: src/setup/ncurses/mconf.c:547
+#, fuzzy, c-format
+msgid ""
+"\n"
+"End of configuration.\n"
+msgstr "Cấu hình GNUnet"
+
+#: src/setup/ncurses/mconf.c:552
+#, 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:65 src/setup/lib/wizard_util.c:140
+#: src/setup/lib/wizard_util.c:195
+msgid "Error"
+msgstr "Lỗi"
+
+#: src/setup/ncurses/wizard_curs.c:73 src/setup/gtk/gconf.c:444
+msgid "Help"
+msgstr "Trợ giúp"
+
+#: src/setup/ncurses/wizard_curs.c:80
 #, fuzzy
-msgid "# bytes sent via TCP6"
-msgstr "# Byte gửi qua TCP"
+msgid "Error!"
+msgstr "Lỗi"
 
-#: src/transports/tcp6.c:515
+#: src/setup/ncurses/wizard_curs.c:94 src/applications/vpn/vpn.c:1454
+msgid "No"
+msgstr "Không"
+
+#: src/setup/ncurses/wizard_curs.c:95 src/applications/vpn/vpn.c:1454
+msgid "Yes"
+msgstr "Có"
+
+#: src/setup/ncurses/wizard_curs.c:143
 #, fuzzy
-msgid "# bytes dropped by TCP6 (outgoing)"
-msgstr "# byte loại đi bởi TCP (đi ra)"
+msgid "Abort"
+msgstr "_Nói về"
 
-#: src/transports/tcp_helper.c:257
-#, fuzzy
-msgid "Received malformed message instead of welcome message. Closing.\n"
+#: src/setup/ncurses/wizard_curs.c:144
+msgid "Ok"
 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:276
+#: src/setup/ncurses/wizard_curs.c:211 src/setup/ncurses/wizard_curs.c:277
+#: src/setup/ncurses/wizard_curs.c:418
+msgid "GNUnet configuration"
+msgstr "Cấu hình GNUnet"
+
+#: src/setup/ncurses/wizard_curs.c:213
 #, fuzzy
-msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgid ""
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org/\n";
+"and join our community at\n"
+"\thttp://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"the GNUnet team"
 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"
+"Xin chào mừng tới GNUnet!\n"
+"\n"
+"Trình giúp đỡ này sẽ hỏi bạn vài câu cơ bản để cấu hình GNUnet.\n"
+"\n"
+"Xin hãy thăm trang chủ của chúng tôi tại\n"
+"\thttp://www.gnunet.org\n";
+"và tham gia cộng đồng tại\n"
+"\thttp://www.gnunet.org/drupal/\n";
+"\n"
+"Chúc có nhiều niềm vui,\n"
+"\n"
+"đội GNUnet"
 
-#: 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/setup/ncurses/wizard_curs.c:279
+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/transports/upnp/upnp.c:475
-#, c-format
-msgid "upnp: NAT Returned IP: %s\n"
+#: src/setup/ncurses/wizard_curs.c:297 src/setup/ncurses/wizard_curs.c:311
+msgid ""
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL."
 msgstr ""
+"\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây thường là "
+"một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL."
 
-#: src/transports/udp_helper.c:96
+#: src/setup/ncurses/wizard_curs.c:308
 #, fuzzy
-msgid "Received malformed message from udp-peer connection. Closing.\n"
-msgstr ""
-"Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
-"đóng.\n"
+msgid "Network configuration: interface"
+msgstr "Giao diện mạng:"
 
-#: src/applications/dht/tools/dht-query.c:55
+#: src/setup/ncurses/wizard_curs.c:310
+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:321
 #, fuzzy
-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."
+msgid "Network configuration: IP"
+msgstr "Cấu hình GNUnet"
 
-#: src/applications/dht/tools/dht-query.c:60
+#: src/setup/ncurses/wizard_curs.c:323
 #, fuzzy
+msgid "What is this computer's public IP address or hostname?"
+msgstr ""
+"Địa chỉ IP công cộng hoặc tên của máy tính này là gì?\n"
+"\n"
+"Nếu không biết, hãy để trống."
+
+#: src/setup/ncurses/wizard_curs.c:324
+#, 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:99
-#, c-format
-msgid "%s(%s) operation returned no results.\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If left empty, GNUnet will try to automatically detect the IP.\n"
+"You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
+"If in doubt, leave this empty."
 msgstr ""
+"Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh"
+"\"), thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay "
+"đổi sau mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn luôn "
+"chỉ tới địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập nó ở "
+"đây.\n"
+"Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra địa "
+"chỉ IP."
 
-#: src/applications/dht/tools/dht-query.c:116
-#, fuzzy, c-format
-msgid "Issuing '%s(%s,%s)' command.\n"
-msgstr "'%s(%s,%s)' thất bại.\n"
+#: src/setup/ncurses/wizard_curs.c:339
+#, fuzzy
+msgid "Bandwidth configuration: upload"
+msgstr "Giới hạn băng thông"
 
-#: src/applications/dht/tools/dht-query.c:123
-#, c-format
-msgid "'%s(%s,%s)' succeeded\n"
-msgstr "'%s(%s,%s)' đã thành công\n"
+#: src/setup/ncurses/wizard_curs.c:341
+#, 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/applications/dht/tools/dht-query.c:127
-#, c-format
-msgid "'%s(%s,%s)' failed.\n"
-msgstr "'%s(%s,%s)' thất bại.\n"
+#: src/setup/ncurses/wizard_curs.c:342
+#, fuzzy
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
+"you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
+msgstr ""
+"Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
+"\n"
+"\"Dòng ra\" là kênh dữ liệu qua đó *gửi* dữ liệu tới internet. Có thể giới "
+"hạn hoặc cho cả máy tính này hoặc chỉ giới hạn cho GNUnet. Người dùng có thể "
+"chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
+"internet lớn nhất."
 
-#: src/applications/dht/tools/dht-query.c:151
-#, 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/setup/ncurses/wizard_curs.c:354
+#, fuzzy
+msgid "Bandwidth configuration: download"
+msgstr "Giới hạn băng thông"
 
-#: src/applications/dht/tools/dht-query.c:164
-#, 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/setup/ncurses/wizard_curs.c:356
+#, 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/applications/dht/tools/dht-query.c:181
-#, 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/setup/ncurses/wizard_curs.c:357
+#, fuzzy
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
+"If you have a flatrate, you can set it to the maximum speed of your internet "
+"connection. You should not use a value that is higher than what your actual "
+"connection allows."
+msgstr ""
+"Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
+"\n"
+"\"Dòng vào\" là kênh dữ liệu qua đó *nhận* dữ liệu từ internet. Có thể giới "
+"hạn hoặc cho cả máy tính này hoặc chỉ giới hạn cho GNUnet. Người dùng có thể "
+"chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
+"internet lớn nhất."
 
-#: src/applications/dht/tools/dht-query.c:192
-#, fuzzy, c-format
-msgid "Unsupported command `%s'.  Aborting.\n"
-msgstr "Câu lệnh không hỗ trợ '%s'.  Đang thoát.\n"
+#: src/setup/ncurses/wizard_curs.c:369
+#, fuzzy
+msgid "Quota configuration"
+msgstr "Cấu hình GNUnet"
 
-#: src/applications/dht/module/table.c:716
+#: src/setup/ncurses/wizard_curs.c:370
+msgid "What is the maximum size of the datastore in MB?"
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:371
 #, fuzzy
-msgid "# dht connections"
-msgstr "Kết nối mạng"
+msgid ""
+"The GNUnet datastore contains all content that GNUnet needs to store "
+"(indexed, inserted and migrated content)."
+msgstr ""
+"Kích thước lớn nhất của kho dữ liệu tính theo MB?\n"
+"\n"
+"Kho dữ liệu GNUnet chứa tất cả các dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, "
+"nội dung chèn và nhập vào)."
 
-#: src/applications/dht/module/table.c:718
+#: src/setup/ncurses/wizard_curs.c:383
 #, fuzzy
-msgid "# dht discovery messages received"
-msgstr "# nhận được thông báo PING đã mã hóa"
+msgid "Daemon configuration: user account"
+msgstr "Không tạo được tài khoản người dùng:"
 
-#: src/applications/dht/module/table.c:720
-msgid "# dht route host lookups performed"
+#: src/setup/ncurses/wizard_curs.c:384
+msgid "As which user should gnunetd be run?"
 msgstr ""
 
-#: src/applications/dht/module/table.c:722
+#: src/setup/ncurses/wizard_curs.c:386
 #, fuzzy
-msgid "# dht discovery messages sent"
-msgstr "# đã gửi các thông báo PING mã hóa"
+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"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the field empty to run GNUnet with system privileges.\n"
+msgstr ""
+"Xác định người dùng sở hữu dịch vụ GNUnet.\n"
+"\n"
+"Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng mới sở hữu dịch "
+"vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
+"\n"
+"Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao gồm "
+"các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho phép "
+"người dùng chỉ ra dưới đây quyền đọc chúng.\n"
+"\n"
+"Để trống để chạy GNUnet với quyền hệ thống.\n"
+"Người dùng GNUnet:"
 
-#: 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/setup/ncurses/wizard_curs.c:403
+msgid "Daemon configuration: group account"
+msgstr ""
 
-#: 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/setup/ncurses/wizard_curs.c:404
+msgid "As which group should gnunetd be run?"
+msgstr ""
 
-#: src/applications/dht/module/cs.c:251
-msgid "Enables efficient non-anonymous routing"
+#: src/setup/ncurses/wizard_curs.c:406
+#, fuzzy
+msgid ""
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
+"\n"
+"You can also specify a already existant group here.\n"
+"\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
 msgstr ""
+"Xác định nhóm sở hữu dịch vụ GNUnet.\n"
+"\n"
+"Vì lý do bảo mật, nên để cài đặt này tạo một nhóm mới cho tài khoản người "
+"dùng đã chọn\n"
+"\n"
+"Cũng có thể chỉ ra một nhóm đã có.\n"
+"\n"
+"Chỉ thành viên của nhóm này mới có quyền chạy và dừng máy chủ GNUnet và có "
+"truy cập tới dữ liệu máy chủ GNUnet.\n"
+"\n"
+"Nhóm GNUnet:"
 
-#: src/applications/dht/module/routing.c:736
-msgid "# dht replies routed"
+#: src/setup/ncurses/wizard_curs.c:420
+msgid "Do you want to automatically launch GNUnet as a system service?"
 msgstr ""
 
-#: src/applications/dht/module/routing.c:738
+#: src/setup/ncurses/wizard_curs.c:422
 #, fuzzy
-msgid "# dht requests routed"
-msgstr "# nhận được yêu cầu theo vết trace p2p"
+msgid ""
+"If you say \"yes\" here, the GNUnet background process will be automatically "
+"started when you turn on your computer. If you say \"no\" here, you have to "
+"launch GNUnet yourself each time you want to use it."
+msgstr ""
+"Chạy GNUnet như một dịch vụ hệ thống?\n"
+"\n"
+"Nếu chọn \"yes\", tiến trình nền sau GNUnet sẽ tự động chạy khi bật máy "
+"tính. Nếu chọn \"no\", thì cần chạy GNUnet mỗi khi muốn sử dụng."
 
-#: src/applications/dht/module/routing.c:740
+#: src/setup/ncurses/wizard_curs.c:445 src/setup/gtk/wizard_gtk.c:415
+#, 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/ncurses/wizard_curs.c:464
 #, fuzzy
-msgid "# dht get requests received"
-msgstr "# nhận được yêu cầu theo vết trace p2p"
+msgid "Unable to create user account for daemon."
+msgstr "Không tạo được tài khoản người dùng:"
 
-#: src/applications/dht/module/routing.c:742
+#: src/setup/ncurses/wizard_curs.c:471
+msgid "Unable to setup autostart for daemon."
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:486
 #, fuzzy
-msgid "# dht put requests received"
-msgstr "# nhận được yêu cầu theo vết trace p2p"
+msgid "Save configuration?"
+msgstr "Cấu hình GNUnet"
 
-#: src/applications/dht/module/routing.c:744
+#: src/setup/ncurses/wizard_curs.c:487
 #, fuzzy
-msgid "# dht results received"
-msgstr "# nhận được yêu cầu theo vết trace p2p"
+msgid "Save configuration now?"
+msgstr "Cấu hình GNUnet"
 
-#: 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/setup/ncurses/wizard_curs.c:531 src/setup/gtk/gnunet-setup.glade:723
+#: src/setup/gtk/gnunet-setup.glade:1056 src/setup/gtk/gnunet-setup.glade:1340
+msgid "Back"
+msgstr "Quay lại"
 
-#: 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/setup/text/conf.c:79
+#, fuzzy
+msgid "yes"
+msgstr "Có"
 
-#: 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/setup/text/conf.c:80
+msgid "no"
+msgstr ""
 
-#: 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"
-
-#: src/applications/chat/chat.c:160
+#: src/setup/text/conf.c:106
 #, c-format
-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"
+msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgstr ""
 
-#: 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/setup/text/conf.c:115
+msgid "\tPossible choices:\n"
+msgstr ""
 
-#: src/applications/chat/chat.c:219
-msgid "enables P2P-chat (incomplete)"
+#: src/setup/text/conf.c:123
+msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:45
-msgid "Join a chat on GNUnet."
+#: src/setup/text/conf.c:125
+#, c-format
+msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:49
-msgid "set the nickname to use (requred)"
+#: src/setup/text/conf.c:143
+#, c-format
+msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:52
-msgid "set the chat room to join (requred)"
+#: src/setup/text/conf.c:147
+#, c-format
+msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:134
+#: src/setup/text/conf.c:153
+#, c-format
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
+msgstr ""
+
+#: src/setup/text/conf.c:187
 #, 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"
+msgid "Yes\n"
+msgstr "Có"
 
-#: src/applications/chat/gnunet-chat.c:144
+#: src/setup/text/conf.c:192
 #, fuzzy, c-format
-msgid "Failed to join the room\n"
-msgstr "Không kết gắn được tới cổng UDP %d.\n"
+msgid "No\n"
+msgstr "Không"
 
-#: src/applications/chat/gnunet-chat.c:160
+#: src/setup/text/conf.c:195 src/setup/text/conf.c:236
+#: src/setup/text/conf.c:266 src/setup/text/conf.c:329
+#: src/setup/text/conf.c:387
 #, 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"
+msgid "Help\n"
+msgstr "Trợ giúp"
 
-#: src/applications/advertising/advertising.c:193
+#: src/setup/text/conf.c:198 src/setup/text/conf.c:213
+#: src/setup/text/conf.c:276 src/setup/text/conf.c:307
+#: src/setup/text/conf.c:365
 #, 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"
+msgid "Abort\n"
+msgstr "_Nói về"
 
-#: 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/setup/text/conf.c:354 src/setup/text/conf.c:416
+#, c-format
+msgid ""
+"\n"
+"Invalid entry, try again (use '?' for help): "
+msgstr ""
 
-#: src/applications/advertising/advertising.c:374
+#: src/setup/text/conf.c:422
+#, c-format
+msgid "Unknown kind %x (internal error).  Skipping option.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:484
+msgid "\tDescend? (y/n/?) "
+msgstr ""
+
+#: src/setup/text/conf.c:493
+msgid "Aborted.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:506
 #, 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"
+msgid "Invalid entry.\n"
+msgstr "Tham số sai: "
 
-#: src/applications/advertising/advertising.c:396
-msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
+#: src/setup/text/conf.c:524
+#, c-format
+msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:544
+#: src/setup/text/conf.c:556
 #, 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"
+msgid "You can always press ENTER to keep the current value.\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:553
+#: src/setup/text/conf.c:557
+#, c-format
+msgid "Use the '%s' key to abort.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:575
+#, c-format
 msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
 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:817
-msgid "# Peer advertisements received"
-msgstr "# Nhận được quảng cáo của đầu peer"
+#: src/setup/text/conf.c:590
+#, 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/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/setup/text/conf.c:599
+#, fuzzy, c-format
+msgid "Configuration file `%s' written.\n"
+msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
 
-#: src/applications/advertising/advertising.c:823
+#: src/setup/gtk/wizard_gtk.c:141
 #, fuzzy
-msgid "# Peer advertisements confirmed via PONG"
-msgstr "# Nhận được quảng cáo của đầu peer"
+msgid "(unknown connection)"
+msgstr "Kết nối mạng"
 
-#: src/applications/advertising/advertising.c:827
+#: src/setup/gtk/wizard_gtk.c:439
 #, fuzzy
-msgid "# Peer advertisements updating earlier HELLOs"
-msgstr "# Nhận được quảng cáo của đầu peer"
+msgid "Do you want to save the new configuration?"
+msgstr "Ghi thiết lập?"
 
-#: src/applications/advertising/advertising.c:830
+#: src/setup/gtk/wizard_gtk.c:471
+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:479
+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:494
+msgid ""
+"Running gnunet-update failed.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
+"Finally, run gnunet-update manually."
+msgstr ""
+
+#: src/setup/gtk/ngconf.c:383 src/setup/gtk/gconf.c:492
 #, fuzzy
-msgid "# Peer advertisements discarded due to load"
-msgstr "# Nhận được quảng cáo của đầu peer"
+msgid "Configuration saved."
+msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
 
-#: src/applications/advertising/advertising.c:834
+#: src/setup/gtk/ngconf.c:393 src/setup/gtk/gconf.c:502
 #, fuzzy
-msgid "# Peer advertisements for unsupported transport"
-msgstr "# Nhận được quảng cáo của đầu peer"
+msgid "Failed to save configuration."
+msgstr "Không ghi được thiết lập!"
 
-#: src/applications/advertising/advertising.c:838
+#: src/setup/gtk/ngconf.c:418 src/setup/gtk/gconf.c:528
 #, fuzzy
-msgid "# Peer advertisements not confirmed due to ping busy"
-msgstr "# Nhận được quảng cáo của đầu peer"
+msgid "Configuration changed. Save?"
+msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
 
-#: src/applications/advertising/advertising.c:842
+#: src/setup/gtk/ngconf.c:431 src/setup/gtk/gconf.c:541
 #, fuzzy
-msgid "# Peer advertisements not confirmed due to lack of self ad"
-msgstr "# Nhận được quảng cáo của đầu peer"
+msgid "Error saving configuration."
+msgstr "Không ghi được thiết lập!"
 
-#: src/applications/advertising/advertising.c:846
+#: src/setup/gtk/gconf.c:389
 #, fuzzy
-msgid "# Peer advertisements not confirmed due to send error"
-msgstr "# Nhận được quảng cáo của đầu peer"
+msgid "Description"
+msgstr "Câu hỏi"
 
-#: src/applications/advertising/advertising.c:848
-msgid "# Self advertisments transmitted"
-msgstr "# Đã truyền tải tự quảng cáo"
+#: src/setup/gtk/gconf.c:405
+msgid "Value"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:850
-msgid "# Foreign advertisements forwarded"
-msgstr "# Đã chuyển tiếp quàng cáo ngoài"
+#: src/setup/gtk/gconf.c:429
+msgid "Default"
+msgstr ""
 
-#: 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/setup/gtk/gconf.c:458
+#, fuzzy
+msgid "Section"
+msgstr "Câu hỏi"
 
-#: src/applications/advertising/advertising.c:857
-#: src/applications/session/connect.c:913
-#, 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/setup/gtk/gconf.c:469
+#, fuzzy
+msgid "Option"
+msgstr "Tùy _chọn"
 
-#: src/applications/advertising/advertising.c:872
+#: src/setup/lib/tree.c:191
+#, c-format
 msgid ""
-"ensures that this peer is known by other peers and discovers other peers"
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:467
-msgid "maintains GNUnet default mesh topology"
+#: src/setup/lib/gns.c:315
+#, c-format
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:132
-#: src/applications/pingpong/pingpong.c:199
-#: src/applications/pingpong/pingpong.c:264
-#: 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/setup/lib/wizard_util.c:111
+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/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/setup/lib/wizard_util.c:117
+msgid "Can't create service"
+msgstr "Không tạo được dịch vụ"
 
-#: 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/setup/lib/wizard_util.c:121
+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/applications/pingpong/pingpong.c:303
-#: src/applications/pingpong/pingpong.c:365
+#: src/setup/lib/wizard_util.c:126
+msgid "Cannot write to the regisitry"
+msgstr "Không ghi được tới bản ghi"
+
+#: src/setup/lib/wizard_util.c:129
+msgid "Can't access the service"
+msgstr "Không truy cập được dịch vụ"
+
+#: src/setup/lib/wizard_util.c:132
+msgid "Can't delete the service"
+msgstr "Không xóa được dịch vụ"
+
+#: src/setup/lib/wizard_util.c:135
+msgid "Unknown error"
+msgstr "Lỗi không rõ"
+
+#: src/setup/lib/wizard_util.c:171
+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:175
+msgid "Error creating user"
+msgstr "Lỗi tạo người dùng"
+
+#: src/setup/lib/wizard_util.c:179
+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:184
+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:189
+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/setup/gnunet-setup.c:64
+#, c-format
+msgid "Can only set one option per invocation.\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:72
+#, c-format
 msgid ""
-"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
-"constant.\n"
+"Invalid synatx, argument to 'set' must have the format SECTION:"
+"OPTION=VALUE.\n"
 msgstr ""
-"Không tương ứng được PONG đối với bất kỳ PING. Hãy thử tăng hằng số "
-"MAX_PING_PONG.\n"
 
-#: src/applications/pingpong/pingpong.c: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/setup/gnunet-setup.c:86
+#, c-format
+msgid "Can only display one option per invocation.\n"
+msgstr ""
 
-#: src/applications/pingpong/pingpong.c:499
-msgid "# encrypted PONG messages received"
-msgstr "# nhận được thông báo PONG đã mã hóa"
+#: src/setup/gnunet-setup.c:93
+#, c-format
+msgid ""
+"Invalid synatx, argument to 'get' must have the format SECTION:OPTION.\n"
+msgstr ""
 
-#: 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/setup/gnunet-setup.c:107
+msgid "generate configuration for gnunetd, the GNUnet daemon"
+msgstr ""
 
-#: src/applications/pingpong/pingpong.c:503
-msgid "# encrypted PING messages received"
-msgstr "# nhận được thông báo PING đã mã hóa"
+#: src/setup/gnunet-setup.c:110 src/server/gnunet-update.c:265
+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/applications/pingpong/pingpong.c:505
-msgid "# PING messages created"
-msgstr "# đã tạo tin nhắn PING"
+#: src/setup/gnunet-setup.c:112
+msgid "Tool to setup GNUnet."
+msgstr ""
 
-#: src/applications/pingpong/pingpong.c:507
-#: src/applications/session/connect.c:908
-msgid "# encrypted PONG messages sent"
-msgstr "# đã gửi thông báo PONG đã mã hóa"
+#: src/setup/gnunet-setup.c:114
+#, fuzzy
+msgid "update a value in the configuration file"
+msgstr "in một giá trị từ tập tin cấu hình ra stdout"
 
-#: src/applications/pingpong/pingpong.c:511
-#: src/applications/session/connect.c:906
-msgid "# encrypted PING messages sent"
-msgstr "# đã gửi các thông báo PING mã hóa"
+#: src/setup/gnunet-setup.c:257
+#, fuzzy, c-format
+msgid "Too many arguments.\n"
+msgstr "Sai tham số dòng lệnh.\n"
 
-#: src/applications/pingpong/pingpong.c:513
+#: src/setup/gnunet-setup.c:263
 #, 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"
+msgid "No interface specified, using default\n"
+msgstr "Chưa chỉ ra tên bảng, đang dùng '%s'.\n"
 
-#: 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:526
+#: src/setup/gnunet-setup.c:340
 #, 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"
+msgid "Undefined option.\n"
+msgstr "Hiển thị mọi tùy chọn"
 
-#: 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:470
-#: src/applications/sqstore_mysql/mysql.c:480
-#: src/applications/sqstore_mysql/mysql.c:518
-#: src/applications/sqstore_mysql/mysql.c:528
-#: src/applications/sqstore_mysql/mysql.c:560
-#: src/applications/sqstore_mysql/mysql.c:571
-#: src/applications/sqstore_mysql/mysql.c:669
-#: src/applications/sqstore_mysql/mysql.c:681
-#: src/applications/sqstore_mysql/mysql.c:693
-#: src/applications/sqstore_mysql/mysql.c:707
-#: src/applications/sqstore_mysql/mysql.c:804
-#: src/applications/sqstore_mysql/mysql.c:818
-#: src/applications/sqstore_mysql/mysql.c:968
-#: src/applications/sqstore_mysql/mysql.c:980
-#: src/applications/sqstore_mysql/mysql.c:992
-#: src/applications/sqstore_mysql/mysql.c:1232
-#: src/applications/sqstore_mysql/mysql.c:1244
-#: src/applications/sqstore_mysql/mysql.c:1256
-#: src/applications/sqstore_mysql/mysql.c:1341
-#: src/applications/kvstore_sqlite/kv_sqlite.c:44
-#: src/applications/kvstore_sqlite/kv_sqlite.c:51
-#: src/applications/dstore/dstore.c:92 src/applications/dstore/dstore.c:99
-#: src/applications/dstore/dstore.c:195 src/applications/dstore/dstore.c:234
-#: src/applications/dstore/dstore.c:253 src/applications/dstore/dstore.c:308
-#: src/applications/dstore/dstore.c:326 src/applications/dstore/dstore.c:337
-#: src/applications/dstore/dstore.c:368 src/applications/dstore/dstore.c:459
-#: 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
+#: src/setup/gnunet-setup.c:391
 #, 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"
+msgid "`%s' is not available."
+msgstr "'%s' không phải là một tập tin thông thường.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:193
+#: src/setup/gnunet-setup.c:409
 #, fuzzy, c-format
-msgid "Unable to initialize SQLite: %s.\n"
-msgstr "Không chạy được SQLite.\n"
+msgid "Unknown operation `%s'\n"
+msgstr "Lỗi không rõ.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:393
+#: src/setup/gnunet-setup.c:410 src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:517 src/util/getopt/getopt.c:1072
 #, c-format
-msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
+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/setup/gnunet-win-tool.c:52
+msgid "list all network adapters"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:394
-#: src/applications/sqstore_sqlite/sqlite.c:431
-msgid "sqlite datastore"
+#: src/setup/gnunet-win-tool.c:55
+msgid "install GNUnet as Windows service"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:430
-#, c-format
-msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
+#: src/setup/gnunet-win-tool.c:58
+msgid "uninstall GNUnet service"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1276
-#: src/applications/sqstore_mysql/mysql.c:1449
-msgid "# bytes in datastore"
+#: src/setup/gnunet-win-tool.c:61
+msgid "increase the maximum number of TCP/IP connections"
 msgstr ""
 
-#: 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:313
-#, fuzzy, c-format
-msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
+#: src/setup/gnunet-win-tool.c:64
+msgid "display a file's hash value"
 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:492
+#: src/setup/gnunet-win-tool.c:123
+#, 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:126 src/setup/gnunet-win-tool.c:154
+#, 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:130 src/setup/gnunet-win-tool.c:158
+#, 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:135
+#, 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:138 src/setup/gnunet-win-tool.c:170
+#, c-format
+msgid "Unknown error.\n"
+msgstr "Lỗi không rõ.\n"
+
+#: src/setup/gnunet-win-tool.c:151
+#, c-format
+msgid "Service deleted.\n"
+msgstr "Đã xóa bỏ dịch vụ.\n"
+
+#: src/setup/gnunet-win-tool.c:163
+#, 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:167
+#, c-format
+msgid "Error: can't delete service: %s\n"
+msgstr "Lỗi: không xóa được dịch vụ: %s\n"
+
+#: src/applications/dht/tools/dhttest.c:43
+#: src/applications/dht/tools/dhttest2.c:43
+#: src/applications/dht/module/table.c:734
 #, fuzzy
-msgid "Could not create any HELLO for myself!\n"
-msgstr "Không tạo được chìa khóa máy!\n"
+msgid "# dht connections"
+msgstr "Kết nối mạng"
 
-#: src/applications/session/connect.c:592
+#: src/applications/dht/tools/dht-query.c:52
+#, fuzzy
+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:57
+#, 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:96
+#, c-format
+msgid "%s(%s) operation returned no results.\n"
+msgstr ""
+
+#: src/applications/dht/tools/dht-query.c:113
 #, 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"
+msgid "Issuing '%s(%s,%s)' command.\n"
+msgstr "'%s(%s,%s)' thất bại.\n"
 
-#: src/applications/session/connect.c:624
+#: src/applications/dht/tools/dht-query.c:120
+#, c-format
+msgid "'%s(%s,%s)' succeeded\n"
+msgstr "'%s(%s,%s)' đã thành công\n"
+
+#: src/applications/dht/tools/dht-query.c:124
+#, c-format
+msgid "'%s(%s,%s)' failed.\n"
+msgstr "'%s(%s,%s)' thất bại.\n"
+
+#: src/applications/dht/tools/dht-query.c:148
+#, 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:161
 #, 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"
+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/session/connect.c:656
+#: src/applications/dht/tools/dht-query.c:178
 #, 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"
+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/session/connect.c:666
+#: src/applications/dht/tools/dht-query.c:189
 #, 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"
+msgid "Unsupported command `%s'.  Aborting.\n"
+msgstr "Câu lệnh không hỗ trợ '%s'.  Đang thoát.\n"
 
-#: src/applications/session/connect.c:729
+#: src/applications/dht/module/cs.c:135
 #, fuzzy, c-format
-msgid ""
-"Error parsing encrypted session key from `%s', given message part size is "
-"invalid.\n"
+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:242
+#, 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:261
+msgid "Enables efficient non-anonymous routing"
 msgstr ""
-"Lỗi phân tích chìa khóa buổi làm việc đã mã hóa, kích thước của phần thông "
-"báo đưa ra là sai.\n"
 
-#: src/applications/session/connect.c:741
-#, c-format
-msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
+#: src/applications/dht/module/routing.c:747
+msgid "# dht replies routed"
 msgstr ""
 
-#: src/applications/session/connect.c:898
-msgid "# session keys sent"
-msgstr "# đã gửi các phím buổi làm việc"
+#: src/applications/dht/module/routing.c:749
+#, fuzzy
+msgid "# dht requests routed"
+msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/session/connect.c:900
-msgid "# session keys rejected"
-msgstr "# đã nhả ra các phím buổi làm việc"
+#: src/applications/dht/module/routing.c:751
+#, fuzzy
+msgid "# dht get requests received"
+msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/session/connect.c:902
-msgid "# session keys accepted"
-msgstr "# đã chấp nhận các phím buổi làm việc"
+#: src/applications/dht/module/routing.c:753
+#, fuzzy
+msgid "# dht put requests received"
+msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/session/connect.c:904
-msgid "# sessions established"
-msgstr "# đã thiết lập buổi làm việc"
+#: src/applications/dht/module/routing.c:755
+#, fuzzy
+msgid "# dht results received"
+msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/rpc/rpc.c:134 src/applications/rpc/rpc.c:175
+#: src/applications/dht/module/routing.c:759
+#, 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/dht/module/table.c:736
+#, fuzzy
+msgid "# dht discovery messages received"
+msgstr "# nhận được thông báo PING đã mã hóa"
+
+#: src/applications/dht/module/table.c:738
+msgid "# dht route host lookups performed"
+msgstr ""
+
+#: src/applications/dht/module/table.c:740
+#, fuzzy
+msgid "# dht discovery messages sent"
+msgstr "# đã gửi các thông báo PING mã hóa"
+
+#: src/applications/topology_default/topology.c:545
+#, 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_default/topology.c:562
+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_default/topology.c:576
+#, 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_default/topology.c:588
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:596
+msgid ""
+"More friendly connections required than target total number of connections.\n"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:703
+msgid "maintains GNUnet default mesh topology"
+msgstr ""
+
+#: src/applications/rpc/rpc.c:136 src/applications/rpc/rpc.c:181
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
@@ -750,7 +1189,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:218 src/applications/rpc/rpc.c:265
+#: src/applications/rpc/rpc.c:228 src/applications/rpc/rpc.c:281
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
@@ -759,684 +1198,465 @@
 "%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:237
+#: src/applications/rpc/rpc.c:250
 #, 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:285
+#: src/applications/rpc/rpc.c:303
 #, 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:909 src/applications/rpc/rpc.c:1043
-#: src/applications/rpc/rpc.c:1129
+#: src/applications/rpc/rpc.c:945 src/applications/rpc/rpc.c:1084
+#: src/applications/rpc/rpc.c:1174
 #, 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:975
+#: src/applications/rpc/rpc.c:1015
 #, 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:1307
+#: src/applications/rpc/rpc.c:1363
 #, 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:1421
+#: src/applications/rpc/rpc.c:1482
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "Chưa bỏ đăng ký RPC: %s: %p\n"
 
-#: src/applications/rpc/rpc.c:1450
+#: src/applications/rpc/rpc.c:1511
 #, 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:1466
+#: src/applications/rpc/rpc.c:1529
 #, 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:1524
+#: src/applications/rpc/rpc.c:1592
 msgid "RPC async reply invalid.\n"
 msgstr "Câu trả lời async của RPC sai.\n"
 
-#: src/applications/rpc/rpc.c:1592
+#: src/applications/rpc/rpc.c:1663
 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:421
+#: src/applications/datastore/datastore.c:170
+#: src/applications/datastore/datastore.c:184
 #, 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:1359
-#, fuzzy, c-format
-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:1471
-#: src/applications/sqstore_mysql/mysql.c:1618
-#, 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:1496
-#: src/applications/sqstore_mysql/mysql.c:1641
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
-msgstr ""
-
-#: 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:368
+#: src/applications/datastore/datastore.c:423
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:370
+#: src/applications/datastore/datastore.c:425
 msgid "# bloom filter false positives"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:373
+#: src/applications/datastore/datastore.c:428
 msgid "# bytes allowed in datastore"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:388
+#: src/applications/datastore/datastore.c:445
 #, 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:513
+#: src/applications/datastore/datastore.c:586
 #, 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: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/fragmentation/fragmentation.c:578
+msgid "# messages defragmented"
+msgstr "# thông báo đã gom lại"
 
-#: src/applications/identity/hostkey.c:143
-#, fuzzy, c-format
-msgid ""
-"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
-msgstr ""
-"Kiểm tra chìa khóa máy có trong '%s' không thành công, đang tạo chìa khóa "
-"máy mới.\n"
+#: src/applications/fragmentation/fragmentation.c:580
+msgid "# messages fragmented"
+msgstr "# thông báo đã phân mảnh"
 
-#: 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/fragmentation/fragmentation.c:581
+msgid "# fragments discarded"
+msgstr "# các mảnh bị loại bỏ"
 
-#: 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:345
+#: src/applications/fragmentation/fragmentation.c:592
 #, fuzzy, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"Tập tin '%s' trong thư mục '%s' không tương ứng quy ước tên. Đã xóa bỏ.\n"
+msgid "`%s' registering handler %d\n"
+msgstr "'%s' đăng ký trình điều khiển %d\n"
 
-#: src/applications/identity/identity.c:358
-#, fuzzy, c-format
-msgid ""
-"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
+#: src/applications/vpn/gnunet-vpn.c:51
+#: src/applications/stats/gnunet-stats.c:83
+msgid "Print statistics about GNUnet operations."
+msgstr "In thống kê về các thao tác của GNUnet."
+
+#: src/applications/vpn/gnunet-vpn.c:55
+msgid "Suppress display of asynchronous log messages"
 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:393
+#: src/applications/vpn/gnunet-vpn.c:149
+#: src/applications/stats/gnunet-stats.c:121
+#: src/applications/tbench/gnunet-tbench.c:126
+#: src/applications/tracekit/gnunet-tracekit.c:325
+#: src/applications/template/gnunet-template.c:95
 #, c-format
-msgid "Still no peers found in `%s'!\n"
+msgid "Error establishing connection with gnunetd.\n"
+msgstr "Lỗi thiết lập kết nối với gnunetd.\n"
+
+#: src/applications/vpn/vpn.c:368
+#, c-format
+msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: 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:776
+#: src/applications/vpn/vpn.c:379
 #, c-format
-msgid "Signature failed verification: peer `%s' not known.\n"
+msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/identity/identity.c:785
-msgid "Signature failed verification: signature invalid.\n"
+#: src/applications/vpn/vpn.c:412
+#, c-format
+msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:894
-#: src/applications/identity/identity.c:1014
+#: src/applications/vpn/vpn.c:468
 #, c-format
-msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
+msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:1017
+#: src/applications/vpn/vpn.c:475
 #, c-format
-msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
+msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:190
+#: src/applications/vpn/vpn.c:491
 #, c-format
-msgid ""
-"Converting peer address to string failed, transport type %d not supported\n"
+msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:244
+#: src/applications/vpn/vpn.c:563
 #, c-format
-msgid "Transport connection attempt failed, transport type %d not supported\n"
+msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:297
+#: src/applications/vpn/vpn.c:569
 #, c-format
-msgid ""
-"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
+msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: 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:494
+#: src/applications/vpn/vpn.c:606
 #, 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:553
-msgid "No transport succeeded in creating a hello!\n"
+msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: 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: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: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:808
-#, fuzzy, c-format
-msgid "Loaded transport `%s'\n"
-msgstr "(Các) truyền tải có: %s\n"
-
-#: 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:575
-msgid "# messages defragmented"
-msgstr "# thông báo đã gom lại"
-
-#: src/applications/fragmentation/fragmentation.c:577
-msgid "# messages fragmented"
-msgstr "# thông báo đã phân mảnh"
-
-#: src/applications/fragmentation/fragmentation.c:578
-msgid "# fragments discarded"
-msgstr "# các mảnh bị loại bỏ"
-
-#: 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:62
+#: src/applications/vpn/vpn.c:621
 #, c-format
-msgid "Supported peer-to-peer messages:\n"
-msgstr "Thông báo Peer to Peer được hỗ trợ:\n"
+msgid "Cannot set tunnel name to %s because of %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:65
+#: src/applications/vpn/vpn.c:631
 #, c-format
-msgid "Supported client-server messages:\n"
-msgstr "Thông báo máy khách-máy chủ hỗ trợ:\n"
+msgid "Configured tunnel name to %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:84
-#: src/applications/vpn/gnunet-vpn.c:53
-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: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: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:149
+#: src/applications/vpn/vpn.c:673
 #, c-format
-msgid "Error establishing connection with gnunetd.\n"
-msgstr "Lỗi thiết lập kết nối với gnunetd.\n"
+msgid "Cannot get socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:134
+#: src/applications/vpn/vpn.c:683
 #, c-format
-msgid "Error reading information from gnunetd.\n"
-msgstr "Lỗi đọc thông tin từ gnunetd.\n"
+msgid "Cannot set socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/clientapi.c:330
-msgid "Uptime (seconds)"
-msgstr "Đã chạy (giây)"
-
-#: src/applications/stats/statistics.c:223
+#: src/applications/vpn/vpn.c:693
 #, c-format
-msgid "% of allowed network load (up)"
-msgstr "% o tải mạng cho phép (lên)"
+msgid "Cannot set MTU for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:225
+#: src/applications/vpn/vpn.c:701
 #, c-format
-msgid "% of allowed network load (down)"
-msgstr "% o tải mạng cho phép (xuống)"
+msgid "Cannot get interface index for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:226
+#: src/applications/vpn/vpn.c:715
 #, c-format
-msgid "% of allowed cpu load"
-msgstr "% o tải cho phép của cpu"
+msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:227
+#: src/applications/vpn/vpn.c:730
 #, fuzzy, c-format
-msgid "% of allowed io load"
-msgstr "% o tải cho phép của cpu"
+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/stats/statistics.c:228
-msgid "# of connected peers"
-msgstr "# của các đầu đã kết nối"
+#: src/applications/vpn/vpn.c:746
+#, c-format
+msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgstr ""
 
-#: 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:401
+#: src/applications/vpn/vpn.c:760
 #, 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"
+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/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."
+#: src/applications/vpn/vpn.c:803
+msgid ""
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
+msgstr ""
 
-#: src/applications/stats/sqstats.c:150
-msgid "# Any-Blocks"
+#: src/applications/vpn/vpn.c:853
+#, c-format
+msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:151
-msgid "# DBlocks"
+#: src/applications/vpn/vpn.c:932
+#, c-format
+msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:152
-msgid "# SBlocks"
+#: src/applications/vpn/vpn.c:941
+#, c-format
+msgid "VPN cannot drop connection %x\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:153
-msgid "# KBlocks"
+#: src/applications/vpn/vpn.c:961
+msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:154
-msgid "# NBlocks"
+#: src/applications/vpn/vpn.c:1010
+msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:155
-msgid "# KNBlocks"
+#: src/applications/vpn/vpn.c:1018
+msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:156
-msgid "# OnDemand-Blocks"
+#: src/applications/vpn/vpn.c:1027
+msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:157
-msgid "# Unknown-Blocks"
+#: src/applications/vpn/vpn.c:1032
+#, 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:1043
+#, c-format
+msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:158
-msgid "# expired"
+#: src/applications/vpn/vpn.c:1071
+msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:159
-msgid "# expire in 1h"
+#: src/applications/vpn/vpn.c:1092
+msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:160
-msgid "# expire in 24h"
+#: src/applications/vpn/vpn.c:1099
+#, c-format
+msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:161
-msgid "# expire in 1 week"
+#: src/applications/vpn/vpn.c:1117
+#, c-format
+msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:162
-msgid "# expire in 1 month"
+#: src/applications/vpn/vpn.c:1123
+#, c-format
+msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:163
-msgid "# zero priority"
+#: src/applications/vpn/vpn.c:1140
+msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:164
-msgid "# priority one"
+#: src/applications/vpn/vpn.c:1146
+msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:165
-msgid "# priority larger than one"
+#: src/applications/vpn/vpn.c:1152
+#, c-format
+msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:166
-msgid "# no anonymity"
+#: src/applications/vpn/vpn.c:1173
+#, c-format
+msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:167
-msgid "# anonymity one"
+#: src/applications/vpn/vpn.c:1191
+#, c-format
+msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/stats/sqstats.c:168
-msgid "# anonymity larger than one"
+#: src/applications/vpn/vpn.c:1223
+msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:64
-#: 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."
+#: src/applications/vpn/vpn.c:1244
+msgid "realise add routes\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:66
-msgid "output in gnuplot format"
-msgstr "kết quả ở dạng gnuplot"
+#: src/applications/vpn/vpn.c:1296
+msgid "realise pull routes\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:70
-msgid "number of iterations"
-msgstr "số lần làm lại"
+#: src/applications/vpn/vpn.c:1350
+msgid "realise copy table\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:74
-msgid "number of messages to use per iteration"
-msgstr "số thông báo dùng cho mỗi lần làm lại"
+#: src/applications/vpn/vpn.c:1383
+msgid "Cannot store client info\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:77
-msgid "receiver host identifier (ENC file name)"
-msgstr "trình nhận tên máy (tên tập tin ENC)"
-
-#: src/applications/tbench/gnunet-tbench.c:80
-msgid "message size"
-msgstr "kích thước thông báo"
-
-#: src/applications/tbench/gnunet-tbench.c:83
-msgid "sleep for SPACE ms after each a message block"
-msgstr "ngủ SPACE miligiây sau mỗi khối tin nhắn"
-
-#: src/applications/tbench/gnunet-tbench.c:86
-msgid "time to wait for the completion of an iteration (in ms)"
-msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
-
-#: src/applications/tbench/gnunet-tbench.c:91
-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: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"
-
-#: src/applications/tbench/gnunet-tbench.c:152
+#: src/applications/vpn/vpn.c:1723
 #, fuzzy, c-format
-msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
-msgstr "Chỉ ra ID của trình nhận sai ('%s' không phải là một tên đúng).\n"
+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/tbench/gnunet-tbench.c:187
+#: src/applications/vpn/vpn.c:1728
 #, c-format
-msgid "Time:\n"
-msgstr "Thời gian:\n"
+msgid "RFC4193 my First 4 hex digits of host id are %x\n"
+msgstr ""
 
-#: 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:189
-#, c-format
-msgid "\tmin      %llums\n"
-msgstr "\tmin      %llu miligiây\n"
-
-#: 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:191
-#, c-format
-msgid "\tvariance %8.4fms\n"
-msgstr "\tkhác nhau %8.4f miligiây\n"
-
-#: src/applications/tbench/gnunet-tbench.c:193
-#, c-format
-msgid "Loss:\n"
-msgstr "Mất:\n"
-
-#: src/applications/tbench/gnunet-tbench.c:194
-#, c-format
-msgid "\tmax      %u\n"
-msgstr "\tmax      %u\n"
-
-#: src/applications/tbench/gnunet-tbench.c:195
-#, c-format
-msgid "\tmin      %u\n"
-msgstr "\tmin      %u\n"
-
-#: 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:197
-#, c-format
-msgid "\tvariance %8.4f\n"
-msgstr "\tkhác nhau %8.4f\n"
-
-#: 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:209
-#, c-format
-msgid ""
-"\n"
-"Did not receive the message from gnunetd. Is gnunetd running?\n"
+#: src/applications/vpn/vpn.c:1817
+msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
-"\n"
-"Không nhận được thông báo từ gnunetd. gnunetd đang chạy?\n"
 
-#: src/applications/tbench/tbench.c:412
-msgid "allows profiling of direct peer-to-peer connections"
+#: src/applications/vpn/vpn.c:1851
+msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:48
-msgid "probe network to the given DEPTH"
-msgstr "thử mạng tới độ sâu DEPTH đưa ra"
-
-#: src/applications/tracekit/gnunet-tracekit.c:52
-msgid ""
-"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+#: src/applications/vpn/vpn.c:1866
+msgid "RFC4193 The tun thread has ended\n"
 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: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: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:111
+#: src/applications/vpn/vpn.c:1884
 #, c-format
-msgid ""
-"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
-"vcg.\n"
+msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
-"Định dạng bị sai. Dùng 0 cho người dùng dễ đọc, 1 cho chấm, 2 cho vcg.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c: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"
+#: src/applications/gap/pid_table.c:177
+msgid "# distinct interned peer IDs in pid table"
+msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:197
-#, fuzzy, c-format
-msgid "`%s' connected to `%s'.\n"
-msgstr "'%s' kết nối tới '%s'.\n"
+#: src/applications/gap/pid_table.c:181
+msgid "# total RC of interned peer IDs in pid table"
+msgstr ""
 
-#: 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:236
+#: src/applications/gap/gap.c:1723
 #, 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: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: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: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: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: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: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:1696
+#: src/applications/gap/gap.c:1724
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1883
+#: src/applications/gap/gap.c:1916
 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:1892 src/applications/fs/module/anonymity.c:65
+#: src/applications/gap/gap.c:1927 src/applications/fs/module/anonymity.c:66
 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:1902 src/applications/gap/gap.c:1910
-#: src/applications/gap/gap.c:1921
+#: src/applications/gap/gap.c:1938 src/applications/gap/gap.c:1947
+#: src/applications/gap/gap.c:1959
 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:2183
+#: src/applications/gap/gap.c:2231
 #, fuzzy
 msgid "# gap requests total received"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2234
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2188
+#: src/applications/gap/gap.c:2236
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2190
+#: src/applications/gap/gap.c:2238
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2194
+#: src/applications/gap/gap.c:2242
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2197
+#: src/applications/gap/gap.c:2245
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2199
+#: src/applications/gap/gap.c:2247
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2202
+#: src/applications/gap/gap.c:2250
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2206
+#: src/applications/gap/gap.c:2254
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2208
+#: src/applications/gap/gap.c:2256
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2211
+#: src/applications/gap/gap.c:2259
 #, 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:2214
+#: src/applications/gap/gap.c:2262
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2216
+#: src/applications/gap/gap.c:2264
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2218
+#: src/applications/gap/gap.c:2266
 msgid "# gap spurious replies (dropped)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2220
+#: src/applications/gap/gap.c:2268
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2223
+#: src/applications/gap/gap.c:2271
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2227
+#: src/applications/gap/gap.c:2275
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2229
+#: src/applications/gap/gap.c:2277
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2231
+#: src/applications/gap/gap.c:2279
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2246
+#: src/applications/gap/gap.c:2295
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
@@ -1444,57 +1664,39 @@
 "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:2269
+#: src/applications/gap/gap.c:2319
 #, 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:177
-msgid "# distinct interned peer IDs in pid table"
-msgstr ""
-
-#: src/applications/gap/pid_table.c:181
-msgid "# total RC of interned peer IDs in pid table"
-msgstr ""
-
-#: 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: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-pseudonym.c:70
 #: src/applications/fs/tools/gnunet-insert.c:268
-#: src/applications/fs/tools/gnunet-search.c:135
+#: src/applications/fs/tools/gnunet-search.c:136
 #: 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"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:74
+#: src/applications/fs/tools/gnunet-pseudonym.c:73
 msgid "automate creation of a namespace by starting a collection"
 msgstr "tự động tạo một không gian tên bằng cách bắt đầu một thu thập"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:78
+#: src/applications/fs/tools/gnunet-pseudonym.c:77
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "tạo một tên hiệu mới dưới NICKNAME đưa ra"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:81
+#: src/applications/fs/tools/gnunet-pseudonym.c:80
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "xóa tên hiệu với TÊNNICK đưa ra"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:84
+#: src/applications/fs/tools/gnunet-pseudonym.c:83
 msgid "end automated building of a namespace (ends collection)"
 msgstr "kết thúc việc tự động xây dựng một không gian tên (kết thúc thu thập)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:86
+#: src/applications/fs/tools/gnunet-pseudonym.c:85
 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:90
+#: src/applications/fs/tools/gnunet-pseudonym.c:89
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
@@ -1502,12 +1704,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:93
+#: src/applications/fs/tools/gnunet-pseudonym.c:92
 #, 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:97
+#: src/applications/fs/tools/gnunet-pseudonym.c:96
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
@@ -1515,11 +1717,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:100
+#: src/applications/fs/tools/gnunet-pseudonym.c:99
 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:104
+#: src/applications/fs/tools/gnunet-pseudonym.c:103
 msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
@@ -1527,72 +1729,72 @@
 "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:107
+#: src/applications/fs/tools/gnunet-pseudonym.c:106
 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:140
+#: src/applications/fs/tools/gnunet-pseudonym.c:139
 #, fuzzy, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "Không gian tên '%s' có xếp hạng %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:142
+#: src/applications/fs/tools/gnunet-pseudonym.c:141
 #, fuzzy, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr "Không gian tên '%s' (%s) có xếp hạng %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:171
+#: src/applications/fs/tools/gnunet-pseudonym.c:170
 #, 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:204
+#: src/applications/fs/tools/gnunet-pseudonym.c:203
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Dừng thu thập.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:206
+#: src/applications/fs/tools/gnunet-pseudonym.c:205
 #, 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:214
+#: src/applications/fs/tools/gnunet-pseudonym.c:213
 #, fuzzy, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Đã xóa tên hiệu '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:219
+#: src/applications/fs/tools/gnunet-pseudonym.c:218
 #, 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:234
+#: src/applications/fs/tools/gnunet-pseudonym.c:233
 #, fuzzy, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Bắt đầu thu thập '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:238
+#: src/applications/fs/tools/gnunet-pseudonym.c:237
 #, 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:279
+#: src/applications/fs/tools/gnunet-pseudonym.c:280
 #, 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:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:287
 #, 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:301
+#: src/applications/fs/tools/gnunet-pseudonym.c:302
 #, 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:309
+#: src/applications/fs/tools/gnunet-pseudonym.c:310
 #, 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"
@@ -1602,38 +1804,38 @@
 msgid "==> Directory `%s':\n"
 msgstr "==> Thư mục '%s':\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:87
+#: src/applications/fs/tools/gnunet-directory.c:88
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:114
+#: src/applications/fs/tools/gnunet-directory.c:118
 #, 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:116
+#: src/applications/fs/tools/gnunet-directory.c:120
 #, 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:131
+#: src/applications/fs/tools/gnunet-directory.c:135
 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:134
+#: src/applications/fs/tools/gnunet-directory.c:138
 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:138
+#: src/applications/fs/tools/gnunet-directory.c:142
 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:141
+#: src/applications/fs/tools/gnunet-directory.c:145
 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:164
+#: src/applications/fs/tools/gnunet-directory.c:168
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "Đã liệt kê %d mục tương ứng.\n"
@@ -1809,43 +2011,43 @@
 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:418
+#: src/applications/fs/tools/gnunet-insert.c:420
 #, 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:437
+#: src/applications/fs/tools/gnunet-insert.c:440
 #, 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:464
-#: src/applications/fs/tools/gnunet-insert.c:472
-#: src/applications/fs/tools/gnunet-insert.c:480
+#: src/applications/fs/tools/gnunet-insert.c:451
+#: src/applications/fs/tools/gnunet-insert.c:459
+#: src/applications/fs/tools/gnunet-insert.c:467
+#: src/applications/fs/tools/gnunet-insert.c:475
+#: src/applications/fs/tools/gnunet-insert.c:483
 #, 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:138
+#: src/applications/fs/tools/gnunet-search.c:139
 msgid "Search GNUnet for files."
 msgstr "Tìm kiếm tập tin trong GNUnet."
 
-#: src/applications/fs/tools/gnunet-search.c:142
+#: src/applications/fs/tools/gnunet-search.c:143
 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:145
+#: src/applications/fs/tools/gnunet-search.c:146
 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:148
+#: src/applications/fs/tools/gnunet-search.c:149
 #, 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:183
+#: src/applications/fs/tools/gnunet-search.c:186
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr "Lỗi chuyển đổi tham số tới URI!\n"
@@ -1895,45 +2097,45 @@
 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:178
+#: src/applications/fs/tools/gnunet-download.c:180
 msgid "no name given"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:184
+#: src/applications/fs/tools/gnunet-download.c:186
 #, fuzzy, c-format
 msgid "Starting download `%s'\n"
 msgstr "Lỗi tải xuống: %s\n"
 
-#: src/applications/fs/tools/gnunet-download.c:225
+#: src/applications/fs/tools/gnunet-download.c:228
 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:242
+#: src/applications/fs/tools/gnunet-download.c:246
 #, 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:279
+#: src/applications/fs/tools/gnunet-download.c:289
 #, 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:320
+#: src/applications/fs/tools/gnunet-download.c:331
 #, 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:338
+#: src/applications/fs/tools/gnunet-download.c:351
 #, 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:341
+#: src/applications/fs/tools/gnunet-download.c:354
 #, 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:377
+#: src/applications/fs/tools/gnunet-download.c:391
 #, fuzzy, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Tập tin chứa với tên '%s'.\n"
@@ -1947,7 +2149,7 @@
 "Đã bỏ chỉ mục %16llu từ %16llu byte (sẽ hoàn thành sau %llu "
 "giây)                "
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:73
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1956,7 +2158,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:85
+#: src/applications/fs/tools/gnunet-unindex.c:88
 #, c-format
 msgid ""
 "\n"
@@ -1965,35 +2167,48 @@
 "\n"
 "Lỗi bỏ đánh chỉ mục tập tin: %s\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:105
+#: src/applications/fs/tools/gnunet-unindex.c:108
 msgid "Unindex files."
 msgstr "Tập tin đã bỏ đánh chỉ mục."
 
-#: src/applications/fs/tools/gnunet-unindex.c:142
+#: src/applications/fs/tools/gnunet-unindex.c:145
 #, 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:158
+#: src/applications/fs/tools/gnunet-unindex.c:163
 #, 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:228
+#: src/applications/fs/uritrack/file_info.c:134
+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:414
+#, c-format
+msgid "Deleted corrupt URI database in `%s'."
+msgstr ""
+
+#: src/applications/fs/module/dht_push.c:138
+msgid "# blocks pushed into DHT"
+msgstr ""
+
+#: src/applications/fs/module/querymanager.c:234
 #, 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:230
+#: src/applications/fs/module/querymanager.c:236
 msgid "# FS replies passed to clients"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:323
+#: src/applications/fs/module/ondemand.c:330
 #, 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:418
+#: src/applications/fs/module/ondemand.c:431
 #, fuzzy, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2004,7 +2219,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:444
+#: src/applications/fs/module/ondemand.c:457
 #, fuzzy, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2013,17 +2228,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:495
+#: src/applications/fs/module/ondemand.c:514
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:647
+#: src/applications/fs/module/ondemand.c:668
 #, 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:1170
+#: src/applications/fs/module/fs.c:1204
 #, fuzzy, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2031,82 +2246,89 @@
 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:1185
+#: src/applications/fs/module/fs.c:1219
 msgid "# FS expired replies dropped"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1187
+#: src/applications/fs/module/fs.c:1221
 #, 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:1220
+#: src/applications/fs/module/fs.c:1257
 #, 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:1266
+#: src/applications/fs/module/fs.c:1314
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:374
+#: src/applications/fs/module/migration.c:381
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:376
+#: src/applications/fs/module/migration.c:383
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:379
+#: src/applications/fs/module/migration.c:386
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/module/dht_push.c:138
-msgid "# blocks pushed into DHT"
-msgstr ""
+#: src/applications/fs/fsui/deserialize.c:772
+#, fuzzy, c-format
+msgid "FSUI state file `%s' had syntax error at offset %u.\n"
+msgstr "Tập tin trạng thái FSUI '%s' có lỗi cú pháp tại vùng %u.\n"
 
-#: src/applications/fs/fsui/search.c:234
+#: src/applications/fs/fsui/searchtest.c:154
+#: src/applications/fs/fsui/fsuitest.c:173
+#: src/applications/fs/fsui/downloadtest.c:289
+#: src/applications/fs/fsui/serializetest2.c:391
+#: src/applications/fs/fsui/serializetest3.c:163
+#: src/applications/fs/fsui/serializetest4.c:358
+#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
+#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
+msgid "AND"
+msgstr "VÀ"
+
+#: src/applications/fs/fsui/search.c:241
 msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:294
+#: src/applications/fs/fsui/download.c:311
 #, 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)."
 
-#: src/applications/fs/fsui/unindex.c:109
+#: src/applications/fs/fsui/unindex.c:114
 msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:278
+#: src/applications/fs/fsui/upload.c:328
 #, 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: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: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:214
+#: src/applications/fs/ecrs/search.c:217
 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:131
+#: src/applications/fs/ecrs/download.c:132
 #, 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:271
+#: src/applications/fs/ecrs/download.c:272
 #, fuzzy, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "'%s' %s không thành công: %s\n"
 
-#: src/applications/fs/ecrs/download.c:1001
+#: src/applications/fs/ecrs/download.c:1010
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2114,117 +2336,103 @@
 "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:1184
+#: src/applications/fs/ecrs/download.c:1205
 #, 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:155
+#: src/applications/fs/ecrs/helper.c:75
+msgid "No keywords specified!\n"
+msgstr "Chưa chỉ ra từ khóa!\n"
+
+#: src/applications/fs/ecrs/upload.c:156
 #, 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:162
+#: src/applications/fs/ecrs/upload.c:164
 #, 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:171
+#: src/applications/fs/ecrs/upload.c:173
 #, 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:183
+#: src/applications/fs/ecrs/upload.c:185
 #, fuzzy, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Không hash được '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:202
+#: src/applications/fs/ecrs/upload.c:204
 #, 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:209
+#: src/applications/fs/ecrs/upload.c:212
 #, 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:223
+#: src/applications/fs/ecrs/upload.c:226
 #, 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:296
+#: src/applications/fs/ecrs/upload.c:309
 #, 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:876
+#: src/applications/fs/ecrs/meta.c:883
 #, 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:884
+#: src/applications/fs/ecrs/meta.c:893
 #, fuzzy, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "Không đổi tên được tập tin '%s' thành '%s': tập tin tồn tại\n"
 
-#: src/applications/fs/ecrs/namespace.c:154
+#: src/applications/fs/ecrs/namespace.c:157
 #, fuzzy, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Không tạo được tên hiệu '%s', tập tin '%s' tồn tại.\n"
 
-#: src/applications/fs/ecrs/namespace.c:325
-#: src/applications/fs/ecrs/namespace.c:404
-#: src/applications/fs/ecrs/namespace.c:545
+#: src/applications/fs/ecrs/namespace.c:339
+#: src/applications/fs/ecrs/namespace.c:420
+#: src/applications/fs/ecrs/namespace.c:571
 #, 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:337
-#: src/applications/fs/ecrs/namespace.c:415
+#: src/applications/fs/ecrs/namespace.c:352
+#: src/applications/fs/ecrs/namespace.c:432
 #, 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:556
-#: src/applications/fs/ecrs/namespace.c:567
+#: src/applications/fs/ecrs/namespace.c:583
+#: src/applications/fs/ecrs/namespace.c:594
 #, 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:74
-msgid "No keywords specified!\n"
-msgstr "Chưa chỉ ra từ khóa!\n"
-
-#: 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:120
+#: src/applications/fs/ecrs/parser.c:124
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
 msgstr ""
 
-#: 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:395
-#, c-format
-msgid "Deleted corrupt URI database in `%s'."
-msgstr ""
-
-#: src/applications/fs/namespace/namespace_info.c:655
+#: src/applications/fs/namespace/namespace_info.c:685
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 "Đã thay đổi khoảng thời gian giữa các lần đưa ra chia sẻ cho chia sẻ định kỳ."
 
-#: src/applications/fs/namespace/namespace_info.c:675
+#: src/applications/fs/namespace/namespace_info.c:708
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -2232,473 +2440,1266 @@
 "Đ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:373
+#: src/applications/testing/testing.c:247
 #, 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"
+msgid "Waiting for peers to connect"
+msgstr "Đang chờ kết nối các đầu (còn %u lần thử)...\n"
 
-#: 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/kvstore_sqlite/kv_sqlite.c:44
+#: src/applications/kvstore_sqlite/kv_sqlite.c:51
+#: 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:476
+#: src/applications/sqstore_mysql/mysql.c:487
+#: src/applications/sqstore_mysql/mysql.c:526
+#: src/applications/sqstore_mysql/mysql.c:537
+#: src/applications/sqstore_mysql/mysql.c:571
+#: src/applications/sqstore_mysql/mysql.c:582
+#: src/applications/sqstore_mysql/mysql.c:680
+#: src/applications/sqstore_mysql/mysql.c:693
+#: src/applications/sqstore_mysql/mysql.c:706
+#: src/applications/sqstore_mysql/mysql.c:721
+#: src/applications/sqstore_mysql/mysql.c:821
+#: src/applications/sqstore_mysql/mysql.c:836
+#: src/applications/sqstore_mysql/mysql.c:988
+#: src/applications/sqstore_mysql/mysql.c:1000
+#: src/applications/sqstore_mysql/mysql.c:1012
+#: src/applications/sqstore_mysql/mysql.c:1260
+#: src/applications/sqstore_mysql/mysql.c:1272
+#: src/applications/sqstore_mysql/mysql.c:1284
+#: src/applications/sqstore_mysql/mysql.c:1369
+#: src/applications/kvstore_mysql/kv_mysql.c:44
+#: src/applications/kvstore_mysql/kv_mysql.c:51
+#: src/applications/dstore_mysql/dstore_mysql.c:107
+#: src/applications/dstore_mysql/dstore_mysql.c:114
+#: src/applications/dstore_mysql/dstore_mysql.c:286
+#: src/applications/dstore_mysql/dstore_mysql.c:301
+#: src/applications/dstore_mysql/dstore_mysql.c:315
+#: src/applications/dstore_mysql/dstore_mysql.c:329
+#: src/applications/dstore_mysql/dstore_mysql.c:342
+#: src/applications/dstore_mysql/dstore_mysql.c:412
+#: src/applications/dstore_mysql/dstore_mysql.c:434
+#: src/applications/dstore_mysql/dstore_mysql.c:446
+#: src/applications/dstore_mysql/dstore_mysql.c:521
+#: src/applications/dstore_mysql/dstore_mysql.c:533
+#: src/applications/dstore_mysql/dstore_mysql.c:554
+#: src/applications/dstore_sqlite/dstore.c:91
+#: src/applications/dstore_sqlite/dstore.c:98
+#: src/applications/dstore_sqlite/dstore.c:194
+#: src/applications/dstore_sqlite/dstore.c:236
+#: src/applications/dstore_sqlite/dstore.c:257
+#: src/applications/dstore_sqlite/dstore.c:313
+#: src/applications/dstore_sqlite/dstore.c:331
+#: src/applications/dstore_sqlite/dstore.c:343
+#: src/applications/dstore_sqlite/dstore.c:375
+#: src/applications/dstore_sqlite/dstore.c:467
+#: src/util/crypto/hostkey_gcrypt.c:64 src/util/crypto/hostkey_gcrypt.c:71
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#, 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/topology_f2f/topology.c:404
+#: src/applications/advertising/advertising_test.c:47
+#: src/applications/session/sessiontest_http.c:40
+#: src/applications/session/sessiontest.c:40
+#: src/applications/session/sessiontest2.c:40
+#: src/applications/stats/statistics.c:233
+msgid "# of connected peers"
+msgstr "# của các đầu đã kết nối"
+
+#: src/applications/advertising/advertising.c:194
 #, 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"
+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/topology_f2f/topology.c:511
-msgid "maintains a friend-to-friend restricted topology"
+#: src/applications/advertising/advertising.c:205
+#, 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:407
+#, 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:429
+msgid "Failed to create an advertisement for this peer. Will not send PING.\n"
 msgstr ""
 
-#: 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"
+#: src/applications/advertising/advertising.c:601
+#, 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/template/gnunet-template.c:43
-msgid "Template description."
+#: src/applications/advertising/advertising.c:610
+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/bootstrap_http/http.c:109
+#: src/applications/advertising/advertising.c:887
+msgid "# Peer advertisements received"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:890
+#, 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:893
+#, fuzzy
+msgid "# Peer advertisements confirmed via PONG"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:897
+#, fuzzy
+msgid "# Peer advertisements updating earlier HELLOs"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:900
+#, 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:904
+#, fuzzy
+msgid "# Peer advertisements for unsupported transport"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:908
+#, 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:912
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to lack of self ad"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:916
+#, fuzzy
+msgid "# Peer advertisements not confirmed due to send error"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:918
+msgid "# Self advertisments transmitted"
+msgstr "# Đã truyền tải tự quảng cáo"
+
+#: src/applications/advertising/advertising.c:920
+msgid "# Foreign advertisements forwarded"
+msgstr "# Đã chuyển tiếp quàng cáo ngoài"
+
+#: src/applications/advertising/advertising.c:922
+#: src/applications/pingpong/pingpong.c:527
+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:928
+#: src/applications/session/connect.c:953
 #, 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"
+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/bootstrap_http/http.c:177
-msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
+#: src/applications/advertising/advertising.c:944
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:217
+#: src/applications/chat/chat.c:91
+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:140
+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:161
+msgid "Maximum number of chat clients reached.\n"
+msgstr "Đã đạt tới số máy khách chát lớn nhất.\n"
+
+#: src/applications/chat/chat.c:167
 #, c-format
-msgid "Bootstrapping using `%s'.\n"
+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:211
+#, 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:230
+msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:231
+#: src/applications/chat/gnunet-chat.c:45
+msgid "Join a chat on GNUnet."
+msgstr ""
+
+#: src/applications/chat/gnunet-chat.c:49
+msgid "set the nickname to use (requred)"
+msgstr ""
+
+#: src/applications/chat/gnunet-chat.c:52
+msgid "set the chat room to join (requred)"
+msgstr ""
+
+#: src/applications/chat/gnunet-chat.c:135
 #, 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"
+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/bootstrap_http/http.c:359
+#: src/applications/chat/gnunet-chat.c:145
 #, fuzzy, c-format
-msgid "Downloaded %llu bytes from `%s'.\n"
-msgstr "Tải tập tin từ GNUnet."
+msgid "Failed to join the room\n"
+msgstr "Không kết gắn được tới cổng UDP %d.\n"
 
-#: src/applications/bootstrap_http/http.c:392
-#, fuzzy
-msgid "# HELLOs downloaded via http"
-msgstr "# đã tải xuống HELO qua http"
+#: src/applications/chat/gnunet-chat.c:162
+#, 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/traffic/traffic.c:454
+#: src/applications/sqstore_sqlite/sqlite.c:238
+#, fuzzy, c-format
+msgid "Unable to initialize SQLite: %s.\n"
+msgstr "Không chạy được SQLite.\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:442
 #, c-format
-msgid "# bytes transmitted of type %d"
-msgstr "# byte đã truyền của dạng %d"
+msgid "Invalid data in %s (NCS).  Trying to fix (by deletion).\n"
+msgstr ""
 
-#: src/applications/traffic/traffic.c:470
+#: src/applications/sqstore_sqlite/sqlite.c:443
+#: src/applications/sqstore_sqlite/sqlite.c:482
+msgid "sqlite datastore"
+msgstr ""
+
+#: src/applications/sqstore_sqlite/sqlite.c:481
 #, c-format
-msgid "# bytes received of type %d"
-msgstr "# byte nhận được của dạng %d"
+msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
+msgstr ""
 
-#: src/applications/traffic/traffic.c:489
+#: src/applications/sqstore_sqlite/sqlite.c:1336
+#: src/applications/sqstore_mysql/mysql.c:1483
+msgid "# bytes in datastore"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:134
+#: src/applications/pingpong/pingpong.c:205
+#: src/applications/pingpong/pingpong.c:273
+#: src/applications/pingpong/pingpong.c:345
 #, fuzzy, c-format
-msgid "# bytes received in plaintext of type %d"
-msgstr "# byte nhận được của dạng %d"
+msgid "Received malformed `%s' message. Dropping.\n"
+msgstr "Nhận được thông báo '%s' hỏng. Đang bỏ đi.\n"
 
-#: src/applications/traffic/traffic.c:644
-msgid "tracks bandwidth utilization by gnunetd"
+#: src/applications/pingpong/pingpong.c:146
+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:216
+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:315
+#: src/applications/pingpong/pingpong.c:381
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
 msgstr ""
+"Không tương ứng được PONG đối với bất kỳ PING. Hãy thử tăng hằng số "
+"MAX_PING_PONG.\n"
 
-#: src/applications/vpn/gnunet-vpn.c:57
-msgid "Suppress display of asynchronous log messages"
+#: src/applications/pingpong/pingpong.c:425
+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:517
+msgid "# encrypted PONG messages received"
+msgstr "# nhận được thông báo PONG đã mã hóa"
+
+#: src/applications/pingpong/pingpong.c:519
+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:521
+msgid "# encrypted PING messages received"
+msgstr "# nhận được thông báo PING đã mã hóa"
+
+#: src/applications/pingpong/pingpong.c:523
+msgid "# PING messages created"
+msgstr "# đã tạo tin nhắn PING"
+
+#: src/applications/pingpong/pingpong.c:525
+#: src/applications/session/connect.c:947
+msgid "# encrypted PONG messages sent"
+msgstr "# đã gửi thông báo PONG đã mã hóa"
+
+#: src/applications/pingpong/pingpong.c:529
+#: src/applications/session/connect.c:945
+msgid "# encrypted PING messages sent"
+msgstr "# đã gửi các thông báo PING mã hóa"
+
+#: src/applications/pingpong/pingpong.c:531
+#, 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:535
+#, 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:545
+#, 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/vpn/vpn.c:366
-#, c-format
-msgid "Not storing route to myself from peer %d\n"
+#: src/applications/session/connect.c:260
+#: src/applications/session/connect.c:279
+#, 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:323
+#, 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/vpn/vpn.c:377
-#, c-format
-msgid "Duplicate route to node from peer %d, choosing minimum hops"
+#: src/applications/session/connect.c:512
+#, 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:615
+#, 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:649
+#, 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:683
+#, 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:694
+#, 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:763
+#, fuzzy, c-format
+msgid ""
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
 msgstr ""
+"Lỗi phân tích chìa khóa buổi làm việc đã mã hóa, kích thước của phần thông "
+"báo đưa ra là sai.\n"
 
-#: src/applications/vpn/vpn.c:410
+#: src/applications/session/connect.c:776
 #, c-format
-msgid "Inserting route from peer %d in route table at location %d\n"
+msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:466
-#, c-format
-msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
+#: src/applications/session/connect.c:937
+msgid "# session keys sent"
+msgstr "# đã gửi các phím buổi làm việc"
+
+#: src/applications/session/connect.c:939
+msgid "# session keys rejected"
+msgstr "# đã nhả ra các phím buổi làm việc"
+
+#: src/applications/session/connect.c:941
+msgid "# session keys accepted"
+msgstr "# đã chấp nhận các phím buổi làm việc"
+
+#: src/applications/session/connect.c:943
+msgid "# sessions established"
+msgstr "# đã thiết lập buổi làm việc"
+
+#: src/applications/sqstore_mysql/mysql.c:427
+#: src/applications/dstore_mysql/dstore_mysql.c:220
+#, 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:1388
+#, fuzzy, c-format
+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:1508
+#: src/applications/sqstore_mysql/mysql.c:1661
+#: src/applications/dstore_mysql/dstore_mysql.c:627
+#, 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:1535
+#: src/applications/sqstore_mysql/mysql.c:1686
+msgid ""
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:472
-#, c-format
-msgid "RFC4193 Frame length %d too small\n"
+#: src/applications/identity/hostkey.c:122
+#, 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:155
+#, fuzzy, c-format
+msgid ""
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr ""
+"Kiểm tra chìa khóa máy có trong '%s' không thành công, đang tạo chìa khóa "
+"máy mới.\n"
 
-#: src/applications/vpn/vpn.c:488
-#, c-format
-msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
+#: src/applications/identity/hostkey.c:164
+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:176
+msgid "Done creating hostkey.\n"
+msgstr "Đã tạo xong chìa khóa máy.\n"
+
+#: src/applications/identity/identity.c:352
+#, 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/vpn/vpn.c:556
-#, c-format
-msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
+#: src/applications/identity/identity.c:366
+#, 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/vpn/vpn.c:562
+#: src/applications/identity/identity.c:402
 #, c-format
-msgid "Cannot open tunnel device because of %s"
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:594
+#: src/applications/identity/identity.c:731
+#: src/applications/identity/identity.c:757
+#, 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:809
 #, c-format
-msgid "RFC4193 Create skips gnu%d as we are already using it\n"
+msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:606
-#, c-format
-msgid "Cannot set tunnel name to %s because of %s\n"
+#: src/applications/identity/identity.c:819
+msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:614
+#: src/applications/identity/identity.c:935
+#: src/applications/identity/identity.c:1058
 #, c-format
-msgid "Configured tunnel name to %s\n"
+msgid "Peer `%s' is currently strictly blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:655
+#: src/applications/identity/identity.c:1061
 #, c-format
-msgid "Cannot get socket flags for gnu%d because %s\n"
+msgid "Peer `%s' is currently blacklisted (for another %llums).\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:664
+#: src/applications/testbed/commands.c:1179
+#: src/applications/stats/gnunet-stats.c:61
 #, c-format
-msgid "Cannot set socket flags for gnu%d because %s\n"
-msgstr ""
+msgid "Supported peer-to-peer messages:\n"
+msgstr "Thông báo Peer to Peer được hỗ trợ:\n"
 
-#: src/applications/vpn/vpn.c:674
+#: src/applications/testbed/commands.c:1181
+#: src/applications/stats/gnunet-stats.c:64
 #, c-format
-msgid "Cannot set MTU for gnu%d because %s\n"
-msgstr ""
+msgid "Supported client-server messages:\n"
+msgstr "Thông báo máy khách-máy chủ hỗ trợ:\n"
 
-#: src/applications/vpn/vpn.c:682
+#: src/applications/testbed/gnunet-testbed.c:118
+msgid "Start GNUnet-testbed helper."
+msgstr "Chạy chương trình trợ giúp Start GNUnet-testbed."
+
+#: src/applications/testbed/gnunet-testbed.c:176
 #, c-format
-msgid "Cannot get interface index for gnu%d because %s\n"
-msgstr ""
+msgid "Cannot connect to LOOPBACK port %d: %s\n"
+msgstr "Không kết nối được tới cổng quay lại LOOPBACK %d: %s\n"
 
-#: src/applications/vpn/vpn.c:694
+#: src/applications/testbed/gnunet-testbed.c:268
+#, fuzzy, c-format
+msgid "Could not execute `%s': %s\n"
+msgstr "Không thực hiện được '%s': %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:314
+msgid "No client service started. Trying again in 30 seconds.\n"
+msgstr "Chưa chạy dịch vụ máy khách. Hãy thử lại sau 30 giây.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:329
 #, c-format
-msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgid ""
+"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
+"Trying again in %d seconds...\n"
 msgstr ""
+"Lỗi (%s) kết gắn bind trình nghe TCP vào cổng %d. Chưa chạy dịch vụ proxy.\n"
+"Hãy thử lại sau %d giây...\n"
 
-#: src/applications/vpn/vpn.c:707
+#: src/applications/testbed/gnunet-testbed.c:392
+#, c-format
+msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
+msgstr "Đã nhả ra kết nối chưa xác thực từ %u.%u.%u.%u.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:406
+#, c-format
+msgid "Protocol violation on socket. Expected command.\n"
+msgstr "Xâm phạm giao thức trên socket. Đã mong đợi câu lệnh.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:446
 #, 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"
+msgid "Command `%s' not found!\n"
+msgstr "Không tìm thấy câu lệnh '%s'!\n"
 
-#: src/applications/vpn/vpn.c:721
+#: src/applications/testbed/gnunet-testbed.c:510
+msgid "Start GNUnet testbed controller."
+msgstr "Chạy trình điều khiển testbed của GNUnet."
+
+#: src/applications/testbed/gnunet-testbed.c:572
 #, c-format
-msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgid "Malformed entry in the configuration in section %s under %s: %s\n"
+msgstr "Mục có định dạng sai trong phần %s dưới %s của cấu hình: %s\n"
+
+#: src/applications/testbed/testbed.c:53
+msgid "Could not send acknowledgement back to client.\n"
+msgstr "Không gửi được câu trả lời đã biết ack trở lại cho máy khách.\n"
+
+#: src/applications/testbed/testbed.c:64
+#, c-format
+msgid "Received unknown testbed message of type %u.\n"
+msgstr "Nhận được thông báo testbed không rõ dạng %u.\n"
+
+#: src/applications/testbed/testbed.c:82
+#: src/applications/testbed/testbed.c:848
+#, fuzzy, c-format
+msgid "size of `%s' message is too short. Ignoring.\n"
+msgstr "kích thước của thông báo '%s' quá ngắn. Đang lờ đi.\n"
+
+#: src/applications/testbed/testbed.c:90
+#, fuzzy, c-format
+msgid "size of `%s' message is wrong. Ignoring.\n"
+msgstr "kích thước của thông báo '%s' bị sai. Đang lờ đi.\n"
+
+#: src/applications/testbed/testbed.c:145
+#, fuzzy, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
+msgstr "TESTBED không tạo được thông báo HELO cho giao thức %u\n"
+
+#: src/applications/testbed/testbed.c:223
+#: src/applications/testbed/testbed.c:268
+#: src/applications/testbed/testbed.c:381
+#: src/applications/testbed/testbed.c:390
+#: src/applications/testbed/testbed.c:434
+#: src/applications/testbed/testbed.c:443
+#, fuzzy, c-format
+msgid "received invalid `%s' message\n"
+msgstr "nhận được thông báo sai '%s'\n"
+
+#: src/applications/testbed/testbed.c:240
+#: src/applications/testbed/testbed.c:284
+#, fuzzy, c-format
+msgid "received invalid `%s' message (empty module name)\n"
+msgstr "nhận được thông báo '%s' sai (tên môđun rỗng)\n"
+
+#: src/applications/testbed/testbed.c:247
+#, fuzzy, c-format
+msgid "loading module `%s' failed.  Notifying client.\n"
+msgstr "nạp môđun '%s' không thành công.  Đang cho máy khách biết.\n"
+
+#: src/applications/testbed/testbed.c:291
+msgid "unloading module failed.  Notifying client.\n"
+msgstr "hủy nạp môđun không thành công.  Đang cho máy khách biết.\n"
+
+#: src/applications/testbed/testbed.c:576
+#, fuzzy, c-format
+msgid "`%s' %s failed: %s\n"
+msgstr "'%s' %s không thành công: %s\n"
+
+#: src/applications/testbed/testbed.c:658
+#, fuzzy, c-format
+msgid "received invalid `%s' message: %s.\n"
+msgstr "nhận được thông báo '%s' sai: %s.\n"
+
+#: src/applications/testbed/testbed.c:861
+#, c-format
+msgid "'..' is not allowed in file name (%s).\n"
+msgstr "không cho phép '..' trong tên tập tin (%s).\n"
+
+#: src/applications/testbed/testbed.c:872
+msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
+msgstr "Tên tập tin rỗng cho thông báo UPLOAD_FILE là sai!\n"
+
+#: src/applications/testbed/testbed.c:881
+msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
 msgstr ""
+"Tên tập tin cho thông báo UPLOAD_FILE không phải là kết thúc rỗng (sai)!\n"
 
-#: src/applications/vpn/vpn.c:733
+#: src/applications/testbed/testbed.c:889
+msgid "Upload refused!"
+msgstr "Từ chối tải lên!"
+
+#: src/applications/testbed/testbed.c:919
+#, c-format
+msgid "Invalid message received at %s:%d."
+msgstr "Nhận được thông báo sai tại %s: %d."
+
+#: src/applications/testbed/testbed.c:1041
+#, c-format
+msgid "received invalid testbed message of size %u\n"
+msgstr "nhận được thông báo testbed sai với kích thước %u\n"
+
+#: src/applications/testbed/testbed.c:1064
+#, c-format
+msgid ""
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
+msgstr ""
+"Nhận được thông báo testbed dạng %u nhưng kích thước không mong đợi %u, mong "
+"đợi %u\n"
+
+#: src/applications/testbed/testbed.c:1110
+msgid "No testbed URL given, not registered.\n"
+msgstr "Chưa đưa ra URL của testbed, không đăng ký.\n"
+
+#: src/applications/testbed/testbed.c:1121
 #, 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"
+msgid "Could not resolve name of HTTP proxy `%s'.\n"
+msgstr "Không tìm được tên của proxy HTTP '%s'.\n"
 
-#: src/applications/vpn/vpn.c:774
+#: src/applications/testbed/testbed.c:1151
+#, fuzzy, c-format
+msgid "Invalid URL `%s' (must begin with `%s')\n"
+msgstr "URL sai '%s' (phải bắt đầu với '%s')\n"
+
+#: src/applications/testbed/testbed.c:1194
+#, fuzzy, c-format
+msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
+msgstr "URL http lỗi: '%s' tại '%s'.  Chưa đăng ký máy khách testbed.\n"
+
+#: src/applications/testbed/testbed.c:1229
+#, fuzzy, c-format
+msgid "Could not register testbed, host `%s' unknown\n"
+msgstr "Không đăng ký được testbed, máy '%s' không rõ\n"
+
+#: src/applications/testbed/testbed.c:1251
+#, fuzzy, c-format
+msgid "Failed to send HTTP request to host `%s': %s\n"
+msgstr "Gửi yêu cầu HTTP tới máy '%s' không thành công: %s\n"
+
+#: src/applications/testbed/testbed.c:1289
+#, fuzzy, c-format
+msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
+msgstr "Gửi yêu cầu HTTP '%s' tới máy '%s' không thành công: %s\n"
+
+#: src/applications/testbed/testbed.c:1327
+msgid "Exit register (error: no http response read).\n"
+msgstr "Thoát trình đăng ký (lỗi: không đọc được câu trả lời http).\n"
+
+#: src/applications/testbed/testbed.c:1434
+msgid "allows construction of a P2P-testbed (incomplete)"
+msgstr ""
+
+#: src/applications/transport/transport.c:192
+#, c-format
 msgid ""
-"RFC4193 We have run out of memory and so I can't store a tunnel for this "
-"peer.\n"
+"Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:822
+#: src/applications/transport/transport.c:247
 #, c-format
-msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
+msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:895
+#: src/applications/transport/transport.c:300
 #, c-format
-msgid "VPN dropping connection %x\n"
+msgid ""
+"Transport failed to connect to peer `%s' (%u HELLOs known, none worked)\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:902
+#: src/applications/transport/transport.c:377
+#, 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:500
 #, c-format
-msgid "VPN cannot drop connection %x\n"
+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:559
+msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:921
-msgid "RFC4193 Thread exiting\n"
+#: src/applications/transport/transport.c:760
+#, 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:780
+#, 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:794
+#, 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:823
+#, fuzzy, c-format
+msgid "Loaded transport `%s'\n"
+msgstr "(Các) truyền tải có: %s\n"
+
+#: src/applications/transport/transport.c:835
+#, fuzzy, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Tôi là một đầu peer '%s'.\n"
+
+#: src/applications/stats/sqstats.c:151
+msgid "# Any-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:968
-msgid "VPN IP src not anonymous. drop..\n"
+#: src/applications/stats/sqstats.c:152
+msgid "# DBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:974
-msgid "VPN IP not anonymous, drop.\n"
+#: src/applications/stats/sqstats.c:153
+msgid "# SBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:981
-msgid "VPN Received, not anonymous, drop.\n"
+#: src/applications/stats/sqstats.c:154
+msgid "# KBlocks"
 msgstr ""
 
-#: 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:996
-#, c-format
-msgid "<- GNUnet(%d) : %s\n"
+#: src/applications/stats/sqstats.c:155
+msgid "# NBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1022
-msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
+#: src/applications/stats/sqstats.c:156
+msgid "# KNBlocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1043
-msgid "Receive route request\n"
+#: src/applications/stats/sqstats.c:157
+msgid "# OnDemand-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1050
-#, c-format
-msgid "Prepare route announcement level %d\n"
+#: src/applications/stats/sqstats.c:158
+msgid "# Unknown-Blocks"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1065
-#, c-format
-msgid "Send route announcement %d with route announce\n"
+#: src/applications/stats/sqstats.c:159
+msgid "# expired"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1071
-#, c-format
-msgid "Send outside table info %d\n"
+#: src/applications/stats/sqstats.c:160
+msgid "# expire in 1h"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1088
-msgid "Receive route announce.\n"
+#: src/applications/stats/sqstats.c:161
+msgid "# expire in 24h"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1094
-msgid "Going to try insert route into local table.\n"
+#: src/applications/stats/sqstats.c:162
+msgid "# expire in 1 week"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1100
-#, c-format
-msgid "Inserting with hops %d\n"
+#: src/applications/stats/sqstats.c:163
+msgid "# expire in 1 month"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1119
-#, c-format
-msgid "Request level %d from peer %d\n"
+#: src/applications/stats/sqstats.c:164
+msgid "# zero priority"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1137
-#, c-format
-msgid "Receive table limit on peer reached %d\n"
+#: src/applications/stats/sqstats.c:165
+msgid "# priority one"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1168
-msgid "realise alloc ram\n"
+#: src/applications/stats/sqstats.c:166
+msgid "# priority larger than one"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1188
-msgid "realise add routes\n"
+#: src/applications/stats/sqstats.c:167
+msgid "# no anonymity"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1239
-msgid "realise pull routes\n"
+#: src/applications/stats/sqstats.c:168
+msgid "# anonymity one"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1292
-msgid "realise copy table\n"
+#: src/applications/stats/sqstats.c:169
+msgid "# anonymity larger than one"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1324
-msgid "Cannot store client info\n"
+#: src/applications/stats/clientapi.c:333
+msgid "Uptime (seconds)"
+msgstr "Đã chạy (giây)"
+
+#: src/applications/stats/statistics.c:228
+#, c-format
+msgid "% of allowed network load (up)"
+msgstr "% o tải mạng cho phép (lên)"
+
+#: src/applications/stats/statistics.c:230
+#, c-format
+msgid "% of allowed network load (down)"
+msgstr "% o tải mạng cho phép (xuống)"
+
+#: src/applications/stats/statistics.c:231
+#, c-format
+msgid "% of allowed cpu load"
+msgstr "% o tải cho phép của cpu"
+
+#: src/applications/stats/statistics.c:232
+#, fuzzy, c-format
+msgid "% of allowed io load"
+msgstr "% o tải cho phép của cpu"
+
+#: src/applications/stats/statistics.c:235
+msgid "# bytes of noise received"
+msgstr "# byte nhận được do nhiễu đường truyền"
+
+#: src/applications/stats/statistics.c:237
+msgid "# plibc handles"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:95
-msgid "Yes"
-msgstr "Có"
+#: src/applications/stats/statistics.c:421
+#, 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/vpn/vpn.c:1394 src/setup/ncurses/wizard_curs.c:94
-msgid "No"
-msgstr "Không"
+#: src/applications/stats/statistics.c:445
+#, fuzzy
+msgid "keeps statistics about gnunetd's operation"
+msgstr "In thống kê về các thao tác của GNUnet."
 
-#: src/applications/vpn/vpn.c:1651
+#: src/applications/stats/gnunet-stats.c:87
+msgid "prints supported protocol messages"
+msgstr "in các thông báo giao thức hỗ trợ"
+
+#: src/applications/stats/gnunet-stats.c:136
+#, c-format
+msgid "Error reading information from gnunetd.\n"
+msgstr "Lỗi đọc thông tin từ gnunetd.\n"
+
+#: src/applications/tbench/gnunet-tbench.c:63
+#: src/applications/tracekit/gnunet-tracekit.c:54
+msgid "Start GNUnet transport benchmarking tool."
+msgstr "Chạy công cụ kiểm tra truyền tải của GNUnet."
+
+#: src/applications/tbench/gnunet-tbench.c:65
+msgid "output in gnuplot format"
+msgstr "kết quả ở dạng gnuplot"
+
+#: src/applications/tbench/gnunet-tbench.c:69
+msgid "number of iterations"
+msgstr "số lần làm lại"
+
+#: src/applications/tbench/gnunet-tbench.c:73
+msgid "number of messages to use per iteration"
+msgstr "số thông báo dùng cho mỗi lần làm lại"
+
+#: src/applications/tbench/gnunet-tbench.c:76
+msgid "receiver host identifier (ENC file name)"
+msgstr "trình nhận tên máy (tên tập tin ENC)"
+
+#: src/applications/tbench/gnunet-tbench.c:79
+msgid "message size"
+msgstr "kích thước thông báo"
+
+#: src/applications/tbench/gnunet-tbench.c:82
+msgid "sleep for SPACE ms after each a message block"
+msgstr "ngủ SPACE miligiây sau mỗi khối tin nhắn"
+
+#: src/applications/tbench/gnunet-tbench.c:85
+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
+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:142
+#, c-format
+msgid "You must specify a receiver!\n"
+msgstr "Người dùng phải chỉ ra một trình nhận!\n"
+
+#: src/applications/tbench/gnunet-tbench.c:152
 #, 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"
+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/vpn/vpn.c:1654
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
-msgid "RFC4193 my First 4 hex digits of host id are %x\n"
-msgstr ""
+msgid "Time:\n"
+msgstr "Thời gian:\n"
 
-#: src/applications/vpn/vpn.c:1727
-msgid "enables IPv6 over GNUnet (incomplete)"
+#: src/applications/tbench/gnunet-tbench.c:190
+#, c-format
+msgid "\tmax      %llums\n"
+msgstr "\tmax      %llu miligiây\n"
+
+#: src/applications/tbench/gnunet-tbench.c:191
+#, c-format
+msgid "\tmin      %llums\n"
+msgstr "\tmin      %llu miligiây\n"
+
+#: src/applications/tbench/gnunet-tbench.c:192
+#, c-format
+msgid "\tmean     %8.4fms\n"
+msgstr "\tý nghĩa   %8.4f miligiây\n"
+
+#: src/applications/tbench/gnunet-tbench.c:193
+#, c-format
+msgid "\tvariance %8.4fms\n"
+msgstr "\tkhác nhau %8.4f miligiây\n"
+
+#: src/applications/tbench/gnunet-tbench.c:195
+#, c-format
+msgid "Loss:\n"
+msgstr "Mất:\n"
+
+#: src/applications/tbench/gnunet-tbench.c:196
+#, c-format
+msgid "\tmax      %u\n"
+msgstr "\tmax      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:197
+#, c-format
+msgid "\tmin      %u\n"
+msgstr "\tmin      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:198
+#, c-format
+msgid "\tmean     %8.4f\n"
+msgstr "\tý nghĩa   %8.4f\n"
+
+#: src/applications/tbench/gnunet-tbench.c:199
+#, c-format
+msgid "\tvariance %8.4f\n"
+msgstr "\tkhác nhau %8.4f\n"
+
+#: src/applications/tbench/gnunet-tbench.c:205
+#, 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:211
+#, c-format
+msgid ""
+"\n"
+"Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
+"\n"
+"Không nhận được thông báo từ gnunetd. gnunetd đang chạy?\n"
 
-#: src/applications/vpn/vpn.c:1761
-msgid "RFC4193 Waiting for tun thread to end\n"
+#: src/applications/tbench/tbench.c:420
+msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1775
-msgid "RFC4193 The tun thread has ended\n"
+#: src/applications/tbench/tbenchtest.c:53
+#, c-format
+msgid "Using %u messages of size %u for %u times.\n"
+msgstr "Sử dụng %u thông báo với kích thước %u trong %u lần.\n"
+
+#: src/applications/tbench/tbenchtest.c:85
+#, c-format
+msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
+msgstr "Thời gian:  max %16llu  min %16llu  có nghĩa %12.3f  biến %12.3f\n"
+
+#: src/applications/tbench/tbenchtest.c:89
+#, c-format
+msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
+msgstr "Mất:  max %16u  min %16u  có nghĩa %12.3f  biến %12.3f\n"
+
+#: src/applications/tbench/tbenchtest.c:95
+#, c-format
+msgid ""
+"\n"
+"Failed to receive reply from gnunetd.\n"
 msgstr ""
+"\n"
+"Không nhận thành công câu trả lời từ gnunetd.\n"
 
-#: src/applications/vpn/vpn.c:1792
+#: src/applications/tbench/tbenchtest.c:151
 #, c-format
-msgid "RFC4193 Closing tunnel %d fd %d\n"
+msgid "Running benchmark...\n"
+msgstr "Đang chạy thử mức độ (benchmark)...\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:47
+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
+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/dstore/dstore.c:525
-msgid "# bytes in dstore"
+#: src/applications/tracekit/gnunet-tracekit.c:58
+msgid "use PRIO for the priority of the trace request"
+msgstr "dùng PRIO làm ưu tiên của yêu cầu theo dấu vết trace"
+
+#: src/applications/tracekit/gnunet-tracekit.c:62
+msgid "wait DELAY seconds for replies"
+msgstr "chờ các câu trả lời DELAY giây"
+
+#: src/applications/tracekit/gnunet-tracekit.c:110
+#, c-format
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
 msgstr ""
+"Định dạng bị sai. Dùng 0 cho người dùng dễ đọc, 1 cho chấm, 2 cho vcg.\n"
 
-#: src/server/gnunet-update.c:147
+#: src/applications/tracekit/gnunet-tracekit.c:164
 #, fuzzy, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Đang cập nhật dữ liệu cho môđun '%s'\n"
+msgid "`%s' is not connected to any peer.\n"
+msgstr "'%s' chưa kết nối tới bất kỳ đầu peer nào.\n"
 
-#: src/server/gnunet-update.c:151
+#: src/applications/tracekit/gnunet-tracekit.c:207
 #, 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"
+msgid "`%s' connected to `%s'.\n"
+msgstr "'%s' kết nối tới '%s'.\n"
 
-#: src/server/gnunet-update.c:198 src/server/gnunetd.c:136
+#: src/applications/tracekit/gnunet-tracekit.c:220
+#, 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:246
+#, 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:348
+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:74
+#: src/applications/tracekit/tracekit.c:216
+#, 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:283
+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:362
+#, 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:462
 #, fuzzy
-msgid "Core initialization failed.\n"
-msgstr " Kết nối không thành công\n"
+msgid "allows mapping of the network topology"
+msgstr "Theo dấu vết trace hình học của mạng GNUnet."
 
-#: 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/applications/getoption/getoption.c:78
+#, 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/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/applications/getoption/getoption.c:88
+#, 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/server/gnunet-update.c:245 src/server/gnunet-transport-check.c:369
-msgid "run as user LOGIN"
-msgstr "chạy dưới người dùng LOGIN"
+#: src/applications/template/gnunet-template.c:42
+msgid "Template description."
+msgstr ""
 
-#: src/server/gnunet-update.c:249
+#: src/applications/template/template.c:70
+#, 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"
+
+#: src/applications/bootstrap_http/http.c:110
+#, 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:178
+msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:219
+#, c-format
+msgid "Bootstrapping using `%s'.\n"
+msgstr ""
+
+#: src/applications/bootstrap_http/http.c:234
+#, 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:364
+#, fuzzy, c-format
+msgid "Downloaded %llu bytes from `%s'.\n"
+msgstr "Tải tập tin từ GNUnet."
+
+#: src/applications/bootstrap_http/http.c:397
 #, 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)"
+msgid "# HELLOs downloaded via http"
+msgstr "# đã tải xuống HELO qua http"
 
-#: src/server/connection.c:1202
+#: 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:470
+#, c-format
+msgid "# bytes received of type %d"
+msgstr "# byte nhận được của dạng %d"
+
+#: 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:650
+msgid "tracks bandwidth utilization by gnunetd"
+msgstr ""
+
+#: src/applications/dstore_mysql/dstore_mysql.c:636
+msgid "Failed to initialize MySQL database connection for dstore.\n"
+msgstr ""
+
+#: src/applications/dstore_mysql/dstore_mysql.c:661
+#: src/applications/dstore_sqlite/dstore.c:535
+msgid "# bytes in dstore"
+msgstr ""
+
+#: src/server/connection.c:1214
+#, 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:1211
+#: src/server/connection.c:1224
 #, 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:2897
+#: src/server/connection.c:2986
 #, 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:2982
+#: src/server/connection.c:3075
 #, 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:3004
+#: src/server/connection.c:3097
 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:3500
+#: src/server/connection.c:3608
 msgid "# outgoing messages dropped"
 msgstr "# thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:3503
+#: src/server/connection.c:3611
 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:3505
+#: src/server/connection.c:3613
 msgid "# connections closed (HANGUP sent)"
 msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
-#: src/server/connection.c:3509
+#: src/server/connection.c:3617
 #, fuzzy
 msgid "# connections closed (transport issue)"
 msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
-#: src/server/connection.c:3512
+#: src/server/connection.c:3620
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:3516
+#: src/server/connection.c:3624
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte đã truyền của dạng %d"
 
-#: src/server/connection.c:3520
+#: src/server/connection.c:3628
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte nhận được qua TCP"
 
-#: src/server/connection.c:3522
+#: src/server/connection.c:3630
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:3523
+#: src/server/connection.c:3631
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/server/connection.c:3526
+#: src/server/connection.c:3634
 msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3529
+#: src/server/connection.c:3637
 #, fuzzy
 msgid "# total bytes per second receive limit"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/server/connection.c:3532
+#: src/server/connection.c:3640
 #, 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:3536
+#: src/server/connection.c:3644
 msgid "# total number of bytes we were allowed to sent but did not"
 msgstr ""
 
-#: src/server/connection.c:3540
+#: src/server/connection.c:3648
 msgid "# total number of bytes we were allowed to sent"
 msgstr ""
 
-#: src/server/connection.c:3544
+#: src/server/connection.c:3652
 msgid "# total number of bytes we are currently allowed to send"
 msgstr ""
 
-#: src/server/connection.c:3547
+#: src/server/connection.c:3655
 msgid "# transports switched to stream transport"
 msgstr ""
 
-#: src/server/startup.c:206
+#: src/server/startup.c:215
 #, 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:223
+#: src/server/startup.c:233
 #, c-format
 msgid ""
 "Filesystem `%s' of partition `%s' is unknown. Please contact gnunet-"
 "address@hidden"
 msgstr ""
 
-#: src/server/startup.c:237
+#: src/server/startup.c:248
 #, c-format
 msgid ""
 "Limiting datastore size to %llu GB, because the `%s' filesystem does not "
@@ -2706,22 +3707,27 @@
 "partition!\n"
 msgstr ""
 
-#: src/server/startup.c:274
+#: src/server/startup.c:287
 #, c-format
 msgid "Insufficient access permissions for `%s': %s\n"
 msgstr ""
 
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:83
 #, fuzzy, c-format
 msgid "`%s' startup complete.\n"
 msgstr "'%s' khởi động thành công.\n"
 
-#: src/server/gnunetd.c:89
+#: src/server/gnunetd.c:87
 #, fuzzy, c-format
 msgid "`%s' is shutting down.\n"
 msgstr "'%s' đang tắt.\n"
 
-#: src/server/gnunetd.c:192
+#: src/server/gnunetd.c:121 src/server/gnunet-update.c:222
+#, fuzzy
+msgid "Core initialization failed.\n"
+msgstr " Kết nối không thành công\n"
+
+#: src/server/gnunetd.c:176
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
@@ -2729,95 +3735,55 @@
 "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:196
+#: src/server/gnunetd.c:180
 msgid "Starts the gnunetd daemon."
 msgstr "Chạy daemon gnunetd."
 
-#: src/server/gnunetd.c:199
+#: src/server/gnunetd.c:183
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:203
+#: src/server/gnunetd.c:187
 msgid "print all log messages to the console (only works together with -d)"
 msgstr ""
 
-#: src/server/gnunetd.c:207
+#: src/server/gnunetd.c:191
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/server/gnunetd.c:271
+#: src/server/gnunetd.c:272
 #, 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:126
+#: src/server/gnunet-transport-check.c:121
 #, fuzzy, c-format
-msgid "Application module `%s' already initialized!\n"
-msgstr "Đã chạy môđun ứng dụng '%s'!\n"
-
-#: 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: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: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: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: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: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: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:122
-#, 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:129
+#: 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:160
 #, fuzzy, c-format
 msgid "`%s': Could not send.\n"
 msgstr "'%s': Không gửi được.\n"
 
-#: src/server/gnunet-transport-check.c:176
+#: src/server/gnunet-transport-check.c:175
 #, 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:189
+#: src/server/gnunet-transport-check.c:188
 #, 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:196
+#: src/server/gnunet-transport-check.c:195
 #, fuzzy, c-format
 msgid ""
 "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
@@ -2831,7 +3797,7 @@
 msgid " Transport %d is not being tested\n"
 msgstr " Giao thông %d là không thể\n"
 
-#: src/server/gnunet-transport-check.c:255
+#: src/server/gnunet-transport-check.c:256
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2840,83 +3806,87 @@
 "\n"
 "Đang liên hệ '%s'."
 
-#: src/server/gnunet-transport-check.c:280
+#: src/server/gnunet-transport-check.c:281
 #, c-format
 msgid " Connection failed\n"
 msgstr " Kết nối không thành công\n"
 
-#: src/server/gnunet-transport-check.c:286
+#: src/server/gnunet-transport-check.c:287
 #, 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:323
+#: src/server/gnunet-transport-check.c:325
 #, c-format
 msgid "Timeout after %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:325
+#: src/server/gnunet-transport-check.c:327
 #, fuzzy, c-format
 msgid "OK!\n"
 msgstr "Ừ"
 
-#: src/server/gnunet-transport-check.c:350
+#: src/server/gnunet-transport-check.c:352
 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:354
+#: src/server/gnunet-transport-check.c:356
 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:357
+#: src/server/gnunet-transport-check.c:359
 msgid "send COUNT messages"
 msgstr "gửi COUNT thông báo"
 
-#: src/server/gnunet-transport-check.c:360
+#: src/server/gnunet-transport-check.c:362
 msgid "send messages with SIZE bytes payload"
 msgstr "gửi các thông báo với SIZE byte nạp trả"
 
-#: src/server/gnunet-transport-check.c:363
+#: src/server/gnunet-transport-check.c:365
 msgid "specifies which TRANSPORT should be tested"
 msgstr "chỉ ra TRANSPORT cần được thử nghiệm"
 
-#: src/server/gnunet-transport-check.c:366
+#: src/server/gnunet-transport-check.c:368
 msgid "specifies after how many MS to time-out"
 msgstr "chỉ ra hết thời gian chờ sau bao nhiên MS"
 
-#: src/server/gnunet-transport-check.c:374
+#: src/server/gnunet-transport-check.c:371 src/server/gnunet-update.c:271
+msgid "run as user LOGIN"
+msgstr "chạy dưới người dùng LOGIN"
+
+#: src/server/gnunet-transport-check.c:376
 msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:435
+#: src/server/gnunet-transport-check.c:440
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/server/gnunet-transport-check.c:437
+#: src/server/gnunet-transport-check.c:442
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "(Các) truyền tải có: %s\n"
 
-#: src/server/gnunet-transport-check.c:478
+#: src/server/gnunet-transport-check.c:489
 #, 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:109
+#: src/server/tcpserver.c:111
 #, 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:324
+#: src/server/tcpserver.c:336
 #, c-format
 msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr ""
 
-#: src/server/tcpserver.c:398
+#: src/server/tcpserver.c:411
 #, fuzzy, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
@@ -2924,30 +3894,44 @@
 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:454
+#: src/server/tcpserver.c:468
 #, 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:428
+#: src/server/handler.c:431
 #, 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:141
-msgid ""
-"Failed to determine filename used to store GNUnet version information!\n"
-msgstr ""
+#: src/server/gnunet-update.c:146
+#, 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-peer-info.c:53
+#: 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:267
+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:275
+#, 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/gnunet-peer-info.c:51
 msgid "Print information about GNUnet peers."
 msgstr "In thông tin về các đầu peer của GNUnet."
 
-#: src/server/gnunet-peer-info.c:57
+#: src/server/gnunet-peer-info.c:55
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:122 src/server/gnunet-peer-info.c:153
+#: src/server/gnunet-peer-info.c:120 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"
@@ -2967,43 +3951,52 @@
 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:199
+#: src/server/version.c:143
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
+msgstr ""
+
+#: src/server/core.c:129
 #, 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"
+msgid "Application module `%s' already initialized!\n"
+msgstr "Đã chạy môđun ứng dụng '%s'!\n"
 
-#: 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/server/core.c:183
+#, 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/util/network_client/tcpio.c:111
+#: src/server/core.c:233
 #, 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"
+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/util/network_client/tcpio.c:290
+#: src/server/core.c:244
 #, 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"
+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/util/network_client/tcpio.c:327
+#: src/server/core.c:254
 #, fuzzy, c-format
-msgid "Error connecting to %s:%u\n"
-msgstr ""
-"\n"
-"Lỗi bỏ đánh chỉ mục tập tin: %s\n"
+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/util/network_client/tcpio.c:338
+#: src/server/core.c:400
+#, 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:509
 #, 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"
+msgid "Could not properly shutdown application `%s'.\n"
+msgstr "Không tắt đúng được ứng dụng '%s'.\n"
 
-#: src/util/network_client/tcpio.c:494
+#: src/server/core.c:646
 #, fuzzy, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "'%s' thất bại, câu trả lời sai!\n"
+msgid "Could not properly unload service `%s'!\n"
+msgstr "Không hủy nạp đúng được dịch vụ '%s'!\n"
 
-#: src/util/crypto/hostkey_gcrypt.c:898
+#: src/util/crypto/hostkey_gcrypt.c:907
 #, 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"
@@ -3013,115 +4006,146 @@
 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:195 src/util/os/statuscalls.c:336
+#: src/util/os/statuscalls.c:197 src/util/os/statuscalls.c:342
 #, 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:379 src/util/os/statuscalls.c:389
+#: src/util/os/statuscalls.c:387 src/util/os/statuscalls.c:397
 #, 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: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:124
+#: src/util/os/osconfig.c:127
 msgid "Setting open descriptor limit not supported.\n"
 msgstr ""
 
-#: src/util/os/osconfig.c:391
+#: src/util/os/osconfig.c:402
 #, 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/user.c:136 src/util/os/user.c:181
+#, 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:137
+msgid "No such user"
+msgstr ""
+
+#: src/util/os/user.c:152
+#, fuzzy, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Không thay đổi được người dùng/nhóm thành '%s': %s"
+
+#: src/util/os/priority.c:78
+#, fuzzy, c-format
+msgid "Invalid process priority `%s'\n"
+msgstr "Câu trả lời không đúng tới '%s'.\n"
+
+#: src/util/os/semaphore.c:223
+#, c-format
+msgid "Can't create semaphore: %i"
+msgstr "Không tạo được đèn tín hiệu: %i"
+
 #: 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:119
+#: src/util/os/dso.c:120
 #, 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:159
+#: src/util/os/dso.c:162
 #, 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:461
+#: src/util/os/cpustatus.c:466
 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:483
+#: src/util/os/cpustatus.c:489
 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:134 src/util/os/user.c:176
+#: src/util/network_client/tcpio.c:98 src/util/network_client/tcpio.c:144
+msgid "Could not find valid value for HOST in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:113
 #, fuzzy, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
-msgstr "Không ghi được các tập tin cấu hình: %s.\n"
+msgid "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/os/user.c:135
-msgid "No such user"
+#: src/util/network_client/tcpio.c:302
+#, 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:340
+#, 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/os/user.c:149
+#: src/util/network_client/tcpio.c:351
 #, 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"
+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/os/priority.c:78
+#: src/util/network_client/tcpio.c:516
 #, fuzzy, c-format
-msgid "Invalid process priority `%s'\n"
-msgstr "Câu trả lời không đúng tới '%s'.\n"
+msgid "`%s' failed, reply invalid!\n"
+msgstr "'%s' thất bại, câu trả lời sai!\n"
 
-#: src/util/network/select.c:304
+#: src/util/network/select.c:310
 #, 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:473
+#: src/util/network/select.c:483
 #, c-format
 msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
 
-#: 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
+#: src/util/network/ipcheck.c:106 src/util/network/ipcheck.c:136
+#: src/util/network/ipcheck.c:186 src/util/network/ipcheck.c:211
+#: src/util/network/ipcheck.c:219
 #, fuzzy, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Định dạng sai cho IP: '%s'\n"
 
-#: src/util/network/ipcheck.c:162
+#: src/util/network/ipcheck.c:167
 #, 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:259
+#: src/util/network/ipcheck.c:267
 #, 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:291
+#: src/util/network/ipcheck.c:300
 #, 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:304
+#: src/util/network/ipcheck.c:314
 #, 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:195
+#: src/util/network/ip.c:207
 #, fuzzy, c-format
 msgid ""
 "Could not find interface `%s' using `%s', trying to find another interface.\n"
@@ -3129,12 +4153,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:268
+#: src/util/network/ip.c:285
 #, 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:277
+#: src/util/network/ip.c:295
 #, fuzzy, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
@@ -3143,173 +4167,143 @@
 "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:297
+#: src/util/network/ip.c:317
 #, 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:326
+#: src/util/network/ip.c:350
 #, 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: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: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: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:533
+#: src/util/error/error.c:117
 #, c-format
-msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
-msgstr ""
-
-#: 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: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: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:115
-#, c-format
-msgid ""
 "\n"
 "Press any key to continue\n"
 msgstr ""
 
-#: src/util/error/error.c:187 src/util/error/error.c:222
+#: src/util/error/error.c:190 src/util/error/error.c:225
 msgid "DEBUG"
 msgstr "TÌMLỖI"
 
-#: src/util/error/error.c:189 src/util/error/error.c:224
+#: src/util/error/error.c:192 src/util/error/error.c:227
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:191 src/util/error/error.c:228
+#: src/util/error/error.c:194 src/util/error/error.c:231
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/error/error.c:193 src/util/error/error.c:230
+#: src/util/error/error.c:196 src/util/error/error.c:233
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/error/error.c:195 src/util/error/error.c:232
+#: src/util/error/error.c:198 src/util/error/error.c:235
 msgid "FATAL"
 msgstr "LỖI NẶNG"
 
-#: src/util/error/error.c:197 src/util/error/error.c:234
+#: src/util/error/error.c:200 src/util/error/error.c:237
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:199 src/util/error/error.c:236
+#: src/util/error/error.c:202 src/util/error/error.c:239
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:201 src/util/error/error.c:238
+#: src/util/error/error.c:204 src/util/error/error.c:241
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:203 src/util/error/error.c:240
+#: src/util/error/error.c:206 src/util/error/error.c:243
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:205 src/util/error/error.c:242
+#: src/util/error/error.c:208 src/util/error/error.c:245
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:207 src/util/error/error.c:244
+#: src/util/error/error.c:210 src/util/error/error.c:247
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:209
+#: src/util/error/error.c:212
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:226
+#: src/util/error/error.c:229
 msgid "INFO"
 msgstr "THÔNGTIN"
 
-#: src/util/error/error.c:245
+#: src/util/error/error.c:248
 msgid "NOTHING"
 msgstr "KHÔNGCÓGÌ"
 
-#: src/util/threads/mutex.c:144 src/util/threads/semaphore.c:166
-#: src/util/threads/pthread.c:154
+#: src/util/disk/storage.c:203
 #, 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:543
+#, 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/threads/mutex.c:146 src/util/threads/semaphore.c:168
+#: src/util/threads/pthread.c:157
+#, 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:152 src/util/threads/mutex.c:194
+#: src/util/threads/mutex.c:155 src/util/threads/mutex.c:201
 #, fuzzy, c-format
 msgid "Invalid argument for `%s'.\n"
 msgstr "Tham số sai: '%s'\n"
 
-#: src/util/threads/mutex.c:156
+#: src/util/threads/mutex.c:160
 #, fuzzy, c-format
 msgid "Deadlock due to `%s'.\n"
 msgstr "Khóa chết theo '%s' tại %s: %d.\n"
 
-#: src/util/threads/mutex.c:181
+#: src/util/threads/mutex.c:187
 #, c-format
 msgid "Lock aquired for too long (%llu ms) at %s:%u\n"
 msgstr ""
 
-#: src/util/threads/mutex.c:198
+#: src/util/threads/mutex.c:207
 #, 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:165 src/util/threads/pthread.c:171
-#: src/util/threads/pthread.c:176 src/util/threads/pthread.c:264
+#: src/util/threads/pthread.c:169 src/util/threads/pthread.c:176
+#: src/util/threads/pthread.c:182 src/util/threads/pthread.c:276
 #, 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:181 src/util/threads/pthread.c:273
+#: src/util/threads/pthread.c:188 src/util/threads/pthread.c:286
 #, 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:229
+#: src/util/loggers/file.c:236
 #, 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:248
+#: src/util/loggers/file.c:257
 msgid "GNUnet error log"
 msgstr ""
 
-#: 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
+#: src/util/loggers/file.c:278 src/util/loggers/file.c:296
+#: src/include/gnunet_util_error.h:252 src/include/gnunet_util_error.h:259
+#: src/include/gnunet_util_error.h:266 src/include/gnunet_util_error.h:273
 #, 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
+#: src/util/loggers/memory.c:72
 msgid "Out of memory (for logging)"
 msgstr ""
 
@@ -3368,19 +4362,14 @@
 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
+#: src/util/getopt/setoption.c:59
 #, 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 ""
 "Setting option `%s' in section `%s' to `%s' when processing command line "
 "option `%s' was denied.\n"
 msgstr ""
 
-#: src/util/getopt/setoption.c:136 src/util/getopt/setoption.c:153
+#: src/util/getopt/setoption.c:138 src/util/getopt/setoption.c:155
 #, 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"
@@ -3391,821 +4380,123 @@
 "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:120
-msgid "ms"
-msgstr "mili giây"
-
-#: src/util/string/string.c:126
-msgid "s"
-msgstr "giây"
-
-#: src/util/string/string.c:130
-msgid "m"
-msgstr "phút"
-
-#: src/util/string/string.c:134
-msgid "h"
-msgstr "giờ"
-
-#: src/util/string/string.c:138
-msgid " days"
-msgstr " ngày"
-
-#: src/util/string/string.c:154
-msgid "b"
-msgstr ""
-
-#: src/util/string/string.c:160
-msgid "KiB"
-msgstr ""
-
-#: src/util/string/string.c:164
-msgid "MiB"
-msgstr ""
-
-#: src/util/string/string.c:168
-msgid "GiB"
-msgstr ""
-
-#: src/util/string/string.c:172
-msgid "TiB"
-msgstr ""
-
-#: src/util/string/string.c:284
-msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:59
-msgid "generate configuration for gnunetd, the GNUnet daemon"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:61
-msgid "Tool to setup GNUnet."
-msgstr ""
-
-#: src/setup/gnunet-setup.c:176
+#: src/util/boot/startup.c:251
 #, fuzzy, c-format
-msgid "Too many arguments.\n"
-msgstr "Sai tham số dòng lệnh.\n"
+msgid "Failed to run %s: %s %d\n"
+msgstr "Kết nối tới gnunetd không thành công.\n"
 
-#: 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:255
+#: src/util/config/config.c:295
 #, 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"
+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/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:55
-msgid "list all network adapters"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:58
-msgid "install GNUnet as Windows service"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:61
-msgid "uninstall GNUnet service"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:64
-msgid "increase the maximum number of TCP/IP connections"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:67
-msgid "display a file's hash value"
-msgstr ""
-
-#: src/setup/gnunet-win-tool.c:126
+#: src/util/config/config.c:544
 #, 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: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: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: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: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:154
-#, c-format
-msgid "Service deleted.\n"
-msgstr "Đã xóa bỏ dịch vụ.\n"
-
-#: 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: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:387
-#, fuzzy
-msgid "Description"
-msgstr "Câu hỏi"
-
-#: src/setup/gtk/gconf.c:403
-msgid "Value"
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:427
-msgid "Default"
-msgstr ""
-
-#: src/setup/gtk/gconf.c:442 src/setup/ncurses/wizard_curs.c:73
-msgid "Help"
-msgstr "Trợ giúp"
-
-#: src/setup/gtk/gconf.c:456
-#, fuzzy
-msgid "Section"
-msgstr "Câu hỏi"
-
-#: src/setup/gtk/gconf.c:467
-#, fuzzy
-msgid "Option"
-msgstr "Tùy _chọn"
-
-#: 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:500
-#, fuzzy
-msgid "Failed to save configuration."
-msgstr "Không ghi được thiết lập!"
-
-#: 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:539
-#, fuzzy
-msgid "Error saving configuration."
-msgstr "Không ghi được thiết lập!"
-
-#: src/setup/gtk/wizard_gtk.c:144
-#, fuzzy
-msgid "(unknown connection)"
-msgstr "Kết nối mạng"
-
-#: 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:437
-#, fuzzy
-msgid "Do you want to save the new configuration?"
-msgstr "Ghi thiết lập?"
-
-#: 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: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:492
-msgid ""
-"Running gnunet-update failed.\n"
-"This maybe due to insufficient permissions, please check your "
-"configuration.\n"
-"Finally, run gnunet-update manually."
-msgstr ""
-
-#: src/setup/text/conf.c:79
-#, fuzzy
-msgid "yes"
-msgstr "Có"
-
-#: src/setup/text/conf.c:80
-msgid "no"
-msgstr ""
-
-#: src/setup/text/conf.c:105
+#: src/util/config/config.c:592
 #, c-format
-msgid "\tEnter yes (%s), no (%s) or help (%s): "
-msgstr ""
-
-#: src/setup/text/conf.c:114
-msgid "\tPossible choices:\n"
-msgstr ""
-
-#: src/setup/text/conf.c:122
-msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
-msgstr ""
-
-#: src/setup/text/conf.c:124
-#, c-format
-msgid "\tEnter string (type '%s' for default value `%s'): "
-msgstr ""
-
-#: src/setup/text/conf.c:142
-#, c-format
-msgid "\t Enter choice (default is %c): "
-msgstr ""
-
-#: src/setup/text/conf.c:146
-#, c-format
-msgid "\tEnter floating point (type '%s' for default value %f): "
-msgstr ""
-
-#: src/setup/text/conf.c:152
-#, c-format
 msgid ""
-"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
-"value %llu): "
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
 msgstr ""
 
-#: src/setup/text/conf.c:186
+#: src/util/config/config.c:602
 #, fuzzy, c-format
-msgid "Yes\n"
-msgstr "Có"
-
-#: src/setup/text/conf.c:191
-#, fuzzy, c-format
-msgid "No\n"
-msgstr "Không"
-
-#: 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: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:353 src/setup/text/conf.c:415
-#, c-format
-msgid ""
-"\n"
-"Invalid entry, try again (use '?' for help): "
+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/setup/text/conf.c:421
+#: src/util/config/config.c:688
 #, c-format
-msgid "Unknown kind %x (internal error).  Skipping option.\n"
-msgstr ""
-
-#: src/setup/text/conf.c:482
-msgid "\tDescend? (y/n/?) "
-msgstr ""
-
-#: src/setup/text/conf.c:491
-msgid "Aborted.\n"
-msgstr ""
-
-#: src/setup/text/conf.c:504
-#, fuzzy
-msgid "Invalid entry.\n"
-msgstr "Tham số sai: "
-
-#: src/setup/text/conf.c:521
-#, c-format
-msgid "Unknown kind %x (internal error).  Aborting.\n"
-msgstr ""
-
-#: 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:553
-#, c-format
-msgid "Use the '%s' key to abort.\n"
-msgstr ""
-
-#: 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:571
-#, c-format
 msgid ""
-"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
-"configuration. "
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: 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/util/string/string.c:55
+msgid "ms"
+msgstr "mili giây"
 
-#: 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"
+#: src/util/string/string.c:61
+msgid "s"
+msgstr "giây"
 
-#: src/setup/ncurses/mconf.c:85
-msgid "Exit"
-msgstr ""
+#: src/util/string/string.c:65
+msgid "m"
+msgstr "phút"
 
-#: src/setup/ncurses/mconf.c:88
-msgid "Up"
-msgstr "Lên"
+#: src/util/string/string.c:69
+msgid "h"
+msgstr "giờ"
 
-#: src/setup/ncurses/mconf.c:91
-msgid "Cancel"
-msgstr "Dừng"
+#: src/util/string/string.c:73
+msgid " days"
+msgstr " ngày"
 
-#: 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?)"
+#: src/util/string/string.c:89
+msgid "b"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:212 src/setup/ncurses/mconf.c:403
-msgid "Internal error! (Value invalid?)"
+#: src/util/string/string.c:95
+msgid "KiB"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:392
-msgid "Invalid input, expecting floating point value."
+#: src/util/string/string.c:99
+msgid "MiB"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:435
-msgid "Invalid input, expecting integer."
+#: src/util/string/string.c:103
+msgid "GiB"
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:443
-msgid "Value is not in legal range."
+#: src/util/string/string.c:107
+msgid "TiB"
 msgstr ""
 
-#: 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:517
-#, fuzzy
-msgid "Do you wish to save your new configuration?"
-msgstr "Ghi thiết lập?"
-
-#: 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: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: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:80
-#, fuzzy
-msgid "Error!"
-msgstr "Lỗi"
-
-#: src/setup/ncurses/wizard_curs.c:142
-#, fuzzy
-msgid "Abort"
-msgstr "_Nói về"
-
-#: src/setup/ncurses/wizard_curs.c:143
-msgid "Ok"
+#: src/util/string/string.c:226
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: 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:211
-#, fuzzy
-msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org/\n";
-"and join our community at\n"
-"\thttp://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"the GNUnet team"
-msgstr ""
-"Xin chào mừng tới GNUnet!\n"
-"\n"
-"Trình giúp đỡ này sẽ hỏi bạn vài câu cơ bản để cấu hình GNUnet.\n"
-"\n"
-"Xin hãy thăm trang chủ của chúng tôi tại\n"
-"\thttp://www.gnunet.org\n";
-"và tham gia cộng đồng tại\n"
-"\thttp://www.gnunet.org/drupal/\n";
-"\n"
-"Chúc có nhiều niềm vui,\n"
-"\n"
-"đội GNUnet"
-
-#: 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: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 ""
-"\"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:306
-#, fuzzy
-msgid "Network configuration: interface"
-msgstr "Giao diện mạng:"
-
-#: 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:319
-#, fuzzy
-msgid "Network configuration: NAT"
-msgstr "Cấu hình GNUnet"
-
-#: src/setup/ncurses/wizard_curs.c:320
-msgid ""
-"Is this machine behind NAT?\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
-"connections through modems, ISDN cards and DNAT (also known as \"port "
-"forwarding\")."
-msgstr ""
-"Máy này nằm dưới NAT?\n"
-"\n"
-"Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến "
-"router hay một \"phần cứng tường lửa\" và các máy khác trong internet không "
-"thể kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu kết nối "
-"thẳng qua môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp cổng\")."
-
-#: src/setup/ncurses/wizard_curs.c:333
-#, fuzzy
-msgid "Network configuration: IP"
-msgstr "Cấu hình GNUnet"
-
-#: src/setup/ncurses/wizard_curs.c:335
-#, fuzzy
-msgid "What is this computer's public IP address or hostname?"
-msgstr ""
-"Địa chỉ IP công cộng hoặc tên của máy tính này là gì?\n"
-"\n"
-"Nếu không biết, hãy để trống."
-
-#: src/setup/ncurses/wizard_curs.c:336
-#, fuzzy
-msgid ""
-"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
-"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If left empty, GNUnet will try to automatically detect the IP.\n"
-"You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
-"If in doubt, leave this empty."
-msgstr ""
-"Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh"
-"\"), thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay "
-"đổi sau mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn luôn "
-"chỉ tới địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập nó ở "
-"đây.\n"
-"Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra địa "
-"chỉ IP."
-
-#: 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: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:354
-#, fuzzy
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"upstream\" is the data channel through which data is *sent* to the "
-"internet. The limit is the maximum amountwhich GNUnet is allowed to use. If "
-"you have a flatrate, you can set it to the maximum speed of your internet "
-"connection. You should not use a value that is higher than what your actual "
-"connection allows."
-msgstr ""
-"Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
-"\n"
-"\"Dòng ra\" là kênh dữ liệu qua đó *gửi* dữ liệu tới internet. Có thể giới "
-"hạn hoặc cho cả máy tính này hoặc chỉ giới hạn cho GNUnet. Người dùng có thể "
-"chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
-"internet lớn nhất."
-
-#: 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: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:369
-#, fuzzy
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"downstream\" is the data channel through which data is *received* from "
-"the internet. The limit is the maximum amountwhich GNUnet is allowed to use. "
-"If you have a flatrate, you can set it to the maximum speed of your internet "
-"connection. You should not use a value that is higher than what your actual "
-"connection allows."
-msgstr ""
-"Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
-"\n"
-"\"Dòng vào\" là kênh dữ liệu qua đó *nhận* dữ liệu từ internet. Có thể giới "
-"hạn hoặc cho cả máy tính này hoặc chỉ giới hạn cho GNUnet. Người dùng có thể "
-"chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
-"internet lớn nhất."
-
-#: src/setup/ncurses/wizard_curs.c:381
-#, fuzzy
-msgid "Quota configuration"
-msgstr "Cấu hình GNUnet"
-
-#: 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:383
-#, fuzzy
-msgid ""
-"The GNUnet datastore contains all content that GNUnet needs to store "
-"(indexed, inserted and migrated content)."
-msgstr ""
-"Kích thước lớn nhất của kho dữ liệu tính theo MB?\n"
-"\n"
-"Kho dữ liệu GNUnet chứa tất cả các dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, "
-"nội dung chèn và nhập vào)."
-
-#: 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:394
-msgid "As which user should gnunetd be run?"
-msgstr ""
-
-#: 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 "
-"account under which the GNUnet service is started at system startup.\n"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the field empty to run GNUnet with system privileges.\n"
-msgstr ""
-"Xác định người dùng sở hữu dịch vụ GNUnet.\n"
-"\n"
-"Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng mới sở hữu dịch "
-"vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
-"\n"
-"Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao gồm "
-"các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho phép "
-"người dùng chỉ ra dưới đây quyền đọc chúng.\n"
-"\n"
-"Để trống để chạy GNUnet với quyền hệ thống.\n"
-"Người dùng GNUnet:"
-
-#: src/setup/ncurses/wizard_curs.c:411
-msgid "Daemon configuration: group account"
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:412
-msgid "As which group should gnunetd be run?"
-msgstr ""
-
-#: 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 "
-"for the chosen user account.\n"
-"\n"
-"You can also specify a already existant group here.\n"
-"\n"
-"Only members of this group will be allowed to start and stop the the GNUnet "
-"server and have access to GNUnet server data.\n"
-msgstr ""
-"Xác định nhóm sở hữu dịch vụ GNUnet.\n"
-"\n"
-"Vì lý do bảo mật, nên để cài đặt này tạo một nhóm mới cho tài khoản người "
-"dùng đã chọn\n"
-"\n"
-"Cũng có thể chỉ ra một nhóm đã có.\n"
-"\n"
-"Chỉ thành viên của nhóm này mới có quyền chạy và dừng máy chủ GNUnet và có "
-"truy cập tới dữ liệu máy chủ GNUnet.\n"
-"\n"
-"Nhóm GNUnet:"
-
-#: 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:430
-#, fuzzy
-msgid ""
-"If you say \"yes\" here, the GNUnet background process will be automatically "
-"started when you turn on your computer. If you say \"no\" here, you have to "
-"launch GNUnet yourself each time you want to use it."
-msgstr ""
-"Chạy GNUnet như một dịch vụ hệ thống?\n"
-"\n"
-"Nếu chọn \"yes\", tiến trình nền sau GNUnet sẽ tự động chạy khi bật máy "
-"tính. Nếu chọn \"no\", thì cần chạy GNUnet mỗi khi muốn sử dụng."
-
-#: 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:478
-msgid "Unable to setup autostart for daemon."
-msgstr ""
-
-#: src/setup/ncurses/wizard_curs.c:493
-#, fuzzy
-msgid "Save configuration?"
-msgstr "Cấu hình GNUnet"
-
-#: src/setup/ncurses/wizard_curs.c:494
-#, fuzzy
-msgid "Save configuration now?"
-msgstr "Cấu hình GNUnet"
-
-#: src/setup/ncurses/wizard_curs.c:538
-msgid "Back"
-msgstr "Quay lại"
-
-#: 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:190
-#, c-format
-msgid ""
-"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
-msgstr ""
-
-#: 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:116
-msgid "Can't create service"
-msgstr "Không tạo được dịch vụ"
-
-#: 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:125
-msgid "Cannot write to the regisitry"
-msgstr "Không ghi được tới bản ghi"
-
-#: 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:131
-msgid "Can't delete the service"
-msgstr "Không xóa được dịch vụ"
-
-#: src/setup/lib/wizard_util.c:134
-msgid "Unknown error"
-msgstr "Lỗi không rõ"
-
-#: 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:174
-msgid "Error creating user"
-msgstr "Lỗi tạo người dùng"
-
-#: 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: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: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:153
+#: src/include/gnunet_util_getopt.h:154
 msgid "print this help"
 msgstr "in trợ giúp này"
 
-#: src/include/gnunet_util_getopt.h:162
+#: src/include/gnunet_util_getopt.h:163
 msgid "print the version number"
 msgstr "in số của phiên bản"
 
-#: src/include/gnunet_util_getopt.h:168
+#: src/include/gnunet_util_getopt.h:169
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_util_getopt.h:174
+#: src/include/gnunet_util_getopt.h:175
 msgid "be verbose"
 msgstr "thông báo chi tiết"
 
-#: src/include/gnunet_util_getopt.h:180
+#: src/include/gnunet_util_getopt.h:181
 msgid "use configuration file FILENAME"
 msgstr "dùng tập tin cấu hình FILENAME"
 
-#: src/include/gnunet_util_getopt.h:186
+#: src/include/gnunet_util_getopt.h:187
 msgid "specify host on which gnunetd is running"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: 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:236
+#: src/include/gnunet_util_error.h:221 src/include/gnunet_util_error.h:223
+#: src/include/gnunet_util_error.h:229 src/include/gnunet_util_error.h:245
 #, 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:230
+#: src/include/gnunet_util_error.h:239
 #, c-format
 msgid ""
 "External protocol violation: assertion failed at %s:%d in %s (no need to "
 "panic, we can handle this).\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:271 src/include/gnunet_util_error.h:278
+#: src/include/gnunet_util_error.h:280 src/include/gnunet_util_error.h:287
 #, 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"
@@ -4346,23 +4637,35 @@
 "configuration here.  Default is no proxy."
 msgstr ""
 
-#: contrib/config-daemon.scm:224 contrib/config-client.scm:144
+#: contrib/config-daemon.scm:210
+msgid ""
+"Name of the directory where gnunetd should store contact information about "
+"peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:212
+msgid ""
+"Unless you want to share the directory directly using a webserver, the "
+"default is most likely just fine."
+msgstr ""
+
+#: contrib/config-daemon.scm:238 contrib/config-client.scm:144
 msgid "How long should logs be kept?"
 msgstr ""
 
-#: contrib/config-daemon.scm:226 contrib/config-client.scm:146
+#: contrib/config-daemon.scm:240 contrib/config-client.scm:146
 msgid ""
 "How long should logs be kept? If you specify a value greater than zero, a "
 "log is created each day with the date appended to its filename. These logs "
 "are deleted after $KEEPLOG days.\tTo keep logs forever, set this value to 0."
 msgstr ""
 
-#: contrib/config-daemon.scm:237
+#: contrib/config-daemon.scm:251
 msgid ""
 "What maximum number of open file descriptors should be requested from the OS?"
 msgstr ""
 
-#: contrib/config-daemon.scm:239
+#: contrib/config-daemon.scm:253
 msgid ""
 "The default of 1024 should be fine for most systems.  If your system can "
 "support more, increasing the number might help support additional clients on "
@@ -4374,62 +4677,66 @@
 "run with what it is given."
 msgstr ""
 
-#: contrib/config-daemon.scm:250
+#: contrib/config-daemon.scm:264
 msgid "Where should gnunetd write the logs?"
 msgstr ""
 
-#: contrib/config-daemon.scm:262 contrib/config-client.scm:169
+#: contrib/config-daemon.scm:276
+msgid "Enable for extra-verbose logging."
+msgstr ""
+
+#: contrib/config-daemon.scm:288 contrib/config-client.scm:169
 msgid "Logging"
 msgstr ""
 
-#: contrib/config-daemon.scm:263 contrib/config-client.scm:170
+#: contrib/config-daemon.scm:289 contrib/config-client.scm:170
 msgid "Specify which system messages should be logged how"
 msgstr ""
 
-#: contrib/config-daemon.scm:267 contrib/config-client.scm:174
+#: contrib/config-daemon.scm:294 contrib/config-client.scm:174
 msgid "Logging of events for users"
 msgstr ""
 
-#: contrib/config-daemon.scm:268 contrib/config-client.scm:175
+#: contrib/config-daemon.scm:295 contrib/config-client.scm:175
 msgid "Logging of events for the system administrator"
 msgstr ""
 
-#: contrib/config-daemon.scm:280
+#: contrib/config-daemon.scm:307
 msgid "Where should gnunetd write the PID?"
 msgstr ""
 
-#: contrib/config-daemon.scm:281
+#: contrib/config-daemon.scm:308
 msgid ""
 "The default is no longer /var/run/gnunetd.pid since we could not delete the "
 "file on shutdown at that location."
 msgstr ""
 
-#: contrib/config-daemon.scm:293
+#: contrib/config-daemon.scm:320
 msgid "As which user should gnunetd run?"
 msgstr ""
 
-#: contrib/config-daemon.scm:295
+#: contrib/config-daemon.scm:322
 msgid ""
 "Empty means \"current user\". On computer startup, it is root/SYSTEM.  Under "
 "Windows, this setting affects the creation of a new system service only."
 msgstr ""
 
-#: contrib/config-daemon.scm:308
+#: contrib/config-daemon.scm:335
 msgid "Should gnunetd be automatically started when the system boots?"
 msgstr ""
 
-#: contrib/config-daemon.scm:309
+#: contrib/config-daemon.scm:336
 msgid ""
 "Set to YES if gnunetd should be automatically started on boot.  If this "
 "option is set, gnunet-setup will install a script to start the daemon upon "
 "completion.  This option may not work on all systems."
 msgstr ""
 
-#: contrib/config-daemon.scm:321
+#: contrib/config-daemon.scm:348
 msgid "Which transport mechanisms should GNUnet use?"
 msgstr ""
 
-#: contrib/config-daemon.scm:323
+#: contrib/config-daemon.scm:350
 msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
 "available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
@@ -4443,11 +4750,11 @@
 "itself."
 msgstr ""
 
-#: contrib/config-daemon.scm:337
+#: contrib/config-daemon.scm:364
 msgid "Which applications should gnunetd support?"
 msgstr ""
 
-#: contrib/config-daemon.scm:339
+#: contrib/config-daemon.scm:366
 msgid ""
 "Whenever this option is changed, you MUST run gnunet-update. Currently, the "
 "available applications are:\n"
@@ -4484,11 +4791,11 @@
 "compromise your anonymity."
 msgstr ""
 
-#: contrib/config-daemon.scm:368
+#: contrib/config-daemon.scm:395
 msgid "Disable client-server connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:369
+#: contrib/config-daemon.scm:396
 msgid ""
 "This option can be used to tell gnunetd not to open the client port.  When "
 "run like this, gnunetd will participate as a peer in the network but not "
@@ -4497,11 +4804,11 @@
 "prevent you from running diagnostic tools like gnunet-stats!"
 msgstr ""
 
-#: contrib/config-daemon.scm:381
+#: contrib/config-daemon.scm:408
 msgid "Disable peer discovery"
 msgstr ""
 
-#: contrib/config-daemon.scm:382
+#: contrib/config-daemon.scm:409
 msgid ""
 "The option 'PRIVATE-NETWORK' can be used to limit the connections of this "
 "peer to peers of which the hostkey has been copied by hand to data/hosts;  "
@@ -4513,15 +4820,15 @@
 "lines above would need some minor editing :-)."
 msgstr ""
 
-#: contrib/config-daemon.scm:393
+#: contrib/config-daemon.scm:420
 msgid "Disable advertising this peer to other peers"
 msgstr ""
 
-#: contrib/config-daemon.scm:405
+#: contrib/config-daemon.scm:432
 msgid "Disable automatic establishment of connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:406
+#: contrib/config-daemon.scm:433
 msgid ""
 "If this option is enabled, GNUnet will not automatically establish "
 "connections to other peers, but instead wait for applications to "
@@ -4529,22 +4836,22 @@
 "connect to us)."
 msgstr ""
 
-#: contrib/config-daemon.scm:417
+#: contrib/config-daemon.scm:444
 msgid "Disable advertising of other peers by this peer"
 msgstr ""
 
-#: contrib/config-daemon.scm:418
+#: contrib/config-daemon.scm:445
 msgid ""
 "This option maybe useful during testing, but turning it off is dangerous! If "
 "in any doubt, set it to YES (which is the default)."
 msgstr ""
 
-#: contrib/config-daemon.scm:429
+#: contrib/config-daemon.scm:456
 #, fuzzy
 msgid "Port for communication with GNUnet user interfaces"
 msgstr "In thông tin về các đầu peer của GNUnet."
 
-#: contrib/config-daemon.scm:430
+#: contrib/config-daemon.scm:457
 msgid ""
 "Which is the client-server port that is used between gnunetd and the clients "
 "(TCP only).  You may firewall this port for non-local machines (but you do "
@@ -4552,11 +4859,11 @@
 "connections from machines that are listed under TRUSTED)."
 msgstr ""
 
-#: contrib/config-daemon.scm:441
+#: contrib/config-daemon.scm:468
 msgid "IPs allowed to use gnunetd server"
 msgstr ""
 
-#: contrib/config-daemon.scm:442
+#: contrib/config-daemon.scm:469
 msgid ""
 "This option specifies which hosts are trusted enough to connect as clients "
 "(to the TCP port).  This is useful if you run gnunetd on one host of your "
@@ -4567,70 +4874,70 @@
 "separated by a semicolon, spaces are not allowed."
 msgstr ""
 
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:481
 msgid "Limit connections to the specfied set of peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:455
+#: contrib/config-daemon.scm:482
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If it is set, "
 "only the specified peers are allowed. Specify the list of peer IDs (not IPs!)"
 msgstr ""
 
-#: contrib/config-daemon.scm:466
+#: contrib/config-daemon.scm:493
 msgid "Run gnunetd as this group."
 msgstr ""
 
-#: contrib/config-daemon.scm:467
+#: contrib/config-daemon.scm:494
 msgid ""
 "When started as root, gnunetd will change permissions to the given group."
 msgstr ""
 
-#: contrib/config-daemon.scm:478
+#: contrib/config-daemon.scm:505
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:479
+#: contrib/config-daemon.scm:506
 msgid ""
 "If this option is not set, any peer is allowed to connect.  If the ID of a "
 "peer is listed here, connections from that peer will be refused.  Specify "
 "the list of peer IDs (not IPs!)"
 msgstr ""
 
-#: contrib/config-daemon.scm:490
+#: contrib/config-daemon.scm:517
 msgid "Topology Maintenance"
 msgstr ""
 
-#: contrib/config-daemon.scm:491
+#: contrib/config-daemon.scm:518
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:511
+#: contrib/config-daemon.scm:538
 #, fuzzy
 msgid "General settings"
 msgstr "Thiết lập khác"
 
-#: contrib/config-daemon.scm:512
+#: contrib/config-daemon.scm:539
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:536
+#: contrib/config-daemon.scm:564
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:537
+#: contrib/config-daemon.scm:565
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:554
+#: contrib/config-daemon.scm:583
 msgid "Fundamentals"
 msgstr ""
 
-#: contrib/config-daemon.scm:574
+#: contrib/config-daemon.scm:603
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:576
+#: contrib/config-daemon.scm:605
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -4639,51 +4946,88 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:589
+#: contrib/config-daemon.scm:618 contrib/config-daemon.scm:631
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:591
+#: contrib/config-daemon.scm:619
+msgid "Which database should be used for the temporary datastore of the DHT?"
+msgstr ""
+
+#: contrib/config-daemon.scm:633
 msgid ""
-"Which topology should be used?  The only options at the moment are "
-"\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
-"to connect to a diverse set of peers, and welcome connections from anyone.  "
-"In f2f (friend-to-friend) mode, GNUnet will only allow connections from "
-"peers that are explicitly listed in a FRIENDS file.  Note that you can list "
-"peers in the FRIENDS file that run in default mode.\n"
-"\n"
-"Use f2f only if you have (trustworthy) friends that use GNUnet and are "
-"afraid of establishing (direct) connections to unknown peers."
+"Which topology should be used?  The only option at the moment is "
+"\"topology_default\""
 msgstr ""
 
-#: contrib/config-daemon.scm:607
+#: contrib/config-daemon.scm:647
+msgid ""
+"Minimum number of connected friends before this peer is allowed to connect "
+"to peers that are not listed as friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:648
+msgid ""
+"Note that this option does not guarantee that the peer will be able to "
+"connect to the specified number of friends.  Also, if the peer had connected "
+"to a sufficient number of friends and then established non-friend "
+"connections, some of the friends may drop out of the network, temporarily "
+"resulting in having fewer than the specified number of friends connected "
+"while being connected to non-friends.  However, it is guaranteed that the "
+"peer itself will never choose to drop a friend's connection if this would "
+"result in dropping below the specified number of friends (unless that number "
+"is higher than the overall connection target)."
+msgstr ""
+
+#: contrib/config-daemon.scm:659
+msgid ""
+"If set to YES, the peer is only allowed to connect to other peers that are "
+"explicitly specified as friends"
+msgstr ""
+
+#: contrib/config-daemon.scm:660
+msgid ""
+"Use YES only if you have (trustworthy) friends that use GNUnet and are "
+"afraid of establishing (direct) connections to unknown peers"
+msgstr ""
+
+#: contrib/config-daemon.scm:671
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:608
+#: contrib/config-daemon.scm:672
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:622
+#: contrib/config-daemon.scm:683
+msgid "Friend-to-Friend Topology Specification"
+msgstr ""
+
+#: contrib/config-daemon.scm:684
+#, fuzzy
+msgid "Settings for restricting connections to friends"
+msgstr "'%s' không thành công. Ngắt kết nối tới máy khách.\n"
+
+#: contrib/config-daemon.scm:701
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:634
+#: contrib/config-daemon.scm:713
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:646
+#: contrib/config-daemon.scm:725
 msgid "Configuration of the MySQL database"
 msgstr ""
 
-#: contrib/config-daemon.scm:665
+#: contrib/config-daemon.scm:744
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:667
+#: contrib/config-daemon.scm:746
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -4694,19 +5038,19 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:681
+#: contrib/config-daemon.scm:760
 msgid "Size of the routing table for anonymous routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:693
+#: contrib/config-daemon.scm:772
 msgid "Size of the routing table for DHT routing."
 msgstr ""
 
-#: contrib/config-daemon.scm:706
+#: contrib/config-daemon.scm:785
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:708
+#: contrib/config-daemon.scm:787
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -4718,13 +5062,13 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:722
+#: contrib/config-daemon.scm:801
 msgid ""
 "MB of diskspace GNUnet can use for caching DHT index data (the data will be "
 "stored in /tmp)"
 msgstr ""
 
-#: contrib/config-daemon.scm:723
+#: contrib/config-daemon.scm:802
 msgid ""
 "DHT index data is inherently small and expires comparatively quickly.  It is "
 "deleted whenever gnunetd is shut down.\n"
@@ -4732,20 +5076,20 @@
 "The size of the DSTORE QUOTA is specified in MB."
 msgstr ""
 
-#: contrib/config-daemon.scm:737
+#: contrib/config-daemon.scm:816
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:756
+#: contrib/config-daemon.scm:835
 #, fuzzy
 msgid "Applications"
 msgstr "Tùy _chọn"
 
-#: contrib/config-daemon.scm:772
+#: contrib/config-daemon.scm:851
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:773
+#: contrib/config-daemon.scm:852
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port and that cannot be traversed using UPnP.  Note "
@@ -4755,18 +5099,21 @@
 "contact you directly.  You can use 'make check' in src/transports/upnp/ to "
 "find out if your NAT supports UPnP.  You can also use gnunet-transport-check "
 "with the '-p' option in order to determine which setting results in more "
-"connections.  Use YES only if you get no connections otherwise."
+"connections.  Use YES only if you get no connections otherwise.  Set to AUTO "
+"to use YES if the local IP is belongs to a private IP network and NO "
+"otherwise."
 msgstr ""
 
-#: contrib/config-daemon.scm:784
+#: contrib/config-daemon.scm:863
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:796 contrib/config-daemon.scm:901
+#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:941
+#: contrib/config-daemon.scm:1078
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:797
+#: contrib/config-daemon.scm:876
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP.  You should disable this option if you are sure that you are "
@@ -4774,30 +5121,38 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:808 contrib/config-daemon.scm:925
-#: contrib/config-daemon.scm:980 contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:887 contrib/config-daemon.scm:1102
+#: contrib/config-daemon.scm:1157 contrib/config-daemon.scm:1222
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:820
+#: contrib/config-daemon.scm:899
 msgid ""
 "Which IPs are allowed to connect? Leave empty to use the IP of your primary "
 "network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:832
+#: contrib/config-daemon.scm:911
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:850
+#: contrib/config-daemon.scm:929
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:862
+#: contrib/config-daemon.scm:942 contrib/config-daemon.scm:1079
+msgid ""
+"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
+"supports UPnP. You should disable this option if you are sure that you are "
+"not behind a NAT.  If your NAT box does not support UPnP, having this on "
+"will not do much harm (only cost a small amount of resources)."
+msgstr ""
+
+#: contrib/config-daemon.scm:953
 msgid "Which is the external port of the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:863
+#: contrib/config-daemon.scm:954
 msgid ""
 "Use this option if your firewall maps say port 80 to your real HTTP port.  "
 "This can be useful in making the HTTP messages appear even more legit "
@@ -4805,91 +5160,129 @@
 "priviledged port)."
 msgstr ""
 
-#: contrib/config-daemon.scm:874
+#: contrib/config-daemon.scm:965
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:889
-msgid "Which port should be used by the UDP IPv4 transport?"
+#: contrib/config-daemon.scm:984
+msgid "What is the maximum transfer unit for SMTP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:902
+#: contrib/config-daemon.scm:996
+msgid "Which e-mail address should be used to send e-mail to this peer?"
+msgstr ""
+
+#: contrib/config-daemon.scm:997
 msgid ""
-"You can use 'make check' in src/transports/upnp/ to find out if your NAT "
-"supports UPnP. You should disable this option if you are sure that you are "
-"not behind a NAT.  If your NAT box does not support UPnP, having this on "
-"will not do much harm (only cost a small amount of resources)."
+"You must make sure that e-mail received at this address is forwarded to the "
+"PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with "
+"procmail and the PIPE option to set the name of the pipe."
 msgstr ""
 
-#: contrib/config-daemon.scm:913
+#: contrib/config-daemon.scm:1008
+msgid ""
+"Which header line should other peers include in e-mails to enable filtering?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1009
+msgid ""
+"You can specify a header line here which can then be used by procmail to "
+"filter GNUnet e-mail from your inbox and forward it to gnunetd."
+msgstr ""
+
+#: contrib/config-daemon.scm:1020
+msgid "What is the filename of the pipe where gnunetd can read its e-mail?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1021
+msgid "Have a look at contrib/dot-procmailrc for an example .procmailrc file."
+msgstr ""
+
+#: contrib/config-daemon.scm:1032
+msgid "What is the name and port of the server for outgoing e-mail?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1033
+msgid "The basic format is HOSTNAME:PORT."
+msgstr ""
+
+#: contrib/config-daemon.scm:1044
+msgid "SMTP transport"
+msgstr ""
+
+#: contrib/config-daemon.scm:1066
+msgid "Which port should be used by the UDP IPv4 transport?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1090
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:937
+#: contrib/config-daemon.scm:1114
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow connections from any "
 "IP."
 msgstr ""
 
-#: contrib/config-daemon.scm:949
+#: contrib/config-daemon.scm:1126
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:968
+#: contrib/config-daemon.scm:1145
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:992 contrib/config-daemon.scm:1057
+#: contrib/config-daemon.scm:1169 contrib/config-daemon.scm:1234
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow any IP to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:1004
+#: contrib/config-daemon.scm:1181
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1021
+#: contrib/config-daemon.scm:1198
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1033
+#: contrib/config-daemon.scm:1210
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1069
+#: contrib/config-daemon.scm:1246
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1087
+#: contrib/config-daemon.scm:1264
 #, fuzzy
 msgid "Network interface"
 msgstr "Giao diện mạng:"
 
-#: contrib/config-daemon.scm:1099
+#: contrib/config-daemon.scm:1276
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1111
+#: contrib/config-daemon.scm:1288
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1123
+#: contrib/config-daemon.scm:1300
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1146
+#: contrib/config-daemon.scm:1324
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1158
+#: contrib/config-daemon.scm:1336
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1170
+#: contrib/config-daemon.scm:1348
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1172
+#: contrib/config-daemon.scm:1350
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -4899,11 +5292,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1183
+#: contrib/config-daemon.scm:1361
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1185
+#: contrib/config-daemon.scm:1363
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4913,36 +5306,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1196
+#: contrib/config-daemon.scm:1374
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1197
+#: contrib/config-daemon.scm:1375
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1208
+#: contrib/config-daemon.scm:1386
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1209
+#: contrib/config-daemon.scm:1387
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1220
+#: contrib/config-daemon.scm:1398
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1232
+#: contrib/config-daemon.scm:1410
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1234
+#: contrib/config-daemon.scm:1412
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -4987,12 +5380,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1251
+#: contrib/config-daemon.scm:1429
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Giao diện mạng:"
 
-#: contrib/config-daemon.scm:1252
+#: contrib/config-daemon.scm:1430
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -5003,11 +5396,11 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1263
+#: contrib/config-daemon.scm:1441
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1288 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1466 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -5140,412 +5533,709 @@
 msgid "The directory for GNUnet files that belong to the user."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Path settings"
-#~ msgstr "Thiết lập khác"
+#: src/setup/gtk/gnunet-setup.glade:9 src/setup/gtk/gnunet-setup.glade:167
+#: src/setup/gtk/gnunet-setup.glade:435 src/setup/gtk/gnunet-setup.glade:845
+#: src/setup/gtk/gnunet-setup.glade:1178
+msgid "GNUnet configuration assistant"
+msgstr "Trình giúp cấu hình GNUnet"
 
-#~ 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"
-
+#: src/setup/gtk/gnunet-setup.glade:34
 #, 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 ""
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org\n";
+"and join our community at\n"
+"\thttps://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"The GNUnet team"
+msgstr ""
+"Xin chào mừng tới GNUnet!\n"
+"\n"
+"Trình giúp đỡ này sẽ hỏi bạn vài câu cơ bản để cấu hình GNUnet.\n"
+"\n"
+"Xin hãy thăm trang chủ của chúng tôi tại\n"
+"\thttp://www.gnunet.org\n";
+"và tham gia cộng đồng tại\n"
+"\thttp://www.gnunet.org/drupal/\n";
+"\n"
+"Chúc có nhiều niềm vui,\n"
+"\n"
+"đội GNUnet"
 
-#~ 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/setup/gtk/gnunet-setup.glade:92 src/setup/gtk/gnunet-setup.glade:360
+#: src/setup/gtk/gnunet-setup.glade:767 src/setup/gtk/gnunet-setup.glade:1384
+msgid "Next"
+msgstr "Tiếp"
 
-#~ msgid "Could not send message to gnunetd\n"
-#~ msgstr "Không gửi được thông báo tới gnunetd\n"
+#: src/setup/gtk/gnunet-setup.glade:194
+msgid ""
+"Enter information about your network connection here.\n"
+"\n"
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL.\n"
+"\n"
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address.\n"
+"\n"
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, check the last option on this page. Leave it "
+"unchecked on direct connections through modems, ISDN cards and DNAT (also "
+"known as \"port forwarding\")."
+msgstr ""
+"Nhập thông tin về kết nối mạng tại đây.\n"
+"\n"
+"\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây thường là "
+"một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL.\n"
+"\n"
+"Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh"
+"\"), thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay "
+"đổi sau mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn luôn "
+"chỉ tới địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập nó ở "
+"đây.\n"
+"Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra địa "
+"chỉ IP. \n"
+"Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến "
+"router hay một \"phần cứng tường lửa\" và các máy khác trong internet không "
+"thể kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu kết nối "
+"thẳng qua môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp cổng\")."
 
-#, 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"
+#: src/setup/gtk/gnunet-setup.glade:250
+msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+msgstr "Máy không thể nhận được kết nối đi vào (SNAT/Firewall)"
 
-#, fuzzy
-#~ msgid "Database failed to delete `%s'.\n"
-#~ msgstr "Cơ sở dữ liệu xóa %s không thành công.\n"
+#: src/setup/gtk/gnunet-setup.glade:283
+msgid "IP-Address/Hostname:"
+msgstr "Địa chỉ IP/Tên máy:"
 
-#~ msgid "GNUnet configuration assistant"
-#~ msgstr "Trình giúp cấu hình GNUnet"
+#: src/setup/gtk/gnunet-setup.glade:296
+msgid "Network interface:"
+msgstr "Giao diện mạng:"
 
-#, fuzzy
-#~ msgid ""
-#~ "Welcome to GNUnet!\n"
-#~ "\n"
-#~ "This assistant will ask you a few basic questions in order to configure "
-#~ "GNUnet.\n"
-#~ "\n"
-#~ "Please visit our homepage at\n"
-#~ "\thttp://gnunet.org\n";
-#~ "and join our community at\n"
-#~ "\thttps://gnunet.org/drupal/\n";
-#~ "\n"
-#~ "Have a lot of fun,\n"
-#~ "\n"
-#~ "The GNUnet team"
-#~ msgstr ""
-#~ "Xin chào mừng tới GNUnet!\n"
-#~ "\n"
-#~ "Trình giúp đỡ này sẽ hỏi bạn vài câu cơ bản để cấu hình GNUnet.\n"
-#~ "\n"
-#~ "Xin hãy thăm trang chủ của chúng tôi tại\n"
-#~ "\thttp://www.gnunet.org\n";
-#~ "và tham gia cộng đồng tại\n"
-#~ "\thttp://www.gnunet.org/drupal/\n";
-#~ "\n"
-#~ "Chúc có nhiều niềm vui,\n"
-#~ "\n"
-#~ "đội GNUnet"
+#: src/setup/gtk/gnunet-setup.glade:319
+msgid "Network connection"
+msgstr "Kết nối mạng"
 
-#~ msgid "Next"
-#~ msgstr "Tiếp"
+#: src/setup/gtk/gnunet-setup.glade:462
+msgid ""
+"You can limit GNUnet's ressource usage here.\n"
+"\n"
+"\"Bandwidth limitation\" is how much data may be sent per second. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection.\n"
+"\n"
+"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
+"to use."
+msgstr ""
+"Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
+"\n"
+"\"Giới hạn băng thông\" cho biết bao nhiêu dữ liệu có thể gửi mỗi giây. Nếu "
+"có một tốc độ đều thì có thể đặt thành tốc độ lớn nhất của kết nối "
+"internet.\n"
+"\n"
+"\"Sử dụng CPU lớn nhất\" là phần trăm thời gian của bộ xử lý cho phép GNUnet "
+"sử dụng."
 
-#~ msgid ""
-#~ "Enter information about your network connection here.\n"
-#~ "\n"
-#~ "The \"Network interface\" is the device that connects your computer to "
-#~ "the internet. This is usually a modem, an ISDN card or a network card in "
-#~ "case you are using DSL.\n"
-#~ "\n"
-#~ "If your provider always assigns the same IP-Address to you (a \"static\" "
-#~ "IP-Address), enter it into the \"IP-Address\" field. If your IP-Address "
-#~ "changes every now and then (\"dynamic\" IP-Address) but there's a "
-#~ "hostname that always points to your actual IP-Address (\"Dynamic DNS\"), "
-#~ "you can also enter it here.\n"
-#~ "If in doubt, leave the field empty. GNUnet will then try to determine "
-#~ "your IP-Address.\n"
-#~ "\n"
-#~ "If you are connected to the internet through another computer doing SNAT, "
-#~ "a router or a \"hardware firewall\" and other computers on the internet "
-#~ "cannot connect to this computer, check the last option on this page. "
-#~ "Leave it unchecked on direct connections through modems, ISDN cards and "
-#~ "DNAT (also known as \"port forwarding\")."
-#~ msgstr ""
-#~ "Nhập thông tin về kết nối mạng tại đây.\n"
-#~ "\n"
-#~ "\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây thường "
-#~ "là một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL.\n"
-#~ "\n"
-#~ "Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh"
-#~ "\"), thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay "
-#~ "đổi sau mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn "
-#~ "luôn chỉ tới địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập "
-#~ "nó ở đây.\n"
-#~ "Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra "
-#~ "địa chỉ IP. \n"
-#~ "Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến "
-#~ "router hay một \"phần cứng tường lửa\" và các máy khác trong internet "
-#~ "không thể kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu "
-#~ "kết nối thẳng qua môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp "
-#~ "cổng\")."
+#: src/setup/gtk/gnunet-setup.glade:520
+msgid "Downstream (Bytes/s):"
+msgstr "Đi vào (Byte/giây):"
 
-#~ msgid "Network interface:"
-#~ msgstr "Giao diện mạng:"
+#: src/setup/gtk/gnunet-setup.glade:547
+msgid "Upstream (Bytes/s):"
+msgstr "Đi ra (Byte/giây):"
 
-#~ msgid "IP-Address/Hostname:"
-#~ msgstr "Địa chỉ IP/Tên máy:"
+#: src/setup/gtk/gnunet-setup.glade:561
+msgid "Bandwidth limitation"
+msgstr "Giới hạn băng thông"
 
-#~ msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
-#~ msgstr "Máy không thể nhận được kết nối đi vào (SNAT/Firewall)"
+#: src/setup/gtk/gnunet-setup.glade:580
+msgid "Use denoted bandwidth for GNUnet"
+msgstr "Sử dụng băng thông chỉ ra cho GNUnet"
 
-#~ msgid "Network connection"
-#~ msgstr "Kết nối mạng"
+#: src/setup/gtk/gnunet-setup.glade:596
+msgid "Share denoted bandwidth with other applications"
+msgstr "Chia sẻ băng thông chỉ ra với các ứng dụng khác"
 
-#~ msgid ""
-#~ "You can limit GNUnet's ressource usage here.\n"
-#~ "\n"
-#~ "\"Bandwidth limitation\" is how much data may be sent per second. If you "
-#~ "have a flatrate you can set it to the maximum speed of your internet "
-#~ "connection.\n"
-#~ "\n"
-#~ "The \"Max. CPU usage\" is the percentage of processor time GNUnet is "
-#~ "allowed to use."
-#~ msgstr ""
-#~ "Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
-#~ "\n"
-#~ "\"Giới hạn băng thông\" cho biết bao nhiêu dữ liệu có thể gửi mỗi giây. "
-#~ "Nếu có một tốc độ đều thì có thể đặt thành tốc độ lớn nhất của kết nối "
-#~ "internet.\n"
-#~ "\n"
-#~ "\"Sử dụng CPU lớn nhất\" là phần trăm thời gian của bộ xử lý cho phép "
-#~ "GNUnet sử dụng."
+#: src/setup/gtk/gnunet-setup.glade:614
+msgid "Bandwidth sharing"
+msgstr "Chia sẻ băng thông"
 
-#~ msgid "Upstream (Bytes/s):"
-#~ msgstr "Đi ra (Byte/giây):"
+#: src/setup/gtk/gnunet-setup.glade:636
+msgid "Max. CPU usage (%):"
+msgstr "Sử dụng CPU lớn nhất (%):"
 
-#~ msgid "Downstream (Bytes/s):"
-#~ msgstr "Đi vào (Byte/giây):"
+#: src/setup/gtk/gnunet-setup.glade:659
+msgid "CPU usage"
+msgstr "Sử dụng CPU"
 
-#~ msgid "Bandwidth limitation"
-#~ msgstr "Giới hạn băng thông"
+#: src/setup/gtk/gnunet-setup.glade:682
+msgid "Load limitation"
+msgstr "Giới hạn nạp"
 
-#~ msgid "Use denoted bandwidth for GNUnet"
-#~ msgstr "Sử dụng băng thông chỉ ra cho GNUnet"
-
-#~ msgid "Share denoted bandwidth with other applications"
-#~ msgstr "Chia sẻ băng thông chỉ ra với các ứng dụng khác"
-
-#~ msgid "Bandwidth sharing"
-#~ msgstr "Chia sẻ băng thông"
-
-#~ msgid "Max. CPU usage (%):"
-#~ msgstr "Sử dụng CPU lớn nhất (%):"
-
-#~ msgid "CPU usage"
-#~ msgstr "Sử dụng CPU"
-
-#~ msgid "Load limitation"
-#~ msgstr "Giới hạn nạp"
-
+#: src/setup/gtk/gnunet-setup.glade:872
 #, fuzzy
-#~ msgid ""
-#~ "GNUnet is able to store data from other peers in your datastore. This is "
-#~ "useful if an adversary has access to your inserted content and you need "
-#~ "to deny that the content is yours. With \"content migration\" on, the "
-#~ "content could have \"migrated\" over the internet to your node without "
-#~ "your knowledge.\n"
-#~ "It also helps to spread popular content over different peers to enhance "
-#~ "availability.\n"
-#~ "\n"
-#~ "The GNUnet datastore contains all data that GNUnet generates (index data, "
-#~ "inserted and migrated content). Its maximum size can be specified below.\n"
-#~ "\n"
-#~ "If you are an experienced user, you may want to tweak your GNUnet "
-#~ "installation using the enhanced configurator.\n"
-#~ "\n"
-#~ "After changing the configuration and/or updating GNUnet, it is sometimes "
-#~ "required to run gnunet-update to update internal data structures. "
-#~ "Depending on the changes made, this may take some time."
-#~ msgstr ""
-#~ "GNUnet có thể chứa ghi nhớ dữ liệu từ các đầu peer khác trong kho dữ "
-#~ "liệu. Tính năng này có ích nếu một đối tượng xấu truy cập tới nội dung đã "
-#~ "chèn và người dùng cần loại bỏ nội dung đó. Khi \"nhập nội dung\" bật "
-#~ "dùng, nội dung có thể \"nhập\" qua internet tới nút của người dùng mà "
-#~ "người dùng không biết.\n"
-#~ "Nó đồng thời giúp chia sẻ nội dung phổ biến qua các đầu peer khác nhau để "
-#~ "dễ dàng truy cập.\n"
-#~ "Kho dữ liệu GNUnet chứa mọi dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, nội "
-#~ "dung chèn và nhập vào). Có thể chỉ ra kích thước lớn nhất ở dưới\n"
-#~ "\n"
-#~ "Nếu là một người dùng có kinh nghiệm, bạn có thể chỉnh sửa cài đặt GNUnet "
-#~ "của mình bằng trình cấu hình nâng cấp."
+msgid ""
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability.\n"
+"\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content). Its maximum size can be specified below.\n"
+"\n"
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
+"\n"
+"After changing the configuration and/or updating GNUnet, it is sometimes "
+"required to run gnunet-update to update internal data structures. Depending "
+"on the changes made, this may take some time."
+msgstr ""
+"GNUnet có thể chứa ghi nhớ dữ liệu từ các đầu peer khác trong kho dữ liệu. "
+"Tính năng này có ích nếu một đối tượng xấu truy cập tới nội dung đã chèn và "
+"người dùng cần loại bỏ nội dung đó. Khi \"nhập nội dung\" bật dùng, nội dung "
+"có thể \"nhập\" qua internet tới nút của người dùng mà người dùng không "
+"biết.\n"
+"Nó đồng thời giúp chia sẻ nội dung phổ biến qua các đầu peer khác nhau để dễ "
+"dàng truy cập.\n"
+"Kho dữ liệu GNUnet chứa mọi dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, nội dung "
+"chèn và nhập vào). Có thể chỉ ra kích thước lớn nhất ở dưới\n"
+"\n"
+"Nếu là một người dùng có kinh nghiệm, bạn có thể chỉnh sửa cài đặt GNUnet "
+"của mình bằng trình cấu hình nâng cấp."
 
-#~ msgid "Store migrated content"
-#~ msgstr "Chứa nội dung đã nhập"
+#: src/setup/gtk/gnunet-setup.glade:905
+msgid "Store migrated content"
+msgstr "Chứa nội dung đã nhập"
 
-#~ msgid "Maximum datastore size (MB):"
-#~ msgstr "Kích thước kho dữ liệu lớn nhất (MB):"
+#: src/setup/gtk/gnunet-setup.glade:923
+msgid "Maximum datastore size (MB):"
+msgstr "Kích thước kho dữ liệu lớn nhất (MB):"
 
-#~ msgid "Start the GNUnet background process on computer startup"
-#~ msgstr "Chạy tiến trình GNUnet trong nền sau khi khởi động máy tính"
+#: src/setup/gtk/gnunet-setup.glade:952
+msgid "Start the GNUnet background process on computer startup"
+msgstr "Chạy tiến trình GNUnet trong nền sau khi khởi động máy tính"
 
-#~ msgid "Open the enhanced configurator"
-#~ msgstr "Mở trình cấu hình nâng cao"
+#: src/setup/gtk/gnunet-setup.glade:969
+msgid "Open the enhanced configurator"
+msgstr "Mở trình cấu hình nâng cao"
 
-#~ msgid "Other settings"
-#~ msgstr "Thiết lập khác"
+#: src/setup/gtk/gnunet-setup.glade:986
+msgid "Run gnunet-update"
+msgstr ""
 
-#~ msgid "Finish"
-#~ msgstr "Kết thúc"
+#: src/setup/gtk/gnunet-setup.glade:1015 src/setup/gtk/gnunet-setup.glade:1299
+msgid "Other settings"
+msgstr "Thiết lập khác"
 
-#~ msgid ""
-#~ "Define the user and the group owning the GNUnet service here.\n"
-#~ "\n"
-#~ "For security reasons, it is a good idea to let this setup create a new "
-#~ "user account and a new group under which the GNUnet service is started at "
-#~ "system startup.\n"
-#~ "\n"
-#~ "However, GNUnet may not be able to access files other than its own. This "
-#~ "includes files you want to publish in GNUnet. You'll have to grant read "
-#~ "permissions to the user specified below.\n"
-#~ "\n"
-#~ "Leave the fields empty to run GNUnet with system privileges."
-#~ msgstr ""
-#~ "Xác định người dùng và nhóm sở hữu dịch vụ GNUnet ở đây.\n"
-#~ "\n"
-#~ "Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng và một nhóm "
-#~ "mới sở hữu dịch vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
-#~ "\n"
-#~ "Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao "
-#~ "gồm các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho "
-#~ "phép người dùng chỉ ra dưới đây quyền đọc chúng.\n"
-#~ "\n"
-#~ "Để trống để chạy GNUnet với quyền hệ thống."
+#: src/setup/gtk/gnunet-setup.glade:1100
+msgid "Finish"
+msgstr "Kết thúc"
 
-#~ msgid "Group:"
-#~ msgstr "Nhóm:"
+#: src/setup/gtk/gnunet-setup.glade:1205
+msgid ""
+"Define the user and the group owning the GNUnet service here.\n"
+"\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account and a new group under which the GNUnet service is started at system "
+"startup.\n"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the fields empty to run GNUnet with system privileges."
+msgstr ""
+"Xác định người dùng và nhóm sở hữu dịch vụ GNUnet ở đây.\n"
+"\n"
+"Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng và một nhóm mới "
+"sở hữu dịch vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
+"\n"
+"Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao gồm "
+"các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho phép "
+"người dùng chỉ ra dưới đây quyền đọc chúng.\n"
+"\n"
+"Để trống để chạy GNUnet với quyền hệ thống."
 
-#~ msgid "User account:"
-#~ msgstr "Tài khoản người dùng:"
+#: src/setup/gtk/gnunet-setup.glade:1239
+msgid "User account:"
+msgstr "Tài khoản người dùng:"
 
-#, fuzzy
-#~ msgid "Save configuration"
-#~ msgstr "Cấu hình GNUnet"
+#: src/setup/gtk/gnunet-setup.glade:1279
+msgid "Group:"
+msgstr "Nhóm:"
 
-#, fuzzy
-#~ msgid "Show copyright information for gnunet-setup."
-#~ msgstr "Lỗi đọc thông tin từ gnunetd.\n"
+#: src/setup/gtk/gnunet-setup.glade:1462
+msgid "gnunet-setup"
+msgstr ""
 
-#~ msgid "Start GNUnet-testbed helper."
-#~ msgstr "Chạy chương trình trợ giúp Start GNUnet-testbed."
-
-#~ msgid "Cannot connect to LOOPBACK port %d: %s\n"
-#~ msgstr "Không kết nối được tới cổng quay lại LOOPBACK %d: %s\n"
-
+#: src/setup/gtk/gnunet-setup.glade:1481
 #, fuzzy
-#~ msgid "Could not execute `%s': %s\n"
-#~ msgstr "Không thực hiện được '%s': %s\n"
+msgid "Save configuration"
+msgstr "Cấu hình GNUnet"
 
-#~ msgid "No client service started. Trying again in 30 seconds.\n"
-#~ msgstr "Chưa chạy dịch vụ máy khách. Hãy thử lại sau 30 giây.\n"
-
-#~ msgid ""
-#~ "Error (%s) binding the TCP listener to port %d. No proxy service "
-#~ "started.\n"
-#~ "Trying again in %d seconds...\n"
-#~ msgstr ""
-#~ "Lỗi (%s) kết gắn bind trình nghe TCP vào cổng %d. Chưa chạy dịch vụ "
-#~ "proxy.\n"
-#~ "Hãy thử lại sau %d giây...\n"
-
-#~ msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
-#~ msgstr "Đã nhả ra kết nối chưa xác thực từ %u.%u.%u.%u.\n"
-
-#~ msgid "Protocol violation on socket. Expected command.\n"
-#~ msgstr "Xâm phạm giao thức trên socket. Đã mong đợi câu lệnh.\n"
-
+#: src/setup/gtk/gnunet-setup.glade:1493
 #, fuzzy
-#~ msgid "Command `%s' not found!\n"
-#~ msgstr "Không tìm thấy câu lệnh '%s'!\n"
+msgid "Show copyright information for gnunet-setup."
+msgstr "Lỗi đọc thông tin từ gnunetd.\n"
 
-#~ msgid "Start GNUnet testbed controller."
-#~ msgstr "Chạy trình điều khiển testbed của GNUnet."
+#: src/setup/gtk/gnunet-setup.glade:1526
+msgid "About gnunet-setup"
+msgstr ""
 
-#~ msgid "Malformed entry in the configuration in section %s under %s: %s\n"
-#~ msgstr "Mục có định dạng sai trong phần %s dưới %s của cấu hình: %s\n"
+#: src/setup/gtk/gnunet-setup.glade:1531
+msgid "(C) 2001-2007 Christian Grothoff (and other contributing authors)"
+msgstr ""
 
-#~ msgid "Could not send acknowledgement back to client.\n"
-#~ msgstr "Không gửi được câu trả lời đã biết ack trở lại cho máy khách.\n"
-
-#~ msgid "Received unknown testbed message of type %u.\n"
-#~ msgstr "Nhận được thông báo testbed không rõ dạng %u.\n"
-
+#: src/setup/gtk/gnunet-setup.glade:1532
 #, fuzzy
-#~ msgid "size of `%s' message is too short. Ignoring.\n"
-#~ msgstr "kích thước của thông báo '%s' quá ngắn. Đang lờ đi.\n"
+msgid "This is the configuration tool for GNUnet."
+msgstr "in một giá trị từ tập tin cấu hình ra stdout"
 
-#, fuzzy
-#~ msgid "size of `%s' message is wrong. Ignoring.\n"
-#~ msgstr "kích thước của thông báo '%s' bị sai. Đang lờ đi.\n"
+#: src/setup/gtk/gnunet-setup.glade:1535
+msgid ""
+"\t\t    GNU GENERAL PUBLIC LICENSE\n"
+"\t\t       Version 2, June 1991\n"
+"\n"
+" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
+"     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+" Everyone is permitted to copy and distribute verbatim copies\n"
+" of this license document, but changing it is not allowed.\n"
+"\n"
+"\t\t\t    Preamble\n"
+"\n"
+"  The licenses for most software are designed to take away your\n"
+"freedom to share and change it.  By contrast, the GNU General Public\n"
+"License is intended to guarantee your freedom to share and change free\n"
+"software--to make sure the software is free for all its users.  This\n"
+"General Public License applies to most of the Free Software\n"
+"Foundation's software and to any other program whose authors commit to\n"
+"using it.  (Some other Free Software Foundation software is covered by\n"
+"the GNU Library General Public License instead.)  You can apply it to\n"
+"your programs, too.\n"
+"\n"
+"  When we speak of free software, we are referring to freedom, not\n"
+"price.  Our General Public Licenses are designed to make sure that you\n"
+"have the freedom to distribute copies of free software (and charge for\n"
+"this service if you wish), that you receive source code or can get it\n"
+"if you want it, that you can change the software or use pieces of it\n"
+"in new free programs; and that you know you can do these things.\n"
+"\n"
+"  To protect your rights, we need to make restrictions that forbid\n"
+"anyone to deny you these rights or to ask you to surrender the rights.\n"
+"These restrictions translate to certain responsibilities for you if you\n"
+"distribute copies of the software, or if you modify it.\n"
+"\n"
+"  For example, if you distribute copies of such a program, whether\n"
+"gratis or for a fee, you must give the recipients all the rights that\n"
+"you have.  You must make sure that they, too, receive or can get the\n"
+"source code.  And you must show them these terms so they know their\n"
+"rights.\n"
+"\n"
+"  We protect your rights with two steps: (1) copyright the software, and\n"
+"(2) offer you this license which gives you legal permission to copy,\n"
+"distribute and/or modify the software.\n"
+"\n"
+"  Also, for each author's protection and ours, we want to make certain\n"
+"that everyone understands that there is no warranty for this free\n"
+"software.  If the software is modified by someone else and passed on, we\n"
+"want its recipients to know that what they have is not the original, so\n"
+"that any problems introduced by others will not reflect on the original\n"
+"authors' reputations.\n"
+"\n"
+"  Finally, any free program is threatened constantly by software\n"
+"patents.  We wish to avoid the danger that redistributors of a free\n"
+"program will individually obtain patent licenses, in effect making the\n"
+"program proprietary.  To prevent this, we have made it clear that any\n"
+"patent must be licensed for everyone's free use or not licensed at all.\n"
+"\n"
+"  The precise terms and conditions for copying, distribution and\n"
+"modification follow.\n"
+"\n"
+"\t\t    GNU GENERAL PUBLIC LICENSE\n"
+"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
+"\n"
+"  0. This License applies to any program or other work which contains\n"
+"a notice placed by the copyright holder saying it may be distributed\n"
+"under the terms of this General Public License.  The \"Program\", below,\n"
+"refers to any such program or work, and a \"work based on the Program\"\n"
+"means either the Program or any derivative work under copyright law:\n"
+"that is to say, a work containing the Program or a portion of it,\n"
+"either verbatim or with modifications and/or translated into another\n"
+"language.  (Hereinafter, translation is included without limitation in\n"
+"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
+"\n"
+"Activities other than copying, distribution and modification are not\n"
+"covered by this License; they are outside its scope.  The act of\n"
+"running the Program is not restricted, and the output from the Program\n"
+"is covered only if its contents constitute a work based on the\n"
+"Program (independent of having been made by running the Program).\n"
+"Whether that is true depends on what the Program does.\n"
+"\n"
+"  1. You may copy and distribute verbatim copies of the Program's\n"
+"source code as you receive it, in any medium, provided that you\n"
+"conspicuously and appropriately publish on each copy an appropriate\n"
+"copyright notice and disclaimer of warranty; keep intact all the\n"
+"notices that refer to this License and to the absence of any warranty;\n"
+"and give any other recipients of the Program a copy of this License\n"
+"along with the Program.\n"
+"\n"
+"You may charge a fee for the physical act of transferring a copy, and\n"
+"you may at your option offer warranty protection in exchange for a fee.\n"
+"\n"
+"  2. You may modify your copy or copies of the Program or any portion\n"
+"of it, thus forming a work based on the Program, and copy and\n"
+"distribute such modifications or work under the terms of Section 1\n"
+"above, provided that you also meet all of these conditions:\n"
+"\n"
+"    a) You must cause the modified files to carry prominent notices\n"
+"    stating that you changed the files and the date of any change.\n"
+"\n"
+"    b) You must cause any work that you distribute or publish, that in\n"
+"    whole or in part contains or is derived from the Program or any\n"
+"    part thereof, to be licensed as a whole at no charge to all third\n"
+"    parties under the terms of this License.\n"
+"\n"
+"    c) If the modified program normally reads commands interactively\n"
+"    when run, you must cause it, when started running for such\n"
+"    interactive use in the most ordinary way, to print or display an\n"
+"    announcement including an appropriate copyright notice and a\n"
+"    notice that there is no warranty (or else, saying that you provide\n"
+"    a warranty) and that users may redistribute the program under\n"
+"    these conditions, and telling the user how to view a copy of this\n"
+"    License.  (Exception: if the Program itself is interactive but\n"
+"    does not normally print such an announcement, your work based on\n"
+"    the Program is not required to print an announcement.)\n"
+"\n"
+"These requirements apply to the modified work as a whole.  If\n"
+"identifiable sections of that work are not derived from the Program,\n"
+"and can be reasonably considered independent and separate works in\n"
+"themselves, then this License, and its terms, do not apply to those\n"
+"sections when you distribute them as separate works.  But when you\n"
+"distribute the same sections as part of a whole which is a work based\n"
+"on the Program, the distribution of the whole must be on the terms of\n"
+"this License, whose permissions for other licensees extend to the\n"
+"entire whole, and thus to each and every part regardless of who wrote it.\n"
+"\n"
+"Thus, it is not the intent of this section to claim rights or contest\n"
+"your rights to work written entirely by you; rather, the intent is to\n"
+"exercise the right to control the distribution of derivative or\n"
+"collective works based on the Program.\n"
+"\n"
+"In addition, mere aggregation of another work not based on the Program\n"
+"with the Program (or with a work based on the Program) on a volume of\n"
+"a storage or distribution medium does not bring the other work under\n"
+"the scope of this License.\n"
+"\n"
+"  3. You may copy and distribute the Program (or a work based on it,\n"
+"under Section 2) in object code or executable form under the terms of\n"
+"Sections 1 and 2 above provided that you also do one of the following:\n"
+"\n"
+"    a) Accompany it with the complete corresponding machine-readable\n"
+"    source code, which must be distributed under the terms of Sections\n"
+"    1 and 2 above on a medium customarily used for software interchange; "
+"or,\n"
+"\n"
+"    b) Accompany it with a written offer, valid for at least three\n"
+"    years, to give any third party, for a charge no more than your\n"
+"    cost of physically performing source distribution, a complete\n"
+"    machine-readable copy of the corresponding source code, to be\n"
+"    distributed under the terms of Sections 1 and 2 above on a medium\n"
+"    customarily used for software interchange; or,\n"
+"\n"
+"    c) Accompany it with the information you received as to the offer\n"
+"    to distribute corresponding source code.  (This alternative is\n"
+"    allowed only for noncommercial distribution and only if you\n"
+"    received the program in object code or executable form with such\n"
+"    an offer, in accord with Subsection b above.)\n"
+"\n"
+"The source code for a work means the preferred form of the work for\n"
+"making modifications to it.  For an executable work, complete source\n"
+"code means all the source code for all modules it contains, plus any\n"
+"associated interface definition files, plus the scripts used to\n"
+"control compilation and installation of the executable.  However, as a\n"
+"special exception, the source code distributed need not include\n"
+"anything that is normally distributed (in either source or binary\n"
+"form) with the major components (compiler, kernel, and so on) of the\n"
+"operating system on which the executable runs, unless that component\n"
+"itself accompanies the executable.\n"
+"\n"
+"If distribution of executable or object code is made by offering\n"
+"access to copy from a designated place, then offering equivalent\n"
+"access to copy the source code from the same place counts as\n"
+"distribution of the source code, even though third parties are not\n"
+"compelled to copy the source along with the object code.\n"
+"\n"
+"  4. You may not copy, modify, sublicense, or distribute the Program\n"
+"except as expressly provided under this License.  Any attempt\n"
+"otherwise to copy, modify, sublicense or distribute the Program is\n"
+"void, and will automatically terminate your rights under this License.\n"
+"However, parties who have received copies, or rights, from you under\n"
+"this License will not have their licenses terminated so long as such\n"
+"parties remain in full compliance.\n"
+"\n"
+"  5. You are not required to accept this License, since you have not\n"
+"signed it.  However, nothing else grants you permission to modify or\n"
+"distribute the Program or its derivative works.  These actions are\n"
+"prohibited by law if you do not accept this License.  Therefore, by\n"
+"modifying or distributing the Program (or any work based on the\n"
+"Program), you indicate your acceptance of this License to do so, and\n"
+"all its terms and conditions for copying, distributing or modifying\n"
+"the Program or works based on it.\n"
+"\n"
+"  6. Each time you redistribute the Program (or any work based on the\n"
+"Program), the recipient automatically receives a license from the\n"
+"original licensor to copy, distribute or modify the Program subject to\n"
+"these terms and conditions.  You may not impose any further\n"
+"restrictions on the recipients' exercise of the rights granted herein.\n"
+"You are not responsible for enforcing compliance by third parties to\n"
+"this License.\n"
+"\n"
+"  7. If, as a consequence of a court judgment or allegation of patent\n"
+"infringement or for any other reason (not limited to patent issues),\n"
+"conditions are imposed on you (whether by court order, agreement or\n"
+"otherwise) that contradict the conditions of this License, they do not\n"
+"excuse you from the conditions of this License.  If you cannot\n"
+"distribute so as to satisfy simultaneously your obligations under this\n"
+"License and any other pertinent obligations, then as a consequence you\n"
+"may not distribute the Program at all.  For example, if a patent\n"
+"license would not permit royalty-free redistribution of the Program by\n"
+"all those who receive copies directly or indirectly through you, then\n"
+"the only way you could satisfy both it and this License would be to\n"
+"refrain entirely from distribution of the Program.\n"
+"\n"
+"If any portion of this section is held invalid or unenforceable under\n"
+"any particular circumstance, the balance of the section is intended to\n"
+"apply and the section as a whole is intended to apply in other\n"
+"circumstances.\n"
+"\n"
+"It is not the purpose of this section to induce you to infringe any\n"
+"patents or other property right claims or to contest validity of any\n"
+"such claims; this section has the sole purpose of protecting the\n"
+"integrity of the free software distribution system, which is\n"
+"implemented by public license practices.  Many people have made\n"
+"generous contributions to the wide range of software distributed\n"
+"through that system in reliance on consistent application of that\n"
+"system; it is up to the author/donor to decide if he or she is willing\n"
+"to distribute software through any other system and a licensee cannot\n"
+"impose that choice.\n"
+"\n"
+"This section is intended to make thoroughly clear what is believed to\n"
+"be a consequence of the rest of this License.\n"
+"\n"
+"  8. If the distribution and/or use of the Program is restricted in\n"
+"certain countries either by patents or by copyrighted interfaces, the\n"
+"original copyright holder who places the Program under this License\n"
+"may add an explicit geographical distribution limitation excluding\n"
+"those countries, so that distribution is permitted only in or among\n"
+"countries not thus excluded.  In such case, this License incorporates\n"
+"the limitation as if written in the body of this License.\n"
+"\n"
+"  9. The Free Software Foundation may publish revised and/or new versions\n"
+"of the General Public License from time to time.  Such new versions will\n"
+"be similar in spirit to the present version, but may differ in detail to\n"
+"address new problems or concerns.\n"
+"\n"
+"Each version is given a distinguishing version number.  If the Program\n"
+"specifies a version number of this License which applies to it and \"any\n"
+"later version\", you have the option of following the terms and conditions\n"
+"either of that version or of any later version published by the Free\n"
+"Software Foundation.  If the Program does not specify a version number of\n"
+"this License, you may choose any version ever published by the Free "
+"Software\n"
+"Foundation.\n"
+"\n"
+"  10. If you wish to incorporate parts of the Program into other free\n"
+"programs whose distribution conditions are different, write to the author\n"
+"to ask for permission.  For software which is copyrighted by the Free\n"
+"Software Foundation, write to the Free Software Foundation; we sometimes\n"
+"make exceptions for this.  Our decision will be guided by the two goals\n"
+"of preserving the free status of all derivatives of our free software and\n"
+"of promoting the sharing and reuse of software generally.\n"
+"\n"
+"\t\t\t    NO WARRANTY\n"
+"\n"
+"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
+"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
+"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
+"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
+"EXPRESSED\n"
+"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
+"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
+"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
+"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
+"REPAIR OR CORRECTION.\n"
+"\n"
+"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
+"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
+"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
+"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
+"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
+"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
+"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
+"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
+"POSSIBILITY OF SUCH DAMAGES.\n"
+"\n"
+"\t\t     END OF TERMS AND CONDITIONS\n"
+"\n"
+"\t    How to Apply These Terms to Your New Programs\n"
+"\n"
+"  If you develop a new program, and you want it to be of the greatest\n"
+"possible use to the public, the best way to achieve this is to make it\n"
+"free software which everyone can redistribute and change under these terms.\n"
+"\n"
+"  To do so, attach the following notices to the program.  It is safest\n"
+"to attach them to the start of each source file to most effectively\n"
+"convey the exclusion of warranty; and each file should have at least\n"
+"the \"copyright\" line and a pointer to where the full notice is found.\n"
+"\n"
+"    <one line to give the program's name and a brief idea of what it does.>\n"
+"    Copyright (C) <year>  <name of author>\n"
+"\n"
+"    This program is free software; you can redistribute it and/or modify\n"
+"    it under the terms of the GNU General Public License as published by\n"
+"    the Free Software Foundation; either version 2 of the License, or\n"
+"    (at your option) any later version.\n"
+"\n"
+"    This program is distributed in the hope that it will be useful,\n"
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"    GNU General Public License for more details.\n"
+"\n"
+"    You should have received a copy of the GNU General Public License\n"
+"    along with this program; if not, write to the Free Software\n"
+"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+"USA\n"
+"\n"
+"\n"
+"Also add information on how to contact you by electronic and paper mail.\n"
+"\n"
+"If the program is interactive, make it output a short notice like this\n"
+"when it starts in an interactive mode:\n"
+"\n"
+"    Gnomovision version 69, Copyright (C) year  name of author\n"
+"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
+"w'.\n"
+"    This is free software, and you are welcome to redistribute it\n"
+"    under certain conditions; type `show c' for details.\n"
+"\n"
+"The hypothetical commands `show w' and `show c' should show the appropriate\n"
+"parts of the General Public License.  Of course, the commands you use may\n"
+"be called something other than `show w' and `show c'; they could even be\n"
+"mouse-clicks or menu items--whatever suits your program.\n"
+"\n"
+"You should also get your employer (if you work as a programmer) or your\n"
+"school, if any, to sign a \"copyright disclaimer\" for the program, if\n"
+"necessary.  Here is a sample; alter the names:\n"
+"\n"
+"  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
+"  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
+"\n"
+"  <signature of Ty Coon>, 1 April 1989\n"
+"  Ty Coon, President of Vice\n"
+"\n"
+"This General Public License does not permit incorporating your program into\n"
+"proprietary programs.  If your program is a subroutine library, you may\n"
+"consider it more useful to permit linking proprietary applications with the\n"
+"library.  If this is what you want to do, use the GNU Library General\n"
+"Public License instead of this License.\n"
+msgstr ""
 
-#, fuzzy
-#~ msgid "TESTBED could not generate hello message for protocol %u\n"
-#~ msgstr "TESTBED không tạo được thông báo HELO cho giao thức %u\n"
+#: src/setup/gtk/gnunet-setup.glade:1917
+msgid "Not for English ;-)"
+msgstr ""
 
 #, fuzzy
-#~ msgid "received invalid `%s' message\n"
-#~ msgstr "nhận được thông báo sai '%s'\n"
+#~ msgid ""
+#~ "You must specify the name of a pipe for the SMTP transport in section `%"
+#~ "s' under `%s'.\n"
+#~ msgstr ""
+#~ "Người dùng phải chỉ ra tên của ống pipe cho truyền tải SMTP trong phần '%"
+#~ "s' dưới '%s'.\n"
 
 #, fuzzy
-#~ msgid "received invalid `%s' message (empty module name)\n"
-#~ msgstr "nhận được thông báo '%s' sai (tên môđun rỗng)\n"
+#~ msgid "Failed to initialize libesmtp: %s.\n"
+#~ msgstr "Chạy dịch vụ '%s' không thành công.\n"
 
 #, fuzzy
-#~ msgid "loading module `%s' failed.  Notifying client.\n"
-#~ msgstr "nạp môđun '%s' không thành công.  Đang cho máy khách biết.\n"
+#~ msgid "Sending E-mail to `%s' failed.\n"
+#~ msgstr "Gửi E-mail tới '%s' thất bại.\n"
 
-#~ msgid "unloading module failed.  Notifying client.\n"
-#~ msgstr "hủy nạp môđun không thành công.  Đang cho máy khách biết.\n"
+#~ msgid "%.*s filter %s (SMTP)"
+#~ msgstr "%.*s đầu lọc %s (SMTP)"
 
 #, fuzzy
-#~ msgid "`%s' %s failed: %s\n"
-#~ msgstr "'%s' %s không thành công: %s\n"
+#~ 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"
 
 #, fuzzy
-#~ msgid "received invalid `%s' message: %s.\n"
-#~ msgstr "nhận được thông báo '%s' sai: %s.\n"
+#~ msgid "Network configuration: NAT"
+#~ msgstr "Cấu hình GNUnet"
 
-#~ msgid "'..' is not allowed in file name (%s).\n"
-#~ msgstr "không cho phép '..' trong tên tập tin (%s).\n"
-
-#~ msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
-#~ msgstr "Tên tập tin rỗng cho thông báo UPLOAD_FILE là sai!\n"
-
-#~ msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
-#~ msgstr ""
-#~ "Tên tập tin cho thông báo UPLOAD_FILE không phải là kết thúc rỗng (sai)!\n"
-
-#~ msgid "Upload refused!"
-#~ msgstr "Từ chối tải lên!"
-
-#~ msgid "Invalid message received at %s:%d."
-#~ msgstr "Nhận được thông báo sai tại %s: %d."
-
-#~ msgid "received invalid testbed message of size %u\n"
-#~ msgstr "nhận được thông báo testbed sai với kích thước %u\n"
-
 #~ msgid ""
-#~ "Received testbed message of type %u but unexpected size %u, expected %u\n"
+#~ "Is this machine behind NAT?\n"
+#~ "\n"
+#~ "If you are connected to the internet through another computer doing SNAT, "
+#~ "a router or a \"hardware firewall\" and other computers on the internet "
+#~ "cannot connect to this computer, say \"yes\" here. Answer \"no\" on "
+#~ "direct connections through modems, ISDN cards and DNAT (also known as "
+#~ "\"port forwarding\")."
 #~ msgstr ""
-#~ "Nhận được thông báo testbed dạng %u nhưng kích thước không mong đợi %u, "
-#~ "mong đợi %u\n"
+#~ "Máy này nằm dưới NAT?\n"
+#~ "\n"
+#~ "Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến "
+#~ "router hay một \"phần cứng tường lửa\" và các máy khác trong internet "
+#~ "không thể kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu "
+#~ "kết nối thẳng qua môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp "
+#~ "cổng\")."
 
-#~ msgid "No testbed URL given, not registered.\n"
-#~ msgstr "Chưa đưa ra URL của testbed, không đăng ký.\n"
-
 #, fuzzy
-#~ msgid "Could not resolve name of HTTP proxy `%s'.\n"
-#~ msgstr "Không tìm được tên của proxy HTTP '%s'.\n"
+#~ msgid "Path settings"
+#~ msgstr "Thiết lập khác"
 
-#, fuzzy
-#~ msgid "Invalid URL `%s' (must begin with `%s')\n"
-#~ msgstr "URL sai '%s' (phải bắt đầu với '%s')\n"
+#~ msgid "specify nickname"
+#~ msgstr "chỉ ra tên nick"
 
-#, fuzzy
-#~ msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
-#~ msgstr "URL http lỗi: '%s' tại '%s'.  Chưa đăng ký máy khách testbed.\n"
+#~ msgid "Start GNUnet chat client."
+#~ msgstr "Chạy máy khách chát của GNUnet."
 
-#, fuzzy
-#~ msgid "Could not register testbed, host `%s' unknown\n"
-#~ msgstr "Không đăng ký được testbed, máy '%s' không rõ\n"
+#~ msgid "Could not connect to gnunetd.\n"
+#~ msgstr "Không kết nối được tới gnunetd.\n"
 
 #, fuzzy
-#~ msgid "Failed to send HTTP request to host `%s': %s\n"
-#~ msgstr "Gửi yêu cầu HTTP tới máy '%s' không thành công: %s\n"
+#~ 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"
 
-#, fuzzy
-#~ msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
-#~ msgstr "Gửi yêu cầu HTTP '%s' tới máy '%s' không thành công: %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 "Exit register (error: no http response read).\n"
-#~ msgstr "Thoát trình đăng ký (lỗi: không đọc được câu trả lời http).\n"
+#~ msgid "Could not send message to gnunetd\n"
+#~ msgstr "Không gửi được thông báo tới gnunetd\n"
 
-#~ msgid "Using %u messages of size %u for %u times.\n"
-#~ msgstr "Sử dụng %u thông báo với kích thước %u trong %u lần.\n"
-
-#~ msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
-#~ msgstr "Thời gian:  max %16llu  min %16llu  có nghĩa %12.3f  biến %12.3f\n"
-
-#~ msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
-#~ msgstr "Mất:  max %16u  min %16u  có nghĩa %12.3f  biến %12.3f\n"
-
+#, fuzzy
 #~ msgid ""
-#~ "\n"
-#~ "Failed to receive reply from gnunetd.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Không nhận thành công câu trả lời từ gnunetd.\n"
+#~ "`%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"
 
-#~ msgid "Running benchmark...\n"
-#~ msgstr "Đang chạy thử mức độ (benchmark)...\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"
 
 #, fuzzy
 #~ msgid "Error log:\n"
@@ -5566,9 +6256,6 @@
 #~ msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 #~ msgstr "Đang chờ chạy gnunetd (còn %u lần thử)...\n"
 
-#~ msgid "Waiting for peers to connect (%u iterations left)...\n"
-#~ msgstr "Đang chờ kết nối các đầu (còn %u lần thử)...\n"
-
 #, fuzzy
 #~ msgid "hello advertisement for protocol %d received.\n"
 #~ msgstr "Nhận được quảng cáo HELO cho giao thức %d.\n"

Modified: GNUnet/src/applications/topology_default/topology.c
===================================================================
--- GNUnet/src/applications/topology_default/topology.c 2007-12-10 02:47:03 UTC 
(rev 5850)
+++ GNUnet/src/applications/topology_default/topology.c 2007-12-10 03:20:09 UTC 
(rev 5851)
@@ -531,7 +531,7 @@
        GNUNET_GE_LOG (ectx,
                       GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_ERROR |
                       GNUNET_GE_IMMEDIATE,
-                      "Could not read friends list `%s'\n", fn);
+                      _("Could not read friends list `%s'\n"), fn);
        return GNUNET_SYSERR;
       }
     }

Modified: GNUnet/src/util/os/daemon.c
===================================================================
--- GNUnet/src/util/os/daemon.c 2007-12-10 02:47:03 UTC (rev 5850)
+++ GNUnet/src/util/os/daemon.c 2007-12-10 03:20:09 UTC (rev 5851)
@@ -26,6 +26,7 @@
 
 #include "platform.h"
 #include "gnunet_util_os.h"
+#include "gnunet_util_threads.h"
 #include "gnunet_util_string.h"
 
 #if LINUX || OSX || SOLARIS || SOMEBSD || MINGW





reply via email to

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