7 files changed, 2423 insertions, 1986 deletions

diff --git a/po/de.po b/po/de.po
index 58a71e4f7..037a90288 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-11-27 09:18+0100\n"
+"POT-Creation-Date: 2017-01-12 17:19+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"
@@ -252,21 +252,20 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:652
 #: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637
-#: src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:3309 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:637 src/util/service_new.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:682
+#: src/util/client.c:464 src/util/service.c:621 src/util/service_new.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:687
+#: src/util/client.c:469 src/util/service.c:625 src/util/service_new.c:687
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
@@ -286,7 +285,7 @@ msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2617
+#: src/transport/plugin_transport_http_server.c:2620
 #: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
 #: src/util/service_new.c:782
 #, c-format
@@ -294,7 +293,7 @@ msgid "Failed to resolve `%s': %s\n"
 msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
 
 #: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2635
+#: src/transport/plugin_transport_http_server.c:2638
 #: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
 #: src/util/service_new.c:802
 #, fuzzy, c-format
@@ -388,13 +387,11 @@ msgid ""
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
+#: src/ats/gnunet-ats-solver-eval.c:3296 src/ats-tests/gnunet-solver-eval.c:938
 #: src/ats-tests/gnunet-solver-eval.c:941
 msgid "experiment to use"
 msgstr ""
@@ -499,12 +496,12 @@ msgstr ""
 msgid "Invalid %s configuration %f\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/ats-tests/ats-testing.c:441
+#: src/ats-tests/ats-testing.c:422
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:448
+#: src/ats-tests/ats-testing.c:429
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -561,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:1476
+#: src/transport/gnunet-transport.c:1255
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
@@ -643,6 +640,37 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
+#: src/auction/gnunet-auction-create.c:69
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:72
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:75
+msgid "max duration per round"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:78
+msgid "duration until auction starts"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:81
+msgid "number of items to sell, 0 for first price auction"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:84
+msgid "public auction outcome"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:94 src/auction/gnunet-auction-info.c:76
+#: src/auction/gnunet-auction-join.c:76
+#: src/conversation/gnunet-conversation-test.c:243
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+msgid "help text"
+msgstr "Hilfetext"
+
 #: src/cadet/gnunet-cadet.c:511
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
@@ -697,7 +725,7 @@ msgstr ""
 msgid "provide information about all tunnels"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-service-cadet_peer.c:681
+#: src/cadet/gnunet-service-cadet_peer.c:686
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1020,11 +1048,6 @@ msgid ""
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
-msgid "help text"
-msgstr "Hilfetext"
-
 #: src/conversation/gnunet_gst.c:630
 #: src/conversation/gnunet-helper-audio-playback-gst.c:357
 #, c-format
@@ -1222,7 +1245,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:1677
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -1493,7 +1516,7 @@ msgstr ""
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
+#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:700
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1893,8 +1916,7 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
@@ -2074,8 +2096,7 @@ msgstr ""
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
@@ -2147,38 +2168,38 @@ msgstr "# Client Trace-Anfragen empfangen"
 msgid "# P2P PUT bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1854
+#: src/dht/gnunet-service-dht_neighbours.c:1858
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1862
+#: src/dht/gnunet-service-dht_neighbours.c:1866
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2018
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2026
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2097
+#: src/dht/gnunet-service-dht_neighbours.c:2101
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2120
+#: src/dht/gnunet-service-dht_neighbours.c:2124
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2222
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2230
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
@@ -2188,35 +2209,35 @@ msgstr "# Bytes empfangen über TCP"
 msgid "# Network size estimates received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:227
+#: src/dht/gnunet-service-dht_routing.c:229
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:233
+#: src/dht/gnunet-service-dht_routing.c:235
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:239
+#: src/dht/gnunet-service-dht_routing.c:241
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:251
+#: src/dht/gnunet-service-dht_routing.c:253
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:327
+#: src/dht/gnunet-service-dht_routing.c:329
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:409
+#: src/dht/gnunet-service-dht_routing.c:411
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:427
+#: src/dht/gnunet-service-dht_routing.c:429
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# dht Anfragen weitergeleitet"
@@ -2330,16 +2351,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:142
+#: src/dht/plugin_block_dht.c:144
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/dht/plugin_block_dht.c:149
+#: src/dht/plugin_block_dht.c:151
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:159
+#: src/dht/plugin_block_dht.c:161
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -3472,7 +3493,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:1517 src/transport/gnunet-transport.c:1542
+#: src/transport/gnunet-transport.c:1296 src/transport/gnunet-transport.c:1321
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
@@ -4003,41 +4024,41 @@ msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:709
+#: src/gns/gnunet-dns2gns.c:712
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:737
+#: src/gns/gnunet-dns2gns.c:740
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:761
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:782
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:788
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:788
+#: src/gns/gnunet-dns2gns.c:791
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:794
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:804
+#: src/gns/gnunet-dns2gns.c:807
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4199,83 +4220,85 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2167
+#: src/gns/gnunet-gns-proxy.c:2168
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/gnunet-gns-proxy.c:2197
+#: src/gns/gnunet-gns-proxy.c:2198
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2370
+#: src/gns/gnunet-gns-proxy.c:2371
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2389 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2709
+#: src/gns/gnunet-gns-proxy.c:2710
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2738
+#: src/gns/gnunet-gns-proxy.c:2739
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
+#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2836
+#: src/gns/gnunet-gns-proxy.c:2837
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3171
+#: src/gns/gnunet-gns-proxy.c:3172
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
-#: src/gns/gnunet-service-gns.c:1149
+#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
+#: src/gns/gnunet-service-gns.c:548
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3273
+#: src/gns/gnunet-gns-proxy.c:3274
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3313
+#: src/gns/gnunet-gns-proxy.c:3314
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3316
+#: src/gns/gnunet-gns-proxy.c:3317
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3335
+#: src/gns/gnunet-gns-proxy.c:3336
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1187
+#: src/gns/gnunet-service-gns.c:585
+#: src/zonemaster/gnunet-service-zonemaster.c:705
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:1195
+#: src/gns/gnunet-service-gns.c:593
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:1228
+#: src/gns/gnunet-service-gns.c:612
+#: src/zonemaster/gnunet-service-zonemaster.c:740
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -5118,8 +5141,7 @@ msgstr ""
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:979
-#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -5275,221 +5297,296 @@ msgstr "Sqlite-Datenbank läuft\n"
 msgid "Namestore REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/nat/gnunet-nat.c:159
-msgid "GNUnet NAT traversal autoconfigure daemon"
+#: src/nat-auto/gnunet-nat-auto.c:192
+#, fuzzy
+msgid "Suggested configuration changes:\n"
+msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
+
+#: src/nat-auto/gnunet-nat-auto.c:220
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/nat-auto/gnunet-nat-auto.c:227
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:345
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "# Freunde in Konfiguration"
+
+#: src/nat-auto/gnunet-nat-auto.c:348
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+msgid "use TCP"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+msgid "use UDP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:357
+msgid "write configuration file (for autoconfiguration)"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:369
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:403
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681
+#: src/nat-auto/nat_auto_api_test.c:405
+#, fuzzy
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:518
+#: src/nat-auto/nat_auto_api_test.c:520
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:568
+#: src/nat-auto/nat_auto_api_test.c:569
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/nat-auto/gnunet-nat-server.c:336
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:363
+#: src/nat-auto/gnunet-nat-server.c:386
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_api.c:880 src/nat/nat.c:2010
+#: src/nat-auto/gnunet-service-nat-auto.c:342
+#, fuzzy
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#, fuzzy, c-format
+msgid "Detected external IP `%s'\n"
+msgstr "Ungültiger RPC `%s' empfangen.\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590
+#, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725
+#, fuzzy
+msgid "upnpc not found\n"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/nat_auto_api.c:76
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat_api.c:882 src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
+#: src/nat-auto/nat_auto_api.c:78
+msgid "IPC failure"
 msgstr ""
 
-#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+#: src/nat-auto/nat_auto_api.c:80
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+#: src/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+#: src/nat-auto/nat_auto_api.c:84
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+#: src/nat-auto/nat_auto_api.c:86
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+#: src/nat-auto/nat_auto_api.c:88
 #, 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
+#: src/nat-auto/nat_auto_api.c:90
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat_api.c:896 src/nat/nat.c:2026
+#: src/nat-auto/nat_auto_api.c:92
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+#: src/nat-auto/nat_auto_api.c:94
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat_api.c:900 src/nat/nat.c:2030
+#: src/nat-auto/nat_auto_api.c:96
 #, 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
+#: src/nat-auto/nat_auto_api.c:98
 #, 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
+#: src/nat-auto/nat_auto_api.c:100
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+#: src/nat-auto/nat_auto_api.c:102
 #, 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
+#: src/nat-auto/nat_auto_api.c:104
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat_api.c:910 src/nat/nat.c:2040
+#: src/nat-auto/nat_auto_api.c:106
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+#: src/nat-auto/nat_auto_api.c:108
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+#: src/nat-auto/nat_auto_api.c:110
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+#: src/nat-auto/nat_auto_api.c:112
 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 ""
-
-#: src/nat/nat_auto.c:386
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:405
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:437
+#: src/nat-auto/nat_auto_api_test.c:477
 #, fuzzy, c-format
-msgid "Detected external IP `%s'\n"
-msgstr "Ungültiger RPC `%s' empfangen.\n"
+msgid "Failed to find valid PORT in section `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/nat/nat_auto.c:572
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+#: src/nat/gnunet-nat.c:424
+msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/nat_auto.c:590
-#, c-format
-msgid "Detected internal network address `%s'.\n"
+#: src/nat/gnunet-nat.c:427
+msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
-#, fuzzy
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/nat/nat_auto.c:724
-msgid "upnpc found, enabling its use\n"
+#: src/nat/gnunet-nat.c:430
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
 msgstr ""
 
-#: src/nat/nat_auto.c:725
-#, fuzzy
-msgid "upnpc not found\n"
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
-#: src/nat/nat_auto.c:762
-msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+#: src/nat/gnunet-nat.c:433
+msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/nat_auto.c:774 src/nat/nat_auto.c:834
-msgid "test_icmp_server not possible, as we are not behind NAT\n"
+#: src/nat/gnunet-nat.c:442
+msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/nat/gnunet-nat.c:454
+msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:823
-msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+#: src/nat/gnunet-service-nat.c:1313
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat.c:1019
+#: src/nat/gnunet-service-nat.c:1323
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat.c:1070
-#, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "Fehler beim Starten der Collection.\n"
-
-#: src/nat/nat.c:1327
-msgid "Error while running upnp client:\n"
+#: src/nat/gnunet-service-nat.c:1339
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/nat.c:1402
-#, fuzzy, c-format
-msgid "Failed to run upnp client for port %u\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-
-#: src/nat/nat.c:1546
-msgid "malformed"
+#: src/nat/gnunet-service-nat.c:1350
+#, c-format
+msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/nat.c:1600
+#: src/nat/gnunet-service-nat.c:1803
+#, fuzzy
+msgid "Connection reversal request failed\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/nat/gnunet-service-nat.c:1876
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
-"disabling UPnP \n"
+"disabling UPnP\n"
 msgstr ""
 
-#: src/nat/nat.c:1726 src/nat/nat.c:1739
+#: src/nat/gnunet-service-nat_helper.c:186
 #, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
-msgstr ""
-
-#: src/nat/nat.c:1903
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:1919
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
-msgstr ""
+#: src/nat/gnunet-service-nat_helper.c:260
+#, fuzzy, c-format
+msgid "Failed to start %s\n"
+msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat_mini.c:205
+#: src/nat/gnunet-service-nat_mini.c:196
 #, fuzzy
 msgid "`external-ip' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_mini.c:611
+#: src/nat/gnunet-service-nat_mini.c:654
 #, fuzzy
 msgid "`upnpc' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_test.c:518
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
-msgstr ""
-
-#: src/nat/nat_test.c:568
-#, fuzzy
-msgid "NAT test failed to start NAT library\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
 #: src/nse/gnunet-nse.c:122
 msgid "Show network size estimates from NSE service."
 msgstr ""
@@ -7256,175 +7353,152 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:486
+#: src/transport/gnunet-transport.c:418
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:496
+#: src/transport/gnunet-transport.c:428
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:540
+#: src/transport/gnunet-transport.c:472
 #, 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:553
+#: src/transport/gnunet-transport.c:485
 #, 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:565
+#: src/transport/gnunet-transport.c:499
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:588
-#, c-format
-msgid "NAT plugin `%s' reports: %s\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:675
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
-
-#: 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:714
-#, fuzzy
-msgid "Failed to start resolver!\n"
-msgstr "Fehler beim Starten der Collection.\n"
-
-#: src/transport/gnunet-transport.c:750
+#: src/transport/gnunet-transport.c:532
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:784
+#: src/transport/gnunet-transport.c:566
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:815
+#: src/transport/gnunet-transport.c:597
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:839 src/transport/gnunet-transport.c:868
+#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u Verbindungen insgesamt)\n"
 
-#: src/transport/gnunet-transport.c:841
+#: src/transport/gnunet-transport.c:623
 msgid "Connected to"
 msgstr "Verbunden mit"
 
-#: src/transport/gnunet-transport.c:870
+#: src/transport/gnunet-transport.c:652
 msgid "Disconnected from"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:905
+#: src/transport/gnunet-transport.c:687
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/transport/gnunet-transport.c:942
+#: src/transport/gnunet-transport.c:724
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:954
+#: src/transport/gnunet-transport.c:736
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Knoten »%s«: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1366
+#: src/transport/gnunet-transport.c:1150
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:1488
+#: src/transport/gnunet-transport.c:1267
 #, 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:1501
+#: src/transport/gnunet-transport.c:1280
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1529
+#: src/transport/gnunet-transport.c:1308
 #, 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:1535
+#: src/transport/gnunet-transport.c:1314
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
-#: src/transport/gnunet-transport.c:1641
+#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
+#: src/transport/gnunet-transport.c:1420
 msgid "Failed to connect to transport service\n"
 msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n"
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:1374
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1665
+#: src/transport/gnunet-transport.c:1444
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Informationen über verbundene Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1668
+#: src/transport/gnunet-transport.c:1447
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1671
+#: src/transport/gnunet-transport.c:1450
 msgid "disconnect from a peer"
 msgstr "Verbindung zu einem Knoten trennen"
 
-#: src/transport/gnunet-transport.c:1674
+#: src/transport/gnunet-transport.c:1453
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1680
+#: src/transport/gnunet-transport.c:1459
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1683
+#: src/transport/gnunet-transport.c:1462
 msgid "do not resolve hostnames"
 msgstr "Keine Rechnernamen auflösen"
 
-#: src/transport/gnunet-transport.c:1686
+#: src/transport/gnunet-transport.c:1465
 #: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1689
+#: src/transport/gnunet-transport.c:1468
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1692
+#: src/transport/gnunet-transport.c:1471
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1695
-msgid "test transport configuration (involves external server)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1706
+#: src/transport/gnunet-transport.c:1482
 #: src/transport/gnunet-transport-profiler.c:642
 msgid "Direct access to transport service."
 msgstr "Direkter Zugriff auf den Transportdienst"
@@ -7458,9 +7532,9 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
-#: src/transport/plugin_transport_http_server.c:3457
-#: src/transport/plugin_transport_tcp.c:3365
-#: src/transport/plugin_transport_tcp.c:3372
+#: src/transport/plugin_transport_http_server.c:3462
+#: src/transport/plugin_transport_tcp.c:3375
+#: src/transport/plugin_transport_tcp.c:3382
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7470,13 +7544,13 @@ msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_client.c:2167
-#: src/transport/plugin_transport_http_server.c:3172
+#: src/transport/plugin_transport_http_server.c:3177
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
 #: src/transport/plugin_transport_http_client.c:2184
-#: src/transport/plugin_transport_http_server.c:3242
+#: src/transport/plugin_transport_http_server.c:3247
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
@@ -7519,70 +7593,70 @@ msgstr ""
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2583
+#: src/transport/plugin_transport_http_server.c:2586
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2748
+#: src/transport/plugin_transport_http_server.c:2751
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2832
-#: src/transport/plugin_transport_udp.c:3600
+#: src/transport/plugin_transport_http_server.c:2837
+#: src/transport/plugin_transport_udp.c:3623
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2938
+#: src/transport/plugin_transport_http_server.c:2943
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2953
+#: src/transport/plugin_transport_http_server.c:2958
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2959
+#: src/transport/plugin_transport_http_server.c:2964
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 "Weder IPv4 noch IPv6 sind aktiviert! Bearbeiten Sie die Konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2970
+#: src/transport/plugin_transport_http_server.c:2975
 msgid "Port is required! Fix in configuration\n"
 msgstr "Port ist erforderlich! Bearbeiten Sie die Konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2976
+#: src/transport/plugin_transport_http_server.c:2981
 #, c-format
 msgid "Using port %u\n"
 msgstr "Port %u wird verwendet\n"
 
-#: src/transport/plugin_transport_http_server.c:2995
+#: src/transport/plugin_transport_http_server.c:3000
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3030
+#: src/transport/plugin_transport_http_server.c:3035
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3105
+#: src/transport/plugin_transport_http_server.c:3110
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3126
+#: src/transport/plugin_transport_http_server.c:3131
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:3143
+#: src/transport/plugin_transport_http_server.c:3148
 #, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "Maximale Anzahl der Verbindungen ist %u\n"
 
-#: src/transport/plugin_transport_http_server.c:3469
+#: src/transport/plugin_transport_http_server.c:3474
 msgid "Unable to compile URL regex\n"
 msgstr ""
 
@@ -7632,160 +7706,160 @@ msgstr "# Bytes gesendet über SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von SMTP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1051
-#: src/transport/plugin_transport_tcp.c:2362
+#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:2379
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1234
-#: src/transport/plugin_transport_tcp.c:1458
-#: src/transport/plugin_transport_tcp.c:2633
-#: src/transport/plugin_transport_tcp.c:3490
+#: src/transport/plugin_transport_tcp.c:1243
+#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:2643
+#: src/transport/plugin_transport_tcp.c:3498
 msgid "# TCP sessions active"
 msgstr "# aktive TCP-Sitzungen"
 
-#: src/transport/plugin_transport_tcp.c:1276
-#: src/transport/plugin_transport_tcp.c:1440
-#: src/transport/plugin_transport_tcp.c:1564
-#: src/transport/plugin_transport_tcp.c:1637
-#: src/transport/plugin_transport_tcp.c:1737
-#: src/transport/plugin_transport_tcp.c:1762
+#: src/transport/plugin_transport_tcp.c:1285
+#: src/transport/plugin_transport_tcp.c:1449
+#: src/transport/plugin_transport_tcp.c:1573
+#: src/transport/plugin_transport_tcp.c:1646
+#: src/transport/plugin_transport_tcp.c:1746
+#: src/transport/plugin_transport_tcp.c:1771
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes derzeit in TCP-Puffern"
 
-#: src/transport/plugin_transport_tcp.c:1279
+#: src/transport/plugin_transport_tcp.c:1288
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (unterbrochen)"
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1576
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (Zeitüberschreitung)"
 
