From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 8 Nov 2016 12:53:48 +0000 (+0100)
Subject: remove obsolete svn to change log script
X-Git-Tag: taler-0.2.0~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d8e2905c74e63975af5ffe79d7fb1247328def94;p=oweals%2Fgnunet.git

remove obsolete svn to change log script
---

diff --git a/contrib/svn2cl.xsl b/contrib/svn2cl.xsl
deleted file mode 100644
index 3d9db0200..000000000
--- a/contrib/svn2cl.xsl
+++ /dev/null
@@ -1,494 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-
-   svn2cl.xsl - xslt stylesheet for converting svn log to a normal
-                changelog
-
-   version 0.11
-
-   Usage (replace ++ with two minus signs which aren't allowed
-   inside xml comments):
-     svn ++verbose ++xml log | \
-       xsltproc ++stringparam strip-prefix `basename $(pwd)` \
-                ++stringparam linelen 75 \
-                ++stringparam groupbyday yes \
-                ++stringparam separate-daylogs yes \
-                ++stringparam include-rev yes \
-                ++stringparam include-actions yes \
-                ++stringparam breakbeforemsg yes/2 \
-                ++stringparam reparagraph yes \
-                ++stringparam authorsfile FILE \
-                ++stringparam ignore-message-starting \
-                svn2cl.xsl - > ChangeLog
-
-   This file is based on several implementations of this conversion
-   that I was not completely happy with and some other common
-   xslt constructs found on the web.
-
-   Copyright (C) 2004, 2005, 2006, 2007 Arthur de Jong.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in
-      the documentation and/or other materials provided with the
-      distribution.
-   3. The name of the author may not be used to endorse or promote
-      products derived from this software without specific prior
-      written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-   IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--->
-
-<!DOCTYPE xsl:stylesheet [
- <!ENTITY space "&#32;">
-]>
-
-<xsl:stylesheet
-  version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
- <xsl:output
-   method="text"
-   encoding="utf-8"
-   media-type="text/plain"
-   omit-xml-declaration="yes"
-   standalone="yes"
-   indent="no" />
-
- <xsl:strip-space elements="*" />
-
- <!-- the prefix of pathnames to strip -->
- <xsl:param name="strip-prefix" select="'/'" />
-
- <!-- the length of a line to wrap messages at -->
- <xsl:param name="linelen" select="75" />
-
- <!-- whether entries should be grouped by day -->
- <xsl:param name="groupbyday" select="'no'" />
-
- <!-- whether to seperate log messages by empty lines -->
- <xsl:param name="separate-daylogs" select="'no'" />
-
- <!-- whether a revision number should be included -->
- <xsl:param name="include-rev" select="'no'" />
-
- <!-- whether aaction labels should be added to files -->
- <xsl:param name="include-actions" select="'no'" />
-
- <!-- whether the log message should start on a new line -->
- <xsl:param name="breakbeforemsg" select="'no'" />
-
- <!-- whether the message should be rewrapped within one paragraph -->
- <xsl:param name="reparagraph" select="'no'" />
-
- <!-- whether certain messages should be ignored -->
- <xsl:param name="ignore-message-starting" select="''" />
-
- <!-- location of authors file if any -->
- <xsl:param name="authorsfile" select="''" />
- <xsl:key name="author-lookup" match="author" use="@uid" />
- <xsl:variable name="authors-top" select="document($authorsfile)/authors" />
-
- <!-- match the topmost log entry -->
- <xsl:template match="log">
-  <xsl:choose>
-   <xsl:when test="$ignore-message-starting != ''">
-    <!-- only handle logentries with don't contain the string -->
-    <xsl:apply-templates select="logentry[not(starts-with(msg,$ignore-message-starting))]" />
-   </xsl:when>
-   <xsl:otherwise>
-    <xsl:apply-templates select="logentry" />
-   </xsl:otherwise>
-  </xsl:choose>
-  <!-- add newlines at the end of the changelog -->
-  <xsl:text>&#xA;</xsl:text>
- </xsl:template>
-
- <!-- format one entry from the log -->
- <xsl:template match="logentry">
-  <xsl:choose>
-   <!-- if we're grouping we should omit some headers -->
-   <xsl:when test="$groupbyday='yes'">
-    <!-- save log entry number -->
-    <xsl:variable name="pos" select="position()" />
-    <!-- fetch previous entry's date -->
-    <xsl:variable name="prevdate">
-     <xsl:apply-templates select="../logentry[position()=(($pos)-1)]/date" />
-    </xsl:variable>
-    <!-- fetch previous entry's author -->
-    <xsl:variable name="prevauthor">
-     <xsl:value-of select="normalize-space(../logentry[position()=(($pos)-1)]/author)" />
-    </xsl:variable>
-    <!-- fetch this entry's date -->
-    <xsl:variable name="date">
-     <xsl:apply-templates select="date" />
-    </xsl:variable>
-    <!-- fetch this entry's author -->
-    <xsl:variable name="author">
-     <xsl:value-of select="normalize-space(author)" />
-    </xsl:variable>
-    <!-- check if header is changed -->
-    <xsl:if test="($prevdate!=$date) or ($prevauthor!=$author)">
-     <!-- add newline -->
-     <xsl:if test="not(position()=1)">
-      <xsl:text>&#xA;</xsl:text>
-     </xsl:if>
-     <!-- date -->
-     <xsl:value-of select="$date" />
-     <!-- two spaces -->
-     <xsl:text>&space;&space;</xsl:text>
-     <!-- author's name -->
-     <xsl:apply-templates select="author" />
-     <!-- two newlines -->
-     <xsl:text>&#xA;</xsl:text>
-     <xsl:if test="$separate-daylogs!='yes'"><xsl:text>&#xA;</xsl:text></xsl:if>
-    </xsl:if>
-   </xsl:when>
-   <!-- write the log header -->
-   <xsl:otherwise>
-    <!-- add newline -->
-    <xsl:if test="not(position()=1)">
-     <xsl:text>&#xA;</xsl:text>
-    </xsl:if>
-    <!-- date -->
-    <xsl:apply-templates select="date" />
-    <!-- two spaces -->
-    <xsl:text>&space;&space;</xsl:text>
-    <!-- author's name -->
-    <xsl:apply-templates select="author" />
-    <!-- two newlines -->
-    <xsl:text>&#xA;&#xA;</xsl:text>
-   </xsl:otherwise>
-  </xsl:choose>
-  <!-- get paths string -->
-  <xsl:variable name="paths">
-   <xsl:apply-templates select="paths" />
-  </xsl:variable>
-  <!-- get revision number -->
-  <xsl:variable name="rev">
-   <xsl:if test="$include-rev='yes'">
-    <xsl:text>[r</xsl:text>
-    <xsl:value-of select="@revision" />
-    <xsl:text>]&space;</xsl:text>
-   </xsl:if>
-  </xsl:variable>
-  <!-- trim trailing newlines -->
-  <xsl:variable name="msg">
-   <!-- add a line break before the log message -->
-   <xsl:choose>
-    <xsl:when test="$breakbeforemsg='yes'">
-     <xsl:text>&#xA;</xsl:text>
-    </xsl:when>
-    <xsl:when test="number($breakbeforemsg)&gt;0">
-     <xsl:call-template name="newlines">
-      <xsl:with-param name="count" select="number($breakbeforemsg)" />
-     </xsl:call-template>
-    </xsl:when>
-   </xsl:choose>
-   <xsl:call-template name="trim-newln">
-    <xsl:with-param name="txt" select="msg" />
-   </xsl:call-template>
-  </xsl:variable>
-  <!-- add newline here if separate-daylogs is in effect -->
-  <xsl:if test="$groupbyday='yes' and $separate-daylogs='yes'"><xsl:text>&#xA;</xsl:text></xsl:if>
-  <!-- first line is indented (other indents are done in wrap template) -->
-  <xsl:text>&#x9;*&space;</xsl:text>
-  <!-- set up the text to wrap -->
-  <xsl:variable name="txt">
-   <xsl:value-of select="$rev" />
-   <xsl:if test="$paths!=''">
-    <xsl:value-of select="concat($paths,':&space;')" />
-   </xsl:if>
-   <xsl:value-of select="$msg" />
-  </xsl:variable>
-  <!-- print the paths and message nicely wrapped -->
-  <xsl:call-template name="wrap">
-   <xsl:with-param name="txt" select="$txt" />
-  </xsl:call-template>
- </xsl:template>
-
- <!-- format date -->
- <xsl:template match="date">
-  <xsl:variable name="date" select="normalize-space(.)" />
-  <!-- output date part -->
-  <xsl:value-of select="substring($date,1,10)" />
-  <!-- output time part -->
-  <xsl:if test="$groupbyday!='yes'">
-   <xsl:text>&space;</xsl:text>
-   <xsl:value-of select="substring($date,12,5)" />
-  </xsl:if>
- </xsl:template>
-
- <!-- format author -->
- <xsl:template match="author">
-  <xsl:variable name="uid" select="normalize-space(.)" />
-  <!-- try to lookup author in authorsfile -->
-  <xsl:choose>
-   <xsl:when test="$authorsfile!=''">
-    <xsl:for-each select="$authors-top">
-     <xsl:variable name="author" select="key('author-lookup',$uid)" />
-     <!-- present result -->
-     <xsl:choose>
-      <xsl:when test="string($author/.)">
-       <xsl:apply-templates select="$author/node()" mode="copy" />
-      </xsl:when>
-      <xsl:otherwise>
-       <xsl:value-of select="$uid" />
-      </xsl:otherwise>
-     </xsl:choose>
-    </xsl:for-each>
-   </xsl:when>
-   <xsl:otherwise>
-    <xsl:value-of select="$uid" />
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
-
- <!-- copy but normalize text -->
- <xsl:template match="text()" mode="copy">
-  <xsl:value-of select="normalize-space(.)" />
- </xsl:template>
-
- <!-- simple copy template -->
- <xsl:template match="@*|node()" mode="copy">
-  <xsl:copy>
-   <xsl:apply-templates select="@*|node()" mode="copy" />
-  </xsl:copy>
- </xsl:template>
-
- <!-- present a list of paths names -->
- <xsl:template match="paths">
-  <xsl:choose>
-   <!-- only handle paths that begin with the path and strip the path -->
-   <xsl:when test="$strip-prefix != ''">
-    <!-- if strip-prefix does not start with a slash, prepend it -->
-    <xsl:variable name="tmpstrip1">
-     <xsl:choose>
-      <xsl:when test="starts-with($strip-prefix,'/')">
-       <xsl:value-of select="$strip-prefix" />
-      </xsl:when>
-      <xsl:otherwise>
-       <xsl:value-of select="concat('/',$strip-prefix)" />
-      </xsl:otherwise>
-     </xsl:choose>
-    </xsl:variable>
-    <!-- strip trailing slash from strip-prefix -->
-    <xsl:variable name="tmpstrip2">
-     <xsl:choose>
-      <xsl:when test="substring($tmpstrip1,string-length($tmpstrip1),1)='/'">
-       <xsl:value-of select="substring($tmpstrip1,1,string-length($tmpstrip1)-1)" />
-      </xsl:when>
-      <xsl:otherwise>
-       <xsl:value-of select="$tmpstrip1" />
-      </xsl:otherwise>
-     </xsl:choose>
-    </xsl:variable>
-    <!-- filter on all entries within directory -->
-    <xsl:for-each select="path[starts-with(concat(normalize-space(.),'/'),concat($tmpstrip2,'/'))]">
-     <xsl:sort select="normalize-space(.)" data-type="text" />
-     <!-- unless we are the first entry, add a comma -->
-     <xsl:if test="not(position()=1)">
-      <xsl:text>,&space;</xsl:text>
-     </xsl:if>
-     <!-- print the path name -->
-     <xsl:call-template name="printpath">
-      <xsl:with-param name="path" select="substring(normalize-space(.),string-length($strip-prefix)+3)" />
-     </xsl:call-template>
-     <!-- add the action flag -->
-     <xsl:if test="$include-actions='yes'">
-      <xsl:apply-templates select="." mode="action"/>
-     </xsl:if>
-    </xsl:for-each>
-   </xsl:when>
-   <!-- print a simple list of all paths -->
-   <xsl:otherwise>
-    <xsl:for-each select="path">
-     <xsl:sort select="normalize-space(.)" data-type="text" />
-     <!-- unless we are the first entry, add a comma -->
-     <xsl:if test="not(position()=1)">
-      <xsl:text>,&space;</xsl:text>
-     </xsl:if>
-     <!-- print the path name -->
-     <xsl:value-of select="normalize-space(.)" />
-     <!-- add the action flag -->
-     <xsl:if test="$include-actions='yes'">
-      <xsl:apply-templates select="." mode="action"/>
-     </xsl:if>
-    </xsl:for-each>
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
-
- <xsl:template match="path" mode="action">
-  <xsl:choose>
-   <xsl:when test="@action='D'">
-    <xsl:text>[DEL]</xsl:text>
-   </xsl:when>
-   <xsl:when test="@copyfrom-path">
-    <xsl:text>[CPY]</xsl:text>
-   </xsl:when>
-   <xsl:when test="@action='D'">
-    <xsl:text>[ADD]</xsl:text>
-   </xsl:when>
-  </xsl:choose>
- </xsl:template>
-
- <!-- transform path to something printable -->
- <xsl:template name="printpath">
-  <!-- fetch the pathname -->
-  <xsl:param name="path" />
-  <!-- strip leading slash -->
-  <xsl:variable name="tmp1">
-   <xsl:choose>
-    <xsl:when test="starts-with($path,'/')">
-     <xsl:value-of select="substring($path,2)" />
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="$path" />
-    </xsl:otherwise>
-   </xsl:choose>
-  </xsl:variable>
-  <!-- translate empty string to dot -->
-  <xsl:choose>
-   <xsl:when test="$tmp1 = ''">
-    <xsl:text>.</xsl:text>
-   </xsl:when>
-   <xsl:otherwise>
-    <xsl:value-of select="$tmp1" />
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
-
- <!-- string-wrapping template -->
- <xsl:template name="wrap">
-  <xsl:param name="txt" />
-  <xsl:variable name="normtxt" select="normalize-space($txt)" />
-  <xsl:choose>
-   <xsl:when test="contains($txt,'&#xA;')">
-     <!-- text contains newlines, do the first line -->
-     <xsl:call-template name="wrap">
-      <xsl:with-param name="txt" select="substring-before($txt,'&#xA;')" />
-     </xsl:call-template>
-     <!-- print tab -->
-     <xsl:text>&#x9;&space;&space;</xsl:text>
-     <!-- wrap the rest of the text -->
-     <xsl:call-template name="wrap">
-      <xsl:with-param name="txt" select="substring-after($txt,'&#xA;')" />
-     </xsl:call-template>
-   </xsl:when>
-   <xsl:when test="(string-length($normtxt) &lt; (($linelen)-9)) or not(contains($normtxt,' '))">
-    <!-- this is easy, nothing to do -->
-    <xsl:value-of select="$normtxt" />
-    <!-- add newline -->
-    <xsl:text>&#xA;</xsl:text>
-   </xsl:when>
-   <xsl:otherwise>
-    <!-- find the first line -->
-    <xsl:variable name="tmp" select="substring($normtxt,1,(($linelen)-9))" />
-    <xsl:variable name="line">
-     <xsl:choose>
-      <!-- if our attempt contains spaces wrap on that -->
-      <xsl:when test="contains($tmp,' ')">
-       <xsl:call-template name="find-line">
-        <xsl:with-param name="txt" select="$tmp" />
-       </xsl:call-template>
-      </xsl:when>
-      <!-- otherwise use the first non-space characters from the text -->
-      <xsl:otherwise>
-       <xsl:value-of select="substring-before($normtxt,' ')" />
-      </xsl:otherwise>
-     </xsl:choose>
-    </xsl:variable>
-    <!-- print line -->
-    <xsl:value-of select="$line" />
-    <!-- print newline and tab -->
-    <xsl:text>&#xA;&#x9;&space;&space;</xsl:text>
-    <!-- wrap the rest of the text -->
-    <xsl:call-template name="wrap">
-     <xsl:with-param name="txt" select="normalize-space(substring($normtxt,string-length($line)+1))" />
-    </xsl:call-template>
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
-
- <!-- template to trim line to contain space as last char -->
- <xsl:template name="find-line">
-  <xsl:param name="txt" />
-  <xsl:choose>
-   <xsl:when test="substring($txt,string-length($txt),1)=' '">
-    <xsl:value-of select="substring($txt,1,string-length($txt)-1)" />
-   </xsl:when>
-   <xsl:otherwise>
-    <xsl:call-template name="find-line">
-     <xsl:with-param name="txt" select="substring($txt,1,string-length($txt)-1)" />
-    </xsl:call-template>
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
-
- <!-- template to trim trailing and starting newlines -->
- <xsl:template name="trim-newln">
-  <xsl:param name="txt" />
-  <xsl:choose>
-   <!-- find starting newlines -->
-   <xsl:when test="substring($txt,1,1) = '&#xA;'">
-    <xsl:call-template name="trim-newln">
-     <xsl:with-param name="txt" select="substring($txt,2)" />
-    </xsl:call-template>
-   </xsl:when>
-   <!-- find trailing newlines -->
-   <xsl:when test="substring($txt,string-length($txt),1) = '&#xA;'">
-    <xsl:call-template name="trim-newln">
-     <xsl:with-param name="txt" select="substring($txt,1,string-length($txt)-1)" />
-    </xsl:call-template>
-   </xsl:when>
-   <!-- if the message has paragrapgs, find the first one -->
-   <xsl:when test="$reparagraph='yes' and contains($txt,'&#xA;&#xA;')">
-     <!-- remove newlines from first paragraph -->
-     <xsl:value-of select="normalize-space(substring-before($txt,'&#xA;&#xA;'))" />
-     <!-- paragraph separator -->
-     <xsl:text>&#xA;&#xA;</xsl:text>
-     <!-- do the rest of the text -->
-     <xsl:call-template name="trim-newln">
-      <xsl:with-param name="txt" select="substring-after($txt,'&#xA;&#xA;')" />
-     </xsl:call-template>
-   </xsl:when>
-   <!-- remove more single newlines -->
-   <xsl:when test="$reparagraph='yes'">
-    <xsl:value-of select="normalize-space($txt)" />
-   </xsl:when>
-   <!-- no newlines found, we're done -->
-   <xsl:otherwise>
-    <xsl:value-of select="$txt" />
-   </xsl:otherwise>
-  </xsl:choose>
- </xsl:template>
-
- <!-- insert a number of newlines -->
- <xsl:template name="newlines">
-  <xsl:param name="count" />
-  <xsl:text>&#xA;</xsl:text>
-  <xsl:if test="$count&gt;1">
-   <xsl:call-template name="newlines">
-    <xsl:with-param name="count" select="($count)-1" />
-   </xsl:call-template>
-  </xsl:if>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/po/de.po b/po/de.po
index d2361c0af..71dd25cd7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-10-26 09:18-0500\n"
+"POT-Creation-Date: 2016-11-08 13:49+0100\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -558,7 +558,7 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1536
+#: src/transport/gnunet-transport.c:1476
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
@@ -694,7 +694,7 @@ msgstr ""
 msgid "provide information about all tunnels"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-service-cadet_peer.c:707
