aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-11-08 13:53:48 +0100
committerChristian Grothoff <christian@grothoff.org>2016-11-08 13:53:48 +0100
commitd8e2905c74e63975af5ffe79d7fb1247328def94 (patch)
tree55092d560ee9c27435414f281f8b6b757282997a
parent5b9aeb0a9e957b084809679ca0fc83c24fde88d2 (diff)
remove obsolete svn to change log script
-rw-r--r--contrib/svn2cl.xsl494
-rw-r--r--po/de.po290
-rw-r--r--po/es.po301
-rw-r--r--po/fr.po264
-rw-r--r--po/sv.po294
-rw-r--r--po/vi.po288
-rw-r--r--po/zh_CN.po282
7 files changed, 837 insertions, 1376 deletions
diff --git a/contrib/svn2cl.xsl b/contrib/svn2cl.xsl
deleted file mode 100644
index 3d9db02003..0000000000
--- 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 d2361c0af2..71dd25cd78 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"