-#: src/transport/plugin_transport_tcp.c:1641
+#: src/transport/plugin_transport_tcp.c:1650
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes über TCP übertragen"
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2041
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2200
+#: src/transport/plugin_transport_tcp.c:2217
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2692
+#: src/transport/plugin_transport_tcp.c:2702
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2883
+#: src/transport/plugin_transport_tcp.c:2893
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2934
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:3002
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/transport/plugin_transport_tcp.c:2938
+#: src/transport/plugin_transport_tcp.c:2948
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# verbundener Knoten"
 
-#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:2954
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2946
+#: src/transport/plugin_transport_tcp.c:2956
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2986
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3006
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3315
+#: src/transport/plugin_transport_tcp.c:3325
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten des Dienstes.\n"
 
-#: src/transport/plugin_transport_tcp.c:3478
+#: src/transport/plugin_transport_tcp.c:3486
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "TCP-Transportdienst wartet auf Port %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:3482
+#: src/transport/plugin_transport_tcp.c:3490
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:3494
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:170
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 #, fuzzy
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:546
+#: src/transport/plugin_transport_udp_broadcasting.c:545
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:567
+#: src/transport/plugin_transport_udp_broadcasting.c:566
 #, fuzzy, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_udp.c:3344
+#: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3358
+#: src/transport/plugin_transport_udp.c:3381
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3676
-#: src/transport/plugin_transport_udp.c:3775
+#: src/transport/plugin_transport_udp.c:3699
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/transport/plugin_transport_udp.c:3694
+#: src/transport/plugin_transport_udp.c:3717
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3785
+#: src/transport/plugin_transport_udp.c:3808
 msgid "Failed to open UDP sockets\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/transport/plugin_transport_udp.c:3857
-#: src/transport/plugin_transport_udp.c:3871
+#: src/transport/plugin_transport_udp.c:3879
+#: src/transport/plugin_transport_udp.c:3893
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3903
+#: src/transport/plugin_transport_udp.c:3925
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/transport/plugin_transport_udp.c:3930
+#: src/transport/plugin_transport_udp.c:3952
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/transport/plugin_transport_udp.c:3996
+#: src/transport/plugin_transport_udp.c:4018
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
@@ -7905,7 +7979,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client_new.c:864
+#: src/util/client.c:864
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8683,42 +8757,42 @@ msgstr "IPv6-Adresse enthält keine gültige Portnummer nach dem letzten »:«\n
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 
-#: src/util/strings.c:1475 src/util/strings.c:1491
+#: src/util/strings.c:1541 src/util/strings.c:1557
 msgid "Port not in range\n"
 msgstr "Port außerhalb des Bereichs\n"
 
-#: src/util/strings.c:1500
+#: src/util/strings.c:1566
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
-#: src/util/strings.c:1683
+#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
+#: src/util/strings.c:1749
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: »%s«\n"
 
-#: src/util/strings.c:1640
+#: src/util/strings.c:1706
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk-Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/strings.c:1692
+#: src/util/strings.c:1758
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/strings.c:1744
+#: src/util/strings.c:1810
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk-Notation (endet nicht mit »;«: »%s«)\n"
 
-#: src/util/strings.c:1794
+#: src/util/strings.c:1860
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/strings.c:1825
+#: src/util/strings.c:1891
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
@@ -8902,22 +8976,30 @@ msgid "Setup tunnels via VPN."
 msgstr "Tunnel über VPN einrichten."
 
 #: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:660
+#: src/include/gnunet_common.h:662 src/include/gnunet_common.h:670
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/include/gnunet_common.h:672
+#: src/include/gnunet_common.h:682
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
 
-#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
+#: src/include/gnunet_common.h:709 src/include/gnunet_common.h:718
 #, fuzzy, c-format
 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 "Failed to run upnp client for port %u\n"
+#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to start resolver!\n"
+#~ msgstr "Fehler beim Starten der Collection.\n"
+
+#, fuzzy
 #~ msgid "Unable to initialize Postgres: %s\n"
 #~ msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
diff --git a/po/es.po b/po/es.po
index 8df52f5c9..89ed32c0e 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-11-27 09:18+0100\n"
+"POT-Creation-Date: 2017-01-12 17:19+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"
@@ -260,9 +260,8 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:652
 #: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637
-#: src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:3309 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:637 src/util/service_new.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -270,14 +269,14 @@ msgstr ""
 "configuración!\n"
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:682
+#: src/util/client.c:464 src/util/service.c:621 src/util/service_new.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:687
+#: src/util/client.c:469 src/util/service.c:625 src/util/service_new.c:687
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
@@ -301,7 +300,7 @@ msgstr ""
 "uno es necesario\n"
 
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2617
+#: src/transport/plugin_transport_http_server.c:2620
 #: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
 #: src/util/service_new.c:782
 #, c-format
@@ -309,7 +308,7 @@ msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
 #: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2635
+#: src/transport/plugin_transport_http_server.c:2638
 #: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
 #: src/util/service_new.c:802
 #, c-format
@@ -416,14 +415,12 @@ msgstr ""
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 #, fuzzy
 msgid "solver to use"
 msgstr "valor a establecer"
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
+#: src/ats/gnunet-ats-solver-eval.c:3296 src/ats-tests/gnunet-solver-eval.c:938
 #: src/ats-tests/gnunet-solver-eval.c:941
 msgid "experiment to use"
 msgstr ""
@@ -540,12 +537,12 @@ msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 msgid "Invalid %s configuration %f\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
 
-#: src/ats-tests/ats-testing.c:441
+#: src/ats-tests/ats-testing.c:422
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:448
+#: src/ats-tests/ats-testing.c:429
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Fallo al conectar a gnunetd.\n"
@@ -610,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:1476
+#: src/transport/gnunet-transport.c:1255
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
@@ -701,6 +698,38 @@ msgstr "salida prolija (incluye las propiedades de direcciones del ATS)"
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
+#: src/auction/gnunet-auction-create.c:69
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:72
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:75
+msgid "max duration per round"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:78
+msgid "duration until auction starts"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:81
+msgid "number of items to sell, 0 for first price auction"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:84
+#, fuzzy
+msgid "public auction outcome"
+msgstr "_Opciones"
+
+#: src/auction/gnunet-auction-create.c:94 src/auction/gnunet-auction-info.c:76
+#: src/auction/gnunet-auction-join.c:76
+#: src/conversation/gnunet-conversation-test.c:243
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+msgid "help text"
+msgstr "texto de ayuda"
+
 #: src/cadet/gnunet-cadet.c:511
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
@@ -756,7 +785,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:681
+#: src/cadet/gnunet-service-cadet_peer.c:686
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
@@ -1085,11 +1114,6 @@ msgid ""
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
-msgid "help text"
-msgstr "texto de ayuda"
-
 #: src/conversation/gnunet_gst.c:630
 #: src/conversation/gnunet-helper-audio-playback-gst.c:357
 #, c-format
@@ -1299,7 +1323,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:1677
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
@@ -1564,7 +1588,7 @@ msgstr "Caché de datos de montículo (heap) ejecutándose\n"
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
+#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:700
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1976,8 +2000,7 @@ msgstr "cuanto tiempo debe ejecutarse el comando de monitorización"
 msgid "Prints all packets that go through the DHT."
 msgstr "Imprime todos los paquetes que pasan por la DHT."
 
-#: src/dht/gnunet_dht_profiler.c:1161
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
@@ -2161,8 +2184,7 @@ msgstr "¡Tipo de bloque no soportado (%u) en respuesta local!\n"
 msgid "# GET requests given to datacache"
 msgstr "# Peticiones «GET» realizadas a la caché de datos"
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr "# «HELLO» obtenidos de «peerinfo»"
 
@@ -2229,36 +2251,36 @@ msgstr "# Peticiones «PUT» P2P recibidas"
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1854
+#: src/dht/gnunet-service-dht_neighbours.c:1858
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1862
+#: src/dht/gnunet-service-dht_neighbours.c:1866
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a falta de «HELLO»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2018
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2026
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2097
+#: src/dht/gnunet-service-dht_neighbours.c:2101
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2120
+#: src/dht/gnunet-service-dht_neighbours.c:2124
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2222
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2230
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
@@ -2267,41 +2289,41 @@ msgstr "# Resultados (RESULTS) P2P recibidos"
 msgid "# Network size estimates received"
 msgstr "# Estimaciones del tamaño de red recibidas"
 
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 "# Buenas respuestas (REPLIES) encontradas en la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:227
+#: src/dht/gnunet-service-dht_routing.c:229
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) duplicadas encontradas en la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:233
+#: src/dht/gnunet-service-dht_routing.c:235
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) no válidas encontradas en la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:239
+#: src/dht/gnunet-service-dht_routing.c:241
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) irrelevantes encontradas en la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:251
+#: src/dht/gnunet-service-dht_routing.c:253
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) no soportadas encontradas en la tabla de "
 "encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:327
+#: src/dht/gnunet-service-dht_routing.c:329
 msgid "# Entries removed from routing table"
 msgstr "# Entradas eliminadas de la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:409
+#: src/dht/gnunet-service-dht_routing.c:411
 msgid "# Entries added to routing table"
 msgstr "# Entradas añadidas a la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:427
+#: src/dht/gnunet-service-dht_routing.c:429
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
@@ -2414,16 +2436,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:142
+#: src/dht/plugin_block_dht.c:144
 #, c-format
 msgid "Block not of type %u\n"
 msgstr "El bloque no es del tipo %u\n"
 
-#: src/dht/plugin_block_dht.c:149
+#: src/dht/plugin_block_dht.c:151
 msgid "Size mismatch for block\n"
 msgstr "Discrepancias de tamaños para el bloque\n"
 
-#: src/dht/plugin_block_dht.c:159
+#: src/dht/plugin_block_dht.c:161
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
@@ -3593,7 +3615,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:1517 src/transport/gnunet-transport.c:1542
+#: src/transport/gnunet-transport.c:1296 src/transport/gnunet-transport.c:1321
 #, 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"
@@ -4119,45 +4141,45 @@ msgstr "Recibida petición DNS mal formada de %s\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Recibida petición DNS no soportada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:709
+#: src/gns/gnunet-dns2gns.c:712
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:737
+#: src/gns/gnunet-dns2gns.c:740
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:761
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:782
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 "Sufijo FCFS autoritativo a usar (opcional); predeterminado: fcfs.zkey.eu"
 
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:788
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr "Sufijo DNS autoritativo a usar (opcional); predeterminado: zkey.eu"
 
-#: src/gns/gnunet-dns2gns.c:788
+#: src/gns/gnunet-dns2gns.c:791
 #, fuzzy
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: "
 "53"
 
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:794
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:804
+#: src/gns/gnunet-dns2gns.c:807
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
@@ -4321,83 +4343,85 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2167
+#: src/gns/gnunet-gns-proxy.c:2168
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "No se pudo importar la clave privada del fichero «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2197
+#: src/gns/gnunet-gns-proxy.c:2198
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "No se pudo importar el certificado %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:2370
+#: src/gns/gnunet-gns-proxy.c:2371
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/gns/gnunet-gns-proxy.c:2389 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns-proxy.c:2709
+#: src/gns/gnunet-gns-proxy.c:2710
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2738
+#: src/gns/gnunet-gns-proxy.c:2739
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
+#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2836
+#: src/gns/gnunet-gns-proxy.c:2837
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3171
+#: src/gns/gnunet-gns-proxy.c:3172
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
-#: src/gns/gnunet-service-gns.c:1149
+#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
+#: src/gns/gnunet-service-gns.c:548
 #, fuzzy, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
-#: src/gns/gnunet-gns-proxy.c:3273
+#: src/gns/gnunet-gns-proxy.c:3274
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:3313
+#: src/gns/gnunet-gns-proxy.c:3314
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3316
+#: src/gns/gnunet-gns-proxy.c:3317
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3335
+#: src/gns/gnunet-gns-proxy.c:3336
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-service-gns.c:1187
+#: src/gns/gnunet-service-gns.c:585
+#: src/zonemaster/gnunet-service-zonemaster.c:705
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:1195
+#: src/gns/gnunet-service-gns.c:593
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:1228
+#: src/gns/gnunet-service-gns.c:612
+#: src/zonemaster/gnunet-service-zonemaster.c:740
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
@@ -5279,8 +5303,7 @@ msgstr "borrar"
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:979
-#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
@@ -5444,232 +5467,306 @@ msgstr "Base de datos de plantilla ejecutándose\n"
 msgid "Namestore REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/nat/gnunet-nat.c:159
+#: src/nat-auto/gnunet-nat-auto.c:192
 #, fuzzy
-msgid "GNUnet NAT traversal autoconfigure daemon"
+msgid "Suggested configuration changes:\n"
+msgstr "Configuración de GNUnet"
+
+#: src/nat-auto/gnunet-nat-auto.c:220
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Se produjo un fallo al guardar la nueva configuración al disco"
+
+#: src/nat-auto/gnunet-nat-auto.c:227
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "No se pudo acceder al fichero de configuración «%s»\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:345
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "Configuración de GNUnet"
+
+#: src/nat-auto/gnunet-nat-auto.c:348
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+msgid "use TCP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+msgid "use UDP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:357
+#, fuzzy
+msgid "write configuration file (for autoconfiguration)"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:369
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfiguration"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat-auto/gnunet-nat-auto_legacy.c:403
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681
+#: src/nat-auto/nat_auto_api_test.c:405
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr "Se produjo un fallo al conectar con «gnunet-nat-server»\n"
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:518
+#: src/nat-auto/nat_auto_api_test.c:520
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgstr ""
+"Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
+"pruebas NAT: %s\n"
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:568
+#: src/nat-auto/nat_auto_api_test.c:569
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
+#: src/nat-auto/gnunet-nat-server.c:336
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 "¡Por favor, pase un número de puerto válido como primer parámetro! (se "
 "obtuvo «%s»)\n"
 
-#: src/nat/gnunet-nat-server.c:363
+#: src/nat-auto/gnunet-nat-server.c:386
 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
+#: src/nat-auto/gnunet-service-nat-auto.c:342
+#, fuzzy
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
+msgstr "comando «upnpc» no encontrado\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr "Recorrido NAT con servidor ICMP satisfactorio.\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr "Recorrido NAT con servidor ICMP fallido.\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr "Probando conexión inversa con el servidor ICMP.\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr "Detectada IP externa «%s»\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+"Este sistema tiene una dirección IPv6 global, fijando IPv6 a habilitado.\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590
+#, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr "Detectada dirección de la red interna «%s».\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724
+msgid "upnpc found, enabling its use\n"
+msgstr "«upnpc» encontrado, habilitando su uso\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725
+msgid "upnpc not found\n"
+msgstr "«upnpc» no encontrado\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/nat_auto_api.c:76
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat_api.c:882 src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
+#: src/nat-auto/nat_auto_api.c:78
+msgid "IPC failure"
 msgstr ""
 
-#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+#: src/nat-auto/nat_auto_api.c:80
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+#: src/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+#: src/nat-auto/nat_auto_api.c:84
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+#: src/nat-auto/nat_auto_api.c:86
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+#: src/nat-auto/nat_auto_api.c:88
 #, 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
+#: src/nat-auto/nat_auto_api.c:90
 #, 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
+#: src/nat-auto/nat_auto_api.c:92
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+#: src/nat-auto/nat_auto_api.c:94
 #, 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
+#: src/nat-auto/nat_auto_api.c:96
 #, 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
+#: src/nat-auto/nat_auto_api.c:98
 #, 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
+#: src/nat-auto/nat_auto_api.c:100
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+#: src/nat-auto/nat_auto_api.c:102
 #, 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
+#: src/nat-auto/nat_auto_api.c:104
 #, 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
+#: src/nat-auto/nat_auto_api.c:106
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+#: src/nat-auto/nat_auto_api.c:108
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+#: src/nat-auto/nat_auto_api.c:110
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+#: src/nat-auto/nat_auto_api.c:112
 #, 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"
-
-#: src/nat/nat_auto.c:386
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr "Recorrido NAT con servidor ICMP fallido.\n"
-
-#: src/nat/nat_auto.c:405
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr "Probando conexión inversa con el servidor ICMP.\n"
-
-#: src/nat/nat_auto.c:437
-#, c-format
-msgid "Detected external IP `%s'\n"
-msgstr "Detectada IP externa «%s»\n"
+#: src/nat-auto/nat_auto_api_test.c:477
+#, fuzzy, c-format
+msgid "Failed to find valid PORT in section `%s'\n"
+msgstr "¡Se produjo un fallo al buscar la opción %s en la sección %s!\n"
 
-#: src/nat/nat_auto.c:572
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+#: src/nat/gnunet-nat.c:424
+msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
-"Este sistema tiene una dirección IPv6 global, fijando IPv6 a habilitado.\n"
-
-#: src/nat/nat_auto.c:590
-#, c-format
-msgid "Detected internal network address `%s'.\n"
-msgstr "Detectada dirección de la red interna «%s».\n"
-
-#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr "Se produjo un fallo al conectar con «gnunet-nat-server»\n"
-
-#: src/nat/nat_auto.c:724
-msgid "upnpc found, enabling its use\n"
-msgstr "«upnpc» encontrado, habilitando su uso\n"
 
-#: src/nat/nat_auto.c:725
-msgid "upnpc not found\n"
-msgstr "«upnpc» no encontrado\n"
+#: src/nat/gnunet-nat.c:427
+msgid "which remote IP and port should be asked for connection reversal"
+msgstr ""
 
-#: src/nat/nat_auto.c:762
-msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+#: src/nat/gnunet-nat.c:430
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
 msgstr ""
 
-#: src/nat/nat_auto.c:774 src/nat/nat_auto.c:834
-msgid "test_icmp_server not possible, as we are not behind NAT\n"
+#: src/nat/gnunet-nat.c:433
+msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
-msgid "No working gnunet-helper-nat-server found\n"
-msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
+#: src/nat/gnunet-nat.c:442
+#, fuzzy
+msgid "watch for connection reversal requests"
+msgstr "# pares desconectados debido a petición externa"
 
-#: src/nat/nat_auto.c:823
-msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
-msgstr ""
+#: src/nat/gnunet-nat.c:454
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfigure daemon"
+msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
-#: src/nat/nat.c:1019
+#: src/nat/gnunet-service-nat.c:1313
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
-msgstr "«gnunet-helper-nat-server» generó la dirección mal formada «%s»\n"
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
+msgstr ""
 
-#: src/nat/nat.c:1070
-#, c-format
-msgid "Failed to start %s\n"
-msgstr "Se produjo un fallo al arrancar %s\n"
+#: src/nat/gnunet-service-nat.c:1323
+#, fuzzy, c-format
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
+msgstr ""
+"Puerto inválido \"%s\" en la especificación de la lista local, probando el "
+"puerto %d.\n"
 
-#: src/nat/nat.c:1327
-msgid "Error while running upnp client:\n"
+#: src/nat/gnunet-service-nat.c:1339
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/nat.c:1402
-#, fuzzy, c-format
-msgid "Failed to run upnp client for port %u\n"
+#: src/nat/gnunet-service-nat.c:1350
+#, c-format
+msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
-"Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
 
-#: src/nat/nat.c:1546
-msgid "malformed"
-msgstr "mal formado"
+#: src/nat/gnunet-service-nat.c:1803
+#, fuzzy
+msgid "Connection reversal request failed\n"
+msgstr "Colección detenida.\n"
 