+#: src/cadet/gnunet-service-cadet_peer.c:681
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1219,7 +1219,7 @@ msgstr "Ungültiges Befehlszeilenargument »%s«\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1677
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -3467,7 +3467,7 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
 #: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
+#: src/transport/gnunet-transport.c:1517 src/transport/gnunet-transport.c:1542
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
@@ -5282,6 +5282,87 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
+#: src/nat/nat_api.c:880 src/nat/nat.c:2010
+msgid "Operation Successful"
+msgstr ""
+
+#: src/nat/nat_api.c:882 src/nat/nat.c:2012
+msgid "Internal Failure (IPC, ...)"
+msgstr ""
+
+#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+msgid "Failure in network subsystem, check permissions."
+msgstr ""
+
+#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+#, fuzzy
+msgid "`upnpc` command not found"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/nat/nat_api.c:894 src/nat/nat.c:2024
+msgid "`upnpc' command took too long, process killed"
+msgstr ""
+
+#: src/nat/nat_api.c:896 src/nat/nat.c:2026
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+msgid "`external-ip' command not found"
+msgstr ""
+
+#: src/nat/nat_api.c:900 src/nat/nat.c:2030
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/nat/nat_api.c:902 src/nat/nat.c:2032
+#, fuzzy
+msgid "`external-ip' command output invalid"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/nat/nat_api.c:904 src/nat/nat.c:2034
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+
+#: src/nat/nat_api.c:908 src/nat/nat.c:2038
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr ""
+
+#: src/nat/nat_api.c:910 src/nat/nat.c:2040
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr ""
+
 #: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
@@ -5383,87 +5464,6 @@ msgstr ""
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:2010
-msgid "Operation Successful"
-msgstr ""
-
-#: src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
-msgstr ""
-
-#: src/nat/nat.c:2014
-msgid "Failure in network subsystem, check permissions."
-msgstr ""
-
-#: src/nat/nat.c:2016
-msgid "Encountered timeout while performing operation"
-msgstr ""
-
-#: src/nat/nat.c:2018
-msgid "detected that we are offline"
-msgstr ""
-
-#: src/nat/nat.c:2020
-#, fuzzy
-msgid "`upnpc` command not found"
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
-#: src/nat/nat.c:2022
-#, fuzzy
-msgid "Failed to run `upnpc` command"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/nat/nat.c:2024
-msgid "`upnpc' command took too long, process killed"
-msgstr ""
-
-#: src/nat/nat.c:2026
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat/nat.c:2028
-msgid "`external-ip' command not found"
-msgstr ""
-
-#: src/nat/nat.c:2030
-#, fuzzy
-msgid "Failed to run `external-ip` command"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/nat/nat.c:2032
-#, fuzzy
-msgid "`external-ip' command output invalid"
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
-#: src/nat/nat.c:2034
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat.c:2036
-#, fuzzy
-msgid "Could not determine interface with internal/local network address"
-msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
-
-#: src/nat/nat.c:2038
-msgid "No functioning gnunet-helper-nat-server installation found"
-msgstr ""
-
-#: src/nat/nat.c:2040
-msgid "NAT test could not be initialized"
-msgstr ""
-
-#: src/nat/nat.c:2042
-msgid "NAT test timeout reached"
-msgstr ""
-
-#: src/nat/nat.c:2044
-msgid "could not register NAT"
-msgstr ""
-
-#: src/nat/nat.c:2046
-msgid "No working gnunet-helper-nat-client installation found"
-msgstr ""
-
 #: src/nat/nat_mini.c:205
 #, fuzzy
 msgid "`external-ip' command not found\n"
@@ -7250,197 +7250,175 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:518
+#: src/transport/gnunet-transport.c:486
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:496
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:572
+#: src/transport/gnunet-transport.c:540
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:553
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:565
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
-#, fuzzy, c-format
-msgid "Configuration for plugin `%s' did not work!\n"
-msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\n"
-
-#: src/transport/gnunet-transport.c:627
-#, fuzzy, c-format
-msgid "Configuration for plugin `%s' did work!\n"
-msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
-
-#: src/transport/gnunet-transport.c:632
-#, fuzzy, c-format
-msgid "Internal NAT error while running test for plugin `%s'\n"
-msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
-
-#: src/transport/gnunet-transport.c:637
-#, fuzzy, c-format
-msgid "Failed to start NAT test for plugin `%s'\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-
-#: src/transport/gnunet-transport.c:642
+#: src/transport/gnunet-transport.c:588
 #, c-format
-msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
+msgid "NAT plugin `%s' reports: %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:735
+#: src/transport/gnunet-transport.c:675
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:749
+#: src/transport/gnunet-transport.c:689
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:774
+#: src/transport/gnunet-transport.c:714
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:750
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:844
+#: src/transport/gnunet-transport.c:784
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:875
+#: src/transport/gnunet-transport.c:815
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
+#: src/transport/gnunet-transport.c:839 src/transport/gnunet-transport.c:868
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u Verbindungen insgesamt)\n"
 
-#: src/transport/gnunet-transport.c:901
+#: src/transport/gnunet-transport.c:841
 msgid "Connected to"
 msgstr "Verbunden mit"
 
-#: src/transport/gnunet-transport.c:930
+#: src/transport/gnunet-transport.c:870
 msgid "Disconnected from"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:965
+#: src/transport/gnunet-transport.c:905
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:942
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1014
+#: src/transport/gnunet-transport.c:954
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Knoten »%s«: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1366
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:1548
+#: src/transport/gnunet-transport.c:1488
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1561
+#: src/transport/gnunet-transport.c:1501
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1589
+#: src/transport/gnunet-transport.c:1529
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:1535
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
-#: src/transport/gnunet-transport.c:1701
+#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
+#: src/transport/gnunet-transport.c:1641
 msgid "Failed to connect to transport service\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:1655
+#: src/transport/gnunet-transport.c:1595
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1725
+#: src/transport/gnunet-transport.c:1665
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Informationen über verbundene Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1728
+#: src/transport/gnunet-transport.c:1668
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1731
+#: src/transport/gnunet-transport.c:1671
 msgid "disconnect from a peer"
 msgstr "Verbindung zu einem Knoten trennen"
 
-#: src/transport/gnunet-transport.c:1734
+#: src/transport/gnunet-transport.c:1674
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1740
+#: src/transport/gnunet-transport.c:1680
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1743
+#: src/transport/gnunet-transport.c:1683
 msgid "do not resolve hostnames"
 msgstr "Keine Rechnernamen auflösen"
 
-#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport.c:1686
 #: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1749
+#: src/transport/gnunet-transport.c:1689
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1752
+#: src/transport/gnunet-transport.c:1692
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1755
+#: src/transport/gnunet-transport.c:1695
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport.c:1706
 #: src/transport/gnunet-transport-profiler.c:642
 msgid "Direct access to transport service."
 msgstr "Direkter Zugriff auf den Transportdienst"