-#: src/nat/nat.c:1600
+#: src/nat/gnunet-service-nat.c:1876
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
-"disabling UPnP \n"
+"disabling UPnP\n"
 msgstr ""
 
-#: src/nat/nat.c:1726 src/nat/nat.c:1739
+#: src/nat/gnunet-service-nat_helper.c:186
 #, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
-msgstr ""
-"La configuración requiere «%s», pero el binario no está instalado de forma "
-"correcta (SUID bit no activado).  Opción deshabilitada.\n"
-
-#: src/nat/nat.c:1903
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
-msgstr ""
-"Direcciones internas IP no conocidas, no se puede usar el método del "
-"recorrido NAT ICMP\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgstr "«gnunet-helper-nat-server» generó la dirección mal formada «%s»\n"
 
-#: src/nat/nat.c:1919
+#: src/nat/gnunet-service-nat_helper.c:260
 #, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
-msgstr "Ejecutando gnunet-helper-nat-client %s %s %u\n"
+msgid "Failed to start %s\n"
+msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/nat/nat_mini.c:205
+#: src/nat/gnunet-service-nat_mini.c:196
 msgid "`external-ip' command not found\n"
 msgstr "comando «external-ip» no encontrado\n"
 
-#: src/nat/nat_mini.c:611
+#: src/nat/gnunet-service-nat_mini.c:654
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat_test.c:518
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
-msgstr ""
-"Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
-"pruebas NAT: %s\n"
-
-#: src/nat/nat_test.c:568
-#, fuzzy
-msgid "NAT test failed to start NAT library\n"
-msgstr "El almacén de nombres no pudo añadir el registro\n"
-
 #: src/nse/gnunet-nse.c:122
 #, fuzzy
 msgid "Show network size estimates from NSE service."
@@ -7504,59 +7601,38 @@ msgstr "# Mensajes PONG omitidos, firma expirada"
 msgid "# validations succeeded"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-transport.c:486
+#: src/transport/gnunet-transport.c:418
 #, 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:496
+#: src/transport/gnunet-transport.c:428
 #, 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:540
+#: src/transport/gnunet-transport.c:472
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-transport.c:553
+#: src/transport/gnunet-transport.c:485
 #, 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:565
+#: src/transport/gnunet-transport.c:499
 msgid "Failed to list connections, timeout occured\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
 
-#: src/transport/gnunet-transport.c:588
-#, fuzzy, c-format
-msgid "NAT plugin `%s' reports: %s\n"
-msgstr "Módulo de transporte: «%s» puerto %llu\n"
-
-#: 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: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:714
-#, fuzzy
-msgid "Failed to start resolver!\n"
-msgstr "Se produjo un fallo al arrancar %s\n"
-
-#: src/transport/gnunet-transport.c:750
+#: src/transport/gnunet-transport.c:532
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:784
+#: src/transport/gnunet-transport.c:566
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7565,46 +7641,46 @@ msgstr ""
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:815
+#: src/transport/gnunet-transport.c:597
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:839 src/transport/gnunet-transport.c:868
+#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
 #, 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:841
+#: src/transport/gnunet-transport.c:623
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/transport/gnunet-transport.c:870
+#: src/transport/gnunet-transport.c:652
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/transport/gnunet-transport.c:905
+#: src/transport/gnunet-transport.c:687
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:942
+#: src/transport/gnunet-transport.c:724
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:954
+#: src/transport/gnunet-transport.c:736
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1366
+#: src/transport/gnunet-transport.c:1150
 #, 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:1488
+#: src/transport/gnunet-transport.c:1267
 #, fuzzy, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7613,7 +7689,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:1501
+#: src/transport/gnunet-transport.c:1280
 #, fuzzy, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
@@ -7621,72 +7697,68 @@ msgstr ""
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1529
+#: src/transport/gnunet-transport.c:1308
 #, 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:1535
+#: src/transport/gnunet-transport.c:1314
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
-#: src/transport/gnunet-transport.c:1641
+#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
+#: src/transport/gnunet-transport.c:1420
 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:1595
+#: src/transport/gnunet-transport.c:1374
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:1665
+#: src/transport/gnunet-transport.c:1444
 #, 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:1668
+#: src/transport/gnunet-transport.c:1447
 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:1671
+#: src/transport/gnunet-transport.c:1450
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:1674
+#: src/transport/gnunet-transport.c:1453
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:1680
+#: src/transport/gnunet-transport.c:1459
 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:1683
+#: src/transport/gnunet-transport.c:1462
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1686
+#: src/transport/gnunet-transport.c:1465
 #: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:1689
+#: src/transport/gnunet-transport.c:1468
 #, fuzzy
 msgid "monitor plugin sessions"
 msgstr "# sesiones wlan pendientes"
 
-#: src/transport/gnunet-transport.c:1692
+#: src/transport/gnunet-transport.c:1471
 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:1695
-msgid "test transport configuration (involves external server)"
-msgstr "probar configuración de transporte (requiere un servidor externo)"
-
-#: src/transport/gnunet-transport.c:1706
+#: src/transport/gnunet-transport.c:1482
 #: src/transport/gnunet-transport-profiler.c:642
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
@@ -7722,9 +7794,9 @@ msgstr "tamaño del mensaje"
 
 #: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
-#: src/transport/plugin_transport_http_server.c:3457
-#: src/transport/plugin_transport_tcp.c:3365
-#: src/transport/plugin_transport_tcp.c:3372
+#: src/transport/plugin_transport_http_server.c:3462
+#: src/transport/plugin_transport_tcp.c:3375
+#: src/transport/plugin_transport_tcp.c:3382
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7736,13 +7808,13 @@ msgstr ""
 "módulo %s!\n"
 
 #: src/transport/plugin_transport_http_client.c:2167
-#: src/transport/plugin_transport_http_server.c:3172
+#: src/transport/plugin_transport_http_server.c:3177
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
 #: src/transport/plugin_transport_http_client.c:2184
-#: src/transport/plugin_transport_http_server.c:3242
+#: src/transport/plugin_transport_http_server.c:3247
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Finalización del módulo «%s» completa\n"
@@ -7793,73 +7865,73 @@ msgstr ""
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2583
+#: src/transport/plugin_transport_http_server.c:2586
 msgid "Require valid port number for service in configuration!\n"
 msgstr "¡Se necesita un puerto válido para el servicio en la configuración!\n"
 
-#: src/transport/plugin_transport_http_server.c:2748
+#: src/transport/plugin_transport_http_server.c:2751
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n"
 
-#: src/transport/plugin_transport_http_server.c:2832
-#: src/transport/plugin_transport_udp.c:3600
+#: src/transport/plugin_transport_http_server.c:2837
+#: src/transport/plugin_transport_udp.c:3623
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
-#: src/transport/plugin_transport_http_server.c:2938
+#: src/transport/plugin_transport_http_server.c:2943
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2953
+#: src/transport/plugin_transport_http_server.c:2958
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2959
+#: src/transport/plugin_transport_http_server.c:2964
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "¡Ni IPv4 ni IPv6 están habilitadas! Corrija la configuración\n"
 
-#: src/transport/plugin_transport_http_server.c:2970
+#: src/transport/plugin_transport_http_server.c:2975
 msgid "Port is required! Fix in configuration\n"
 msgstr "¡El puerto es necesario! Corrija la configuración\n"
 
-#: src/transport/plugin_transport_http_server.c:2976
+#: src/transport/plugin_transport_http_server.c:2981
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2995
+#: src/transport/plugin_transport_http_server.c:3000
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "¡La dirección IPv4 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
 
-#: src/transport/plugin_transport_http_server.c:3030
+#: src/transport/plugin_transport_http_server.c:3035
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "¡La dirección IPv6 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
 
-#: src/transport/plugin_transport_http_server.c:3105
+#: src/transport/plugin_transport_http_server.c:3110
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:3126
+#: src/transport/plugin_transport_http_server.c:3131
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Notificando al transporte sólo el nombre de máquina «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:3143
+#: src/transport/plugin_transport_http_server.c:3148
 #, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/transport/plugin_transport_http_server.c:3469
+#: src/transport/plugin_transport_http_server.c:3474
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "¡Imposible obtener «HELLO» del par!\n"
@@ -7909,119 +7981,119 @@ msgstr "# bytes enviados vía SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por SMTP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:1051
-#: src/transport/plugin_transport_tcp.c:2362
+#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:2379
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
-#: src/transport/plugin_transport_tcp.c:1234
-#: src/transport/plugin_transport_tcp.c:1458
-#: src/transport/plugin_transport_tcp.c:2633
-#: src/transport/plugin_transport_tcp.c:3490
+#: src/transport/plugin_transport_tcp.c:1243
+#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:2643
+#: src/transport/plugin_transport_tcp.c:3498
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
-#: src/transport/plugin_transport_tcp.c:1276
-#: src/transport/plugin_transport_tcp.c:1440
-#: src/transport/plugin_transport_tcp.c:1564
-#: src/transport/plugin_transport_tcp.c:1637
-#: src/transport/plugin_transport_tcp.c:1737
-#: src/transport/plugin_transport_tcp.c:1762
+#: src/transport/plugin_transport_tcp.c:1285
+#: src/transport/plugin_transport_tcp.c:1449
+#: src/transport/plugin_transport_tcp.c:1573
+#: src/transport/plugin_transport_tcp.c:1646
+#: src/transport/plugin_transport_tcp.c:1746
+#: src/transport/plugin_transport_tcp.c:1771
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
-#: src/transport/plugin_transport_tcp.c:1279
+#: src/transport/plugin_transport_tcp.c:1288
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1576
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
-#: src/transport/plugin_transport_tcp.c:1641
+#: src/transport/plugin_transport_tcp.c:1650
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2041
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2200
+#: src/transport/plugin_transport_tcp.c:2217
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2692
+#: src/transport/plugin_transport_tcp.c:2702
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2883
+#: src/transport/plugin_transport_tcp.c:2893
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2934
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:3002
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/transport/plugin_transport_tcp.c:2938
+#: src/transport/plugin_transport_tcp.c:2948
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# Pares conectados"
 
-#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:2954
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2946
+#: src/transport/plugin_transport_tcp.c:2956
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2986
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3006
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:3315
+#: src/transport/plugin_transport_tcp.c:3325
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:3478
+#: src/transport/plugin_transport_tcp.c:3486
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Transporte TCP escuchando en el puerto %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:3482
+#: src/transport/plugin_transport_tcp.c:3490
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n"
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:3494
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:170
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 #, fuzzy
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:546
+#: src/transport/plugin_transport_udp_broadcasting.c:545
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:567
+#: src/transport/plugin_transport_udp_broadcasting.c:566
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 "Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
 "«socket» en el puerto %d\n"
 
-#: src/transport/plugin_transport_udp.c:3344
+#: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -8030,7 +8102,7 @@ msgstr ""
 "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, "
 "compruebe su configuración de red\n"
 
-#: src/transport/plugin_transport_udp.c:3358
+#: src/transport/plugin_transport_udp.c:3381
 #, fuzzy
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
@@ -8040,37 +8112,37 @@ msgstr ""
 "configuración de red y deshabilite IPv6 si su conexión carece de una "
 "dirección IPv6 global\n"
 
-#: src/transport/plugin_transport_udp.c:3676
-#: src/transport/plugin_transport_udp.c:3775
+#: src/transport/plugin_transport_udp.c:3699
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3694
+#: src/transport/plugin_transport_udp.c:3717
 #, fuzzy
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
-#: src/transport/plugin_transport_udp.c:3785
+#: src/transport/plugin_transport_udp.c:3808
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3857
-#: src/transport/plugin_transport_udp.c:3871
+#: src/transport/plugin_transport_udp.c:3879
+#: src/transport/plugin_transport_udp.c:3893
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3903
+#: src/transport/plugin_transport_udp.c:3925
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/transport/plugin_transport_udp.c:3930
+#: src/transport/plugin_transport_udp.c:3952
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/transport/plugin_transport_udp.c:3996
+#: src/transport/plugin_transport_udp.c:4018
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
@@ -8194,7 +8266,7 @@ msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
 
-#: src/util/client_new.c:864
+#: src/util/client.c:864
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n"
@@ -9001,42 +9073,42 @@ msgstr ""
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/util/strings.c:1475 src/util/strings.c:1491
+#: src/util/strings.c:1541 src/util/strings.c:1557
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1500
+#: src/util/strings.c:1566
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
-#: src/util/strings.c:1683
+#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
+#: src/util/strings.c:1749
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/util/strings.c:1640
+#: src/util/strings.c:1706
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)."
 
-#: src/util/strings.c:1692
+#: src/util/strings.c:1758
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/util/strings.c:1744
+#: src/util/strings.c:1810
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con «;»: «%s»)\n"
 
-#: src/util/strings.c:1794
+#: src/util/strings.c:1860
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato «%s» erroneo para máscara de red\n"
 
-#: src/util/strings.c:1825
+#: src/util/strings.c:1891
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato «%s» erroneo para red\n"
@@ -9223,22 +9295,66 @@ msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
 #: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:660
+#: src/include/gnunet_common.h:662 src/include/gnunet_common.h:670
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:672
+#: src/include/gnunet_common.h:682
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Violación externa del protocolo detectada en %s:%d.\n"
 
-#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
+#: src/include/gnunet_common.h:709 src/include/gnunet_common.h:718
 #, c-format
 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 "Failed to run upnp client for port %u\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al inicializar la clave de la máquina desde el par "
+#~ "%u\n"
+
+#~ msgid "malformed"
+#~ msgstr "mal formado"
+
+#~ msgid ""
+#~ "Configuration requires `%s', but binary is not installed properly (SUID "
+#~ "bit not set).  Option disabled.\n"
+#~ msgstr ""
+#~ "La configuración requiere «%s», pero el binario no está instalado de "
+#~ "forma correcta (SUID bit no activado).  Opción deshabilitada.\n"
+
+#~ msgid ""
+#~ "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#~ msgstr ""
+#~ "Direcciones internas IP no conocidas, no se puede usar el método del "
+#~ "recorrido NAT ICMP\n"
+
+#~ msgid "Running gnunet-helper-nat-client %s %s %u\n"
+#~ msgstr "Ejecutando gnunet-helper-nat-client %s %s %u\n"
+
+#, fuzzy
+#~ msgid "NAT plugin `%s' reports: %s\n"
+#~ msgstr "Módulo de transporte: «%s» puerto %llu\n"
+
+#~ msgid "No transport plugins configured, peer will never communicate\n"
+#~ msgstr ""
+#~ "No hay módulos de transporte configurados, el par nunca se comunicará\n"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Failed to start resolver!\n"
+#~ msgstr "Se produjo un fallo al arrancar %s\n"
+
+#~ msgid "test transport configuration (involves external server)"
+#~ msgstr "probar configuración de transporte (requiere un servidor externo)"
+
+#, fuzzy
 #~ msgid "Unable to initialize Postgres: %s\n"
 #~ msgstr "No se pudo inicializar Postgres: %s"
 
@@ -11276,9 +11392,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ "Par todavía no ejecutandose, no se puede cambiar la configuración en este "
 #~ "punto."
 
-#~ msgid "Failed to write new configuration to disk."
-#~ msgstr "Se produjo un fallo al guardar la nueva configuración al disco"
-
 #~ msgid "Could not start `%s' process to copy configuration file.\n"
 #~ msgstr ""
 #~ "No se pudo iniciar el proceso «%s» para copiar el fichero de "
@@ -11528,9 +11641,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "# failed connection attempts due to timeout"
 #~ msgstr "# conexiones fallidas debido a expiración de plazo"
 
-#~ msgid "# peers disconnected due to external request"
-#~ msgstr "# pares desconectados debido a petición externa"
-
 #~ msgid "# peers disconnected due to timeout"
 #~ msgstr "# pares desconectados debido a expiración de plazo"
 
@@ -11549,9 +11659,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "Found valid IPv4 NAT address (creating session)!\n"
 #~ msgstr "¡Encontrada una dirección NAT IPv4 válida (creando sesión)!\n"
 
-#~ msgid "Failed to find option %s in section %s!\n"
-#~ msgstr "¡Se produjo un fallo al buscar la opción %s en la sección %s!\n"
-
 #~ msgid "# wlan session timeouts"
 #~ msgstr "# expiraciones de plazo en sesiones wlan"
 
@@ -11837,10 +11944,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgstr "# bytes recibidos por TCP"
 
 #, fuzzy
-#~ msgid "Misconfigured address to bind to in configuration!\n"
-#~ msgstr "¡Ninguna aplicación definida en la configuración!\n"
-
-#, fuzzy
 #~ msgid "Failed to load transport plugin for http\n"
 #~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
@@ -12042,10 +12145,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ "máxima velocidad de tu conexión a Internet."
 
 #, fuzzy
-#~ msgid "Quota configuration"
-#~ msgstr "Configuración de GNUnet"
-
-#, fuzzy
 #~ msgid ""
 #~ "The GNUnet datastore contains all content that GNUnet needs to store "
 #~ "(indexed, inserted and migrated content)."
@@ -12867,10 +12966,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ "El contenido descifrado no encuentra una clave. Esto puede ser un bug o "
 #~ "un fichero introducido maliciosamente. Descarga abortada.\n"
 
-#, fuzzy
-#~ msgid "Application aborted."
-#~ msgstr "_Opciones"
-
 #~ msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 #~ msgstr ""
 #~ "Fichero del estado de FSUI '%s' tiene un error de sintáxis en la "
@@ -13527,10 +13622,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgstr "Grupo:"
 
 #, fuzzy
-#~ msgid "Save configuration"
-#~ msgstr "Configuración de GNUnet"
-
-#, fuzzy
 #~ msgid "Show copyright information for gnunet-setup."
 #~ msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
@@ -14183,11 +14274,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "Template for gnunet-clients."
 #~ msgstr "Plantilla para clientes-de-gnunet."
 
-#~ msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
-#~ msgstr ""
-#~ "Puerto inválido \"%s\" en la especificación de la lista local, probando "
-#~ "el puerto %d.\n"
-
 #~ msgid "Parsing HTTP response for URL `%s' failed.\n"
 #~ msgstr "Analizando HTTP de la URL '%s' se produjo un fallo.\n"
 
diff --git a/po/fr.po b/po/fr.po
index a4df4ae7d..e287041e9 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-11-27 09:18+0100\n"
+"POT-Creation-Date: 2017-01-12 17:19+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"
@@ -244,21 +244,20 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:652
 #: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637
-#: src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:3309 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:637 src/util/service_new.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:682
+#: src/util/client.c:464 src/util/service.c:621 src/util/service_new.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:687
+#: src/util/client.c:469 src/util/service.c:625 src/util/service_new.c:687
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
@@ -278,7 +277,7 @@ msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2617
+#: src/transport/plugin_transport_http_server.c:2620
 #: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
 #: src/util/service_new.c:782
 #, c-format
@@ -286,7 +285,7 @@ msgid "Failed to resolve `%s': %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
 #: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2635
+#: src/transport/plugin_transport_http_server.c:2638
 #: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
 #: src/util/service_new.c:802
 #, c-format
@@ -380,13 +379,11 @@ msgid ""
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 msgid "solver to use"
 msgstr "solveur utilisé"
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
+#: src/ats/gnunet-ats-solver-eval.c:3296 src/ats-tests/gnunet-solver-eval.c:938
 #: src/ats-tests/gnunet-solver-eval.c:941
 msgid "experiment to use"
 msgstr ""
@@ -491,12 +488,12 @@ msgstr ""
 msgid "Invalid %s configuration %f\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/ats-tests/ats-testing.c:441
+#: src/ats-tests/ats-testing.c:422
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:448
+#: src/ats-tests/ats-testing.c:429
 #, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr ""
@@ -553,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:1476
+#: src/transport/gnunet-transport.c:1255
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
@@ -633,6 +630,37 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr ""
 
+#: src/auction/gnunet-auction-create.c:69
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:72
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:75
+msgid "max duration per round"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:78
+msgid "duration until auction starts"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:81
+msgid "number of items to sell, 0 for first price auction"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:84
+msgid "public auction outcome"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:94 src/auction/gnunet-auction-info.c:76
+#: src/auction/gnunet-auction-join.c:76
+#: src/conversation/gnunet-conversation-test.c:243
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+msgid "help text"
+msgstr ""
+
 #: src/cadet/gnunet-cadet.c:511
 #, c-format
 msgid "Invalid target `%s'\n"
@@ -684,7 +712,7 @@ msgstr ""
 msgid "provide information about all tunnels"
 msgstr ""
 
-#: src/cadet/gnunet-service-cadet_peer.c:681
+#: src/cadet/gnunet-service-cadet_peer.c:686
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1002,11 +1030,6 @@ msgid ""
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
-msgid "help text"
-msgstr ""
-
 #: src/conversation/gnunet_gst.c:630
 #: src/conversation/gnunet-helper-audio-playback-gst.c:357
 #, c-format
@@ -1199,7 +1222,7 @@ msgstr ""
 msgid "Failed to connect to CORE service!\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1677
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -1446,7 +1469,7 @@ msgstr ""
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
+#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:700
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1833,8 +1856,7 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
@@ -2010,8 +2032,7 @@ msgstr ""
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
@@ -2076,35 +2097,35 @@ msgstr ""
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1854
+#: src/dht/gnunet-service-dht_neighbours.c:1858
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1862
+#: src/dht/gnunet-service-dht_neighbours.c:1866
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2018
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2026
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2097
+#: src/dht/gnunet-service-dht_neighbours.c:2101
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2120
+#: src/dht/gnunet-service-dht_neighbours.c:2124
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2222
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2230
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -2112,35 +2133,35 @@ msgstr ""
 msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:227
+#: src/dht/gnunet-service-dht_routing.c:229
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:233
+#: src/dht/gnunet-service-dht_routing.c:235
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:239
+#: src/dht/gnunet-service-dht_routing.c:241
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:251
+#: src/dht/gnunet-service-dht_routing.c:253
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:327
+#: src/dht/gnunet-service-dht_routing.c:329
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:409
+#: src/dht/gnunet-service-dht_routing.c:411
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:427
+#: src/dht/gnunet-service-dht_routing.c:429
 msgid "# DHT requests combined"
 msgstr ""
 
@@ -2267,16 +2288,16 @@ msgstr ""
 "\n"
 "SUPU %s, %s, %d,my_identity = %s"
 
-#: src/dht/plugin_block_dht.c:142
+#: src/dht/plugin_block_dht.c:144
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:149
+#: src/dht/plugin_block_dht.c:151
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:159
+#: src/dht/plugin_block_dht.c:161
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -3350,7 +3371,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:1517 src/transport/gnunet-transport.c:1542
+#: src/transport/gnunet-transport.c:1296 src/transport/gnunet-transport.c:1321
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3836,39 +3857,39 @@ msgstr ""
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:709
+#: src/gns/gnunet-dns2gns.c:712
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:737
+#: src/gns/gnunet-dns2gns.c:740
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:761
 msgid "No valid GNS zone specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:782
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:788
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:788
+#: src/gns/gnunet-dns2gns.c:791
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:794
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:804
+#: src/gns/gnunet-dns2gns.c:807
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4027,80 +4048,82 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2167
+#: src/gns/gnunet-gns-proxy.c:2168
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2197
+#: src/gns/gnunet-gns-proxy.c:2198
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2370
+#: src/gns/gnunet-gns-proxy.c:2371
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2389 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2709
+#: src/gns/gnunet-gns-proxy.c:2710
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2738
+#: src/gns/gnunet-gns-proxy.c:2739
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
+#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2836
+#: src/gns/gnunet-gns-proxy.c:2837
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3171
+#: src/gns/gnunet-gns-proxy.c:3172
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
-#: src/gns/gnunet-service-gns.c:1149
+#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
+#: src/gns/gnunet-service-gns.c:548
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3273
+#: src/gns/gnunet-gns-proxy.c:3274
 #, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3313
+#: src/gns/gnunet-gns-proxy.c:3314
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3316
+#: src/gns/gnunet-gns-proxy.c:3317
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3335
+#: src/gns/gnunet-gns-proxy.c:3336
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1187
+#: src/gns/gnunet-service-gns.c:585
+#: src/zonemaster/gnunet-service-zonemaster.c:705
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1195
+#: src/gns/gnunet-service-gns.c:593
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1228
+#: src/gns/gnunet-service-gns.c:612
+#: src/zonemaster/gnunet-service-zonemaster.c:740
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
@@ -4918,8 +4941,7 @@ msgstr "supprimer"
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:979
-#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI invalide « %s »\n"
@@ -5071,211 +5093,282 @@ msgstr ""
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:159
-msgid "GNUnet NAT traversal autoconfigure daemon"
+#: src/nat-auto/gnunet-nat-auto.c:192
+msgid "Suggested configuration changes:\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:220
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:227
+#, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:345
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:348
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+msgid "use TCP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+msgid "use UDP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:357
+msgid "write configuration file (for autoconfiguration)"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:369
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:403
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681
+#: src/nat-auto/nat_auto_api_test.c:405
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat-auto/gnunet-nat-auto_legacy.c:518
+#: src/nat-auto/nat_auto_api_test.c:520
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:568
+#: src/nat-auto/nat_auto_api_test.c:569
+msgid "NAT test failed to start NAT library\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-server.c:336
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:363
+#: src/nat-auto/gnunet-nat-server.c:386
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_api.c:880 src/nat/nat.c:2010
+#: src/nat-auto/gnunet-service-nat-auto.c:342
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590
+#, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725
+msgid "upnpc not found\n"
+msgstr "upnpc introuvable\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/nat_auto_api.c:76
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat_api.c:882 src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
+#: src/nat-auto/nat_auto_api.c:78
+msgid "IPC failure"
 msgstr ""
 
-#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+#: src/nat-auto/nat_auto_api.c:80
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+#: src/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+#: src/nat-auto/nat_auto_api.c:84
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+#: src/nat-auto/nat_auto_api.c:86
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+#: src/nat-auto/nat_auto_api.c:88
 msgid "Failed to run `upnpc` command"
 msgstr ""
 
-#: src/nat/nat_api.c:894 src/nat/nat.c:2024
+#: src/nat-auto/nat_auto_api.c:90
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat_api.c:896 src/nat/nat.c:2026
+#: src/nat-auto/nat_auto_api.c:92
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+#: src/nat-auto/nat_auto_api.c:94
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat_api.c:900 src/nat/nat.c:2030
+#: src/nat-auto/nat_auto_api.c:96
 msgid "Failed to run `external-ip` command"
 msgstr ""
 
-#: src/nat/nat_api.c:902 src/nat/nat.c:2032
+#: src/nat-auto/nat_auto_api.c:98
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat_api.c:904 src/nat/nat.c:2034
+#: src/nat-auto/nat_auto_api.c:100
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+#: src/nat-auto/nat_auto_api.c:102
 msgid "Could not determine interface with internal/local network address"
 msgstr ""
 
-#: src/nat/nat_api.c:908 src/nat/nat.c:2038
+#: src/nat-auto/nat_auto_api.c:104
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat_api.c:910 src/nat/nat.c:2040
+#: src/nat-auto/nat_auto_api.c:106
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+#: src/nat-auto/nat_auto_api.c:108
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+#: src/nat-auto/nat_auto_api.c:110
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+#: src/nat-auto/nat_auto_api.c:112
 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 ""
-
-#: src/nat/nat_auto.c:386
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:405
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:437
-#, c-format
-msgid "Detected external IP `%s'\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:572
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
-msgstr ""
+#: src/nat-auto/nat_auto_api_test.c:477
+#, fuzzy, c-format
+msgid "Failed to find valid PORT in section `%s'\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/nat/nat_auto.c:590
-#, c-format
-msgid "Detected internal network address `%s'.\n"
+#: src/nat/gnunet-nat.c:424
+msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/nat/gnunet-nat.c:427
+msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/nat_auto.c:724
-msgid "upnpc found, enabling its use\n"
+#: src/nat/gnunet-nat.c:430
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
 msgstr ""
 
-#: src/nat/nat_auto.c:725
-msgid "upnpc not found\n"
-msgstr "upnpc introuvable\n"
-
-#: src/nat/nat_auto.c:762
-msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+#: src/nat/gnunet-nat.c:433
+msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/nat_auto.c:774 src/nat/nat_auto.c:834
-msgid "test_icmp_server not possible, as we are not behind NAT\n"
+#: src/nat/gnunet-nat.c:442
+msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/nat/gnunet-nat.c:454
+msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:823
-msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+#: src/nat/gnunet-service-nat.c:1313
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat.c:1019
+#: src/nat/gnunet-service-nat.c:1323
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat.c:1070
+#: src/nat/gnunet-service-nat.c:1339
 #, c-format
-msgid "Failed to start %s\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/nat/nat.c:1327
-msgid "Error while running upnp client:\n"
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/nat.c:1402
+#: src/nat/gnunet-service-nat.c:1350
 #, c-format
-msgid "Failed to run upnp client for port %u\n"
+msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/nat.c:1546
-msgid "malformed"
-msgstr "malformé"
+#: src/nat/gnunet-service-nat.c:1803
+msgid "Connection reversal request failed\n"
+msgstr ""
 
-#: src/nat/nat.c:1600
+#: src/nat/gnunet-service-nat.c:1876
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
-"disabling UPnP \n"
+"disabling UPnP\n"
 msgstr ""
 
-#: src/nat/nat.c:1726 src/nat/nat.c:1739
+#: src/nat/gnunet-service-nat_helper.c:186
 #, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
-msgstr ""
-
-#: src/nat/nat.c:1903
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:1919
+#: src/nat/gnunet-service-nat_helper.c:260
 #, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
-msgstr ""
+msgid "Failed to start %s\n"
+msgstr "Échec du démarrage de %s\n"
 
-#: src/nat/nat_mini.c:205
+#: src/nat/gnunet-service-nat_mini.c:196
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:611
+#: src/nat/gnunet-service-nat_mini.c:654
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:518
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
-msgstr ""
-
-#: src/nat/nat_test.c:568
-msgid "NAT test failed to start NAT library\n"
-msgstr ""
-
 #: src/nse/gnunet-nse.c:122
 msgid "Show network size estimates from NSE service."
 msgstr ""
@@ -6974,171 +7067,148 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:486
+#: src/transport/gnunet-transport.c:418
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:496
+#: src/transport/gnunet-transport.c:428
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:540
+#: src/transport/gnunet-transport.c:472
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:553
+#: src/transport/gnunet-transport.c:485
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:565
+#: src/transport/gnunet-transport.c:499
 msgid "Failed to list connections, timeout occured\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:588
-#, c-format
-msgid "NAT plugin `%s' reports: %s\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:675
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
-
-#: 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:714
-#, fuzzy
-msgid "Failed to start resolver!\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/transport/gnunet-transport.c:750
+#: src/transport/gnunet-transport.c:532
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:784
+#: src/transport/gnunet-transport.c:566
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:815
+#: src/transport/gnunet-transport.c:597
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:839 src/transport/gnunet-transport.c:868
+#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:841
+#: src/transport/gnunet-transport.c:623
 msgid "Connected to"
 msgstr "Connecté à"
 
-#: src/transport/gnunet-transport.c:870
+#: src/transport/gnunet-transport.c:652
 msgid "Disconnected from"
 msgstr "Déconnecté de"
 
-#: src/transport/gnunet-transport.c:905
+#: src/transport/gnunet-transport.c:687
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "%s message(s) reçu(s)\n"
 
-#: src/transport/gnunet-transport.c:942
+#: src/transport/gnunet-transport.c:724
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:954
+#: src/transport/gnunet-transport.c:736
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1366
+#: src/transport/gnunet-transport.c:1150
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1488
+#: src/transport/gnunet-transport.c:1267
 #, 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:1501
+#: src/transport/gnunet-transport.c:1280
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1529
+#: src/transport/gnunet-transport.c:1308
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1535
+#: src/transport/gnunet-transport.c:1314
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
-#: src/transport/gnunet-transport.c:1641
+#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
+#: src/transport/gnunet-transport.c:1420
 msgid "Failed to connect to transport service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:1374
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1665
+#: src/transport/gnunet-transport.c:1444
 msgid "print information for all peers (instead of only connected peers)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1668
+#: src/transport/gnunet-transport.c:1447
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1671
+#: src/transport/gnunet-transport.c:1450
 msgid "disconnect from a peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1674
+#: src/transport/gnunet-transport.c:1453
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1680
+#: src/transport/gnunet-transport.c:1459
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1683
+#: src/transport/gnunet-transport.c:1462
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1686
+#: src/transport/gnunet-transport.c:1465
 #: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1689
+#: src/transport/gnunet-transport.c:1468
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1692
+#: src/transport/gnunet-transport.c:1471
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1695
-msgid "test transport configuration (involves external server)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1706
+#: src/transport/gnunet-transport.c:1482
 #: src/transport/gnunet-transport-profiler.c:642
 msgid "Direct access to transport service."
 msgstr ""
@@ -7171,9 +7241,9 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
-#: src/transport/plugin_transport_http_server.c:3457
-#: src/transport/plugin_transport_tcp.c:3365
-#: src/transport/plugin_transport_tcp.c:3372
+#: src/transport/plugin_transport_http_server.c:3462
+#: src/transport/plugin_transport_tcp.c:3375
+#: src/transport/plugin_transport_tcp.c:3382
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7183,13 +7253,13 @@ msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_client.c:2167
-#: src/transport/plugin_transport_http_server.c:3172
+#: src/transport/plugin_transport_http_server.c:3177
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_client.c:2184
-#: src/transport/plugin_transport_http_server.c:3242
+#: src/transport/plugin_transport_http_server.c:3247
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
@@ -7232,69 +7302,69 @@ msgstr ""
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2583
+#: src/transport/plugin_transport_http_server.c:2586
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2748
+#: src/transport/plugin_transport_http_server.c:2751
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2832
-#: src/transport/plugin_transport_udp.c:3600
+#: src/transport/plugin_transport_http_server.c:2837
+#: src/transport/plugin_transport_udp.c:3623
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2938
+#: src/transport/plugin_transport_http_server.c:2943
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "Prise en charge d’IPv4 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2953
+#: src/transport/plugin_transport_http_server.c:2958
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "Prise en charge d’IPv6 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2959
+#: src/transport/plugin_transport_http_server.c:2964
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2970
+#: src/transport/plugin_transport_http_server.c:2975
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2976
+#: src/transport/plugin_transport_http_server.c:2981
 #, c-format
 msgid "Using port %u\n"
 msgstr "Utilisation du port %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2995
+#: src/transport/plugin_transport_http_server.c:3000
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3030
+#: src/transport/plugin_transport_http_server.c:3035
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3105
+#: src/transport/plugin_transport_http_server.c:3110
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3126
+#: src/transport/plugin_transport_http_server.c:3131
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3143
+#: src/transport/plugin_transport_http_server.c:3148
 #, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3469
+#: src/transport/plugin_transport_http_server.c:3474
 msgid "Unable to compile URL regex\n"
 msgstr ""
 
@@ -7340,157 +7410,157 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1051
-#: src/transport/plugin_transport_tcp.c:2362
+#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:2379
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1234
-#: src/transport/plugin_transport_tcp.c:1458
-#: src/transport/plugin_transport_tcp.c:2633
-#: src/transport/plugin_transport_tcp.c:3490
+#: src/transport/plugin_transport_tcp.c:1243
+#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:2643
+#: src/transport/plugin_transport_tcp.c:3498
 msgid "# TCP sessions active"
 msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_tcp.c:1276
-#: src/transport/plugin_transport_tcp.c:1440
-#: src/transport/plugin_transport_tcp.c:1564
-#: src/transport/plugin_transport_tcp.c:1637
-#: src/transport/plugin_transport_tcp.c:1737
-#: src/transport/plugin_transport_tcp.c:1762
+#: src/transport/plugin_transport_tcp.c:1285
+#: src/transport/plugin_transport_tcp.c:1449
+#: src/transport/plugin_transport_tcp.c:1573
+#: src/transport/plugin_transport_tcp.c:1646
+#: src/transport/plugin_transport_tcp.c:1746
+#: src/transport/plugin_transport_tcp.c:1771
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1279
+#: src/transport/plugin_transport_tcp.c:1288
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1576
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1641
+#: src/transport/plugin_transport_tcp.c:1650
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2041
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2200
+#: src/transport/plugin_transport_tcp.c:2217
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2692
+#: src/transport/plugin_transport_tcp.c:2702
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2883
+#: src/transport/plugin_transport_tcp.c:2893
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2934
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:3002
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_tcp.c:2938
+#: src/transport/plugin_transport_tcp.c:2948
 msgid "# TCP server connect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:2954
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2946
+#: src/transport/plugin_transport_tcp.c:2956
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2986
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3006
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3315
+#: src/transport/plugin_transport_tcp.c:3325
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3478
+#: src/transport/plugin_transport_tcp.c:3486
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3482
+#: src/transport/plugin_transport_tcp.c:3490
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:3494
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:170
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:546
+#: src/transport/plugin_transport_udp_broadcasting.c:545
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:567
+#: src/transport/plugin_transport_udp_broadcasting.c:566
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3344
+#: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3358
+#: src/transport/plugin_transport_udp.c:3381
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3676
-#: src/transport/plugin_transport_udp.c:3775
+#: src/transport/plugin_transport_udp.c:3699
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/transport/plugin_transport_udp.c:3694
+#: src/transport/plugin_transport_udp.c:3717
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3785
+#: src/transport/plugin_transport_udp.c:3808
 msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3857
-#: src/transport/plugin_transport_udp.c:3871
+#: src/transport/plugin_transport_udp.c:3879
+#: src/transport/plugin_transport_udp.c:3893
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3903
+#: src/transport/plugin_transport_udp.c:3925
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:3930
+#: src/transport/plugin_transport_udp.c:3952
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:3996
+#: src/transport/plugin_transport_udp.c:4018
 msgid "Failed to create UDP network sockets\n"
 msgstr ""
 