@@ -8407,7 +8385,7 @@ msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1737 src/util/network.c:1913
+#: src/util/network.c:1735 src/util/network.c:1911
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8933,6 +8911,24 @@ msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did not work!\n"
+#~ msgstr ""
+#~ "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein "
+#~ "Verzeichnis angeben, in dem FS Daten gespeichert werden.\n"
+
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did work!\n"
+#~ msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
+
+#, fuzzy
+#~ msgid "Internal NAT error while running test for plugin `%s'\n"
+#~ msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Failed to start NAT test for plugin `%s'\n"
+#~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
 #~ msgid "Request does not fit into a message"
 #~ msgstr "Anfrage passt nicht in eine Meldung"
 
diff --git a/po/es.po b/po/es.po
index 88c3f1b84..eeaf0e0e7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-10-26 09:18-0500\n"
+"POT-Creation-Date: 2016-11-08 13:49+0100\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -607,7 +607,7 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr "Cuota para la red «%11s» (entrada/salida): %10s / %10s\n"
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1536
+#: src/transport/gnunet-transport.c:1476
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
@@ -753,7 +753,7 @@ msgstr "proveer información acerca de un túnel en particular"
 msgid "provide information about all tunnels"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-service-cadet_peer.c:707
+#: src/cadet/gnunet-service-cadet_peer.c:681
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
@@ -1296,7 +1296,7 @@ msgid "Failed to connect to CORE service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1677
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
@@ -3588,7 +3588,7 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
 #: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
+#: src/transport/gnunet-transport.c:1517 src/transport/gnunet-transport.c:1542
 #, 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"
@@ -5454,6 +5454,91 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
+#: src/nat/nat_api.c:880 src/nat/nat.c:2010
+msgid "Operation Successful"
+msgstr ""
+
+#: src/nat/nat_api.c:882 src/nat/nat.c:2012
+msgid "Internal Failure (IPC, ...)"
+msgstr ""
+
+#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+msgid "Failure in network subsystem, check permissions."
+msgstr ""
+
+#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+#, fuzzy
+msgid "`upnpc` command not found"
+msgstr "comando «upnpc» no encontrado\n"
+
+#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "Se produjo un fallo al ejecutar «%s»\n"
+
+#: src/nat/nat_api.c:894 src/nat/nat.c:2024
+#, fuzzy
+msgid "`upnpc' command took too long, process killed"
+msgstr "comando «upnpc» no encontrado\n"
+
+#: src/nat/nat_api.c:896 src/nat/nat.c:2026
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+#, fuzzy
+msgid "`external-ip' command not found"
+msgstr "comando «external-ip» no encontrado\n"
+
+#: src/nat/nat_api.c:900 src/nat/nat.c:2030
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "Se produjo un fallo al ejecutar «%s»\n"
+
+#: src/nat/nat_api.c:902 src/nat/nat.c:2032
+#, fuzzy
+msgid "`external-ip' command output invalid"
+msgstr "comando «external-ip» no encontrado\n"
+
+#: src/nat/nat_api.c:904 src/nat/nat.c:2034
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
+
+#: src/nat/nat_api.c:908 src/nat/nat.c:2038
+#, fuzzy
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
+
+#: src/nat/nat_api.c:910 src/nat/nat.c:2040
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+#, fuzzy
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
+
 #: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr "Recorrido NAT con servidor ICMP satisfactorio.\n"
@@ -5559,91 +5644,6 @@ msgstr ""
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr "Ejecutando gnunet-helper-nat-client %s %s %u\n"
 
-#: src/nat/nat.c:2010
-msgid "Operation Successful"
-msgstr ""
-
-#: src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
-msgstr ""
-
-#: src/nat/nat.c:2014
-msgid "Failure in network subsystem, check permissions."
-msgstr ""
-
-#: src/nat/nat.c:2016
-msgid "Encountered timeout while performing operation"
-msgstr ""
-
-#: src/nat/nat.c:2018
-msgid "detected that we are offline"
-msgstr ""
-
-#: src/nat/nat.c:2020
-#, fuzzy
-msgid "`upnpc` command not found"
-msgstr "comando «upnpc» no encontrado\n"
-
-#: src/nat/nat.c:2022
-#, fuzzy
-msgid "Failed to run `upnpc` command"
-msgstr "Se produjo un fallo al ejecutar «%s»\n"
-
-#: src/nat/nat.c:2024
-#, fuzzy
-msgid "`upnpc' command took too long, process killed"
-msgstr "comando «upnpc» no encontrado\n"
-
-#: src/nat/nat.c:2026
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat/nat.c:2028
-#, fuzzy
-msgid "`external-ip' command not found"
-msgstr "comando «external-ip» no encontrado\n"
-
-#: src/nat/nat.c:2030
-#, fuzzy
-msgid "Failed to run `external-ip` command"
-msgstr "Se produjo un fallo al ejecutar «%s»\n"
-
-#: src/nat/nat.c:2032
-#, fuzzy
-msgid "`external-ip' command output invalid"
-msgstr "comando «external-ip» no encontrado\n"
-
-#: src/nat/nat.c:2034
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat.c:2036
-#, fuzzy
-msgid "Could not determine interface with internal/local network address"
-msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
-
-#: src/nat/nat.c:2038
-#, fuzzy
-msgid "No functioning gnunet-helper-nat-server installation found"
-msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
-
-#: src/nat/nat.c:2040
-msgid "NAT test could not be initialized"
-msgstr ""
-
-#: src/nat/nat.c:2042
-msgid "NAT test timeout reached"
-msgstr ""
-
-#: src/nat/nat.c:2044
-msgid "could not register NAT"
-msgstr ""
-
-#: src/nat/nat.c:2046
-#, fuzzy
-msgid "No working gnunet-helper-nat-client installation found"
-msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
-
 #: src/nat/nat_mini.c:205
 msgid "`external-ip' command not found\n"
 msgstr "comando «external-ip» no encontrado\n"
@@ -7498,79 +7498,59 @@ msgstr "# Mensajes PONG omitidos, firma expirada"
 msgid "# validations succeeded"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-transport.c:518
+#: src/transport/gnunet-transport.c:486
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Transmitidos %llu bytes/s (%llu bytes en %s)\n"
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:496
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Recibidos %llu bytes/s (%llu bytes en %s)\n"
 
-#: src/transport/gnunet-transport.c:572
+#: src/transport/gnunet-transport.c:540
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:553
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
 
 # Miguel: La traducción no es literal, pero me parece más correcta
 # en castellano.
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:565
 msgid "Failed to list connections, timeout occured\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
 
-#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
-#, fuzzy, c-format
-msgid "Configuration for plugin `%s' did not work!\n"
-msgstr "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
-
-#: src/transport/gnunet-transport.c:627
+#: src/transport/gnunet-transport.c:588
 #, fuzzy, c-format
-msgid "Configuration for plugin `%s' did work!\n"
-msgstr "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
+msgid "NAT plugin `%s' reports: %s\n"
+msgstr "Módulo de transporte: «%s» puerto %llu\n"
 
-#: src/transport/gnunet-transport.c:632
-#, fuzzy, c-format
-msgid "Internal NAT error while running test for plugin `%s'\n"
-msgstr "Error interno escaneando «%s».\n"
-
-#: src/transport/gnunet-transport.c:637
-#, fuzzy, c-format
-msgid "Failed to start NAT test for plugin `%s'\n"
-msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
-
-#: src/transport/gnunet-transport.c:642
-#, c-format
-msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:735
+#: src/transport/gnunet-transport.c:675
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 "No hay módulos de transporte configurados, el par nunca se comunicará\n"
 
-#: src/transport/gnunet-transport.c:749
+#: src/transport/gnunet-transport.c:689
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
-#: src/transport/gnunet-transport.c:774
+#: src/transport/gnunet-transport.c:714
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:750
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:844
+#: src/transport/gnunet-transport.c:784
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7579,46 +7559,46 @@ msgstr ""
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:875
+#: src/transport/gnunet-transport.c:815
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
+#: src/transport/gnunet-transport.c:839 src/transport/gnunet-transport.c:868
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
 
-#: src/transport/gnunet-transport.c:901
+#: src/transport/gnunet-transport.c:841
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/transport/gnunet-transport.c:930
+#: src/transport/gnunet-transport.c:870
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/transport/gnunet-transport.c:965
+#: src/transport/gnunet-transport.c:905
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:942
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1014
+#: src/transport/gnunet-transport.c:954
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1366
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/transport/gnunet-transport.c:1548
+#: src/transport/gnunet-transport.c:1488
 #, fuzzy, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7627,7 +7607,7 @@ msgstr ""
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1561
+#: src/transport/gnunet-transport.c:1501
 #, fuzzy, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