@@ -7600,7 +7670,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client_new.c:864
+#: src/util/client.c:864
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8360,42 +8430,42 @@ msgstr ""
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1475 src/util/strings.c:1491
+#: src/util/strings.c:1541 src/util/strings.c:1557
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1500
+#: src/util/strings.c:1566
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
-#: src/util/strings.c:1683
+#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
+#: src/util/strings.c:1749
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1640
+#: src/util/strings.c:1706
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1692
+#: src/util/strings.c:1758
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/strings.c:1744
+#: src/util/strings.c:1810
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1794
+#: src/util/strings.c:1860
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1825
+#: src/util/strings.c:1891
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
@@ -8569,21 +8639,28 @@ msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
 
 #: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:660
+#: src/include/gnunet_common.h:662 src/include/gnunet_common.h:670
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:672
+#: src/include/gnunet_common.h:682
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
+#: src/include/gnunet_common.h:709 src/include/gnunet_common.h:718
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
+#~ msgid "malformed"
+#~ msgstr "malformé"
+
+#, fuzzy
+#~ msgid "Failed to start resolver!\n"
+#~ msgstr "Échec du démarrage de %s\n"
+
 #, fuzzy
 #~ msgid "Failed to start NAT test for plugin `%s'\n"
 #~ msgstr "Résolution de « %s » échouée\n"
diff --git a/po/sv.po b/po/sv.po
index 5b3effdae..6cf121b0e 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-11-27 09:18+0100\n"
+"POT-Creation-Date: 2017-01-12 17:19+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"
@@ -251,21 +251,20 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:652
 #: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637
-#: src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:3309 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:637 src/util/service_new.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:682
+#: src/util/client.c:464 src/util/service.c:621 src/util/service_new.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:687
+#: src/util/client.c:469 src/util/service.c:625 src/util/service_new.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
@@ -285,7 +284,7 @@ msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2617
+#: src/transport/plugin_transport_http_server.c:2620
 #: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
 #: src/util/service_new.c:782
 #, fuzzy, c-format
@@ -293,7 +292,7 @@ msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
 #: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2635
+#: src/transport/plugin_transport_http_server.c:2638
 #: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
 #: src/util/service_new.c:802
 #, fuzzy, c-format
@@ -388,13 +387,11 @@ msgid ""
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
+#: src/ats/gnunet-ats-solver-eval.c:3296 src/ats-tests/gnunet-solver-eval.c:938
 #: src/ats-tests/gnunet-solver-eval.c:941
 msgid "experiment to use"
 msgstr ""
@@ -500,12 +497,12 @@ msgstr ""
 msgid "Invalid %s configuration %f\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/ats-tests/ats-testing.c:441
+#: src/ats-tests/ats-testing.c:422
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:448
+#: src/ats-tests/ats-testing.c:429
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -562,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:1476
+#: src/transport/gnunet-transport.c:1255
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -648,6 +645,38 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
+#: src/auction/gnunet-auction-create.c:69
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:72
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:75
+msgid "max duration per round"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:78
+msgid "duration until auction starts"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:81
+msgid "number of items to sell, 0 for first price auction"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:84
+msgid "public auction outcome"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:94 src/auction/gnunet-auction-info.c:76
+#: src/auction/gnunet-auction-join.c:76
+#: src/conversation/gnunet-conversation-test.c:243
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+#, fuzzy
+msgid "help text"
+msgstr "hjälptext för -t"
+
 #: src/cadet/gnunet-cadet.c:511
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
@@ -704,7 +733,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:681
+#: src/cadet/gnunet-service-cadet_peer.c:686
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1029,12 +1058,6 @@ msgid ""
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
-#, fuzzy
-msgid "help text"
-msgstr "hjälptext för -t"
-
 #: src/conversation/gnunet_gst.c:630
 #: src/conversation/gnunet-helper-audio-playback-gst.c:357
 #, c-format
@@ -1241,7 +1264,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:1677
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -1523,7 +1546,7 @@ msgstr ""
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
+#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:700
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1923,8 +1946,7 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
@@ -2109,8 +2131,7 @@ msgstr ""
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
@@ -2186,40 +2207,40 @@ msgstr "# byte mottogs via TCP"
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1854
+#: src/dht/gnunet-service-dht_neighbours.c:1858
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1862
+#: src/dht/gnunet-service-dht_neighbours.c:1866
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2018
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2026
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2097
+#: src/dht/gnunet-service-dht_neighbours.c:2101
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2120
+#: src/dht/gnunet-service-dht_neighbours.c:2124
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2222
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2230
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2229,35 +2250,35 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# Network size estimates received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:227
+#: src/dht/gnunet-service-dht_routing.c:229
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:233
+#: src/dht/gnunet-service-dht_routing.c:235
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:239
+#: src/dht/gnunet-service-dht_routing.c:241
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:251
+#: src/dht/gnunet-service-dht_routing.c:253
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:327
+#: src/dht/gnunet-service-dht_routing.c:329
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:409
+#: src/dht/gnunet-service-dht_routing.c:411
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:427
+#: src/dht/gnunet-service-dht_routing.c:429
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
@@ -2371,16 +2392,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:142
+#: src/dht/plugin_block_dht.c:144
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/dht/plugin_block_dht.c:149
+#: src/dht/plugin_block_dht.c:151
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:159
+#: src/dht/plugin_block_dht.c:161
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -3515,7 +3536,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:1517 src/transport/gnunet-transport.c:1542
+#: src/transport/gnunet-transport.c:1296 src/transport/gnunet-transport.c:1321
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -4034,41 +4055,41 @@ msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:709
+#: src/gns/gnunet-dns2gns.c:712
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:737
+#: src/gns/gnunet-dns2gns.c:740
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:761
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:782
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:788
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:788
+#: src/gns/gnunet-dns2gns.c:791
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:794
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:804
+#: src/gns/gnunet-dns2gns.c:807
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4233,83 +4254,85 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2167
+#: src/gns/gnunet-gns-proxy.c:2168
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/gns/gnunet-gns-proxy.c:2197
+#: src/gns/gnunet-gns-proxy.c:2198
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2370
+#: src/gns/gnunet-gns-proxy.c:2371
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2389 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2709
+#: src/gns/gnunet-gns-proxy.c:2710
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2738
+#: src/gns/gnunet-gns-proxy.c:2739
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
+#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2836
+#: src/gns/gnunet-gns-proxy.c:2837
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3171
+#: src/gns/gnunet-gns-proxy.c:3172
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
-#: src/gns/gnunet-service-gns.c:1149
+#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
+#: src/gns/gnunet-service-gns.c:548
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3273
+#: src/gns/gnunet-gns-proxy.c:3274
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3313
+#: src/gns/gnunet-gns-proxy.c:3314
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3316
+#: src/gns/gnunet-gns-proxy.c:3317
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3335
+#: src/gns/gnunet-gns-proxy.c:3336
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1187
+#: src/gns/gnunet-service-gns.c:585
+#: src/zonemaster/gnunet-service-zonemaster.c:705
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:1195
+#: src/gns/gnunet-service-gns.c:593
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:1228
+#: src/gns/gnunet-service-gns.c:612
+#: src/zonemaster/gnunet-service-zonemaster.c:740
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -5156,8 +5179,7 @@ msgstr ""
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:979
-#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
@@ -5316,221 +5338,297 @@ msgstr ""
 msgid "Namestore REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/nat/gnunet-nat.c:159
-msgid "GNUnet NAT traversal autoconfigure daemon"
+#: src/nat-auto/gnunet-nat-auto.c:192
+#, fuzzy
+msgid "Suggested configuration changes:\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:220
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/nat-auto/gnunet-nat-auto.c:227
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:345
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "GNUnet-konfiguration"
+
+#: src/nat-auto/gnunet-nat-auto.c:348
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+msgid "use TCP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+msgid "use UDP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:357
+#, fuzzy
+msgid "write configuration file (for autoconfiguration)"
+msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:369
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr "GNUnet-konfiguration"
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:403
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681
+#: src/nat-auto/nat_auto_api_test.c:405
+#, fuzzy
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:518
+#: src/nat-auto/nat_auto_api_test.c:520
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat-auto/gnunet-nat-auto_legacy.c:568
+#: src/nat-auto/nat_auto_api_test.c:569
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/nat-auto/gnunet-nat-server.c:336
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:363
+#: src/nat-auto/gnunet-nat-server.c:386
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_api.c:880 src/nat/nat.c:2010
+#: src/nat-auto/gnunet-service-nat-auto.c:342
+#, fuzzy
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+#, fuzzy
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#, fuzzy, c-format
+msgid "Detected external IP `%s'\n"
+msgstr "Mottog ogiltig RPC \"%s\".\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590
+#, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725
+#, fuzzy
+msgid "upnpc not found\n"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/nat_auto_api.c:76
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat_api.c:882 src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
+#: src/nat-auto/nat_auto_api.c:78
+msgid "IPC failure"
 msgstr ""
 
-#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+#: src/nat-auto/nat_auto_api.c:80
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+#: src/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+#: src/nat-auto/nat_auto_api.c:84
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+#: src/nat-auto/nat_auto_api.c:86
 #, fuzzy
 msgid "`upnpc` command not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+#: src/nat-auto/nat_auto_api.c:88
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat_api.c:894 src/nat/nat.c:2024
+#: src/nat-auto/nat_auto_api.c:90
 #, 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
+#: src/nat-auto/nat_auto_api.c:92
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+#: src/nat-auto/nat_auto_api.c:94
 #, fuzzy
 msgid "`external-ip' command not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat_api.c:900 src/nat/nat.c:2030
+#: src/nat-auto/nat_auto_api.c:96
 #, 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
+#: src/nat-auto/nat_auto_api.c:98
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat_api.c:904 src/nat/nat.c:2034
+#: src/nat-auto/nat_auto_api.c:100
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+#: src/nat-auto/nat_auto_api.c:102
 #, 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
+#: src/nat-auto/nat_auto_api.c:104
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat_api.c:910 src/nat/nat.c:2040
+#: src/nat-auto/nat_auto_api.c:106
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+#: src/nat-auto/nat_auto_api.c:108
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+#: src/nat-auto/nat_auto_api.c:110
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+#: src/nat-auto/nat_auto_api.c:112
 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 ""
-
-#: src/nat/nat_auto.c:386
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:405
-#, fuzzy
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/nat/nat_auto.c:437
+#: src/nat-auto/nat_auto_api_test.c:477
 #, fuzzy, c-format
-msgid "Detected external IP `%s'\n"
-msgstr "Mottog ogiltig RPC \"%s\".\n"
+msgid "Failed to find valid PORT in section `%s'\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/nat/nat_auto.c:572
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+#: src/nat/gnunet-nat.c:424
+msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/nat_auto.c:590
-#, c-format
-msgid "Detected internal network address `%s'.\n"
+#: src/nat/gnunet-nat.c:427
+msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
-#, fuzzy
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/nat/nat_auto.c:724
-msgid "upnpc found, enabling its use\n"
+#: src/nat/gnunet-nat.c:430
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
 msgstr ""
 
-#: src/nat/nat_auto.c:725
-#, fuzzy
-msgid "upnpc not found\n"
-msgstr "Kommando \"%s\" hittades inte!\n"
-
-#: src/nat/nat_auto.c:762
-msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+#: src/nat/gnunet-nat.c:433
+msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/nat_auto.c:774 src/nat/nat_auto.c:834
-msgid "test_icmp_server not possible, as we are not behind NAT\n"
+#: src/nat/gnunet-nat.c:442
+msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/nat/gnunet-nat.c:454
+msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:823
-msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+#: src/nat/gnunet-service-nat.c:1313
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat.c:1019
+#: src/nat/gnunet-service-nat.c:1323
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat.c:1070
-#, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/nat/nat.c:1327
-msgid "Error while running upnp client:\n"
+#: src/nat/gnunet-service-nat.c:1339
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/nat.c:1402
-#, fuzzy, c-format
-msgid "Failed to run upnp client for port %u\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-
-#: src/nat/nat.c:1546
-msgid "malformed"
+#: src/nat/gnunet-service-nat.c:1350
+#, c-format
+msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/nat.c:1600
+#: src/nat/gnunet-service-nat.c:1803
+#, fuzzy
+msgid "Connection reversal request failed\n"
+msgstr "Samling stoppad.\n"
+
+#: src/nat/gnunet-service-nat.c:1876
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
-"disabling UPnP \n"
+"disabling UPnP\n"
 msgstr ""
 
-#: src/nat/nat.c:1726 src/nat/nat.c:1739
+#: src/nat/gnunet-service-nat_helper.c:186
 #, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
-msgstr ""
-
-#: src/nat/nat.c:1903
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:1919
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
-msgstr ""
+#: src/nat/gnunet-service-nat_helper.c:260
+#, fuzzy, c-format
+msgid "Failed to start %s\n"
+msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat_mini.c:205
+#: src/nat/gnunet-service-nat_mini.c:196
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:611
+#: src/nat/gnunet-service-nat_mini.c:654
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:518
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
-msgstr ""
-
-#: src/nat/nat_test.c:568
-#, fuzzy
-msgid "NAT test failed to start NAT library\n"
-msgstr "Misslyckades att starta samling.\n"
-
 #: src/nse/gnunet-nse.c:122
 #, fuzzy
 msgid "Show network size estimates from NSE service."
@@ -7330,182 +7428,159 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:486
+#: src/transport/gnunet-transport.c:418
 #, 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:496
+#: src/transport/gnunet-transport.c:428
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:540
+#: src/transport/gnunet-transport.c:472
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:553
+#: src/transport/gnunet-transport.c:485
 #, 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:565
+#: src/transport/gnunet-transport.c:499
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:588
-#, fuzzy, c-format
-msgid "NAT plugin `%s' reports: %s\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/transport/gnunet-transport.c:675
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
-
-#: 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:714
-#, fuzzy
-msgid "Failed to start resolver!\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/transport/gnunet-transport.c:750
+#: src/transport/gnunet-transport.c:532
 #, fuzzy, c-format
 msgid "Transmitting %u bytes\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:784
+#: src/transport/gnunet-transport.c:566
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:815
+#: src/transport/gnunet-transport.c:597
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:839 src/transport/gnunet-transport.c:868
+#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:841
+#: src/transport/gnunet-transport.c:623
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:870
+#: src/transport/gnunet-transport.c:652
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:905
+#: src/transport/gnunet-transport.c:687
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "mottog ogiltigt \"%s\" meddelande\n"
 
-#: src/transport/gnunet-transport.c:942
+#: src/transport/gnunet-transport.c:724
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:954
+#: src/transport/gnunet-transport.c:736
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1366
+#: src/transport/gnunet-transport.c:1150
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1488
+#: src/transport/gnunet-transport.c:1267
 #, 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:1501
+#: src/transport/gnunet-transport.c:1280
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1529
+#: src/transport/gnunet-transport.c:1308
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1535
+#: src/transport/gnunet-transport.c:1314
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
-#: src/transport/gnunet-transport.c:1641
+#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
+#: src/transport/gnunet-transport.c:1420
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:1374
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1665
+#: src/transport/gnunet-transport.c:1444
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1668
+#: src/transport/gnunet-transport.c:1447
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1671
+#: src/transport/gnunet-transport.c:1450
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1674
+#: src/transport/gnunet-transport.c:1453
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1680
+#: src/transport/gnunet-transport.c:1459
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1683
+#: src/transport/gnunet-transport.c:1462
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1686
+#: src/transport/gnunet-transport.c:1465
 #: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1689
+#: src/transport/gnunet-transport.c:1468
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1692
+#: src/transport/gnunet-transport.c:1471
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1695
-msgid "test transport configuration (involves external server)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1706
+#: src/transport/gnunet-transport.c:1482
 #: src/transport/gnunet-transport-profiler.c:642
 #, fuzzy
 msgid "Direct access to transport service."
@@ -7542,9 +7617,9 @@ msgstr "meddelandestorlek"
 
 #: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
-#: src/transport/plugin_transport_http_server.c:3457
-#: src/transport/plugin_transport_tcp.c:3365
-#: src/transport/plugin_transport_tcp.c:3372
+#: src/transport/plugin_transport_http_server.c:3462
+#: src/transport/plugin_transport_tcp.c:3375
+#: src/transport/plugin_transport_tcp.c:3382
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7554,13 +7629,13 @@ msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_client.c:2167
-#: src/transport/plugin_transport_http_server.c:3172
+#: src/transport/plugin_transport_http_server.c:3177
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
 #: src/transport/plugin_transport_http_client.c:2184
-#: src/transport/plugin_transport_http_server.c:3242
+#: src/transport/plugin_transport_http_server.c:3247
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
@@ -7604,75 +7679,75 @@ msgstr ""
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2583
+#: src/transport/plugin_transport_http_server.c:2586
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/transport/plugin_transport_http_server.c:2748
+#: src/transport/plugin_transport_http_server.c:2751
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2832
-#: src/transport/plugin_transport_udp.c:3600
+#: src/transport/plugin_transport_http_server.c:2837
+#: src/transport/plugin_transport_udp.c:3623
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2938
+#: src/transport/plugin_transport_http_server.c:2943
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2953
+#: src/transport/plugin_transport_http_server.c:2958
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2959
+#: src/transport/plugin_transport_http_server.c:2964
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2970
+#: src/transport/plugin_transport_http_server.c:2975
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2976
+#: src/transport/plugin_transport_http_server.c:2981
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2995
+#: src/transport/plugin_transport_http_server.c:3000
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3030
+#: src/transport/plugin_transport_http_server.c:3035
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3105
+#: src/transport/plugin_transport_http_server.c:3110
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:3126
+#: src/transport/plugin_transport_http_server.c:3131
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/plugin_transport_http_server.c:3143
+#: src/transport/plugin_transport_http_server.c:3148
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/transport/plugin_transport_http_server.c:3469
+#: src/transport/plugin_transport_http_server.c:3474
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -7725,167 +7800,167 @@ msgstr "# byte skickades via TCP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1051
-#: src/transport/plugin_transport_tcp.c:2362
+#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:2379
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1234
-#: src/transport/plugin_transport_tcp.c:1458
-#: src/transport/plugin_transport_tcp.c:2633
-#: src/transport/plugin_transport_tcp.c:3490
+#: src/transport/plugin_transport_tcp.c:1243
+#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:2643
+#: src/transport/plugin_transport_tcp.c:3498
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:1276
-#: src/transport/plugin_transport_tcp.c:1440
-#: src/transport/plugin_transport_tcp.c:1564
-#: src/transport/plugin_transport_tcp.c:1637
-#: src/transport/plugin_transport_tcp.c:1737
-#: src/transport/plugin_transport_tcp.c:1762
+#: src/transport/plugin_transport_tcp.c:1285
+#: src/transport/plugin_transport_tcp.c:1449
+#: src/transport/plugin_transport_tcp.c:1573
+#: src/transport/plugin_transport_tcp.c:1646
+#: src/transport/plugin_transport_tcp.c:1746
+#: src/transport/plugin_transport_tcp.c:1771
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:1279
+#: src/transport/plugin_transport_tcp.c:1288
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1576
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1641
+#: src/transport/plugin_transport_tcp.c:1650
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2041
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2200
+#: src/transport/plugin_transport_tcp.c:2217
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2692
+#: src/transport/plugin_transport_tcp.c:2702
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2883
+#: src/transport/plugin_transport_tcp.c:2893
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2934
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:3002
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "Nätverksanslutning"
 
-#: src/transport/plugin_transport_tcp.c:2938
+#: src/transport/plugin_transport_tcp.c:2948
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# av anslutna parter"
 
-#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:2954
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2946
+#: src/transport/plugin_transport_tcp.c:2956
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2986
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3006
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3315
+#: src/transport/plugin_transport_tcp.c:3325
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:3478
+#: src/transport/plugin_transport_tcp.c:3486
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3482
+#: src/transport/plugin_transport_tcp.c:3490
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:3494
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:170
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 #, fuzzy
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:546
+#: src/transport/plugin_transport_udp_broadcasting.c:545
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:567
+#: src/transport/plugin_transport_udp_broadcasting.c:566
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3344
+#: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3358
+#: src/transport/plugin_transport_udp.c:3381
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3676
-#: src/transport/plugin_transport_udp.c:3775
+#: src/transport/plugin_transport_udp.c:3699
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3694
+#: src/transport/plugin_transport_udp.c:3717
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3785
+#: src/transport/plugin_transport_udp.c:3808
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3857
-#: src/transport/plugin_transport_udp.c:3871
+#: src/transport/plugin_transport_udp.c:3879
+#: src/transport/plugin_transport_udp.c:3893
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3903
+#: src/transport/plugin_transport_udp.c:3925
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/transport/plugin_transport_udp.c:3930
+#: src/transport/plugin_transport_udp.c:3952
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/transport/plugin_transport_udp.c:3996
+#: src/transport/plugin_transport_udp.c:4018
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
@@ -8007,7 +8082,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client_new.c:864
+#: src/util/client.c:864
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8782,42 +8857,42 @@ msgstr ""
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/strings.c:1475 src/util/strings.c:1491
+#: src/util/strings.c:1541 src/util/strings.c:1557
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1500
+#: src/util/strings.c:1566
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
-#: src/util/strings.c:1683
+#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
+#: src/util/strings.c:1749
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1640
+#: src/util/strings.c:1706
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/util/strings.c:1692
+#: src/util/strings.c:1758
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1744
+#: src/util/strings.c:1810
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/strings.c:1794
+#: src/util/strings.c:1860
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/strings.c:1825
+#: src/util/strings.c:1891
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
@@ -9006,22 +9081,34 @@ msgid "Setup tunnels via VPN."
 msgstr ""
 
 #: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:660
+#: src/include/gnunet_common.h:662 src/include/gnunet_common.h:670
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:672
+#: src/include/gnunet_common.h:682
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
+#: src/include/gnunet_common.h:709 src/include/gnunet_common.h:718
 #, c-format
 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 "Failed to run upnp client for port %u\n"
+#~ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#, fuzzy
+#~ msgid "NAT plugin `%s' reports: %s\n"
+#~ msgstr "Testar transport(er) %s\n"
+
+#, fuzzy
+#~ msgid "Failed to start resolver!\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
 #~ msgid "Unable to initialize Postgres: %s\n"
 #~ msgstr "Kunde inte initiera SQLite.\n"
 
@@ -10251,10 +10338,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Startade samling \"%s\".\n"
 
 #, fuzzy
-#~ msgid "Failed to write new configuration to disk."
-#~ msgstr "Kunde inte spara konfiguration!"
-
-#, fuzzy
 #~ msgid "Could not start `%s' process to copy configuration file.\n"
 #~ msgstr "Kunde inte skapa värdnyckel!\n"
 
@@ -10279,10 +10362,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
 #, fuzzy
-#~ msgid "Failed to find option %s in section %s!\n"
-#~ msgstr "Misslyckades att binda till UDP-port %d.\n"
-
-#, fuzzy
 #~ msgid "Invalid configuration option `%s' in section `%s'\n"
 #~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
@@ -10462,10 +10541,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Kunde inte slå upp \"%s\": %s\n"
 
 #, fuzzy
-#~ msgid "Misconfigured address to bind to in configuration!\n"
-#~ msgstr "Inga applikationer definierade i konfiguration!\n"
-
-#, fuzzy
 #~ msgid "Failed to load transport plugin for http\n"
 #~ msgstr "Kunde inte slå upp \"%s\": %s\n"
 
@@ -10575,10 +10650,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Hur mycket CPU (i %) får användas?"
 
 #, fuzzy
-#~ msgid "Quota configuration"
-#~ msgstr "GNUnet-konfiguration"
-
-#, fuzzy
 #~ msgid "Daemon configuration: user account"
 #~ msgstr "Kunde inte skapa användarkonto:"
 
@@ -10586,10 +10657,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Save configuration?"
 #~ msgstr "GNUnet-konfiguration"
 
-#, fuzzy
-#~ msgid "GNUnet Configuration"
-#~ msgstr "GNUnet-konfiguration"
-
 #~ msgid "Back"
 #~ msgstr "Tillbaka"
 
@@ -10618,10 +10685,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Fel: kan inte ta bort tjänst: %s\n"
 
 #, fuzzy
-#~ msgid "Configuration changed. Save?"
-#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#, fuzzy
 #~ msgid "Error saving configuration."
 #~ msgstr "Kunde inte spara konfiguration!"
 
diff --git a/po/vi.po b/po/vi.po
index 7e9b43b60..36ba909b4 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-11-27 09:18+0100\n"
+"POT-Creation-Date: 2017-01-12 17:19+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"
@@ -257,21 +257,20 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:652
 #: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637
-#: src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:3309 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:637 src/util/service_new.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:682
+#: src/util/client.c:464 src/util/service.c:621 src/util/service_new.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:687
+#: src/util/client.c:469 src/util/service.c:625 src/util/service_new.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
@@ -291,7 +290,7 @@ msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2617
+#: src/transport/plugin_transport_http_server.c:2620
 #: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
 #: src/util/service_new.c:782
 #, fuzzy, c-format
@@ -299,7 +298,7 @@ msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
 #: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2635
+#: src/transport/plugin_transport_http_server.c:2638
 #: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
 #: src/util/service_new.c:802
 #, fuzzy, c-format
@@ -394,13 +393,11 @@ msgid ""
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
+#: src/ats/gnunet-ats-solver-eval.c:3296 src/ats-tests/gnunet-solver-eval.c:938
 #: src/ats-tests/gnunet-solver-eval.c:941
 msgid "experiment to use"
 msgstr ""
@@ -506,12 +503,12 @@ msgstr ""
 msgid "Invalid %s configuration %f\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/ats-tests/ats-testing.c:441
+#: src/ats-tests/ats-testing.c:422
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:448
+#: src/ats-tests/ats-testing.c:429
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -569,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:1476
+#: src/transport/gnunet-transport.c:1255
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -656,6 +653,38 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
+#: src/auction/gnunet-auction-create.c:69
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:72
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:75
+msgid "max duration per round"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:78
+msgid "duration until auction starts"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:81
+msgid "number of items to sell, 0 for first price auction"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:84
+#, fuzzy
+msgid "public auction outcome"
+msgstr "Ứng dụng bị hủy bỏ."
+
+#: src/auction/gnunet-auction-create.c:94 src/auction/gnunet-auction-info.c:76
+#: src/auction/gnunet-auction-join.c:76
+#: src/conversation/gnunet-conversation-test.c:243
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+msgid "help text"
+msgstr ""
+
 #: src/cadet/gnunet-cadet.c:511
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
@@ -712,7 +741,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:681
+#: src/cadet/gnunet-service-cadet_peer.c:686
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1037,11 +1066,6 @@ msgid ""
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
-msgid "help text"
-msgstr ""
-
 #: src/conversation/gnunet_gst.c:630
 #: src/conversation/gnunet-helper-audio-playback-gst.c:357
 #, c-format
@@ -1246,7 +1270,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:1677
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -1531,7 +1555,7 @@ msgstr "kho dữ liệu sqlite"
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
+#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:700
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1943,8 +1967,7 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
@@ -2128,8 +2151,7 @@ msgstr ""
 msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 #, fuzzy
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
@@ -2206,41 +2228,41 @@ msgstr "# các yêu cầu get (lấy) dht được nhận"
 msgid "# P2P PUT bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1854
+#: src/dht/gnunet-service-dht_neighbours.c:1858
 #, fuzzy
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1862
+#: src/dht/gnunet-service-dht_neighbours.c:1866
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2018
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2026
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2097
+#: src/dht/gnunet-service-dht_neighbours.c:2101
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2120
+#: src/dht/gnunet-service-dht_neighbours.c:2124
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2222
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2230
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -2250,35 +2272,35 @@ msgstr "# Tín hiệu HTTP PUT được nhận"
 msgid "# Network size estimates received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:227
+#: src/dht/gnunet-service-dht_routing.c:229
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:233
+#: src/dht/gnunet-service-dht_routing.c:235
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:239
+#: src/dht/gnunet-service-dht_routing.c:241
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:251
+#: src/dht/gnunet-service-dht_routing.c:253
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:327
+#: src/dht/gnunet-service-dht_routing.c:329
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:409
+#: src/dht/gnunet-service-dht_routing.c:411
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:427
+#: src/dht/gnunet-service-dht_routing.c:429
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -2391,16 +2413,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:142
+#: src/dht/plugin_block_dht.c:144
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Không biết truyền tải nào kiểu %d.\n"
 
-#: src/dht/plugin_block_dht.c:149
+#: src/dht/plugin_block_dht.c:151
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:159
+#: src/dht/plugin_block_dht.c:161
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -3534,7 +3556,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:1517 src/transport/gnunet-transport.c:1542
+#: src/transport/gnunet-transport.c:1296 src/transport/gnunet-transport.c:1321
 #, 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"
@@ -4077,41 +4099,41 @@ msgstr "Nhận yêu cầu định tuyến\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:709
+#: src/gns/gnunet-dns2gns.c:712
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:737
+#: src/gns/gnunet-dns2gns.c:740
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:761
 #, fuzzy
 msgid "No valid GNS zone specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:782
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:788
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:788
+#: src/gns/gnunet-dns2gns.c:791
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:794
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:804
+#: src/gns/gnunet-dns2gns.c:807
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4276,83 +4298,85 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2167
+#: src/gns/gnunet-gns-proxy.c:2168
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/gns/gnunet-gns-proxy.c:2197
+#: src/gns/gnunet-gns-proxy.c:2198
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:2370
+#: src/gns/gnunet-gns-proxy.c:2371
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2389 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2709
+#: src/gns/gnunet-gns-proxy.c:2710
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2738
+#: src/gns/gnunet-gns-proxy.c:2739
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
+#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2836
+#: src/gns/gnunet-gns-proxy.c:2837
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3171
+#: src/gns/gnunet-gns-proxy.c:3172
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
-#: src/gns/gnunet-service-gns.c:1149
+#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
+#: src/gns/gnunet-service-gns.c:548
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3273
+#: src/gns/gnunet-gns-proxy.c:3274
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:3313
+#: src/gns/gnunet-gns-proxy.c:3314
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3316
+#: src/gns/gnunet-gns-proxy.c:3317
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3335
+#: src/gns/gnunet-gns-proxy.c:3336
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1187
+#: src/gns/gnunet-service-gns.c:585
+#: src/zonemaster/gnunet-service-zonemaster.c:705
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-service-gns.c:1195
+#: src/gns/gnunet-service-gns.c:593
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-service-gns.c:1228
+#: src/gns/gnunet-service-gns.c:612
+#: src/zonemaster/gnunet-service-zonemaster.c:740
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -5207,8 +5231,7 @@ msgstr ""
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/namestore/gnunet-namestore.c:979
-#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -5367,217 +5390,293 @@ msgstr "kho dữ liệu sqlite"
 msgid "Namestore REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/nat/gnunet-nat.c:159
-msgid "GNUnet NAT traversal autoconfigure daemon"
+#: src/nat-auto/gnunet-nat-auto.c:192
+#, fuzzy
+msgid "Suggested configuration changes:\n"
 msgstr ""
+"\n"
+"CHƯA lưu các thay đổi trong cấu hình.\n"
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat-auto/gnunet-nat-auto.c:220
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/nat-auto/gnunet-nat-auto.c:227
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:345
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "Cấu hình hạn ngạch"
+
+#: src/nat-auto/gnunet-nat-auto.c:348
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+msgid "use TCP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+msgid "use UDP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:357
+msgid "write configuration file (for autoconfiguration)"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:369
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr "Cấu hình GNUnet"
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:403
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681
+#: src/nat-auto/nat_auto_api_test.c:405
+#, fuzzy
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:518
+#: src/nat-auto/nat_auto_api_test.c:520
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:568
+#: src/nat-auto/nat_auto_api_test.c:569
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/nat-auto/gnunet-nat-server.c:336
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:363
+#: src/nat-auto/gnunet-nat-server.c:386
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_api.c:880 src/nat/nat.c:2010
+#: src/nat-auto/gnunet-service-nat-auto.c:342
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+#, fuzzy
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590
+#, fuzzy, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725
+msgid "upnpc not found\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/nat_auto_api.c:76
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat_api.c:882 src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
+#: src/nat-auto/nat_auto_api.c:78
+msgid "IPC failure"
 msgstr ""
 
-#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+#: src/nat-auto/nat_auto_api.c:80
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+#: src/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+#: src/nat-auto/nat_auto_api.c:84
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+#: src/nat-auto/nat_auto_api.c:86
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+#: src/nat-auto/nat_auto_api.c:88
 #, 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
+#: src/nat-auto/nat_auto_api.c:90
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat_api.c:896 src/nat/nat.c:2026
+#: src/nat-auto/nat_auto_api.c:92
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+#: src/nat-auto/nat_auto_api.c:94
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat_api.c:900 src/nat/nat.c:2030
+#: src/nat-auto/nat_auto_api.c:96
 #, 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
+#: src/nat-auto/nat_auto_api.c:98
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat_api.c:904 src/nat/nat.c:2034
+#: src/nat-auto/nat_auto_api.c:100
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+#: src/nat-auto/nat_auto_api.c:102
 #, 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
+#: src/nat-auto/nat_auto_api.c:104
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat_api.c:910 src/nat/nat.c:2040
+#: src/nat-auto/nat_auto_api.c:106
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+#: src/nat-auto/nat_auto_api.c:108
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+#: src/nat-auto/nat_auto_api.c:110
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+#: src/nat-auto/nat_auto_api.c:112
 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 ""
+#: src/nat-auto/nat_auto_api_test.c:477
+#, fuzzy, c-format
+msgid "Failed to find valid PORT in section `%s'\n"
+msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/nat/nat_auto.c:386
-msgid "NAT traversal with ICMP Server failed.\n"
+#: src/nat/gnunet-nat.c:424
+msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/nat_auto.c:405
-#, fuzzy
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
-
-#: src/nat/nat_auto.c:437
-#, c-format
-msgid "Detected external IP `%s'\n"
+#: src/nat/gnunet-nat.c:427
+msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/nat_auto.c:572
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+#: src/nat/gnunet-nat.c:430
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
 msgstr ""
 
-#: src/nat/nat_auto.c:590
-#, fuzzy, c-format
-msgid "Detected internal network address `%s'.\n"
-msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
-
-#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
-#, fuzzy
-msgid "Failed to connect to `gnunet-nat-server'\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/nat/nat_auto.c:724
-msgid "upnpc found, enabling its use\n"
+#: src/nat/gnunet-nat.c:433
+msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/nat_auto.c:725
-msgid "upnpc not found\n"
+#: src/nat/gnunet-nat.c:442
+msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/nat_auto.c:762
-msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:774 src/nat/nat_auto.c:834
-msgid "test_icmp_server not possible, as we are not behind NAT\n"
+#: src/nat/gnunet-nat.c:454
+msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/nat/gnunet-service-nat.c:1313
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:823
-msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+#: src/nat/gnunet-service-nat.c:1323
+#, c-format
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat.c:1019
+#: src/nat/gnunet-service-nat.c:1339
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/nat.c:1070
-#, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/nat/nat.c:1327
-msgid "Error while running upnp client:\n"
+#: src/nat/gnunet-service-nat.c:1350
+#, c-format
+msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/nat.c:1402
-#, fuzzy, c-format
-msgid "Failed to run upnp client for port %u\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-
-#: src/nat/nat.c:1546
-msgid "malformed"
-msgstr ""
+#: src/nat/gnunet-service-nat.c:1803
+#, fuzzy
+msgid "Connection reversal request failed\n"
+msgstr "Thu thập bị dừng.\n"
 
-#: src/nat/nat.c:1600
+#: src/nat/gnunet-service-nat.c:1876
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
-"disabling UPnP \n"
+"disabling UPnP\n"
 msgstr ""
 
-#: src/nat/nat.c:1726 src/nat/nat.c:1739
+#: src/nat/gnunet-service-nat_helper.c:186
 #, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
-msgstr ""
-
-#: src/nat/nat.c:1903
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:1919
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
-msgstr ""
+#: src/nat/gnunet-service-nat_helper.c:260
+#, fuzzy, c-format
+msgid "Failed to start %s\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat_mini.c:205
+#: src/nat/gnunet-service-nat_mini.c:196
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:611
+#: src/nat/gnunet-service-nat_mini.c:654
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:518
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
-msgstr ""
-
-#: src/nat/nat_test.c:568
-#, fuzzy
-msgid "NAT test failed to start NAT library\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
 #: src/nse/gnunet-nse.c:122
 #, fuzzy
 msgid "Show network size estimates from NSE service."
@@ -7390,182 +7489,159 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:486
+#: src/transport/gnunet-transport.c:418
 #, 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:496
+#: src/transport/gnunet-transport.c:428
 #, 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:540
+#: src/transport/gnunet-transport.c:472
 #, 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:553
+#: src/transport/gnunet-transport.c:485
 #, 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:565
+#: src/transport/gnunet-transport.c:499
 #, 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:588
-#, fuzzy, c-format
-msgid "NAT plugin `%s' reports: %s\n"
-msgstr "Đang nạp các truyền tải « %s »\n"
-
-#: src/transport/gnunet-transport.c:675
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
-
-#: 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:714
-#, fuzzy
-msgid "Failed to start resolver!\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/transport/gnunet-transport.c:750
+#: src/transport/gnunet-transport.c:532
 #, 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:784
+#: src/transport/gnunet-transport.c:566
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:815
+#: src/transport/gnunet-transport.c:597
 #, 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:839 src/transport/gnunet-transport.c:868
+#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:841
+#: src/transport/gnunet-transport.c:623
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:870
+#: src/transport/gnunet-transport.c:652
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:905
+#: src/transport/gnunet-transport.c:687
 #, fuzzy, c-format
 msgid "Received %u bytes\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:942
+#: src/transport/gnunet-transport.c:724
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:954
+#: src/transport/gnunet-transport.c:736
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1366
+#: src/transport/gnunet-transport.c:1150
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1488
+#: src/transport/gnunet-transport.c:1267
 #, 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:1501
+#: src/transport/gnunet-transport.c:1280
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1529
+#: src/transport/gnunet-transport.c:1308
 #, 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:1535
+#: src/transport/gnunet-transport.c:1314
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
-#: src/transport/gnunet-transport.c:1641
+#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
+#: src/transport/gnunet-transport.c:1420
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:1374
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1665
+#: src/transport/gnunet-transport.c:1444
 #, 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:1668