@@ -7635,72 +7615,72 @@ msgstr ""
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1589
+#: src/transport/gnunet-transport.c:1529
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Se produjo un fallo al conectar con el servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:1535
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
-#: src/transport/gnunet-transport.c:1701
+#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
+#: src/transport/gnunet-transport.c:1641
 msgid "Failed to connect to transport service\n"
 msgstr "Se produjo un fallo al conectar con el servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:1655
+#: src/transport/gnunet-transport.c:1595
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:1725
+#: src/transport/gnunet-transport.c:1665
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Imprime información sobre los pares conectados."
 
-#: src/transport/gnunet-transport.c:1728
+#: src/transport/gnunet-transport.c:1668
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr "medir cómo de rápido recibimos datos de todos los pares (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:1731
+#: src/transport/gnunet-transport.c:1671
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:1734
+#: src/transport/gnunet-transport.c:1674
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:1740
+#: src/transport/gnunet-transport.c:1680
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 "provee información sobre todas los eventos de conexión y desconexión "
 "(continuamente)"
 
-#: src/transport/gnunet-transport.c:1743
+#: src/transport/gnunet-transport.c:1683
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport.c:1686
 #: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:1749
+#: src/transport/gnunet-transport.c:1689
 #, fuzzy
 msgid "monitor plugin sessions"
 msgstr "# sesiones wlan pendientes"
 
-#: src/transport/gnunet-transport.c:1752
+#: src/transport/gnunet-transport.c:1692
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "enviar data para prueba a otro par (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:1755
+#: src/transport/gnunet-transport.c:1695
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport.c:1706
 #: src/transport/gnunet-transport-profiler.c:642
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
@@ -8702,7 +8682,7 @@ msgstr "Error escribiendo a «%s»: %s\n"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
 
-#: src/util/network.c:1737 src/util/network.c:1913
+#: src/util/network.c:1735 src/util/network.c:1911
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9252,6 +9232,24 @@ msgstr "Violación externa del protocolo detectada en %s:%d.\n"
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did not work!\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
+
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did work!\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
+
+#, fuzzy
+#~ msgid "Internal NAT error while running test for plugin `%s'\n"
+#~ msgstr "Error interno escaneando «%s».\n"
+
+#, fuzzy
+#~ msgid "Failed to start NAT test for plugin `%s'\n"
+#~ msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
+
 #, fuzzy
 #~ msgid "Client was disconnected from arm service, trying to reconnect.\n"
 #~ msgstr ""
@@ -10256,9 +10254,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "Peer `%s' disconnected\n"
 #~ msgstr "Par «%s» desconectado\n"
 
-#~ msgid "Transport plugin: `%s' port %llu\n"
-#~ msgstr "Módulo de transporte: «%s» puerto %llu\n"
-
 #~ msgid "Found %u transport plugins: `%s'\n"
 #~ msgstr "Encontrados %u módulos de transporte: «%s»\n"
 
diff --git a/po/fr.po b/po/fr.po
index 91032f749..20cd77cdc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-10-26 09:18-0500\n"
+"POT-Creation-Date: 2016-11-08 13:49+0100\n"
 "PO-Revision-Date: 2015-12-24 01:20+0100\n"
 "Last-Translator: Stéphane  Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -550,7 +550,7 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1536
+#: src/transport/gnunet-transport.c:1476
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
@@ -681,7 +681,7 @@ msgstr ""
 msgid "provide information about all tunnels"
 msgstr ""
 
-#: src/cadet/gnunet-service-cadet_peer.c:707
+#: src/cadet/gnunet-service-cadet_peer.c:681
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1196,7 +1196,7 @@ msgstr ""
 msgid "Failed to connect to CORE service!\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1677
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -3345,7 +3345,7 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
 #: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
+#: src/transport/gnunet-transport.c:1517 src/transport/gnunet-transport.c:1542
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -5078,6 +5078,82 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
+#: src/nat/nat_api.c:880 src/nat/nat.c:2010
+msgid "Operation Successful"
+msgstr ""
+
+#: src/nat/nat_api.c:882 src/nat/nat.c:2012
+msgid "Internal Failure (IPC, ...)"
+msgstr ""
+
+#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+msgid "Failure in network subsystem, check permissions."
+msgstr ""
+
+#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+msgid "`upnpc` command not found"
+msgstr ""
+
+#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+msgid "Failed to run `upnpc` command"
+msgstr ""
+
+#: src/nat/nat_api.c:894 src/nat/nat.c:2024
+msgid "`upnpc' command took too long, process killed"
+msgstr ""
+
+#: src/nat/nat_api.c:896 src/nat/nat.c:2026
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+msgid "`external-ip' command not found"
+msgstr ""
+
+#: src/nat/nat_api.c:900 src/nat/nat.c:2030
+msgid "Failed to run `external-ip` command"
+msgstr ""
+
+#: src/nat/nat_api.c:902 src/nat/nat.c:2032
+msgid "`external-ip' command output invalid"
+msgstr ""
+
+#: src/nat/nat_api.c:904 src/nat/nat.c:2034
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+msgid "Could not determine interface with internal/local network address"
+msgstr ""
+
+#: src/nat/nat_api.c:908 src/nat/nat.c:2038
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr ""
+
+#: src/nat/nat_api.c:910 src/nat/nat.c:2040
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr ""
+
 #: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
@@ -5177,82 +5253,6 @@ msgstr ""
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:2010
-msgid "Operation Successful"
-msgstr ""
-
-#: src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
-msgstr ""
-
-#: src/nat/nat.c:2014
-msgid "Failure in network subsystem, check permissions."
-msgstr ""
-
-#: src/nat/nat.c:2016
-msgid "Encountered timeout while performing operation"
-msgstr ""
-
-#: src/nat/nat.c:2018
-msgid "detected that we are offline"
-msgstr ""
-
-#: src/nat/nat.c:2020
-msgid "`upnpc` command not found"
-msgstr ""
-
-#: src/nat/nat.c:2022
-msgid "Failed to run `upnpc` command"
-msgstr ""
-
-#: src/nat/nat.c:2024
-msgid "`upnpc' command took too long, process killed"
-msgstr ""
-
-#: src/nat/nat.c:2026
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat/nat.c:2028
-msgid "`external-ip' command not found"
-msgstr ""
-
-#: src/nat/nat.c:2030
-msgid "Failed to run `external-ip` command"
-msgstr ""
-
-#: src/nat/nat.c:2032
-msgid "`external-ip' command output invalid"
-msgstr ""
-
-#: src/nat/nat.c:2034
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat.c:2036
-msgid "Could not determine interface with internal/local network address"
-msgstr ""
-
-#: src/nat/nat.c:2038
-msgid "No functioning gnunet-helper-nat-server installation found"
-msgstr ""
-
-#: src/nat/nat.c:2040
-msgid "NAT test could not be initialized"
-msgstr ""
-
-#: src/nat/nat.c:2042
-msgid "NAT test timeout reached"
-msgstr ""
-
-#: src/nat/nat.c:2044
-msgid "could not register NAT"
-msgstr ""
-
-#: src/nat/nat.c:2046
-msgid "No working gnunet-helper-nat-client installation found"
-msgstr ""
-
 #: src/nat/nat_mini.c:205
 msgid "`external-ip' command not found\n"
 msgstr ""
@@ -6968,191 +6968,171 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:518
+#: src/transport/gnunet-transport.c:486
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:496
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:572
+#: src/transport/gnunet-transport.c:540
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:553
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:565
 msgid "Failed to list connections, timeout occured\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
+#: src/transport/gnunet-transport.c:588
 #, c-format
-msgid "Configuration for plugin `%s' did not work!\n"
+msgid "NAT plugin `%s' reports: %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:627
-#, c-format
-msgid "Configuration for plugin `%s' did work!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:632
-#, c-format
-msgid "Internal NAT error while running test for plugin `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:637
-#, fuzzy, c-format
-msgid "Failed to start NAT test for plugin `%s'\n"
-msgstr "Résolution de « %s » échouée\n"
-
-#: src/transport/gnunet-transport.c:642
-#, c-format
-msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:735
+#: src/transport/gnunet-transport.c:675
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:749
+#: src/transport/gnunet-transport.c:689
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:774
+#: src/transport/gnunet-transport.c:714
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:750
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:844
+#: src/transport/gnunet-transport.c:784
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:875
+#: src/transport/gnunet-transport.c:815
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
+#: src/transport/gnunet-transport.c:839 src/transport/gnunet-transport.c:868
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:901
+#: src/transport/gnunet-transport.c:841
 msgid "Connected to"
 msgstr "Connecté à"
 