+#: src/transport/gnunet-transport.c:1447
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1671
+#: src/transport/gnunet-transport.c:1450
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1674
+#: src/transport/gnunet-transport.c:1453
 #, 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:1680
+#: src/transport/gnunet-transport.c:1459
 #, 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:1683
+#: src/transport/gnunet-transport.c:1462
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1686
+#: src/transport/gnunet-transport.c:1465
 #: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1689
+#: src/transport/gnunet-transport.c:1468
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1692
+#: src/transport/gnunet-transport.c:1471
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1695
-msgid "test transport configuration (involves external server)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1706
+#: src/transport/gnunet-transport.c:1482
 #: src/transport/gnunet-transport-profiler.c:642
 #, fuzzy
 msgid "Direct access to transport service."
@@ -7602,9 +7678,9 @@ msgstr "kích cỡ tin nhắn"
 
 #: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
-#: src/transport/plugin_transport_http_server.c:3457
-#: src/transport/plugin_transport_tcp.c:3365
-#: src/transport/plugin_transport_tcp.c:3372
+#: src/transport/plugin_transport_http_server.c:3462
+#: src/transport/plugin_transport_tcp.c:3375
+#: src/transport/plugin_transport_tcp.c:3382
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7614,13 +7690,13 @@ msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_client.c:2167
-#: src/transport/plugin_transport_http_server.c:3172
+#: src/transport/plugin_transport_http_server.c:3177
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
 #: src/transport/plugin_transport_http_client.c:2184
-#: src/transport/plugin_transport_http_server.c:3242
+#: src/transport/plugin_transport_http_server.c:3247
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
@@ -7663,73 +7739,73 @@ msgstr ""
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2583
+#: src/transport/plugin_transport_http_server.c:2586
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/transport/plugin_transport_http_server.c:2748
+#: src/transport/plugin_transport_http_server.c:2751
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2832
-#: src/transport/plugin_transport_udp.c:3600
+#: src/transport/plugin_transport_http_server.c:2837
+#: src/transport/plugin_transport_udp.c:3623
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2938
+#: src/transport/plugin_transport_http_server.c:2943
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2953
+#: src/transport/plugin_transport_http_server.c:2958
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2959
+#: src/transport/plugin_transport_http_server.c:2964
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2970
+#: src/transport/plugin_transport_http_server.c:2975
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/transport/plugin_transport_http_server.c:2976
+#: src/transport/plugin_transport_http_server.c:2981
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2995
+#: src/transport/plugin_transport_http_server.c:3000
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:3030
+#: src/transport/plugin_transport_http_server.c:3035
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:3105
+#: src/transport/plugin_transport_http_server.c:3110
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/transport/plugin_transport_http_server.c:3126
+#: src/transport/plugin_transport_http_server.c:3131
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/plugin_transport_http_server.c:3143
+#: src/transport/plugin_transport_http_server.c:3148
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/transport/plugin_transport_http_server.c:3469
+#: src/transport/plugin_transport_http_server.c:3474
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -7776,167 +7852,167 @@ msgstr "# các byte đã gửi qua SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1051
-#: src/transport/plugin_transport_tcp.c:2362
+#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:2379
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:1234
-#: src/transport/plugin_transport_tcp.c:1458
-#: src/transport/plugin_transport_tcp.c:2633
-#: src/transport/plugin_transport_tcp.c:3490
+#: src/transport/plugin_transport_tcp.c:1243
+#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:2643
+#: src/transport/plugin_transport_tcp.c:3498
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:1276
-#: src/transport/plugin_transport_tcp.c:1440
-#: src/transport/plugin_transport_tcp.c:1564
-#: src/transport/plugin_transport_tcp.c:1637
-#: src/transport/plugin_transport_tcp.c:1737
-#: src/transport/plugin_transport_tcp.c:1762
+#: src/transport/plugin_transport_tcp.c:1285
+#: src/transport/plugin_transport_tcp.c:1449
+#: src/transport/plugin_transport_tcp.c:1573
+#: src/transport/plugin_transport_tcp.c:1646
+#: src/transport/plugin_transport_tcp.c:1746
+#: src/transport/plugin_transport_tcp.c:1771
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:1279
+#: src/transport/plugin_transport_tcp.c:1288
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1576
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1641
+#: src/transport/plugin_transport_tcp.c:1650
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2041
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2200
+#: src/transport/plugin_transport_tcp.c:2217
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2692
+#: src/transport/plugin_transport_tcp.c:2702
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_tcp.c:2883
+#: src/transport/plugin_transport_tcp.c:2893
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2934
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:3002
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# các kết nối dht"
 
-#: src/transport/plugin_transport_tcp.c:2938
+#: src/transport/plugin_transport_tcp.c:2948
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:2954
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2946
+#: src/transport/plugin_transport_tcp.c:2956
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2986
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3006
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3315
+#: src/transport/plugin_transport_tcp.c:3325
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:3478
+#: src/transport/plugin_transport_tcp.c:3486
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3482
+#: src/transport/plugin_transport_tcp.c:3490
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:3494
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:170
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 #, fuzzy
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:546
+#: src/transport/plugin_transport_udp_broadcasting.c:545
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:567
+#: src/transport/plugin_transport_udp_broadcasting.c:566
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3344
+#: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3358
+#: src/transport/plugin_transport_udp.c:3381
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3676
-#: src/transport/plugin_transport_udp.c:3775
+#: src/transport/plugin_transport_udp.c:3699
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3694
+#: src/transport/plugin_transport_udp.c:3717
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3785
+#: src/transport/plugin_transport_udp.c:3808
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3857
-#: src/transport/plugin_transport_udp.c:3871
+#: src/transport/plugin_transport_udp.c:3879
+#: src/transport/plugin_transport_udp.c:3893
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3903
+#: src/transport/plugin_transport_udp.c:3925
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/transport/plugin_transport_udp.c:3930
+#: src/transport/plugin_transport_udp.c:3952
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/transport/plugin_transport_udp.c:3996
+#: src/transport/plugin_transport_udp.c:4018
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Không thể tạo miền tên.\n"
@@ -8057,7 +8133,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client_new.c:864
+#: src/util/client.c:864
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8833,42 +8909,42 @@ msgstr ""
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/util/strings.c:1475 src/util/strings.c:1491
+#: src/util/strings.c:1541 src/util/strings.c:1557
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1500
+#: src/util/strings.c:1566
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
-#: src/util/strings.c:1683
+#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
+#: src/util/strings.c:1749
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1640
+#: src/util/strings.c:1706
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/util/strings.c:1692
+#: src/util/strings.c:1758
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1744
+#: src/util/strings.c:1810
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/strings.c:1794
+#: src/util/strings.c:1860
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/strings.c:1825
+#: src/util/strings.c:1891
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
@@ -9057,22 +9133,34 @@ msgid "Setup tunnels via VPN."
 msgstr ""
 
 #: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:660
+#: src/include/gnunet_common.h:662 src/include/gnunet_common.h:670
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:672
+#: src/include/gnunet_common.h:682
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
+#: src/include/gnunet_common.h:709 src/include/gnunet_common.h:718
 #, c-format
 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 "Failed to run upnp client for port %u\n"
+#~ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#, fuzzy
+#~ msgid "NAT plugin `%s' reports: %s\n"
+#~ msgstr "Đang nạp các truyền tải « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to start resolver!\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
+
+#, fuzzy
 #~ msgid "Unable to initialize Postgres: %s\n"
 #~ msgstr "Không thể sơ khởi SQLite: %s.\n"
 
@@ -10482,10 +10570,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "Đang bắt đầu tài lên « %s ».\n"
 
 #, fuzzy
-#~ msgid "Failed to write new configuration to disk."
-#~ msgstr "Lỗi lưu cấu hình."
-
-#, fuzzy
 #~ msgid "Could not start `%s' process to copy configuration file.\n"
 #~ msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
@@ -10533,10 +10617,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
 #, fuzzy
-#~ msgid "Failed to find option %s in section %s!\n"
-#~ msgstr "Lỗi đóng kết đến cổng %s %d.\n"
-
-#, fuzzy
 #~ msgid "Invalid configuration option `%s' in section `%s'\n"
 #~ msgstr ""
 #~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
@@ -10948,9 +11028,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ "thì có thể đặt thành tốc độ kết nối Internet lớn nhất. Không nên đặt giá "
 #~ "trị lớn hơn số được gán cho kết nối Internet của bạn."
 
-#~ msgid "Quota configuration"
-#~ msgstr "Cấu hình hạn ngạch"
-
 #~ msgid "What is the maximum size of the datastore in MB?"
 #~ msgstr "Kho dữ liệu có kích cỡ tối đa (theo MB)?"
 
@@ -11031,9 +11108,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Save configuration?"
 #~ msgstr "Lưu cấu hình không?"
 
-#~ msgid "GNUnet Configuration"
-#~ msgstr "Cấu hình GNUnet"
-
 #~ msgid "Back"
 #~ msgstr "Lùi"
 
@@ -11058,13 +11132,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Do you wish to save your new configuration?"
 #~ msgstr "Bạn có muốn lưu cấu hình mới không?"
 
-#~ msgid ""
-#~ "\n"
-#~ "Your configuration changes were NOT saved.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "CHƯA lưu các thay đổi trong cấu hình.\n"
-
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "cài đặt GNUnet như là một dịch vụ Windows"
 
@@ -12024,9 +12091,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Revision %u"
 #~ msgstr "Bản sửa đổi %u"
 
-#~ msgid "Application aborted."
-#~ msgstr "Ứng dụng bị hủy bỏ."
-
 #~ msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 #~ msgstr "Tập tin tình trạng FSUI « %s » có lỗi cú pháp tại khoảng bù %u.\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 16fee9b24..579bc8364 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-11-27 09:18+0100\n"
+"POT-Creation-Date: 2017-01-12 17:19+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"
@@ -250,21 +250,20 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:652
 #: src/transport/plugin_transport_tcp.c:658
-#: src/transport/plugin_transport_tcp.c:3299 src/util/service.c:584
-#: src/util/service.c:590 src/util/service_new.c:637
-#: src/util/service_new.c:643
+#: src/transport/plugin_transport_tcp.c:3309 src/util/service.c:584
+#: src/util/service.c:590 src/util/service_new.c:637 src/util/service_new.c:643
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:689
-#: src/util/client_new.c:464 src/util/service.c:621 src/util/service_new.c:682
+#: src/util/client.c:464 src/util/service.c:621 src/util/service_new.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:693
-#: src/util/client_new.c:469 src/util/service.c:625 src/util/service_new.c:687
+#: src/util/client.c:469 src/util/service.c:625 src/util/service_new.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s：选项“%s”有歧义\n"
@@ -284,7 +283,7 @@ msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:513
-#: src/transport/plugin_transport_http_server.c:2617
+#: src/transport/plugin_transport_http_server.c:2620
 #: src/transport/plugin_transport_tcp.c:772 src/util/service.c:704
 #: src/util/service_new.c:782
 #, fuzzy, c-format
@@ -292,7 +291,7 @@ msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #: src/arm/gnunet-service-arm.c:532
-#: src/transport/plugin_transport_http_server.c:2635
+#: src/transport/plugin_transport_http_server.c:2638
 #: src/transport/plugin_transport_tcp.c:791 src/util/service.c:723
 #: src/util/service_new.c:802
 #, fuzzy, c-format
@@ -387,13 +386,11 @@ msgid ""
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3293
-#: src/ats-tests/gnunet-solver-eval.c:935
+#: src/ats/gnunet-ats-solver-eval.c:3293 src/ats-tests/gnunet-solver-eval.c:935
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3296
-#: src/ats-tests/gnunet-solver-eval.c:938
+#: src/ats/gnunet-ats-solver-eval.c:3296 src/ats-tests/gnunet-solver-eval.c:938
 #: src/ats-tests/gnunet-solver-eval.c:941
 msgid "experiment to use"
 msgstr ""
@@ -499,12 +496,12 @@ msgstr ""
 msgid "Invalid %s configuration %f\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tests/ats-testing.c:441
+#: src/ats-tests/ats-testing.c:422
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:448
+#: src/ats-tests/ats-testing.c:429
 #, fuzzy, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -561,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:1476
+#: src/transport/gnunet-transport.c:1255
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -647,6 +644,37 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
+#: src/auction/gnunet-auction-create.c:69
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:72
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:75
+msgid "max duration per round"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:78
+msgid "duration until auction starts"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:81
+msgid "number of items to sell, 0 for first price auction"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:84
+msgid "public auction outcome"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:94 src/auction/gnunet-auction-info.c:76
+#: src/auction/gnunet-auction-join.c:76
+#: src/conversation/gnunet-conversation-test.c:243
+#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
+msgid "help text"
+msgstr ""
+
 #: src/cadet/gnunet-cadet.c:511
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
@@ -703,7 +731,7 @@ msgstr "无法获取有关用户“%s”的信息：%s\n"
 msgid "provide information about all tunnels"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-service-cadet_peer.c:681
+#: src/cadet/gnunet-service-cadet_peer.c:686
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -1026,11 +1054,6 @@ msgid ""
 "played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:243
-#: src/revocation/gnunet-revocation.c:550 src/template/gnunet-template.c:76
-msgid "help text"
-msgstr ""
-
 #: src/conversation/gnunet_gst.c:630
 #: src/conversation/gnunet-helper-audio-playback-gst.c:357
 #, c-format
@@ -1231,7 +1254,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:1677
+#: src/core/gnunet-core.c:176 src/transport/gnunet-transport.c:1456
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -1483,7 +1506,7 @@ msgstr "sqlite 数据仓库"
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:681 src/include/gnunet_common.h:690
+#: src/include/gnunet_common.h:691 src/include/gnunet_common.h:700
 #: src/scalarproduct/scalarproduct.h:35
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
@@ -1876,8 +1899,7 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161
-#: src/testbed/gnunet-testbed-profiler.c:255
+#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:255
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
@@ -2054,8 +2076,7 @@ msgstr ""
 msgid "# GET requests given to datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
+#: src/dht/gnunet-service-dht_hello.c:84 src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
@@ -2120,35 +2141,35 @@ msgstr ""
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1854
+#: src/dht/gnunet-service-dht_neighbours.c:1858
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1862
+#: src/dht/gnunet-service-dht_neighbours.c:1866
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2018
+#: src/dht/gnunet-service-dht_neighbours.c:2022
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2022
+#: src/dht/gnunet-service-dht_neighbours.c:2026
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2097
+#: src/dht/gnunet-service-dht_neighbours.c:2101
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2120
+#: src/dht/gnunet-service-dht_neighbours.c:2124
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2222
+#: src/dht/gnunet-service-dht_neighbours.c:2226
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2226
+#: src/dht/gnunet-service-dht_neighbours.c:2230
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -2156,35 +2177,35 @@ msgstr ""
 msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:218
+#: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:227
+#: src/dht/gnunet-service-dht_routing.c:229
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:233
+#: src/dht/gnunet-service-dht_routing.c:235
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:239
+#: src/dht/gnunet-service-dht_routing.c:241
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:251
+#: src/dht/gnunet-service-dht_routing.c:253
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:327
+#: src/dht/gnunet-service-dht_routing.c:329
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:409
+#: src/dht/gnunet-service-dht_routing.c:411
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:427
+#: src/dht/gnunet-service-dht_routing.c:429
 msgid "# DHT requests combined"
 msgstr ""
 
@@ -2295,16 +2316,16 @@ msgid ""
 "SUPU %s, %s, %d, trail->prev_hop = %s"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:142
+#: src/dht/plugin_block_dht.c:144
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:149
+#: src/dht/plugin_block_dht.c:151
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:159
+#: src/dht/plugin_block_dht.c:161
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -3401,7 +3422,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:1517 src/transport/gnunet-transport.c:1542
+#: src/transport/gnunet-transport.c:1296 src/transport/gnunet-transport.c:1321
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3894,39 +3915,39 @@ msgstr ""
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:709
+#: src/gns/gnunet-dns2gns.c:712
 msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:737
+#: src/gns/gnunet-dns2gns.c:740
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:761
 msgid "No valid GNS zone specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
+#: src/gns/gnunet-dns2gns.c:782
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
+#: src/gns/gnunet-dns2gns.c:785
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:785
+#: src/gns/gnunet-dns2gns.c:788
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:788
+#: src/gns/gnunet-dns2gns.c:791
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:791
+#: src/gns/gnunet-dns2gns.c:794
 msgid "Public key of the GNS zone to use (overrides default)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:804
+#: src/gns/gnunet-dns2gns.c:807
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4086,83 +4107,85 @@ msgstr ""
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2167
+#: src/gns/gnunet-gns-proxy.c:2168
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户："
 
-#: src/gns/gnunet-gns-proxy.c:2197
+#: src/gns/gnunet-gns-proxy.c:2198
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "无法保存配置文件“%s”："
 
-#: src/gns/gnunet-gns-proxy.c:2370
+#: src/gns/gnunet-gns-proxy.c:2371
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2389 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2390 src/rest/gnunet-rest-server.c:533
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2709
+#: src/gns/gnunet-gns-proxy.c:2710
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2738
+#: src/gns/gnunet-gns-proxy.c:2739
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2756 src/gns/gnunet-gns-proxy.c:2785
+#: src/gns/gnunet-gns-proxy.c:2757 src/gns/gnunet-gns-proxy.c:2786
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2836
+#: src/gns/gnunet-gns-proxy.c:2837
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3171
+#: src/gns/gnunet-gns-proxy.c:3172
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3211 src/gns/gnunet-service-gns.c:1093
-#: src/gns/gnunet-service-gns.c:1149
+#: src/gns/gnunet-gns-proxy.c:3212 src/gns/gnunet-service-gns.c:493
+#: src/gns/gnunet-service-gns.c:548
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3273
+#: src/gns/gnunet-gns-proxy.c:3274
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3313
+#: src/gns/gnunet-gns-proxy.c:3314
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3316
+#: src/gns/gnunet-gns-proxy.c:3317
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3335
+#: src/gns/gnunet-gns-proxy.c:3336
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1187
+#: src/gns/gnunet-service-gns.c:585
+#: src/zonemaster/gnunet-service-zonemaster.c:705
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:1195
+#: src/gns/gnunet-service-gns.c:593
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:1228
+#: src/gns/gnunet-service-gns.c:612
+#: src/zonemaster/gnunet-service-zonemaster.c:740
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u：%s\n"
@@ -4994,8 +5017,7 @@ msgstr ""
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore.c:979
-#: src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
@@ -5153,215 +5175,290 @@ msgstr "sqlite 数据仓库"
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:159
-msgid "GNUnet NAT traversal autoconfigure daemon"
+#: src/nat-auto/gnunet-nat-auto.c:192
+#, fuzzy
+msgid "Suggested configuration changes:\n"
+msgstr ""
+"\n"
+"您的配置更改没有保存。\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:220
+#, fuzzy, c-format
+msgid "Failed to write configuration to `%s'\n"
+msgstr "保存配置失败。"
+
+#: src/nat-auto/gnunet-nat-auto.c:227
+#, fuzzy, c-format
+msgid "Wrote updated configuration to `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/nat-auto/gnunet-nat-auto.c:345
+#, fuzzy
+msgid "run autoconfiguration"
+msgstr "配额配置"
+
+#: src/nat-auto/gnunet-nat-auto.c:348
+msgid "section name providing the configuration for the adapter"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:436
+msgid "use TCP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:439
+msgid "use UDP"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto.c:357
+msgid "write configuration file (for autoconfiguration)"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
+#: src/nat-auto/gnunet-nat-auto.c:369
+#, fuzzy
+msgid "GNUnet NAT traversal autoconfiguration"
+msgstr "GNUnet 配置"
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:403
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681
+#: src/nat-auto/nat_auto_api_test.c:405
+msgid "Failed to connect to `gnunet-nat-server'\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:518
+#: src/nat-auto/nat_auto_api_test.c:520
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-nat-auto_legacy.c:568
+#: src/nat-auto/nat_auto_api_test.c:569
+#, fuzzy
+msgid "NAT test failed to start NAT library\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/nat-auto/gnunet-nat-server.c:336
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:363
+#: src/nat-auto/gnunet-nat-server.c:386
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_api.c:880 src/nat/nat.c:2010
+#: src/nat-auto/gnunet-service-nat-auto.c:342
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590
+#, fuzzy, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725
+msgid "upnpc not found\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+msgstr ""
+
+#: src/nat-auto/nat_auto_api.c:76
 msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat_api.c:882 src/nat/nat.c:2012
-msgid "Internal Failure (IPC, ...)"
+#: src/nat-auto/nat_auto_api.c:78
+msgid "IPC failure"
 msgstr ""
 
-#: src/nat/nat_api.c:884 src/nat/nat.c:2014
+#: src/nat-auto/nat_auto_api.c:80
 msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nat/nat_api.c:886 src/nat/nat.c:2016
+#: src/nat-auto/nat_auto_api.c:82
 msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nat/nat_api.c:888 src/nat/nat.c:2018
+#: src/nat-auto/nat_auto_api.c:84
 msgid "detected that we are offline"
 msgstr ""
 
-#: src/nat/nat_api.c:890 src/nat/nat.c:2020
+#: src/nat-auto/nat_auto_api.c:86
 msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nat/nat_api.c:892 src/nat/nat.c:2022
+#: src/nat-auto/nat_auto_api.c:88
 #, fuzzy
 msgid "Failed to run `upnpc` command"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat/nat_api.c:894 src/nat/nat.c:2024
+#: src/nat-auto/nat_auto_api.c:90
 msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nat/nat_api.c:896 src/nat/nat.c:2026
+#: src/nat-auto/nat_auto_api.c:92
 msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nat/nat_api.c:898 src/nat/nat.c:2028
+#: src/nat-auto/nat_auto_api.c:94
 msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nat/nat_api.c:900 src/nat/nat.c:2030
+#: src/nat-auto/nat_auto_api.c:96
 #, fuzzy
 msgid "Failed to run `external-ip` command"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat/nat_api.c:902 src/nat/nat.c:2032
+#: src/nat-auto/nat_auto_api.c:98
 msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nat/nat_api.c:904 src/nat/nat.c:2034
+#: src/nat-auto/nat_auto_api.c:100
 msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/nat/nat_api.c:906 src/nat/nat.c:2036
+#: src/nat-auto/nat_auto_api.c:102
 #, fuzzy
 msgid "Could not determine interface with internal/local network address"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/nat/nat_api.c:908 src/nat/nat.c:2038
+#: src/nat-auto/nat_auto_api.c:104
 msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/nat/nat_api.c:910 src/nat/nat.c:2040
+#: src/nat-auto/nat_auto_api.c:106
 msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/nat/nat_api.c:912 src/nat/nat.c:2042
+#: src/nat-auto/nat_auto_api.c:108
 msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/nat/nat_api.c:914 src/nat/nat.c:2044
+#: src/nat-auto/nat_auto_api.c:110
 msgid "could not register NAT"
 msgstr ""
 
-#: src/nat/nat_api.c:916 src/nat/nat.c:2046
+#: src/nat-auto/nat_auto_api.c:112
 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 ""
-
-#: src/nat/nat_auto.c:386
-msgid "NAT traversal with ICMP Server failed.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:405
-msgid "Testing connection reversal with ICMP server.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:437
-#, c-format
-msgid "Detected external IP `%s'\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:572
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:590
+#: src/nat-auto/nat_auto_api_test.c:477
 #, fuzzy, c-format
-msgid "Detected internal network address `%s'.\n"
-msgstr "GNUnet ���在���用 IP 地�� %s���\n"
+msgid "Failed to find valid PORT in section `%s'\n"
+msgstr "解析配��文件���%s���失败\n"
 
-#: src/nat/nat_auto.c:681 src/nat/nat_test.c:403
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/nat/gnunet-nat.c:424
+msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/nat_auto.c:724
-msgid "upnpc found, enabling its use\n"
+#: src/nat/gnunet-nat.c:427
+msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/nat_auto.c:725
-msgid "upnpc not found\n"
+#: src/nat/gnunet-nat.c:430
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
 msgstr ""
 
-#: src/nat/nat_auto.c:762
-msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
+#: src/nat/gnunet-nat.c:433
+msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/nat_auto.c:774 src/nat/nat_auto.c:834
-msgid "test_icmp_server not possible, as we are not behind NAT\n"
+#: src/nat/gnunet-nat.c:442
+msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/nat_auto.c:786 src/nat/nat_auto.c:846
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/nat/gnunet-nat.c:454
+msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:823
-msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
+#: src/nat/gnunet-service-nat.c:1313
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat.c:1019
+#: src/nat/gnunet-service-nat.c:1323
 #, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/nat.c:1070
-#, fuzzy, c-format
-msgid "Failed to start %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/nat/nat.c:1327
-msgid "Error while running upnp client:\n"
+#: src/nat/gnunet-service-nat.c:1339
+#, c-format
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/nat.c:1402
-#, fuzzy, c-format
-msgid "Failed to run upnp client for port %u\n"
-msgstr "初始化“%s”服务失败。\n"
+#: src/nat/gnunet-service-nat.c:1350
+#, c-format
+msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
+msgstr ""
 
-#: src/nat/nat.c:1546
-msgid "malformed"
+#: src/nat/gnunet-service-nat.c:1803
+msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/nat/nat.c:1600
+#: src/nat/gnunet-service-nat.c:1876
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
-"disabling UPnP \n"
+"disabling UPnP\n"
 msgstr ""
 
-#: src/nat/nat.c:1726 src/nat/nat.c:1739
+#: src/nat/gnunet-service-nat_helper.c:186
 #, c-format
-msgid ""
-"Configuration requires `%s', but binary is not installed properly (SUID bit "
-"not set).  Option disabled.\n"
-msgstr ""
-
-#: src/nat/nat.c:1903
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:1919
-#, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
-msgstr ""
+#: src/nat/gnunet-service-nat_helper.c:260
+#, fuzzy, c-format
+msgid "Failed to start %s\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat/nat_mini.c:205
+#: src/nat/gnunet-service-nat_mini.c:196
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:611
+#: src/nat/gnunet-service-nat_mini.c:654
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:518
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
-msgstr ""
-
-#: src/nat/nat_test.c:568
-#, fuzzy
-msgid "NAT test failed to start NAT library\n"
-msgstr "初始化“%s”服务失败。\n"
-
 #: src/nse/gnunet-nse.c:122
 msgid "Show network size estimates from NSE service."
 msgstr ""
@@ -7115,179 +7212,156 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:486
+#: src/transport/gnunet-transport.c:418
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:496
+#: src/transport/gnunet-transport.c:428
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:540
+#: src/transport/gnunet-transport.c:472
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:553
+#: src/transport/gnunet-transport.c:485
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-transport.c:565
+#: src/transport/gnunet-transport.c:499
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:588
-#, c-format
-msgid "NAT plugin `%s' reports: %s\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:675
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
-
-#: 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:714
-#, fuzzy
-msgid "Failed to start resolver!\n"
-msgstr "运行 %s失败：%s %d\n"
-
-#: src/transport/gnunet-transport.c:750
+#: src/transport/gnunet-transport.c:532
 #, c-format
 msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:784
+#: src/transport/gnunet-transport.c:566
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:815
+#: src/transport/gnunet-transport.c:597
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:839 src/transport/gnunet-transport.c:868
+#: src/transport/gnunet-transport.c:621 src/transport/gnunet-transport.c:650
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:841
+#: src/transport/gnunet-transport.c:623
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:870
+#: src/transport/gnunet-transport.c:652
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:905
+#: src/transport/gnunet-transport.c:687
 #, c-format
 msgid "Received %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:942
+#: src/transport/gnunet-transport.c:724
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:954
+#: src/transport/gnunet-transport.c:736
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:1366
+#: src/transport/gnunet-transport.c:1150
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1488
+#: src/transport/gnunet-transport.c:1267
 #, 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:1501
+#: src/transport/gnunet-transport.c:1280
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1529
+#: src/transport/gnunet-transport.c:1308
 #, fuzzy
 msgid "Failed to connect to transport service for disconnection\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1535
+#: src/transport/gnunet-transport.c:1314
 msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1558 src/transport/gnunet-transport.c:1588
-#: src/transport/gnunet-transport.c:1641
+#: src/transport/gnunet-transport.c:1337 src/transport/gnunet-transport.c:1367
+#: src/transport/gnunet-transport.c:1420
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:1374
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1665
+#: src/transport/gnunet-transport.c:1444
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers)"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:1668
+#: src/transport/gnunet-transport.c:1447
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1671
+#: src/transport/gnunet-transport.c:1450
 #, fuzzy
 msgid "disconnect from a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1674
+#: src/transport/gnunet-transport.c:1453
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1680
+#: src/transport/gnunet-transport.c:1459
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1683
+#: src/transport/gnunet-transport.c:1462
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1686
+#: src/transport/gnunet-transport.c:1465
 #: src/transport/gnunet-transport-profiler.c:631
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1689
+#: src/transport/gnunet-transport.c:1468
 msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1692
+#: src/transport/gnunet-transport.c:1471
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1695
-msgid "test transport configuration (involves external server)"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1706
+#: src/transport/gnunet-transport.c:1482
 #: src/transport/gnunet-transport-profiler.c:642
 #, fuzzy
 msgid "Direct access to transport service."
@@ -7322,9 +7396,9 @@ msgstr "消息尺寸"
 
 #: src/transport/plugin_transport_http_client.c:1477
 #: src/transport/plugin_transport_http_server.c:2248
-#: src/transport/plugin_transport_http_server.c:3457
-#: src/transport/plugin_transport_tcp.c:3365
-#: src/transport/plugin_transport_tcp.c:3372
+#: src/transport/plugin_transport_http_server.c:3462
+#: src/transport/plugin_transport_tcp.c:3375
+#: src/transport/plugin_transport_tcp.c:3382
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7334,13 +7408,13 @@ msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_client.c:2167
-#: src/transport/plugin_transport_http_server.c:3172
+#: src/transport/plugin_transport_http_server.c:3177
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
 #: src/transport/plugin_transport_http_client.c:2184
-#: src/transport/plugin_transport_http_server.c:3242
+#: src/transport/plugin_transport_http_server.c:3247
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
@@ -7383,73 +7457,73 @@ msgstr ""
 msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2583
+#: src/transport/plugin_transport_http_server.c:2586
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http_server.c:2748
+#: src/transport/plugin_transport_http_server.c:2751
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2832
-#: src/transport/plugin_transport_udp.c:3600
+#: src/transport/plugin_transport_http_server.c:2837
+#: src/transport/plugin_transport_udp.c:3623
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2938
+#: src/transport/plugin_transport_http_server.c:2943
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2953
+#: src/transport/plugin_transport_http_server.c:2958
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2959
+#: src/transport/plugin_transport_http_server.c:2964
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2970
+#: src/transport/plugin_transport_http_server.c:2975
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http_server.c:2976
+#: src/transport/plugin_transport_http_server.c:2981
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2995
+#: src/transport/plugin_transport_http_server.c:3000
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3030
+#: src/transport/plugin_transport_http_server.c:3035
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3105
+#: src/transport/plugin_transport_http_server.c:3110
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/plugin_transport_http_server.c:3126
+#: src/transport/plugin_transport_http_server.c:3131
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3143
+#: src/transport/plugin_transport_http_server.c:3148
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:3469
+#: src/transport/plugin_transport_http_server.c:3474
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "无法初始化 SQLite：%s。\n"
@@ -7496,164 +7570,164 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1051
-#: src/transport/plugin_transport_tcp.c:2362
+#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:2379
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1234
-#: src/transport/plugin_transport_tcp.c:1458
-#: src/transport/plugin_transport_tcp.c:2633
-#: src/transport/plugin_transport_tcp.c:3490
+#: src/transport/plugin_transport_tcp.c:1243
+#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:2643
+#: src/transport/plugin_transport_tcp.c:3498
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1276
-#: src/transport/plugin_transport_tcp.c:1440
-#: src/transport/plugin_transport_tcp.c:1564
-#: src/transport/plugin_transport_tcp.c:1637
-#: src/transport/plugin_transport_tcp.c:1737
-#: src/transport/plugin_transport_tcp.c:1762
+#: src/transport/plugin_transport_tcp.c:1285
+#: src/transport/plugin_transport_tcp.c:1449
+#: src/transport/plugin_transport_tcp.c:1573
+#: src/transport/plugin_transport_tcp.c:1646
+#: src/transport/plugin_transport_tcp.c:1746
+#: src/transport/plugin_transport_tcp.c:1771
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1279
+#: src/transport/plugin_transport_tcp.c:1288
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:1576
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1641
+#: src/transport/plugin_transport_tcp.c:1650
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2041
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2200
+#: src/transport/plugin_transport_tcp.c:2217
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2692
+#: src/transport/plugin_transport_tcp.c:2702
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2883
+#: src/transport/plugin_transport_tcp.c:2893
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2934
-#: src/transport/plugin_transport_tcp.c:2992
+#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:3002
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:2938
+#: src/transport/plugin_transport_tcp.c:2948
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:2944
+#: src/transport/plugin_transport_tcp.c:2954
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2946
+#: src/transport/plugin_transport_tcp.c:2956
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2986
+#: src/transport/plugin_transport_tcp.c:2996
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2996
+#: src/transport/plugin_transport_tcp.c:3006
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3315
+#: src/transport/plugin_transport_tcp.c:3325
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:3478
+#: src/transport/plugin_transport_tcp.c:3486
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3482
+#: src/transport/plugin_transport_tcp.c:3490
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3486
+#: src/transport/plugin_transport_tcp.c:3494
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:170
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 msgid "# Multicast HELLO beacons received via UDP"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:546
+#: src/transport/plugin_transport_udp_broadcasting.c:545
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:567
+#: src/transport/plugin_transport_udp_broadcasting.c:566
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3344
+#: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3358
+#: src/transport/plugin_transport_udp.c:3381
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3676
-#: src/transport/plugin_transport_udp.c:3775
+#: src/transport/plugin_transport_udp.c:3699
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:3694
+#: src/transport/plugin_transport_udp.c:3717
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3785
+#: src/transport/plugin_transport_udp.c:3808
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:3857
-#: src/transport/plugin_transport_udp.c:3871
+#: src/transport/plugin_transport_udp.c:3879
+#: src/transport/plugin_transport_udp.c:3893
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3903
+#: src/transport/plugin_transport_udp.c:3925
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
-#: src/transport/plugin_transport_udp.c:3930
+#: src/transport/plugin_transport_udp.c:3952
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
-#: src/transport/plugin_transport_udp.c:3996
+#: src/transport/plugin_transport_udp.c:4018
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "发送消息失败。\n"
@@ -7764,7 +7838,7 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client_new.c:864
+#: src/util/client.c:864
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
@@ -8532,42 +8606,42 @@ msgstr ""
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/util/strings.c:1475 src/util/strings.c:1491
+#: src/util/strings.c:1541 src/util/strings.c:1557
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1500
+#: src/util/strings.c:1566
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/strings.c:1583 src/util/strings.c:1614 src/util/strings.c:1662
-#: src/util/strings.c:1683
+#: src/util/strings.c:1649 src/util/strings.c:1680 src/util/strings.c:1728
+#: src/util/strings.c:1749
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1640
+#: src/util/strings.c:1706
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/strings.c:1692
+#: src/util/strings.c:1758
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1744
+#: src/util/strings.c:1810
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/strings.c:1794
+#: src/util/strings.c:1860
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/strings.c:1825
+#: src/util/strings.c:1891
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
@@ -8747,22 +8821,30 @@ msgid "Setup tunnels via VPN."
 msgstr ""
 
 #: src/include/gnunet_common.h:645 src/include/gnunet_common.h:652
-#: src/include/gnunet_common.h:660
+#: src/include/gnunet_common.h:662 src/include/gnunet_common.h:670
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:672
+#: src/include/gnunet_common.h:682
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:699 src/include/gnunet_common.h:708
+#: src/include/gnunet_common.h:709 src/include/gnunet_common.h:718
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Failed to run upnp client for port %u\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to start resolver!\n"
+#~ msgstr "运行 %s失败：%s %d\n"
+
+#, fuzzy
 #~ msgid "Unable to initialize Postgres: %s\n"
 #~ msgstr "无法初始化 SQLite：%s。\n"
 
@@ -9584,10 +9666,6 @@ msgstr ""
 #~ msgstr "卸载 GNUnet 服务"
 
 #, fuzzy
-#~ msgid "Failed to write new configuration to disk."
-#~ msgstr "保存配置失败。"
-
-#, fuzzy
 #~ msgid "Failed to copy new configuration to remote machine."
 #~ msgstr "保存配置失败。"
 
@@ -9835,9 +9913,6 @@ msgstr ""
 #~ "量。如果您的网速很平稳，您可以将该限制设置为网速的最大值。您不应该使用超过"
 #~ "实际连接速度极限的值。"
 
-#~ msgid "Quota configuration"
-#~ msgstr "配额配置"
-
 #~ msgid "What is the maximum size of the datastore in MB?"
 #~ msgstr "数据仓库的最大尺寸是多少(MB)？"
 
@@ -9912,9 +9987,6 @@ msgstr ""
 #~ msgid "Save configuration?"
 #~ msgstr "保存配置？"
 
-#~ msgid "GNUnet Configuration"
-#~ msgstr "GNUnet 配置"
-
 #~ msgid "Back"
 #~ msgstr "后退"
 
@@ -9939,13 +10011,6 @@ msgstr ""
 #~ msgid "Do you wish to save your new configuration?"
 #~ msgstr "您想保存新配置吗？"
 
-#~ msgid ""
-#~ "\n"
-#~ "Your configuration changes were NOT saved.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "您的配置更改没有保存。\n"
-
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "以 Windows 服务方式安装 GNUnet"
 
diff --git a/src/zonemaster/zonemaster.conf.in b/src/zonemaster/zonemaster.conf.in
index dda0c7ec4..871eb9c8f 100644
--- a/src/zonemaster/zonemaster.conf.in
+++ b/src/zonemaster/zonemaster.conf.in
@@ -1,4 +1,4 @@
-[gns]
+[zonemaster]
 AUTOSTART = @AUTOSTART@
 FORCESTART = YES
 HOSTNAME = localhost