-#: src/transport/gnunet-transport.c:930
+#: src/transport/gnunet-transport.c:870
 msgid "Disconnected from"
 msgstr "Déconnecté de"
 
-#: src/transport/gnunet-transport.c:965
+#: src/transport/gnunet-transport.c:905
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "%s message(s) reçu(s)\n"
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:942
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1014
+#: src/transport/gnunet-transport.c:954
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1366
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1548
+#: src/transport/gnunet-transport.c:1488
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1561
+#: src/transport/gnunet-transport.c:1501
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1589
+#: src/transport/gnunet-transport.c:1529
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:1535
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
-#: src/transport/gnunet-transport.c:1701
+#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
+#: src/transport/gnunet-transport.c:1641
 msgid "Failed to connect to transport service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1655
+#: src/transport/gnunet-transport.c:1595
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1725
+#: src/transport/gnunet-transport.c:1665
 msgid "print information for all peers (instead of only connected peers)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1728
+#: src/transport/gnunet-transport.c:1668
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1731
+#: src/transport/gnunet-transport.c:1671
 msgid "disconnect from a peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1734
+#: src/transport/gnunet-transport.c:1674
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1740
+#: src/transport/gnunet-transport.c:1680
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1743
+#: src/transport/gnunet-transport.c:1683
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport.c:1686
 #: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1749
+#: src/transport/gnunet-transport.c:1689
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1752
+#: src/transport/gnunet-transport.c:1692
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1755
+#: src/transport/gnunet-transport.c:1695
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport.c:1706
 #: src/transport/gnunet-transport-profiler.c:642
 msgid "Direct access to transport service."
 msgstr ""
@@ -8088,7 +8068,7 @@ msgstr ""
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1737 src/util/network.c:1913
+#: src/util/network.c:1735 src/util/network.c:1911
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8598,6 +8578,10 @@ msgstr ""
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Failed to start NAT test for plugin `%s'\n"
+#~ msgstr "Résolution de « %s » échouée\n"
+
 #~ msgid "Benchmarking done\n"
 #~ msgstr "Benchmark terminé\n"
 
diff --git a/po/sv.po b/po/sv.po
index cc0956cfb..fcd3948b6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-10-26 09:18-0500\n"
+"POT-Creation-Date: 2016-11-08 13:49+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -559,7 +559,7 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1536
+#: src/transport/gnunet-transport.c:1476
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -701,7 +701,7 @@ msgstr "Skriv ut information om GNUnets motparter."
 msgid "provide information about all tunnels"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-service-cadet_peer.c:707
+#: src/cadet/gnunet-service-cadet_peer.c:681
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1238,7 +1238,7 @@ msgstr "Ogiltiga kommandoradsargument:\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1677
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -3510,7 +3510,7 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
 #: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
+#: src/transport/gnunet-transport.c:1517 src/transport/gnunet-transport.c:1542
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -5323,6 +5323,88 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
+#: src/nat/nat_api.c:880 src/nat/nat.c:2010
+msgid "Operation Successful"
+msgstr ""
+
+#: src/nat/nat_api.c:882 src/nat/nat.c:2012
+msgid "Internal Failure (IPC, ...)"
+msgstr ""
+
+#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+msgid "Failure in network subsystem, check permissions."
+msgstr ""
+
+#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+#, fuzzy
+msgid "`upnpc` command not found"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/nat/nat_api.c:894 src/nat/nat.c:2024
+#, fuzzy
+msgid "`upnpc' command took too long, process killed"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/nat/nat_api.c:896 src/nat/nat.c:2026
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+#, fuzzy
+msgid "`external-ip' command not found"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/nat/nat_api.c:900 src/nat/nat.c:2030
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/nat/nat_api.c:902 src/nat/nat.c:2032
+msgid "`external-ip' command output invalid"
+msgstr ""
+
+#: src/nat/nat_api.c:904 src/nat/nat.c:2034
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
+
+#: src/nat/nat_api.c:908 src/nat/nat.c:2038
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr ""
+
+#: src/nat/nat_api.c:910 src/nat/nat.c:2040
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr ""
+
 #: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
@@ -5425,88 +5507,6 @@ msgstr ""
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:2010
-msgid "Operation Successful"
-msgstr ""
-
-#: src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
-msgstr ""
-
-#: src/nat/nat.c:2014
-msgid "Failure in network subsystem, check permissions."
-msgstr ""
-
-#: src/nat/nat.c:2016
-msgid "Encountered timeout while performing operation"
-msgstr ""
-
-#: src/nat/nat.c:2018
-msgid "detected that we are offline"
-msgstr ""
-
-#: src/nat/nat.c:2020
-#, fuzzy
-msgid "`upnpc` command not found"
-msgstr "Kommando \"%s\" hittades inte!\n"
-
-#: src/nat/nat.c:2022
-#, fuzzy
-msgid "Failed to run `upnpc` command"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/nat/nat.c:2024
-#, fuzzy
-msgid "`upnpc' command took too long, process killed"
-msgstr "Kommando \"%s\" hittades inte!\n"
-
-#: src/nat/nat.c:2026
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat/nat.c:2028
-#, fuzzy
-msgid "`external-ip' command not found"
-msgstr "Kommando \"%s\" hittades inte!\n"
-
-#: src/nat/nat.c:2030
-#, fuzzy
-msgid "Failed to run `external-ip` command"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/nat/nat.c:2032
-msgid "`external-ip' command output invalid"
-msgstr ""
-
-#: src/nat/nat.c:2034
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat.c:2036
-#, fuzzy
-msgid "Could not determine interface with internal/local network address"
-msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
-
-#: src/nat/nat.c:2038
-msgid "No functioning gnunet-helper-nat-server installation found"
-msgstr ""
-
-#: src/nat/nat.c:2040
-msgid "NAT test could not be initialized"
-msgstr ""
-
-#: src/nat/nat.c:2042
-msgid "NAT test timeout reached"
-msgstr ""
-
-#: src/nat/nat.c:2044
-msgid "could not register NAT"
-msgstr ""
-
-#: src/nat/nat.c:2046
-msgid "No working gnunet-helper-nat-client installation found"
-msgstr ""
-
 #: src/nat/nat_mini.c:205
 msgid "`external-ip' command not found\n"
 msgstr ""
@@ -7324,202 +7324,182 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:518
+#: src/transport/gnunet-transport.c:486
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:496
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:572
+#: src/transport/gnunet-transport.c:540
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:553
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:565
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
-#, fuzzy, c-format
-msgid "Configuration for plugin `%s' did not work!\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/transport/gnunet-transport.c:627
-#, fuzzy, c-format
-msgid "Configuration for plugin `%s' did work!\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/transport/gnunet-transport.c:632
-#, fuzzy, c-format
-msgid "Internal NAT error while running test for plugin `%s'\n"
-msgstr "=\tFel vid läsning av katalog.\n"
-
-#: src/transport/gnunet-transport.c:637
+#: src/transport/gnunet-transport.c:588
 #, fuzzy, c-format
-msgid "Failed to start NAT test for plugin `%s'\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/transport/gnunet-transport.c:642
-#, c-format
-msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
-msgstr ""
+msgid "NAT plugin `%s' reports: %s\n"
+msgstr "Testar transport(er) %s\n"
 
-#: src/transport/gnunet-transport.c:735
+#: src/transport/gnunet-transport.c:675
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:749
+#: src/transport/gnunet-transport.c:689
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:774
+#: src/transport/gnunet-transport.c:714
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:750
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:844
+#: src/transport/gnunet-transport.c:784
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:875
+#: src/transport/gnunet-transport.c:815
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
+#: src/transport/gnunet-transport.c:839 src/transport/gnunet-transport.c:868
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:901
+#: src/transport/gnunet-transport.c:841
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:930
+#: src/transport/gnunet-transport.c:870
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:965
+#: src/transport/gnunet-transport.c:905
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "mottog ogiltigt \"%s\" meddelande\n"
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:942
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1014
+#: src/transport/gnunet-transport.c:954
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1366
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1548
+#: src/transport/gnunet-transport.c:1488
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1561
+#: src/transport/gnunet-transport.c:1501
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1589
+#: src/transport/gnunet-transport.c:1529
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:1535
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
-#: src/transport/gnunet-transport.c:1701
+#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
+#: src/transport/gnunet-transport.c:1641
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1655
+#: src/transport/gnunet-transport.c:1595
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1725
+#: src/transport/gnunet-transport.c:1665
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1728
+#: src/transport/gnunet-transport.c:1668
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1731
+#: src/transport/gnunet-transport.c:1671
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1734
+#: src/transport/gnunet-transport.c:1674
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1740
+#: src/transport/gnunet-transport.c:1680
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1743
+#: src/transport/gnunet-transport.c:1683
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport.c:1686
 #: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1749
+#: src/transport/gnunet-transport.c:1689
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1752
+#: src/transport/gnunet-transport.c:1692
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1755
+#: src/transport/gnunet-transport.c:1695
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport.c:1706
 #: src/transport/gnunet-transport-profiler.c:642
 #, fuzzy
 msgid "Direct access to transport service."
@@ -8502,7 +8482,7 @@ msgstr "Fel vid skapandet av användare"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1737 src/util/network.c:1913
+#: src/util/network.c:1735 src/util/network.c:1911
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9035,6 +9015,22 @@ msgstr ""
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did not work!\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did work!\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "Internal NAT error while running test for plugin `%s'\n"
+#~ msgstr "=\tFel vid läsning av katalog.\n"
+
+#, fuzzy
+#~ msgid "Failed to start NAT test for plugin `%s'\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
 #, fuzzy
 #~ msgid "Could not send status result to client\n"
 #~ msgstr "Kunde inte skicka begäran till gnunetd.\n"
@@ -9764,10 +9760,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Peer `%s' disconnected\n"
 #~ msgstr "# av anslutna parter"
 
-#, fuzzy
-#~ msgid "Transport plugin: `%s' port %llu\n"
-#~ msgstr "Testar transport(er) %s\n"
-
 #, fuzzy
 #~ msgid "Found %u transport plugins: `%s'\n"
 #~ msgstr "Testar transport(er) %s\n"
diff --git a/po/vi.po b/po/vi.po
index a85cc193c..ca993880a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-10-26 09:18-0500\n"
+"POT-Creation-Date: 2016-11-08 13:49+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -566,7 +566,7 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1536
+#: src/transport/gnunet-transport.c:1476
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -709,7 +709,7 @@ msgstr "In ra thông tin về các đồng đẳng GNUnet."
 msgid "provide information about all tunnels"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-service-cadet_peer.c:707
+#: src/cadet/gnunet-service-cadet_peer.c:681
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1243,7 +1243,7 @@ msgstr "Đối số không hợp lệ cho « %s ».\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1677
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -3529,7 +3529,7 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
 #: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
+#: src/transport/gnunet-transport.c:1517 src/transport/gnunet-transport.c:1542
 #, 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"
@@ -5374,6 +5374,85 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
+#: src/nat/nat_api.c:880 src/nat/nat.c:2010
+msgid "Operation Successful"
+msgstr ""
+
+#: src/nat/nat_api.c:882 src/nat/nat.c:2012
+msgid "Internal Failure (IPC, ...)"
+msgstr ""
+
+#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+msgid "Failure in network subsystem, check permissions."
+msgstr ""
+
+#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+msgid "`upnpc` command not found"
+msgstr ""
+
+#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/nat/nat_api.c:894 src/nat/nat.c:2024
+msgid "`upnpc' command took too long, process killed"
+msgstr ""
+
+#: src/nat/nat_api.c:896 src/nat/nat.c:2026
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+msgid "`external-ip' command not found"
+msgstr ""
+
+#: src/nat/nat_api.c:900 src/nat/nat.c:2030
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/nat/nat_api.c:902 src/nat/nat.c:2032
+msgid "`external-ip' command output invalid"
+msgstr ""
+
+#: src/nat/nat_api.c:904 src/nat/nat.c:2034
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#: src/nat/nat_api.c:908 src/nat/nat.c:2038
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr ""
+
+#: src/nat/nat_api.c:910 src/nat/nat.c:2040
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr ""
+
 #: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
@@ -5475,85 +5554,6 @@ msgstr ""
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:2010
-msgid "Operation Successful"
-msgstr ""
-
-#: src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
-msgstr ""
-
-#: src/nat/nat.c:2014
-msgid "Failure in network subsystem, check permissions."
-msgstr ""
-
-#: src/nat/nat.c:2016
-msgid "Encountered timeout while performing operation"
-msgstr ""
-
-#: src/nat/nat.c:2018
-msgid "detected that we are offline"
-msgstr ""
-
-#: src/nat/nat.c:2020
-msgid "`upnpc` command not found"
-msgstr ""
-
-#: src/nat/nat.c:2022
-#, fuzzy
-msgid "Failed to run `upnpc` command"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/nat/nat.c:2024
-msgid "`upnpc' command took too long, process killed"
-msgstr ""
-
-#: src/nat/nat.c:2026
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat/nat.c:2028
-msgid "`external-ip' command not found"
-msgstr ""
-
-#: src/nat/nat.c:2030
-#, fuzzy
-msgid "Failed to run `external-ip` command"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/nat/nat.c:2032
-msgid "`external-ip' command output invalid"
-msgstr ""
-
-#: src/nat/nat.c:2034
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat.c:2036
-#, fuzzy
-msgid "Could not determine interface with internal/local network address"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-
-#: src/nat/nat.c:2038
-msgid "No functioning gnunet-helper-nat-server installation found"
-msgstr ""
-
-#: src/nat/nat.c:2040
-msgid "NAT test could not be initialized"
-msgstr ""
-
-#: src/nat/nat.c:2042
-msgid "NAT test timeout reached"
-msgstr ""
-
-#: src/nat/nat.c:2044
-msgid "could not register NAT"
-msgstr ""
-
-#: src/nat/nat.c:2046
-msgid "No working gnunet-helper-nat-client installation found"
-msgstr ""
-
 #: src/nat/nat_mini.c:205
 msgid "`external-ip' command not found\n"
 msgstr ""
@@ -7384,202 +7384,182 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:518
+#: src/transport/gnunet-transport.c:486
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:496
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:572
+#: src/transport/gnunet-transport.c:540
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:553
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:565
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
-#, fuzzy, c-format
-msgid "Configuration for plugin `%s' did not work!\n"
-msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
-
-#: src/transport/gnunet-transport.c:627
+#: src/transport/gnunet-transport.c:588
 #, fuzzy, c-format
-msgid "Configuration for plugin `%s' did work!\n"
-msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
-
-#: src/transport/gnunet-transport.c:632
-#, fuzzy, c-format
-msgid "Internal NAT error while running test for plugin `%s'\n"
-msgstr "=\tLỗi đọc thư mục.\n"
-
-#: src/transport/gnunet-transport.c:637
-#, fuzzy, c-format
-msgid "Failed to start NAT test for plugin `%s'\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/transport/gnunet-transport.c:642
-#, c-format
-msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
-msgstr ""
+msgid "NAT plugin `%s' reports: %s\n"
+msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/gnunet-transport.c:735
+#: src/transport/gnunet-transport.c:675
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:749
+#: src/transport/gnunet-transport.c:689
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:774
+#: src/transport/gnunet-transport.c:714
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:750
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:844
+#: src/transport/gnunet-transport.c:784
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:875
+#: src/transport/gnunet-transport.c:815
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
+#: src/transport/gnunet-transport.c:839 src/transport/gnunet-transport.c:868
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:901
+#: src/transport/gnunet-transport.c:841
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:930
+#: src/transport/gnunet-transport.c:870
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:965
+#: src/transport/gnunet-transport.c:905
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:942
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1014
+#: src/transport/gnunet-transport.c:954
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1366
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1548
+#: src/transport/gnunet-transport.c:1488
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1561
+#: src/transport/gnunet-transport.c:1501
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1589
+#: src/transport/gnunet-transport.c:1529
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:1535
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
-#: src/transport/gnunet-transport.c:1701
+#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
+#: src/transport/gnunet-transport.c:1641
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1655
+#: src/transport/gnunet-transport.c:1595
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1725
+#: src/transport/gnunet-transport.c:1665
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1728
+#: src/transport/gnunet-transport.c:1668
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1731
+#: src/transport/gnunet-transport.c:1671
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1734
+#: src/transport/gnunet-transport.c:1674
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1740
+#: src/transport/gnunet-transport.c:1680
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1743
+#: src/transport/gnunet-transport.c:1683
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport.c:1686
 #: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1749
+#: src/transport/gnunet-transport.c:1689
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1752
+#: src/transport/gnunet-transport.c:1692
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1755
+#: src/transport/gnunet-transport.c:1695
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport.c:1706
 #: src/transport/gnunet-transport-profiler.c:642
 #, fuzzy
 msgid "Direct access to transport service."
@@ -8556,7 +8536,7 @@ msgstr "Gặp lỗi khi tạo người dùng"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1737 src/util/network.c:1913
+#: src/util/network.c:1735 src/util/network.c:1911
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -9086,6 +9066,22 @@ msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did not work!\n"
+#~ msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
+
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did work!\n"
+#~ msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
+
+#, fuzzy
+#~ msgid "Internal NAT error while running test for plugin `%s'\n"
+#~ msgstr "=\tLỗi đọc thư mục.\n"
+
+#, fuzzy
+#~ msgid "Failed to start NAT test for plugin `%s'\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
+
 #, fuzzy
 #~ msgid "Could not send list result to client\n"
 #~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
@@ -9858,10 +9854,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Peer `%s' disconnected\n"
 #~ msgstr "# của các đồng đẳng đã kết nối"
 
-#, fuzzy
-#~ msgid "Transport plugin: `%s' port %llu\n"
-#~ msgstr "Đang nạp các truyền tải « %s »\n"
-
 #, fuzzy
 #~ msgid "Found %u transport plugins: `%s'\n"
 #~ msgstr "Đang nạp các truyền tải « %s »\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0ca16740d..3862fc5f5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2016-10-26 09:18-0500\n"
+"POT-Creation-Date: 2016-11-08 13:49+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -558,7 +558,7 @@ msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761
-#: src/transport/gnunet-transport.c:1536
+#: src/transport/gnunet-transport.c:1476
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -700,7 +700,7 @@ msgstr "无法获取有关用户“%s”的信息：%s\n"
 msgid "provide information about all tunnels"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-service-cadet_peer.c:707
+#: src/cadet/gnunet-service-cadet_peer.c:681
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1228,7 +1228,7 @@ msgstr "“%s”的参数无效。\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1737
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1677
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -3396,7 +3396,7 @@ msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
 #: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857
-#: src/transport/gnunet-transport.c:1577 src/transport/gnunet-transport.c:1602
+#: src/transport/gnunet-transport.c:1517 src/transport/gnunet-transport.c:1542
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -5160,6 +5160,85 @@ msgstr ""
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
+#: src/nat/nat_api.c:880 src/nat/nat.c:2010
+msgid "Operation Successful"
+msgstr ""
+
+#: src/nat/nat_api.c:882 src/nat/nat.c:2012
+msgid "Internal Failure (IPC, ...)"
+msgstr ""
+
+#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+msgid "Failure in network subsystem, check permissions."
+msgstr ""
+
+#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+msgid "`upnpc` command not found"
+msgstr ""
+
+#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/nat/nat_api.c:894 src/nat/nat.c:2024
+msgid "`upnpc' command took too long, process killed"
+msgstr ""
+
+#: src/nat/nat_api.c:896 src/nat/nat.c:2026
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+msgid "`external-ip' command not found"
+msgstr ""
+
+#: src/nat/nat_api.c:900 src/nat/nat.c:2030
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/nat/nat_api.c:902 src/nat/nat.c:2032
+msgid "`external-ip' command output invalid"
+msgstr ""
+
+#: src/nat/nat_api.c:904 src/nat/nat.c:2034
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "无法确定用户界面定义文件。"
+
+#: src/nat/nat_api.c:908 src/nat/nat.c:2038
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr ""
+
+#: src/nat/nat_api.c:910 src/nat/nat.c:2040
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr ""
+
 #: src/nat/nat_auto.c:385
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
@@ -5259,85 +5338,6 @@ msgstr ""
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat.c:2010
-msgid "Operation Successful"
-msgstr ""
-
-#: src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
-msgstr ""
-
-#: src/nat/nat.c:2014
-msgid "Failure in network subsystem, check permissions."
-msgstr ""
-
-#: src/nat/nat.c:2016
-msgid "Encountered timeout while performing operation"
-msgstr ""
-
-#: src/nat/nat.c:2018
-msgid "detected that we are offline"
-msgstr ""
-
-#: src/nat/nat.c:2020
-msgid "`upnpc` command not found"
-msgstr ""
-
-#: src/nat/nat.c:2022
-#, fuzzy
-msgid "Failed to run `upnpc` command"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/nat/nat.c:2024
-msgid "`upnpc' command took too long, process killed"
-msgstr ""
-
-#: src/nat/nat.c:2026
-msgid "`upnpc' command failed to establish port mapping"
-msgstr ""
-
-#: src/nat/nat.c:2028
-msgid "`external-ip' command not found"
-msgstr ""
-
-#: src/nat/nat.c:2030
-#, fuzzy
-msgid "Failed to run `external-ip` command"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/nat/nat.c:2032
-msgid "`external-ip' command output invalid"
-msgstr ""
-
-#: src/nat/nat.c:2034
-msgid "no valid address was returned by `external-ip'"
-msgstr ""
-
-#: src/nat/nat.c:2036
-#, fuzzy
-msgid "Could not determine interface with internal/local network address"
-msgstr "无法确定用户界面定义文件。"
-
-#: src/nat/nat.c:2038
-msgid "No functioning gnunet-helper-nat-server installation found"
-msgstr ""
-
-#: src/nat/nat.c:2040
-msgid "NAT test could not be initialized"
-msgstr ""
-
-#: src/nat/nat.c:2042
-msgid "NAT test timeout reached"
-msgstr ""
-
-#: src/nat/nat.c:2044
-msgid "could not register NAT"
-msgstr ""
-
-#: src/nat/nat.c:2046
-msgid "No working gnunet-helper-nat-client installation found"
-msgstr ""
-
 #: src/nat/nat_mini.c:205
 msgid "`external-ip' command not found\n"
 msgstr ""
@@ -7109,199 +7109,179 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:518
+#: src/transport/gnunet-transport.c:486
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:528
+#: src/transport/gnunet-transport.c:496
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:572
+#: src/transport/gnunet-transport.c:540
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:585
+#: src/transport/gnunet-transport.c:553
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-transport.c:597
+#: src/transport/gnunet-transport.c:565
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:622 src/transport/gnunet-transport.c:647
-#, fuzzy, c-format
-msgid "Configuration for plugin `%s' did not work!\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/transport/gnunet-transport.c:627
-#, fuzzy, c-format
-msgid "Configuration for plugin `%s' did work!\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/transport/gnunet-transport.c:632
-#, fuzzy, c-format
-msgid "Internal NAT error while running test for plugin `%s'\n"
-msgstr "未知错误。\n"
-
-#: src/transport/gnunet-transport.c:637
-#, fuzzy, c-format
-msgid "Failed to start NAT test for plugin `%s'\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/transport/gnunet-transport.c:642
+#: src/transport/gnunet-transport.c:588
 #, c-format
-msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
+msgid "NAT plugin `%s' reports: %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:735
+#: src/transport/gnunet-transport.c:675
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:749
+#: src/transport/gnunet-transport.c:689
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:774
+#: src/transport/gnunet-transport.c:714
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:750
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:844
+#: src/transport/gnunet-transport.c:784
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:875
+#: src/transport/gnunet-transport.c:815
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:899 src/transport/gnunet-transport.c:928
+#: src/transport/gnunet-transport.c:839 src/transport/gnunet-transport.c:868
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:901
+#: src/transport/gnunet-transport.c:841
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:930
+#: src/transport/gnunet-transport.c:870
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:965
+#: src/transport/gnunet-transport.c:905
 #, c-format
 msgid "Received %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:942
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1014
+#: src/transport/gnunet-transport.c:954
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport.c:1366
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1548
+#: src/transport/gnunet-transport.c:1488
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1561
+#: src/transport/gnunet-transport.c:1501
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1589
+#: src/transport/gnunet-transport.c:1529
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:1535
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1618 src/transport/gnunet-transport.c:1648
-#: src/transport/gnunet-transport.c:1701
+#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
+#: src/transport/gnunet-transport.c:1641
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1655
+#: src/transport/gnunet-transport.c:1595
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1725
+#: src/transport/gnunet-transport.c:1665
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:1728
+#: src/transport/gnunet-transport.c:1668
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1731
+#: src/transport/gnunet-transport.c:1671
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1734
+#: src/transport/gnunet-transport.c:1674
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1740
+#: src/transport/gnunet-transport.c:1680
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1743
+#: src/transport/gnunet-transport.c:1683
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1746
+#: src/transport/gnunet-transport.c:1686
 #: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1749
+#: src/transport/gnunet-transport.c:1689
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1752
+#: src/transport/gnunet-transport.c:1692
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1755
+#: src/transport/gnunet-transport.c:1695
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1766
+#: src/transport/gnunet-transport.c:1706
 #: src/transport/gnunet-transport-profiler.c:642
 #, fuzzy
 msgid "Direct access to transport service."
@@ -8256,7 +8236,7 @@ msgstr "创建用户出错"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1737 src/util/network.c:1913
+#: src/util/network.c:1735 src/util/network.c:1911
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8776,6 +8756,22 @@ msgstr ""
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did not work!\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Configuration for plugin `%s' did work!\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Internal NAT error while running test for plugin `%s'\n"
+#~ msgstr "未知错误。\n"
+
+#, fuzzy
+#~ msgid "Failed to start NAT test for plugin `%s'\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
 #, fuzzy
 #~ msgid "Could not send list result to client\n"
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"