gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] [gnunet] 02/02: whitespace


From: gnunet
Subject: [GNUnet-SVN] [gnunet] 02/02: whitespace
Date: Wed, 06 Jun 2018 00:32:57 +0200

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

commit 6ab858be606ee40db66e349c165a6862a79c65a4
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Jun 6 00:32:51 2018 +0200

    whitespace
---
 po/de.po                           | 1175 ++++++++++++++++++----------------
 po/es.po                           | 1211 +++++++++++++++++++-----------------
 po/fr.po                           | 1166 ++++++++++++++++++----------------
 po/sv.po                           | 1168 ++++++++++++++++++----------------
 po/vi.po                           | 1178 +++++++++++++++++++----------------
 po/zh_CN.po                        | 1168 ++++++++++++++++++----------------
 src/my/Makefile.am                 |    3 +
 src/util/gnunet-service-resolver.c |    6 +-
 8 files changed, 3820 insertions(+), 3255 deletions(-)

diff --git a/po/de.po b/po/de.po
index 05e56b0d4..b3eff360d 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: address@hidden"
-"POT-Creation-Date: 2018-06-04 23:27+0200\n"
+"POT-Creation-Date: 2018-06-05 22:13+0200\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -226,6 +226,7 @@ msgid "Control services and the Automated Restart Manager 
(ARM)"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
+#: src/transport/plugin_transport_xt.c:1120
 #: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
@@ -236,6 +237,9 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
 #: src/transport/plugin_transport_tcp.c:3825
+#: src/transport/plugin_transport_xt.c:1139
+#: src/transport/plugin_transport_xt.c:1145
+#: src/transport/plugin_transport_xt.c:3833
 #: src/transport/tcp_service_legacy.c:576
 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
 #: src/util/service.c:643
@@ -244,6 +248,7 @@ 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:1176
+#: src/transport/plugin_transport_xt.c:1176
 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
 #: src/util/service.c:682
 #, c-format
@@ -251,6 +256,7 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
+#: src/transport/plugin_transport_xt.c:1180
 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
 #: src/util/service.c:687
 #, c-format
@@ -258,6 +264,7 @@ msgid "Using `%s' instead\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
+#: src/transport/plugin_transport_xt.c:1211
 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
@@ -266,6 +273,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_xt.c:1228
 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -274,6 +282,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:513
 #: src/transport/plugin_transport_http_server.c:2684
 #: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_xt.c:1259
 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
@@ -282,6 +291,7 @@ msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
 #: src/arm/gnunet-service-arm.c:532
 #: src/transport/plugin_transport_http_server.c:2702
 #: src/transport/plugin_transport_tcp.c:1278
+#: src/transport/plugin_transport_xt.c:1278
 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
@@ -353,14 +363,131 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:837
-msgid "Stop logging\n"
-msgstr "Protokollierung stoppen\n"
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:892
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3306
+msgid "print logging"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:314
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:359
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, fuzzy, c-format
-msgid "Start logging `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1869
+#, fuzzy, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
+
+#: src/ats/plugin_ats_mlp.c:1913
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
+
+#: src/ats/plugin_ats_mlp.c:2670
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2679
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2689
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2698
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr " gconfig\tGTK Konfiguration\n"
 
 #: src/ats-tests/ats-testing.c:422
 #, c-format
@@ -372,6 +499,15 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
+#: src/ats-tests/ats-testing-log.c:837
+msgid "Stop logging\n"
+msgstr "Protokollierung stoppen\n"
+
+#: src/ats-tests/ats-testing-log.c:892
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -379,15 +515,6 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294
-msgid "solver to use"
-msgstr ""
-
-#: src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299
-msgid "experiment to use"
-msgstr ""
-
 #: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -505,123 +632,6 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3306
-msgid "print logging"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:314
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1869
-#, fuzzy, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
-
-#: src/ats/plugin_ats_mlp.c:1913
-#, fuzzy, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
-
-#: src/ats/plugin_ats_mlp.c:2475
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
-
-#: src/ats/plugin_ats_mlp.c:2670
-#, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2679
-#, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2689
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2698
-#, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1164
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr " gconfig\tGTK Konfiguration\n"
-
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -767,28 +777,6 @@ msgstr "Ausführlicherer Modus (empfangene Werte ausgeben)"
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:119
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:145
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:210
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
-msgstr ""
-
 #: src/conversation/gnunet-conversation.c:270
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1038,16 +1026,38 @@ msgstr "Fehler beim Starten der Collection.\n"
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1300
-msgid "sets the LINE to use for the phone"
+#: src/conversation/gnunet-conversation.c:1300
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:1329
+msgid "Enables having a conversation with other GNUnet users."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:119
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:145
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1329
-msgid "Enables having a conversation with other GNUnet users."
+#: src/conversation/gnunet-conversation-test.c:210
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:361
 #: src/conversation/gnunet_gst.c:622
+#: src/conversation/gnunet-helper-audio-playback-gst.c:361
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr "Fehler beim Lesen aus STDIN: %d %s\n"
@@ -1582,15 +1592,15 @@ msgstr ""
 msgid "GNUnet credential resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/credential/gnunet-service-credential.c:1138
-#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184
+#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184
+#: src/gns/gnunet-gns-helper-service-w32.c:727
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #: src/credential/gnunet-service-credential.c:1144
-#: src/namestore/gnunet-namestore-fcfsd.c:1084
 #: src/namestore/gnunet-namestore.c:914
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
 #: src/namestore/plugin_rest_namestore.c:1035
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
@@ -2109,6 +2119,53 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:949
+#, fuzzy
+msgid "number of peers to start"
+msgstr "Anzahl an Durchläufen"
+
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:969
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:974
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1009
+msgid "Measure quality and performance of the DHT service."
+msgstr ""
+
 #: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
@@ -2363,53 +2420,6 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
-#, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:949
-#, fuzzy
-msgid "number of peers to start"
-msgstr "Anzahl an Durchläufen"
-
-#: src/dht/gnunet_dht_profiler.c:954
-msgid "number of PUTs to perform per peer"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
-#: src/testbed/gnunet-testbed-profiler.c:304
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:969
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:974
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:979
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:984
-msgid "chance that a peer is selected at random for PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:989
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1009
-msgid "Measure quality and performance of the DHT service."
-msgstr ""
-
 #: src/dht/plugin_block_dht.c:189
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -3389,6 +3399,15 @@ msgid ""
 "chk/...)"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:119
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:130
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Alle Optionen anzeigen"
+
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -3405,15 +3424,6 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:119
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:130
-#, fuzzy
-msgid "Special file-sharing operations"
-msgstr "Alle Optionen anzeigen"
-
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -4108,6 +4118,29 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+#, fuzzy
+msgid "Specify the type of the record to lookup"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:258
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "GNUnet Netzwerk Topologie tracen."
+
 #: src/gns/gnunet-gns-helper-service-w32.c:602
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
@@ -4127,7 +4160,7 @@ msgstr "Es konnte keine Verbindung mit gnunetd 
hergestellt werden.\n"
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:109
+#: src/gns/gnunet-gns-proxy.c:111
 #: src/hostlist/gnunet-daemon-hostlist_client.c:535
 #: src/hostlist/gnunet-daemon-hostlist_client.c:753
 #: src/hostlist/gnunet-daemon-hostlist_client.c:759
@@ -4142,126 +4175,103 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "»%s« schlug fehl bei %s:%d mit dem Fehler: »%s«.\n"
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:956
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:979
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:956
+#: src/gns/gnunet-gns-proxy.c:1002
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:969
+#: src/gns/gnunet-gns-proxy.c:1015
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gns/gnunet-gns-proxy.c:984
+#: src/gns/gnunet-gns-proxy.c:1030
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:994
+#: src/gns/gnunet-gns-proxy.c:1040
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1018
+#: src/gns/gnunet-gns-proxy.c:1064
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1132
+#: src/gns/gnunet-gns-proxy.c:1182
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1868
+#: src/gns/gnunet-gns-proxy.c:2017
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2364
+#: src/gns/gnunet-gns-proxy.c:2538
 #, 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:2394
+#: src/gns/gnunet-gns-proxy.c:2570
 #, fuzzy, c-format
-msgid "Unable to import certificate %s\n"
+msgid "Unable to import certificate from `%s'\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2573
+#: src/gns/gnunet-gns-proxy.c:2769
 #, 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:2598 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2925
+#: src/gns/gnunet-gns-proxy.c:3122
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2954
+#: src/gns/gnunet-gns-proxy.c:3151
 #, 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:3035
+#: src/gns/gnunet-gns-proxy.c:3232
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3316
+#: src/gns/gnunet-gns-proxy.c:3522
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3443
+#: src/gns/gnunet-gns-proxy.c:3650
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3448
+#: src/gns/gnunet-gns-proxy.c:3655
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3473
+#: src/gns/gnunet-gns-proxy.c:3681
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:233
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:238
-#, fuzzy
-msgid "Specify the type of the record to lookup"
-msgstr "Die Priorität des Inhalts angeben"
-
-#: src/gns/gnunet-gns.c:242
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:258
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "GNUnet Netzwerk Topologie tracen."
-
 #: src/gns/gnunet-service-gns.c:513
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4273,8 +4283,8 @@ msgid "Failed to connect to the namecache!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #: src/gns/gnunet-service-gns.c:568
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 #: src/zonemaster/gnunet-service-zonemaster.c:875
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -4777,85 +4787,20 @@ msgstr ""
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:769
-#, fuzzy, c-format
-msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
-msgstr "»%s« ist keine gültige IP-Adresse.\n"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:789
-#, fuzzy, c-format
-msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
-msgstr "»%s« ist keine gültige IP-Adresse.\n"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
-#, fuzzy, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-
-#: src/identity-provider/gnunet-idp.c:424
-#, fuzzy
-msgid "Ego is required\n"
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
-
-#: src/identity-provider/gnunet-idp.c:432
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:440
-#, fuzzy
-msgid "Requesting party key is required!\n"
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
-
-#: src/identity-provider/gnunet-idp.c:463
-msgid "Add attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:469
-msgid "Attribute value"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:474
-msgid "Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:479
-msgid "Audience (relying party)"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:483
-msgid "List attributes for Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:488
-msgid "Issue a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:493
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:498
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:503
-msgid "Type of attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:508
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/identity-provider/identity_provider_api.c:436
-#, fuzzy
-msgid "failed to store record\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:769
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1230
-#: src/identity-provider/plugin_rest_openid_connect.c:2147
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:789
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr "»%s« ist keine gültige IP-Adresse.\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#, fuzzy, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
 #: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
@@ -4948,6 +4893,71 @@ msgstr "Dateiformat fehlerhaft (kein GNUnet 
Verzeichnis?)\n"
 msgid "Identity REST API initialized\n"
 msgstr ""
 
+#: src/identity-provider/gnunet-idp.c:424
+#, fuzzy
+msgid "Ego is required\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/identity-provider/gnunet-idp.c:432
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:440
+#, fuzzy
+msgid "Requesting party key is required!\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/identity-provider/gnunet-idp.c:463
+msgid "Add attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:469
+msgid "Attribute value"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:474
+msgid "Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:479
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:483
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:488
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:493
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:498
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:503
+msgid "Type of attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:508
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/identity-provider/identity_provider_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1230
+#: src/identity-provider/plugin_rest_openid_connect.c:2147
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
 #: src/json/json.c:119
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -5049,66 +5059,6 @@ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 msgid "flat plugin running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:547
-#, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:567
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:598
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:678
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:736
-#, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:754
-#, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:790
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:799
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1019
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1045
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1092
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1130
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:313
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -5276,6 +5226,66 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:547
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:567
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:598
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:678
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:736
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:754
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:790
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:799
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1092
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1130
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
 #: src/namestore/gnunet-service-namestore.c:750
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5594,6 +5604,10 @@ msgstr "Kommando `%s' wurde nicht gefunden!\n"
 msgid "`upnpc' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
+#: src/nse/gnunet-nse.c:122
+msgid "Show network size estimates from NSE service."
+msgstr ""
+
 #: src/nse/gnunet-nse-profiler.c:849
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
@@ -5610,23 +5624,76 @@ msgstr ""
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
-msgid "delay between rounds"
-msgstr ""
+#: src/nse/gnunet-nse-profiler.c:884
+msgid "delay between rounds"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:893
+msgid "Measure quality and performance of the NSE service."
+msgstr ""
+
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+msgid "Value is too large.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:178
+#, fuzzy, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Verfügbare(r) Transport(e): %s\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:313
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:449
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:492
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"Die Datei »%s« im Verzeichnis »%s« entspricht nicht der Namenskonvention. "
+"Die Datei wurde entfernt.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:659
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "==> Verzeichnis `%s':\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:667
+#, fuzzy, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/nse/gnunet-nse-profiler.c:893
-msgid "Measure quality and performance of the NSE service."
-msgstr ""
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "==> Verzeichnis `%s':\n"
 
-#: src/nse/gnunet-nse.c:122
-msgid "Show network size estimates from NSE service."
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
-msgid "Value is too large.\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
+msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
+#: src/peerinfo/peerinfo_api.c:220
+#, fuzzy
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+
 #: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5717,63 +5784,6 @@ msgstr "Teste Transport(e) %s\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:178
-#, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Verfügbare(r) Transport(e): %s\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:313
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:334
-#: src/peerinfo/gnunet-service-peerinfo.c:365
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:449
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:492
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"Die Datei »%s« im Verzeichnis »%s« entspricht nicht der Namenskonvention. "
-"Die Datei wurde entfernt.\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:659
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "==> Verzeichnis `%s':\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:667
-#, fuzzy, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1100
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "==> Verzeichnis `%s':\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1438
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1451
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:220
-#, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
-
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
@@ -6286,10 +6296,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -6743,17 +6753,6 @@ msgstr ""
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:289
-msgid "tolerate COUNT number of continious timeout failures"
-msgstr ""
-
-#: src/testbed/gnunet-testbed-profiler.c:294
-msgid ""
-"run profiler in non-interactive mode where upon testbed setup the profiler "
-"does not wait for a keystroke but continues to run until a termination "
-"signal is received"
-msgstr ""
-
 #: src/testbed/gnunet_testbed_mpi_spawn.c:118
 #, fuzzy
 msgid "Waiting for child to exit.\n"
@@ -6766,6 +6765,17 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
+#: src/testbed/gnunet-testbed-profiler.c:289
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:294
+msgid ""
+"run profiler in non-interactive mode where upon testbed setup the profiler "
+"does not wait for a keystroke but continues to run until a termination "
+"signal is received"
+msgstr ""
+
 #: src/testbed/testbed_api.c:410
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -7058,6 +7068,10 @@ msgstr "# HELLO-Meldungen empfangen"
 msgid "GNUnet topology control"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport.c:448
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -7102,10 +7116,6 @@ msgstr ""
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
@@ -7431,43 +7441,6 @@ msgstr ""
 msgid "# HELLOs given to peerinfo"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:621
-#, fuzzy
-msgid "receive data from peer"
-msgstr "# Bytes des Typs %d empfangen"
-
-#: src/transport/gnunet-transport-profiler.c:626
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:631
-#, fuzzy
-msgid "number of messages to send"
-msgstr "Anzahl an Durchläufen"
-
-#: src/transport/gnunet-transport-profiler.c:636
-msgid "message size to use"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:641
-#: src/transport/gnunet-transport.c:1462
-msgid "peer identity"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:652
-#: src/transport/gnunet-transport.c:1482
-msgid "Direct access to transport service."
-msgstr "Direkter Zugriff auf den Transportdienst"
-
 #: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7600,6 +7573,11 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr "Keine Rechnernamen auflösen"
 
+#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport-profiler.c:641
+msgid "peer identity"
+msgstr ""
+
 #: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7608,11 +7586,45 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
+#: src/transport/gnunet-transport.c:1482
+#: src/transport/gnunet-transport-profiler.c:652
+msgid "Direct access to transport service."
+msgstr "Direkter Zugriff auf den Transportdienst"
+
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:621
+#, fuzzy
+msgid "receive data from peer"
+msgstr "# Bytes des Typs %d empfangen"
+
+#: src/transport/gnunet-transport-profiler.c:626
+msgid "iterations"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "Anzahl an Durchläufen"
+
+#: src/transport/gnunet-transport-profiler.c:636
+msgid "message size to use"
+msgstr ""
+
 #: src/transport/plugin_transport_http_client.c:1474
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3526
 #: src/transport/plugin_transport_tcp.c:3891
 #: src/transport/plugin_transport_tcp.c:3898
+#: src/transport/plugin_transport_xt.c:3899
+#: src/transport/plugin_transport_xt.c:3906
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7682,6 +7694,7 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2901
 #: src/transport/plugin_transport_udp.c:3623
+#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7786,6 +7799,8 @@ msgstr "# Bytes verworfen von SMTP (ausgehend)"
 
 #: src/transport/plugin_transport_tcp.c:1547
 #: src/transport/plugin_transport_tcp.c:2873
+#: src/transport/plugin_transport_xt.c:1553
+#: src/transport/plugin_transport_xt.c:2879
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
@@ -7794,6 +7809,9 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1954
 #: src/transport/plugin_transport_tcp.c:3137
 #: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_xt.c:1736
+#: src/transport/plugin_transport_xt.c:1960
+#: src/transport/plugin_transport_xt.c:3143
 msgid "# TCP sessions active"
 msgstr "# aktive TCP-Sitzungen"
 
@@ -7803,66 +7821,87 @@ msgstr "# aktive TCP-Sitzungen"
 #: src/transport/plugin_transport_tcp.c:2133
 #: src/transport/plugin_transport_tcp.c:2233
 #: src/transport/plugin_transport_tcp.c:2258
+#: src/transport/plugin_transport_xt.c:1778
+#: src/transport/plugin_transport_xt.c:1942
+#: src/transport/plugin_transport_xt.c:2066
+#: src/transport/plugin_transport_xt.c:2139
+#: src/transport/plugin_transport_xt.c:2239
+#: src/transport/plugin_transport_xt.c:2264
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes derzeit in TCP-Puffern"
 
 #: src/transport/plugin_transport_tcp.c:1775
+#: src/transport/plugin_transport_xt.c:1781
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (unterbrochen)"
 
 #: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_xt.c:2069
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (Zeitüberschreitung)"
 
 #: src/transport/plugin_transport_tcp.c:2137
+#: src/transport/plugin_transport_xt.c:2143
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes über TCP übertragen"
 
 #: src/transport/plugin_transport_tcp.c:2535
+#: src/transport/plugin_transport_xt.c:2541
 msgid "# requests to create session with invalid address"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:2711
+#: src/transport/plugin_transport_xt.c:2717
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3203
+#: src/transport/plugin_transport_xt.c:3209
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
 #: src/transport/plugin_transport_tcp.c:3409
+#: src/transport/plugin_transport_xt.c:3415
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
 #: src/transport/plugin_transport_tcp.c:3460
 #: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_xt.c:3466
+#: src/transport/plugin_transport_xt.c:3524
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr " Verbindung fehlgeschlagen\n"
 
 #: src/transport/plugin_transport_tcp.c:3464
+#: src/transport/plugin_transport_xt.c:3470
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# verbundener Knoten"
 
 #: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_xt.c:3476
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3472
+#: src/transport/plugin_transport_xt.c:3478
 msgid "# TCP service suspended"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3512
+#: src/transport/plugin_transport_xt.c:3518
 msgid "# TCP service resumed"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_xt.c:3528
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3841
+#: src/transport/plugin_transport_xt.c:3849
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten des Dienstes.\n"
 
@@ -7880,6 +7919,21 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
+#: src/transport/plugin_transport_udp_broadcasting.c:168
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:548
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:565
+#, 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:3367
 #, c-format
 msgid ""
@@ -7900,6 +7954,7 @@ 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:3717
+#: src/transport/plugin_transport_xu.c:2143
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7909,15 +7964,19 @@ msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
 #: src/transport/plugin_transport_udp.c:3879
 #: src/transport/plugin_transport_udp.c:3893
+#: src/transport/plugin_transport_xu.c:2301
+#: src/transport/plugin_transport_xu.c:2315
 msgid "must be in [0,65535]"
 msgstr ""
 
 #: src/transport/plugin_transport_udp.c:3925
+#: src/transport/plugin_transport_xu.c:2347
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
 #: src/transport/plugin_transport_udp.c:3952
+#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
@@ -7927,21 +7986,6 @@ msgstr "»%s« ist keine gültige IP-Adresse.\n"
 msgid "Failed to create UDP network sockets\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, 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_unix.c:1403
 #, c-format
 msgid "Cannot create path to `%s'\n"
@@ -8023,6 +8067,55 @@ msgstr ""
 msgid "# sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
+#: src/transport/plugin_transport_xt.c:4010
+#, fuzzy, c-format
+msgid "XT transport listening on port %llu\n"
+msgstr "TCP-Transportdienst wartet auf Port %llu\n"
+
+#: src/transport/plugin_transport_xt.c:4014
+#, fuzzy
+msgid "XT transport not listening on any port (client only)\n"
+msgstr "TCP-Transportdienst wartet auf Port %llu\n"
+
+#: src/transport/plugin_transport_xt.c:4018
+#, fuzzy, c-format
+msgid "XT transport advertises itself as being on port %llu\n"
+msgstr "TCP-Transportdienst wartet auf Port %llu\n"
+
+#: src/transport/plugin_transport_xt.c:4022
+#, fuzzy
+msgid "# XT sessions active"
+msgstr "# aktive TCP-Sitzungen"
+
+#: src/transport/plugin_transport_xu.c:1237
+#, c-format
+msgid ""
+"XU could not transmit message to `%s': Network seems down, please check your "
+"network configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:1251
+msgid ""
+"XU 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_xu.c:2125
+#: src/transport/plugin_transport_xu.c:2224
+#, fuzzy, c-format
+msgid "Failed to bind XU socket to %s: %s\n"
+msgstr "UDP-Sockets können nicht geöffnet werden\n"
+
+#: src/transport/plugin_transport_xu.c:2234
+#, fuzzy
+msgid "Failed to open XU sockets\n"
+msgstr "UDP-Sockets können nicht geöffnet werden\n"
+
+#: src/transport/plugin_transport_xu.c:2398
+#, fuzzy
+msgid "Failed to create XU network sockets\n"
+msgstr "UDP-Sockets können nicht geöffnet werden\n"
+
 #: src/transport/tcp_connection_legacy.c:452
 #, c-format
 msgid "Access denied to `%s'\n"
@@ -9114,8 +9207,8 @@ msgstr "Dienst wird über UDP angeboten"
 msgid "Setup tunnels via VPN."
 msgstr "Tunnel über VPN einrichten."
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
 #: src/zonemaster/gnunet-service-zonemaster.c:838
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
diff --git a/po/es.po b/po/es.po
index b6fee1713..2bd5655fb 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: address@hidden"
-"POT-Creation-Date: 2018-06-04 23:27+0200\n"
+"POT-Creation-Date: 2018-06-05 22:13+0200\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -233,6 +233,7 @@ msgstr ""
 "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
 
 #: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
+#: src/transport/plugin_transport_xt.c:1120
 #: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
@@ -245,6 +246,9 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
 #: src/transport/plugin_transport_tcp.c:3825
+#: src/transport/plugin_transport_xt.c:1139
+#: src/transport/plugin_transport_xt.c:1145
+#: src/transport/plugin_transport_xt.c:3833
 #: src/transport/tcp_service_legacy.c:576
 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
 #: src/util/service.c:643
@@ -255,6 +259,7 @@ msgstr ""
 "configuración!\n"
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
+#: src/transport/plugin_transport_xt.c:1176
 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
 #: src/util/service.c:682
 #, c-format
@@ -263,6 +268,7 @@ 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:1180
+#: src/transport/plugin_transport_xt.c:1180
 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
 #: src/util/service.c:687
 #, c-format
@@ -270,6 +276,7 @@ msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
 
 #: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
+#: src/transport/plugin_transport_xt.c:1211
 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
@@ -280,6 +287,7 @@ msgstr ""
 "«%s», no se pudo crear un «socket» UNIX: %s\n"
 
 #: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_xt.c:1228
 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -290,6 +298,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:513
 #: src/transport/plugin_transport_http_server.c:2684
 #: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_xt.c:1259
 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
@@ -298,6 +307,7 @@ msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 #: src/arm/gnunet-service-arm.c:532
 #: src/transport/plugin_transport_http_server.c:2702
 #: src/transport/plugin_transport_tcp.c:1278
+#: src/transport/plugin_transport_xt.c:1278
 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
@@ -376,15 +386,151 @@ msgstr "El servicio «%s» finalizó con estado %s/%d, se 
reiniciará en %llu ms
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Iniciando apagado bajo petición del cliente.\n"
 
-#: src/ats-tests/ats-testing-log.c:837
-msgid "Stop logging\n"
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
+"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
 
-#: src/ats-tests/ats-testing-log.c:892
-#, fuzzy, c-format
-msgid "Start logging `%s'\n"
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+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:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+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:3294 src/ats-tests/gnunet-solver-eval.c:939
+#, fuzzy
+msgid "solver to use"
+msgstr "valor a establecer"
+
+#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3306
+#, fuzzy
+msgid "print logging"
 msgstr "Iniciando descarga «%s».\n"
 
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, fuzzy, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+# Miguel: "Inbound" lo he traducido como entrada en todo el texto.
+#: src/ats/gnunet-service-ats_plugins.c:314
+#, fuzzy, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr "La cuota de entrada configurada para la red «%s» es %llu\n"
+
+#: src/ats/gnunet-service-ats_plugins.c:359
+#, fuzzy, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "¡No se puede inicializar el resolvedor!\n"
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1869
+#, fuzzy, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
+
+#: src/ats/plugin_ats_mlp.c:1913
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Se produjo un fallo al cargar la configuración de %s\n"
+
+#: src/ats/plugin_ats_mlp.c:2670
+#, fuzzy, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+#: src/ats/plugin_ats_mlp.c:2679
+#, fuzzy, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+"No hay configuración de cuota de entrada para la red '%s', asignando el "
+"ancho de banda predeterminado (%llu)\n"
+
+# Miguel: "Outbound" lo he traducido como salida en todo el texto.
+#: src/ats/plugin_ats_mlp.c:2689
+#, fuzzy, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
+
+# Miguel: "Outbound" lo he traducido como salida en todo el texto.
+#: src/ats/plugin_ats_mlp.c:2698
+#, fuzzy, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+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:422
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
@@ -395,6 +541,15 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
+#: src/ats-tests/ats-testing-log.c:837
+msgid "Stop logging\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing-log.c:892
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "Iniciando descarga «%s».\n"
+
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -402,16 +557,6 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294
-#, fuzzy
-msgid "solver to use"
-msgstr "valor a establecer"
-
-#: src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299
-msgid "experiment to use"
-msgstr ""
-
 # Miguel: ¿Como podría traducir "resolutions" y "resolve"?
 # Son difíciles de no calcar, puesto que no conozco como expresar
 # el concepto de obtener una dirección a partir de un nombre
@@ -546,141 +691,6 @@ 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/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-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:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-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:3306
-#, fuzzy
-msgid "print logging"
-msgstr "Iniciando descarga «%s».\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, fuzzy, c-format
-msgid ""
-"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-# Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_plugins.c:314
-#, fuzzy, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr "La cuota de entrada configurada para la red «%s» es %llu\n"
-
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, fuzzy, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "¡No se puede inicializar el resolvedor!\n"
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1869
-#, fuzzy, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
-
-#: src/ats/plugin_ats_mlp.c:1913
-#, fuzzy, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
-
-#: src/ats/plugin_ats_mlp.c:2475
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Se produjo un fallo al cargar la configuración de %s\n"
-
-#: src/ats/plugin_ats_mlp.c:2670
-#, fuzzy, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
-msgstr ""
-"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-#: src/ats/plugin_ats_mlp.c:2679
-#, fuzzy, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
-msgstr ""
-"No hay configuración de cuota de entrada para la red '%s', asignando el "
-"ancho de banda predeterminado (%llu)\n"
-
-# Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2689
-#, fuzzy, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
-
-# Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2698
-#, fuzzy, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
-msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
-
-#: src/ats/plugin_ats_proportional.c:1164
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "Se produjo un fallo al cargar la configuración de %s\n"
-
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -832,28 +842,6 @@ msgid "Connection to conversation service lost, trying to 
reconnect\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/conversation/gnunet-conversation-test.c:119
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:145
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:210
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
-msgstr ""
-
 #: src/conversation/gnunet-conversation.c:270
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1104,16 +1092,38 @@ msgstr "Se produjo un fallo al iniciar el proceso 
«gnunet-peerinfo».\n"
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1300
-msgid "sets the LINE to use for the phone"
+#: src/conversation/gnunet-conversation.c:1300
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:1329
+msgid "Enables having a conversation with other GNUnet users."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:119
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:145
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1329
-msgid "Enables having a conversation with other GNUnet users."
+#: src/conversation/gnunet-conversation-test.c:210
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:361
 #: src/conversation/gnunet_gst.c:622
+#: src/conversation/gnunet-helper-audio-playback-gst.c:361
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1655,15 +1665,15 @@ msgstr ""
 msgid "GNUnet credential resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/credential/gnunet-service-credential.c:1138
-#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184
+#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184
+#: src/gns/gnunet-gns-helper-service-w32.c:727
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
 #: src/credential/gnunet-service-credential.c:1144
-#: src/namestore/gnunet-namestore-fcfsd.c:1084
 #: src/namestore/gnunet-namestore.c:914
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
 #: src/namestore/plugin_rest_namestore.c:1035
 #, c-format
 msgid "Failed to connect to namestore\n"
@@ -2200,6 +2210,55 @@ msgstr "ser prolijo (imprime información de progreso)"
 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:916 src/testbed/gnunet-testbed-profiler.c:253
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "El número máximo de conexiones es %u\n"
+
+#: src/dht/gnunet_dht_profiler.c:949
+msgid "number of peers to start"
+msgstr "número de pares para empezar"
+
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+"nombre del fichero con la información de acceso usada para la batería de "
+"pruebas"
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:969
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:974
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1009
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "Medir la calidad y rendimiento del servicio NSE."
+
 #: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr "¡Se deben proveer «KEY» y «DATA» para una subida a la DHT!\n"
@@ -2454,55 +2513,6 @@ msgstr "# Entradas añadidas a la tabla de encaminamiento"
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
-#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "El número máximo de conexiones es %u\n"
-
-#: src/dht/gnunet_dht_profiler.c:949
-msgid "number of peers to start"
-msgstr "número de pares para empezar"
-
-#: src/dht/gnunet_dht_profiler.c:954
-msgid "number of PUTs to perform per peer"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
-#: src/testbed/gnunet-testbed-profiler.c:304
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-"nombre del fichero con la información de acceso usada para la batería de "
-"pruebas"
-
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:969
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:974
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:979
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:984
-msgid "chance that a peer is selected at random for PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:989
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1009
-#, fuzzy
-msgid "Measure quality and performance of the DHT service."
-msgstr "Medir la calidad y rendimiento del servicio NSE."
-
 #: src/dht/plugin_block_dht.c:189
 #, c-format
 msgid "Block not of type %u\n"
@@ -3520,6 +3530,14 @@ msgstr ""
 "Descargar ficheros de GNUnet usando una URI GNUnet CHK o LOC (gnunet://fs/"
 "chk/...)"
 
+#: src/fs/gnunet-fs.c:119
+msgid "print a list of all indexed files"
+msgstr "imprimir una lista de todos los ficheros indexados"
+
+#: src/fs/gnunet-fs.c:130
+msgid "Special file-sharing operations"
+msgstr "Operaciones especiales de compartición de ficheros"
+
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr "ejecuta el experimento con «COUNT» pares"
@@ -3540,14 +3558,6 @@ msgstr ""
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
 "de ficheros"
 
-#: src/fs/gnunet-fs.c:119
-msgid "print a list of all indexed files"
-msgstr "imprimir una lista de todos los ficheros indexados"
-
-#: src/fs/gnunet-fs.c:130
-msgid "Special file-sharing operations"
-msgstr "Operaciones especiales de compartición de ficheros"
-
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -4239,6 +4249,28 @@ msgstr "¿cuánto tiempo se debe ejecutar? 0 = para 
siempre"
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
+msgstr "Buscar el registro para el nombre dado"
+
+#: src/gns/gnunet-gns.c:238
+msgid "Specify the type of the record to lookup"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr "Sin salida innecesaria"
+
+#: src/gns/gnunet-gns.c:258
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Herramienta de acceso GNUnet GNS"
+
 #: src/gns/gnunet-gns-helper-service-w32.c:602
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
@@ -4258,7 +4290,7 @@ msgstr "Fallo al conectar a gnunetd.\n"
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:109
+#: src/gns/gnunet-gns-proxy.c:111
 #: src/hostlist/gnunet-daemon-hostlist_client.c:535
 #: src/hostlist/gnunet-daemon-hostlist_client.c:753
 #: src/hostlist/gnunet-daemon-hostlist_client.c:759
@@ -4273,125 +4305,103 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:956
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:979
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:956
+#: src/gns/gnunet-gns-proxy.c:1002
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/gns/gnunet-gns-proxy.c:969
+#: src/gns/gnunet-gns-proxy.c:1015
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-gns-proxy.c:984
+#: src/gns/gnunet-gns-proxy.c:1030
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:994
+#: src/gns/gnunet-gns-proxy.c:1040
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1018
+#: src/gns/gnunet-gns-proxy.c:1064
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1132
+#: src/gns/gnunet-gns-proxy.c:1182
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1868
+#: src/gns/gnunet-gns-proxy.c:2017
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2364
+#: src/gns/gnunet-gns-proxy.c:2538
 #, 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:2394
-#, c-format
-msgid "Unable to import certificate %s\n"
+#: src/gns/gnunet-gns-proxy.c:2570
+#, fuzzy, c-format
+msgid "Unable to import certificate from `%s'\n"
 msgstr "No se pudo importar el certificado %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:2573
+#: src/gns/gnunet-gns-proxy.c:2769
 #, 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:2598 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658
 #, 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:2925
+#: src/gns/gnunet-gns-proxy.c:3122
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2954
+#: src/gns/gnunet-gns-proxy.c:3151
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3035
+#: src/gns/gnunet-gns-proxy.c:3232
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3316
+#: src/gns/gnunet-gns-proxy.c:3522
 #, fuzzy, c-format
 msgid "Failed to load X.509 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:3443
+#: src/gns/gnunet-gns-proxy.c:3650
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3448
+#: src/gns/gnunet-gns-proxy.c:3655
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3473
+#: src/gns/gnunet-gns-proxy.c:3681
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:233
-msgid "Lookup a record for the given name"
-msgstr "Buscar el registro para el nombre dado"
-
-#: src/gns/gnunet-gns.c:238
-msgid "Specify the type of the record to lookup"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/gns/gnunet-gns.c:242
-msgid "No unneeded output"
-msgstr "Sin salida innecesaria"
-
-#: src/gns/gnunet-gns.c:258
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Herramienta de acceso GNUnet GNS"
-
 #: src/gns/gnunet-service-gns.c:513
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4403,8 +4413,8 @@ 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:568
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 #: src/zonemaster/gnunet-service-zonemaster.c:875
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
@@ -4945,79 +4955,14 @@ msgstr "¡«%s» no es una dirección IP válida! Ignorando 
«BINDTOIP».\n"
 
 #: src/hostlist/gnunet-daemon-hostlist_server.c:789
 #, fuzzy, c-format
-msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
-msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
-#, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
-msgstr ""
-"No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
-
-#: src/identity-provider/gnunet-idp.c:424
-#, fuzzy
-msgid "Ego is required\n"
-msgstr "Las opción «%s» o «%s» es necesaria.\n"
-
-#: src/identity-provider/gnunet-idp.c:432
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:440
-#, fuzzy
-msgid "Requesting party key is required!\n"
-msgstr "el parámetro --section es necesario\n"
-
-#: src/identity-provider/gnunet-idp.c:463
-msgid "Add attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:469
-msgid "Attribute value"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:474
-msgid "Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:479
-msgid "Audience (relying party)"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:483
-msgid "List attributes for Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:488
-msgid "Issue a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:493
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:498
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:503
-msgid "Type of attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:508
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/identity-provider/identity_provider_api.c:436
-#, fuzzy
-msgid "failed to store record\n"
-msgstr "El almacén de nombres no pudo añadir el registro\n"
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1230
-#: src/identity-provider/plugin_rest_openid_connect.c:2147
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr "Conexión fallida\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
+msgstr ""
+"No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
 
 #: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
@@ -5118,6 +5063,71 @@ msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 msgid "Identity REST API initialized\n"
 msgstr "Conexión fallida\n"
 
+#: src/identity-provider/gnunet-idp.c:424
+#, fuzzy
+msgid "Ego is required\n"
+msgstr "Las opción «%s» o «%s» es necesaria.\n"
+
+#: src/identity-provider/gnunet-idp.c:432
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:440
+#, fuzzy
+msgid "Requesting party key is required!\n"
+msgstr "el parámetro --section es necesario\n"
+
+#: src/identity-provider/gnunet-idp.c:463
+msgid "Add attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:469
+msgid "Attribute value"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:474
+msgid "Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:479
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:483
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:488
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:493
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:498
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:503
+msgid "Type of attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:508
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/identity-provider/identity_provider_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1230
+#: src/identity-provider/plugin_rest_openid_connect.c:2147
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr "Conexión fallida\n"
+
 #: src/json/json.c:119
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -5220,67 +5230,6 @@ msgstr "Se produjo un fallo al crear los índices\n"
 msgid "flat plugin running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
-# form??
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Forma de valor no soportada «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:547
-#, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:567
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:598
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr "Encontrado nombre «%s» para la clave dada\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:678
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr "Encontrados %u registros para el dominio «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:736
-#, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Se produjo un fallo al crear la página para «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:754
-#, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:790
-msgid "Domain name must not contain `.'\n"
-msgstr "El nombre de dominio no puede contener «.»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:799
-msgid "Domain name must not contain `+'\n"
-msgstr "El nombre de dominio no puede contener «+»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1019
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1045
-msgid "Failed to start HTTP server\n"
-msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1092
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Se produjo un fallo al conectar con GNS\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1130
-#, fuzzy
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
-
 #: src/namestore/gnunet-namestore.c:313
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -5454,6 +5403,67 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
 
+# form??
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Forma de valor no soportada «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:547
+#, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:567
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:598
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr "Encontrado nombre «%s» para la clave dada\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:678
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr "Encontrados %u registros para el dominio «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:736
+#, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Se produjo un fallo al crear la página para «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:754
+#, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:790
+msgid "Domain name must not contain `.'\n"
+msgstr "El nombre de dominio no puede contener «.»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:799
+msgid "Domain name must not contain `+'\n"
+msgstr "El nombre de dominio no puede contener «+»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1045
+msgid "Failed to start HTTP server\n"
+msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1092
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1130
+#, fuzzy
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
+
 #: src/namestore/gnunet-service-namestore.c:750
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5783,6 +5793,11 @@ msgstr "comando «external-ip» no encontrado\n"
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
+#: src/nse/gnunet-nse.c:122
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# Estimaciones del tamaño de red recibidas"
+
 #: src/nse/gnunet-nse-profiler.c:849
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "límite al número de conexiones a servicios NSE, 0 para ilimitadas"
@@ -5808,15 +5823,69 @@ msgstr "retraso entre rondas"
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-nse.c:122
-#, fuzzy
-msgid "Show network size estimates from NSE service."
-msgstr "# Estimaciones del tamaño de red recibidas"
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+msgid "Value is too large.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:178
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Eliminando dirección de transporte «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:313
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:449
+msgid "# peers known"
+msgstr "# pares conocidos"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:492
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
+"Eliminado.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:659
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Escaneando directorio «%s».\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:667
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "¡Aún no se han encontrado pares en «%s»!\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "Escaneando directorio «%s».\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr "Importando HELLO de «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
-msgid "Value is too large.\n"
+# Miguel: "Failed to receive" también aquí está traducido como
+# "no se obtuvo respuesta" por claridad.
+#: src/peerinfo/peerinfo_api.c:220
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
+"No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
@@ -5907,65 +5976,6 @@ msgstr "Cargando el módulo de transporte «%s»\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:178
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Eliminando dirección de transporte «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:313
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:334
-#: src/peerinfo/gnunet-service-peerinfo.c:365
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:449
-msgid "# peers known"
-msgstr "# pares conocidos"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:492
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
-"Eliminado.\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:659
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "Escaneando directorio «%s».\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:667
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "¡Aún no se han encontrado pares en «%s»!\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1100
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "Escaneando directorio «%s».\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1438
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr "Importando HELLO de «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1451
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-# Miguel: "Failed to receive" también aquí está traducido como
-# "no se obtuvo respuesta" por claridad.
-#: src/peerinfo/peerinfo_api.c:220
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr ""
-"No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
-
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
@@ -6491,10 +6501,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
@@ -6956,6 +6966,16 @@ msgstr "Petición ignorada porque el ARM se está 
apagando.\n"
 msgid "%.s Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
 
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
+#, fuzzy
+msgid "Waiting for child to exit.\n"
+msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
+
 #: src/testbed/gnunet-testbed-profiler.c:289
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo"
@@ -6967,16 +6987,6 @@ msgid ""
 "signal is received"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:118
-#, fuzzy
-msgid "Waiting for child to exit.\n"
-msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:241
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
-
 #: src/testbed/testbed_api.c:410
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -7297,6 +7307,10 @@ msgstr "# mensajes «HELLO» recibidos"
 msgid "GNUnet topology control"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport.c:448
 msgid "# messages dropped due to slow client"
 msgstr "# mensajes omitidos debido a un cliente lento"
@@ -7345,10 +7359,6 @@ msgstr ""
 "El servicio de transporte carece de opciones de configuración de clave.  "
 "Saliendo.\n"
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
@@ -7690,45 +7700,6 @@ msgstr "# revalidaciones de direcciones iniciadas"
 msgid "# HELLOs given to peerinfo"
 msgstr "# «HELLO» obtenidos de «peerinfo»"
 
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:621
-#, fuzzy
-msgid "receive data from peer"
-msgstr "# respuestas recibidas de otros pares"
-
-#: src/transport/gnunet-transport-profiler.c:626
-#, fuzzy
-msgid "iterations"
-msgstr "Otras configuraciones"
-
-#: src/transport/gnunet-transport-profiler.c:631
-#, fuzzy
-msgid "number of messages to send"
-msgstr "número de mensajes a usar por iteración"
-
-#: src/transport/gnunet-transport-profiler.c:636
-#, fuzzy
-msgid "message size to use"
-msgstr "tamaño del mensaje"
-
-#: src/transport/gnunet-transport-profiler.c:641
-#: src/transport/gnunet-transport.c:1462
-msgid "peer identity"
-msgstr "identidad del par"
-
-#: src/transport/gnunet-transport-profiler.c:652
-#: src/transport/gnunet-transport.c:1482
-msgid "Direct access to transport service."
-msgstr "Acceso directo al servicio de transporte."
-
 #: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7872,6 +7843,11 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
+#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport-profiler.c:641
+msgid "peer identity"
+msgstr "identidad del par"
+
 #: src/transport/gnunet-transport.c:1466
 #, fuzzy
 msgid "monitor plugin sessions"
@@ -7881,11 +7857,47 @@ msgstr "# sesiones wlan pendientes"
 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:1482
+#: src/transport/gnunet-transport-profiler.c:652
+msgid "Direct access to transport service."
+msgstr "Acceso directo al servicio de transporte."
+
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:621
+#, fuzzy
+msgid "receive data from peer"
+msgstr "# respuestas recibidas de otros pares"
+
+#: src/transport/gnunet-transport-profiler.c:626
+#, fuzzy
+msgid "iterations"
+msgstr "Otras configuraciones"
+
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "número de mensajes a usar por iteración"
+
+#: src/transport/gnunet-transport-profiler.c:636
+#, fuzzy
+msgid "message size to use"
+msgstr "tamaño del mensaje"
+
 #: src/transport/plugin_transport_http_client.c:1474
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3526
 #: src/transport/plugin_transport_tcp.c:3891
 #: src/transport/plugin_transport_tcp.c:3898
+#: src/transport/plugin_transport_xt.c:3899
+#: src/transport/plugin_transport_xt.c:3906
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7965,6 +7977,7 @@ msgstr "Encontradas %u direcciones para comunicar al 
servicio NAT\n"
 
 #: src/transport/plugin_transport_http_server.c:2901
 #: src/transport/plugin_transport_udp.c:3623
+#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
@@ -8072,6 +8085,8 @@ msgstr "# bytes omitidos por SMTP (salientes)"
 
 #: src/transport/plugin_transport_tcp.c:1547
 #: src/transport/plugin_transport_tcp.c:2873
+#: src/transport/plugin_transport_xt.c:1553
+#: src/transport/plugin_transport_xt.c:2879
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
@@ -8080,6 +8095,9 @@ msgstr "Longitud de dirección inesperada: %u bytes\n"
 #: src/transport/plugin_transport_tcp.c:1954
 #: src/transport/plugin_transport_tcp.c:3137
 #: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_xt.c:1736
+#: src/transport/plugin_transport_xt.c:1960
+#: src/transport/plugin_transport_xt.c:3143
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
@@ -8089,65 +8107,86 @@ msgstr "# Sesiones TCP activas"
 #: src/transport/plugin_transport_tcp.c:2133
 #: src/transport/plugin_transport_tcp.c:2233
 #: src/transport/plugin_transport_tcp.c:2258
+#: src/transport/plugin_transport_xt.c:1778
+#: src/transport/plugin_transport_xt.c:1942
+#: src/transport/plugin_transport_xt.c:2066
+#: src/transport/plugin_transport_xt.c:2139
+#: src/transport/plugin_transport_xt.c:2239
+#: src/transport/plugin_transport_xt.c:2264
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
 #: src/transport/plugin_transport_tcp.c:1775
+#: src/transport/plugin_transport_xt.c:1781
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
 #: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_xt.c:2069
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
 #: src/transport/plugin_transport_tcp.c:2137
+#: src/transport/plugin_transport_xt.c:2143
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
 #: src/transport/plugin_transport_tcp.c:2535
+#: src/transport/plugin_transport_xt.c:2541
 msgid "# requests to create session with invalid address"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:2711
+#: src/transport/plugin_transport_xt.c:2717
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
 #: src/transport/plugin_transport_tcp.c:3203
+#: src/transport/plugin_transport_xt.c:3209
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
 #: src/transport/plugin_transport_tcp.c:3409
+#: src/transport/plugin_transport_xt.c:3415
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
 #: src/transport/plugin_transport_tcp.c:3460
 #: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_xt.c:3466
+#: src/transport/plugin_transport_xt.c:3524
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# conexiones «stream» activas"
 
 #: src/transport/plugin_transport_tcp.c:3464
+#: src/transport/plugin_transport_xt.c:3470
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# Pares conectados"
 
 #: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_xt.c:3476
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3472
+#: src/transport/plugin_transport_xt.c:3478
 msgid "# TCP service suspended"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3512
+#: src/transport/plugin_transport_xt.c:3518
 msgid "# TCP service resumed"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_xt.c:3528
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
 #: src/transport/plugin_transport_tcp.c:3841
+#: src/transport/plugin_transport_xt.c:3849
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
@@ -8165,6 +8204,23 @@ msgstr "Transporte TCP no escuchando en ningún puerto 
(únicamente cliente)\n"
 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:168
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:548
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:565
+#, 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:3367
 #, c-format
 msgid ""
@@ -8191,6 +8247,7 @@ 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:3717
+#: src/transport/plugin_transport_xu.c:2143
 #, 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"
@@ -8201,15 +8258,19 @@ msgstr "Se produjo un fallo al abrir los «sockets» 
UDP\n"
 
 #: src/transport/plugin_transport_udp.c:3879
 #: src/transport/plugin_transport_udp.c:3893
+#: src/transport/plugin_transport_xu.c:2301
+#: src/transport/plugin_transport_xu.c:2315
 msgid "must be in [0,65535]"
 msgstr ""
 
 #: src/transport/plugin_transport_udp.c:3925
+#: src/transport/plugin_transport_xu.c:2347
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
 #: src/transport/plugin_transport_udp.c:3952
+#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
@@ -8219,23 +8280,6 @@ msgstr "«%s» no es una dirección IP válida.\n"
 msgid "Failed to create UDP network sockets\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, 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_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
@@ -8321,6 +8365,61 @@ msgstr ""
 msgid "# sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
+#: src/transport/plugin_transport_xt.c:4010
+#, fuzzy, c-format
+msgid "XT transport listening on port %llu\n"
+msgstr "Transporte TCP escuchando en el puerto %llu\n"
+
+#: src/transport/plugin_transport_xt.c:4014
+#, fuzzy
+msgid "XT 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_xt.c:4018
+#, fuzzy, c-format
+msgid "XT 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_xt.c:4022
+#, fuzzy
+msgid "# XT sessions active"
+msgstr "# Sesiones TCP activas"
+
+#: src/transport/plugin_transport_xu.c:1237
+#, fuzzy, c-format
+msgid ""
+"XU could not transmit message to `%s': Network seems down, please check your "
+"network configuration\n"
+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_xu.c:1251
+#, fuzzy
+msgid ""
+"XU 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 ""
+"UDP no pudo transmitir el mensaje a «%s». Por favor, compruebe su "
+"configuración de red y deshabilite IPv6 si su conexión carece de una "
+"dirección IPv6 global\n"
+
+#: src/transport/plugin_transport_xu.c:2125
+#: src/transport/plugin_transport_xu.c:2224
+#, fuzzy, c-format
+msgid "Failed to bind XU socket to %s: %s\n"
+msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
+
+#: src/transport/plugin_transport_xu.c:2234
+#, fuzzy
+msgid "Failed to open XU sockets\n"
+msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
+
+#: src/transport/plugin_transport_xu.c:2398
+#, fuzzy
+msgid "Failed to create XU network sockets\n"
+msgstr "Se produjo un fallo al crear una nueva firma"
+
 #: src/transport/tcp_connection_legacy.c:452
 #, c-format
 msgid "Access denied to `%s'\n"
@@ -9444,8 +9543,8 @@ msgstr "el servicio es ofrecido vía UDP"
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
 #: src/zonemaster/gnunet-service-zonemaster.c:838
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
diff --git a/po/fr.po b/po/fr.po
index 9789dc314..a18337c11 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: address@hidden"
-"POT-Creation-Date: 2018-06-04 23:27+0200\n"
+"POT-Creation-Date: 2018-06-05 22:13+0200\n"
 "PO-Revision-Date: 2015-12-24 01:20+0100\n"
 "Last-Translator: Stéphane  Aulery <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
@@ -221,6 +221,7 @@ msgid "Control services and the Automated Restart Manager 
(ARM)"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
+#: src/transport/plugin_transport_xt.c:1120
 #: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
@@ -231,6 +232,9 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
 #: src/transport/plugin_transport_tcp.c:3825
+#: src/transport/plugin_transport_xt.c:1139
+#: src/transport/plugin_transport_xt.c:1145
+#: src/transport/plugin_transport_xt.c:3833
 #: src/transport/tcp_service_legacy.c:576
 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
 #: src/util/service.c:643
@@ -239,6 +243,7 @@ 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:1176
+#: src/transport/plugin_transport_xt.c:1176
 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
 #: src/util/service.c:682
 #, c-format
@@ -246,6 +251,7 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
+#: src/transport/plugin_transport_xt.c:1180
 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
 #: src/util/service.c:687
 #, c-format
@@ -253,6 +259,7 @@ msgid "Using `%s' instead\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
+#: src/transport/plugin_transport_xt.c:1211
 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
@@ -261,6 +268,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_xt.c:1228
 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -269,6 +277,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:513
 #: src/transport/plugin_transport_http_server.c:2684
 #: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_xt.c:1259
 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
@@ -277,6 +286,7 @@ msgstr "Résolution de « %s » échouée : %s\n"
 #: src/arm/gnunet-service-arm.c:532
 #: src/transport/plugin_transport_http_server.c:2702
 #: src/transport/plugin_transport_tcp.c:1278
+#: src/transport/plugin_transport_xt.c:1278
 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
@@ -348,14 +358,131 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:837
-msgid "Stop logging\n"
-msgstr "Arrêter la journalisation\n"
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:892
+#: src/ats/gnunet-ats-solver-eval.c:2799
 #, c-format
-msgid "Start logging `%s'\n"
-msgstr "Démarrer la journalisation « %s »\n"
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
+msgid "solver to use"
+msgstr "solveur utilisé"
+
+#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3306
+msgid "print logging"
+msgstr "afficher le journal"
+
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:314
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:359
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1869
+#, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1913
+#, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/ats/plugin_ats_mlp.c:2670
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2679
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2689
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2698
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr "fornat invalide : « %s »\n"
 
 #: src/ats-tests/ats-testing.c:422
 #, c-format
@@ -367,6 +494,15 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr ""
 
+#: src/ats-tests/ats-testing-log.c:837
+msgid "Stop logging\n"
+msgstr "Arrêter la journalisation\n"
+
+#: src/ats-tests/ats-testing-log.c:892
+#, c-format
+msgid "Start logging `%s'\n"
+msgstr "Démarrer la journalisation « %s »\n"
+
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -374,15 +510,6 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294
-msgid "solver to use"
-msgstr "solveur utilisé"
-
-#: src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299
-msgid "experiment to use"
-msgstr ""
-
 #: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -498,123 +625,6 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3306
-msgid "print logging"
-msgstr "afficher le journal"
-
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:314
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1869
-#, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1913
-#, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2475
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "fornat invalide : « %s »\n"
-
-#: src/ats/plugin_ats_mlp.c:2670
-#, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2679
-#, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2689
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2698
-#, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1164
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "fornat invalide : « %s »\n"
-
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -744,35 +754,13 @@ msgstr ""
 msgid "distribute elements to a static subset of good peers"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:564
-msgid "be more verbose (print received values)"
-msgstr ""
-
-#: src/conversation/conversation_api.c:515
-#: src/conversation/conversation_api_call.c:494
-msgid "Connection to conversation service lost, trying to reconnect\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:119
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:145
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
+#: src/consensus/gnunet-consensus-profiler.c:564
+msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:210
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
+#: src/conversation/conversation_api.c:515
+#: src/conversation/conversation_api_call.c:494
+msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
 #: src/conversation/gnunet-conversation.c:270
@@ -1028,8 +1016,30 @@ msgstr ""
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:361
+#: src/conversation/gnunet-conversation-test.c:119
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:145
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:210
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
 #: src/conversation/gnunet_gst.c:622
+#: src/conversation/gnunet-helper-audio-playback-gst.c:361
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1533,15 +1543,15 @@ msgstr ""
 msgid "GNUnet credential resolver tool"
 msgstr ""
 
-#: src/credential/gnunet-service-credential.c:1138
-#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184
+#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184
+#: src/gns/gnunet-gns-helper-service-w32.c:727
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
 
 #: src/credential/gnunet-service-credential.c:1144
-#: src/namestore/gnunet-namestore-fcfsd.c:1084
 #: src/namestore/gnunet-namestore.c:914
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
 #: src/namestore/plugin_rest_namestore.c:1035
 #, c-format
 msgid "Failed to connect to namestore\n"
@@ -2045,6 +2055,53 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:949
+#, fuzzy
+msgid "number of peers to start"
+msgstr "nombre de valeurs"
+
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:969
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:974
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1009
+msgid "Measure quality and performance of the DHT service."
+msgstr ""
+
 #: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
@@ -2282,53 +2339,6 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
-#, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:949
-#, fuzzy
-msgid "number of peers to start"
-msgstr "nombre de valeurs"
-
-#: src/dht/gnunet_dht_profiler.c:954
-msgid "number of PUTs to perform per peer"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
-#: src/testbed/gnunet-testbed-profiler.c:304
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:969
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:974
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:979
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:984
-msgid "chance that a peer is selected at random for PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:989
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1009
-msgid "Measure quality and performance of the DHT service."
-msgstr ""
-
 #: src/dht/plugin_block_dht.c:189
 #, c-format
 msgid "Block not of type %u\n"
@@ -3257,6 +3267,14 @@ msgid ""
 "chk/...)"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:119
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:130
+msgid "Special file-sharing operations"
+msgstr ""
+
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -3273,14 +3291,6 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:119
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:130
-msgid "Special file-sharing operations"
-msgstr ""
-
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3922,6 +3932,27 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+msgid "Specify the type of the record to lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:258
+msgid "GNUnet GNS resolver tool"
+msgstr ""
+
 #: src/gns/gnunet-gns-helper-service-w32.c:602
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
@@ -3941,7 +3972,7 @@ msgstr ""
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:109
+#: src/gns/gnunet-gns-proxy.c:111
 #: src/hostlist/gnunet-daemon-hostlist_client.c:535
 #: src/hostlist/gnunet-daemon-hostlist_client.c:753
 #: src/hostlist/gnunet-daemon-hostlist_client.c:759
@@ -3956,123 +3987,102 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:956
 #, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:979
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:956
+#: src/gns/gnunet-gns-proxy.c:1002
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:969
+#: src/gns/gnunet-gns-proxy.c:1015
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:984
+#: src/gns/gnunet-gns-proxy.c:1030
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:994
+#: src/gns/gnunet-gns-proxy.c:1040
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1018
+#: src/gns/gnunet-gns-proxy.c:1064
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1132
+#: src/gns/gnunet-gns-proxy.c:1182
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1868
+#: src/gns/gnunet-gns-proxy.c:2017
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2364
+#: src/gns/gnunet-gns-proxy.c:2538
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2394
+#: src/gns/gnunet-gns-proxy.c:2570
 #, c-format
-msgid "Unable to import certificate %s\n"
+msgid "Unable to import certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2573
+#: src/gns/gnunet-gns-proxy.c:2769
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2925
+#: src/gns/gnunet-gns-proxy.c:3122
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2954
+#: src/gns/gnunet-gns-proxy.c:3151
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3035
+#: src/gns/gnunet-gns-proxy.c:3232
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3316
+#: src/gns/gnunet-gns-proxy.c:3522
 #, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3443
+#: src/gns/gnunet-gns-proxy.c:3650
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3448
+#: src/gns/gnunet-gns-proxy.c:3655
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3473
+#: src/gns/gnunet-gns-proxy.c:3681
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:233
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:238
-msgid "Specify the type of the record to lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:242
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:258
-msgid "GNUnet GNS resolver tool"
-msgstr ""
-
 #: src/gns/gnunet-service-gns.c:513
 msgid "Properly base32-encoded public key required"
 msgstr ""
@@ -4082,8 +4092,8 @@ msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
 #: src/gns/gnunet-service-gns.c:568
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 #: src/zonemaster/gnunet-service-zonemaster.c:875
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
@@ -4557,94 +4567,32 @@ msgstr ""
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:718
-#, c-format
-msgid "Address to obtain hostlist: `%s'\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:731
-msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:748
-msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:769
-#, c-format
-msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:789
-#, c-format
-msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
-msgstr ""
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
-#, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:424
-msgid "Ego is required\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:432
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:440
-msgid "Requesting party key is required!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:463
-msgid "Add attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:469
-msgid "Attribute value"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:474
-msgid "Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:479
-msgid "Audience (relying party)"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:483
-msgid "List attributes for Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:488
-msgid "Issue a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:493
-msgid "Consume a ticket"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:718
+#, c-format
+msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/identity-provider/gnunet-idp.c:498
-msgid "Revoke a ticket"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:731
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/identity-provider/gnunet-idp.c:503
-msgid "Type of attribute"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:748
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/identity-provider/gnunet-idp.c:508
-msgid "Expiration interval of the attribute"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:769
+#, c-format
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/identity-provider/identity_provider_api.c:436
-#, fuzzy
-msgid "failed to store record\n"
-msgstr "Échec du démarrage de %s\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:789
+#, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr ""
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1230
-#: src/identity-provider/plugin_rest_openid_connect.c:2147
-msgid "Identity Provider REST API initialized\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
 #: src/identity/gnunet-identity.c:179
@@ -4738,6 +4686,68 @@ msgstr ""
 msgid "Identity REST API initialized\n"
 msgstr ""
 
+#: src/identity-provider/gnunet-idp.c:424
+msgid "Ego is required\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:432
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:440
+msgid "Requesting party key is required!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:463
+msgid "Add attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:469
+msgid "Attribute value"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:474
+msgid "Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:479
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:483
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:488
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:493
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:498
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:503
+msgid "Type of attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:508
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/identity-provider/identity_provider_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1230
+#: src/identity-provider/plugin_rest_openid_connect.c:2147
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
 #: src/json/json.c:119
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -4835,64 +4845,6 @@ msgstr "Résolution de « %s » échouée\n"
 msgid "flat plugin running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:547
-#, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:567
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:598
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:678
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:736
-#, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:754
-#, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:790
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:799
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1019
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1045
-msgid "Failed to start HTTP server\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1092
-msgid "Failed to connect to identity\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1130
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:313
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -5060,6 +5012,64 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:547
+#, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:567
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:598
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:678
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:736
+#, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:754
+#, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:790
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:799
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1045
+msgid "Failed to start HTTP server\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1092
+msgid "Failed to connect to identity\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1130
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
 #: src/namestore/gnunet-service-namestore.c:750
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5362,37 +5372,91 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:849
-msgid "limit to the number of connections to NSE services, 0 for none"
+#: src/nse/gnunet-nse.c:122
+msgid "Show network size estimates from NSE service."
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:849
+msgid "limit to the number of connections to NSE services, 0 for none"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:854
+msgid "name of the file for writing connection information and statistics"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:866
+msgid "name of the file for writing the main results"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:873
+msgid "Number of peers to run in each round, separated by commas"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:884
+msgid "delay between rounds"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:893
+msgid "Measure quality and performance of the NSE service."
+msgstr ""
+
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+msgid "Value is too large.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:178
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:313
+#, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
+#, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:449
+msgid "# peers known"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:854
-msgid "name of the file for writing connection information and statistics"
+#: src/peerinfo/gnunet-service-peerinfo.c:492
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:866
-msgid "name of the file for writing the main results"
+#: src/peerinfo/gnunet-service-peerinfo.c:659
+#, c-format
+msgid "Scanning directory `%s'\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:873
-msgid "Number of peers to run in each round, separated by commas"
+#: src/peerinfo/gnunet-service-peerinfo.c:667
+#, c-format
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
-msgid "delay between rounds"
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#, c-format
+msgid "Cleaning up directory `%s'\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:893
-msgid "Measure quality and performance of the NSE service."
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
-msgid "Show network size estimates from NSE service."
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
+msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
-msgid "Value is too large.\n"
+#: src/peerinfo/peerinfo_api.c:220
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:239
@@ -5484,60 +5548,6 @@ msgstr ""
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:178
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:313
-#, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:334
-#: src/peerinfo/gnunet-service-peerinfo.c:365
-#, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:449
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:492
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:659
-#, c-format
-msgid "Scanning directory `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:667
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1100
-#, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1438
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1451
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:220
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr ""
-
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
@@ -6022,10 +6032,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 msgid "Connect to CADET failed\n"
 msgstr ""
 
@@ -6471,6 +6481,15 @@ msgstr ""
 msgid "%.s Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
 
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
+msgid "Waiting for child to exit.\n"
+msgstr ""
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
+#, c-format
+msgid "Spawning process `%s'\n"
+msgstr ""
+
 #: src/testbed/gnunet-testbed-profiler.c:289
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6482,15 +6501,6 @@ msgid ""
 "signal is received"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:118
-msgid "Waiting for child to exit.\n"
-msgstr ""
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:241
-#, c-format
-msgid "Spawning process `%s'\n"
-msgstr ""
-
 #: src/testbed/testbed_api.c:410
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -6778,6 +6788,10 @@ msgstr ""
 msgid "GNUnet topology control"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport.c:448
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -6822,10 +6836,6 @@ msgstr ""
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
@@ -7131,42 +7141,6 @@ msgstr ""
 msgid "# HELLOs given to peerinfo"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:621
-msgid "receive data from peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:626
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:631
-#, fuzzy
-msgid "number of messages to send"
-msgstr "nombre de valeurs"
-
-#: src/transport/gnunet-transport-profiler.c:636
-msgid "message size to use"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:641
-#: src/transport/gnunet-transport.c:1462
-msgid "peer identity"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:652
-#: src/transport/gnunet-transport.c:1482
-msgid "Direct access to transport service."
-msgstr ""
-
 #: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7295,6 +7269,11 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr ""
 
+#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport-profiler.c:641
+msgid "peer identity"
+msgstr ""
+
 #: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7303,11 +7282,44 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
+#: src/transport/gnunet-transport.c:1482
+#: src/transport/gnunet-transport-profiler.c:652
+msgid "Direct access to transport service."
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:621
+msgid "receive data from peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:626
+msgid "iterations"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "nombre de valeurs"
+
+#: src/transport/gnunet-transport-profiler.c:636
+msgid "message size to use"
+msgstr ""
+
 #: src/transport/plugin_transport_http_client.c:1474
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3526
 #: src/transport/plugin_transport_tcp.c:3891
 #: src/transport/plugin_transport_tcp.c:3898
+#: src/transport/plugin_transport_xt.c:3899
+#: src/transport/plugin_transport_xt.c:3906
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7377,6 +7389,7 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2901
 #: src/transport/plugin_transport_udp.c:3623
+#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7476,6 +7489,8 @@ msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:1547
 #: src/transport/plugin_transport_tcp.c:2873
+#: src/transport/plugin_transport_xt.c:1553
+#: src/transport/plugin_transport_xt.c:2879
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
@@ -7484,6 +7499,9 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1954
 #: src/transport/plugin_transport_tcp.c:3137
 #: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_xt.c:1736
+#: src/transport/plugin_transport_xt.c:1960
+#: src/transport/plugin_transport_xt.c:3143
 msgid "# TCP sessions active"
 msgstr "# Session TCP active"
 
@@ -7493,64 +7511,85 @@ msgstr "# Session TCP active"
 #: src/transport/plugin_transport_tcp.c:2133
 #: src/transport/plugin_transport_tcp.c:2233
 #: src/transport/plugin_transport_tcp.c:2258
+#: src/transport/plugin_transport_xt.c:1778
+#: src/transport/plugin_transport_xt.c:1942
+#: src/transport/plugin_transport_xt.c:2066
+#: src/transport/plugin_transport_xt.c:2139
+#: src/transport/plugin_transport_xt.c:2239
+#: src/transport/plugin_transport_xt.c:2264
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:1775
+#: src/transport/plugin_transport_xt.c:1781
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_xt.c:2069
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:2137
+#: src/transport/plugin_transport_xt.c:2143
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:2535
+#: src/transport/plugin_transport_xt.c:2541
 msgid "# requests to create session with invalid address"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:2711
+#: src/transport/plugin_transport_xt.c:2717
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3203
+#: src/transport/plugin_transport_xt.c:3209
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3409
+#: src/transport/plugin_transport_xt.c:3415
 msgid "# bytes received via TCP"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3460
 #: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_xt.c:3466
+#: src/transport/plugin_transport_xt.c:3524
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# Session TCP active"
 
 #: src/transport/plugin_transport_tcp.c:3464
+#: src/transport/plugin_transport_xt.c:3470
 msgid "# TCP server connect events"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_xt.c:3476
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3472
+#: src/transport/plugin_transport_xt.c:3478
 msgid "# TCP service suspended"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3512
+#: src/transport/plugin_transport_xt.c:3518
 msgid "# TCP service resumed"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_xt.c:3528
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3841
+#: src/transport/plugin_transport_xt.c:3849
 msgid "Failed to start service.\n"
 msgstr ""
 
@@ -7568,6 +7607,20 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
+#: src/transport/plugin_transport_udp_broadcasting.c:168
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:548
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:565
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
@@ -7588,6 +7641,7 @@ 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:3717
+#: src/transport/plugin_transport_xu.c:2143
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7597,15 +7651,19 @@ msgstr ""
 
 #: src/transport/plugin_transport_udp.c:3879
 #: src/transport/plugin_transport_udp.c:3893
+#: src/transport/plugin_transport_xu.c:2301
+#: src/transport/plugin_transport_xu.c:2315
 msgid "must be in [0,65535]"
 msgstr ""
 
 #: src/transport/plugin_transport_udp.c:3925
+#: src/transport/plugin_transport_xu.c:2347
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "adresse invalide"
 
 #: src/transport/plugin_transport_udp.c:3952
+#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "adresse invalide"
@@ -7614,20 +7672,6 @@ msgstr "adresse invalide"
 msgid "Failed to create UDP network sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
 #: src/transport/plugin_transport_unix.c:1403
 #, c-format
 msgid "Cannot create path to `%s'\n"
@@ -7700,6 +7744,54 @@ msgstr ""
 msgid "# sessions allocated"
 msgstr "# Session TCP active"
 
+#: src/transport/plugin_transport_xt.c:4010
+#, c-format
+msgid "XT transport listening on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4014
+msgid "XT transport not listening on any port (client only)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4018
+#, c-format
+msgid "XT transport advertises itself as being on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4022
+#, fuzzy
+msgid "# XT sessions active"
+msgstr "# Session TCP active"
+
+#: src/transport/plugin_transport_xu.c:1237
+#, c-format
+msgid ""
+"XU could not transmit message to `%s': Network seems down, please check your "
+"network configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:1251
+msgid ""
+"XU 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_xu.c:2125
+#: src/transport/plugin_transport_xu.c:2224
+#, fuzzy, c-format
+msgid "Failed to bind XU socket to %s: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/transport/plugin_transport_xu.c:2234
+#, fuzzy
+msgid "Failed to open XU sockets\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/transport/plugin_transport_xu.c:2398
+#, fuzzy
+msgid "Failed to create XU network sockets\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
 #: src/transport/tcp_connection_legacy.c:452
 #, c-format
 msgid "Access denied to `%s'\n"
@@ -8762,8 +8854,8 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
 #: src/zonemaster/gnunet-service-zonemaster.c:838
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index e7f91eb35..d6f9dfe28 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: address@hidden"
-"POT-Creation-Date: 2018-06-04 23:27+0200\n"
+"POT-Creation-Date: 2018-06-05 22:13+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -227,6 +227,7 @@ msgid "Control services and the Automated Restart Manager 
(ARM)"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
+#: src/transport/plugin_transport_xt.c:1120
 #: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
@@ -237,6 +238,9 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
 #: src/transport/plugin_transport_tcp.c:3825
+#: src/transport/plugin_transport_xt.c:1139
+#: src/transport/plugin_transport_xt.c:1145
+#: src/transport/plugin_transport_xt.c:3833
 #: src/transport/tcp_service_legacy.c:576
 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
 #: src/util/service.c:643
@@ -245,6 +249,7 @@ 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:1176
+#: src/transport/plugin_transport_xt.c:1176
 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
 #: src/util/service.c:682
 #, c-format
@@ -252,6 +257,7 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
+#: src/transport/plugin_transport_xt.c:1180
 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
 #: src/util/service.c:687
 #, fuzzy, c-format
@@ -259,6 +265,7 @@ msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
 #: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
+#: src/transport/plugin_transport_xt.c:1211
 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
@@ -267,6 +274,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_xt.c:1228
 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -275,6 +283,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:513
 #: src/transport/plugin_transport_http_server.c:2684
 #: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_xt.c:1259
 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
@@ -283,6 +292,7 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 #: src/arm/gnunet-service-arm.c:532
 #: src/transport/plugin_transport_http_server.c:2702
 #: src/transport/plugin_transport_tcp.c:1278
+#: src/transport/plugin_transport_xt.c:1278
 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
@@ -355,15 +365,133 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:837
-msgid "Stop logging\n"
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:892
-#, fuzzy, c-format
-msgid "Start logging `%s'\n"
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3306
+#, fuzzy
+msgid "print logging"
 msgstr "Startade samling \"%s\".\n"
 
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:314
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:359
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1869
+#, fuzzy, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+
+#: src/ats/plugin_ats_mlp.c:1913
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/ats/plugin_ats_mlp.c:2670
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2679
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2689
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2698
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
 #: src/ats-tests/ats-testing.c:422
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
@@ -374,6 +502,15 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
+#: src/ats-tests/ats-testing-log.c:837
+msgid "Stop logging\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing-log.c:892
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -381,15 +518,6 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294
-msgid "solver to use"
-msgstr ""
-
-#: src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299
-msgid "experiment to use"
-msgstr ""
-
 #: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -511,124 +639,6 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3306
-#, fuzzy
-msgid "print logging"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:314
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "Kunde inte initiera SQLite.\n"
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1869
-#, fuzzy, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
-
-#: src/ats/plugin_ats_mlp.c:1913
-#, fuzzy, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
-
-#: src/ats/plugin_ats_mlp.c:2475
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/ats/plugin_ats_mlp.c:2670
-#, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2679
-#, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2689
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2698
-#, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1164
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -773,30 +783,8 @@ msgid "be more verbose (print received values)"
 msgstr ""
 
 #: src/conversation/conversation_api.c:515
-#: src/conversation/conversation_api_call.c:494
-msgid "Connection to conversation service lost, trying to reconnect\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:119
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:145
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:210
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
+#: src/conversation/conversation_api_call.c:494
+msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
 #: src/conversation/gnunet-conversation.c:270
@@ -1056,8 +1044,30 @@ msgstr ""
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:361
+#: src/conversation/gnunet-conversation-test.c:119
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:145
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:210
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
 #: src/conversation/gnunet_gst.c:622
+#: src/conversation/gnunet-helper-audio-playback-gst.c:361
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1611,15 +1621,15 @@ msgstr ""
 msgid "GNUnet credential resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/credential/gnunet-service-credential.c:1138
-#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184
+#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184
+#: src/gns/gnunet-gns-helper-service-w32.c:727
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/credential/gnunet-service-credential.c:1144
-#: src/namestore/gnunet-namestore-fcfsd.c:1084
 #: src/namestore/gnunet-namestore.c:914
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
 #: src/namestore/plugin_rest_namestore.c:1035
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
@@ -2144,6 +2154,54 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "Maximalt antal chattklienter uppnått.\n"
+
+#: src/dht/gnunet_dht_profiler.c:949
+#, fuzzy
+msgid "number of peers to start"
+msgstr "antal iterationer"
+
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:969
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:974
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1009
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "Kan inte tillgå tjänsten"
+
 #: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
@@ -2406,54 +2464,6 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "Maximalt antal chattklienter uppnått.\n"
-
-#: src/dht/gnunet_dht_profiler.c:949
-#, fuzzy
-msgid "number of peers to start"
-msgstr "antal iterationer"
-
-#: src/dht/gnunet_dht_profiler.c:954
-msgid "number of PUTs to perform per peer"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
-#: src/testbed/gnunet-testbed-profiler.c:304
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:969
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:974
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:979
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:984
-msgid "chance that a peer is selected at random for PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:989
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1009
-#, fuzzy
-msgid "Measure quality and performance of the DHT service."
-msgstr "Kan inte tillgå tjänsten"
-
 #: src/dht/plugin_block_dht.c:189
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -3435,6 +3445,15 @@ msgid ""
 "chk/...)"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:119
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:130
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Visa alla alternativ"
+
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -3451,15 +3470,6 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:119
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:130
-#, fuzzy
-msgid "Special file-sharing operations"
-msgstr "Visa alla alternativ"
-
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -4142,6 +4152,29 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+#, fuzzy
+msgid "Specify the type of the record to lookup"
+msgstr "ange prioritet för innehållet"
+
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:258
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Spåra GNUnets nätverkstopologi."
+
 #: src/gns/gnunet-gns-helper-service-w32.c:602
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
@@ -4161,7 +4194,7 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:109
+#: src/gns/gnunet-gns-proxy.c:111
 #: src/hostlist/gnunet-daemon-hostlist_client.c:535
 #: src/hostlist/gnunet-daemon-hostlist_client.c:753
 #: src/hostlist/gnunet-daemon-hostlist_client.c:759
@@ -4176,126 +4209,103 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:956
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:979
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:956
+#: src/gns/gnunet-gns-proxy.c:1002
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/gns/gnunet-gns-proxy.c:969
+#: src/gns/gnunet-gns-proxy.c:1015
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:984
+#: src/gns/gnunet-gns-proxy.c:1030
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:994
+#: src/gns/gnunet-gns-proxy.c:1040
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1018
+#: src/gns/gnunet-gns-proxy.c:1064
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1132
+#: src/gns/gnunet-gns-proxy.c:1182
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1868
+#: src/gns/gnunet-gns-proxy.c:2017
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2364
+#: src/gns/gnunet-gns-proxy.c:2538
 #, 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:2394
+#: src/gns/gnunet-gns-proxy.c:2570
 #, fuzzy, c-format
-msgid "Unable to import certificate %s\n"
+msgid "Unable to import certificate from `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2573
+#: src/gns/gnunet-gns-proxy.c:2769
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2925
+#: src/gns/gnunet-gns-proxy.c:3122
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2954
+#: src/gns/gnunet-gns-proxy.c:3151
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3035
+#: src/gns/gnunet-gns-proxy.c:3232
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3316
+#: src/gns/gnunet-gns-proxy.c:3522
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3443
+#: src/gns/gnunet-gns-proxy.c:3650
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3448
+#: src/gns/gnunet-gns-proxy.c:3655
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3473
+#: src/gns/gnunet-gns-proxy.c:3681
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:233
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:238
-#, fuzzy
-msgid "Specify the type of the record to lookup"
-msgstr "ange prioritet för innehållet"
-
-#: src/gns/gnunet-gns.c:242
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:258
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Spåra GNUnets nätverkstopologi."
-
 #: src/gns/gnunet-service-gns.c:513
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4307,8 +4317,8 @@ msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/gns/gnunet-service-gns.c:568
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 #: src/zonemaster/gnunet-service-zonemaster.c:875
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -4814,80 +4824,15 @@ msgstr "\"%s\" är inte tillgänglig."
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:789
-#, fuzzy, c-format
-msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
-msgstr "\"%s\" är inte tillgänglig."
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
-#, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:424
-#, fuzzy
-msgid "Ego is required\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/identity-provider/gnunet-idp.c:432
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:440
-#, fuzzy
-msgid "Requesting party key is required!\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/identity-provider/gnunet-idp.c:463
-msgid "Add attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:469
-msgid "Attribute value"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:474
-msgid "Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:479
-msgid "Audience (relying party)"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:483
-msgid "List attributes for Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:488
-msgid "Issue a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:493
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:498
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:503
-msgid "Type of attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:508
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/identity-provider/identity_provider_api.c:436
-#, fuzzy
-msgid "failed to store record\n"
-msgstr "Misslyckades att starta samling.\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:789
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr "\"%s\" är inte tillgänglig."
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1230
-#: src/identity-provider/plugin_rest_openid_connect.c:2147
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
+msgstr ""
 
 #: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
@@ -4981,6 +4926,71 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 msgid "Identity REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
+#: src/identity-provider/gnunet-idp.c:424
+#, fuzzy
+msgid "Ego is required\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/identity-provider/gnunet-idp.c:432
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:440
+#, fuzzy
+msgid "Requesting party key is required!\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/identity-provider/gnunet-idp.c:463
+msgid "Add attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:469
+msgid "Attribute value"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:474
+msgid "Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:479
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:483
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:488
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:493
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:498
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:503
+msgid "Type of attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:508
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/identity-provider/identity_provider_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1230
+#: src/identity-provider/plugin_rest_openid_connect.c:2147
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
 #: src/json/json.c:119
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -5081,66 +5091,6 @@ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 msgid "flat plugin running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:547
-#, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:567
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:598
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:678
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:736
-#, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:754
-#, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:790
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:799
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1019
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1045
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1092
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1130
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:313
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
@@ -5318,6 +5268,66 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
 
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:547
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:567
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:598
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:678
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:736
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:754
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:790
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:799
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1092
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1130
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
 #: src/namestore/gnunet-service-namestore.c:750
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5636,6 +5646,11 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
+#: src/nse/gnunet-nse.c:122
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# byte mottogs via TCP"
+
 #: src/nse/gnunet-nse-profiler.c:849
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
@@ -5653,24 +5668,74 @@ msgstr ""
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
-msgid "delay between rounds"
+#: src/nse/gnunet-nse-profiler.c:884
+msgid "delay between rounds"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:893
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Kan inte tillgå tjänsten"
+
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+msgid "Value is too large.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:178
+#, fuzzy, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Tillgängliga transport(er): %s\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:313
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:449
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:492
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:659
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:667
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:893
-#, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "Kan inte tillgå tjänsten"
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
 
-#: src/nse/gnunet-nse.c:122
+#: src/peerinfo/peerinfo_api.c:220
 #, fuzzy
-msgid "Show network size estimates from NSE service."
-msgstr "# byte mottogs via TCP"
-
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
-msgid "Value is too large.\n"
-msgstr ""
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
@@ -5762,61 +5827,6 @@ msgstr "Testar transport(er) %s\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:178
-#, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Tillgängliga transport(er): %s\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:313
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:334
-#: src/peerinfo/gnunet-service-peerinfo.c:365
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:449
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:492
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:659
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:667
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1100
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1438
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1451
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:220
-#, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
@@ -6340,10 +6350,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
@@ -6800,6 +6810,16 @@ msgstr ""
 msgid "%.s Unknown result code."
 msgstr ""
 
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
+#, fuzzy
+msgid "Waiting for child to exit.\n"
+msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
 #: src/testbed/gnunet-testbed-profiler.c:289
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6811,16 +6831,6 @@ msgid ""
 "signal is received"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:118
-#, fuzzy
-msgid "Waiting for child to exit.\n"
-msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:241
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
 #: src/testbed/testbed_api.c:410
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -7117,6 +7127,10 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "GNUnet topology control"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport.c:448
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -7165,10 +7179,6 @@ msgstr ""
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
@@ -7505,46 +7515,6 @@ msgstr ""
 msgid "# HELLOs given to peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:621
-#, fuzzy
-msgid "receive data from peer"
-msgstr "# byte mottagna av typen %d"
-
-#: src/transport/gnunet-transport-profiler.c:626
-#, fuzzy
-msgid "iterations"
-msgstr "Visa alla alternativ"
-
-#: src/transport/gnunet-transport-profiler.c:631
-#, fuzzy
-msgid "number of messages to send"
-msgstr "antal meddelanden att använda per iteration"
-
-#: src/transport/gnunet-transport-profiler.c:636
-#, fuzzy
-msgid "message size to use"
-msgstr "meddelandestorlek"
-
-#: src/transport/gnunet-transport-profiler.c:641
-#: src/transport/gnunet-transport.c:1462
-msgid "peer identity"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:652
-#: src/transport/gnunet-transport.c:1482
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
 #: src/transport/gnunet-transport.c:413
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7684,6 +7654,11 @@ msgstr "Skriv ut information om GNUnets motparter."
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
+#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport-profiler.c:641
+msgid "peer identity"
+msgstr ""
+
 #: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7692,11 +7667,48 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
+#: src/transport/gnunet-transport.c:1482
+#: src/transport/gnunet-transport-profiler.c:652
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:621
+#, fuzzy
+msgid "receive data from peer"
+msgstr "# byte mottagna av typen %d"
+
+#: src/transport/gnunet-transport-profiler.c:626
+#, fuzzy
+msgid "iterations"
+msgstr "Visa alla alternativ"
+
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "antal meddelanden att använda per iteration"
+
+#: src/transport/gnunet-transport-profiler.c:636
+#, fuzzy
+msgid "message size to use"
+msgstr "meddelandestorlek"
+
 #: src/transport/plugin_transport_http_client.c:1474
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3526
 #: src/transport/plugin_transport_tcp.c:3891
 #: src/transport/plugin_transport_tcp.c:3898
+#: src/transport/plugin_transport_xt.c:3899
+#: src/transport/plugin_transport_xt.c:3906
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7768,6 +7780,7 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2901
 #: src/transport/plugin_transport_udp.c:3623
+#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7879,6 +7892,8 @@ msgstr "# byte kastade via TCP (utgående)"
 
 #: src/transport/plugin_transport_tcp.c:1547
 #: src/transport/plugin_transport_tcp.c:2873
+#: src/transport/plugin_transport_xt.c:1553
+#: src/transport/plugin_transport_xt.c:2879
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
@@ -7887,6 +7902,9 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1954
 #: src/transport/plugin_transport_tcp.c:3137
 #: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_xt.c:1736
+#: src/transport/plugin_transport_xt.c:1960
+#: src/transport/plugin_transport_xt.c:3143
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
@@ -7897,70 +7915,91 @@ msgstr "# sessionsnycklar accepterade"
 #: src/transport/plugin_transport_tcp.c:2133
 #: src/transport/plugin_transport_tcp.c:2233
 #: src/transport/plugin_transport_tcp.c:2258
+#: src/transport/plugin_transport_xt.c:1778
+#: src/transport/plugin_transport_xt.c:1942
+#: src/transport/plugin_transport_xt.c:2066
+#: src/transport/plugin_transport_xt.c:2139
+#: src/transport/plugin_transport_xt.c:2239
+#: src/transport/plugin_transport_xt.c:2264
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
 #: src/transport/plugin_transport_tcp.c:1775
+#: src/transport/plugin_transport_xt.c:1781
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
 #: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_xt.c:2069
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
 #: src/transport/plugin_transport_tcp.c:2137
+#: src/transport/plugin_transport_xt.c:2143
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
 #: src/transport/plugin_transport_tcp.c:2535
+#: src/transport/plugin_transport_xt.c:2541
 msgid "# requests to create session with invalid address"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:2711
+#: src/transport/plugin_transport_xt.c:2717
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3203
+#: src/transport/plugin_transport_xt.c:3209
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
 #: src/transport/plugin_transport_tcp.c:3409
+#: src/transport/plugin_transport_xt.c:3415
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
 #: src/transport/plugin_transport_tcp.c:3460
 #: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_xt.c:3466
+#: src/transport/plugin_transport_xt.c:3524
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "Nätverksanslutning"
 
 #: src/transport/plugin_transport_tcp.c:3464
+#: src/transport/plugin_transport_xt.c:3470
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# av anslutna parter"
 
 #: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_xt.c:3476
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3472
+#: src/transport/plugin_transport_xt.c:3478
 msgid "# TCP service suspended"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3512
+#: src/transport/plugin_transport_xt.c:3518
 msgid "# TCP service resumed"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_xt.c:3528
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3841
+#: src/transport/plugin_transport_xt.c:3849
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
@@ -7979,6 +8018,21 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
+#: src/transport/plugin_transport_udp_broadcasting.c:168
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:548
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:565
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
@@ -7999,6 +8053,7 @@ 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:3717
+#: src/transport/plugin_transport_xu.c:2143
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
@@ -8009,15 +8064,19 @@ msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
 #: src/transport/plugin_transport_udp.c:3879
 #: src/transport/plugin_transport_udp.c:3893
+#: src/transport/plugin_transport_xu.c:2301
+#: src/transport/plugin_transport_xu.c:2315
 msgid "must be in [0,65535]"
 msgstr ""
 
 #: src/transport/plugin_transport_udp.c:3925
+#: src/transport/plugin_transport_xu.c:2347
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
 #: src/transport/plugin_transport_udp.c:3952
+#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
@@ -8027,21 +8086,6 @@ msgstr "\"%s\" är inte tillgänglig."
 msgid "Failed to create UDP network sockets\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
 #: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
@@ -8124,6 +8168,54 @@ msgstr ""
 msgid "# sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
+#: src/transport/plugin_transport_xt.c:4010
+#, c-format
+msgid "XT transport listening on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4014
+msgid "XT transport not listening on any port (client only)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4018
+#, c-format
+msgid "XT transport advertises itself as being on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4022
+#, fuzzy
+msgid "# XT sessions active"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/transport/plugin_transport_xu.c:1237
+#, c-format
+msgid ""
+"XU could not transmit message to `%s': Network seems down, please check your "
+"network configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:1251
+msgid ""
+"XU 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_xu.c:2125
+#: src/transport/plugin_transport_xu.c:2224
+#, fuzzy, c-format
+msgid "Failed to bind XU socket to %s: %s\n"
+msgstr "Misslyckades att binda till UDP6-port %d.\n"
+
+#: src/transport/plugin_transport_xu.c:2234
+#, fuzzy
+msgid "Failed to open XU sockets\n"
+msgstr "Misslyckades att binda till UDP6-port %d.\n"
+
+#: src/transport/plugin_transport_xu.c:2398
+#, fuzzy
+msgid "Failed to create XU network sockets\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
 #: src/transport/tcp_connection_legacy.c:452
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
@@ -9216,8 +9308,8 @@ msgstr "# byte mottagna via UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
 #: src/zonemaster/gnunet-service-zonemaster.c:838
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
diff --git a/po/vi.po b/po/vi.po
index 8dc190439..7303a5176 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: address@hidden"
-"POT-Creation-Date: 2018-06-04 23:27+0200\n"
+"POT-Creation-Date: 2018-06-05 22:13+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -234,6 +234,7 @@ msgid "Control services and the Automated Restart Manager 
(ARM)"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
+#: src/transport/plugin_transport_xt.c:1120
 #: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
@@ -244,6 +245,9 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
 #: src/transport/plugin_transport_tcp.c:3825
+#: src/transport/plugin_transport_xt.c:1139
+#: src/transport/plugin_transport_xt.c:1145
+#: src/transport/plugin_transport_xt.c:3833
 #: src/transport/tcp_service_legacy.c:576
 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
 #: src/util/service.c:643
@@ -252,6 +256,7 @@ 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:1176
+#: src/transport/plugin_transport_xt.c:1176
 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
 #: src/util/service.c:682
 #, c-format
@@ -259,6 +264,7 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
+#: src/transport/plugin_transport_xt.c:1180
 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
 #: src/util/service.c:687
 #, fuzzy, c-format
@@ -266,6 +272,7 @@ msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
 #: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
+#: src/transport/plugin_transport_xt.c:1211
 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
@@ -274,6 +281,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_xt.c:1228
 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -282,6 +290,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:513
 #: src/transport/plugin_transport_http_server.c:2684
 #: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_xt.c:1259
 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
@@ -290,6 +299,7 @@ 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:2702
 #: src/transport/plugin_transport_tcp.c:1278
+#: src/transport/plugin_transport_xt.c:1278
 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
@@ -362,15 +372,132 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:837
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3306
 #, fuzzy
-msgid "Stop logging\n"
+msgid "print logging"
 msgstr "Theo dõi"
 
-#: src/ats-tests/ats-testing-log.c:892
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:314
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:359
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:451
 #, fuzzy, c-format
-msgid "Start logging `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1869
+#, fuzzy, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
+
+#: src/ats/plugin_ats_mlp.c:1913
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/ats/plugin_ats_mlp.c:2670
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2679
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2689
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2698
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+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:422
 #, c-format
@@ -382,6 +509,16 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
+#: src/ats-tests/ats-testing-log.c:837
+#, fuzzy
+msgid "Stop logging\n"
+msgstr "Theo dõi"
+
+#: src/ats-tests/ats-testing-log.c:892
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -389,15 +526,6 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294
-msgid "solver to use"
-msgstr ""
-
-#: src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299
-msgid "experiment to use"
-msgstr ""
-
 #: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -520,124 +648,6 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3306
-#, fuzzy
-msgid "print logging"
-msgstr "Theo dõi"
-
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:314
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "Không thể sơ khởi SQLite: %s.\n"
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1869
-#, fuzzy, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
-
-#: src/ats/plugin_ats_mlp.c:1913
-#, fuzzy, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
-
-#: src/ats/plugin_ats_mlp.c:2475
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/ats/plugin_ats_mlp.c:2670
-#, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2679
-#, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2689
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2698
-#, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1164
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -786,28 +796,6 @@ msgstr ""
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:119
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:145
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:210
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
-msgstr ""
-
 #: src/conversation/gnunet-conversation.c:270
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1057,16 +1045,38 @@ msgstr "Lỗi bắt đầu thu thập.\n"
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1300
-msgid "sets the LINE to use for the phone"
+#: src/conversation/gnunet-conversation.c:1300
+msgid "sets the LINE to use for the phone"
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:1329
+msgid "Enables having a conversation with other GNUnet users."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:119
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:145
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1329
-msgid "Enables having a conversation with other GNUnet users."
+#: src/conversation/gnunet-conversation-test.c:210
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:361
 #: src/conversation/gnunet_gst.c:622
+#: src/conversation/gnunet-helper-audio-playback-gst.c:361
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1620,15 +1630,15 @@ msgstr ""
 msgid "GNUnet credential resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/credential/gnunet-service-credential.c:1138
-#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184
+#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184
+#: src/gns/gnunet-gns-helper-service-w32.c:727
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/credential/gnunet-service-credential.c:1144
-#: src/namestore/gnunet-namestore-fcfsd.c:1084
 #: src/namestore/gnunet-namestore.c:914
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
 #: src/namestore/plugin_rest_namestore.c:1035
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
@@ -2166,6 +2176,54 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#, 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"
+
+#: src/dht/gnunet_dht_profiler.c:949
+#, fuzzy
+msgid "number of peers to start"
+msgstr "số lần lặp lại"
+
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:969
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:974
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1009
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "Không thể truy cập đến dịch vụ"
+
 #: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
@@ -2429,54 +2487,6 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
-#, 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"
-
-#: src/dht/gnunet_dht_profiler.c:949
-#, fuzzy
-msgid "number of peers to start"
-msgstr "số lần lặp lại"
-
-#: src/dht/gnunet_dht_profiler.c:954
-msgid "number of PUTs to perform per peer"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
-#: src/testbed/gnunet-testbed-profiler.c:304
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:969
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:974
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:979
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:984
-msgid "chance that a peer is selected at random for PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:989
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1009
-#, fuzzy
-msgid "Measure quality and performance of the DHT service."
-msgstr "Không thể truy cập đến dịch vụ"
-
 #: src/dht/plugin_block_dht.c:189
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -3458,6 +3468,15 @@ msgid ""
 "chk/...)"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:119
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:130
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Tùy chọn chia sẻ tập tin"
+
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -3474,15 +3493,6 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:119
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:130
-#, fuzzy
-msgid "Special file-sharing operations"
-msgstr "Tùy chọn chia sẻ tập tin"
-
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -4188,6 +4198,29 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+#, fuzzy
+msgid "Specify the type of the record to lookup"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:258
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Bản ghi lỗi GNUnet"
+
 #: src/gns/gnunet-gns-helper-service-w32.c:602
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
@@ -4207,7 +4240,7 @@ msgstr "Lỗi kết nối đến gnunetd.\n"
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:109
+#: src/gns/gnunet-gns-proxy.c:111
 #: src/hostlist/gnunet-daemon-hostlist_client.c:535
 #: src/hostlist/gnunet-daemon-hostlist_client.c:753
 #: src/hostlist/gnunet-daemon-hostlist_client.c:759
@@ -4222,126 +4255,103 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:956
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:979
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:956
+#: src/gns/gnunet-gns-proxy.c:1002
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:969
+#: src/gns/gnunet-gns-proxy.c:1015
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:984
+#: src/gns/gnunet-gns-proxy.c:1030
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:994
+#: src/gns/gnunet-gns-proxy.c:1040
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1018
+#: src/gns/gnunet-gns-proxy.c:1064
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1132
+#: src/gns/gnunet-gns-proxy.c:1182
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1868
+#: src/gns/gnunet-gns-proxy.c:2017
 #, fuzzy, c-format
 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:2364
+#: src/gns/gnunet-gns-proxy.c:2538
 #, 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:2394
+#: src/gns/gnunet-gns-proxy.c:2570
 #, fuzzy, c-format
-msgid "Unable to import certificate %s\n"
+msgid "Unable to import certificate from `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:2573
+#: src/gns/gnunet-gns-proxy.c:2769
 #, 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:2598 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658
 #, 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:2925
+#: src/gns/gnunet-gns-proxy.c:3122
 #, 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:2954
+#: src/gns/gnunet-gns-proxy.c:3151
 #, 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:3035
+#: src/gns/gnunet-gns-proxy.c:3232
 #, 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:3316
+#: src/gns/gnunet-gns-proxy.c:3522
 #, fuzzy, c-format
 msgid "Failed to load X.509 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:3443
+#: src/gns/gnunet-gns-proxy.c:3650
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3448
+#: src/gns/gnunet-gns-proxy.c:3655
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3473
+#: src/gns/gnunet-gns-proxy.c:3681
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:233
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:238
-#, fuzzy
-msgid "Specify the type of the record to lookup"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/gns/gnunet-gns.c:242
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:258
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Bản ghi lỗi GNUnet"
-
 #: src/gns/gnunet-service-gns.c:513
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4353,8 +4363,8 @@ 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:568
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 #: src/zonemaster/gnunet-service-zonemaster.c:875
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -4878,76 +4888,11 @@ msgstr "« %s » không sẵn sàng.\n"
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
-#, fuzzy, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
-msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
-
-#: src/identity-provider/gnunet-idp.c:424
-#, fuzzy
-msgid "Ego is required\n"
-msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
-
-#: src/identity-provider/gnunet-idp.c:432
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:440
-#, fuzzy
-msgid "Requesting party key is required!\n"
-msgstr "đặt tên hiệu cần dùng (cần thiết)"
-
-#: src/identity-provider/gnunet-idp.c:463
-msgid "Add attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:469
-msgid "Attribute value"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:474
-msgid "Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:479
-msgid "Audience (relying party)"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:483
-msgid "List attributes for Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:488
-msgid "Issue a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:493
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:498
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:503
-msgid "Type of attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:508
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/identity-provider/identity_provider_api.c:436
-#, fuzzy
-msgid "failed to store record\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/identity-provider/plugin_rest_identity_provider.c:1230
-#: src/identity-provider/plugin_rest_openid_connect.c:2147
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#, fuzzy, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
+msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
+
 #: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
@@ -5040,6 +4985,71 @@ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 msgid "Identity REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
+#: src/identity-provider/gnunet-idp.c:424
+#, fuzzy
+msgid "Ego is required\n"
+msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
+
+#: src/identity-provider/gnunet-idp.c:432
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:440
+#, fuzzy
+msgid "Requesting party key is required!\n"
+msgstr "đặt tên hiệu cần dùng (cần thiết)"
+
+#: src/identity-provider/gnunet-idp.c:463
+msgid "Add attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:469
+msgid "Attribute value"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:474
+msgid "Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:479
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:483
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:488
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:493
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:498
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:503
+msgid "Type of attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:508
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/identity-provider/identity_provider_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1230
+#: src/identity-provider/plugin_rest_openid_connect.c:2147
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
 #: src/json/json.c:119
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -5141,66 +5151,6 @@ msgstr "Không thể tạo miền tên.\n"
 msgid "flat plugin running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:547
-#, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:567
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:598
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:678
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:736
-#, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:754
-#, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:790
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:799
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1019
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1045
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1092
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1130
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:313
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
@@ -5371,6 +5321,66 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:547
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:567
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:598
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:678
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:736
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:754
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:790
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:799
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1092
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1130
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
 #: src/namestore/gnunet-service-namestore.c:750
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5686,6 +5696,11 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
+#: src/nse/gnunet-nse.c:122
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
 #: src/nse/gnunet-nse-profiler.c:849
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
@@ -5703,25 +5718,79 @@ msgstr ""
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
-msgid "delay between rounds"
+#: src/nse/gnunet-nse-profiler.c:884
+msgid "delay between rounds"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:893
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Không thể truy cập đến dịch vụ"
+
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+#, fuzzy
+msgid "Value is too large.\n"
+msgstr "Giá trị không nằm trong phạm vi được phép."
+
+#: src/peerinfo/gnunet-service-peerinfo.c:178
+#, fuzzy, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Đã nạp truyền tải « %s »\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:313
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:449
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:492
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
+"bỏ.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:659
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:667
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
+msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:893
-#, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "Không thể truy cập đến dịch vụ"
-
-#: src/nse/gnunet-nse.c:122
-#, fuzzy
-msgid "Show network size estimates from NSE service."
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+#: src/peerinfo/peerinfo_api.c:220
 #, fuzzy
-msgid "Value is too large.\n"
-msgstr "Giá trị không nằm trong phạm vi được phép."
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
@@ -5814,65 +5883,6 @@ msgstr "Đang nạp các truyền tải « %s »\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:178
-#, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Đã nạp truyền tải « %s »\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:313
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:334
-#: src/peerinfo/gnunet-service-peerinfo.c:365
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:449
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:492
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
-"bỏ.\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:659
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:667
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1100
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1438
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1451
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:220
-#, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
-
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
@@ -6395,10 +6405,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
@@ -6853,6 +6863,16 @@ msgstr "« %s » đang tắt.\n"
 msgid "%.s Unknown result code."
 msgstr ""
 
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
+#, fuzzy
+msgid "Waiting for child to exit.\n"
+msgstr "Đang đợi các đồng đẳng kết nối"
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
 #: src/testbed/gnunet-testbed-profiler.c:289
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6864,16 +6884,6 @@ msgid ""
 "signal is received"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:118
-#, fuzzy
-msgid "Waiting for child to exit.\n"
-msgstr "Đang đợi các đồng đẳng kết nối"
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:241
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
 #: src/testbed/testbed_api.c:410
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -7176,6 +7186,10 @@ msgstr "# các thông báo PONG đã mật mã được nhận"
 msgid "GNUnet topology control"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport.c:448
 #, fuzzy
 msgid "# messages dropped due to slow client"
@@ -7225,10 +7239,6 @@ msgstr ""
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
@@ -7568,46 +7578,6 @@ msgstr ""
 msgid "# HELLOs given to peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:621
-#, fuzzy
-msgid "receive data from peer"
-msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n"
-
-#: src/transport/gnunet-transport-profiler.c:626
-#, fuzzy
-msgid "iterations"
-msgstr "Tùy chọn chung"
-
-#: src/transport/gnunet-transport-profiler.c:631
-#, fuzzy
-msgid "number of messages to send"
-msgstr "số tin nhắn cần dùng mỗi lần lặp"
-
-#: src/transport/gnunet-transport-profiler.c:636
-#, fuzzy
-msgid "message size to use"
-msgstr "kích cỡ tin nhắn"
-
-#: src/transport/gnunet-transport-profiler.c:641
-#: src/transport/gnunet-transport.c:1462
-msgid "peer identity"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:652
-#: src/transport/gnunet-transport.c:1482
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
 #: src/transport/gnunet-transport.c:413
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7747,6 +7717,11 @@ msgstr "In ra thông tin về các đồng đẳng GNUnet."
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
+#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport-profiler.c:641
+msgid "peer identity"
+msgstr ""
+
 #: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7755,11 +7730,48 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
+#: src/transport/gnunet-transport.c:1482
+#: src/transport/gnunet-transport-profiler.c:652
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:621
+#, fuzzy
+msgid "receive data from peer"
+msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n"
+
+#: src/transport/gnunet-transport-profiler.c:626
+#, fuzzy
+msgid "iterations"
+msgstr "Tùy chọn chung"
+
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "số tin nhắn cần dùng mỗi lần lặp"
+
+#: src/transport/gnunet-transport-profiler.c:636
+#, fuzzy
+msgid "message size to use"
+msgstr "kích cỡ tin nhắn"
+
 #: src/transport/plugin_transport_http_client.c:1474
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3526
 #: src/transport/plugin_transport_tcp.c:3891
 #: src/transport/plugin_transport_tcp.c:3898
+#: src/transport/plugin_transport_xt.c:3899
+#: src/transport/plugin_transport_xt.c:3906
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7830,6 +7842,7 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2901
 #: src/transport/plugin_transport_udp.c:3623
+#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7933,6 +7946,8 @@ msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
 #: src/transport/plugin_transport_tcp.c:1547
 #: src/transport/plugin_transport_tcp.c:2873
+#: src/transport/plugin_transport_xt.c:1553
+#: src/transport/plugin_transport_xt.c:2879
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
@@ -7941,6 +7956,9 @@ msgstr "Gặp sự kiện bất thường: %d\n"
 #: src/transport/plugin_transport_tcp.c:1954
 #: src/transport/plugin_transport_tcp.c:3137
 #: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_xt.c:1736
+#: src/transport/plugin_transport_xt.c:1960
+#: src/transport/plugin_transport_xt.c:3143
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -7951,70 +7969,91 @@ msgstr "# các khoá phiên chạy được chấp nhận"
 #: src/transport/plugin_transport_tcp.c:2133
 #: src/transport/plugin_transport_tcp.c:2233
 #: src/transport/plugin_transport_tcp.c:2258
+#: src/transport/plugin_transport_xt.c:1778
+#: src/transport/plugin_transport_xt.c:1942
+#: src/transport/plugin_transport_xt.c:2066
+#: src/transport/plugin_transport_xt.c:2139
+#: src/transport/plugin_transport_xt.c:2239
+#: src/transport/plugin_transport_xt.c:2264
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
 #: src/transport/plugin_transport_tcp.c:1775
+#: src/transport/plugin_transport_xt.c:1781
 #, 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:2063
+#: src/transport/plugin_transport_xt.c:2069
 #, 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:2137
+#: src/transport/plugin_transport_xt.c:2143
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
 #: src/transport/plugin_transport_tcp.c:2535
+#: src/transport/plugin_transport_xt.c:2541
 msgid "# requests to create session with invalid address"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:2711
+#: src/transport/plugin_transport_xt.c:2717
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3203
+#: src/transport/plugin_transport_xt.c:3209
 #, 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:3409
+#: src/transport/plugin_transport_xt.c:3415
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
 #: src/transport/plugin_transport_tcp.c:3460
 #: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_xt.c:3466
+#: src/transport/plugin_transport_xt.c:3524
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# các kết nối dht"
 
 #: src/transport/plugin_transport_tcp.c:3464
+#: src/transport/plugin_transport_xt.c:3470
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# của các đồng đẳng đã kết nối"
 
 #: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_xt.c:3476
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3472
+#: src/transport/plugin_transport_xt.c:3478
 msgid "# TCP service suspended"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3512
+#: src/transport/plugin_transport_xt.c:3518
 msgid "# TCP service resumed"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_xt.c:3528
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3841
+#: src/transport/plugin_transport_xt.c:3849
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
@@ -8033,6 +8072,21 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
+#: src/transport/plugin_transport_udp_broadcasting.c:168
+#, 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:548
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:565
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
@@ -8053,6 +8107,7 @@ 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:3717
+#: src/transport/plugin_transport_xu.c:2143
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
@@ -8063,15 +8118,19 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
 #: src/transport/plugin_transport_udp.c:3879
 #: src/transport/plugin_transport_udp.c:3893
+#: src/transport/plugin_transport_xu.c:2301
+#: src/transport/plugin_transport_xu.c:2315
 msgid "must be in [0,65535]"
 msgstr ""
 
 #: src/transport/plugin_transport_udp.c:3925
+#: src/transport/plugin_transport_xu.c:2347
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
 #: src/transport/plugin_transport_udp.c:3952
+#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
@@ -8081,21 +8140,6 @@ msgstr "« %s » không sẵn sàng.\n"
 msgid "Failed to create UDP network sockets\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-#, 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:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
 #: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
@@ -8178,6 +8222,54 @@ msgstr ""
 msgid "# sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
+#: src/transport/plugin_transport_xt.c:4010
+#, c-format
+msgid "XT transport listening on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4014
+msgid "XT transport not listening on any port (client only)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4018
+#, c-format
+msgid "XT transport advertises itself as being on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4022
+#, fuzzy
+msgid "# XT sessions active"
+msgstr "# các khoá phiên chạy được chấp nhận"
+
+#: src/transport/plugin_transport_xu.c:1237
+#, c-format
+msgid ""
+"XU could not transmit message to `%s': Network seems down, please check your "
+"network configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:1251
+msgid ""
+"XU 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_xu.c:2125
+#: src/transport/plugin_transport_xu.c:2224
+#, fuzzy, c-format
+msgid "Failed to bind XU socket to %s: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/transport/plugin_transport_xu.c:2234
+#, fuzzy
+msgid "Failed to open XU sockets\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/transport/plugin_transport_xu.c:2398
+#, fuzzy
+msgid "Failed to create XU network sockets\n"
+msgstr "Không thể tạo miền tên.\n"
+
 #: src/transport/tcp_connection_legacy.c:452
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
@@ -9271,8 +9363,8 @@ msgstr "# các byte đã nhận qua UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
 #: src/zonemaster/gnunet-service-zonemaster.c:838
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c3248d9ca..cc98cc49e 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: address@hidden"
-"POT-Creation-Date: 2018-06-04 23:27+0200\n"
+"POT-Creation-Date: 2018-06-05 22:13+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -221,6 +221,7 @@ msgid "Control services and the Automated Restart Manager 
(ARM)"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120
+#: src/transport/plugin_transport_xt.c:1120
 #: src/transport/tcp_service_legacy.c:557 src/util/service.c:612
 #, c-format
 msgid ""
@@ -231,6 +232,9 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
 #: src/transport/plugin_transport_tcp.c:3825
+#: src/transport/plugin_transport_xt.c:1139
+#: src/transport/plugin_transport_xt.c:1145
+#: src/transport/plugin_transport_xt.c:3833
 #: src/transport/tcp_service_legacy.c:576
 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
 #: src/util/service.c:643
@@ -239,6 +243,7 @@ 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:1176
+#: src/transport/plugin_transport_xt.c:1176
 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
 #: src/util/service.c:682
 #, c-format
@@ -246,6 +251,7 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
+#: src/transport/plugin_transport_xt.c:1180
 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
 #: src/util/service.c:687
 #, fuzzy, c-format
@@ -253,6 +259,7 @@ msgid "Using `%s' instead\n"
 msgstr "%s:选项“%s”有歧义\n"
 
 #: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211
+#: src/transport/plugin_transport_xt.c:1211
 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:723
 #, c-format
 msgid ""
@@ -261,6 +268,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228
+#: src/transport/plugin_transport_xt.c:1228
 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:741
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
@@ -269,6 +277,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:513
 #: src/transport/plugin_transport_http_server.c:2684
 #: src/transport/plugin_transport_tcp.c:1259
+#: src/transport/plugin_transport_xt.c:1259
 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:782
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
@@ -277,6 +286,7 @@ msgstr "打开日志文件“%s”失败:%s\n"
 #: src/arm/gnunet-service-arm.c:532
 #: src/transport/plugin_transport_http_server.c:2702
 #: src/transport/plugin_transport_tcp.c:1278
+#: src/transport/plugin_transport_xt.c:1278
 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:802
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
@@ -349,15 +359,133 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:837
-msgid "Stop logging\n"
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:892
-#, fuzzy, c-format
-msgid "Start logging `%s'\n"
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
+msgid "solver to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3306
+#, fuzzy
+msgid "print logging"
 msgstr "未知的命令“%s”。\n"
 
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:314
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:359
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "无法初始化 SQLite:%s。\n"
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1869
+#, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1913
+#, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/ats/plugin_ats_mlp.c:2670
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2679
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2689
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2698
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/ats-tests/ats-testing.c:422
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
@@ -368,6 +496,15 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "初始化“%s”服务失败。\n"
 
+#: src/ats-tests/ats-testing-log.c:837
+msgid "Stop logging\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing-log.c:892
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -375,15 +512,6 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294
-msgid "solver to use"
-msgstr ""
-
-#: src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299
-msgid "experiment to use"
-msgstr ""
-
 #: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -505,124 +633,6 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3306
-#, fuzzy
-msgid "print logging"
-msgstr "未知的命令“%s”。\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:314
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "无法初始化 SQLite:%s。\n"
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1869
-#, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1913
-#, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2475
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/ats/plugin_ats_mlp.c:2670
-#, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2679
-#, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2689
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2698
-#, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1164
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "解析配置文件“%s”失败\n"
-
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -764,30 +774,8 @@ msgid "be more verbose (print received values)"
 msgstr ""
 
 #: src/conversation/conversation_api.c:515
-#: src/conversation/conversation_api_call.c:494
-msgid "Connection to conversation service lost, trying to reconnect\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:119
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:145
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:210
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
+#: src/conversation/conversation_api_call.c:494
+msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
 #: src/conversation/gnunet-conversation.c:270
@@ -1046,8 +1034,30 @@ msgstr ""
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:361
+#: src/conversation/gnunet-conversation-test.c:119
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:145
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:210
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
 #: src/conversation/gnunet_gst.c:622
+#: src/conversation/gnunet-helper-audio-playback-gst.c:361
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1566,15 +1576,15 @@ msgstr ""
 msgid "GNUnet credential resolver tool"
 msgstr "GNUnet 错误日志"
 
-#: src/credential/gnunet-service-credential.c:1138
-#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184
+#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184
+#: src/gns/gnunet-gns-helper-service-w32.c:727
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/credential/gnunet-service-credential.c:1144
-#: src/namestore/gnunet-namestore-fcfsd.c:1084
 #: src/namestore/gnunet-namestore.c:914
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
 #: src/namestore/plugin_rest_namestore.c:1035
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
@@ -2086,6 +2096,54 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
+
+#: src/dht/gnunet_dht_profiler.c:949
+#, fuzzy
+msgid "number of peers to start"
+msgstr "迭代次数"
+
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:969
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:974
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1009
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "无法访问该服务"
+
 #: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
@@ -2323,54 +2381,6 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "增加 TCP/IP 的最大连接数"
-
-#: src/dht/gnunet_dht_profiler.c:949
-#, fuzzy
-msgid "number of peers to start"
-msgstr "迭代次数"
-
-#: src/dht/gnunet_dht_profiler.c:954
-msgid "number of PUTs to perform per peer"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
-#: src/testbed/gnunet-testbed-profiler.c:304
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:964
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:969
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:974
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:979
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:984
-msgid "chance that a peer is selected at random for PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:989
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1009
-#, fuzzy
-msgid "Measure quality and performance of the DHT service."
-msgstr "无法访问该服务"
-
 #: src/dht/plugin_block_dht.c:189
 #, c-format
 msgid "Block not of type %u\n"
@@ -3320,6 +3330,14 @@ msgid ""
 "chk/...)"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:119
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:130
+msgid "Special file-sharing operations"
+msgstr ""
+
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -3336,14 +3354,6 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:119
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:130
-msgid "Special file-sharing operations"
-msgstr ""
-
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3994,6 +4004,28 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+msgid "Specify the type of the record to lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:258
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "GNUnet 错误日志"
+
 #: src/gns/gnunet-gns-helper-service-w32.c:602
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
@@ -4013,7 +4045,7 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:109
+#: src/gns/gnunet-gns-proxy.c:111
 #: src/hostlist/gnunet-daemon-hostlist_client.c:535
 #: src/hostlist/gnunet-daemon-hostlist_client.c:753
 #: src/hostlist/gnunet-daemon-hostlist_client.c:759
@@ -4028,125 +4060,103 @@ msgstr ""
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:956
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:979
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:956
+#: src/gns/gnunet-gns-proxy.c:1002
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/gns/gnunet-gns-proxy.c:969
+#: src/gns/gnunet-gns-proxy.c:1015
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:984
+#: src/gns/gnunet-gns-proxy.c:1030
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:994
+#: src/gns/gnunet-gns-proxy.c:1040
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1018
+#: src/gns/gnunet-gns-proxy.c:1064
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1132
+#: src/gns/gnunet-gns-proxy.c:1182
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1868
+#: src/gns/gnunet-gns-proxy.c:2017
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2364
+#: src/gns/gnunet-gns-proxy.c:2538
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户:"
 
-#: src/gns/gnunet-gns-proxy.c:2394
+#: src/gns/gnunet-gns-proxy.c:2570
 #, fuzzy, c-format
-msgid "Unable to import certificate %s\n"
+msgid "Unable to import certificate from `%s'\n"
 msgstr "无法保存配置文件“%s”:"
 
-#: src/gns/gnunet-gns-proxy.c:2573
+#: src/gns/gnunet-gns-proxy.c:2769
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658
+#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2925
+#: src/gns/gnunet-gns-proxy.c:3122
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2954
+#: src/gns/gnunet-gns-proxy.c:3151
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3035
+#: src/gns/gnunet-gns-proxy.c:3232
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3316
+#: src/gns/gnunet-gns-proxy.c:3522
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3443
+#: src/gns/gnunet-gns-proxy.c:3650
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3448
+#: src/gns/gnunet-gns-proxy.c:3655
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3473
+#: src/gns/gnunet-gns-proxy.c:3681
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:233
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:238
-msgid "Specify the type of the record to lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:242
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:258
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "GNUnet 错误日志"
-
 #: src/gns/gnunet-service-gns.c:513
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4158,8 +4168,8 @@ msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/gns/gnunet-service-gns.c:568
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 #: src/zonemaster/gnunet-service-zonemaster.c:875
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u:%s\n"
@@ -4659,78 +4669,14 @@ msgstr "“%s”不可用。\n"
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:789
-#, fuzzy, c-format
-msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
-msgstr "“%s”不可用。\n"
-
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
-#, c-format
-msgid "Could not start hostlist HTTP server on port %u\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:424
-#, fuzzy
-msgid "Ego is required\n"
-msgstr "%s:选项“%s”有歧义\n"
-
-#: src/identity-provider/gnunet-idp.c:432
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:440
-#, fuzzy
-msgid "Requesting party key is required!\n"
-msgstr "设置要使用的昵称(必须)"
-
-#: src/identity-provider/gnunet-idp.c:463
-msgid "Add attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:469
-msgid "Attribute value"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:474
-msgid "Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:479
-msgid "Audience (relying party)"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:483
-msgid "List attributes for Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:488
-msgid "Issue a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:493
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:498
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:503
-msgid "Type of attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:508
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/identity-provider/identity_provider_api.c:436
-#, fuzzy
-msgid "failed to store record\n"
-msgstr "运行 %s失败:%s %d\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:789
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr "“%s”不可用。\n"
 
-#: src/identity-provider/plugin_rest_identity_provider.c:1230
-#: src/identity-provider/plugin_rest_openid_connect.c:2147
-msgid "Identity Provider REST API initialized\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#, c-format
+msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
 #: src/identity/gnunet-identity.c:179
@@ -4824,6 +4770,70 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Identity REST API initialized\n"
 msgstr ""
 
+#: src/identity-provider/gnunet-idp.c:424
+#, fuzzy
+msgid "Ego is required\n"
+msgstr "%s:选项“%s”有歧义\n"
+
+#: src/identity-provider/gnunet-idp.c:432
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:440
+#, fuzzy
+msgid "Requesting party key is required!\n"
+msgstr "设置要使用的昵称(必须)"
+
+#: src/identity-provider/gnunet-idp.c:463
+msgid "Add attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:469
+msgid "Attribute value"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:474
+msgid "Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:479
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:483
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:488
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:493
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:498
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:503
+msgid "Type of attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:508
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/identity-provider/identity_provider_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1230
+#: src/identity-provider/plugin_rest_openid_connect.c:2147
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
 #: src/json/json.c:119
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -4924,66 +4934,6 @@ msgstr "发送消息失败。\n"
 msgid "flat plugin running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:520
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:547
-#, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:567
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:598
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:678
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:736
-#, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "发送消息失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:754
-#, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:790
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:799
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1019
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1045
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1092
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1130
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:313
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -5154,6 +5104,66 @@ msgstr ""
 msgid "name of the ego controlling the zone"
 msgstr ""
 
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:547
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:567
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:598
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:678
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:736
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:754
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:790
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:799
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1092
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1130
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
 #: src/namestore/gnunet-service-namestore.c:750
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
@@ -5465,41 +5475,95 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
+#: src/nse/gnunet-nse.c:122
+msgid "Show network size estimates from NSE service."
+msgstr ""
+
 #: src/nse/gnunet-nse-profiler.c:849
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:854
-msgid "name of the file for writing connection information and statistics"
+#: src/nse/gnunet-nse-profiler.c:854
+msgid "name of the file for writing connection information and statistics"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:866
+msgid "name of the file for writing the main results"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:873
+msgid "Number of peers to run in each round, separated by commas"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:884
+msgid "delay between rounds"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:893
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "无法访问该服务"
+
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+#, fuzzy
+msgid "Value is too large.\n"
+msgstr "值不在合法范围内。"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:178
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:313
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:449
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:492
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:659
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:667
+#, c-format
+msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:866
-msgid "name of the file for writing the main results"
-msgstr ""
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/nse/gnunet-nse-profiler.c:873
-msgid "Number of peers to run in each round, separated by commas"
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
-msgid "delay between rounds"
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
+msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:893
-#, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "无法访问该服务"
-
-#: src/nse/gnunet-nse.c:122
-msgid "Show network size estimates from NSE service."
+#: src/peerinfo/peerinfo_api.c:220
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
-#, fuzzy
-msgid "Value is too large.\n"
-msgstr "值不在合法范围内。"
-
 #: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5591,60 +5655,6 @@ msgstr ""
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:178
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:313
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:334
-#: src/peerinfo/gnunet-service-peerinfo.c:365
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:449
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:492
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:659
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:667
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1100
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1438
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1451
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:220
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr ""
-
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
@@ -6156,10 +6166,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "“%s”已连接到“%s”。\n"
@@ -6614,6 +6624,15 @@ msgstr ""
 msgid "%.s Unknown result code."
 msgstr ""
 
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
+msgid "Waiting for child to exit.\n"
+msgstr ""
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
 #: src/testbed/gnunet-testbed-profiler.c:289
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6625,15 +6644,6 @@ msgid ""
 "signal is received"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:118
-msgid "Waiting for child to exit.\n"
-msgstr ""
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:241
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "卸载 GNUnet 服务"
-
 #: src/testbed/testbed_api.c:410
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -6930,6 +6940,10 @@ msgstr ""
 msgid "GNUnet topology control"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport.c:448
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -6975,10 +6989,6 @@ msgstr ""
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
@@ -7287,44 +7297,6 @@ msgstr ""
 msgid "# HELLOs given to peerinfo"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:621
-msgid "receive data from peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:626
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:631
-#, fuzzy
-msgid "number of messages to send"
-msgstr "每次迭代所使用的消息数量"
-
-#: src/transport/gnunet-transport-profiler.c:636
-#, fuzzy
-msgid "message size to use"
-msgstr "消息尺寸"
-
-#: src/transport/gnunet-transport-profiler.c:641
-#: src/transport/gnunet-transport.c:1462
-msgid "peer identity"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:652
-#: src/transport/gnunet-transport.c:1482
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "初始化“%s”服务失败。\n"
-
 #: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7461,6 +7433,11 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr ""
 
+#: src/transport/gnunet-transport.c:1462
+#: src/transport/gnunet-transport-profiler.c:641
+msgid "peer identity"
+msgstr ""
+
 #: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7469,11 +7446,46 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
+#: src/transport/gnunet-transport.c:1482
+#: src/transport/gnunet-transport-profiler.c:652
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:621
+msgid "receive data from peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:626
+msgid "iterations"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "每次迭代所使用的消息数量"
+
+#: src/transport/gnunet-transport-profiler.c:636
+#, fuzzy
+msgid "message size to use"
+msgstr "消息尺寸"
+
 #: src/transport/plugin_transport_http_client.c:1474
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3526
 #: src/transport/plugin_transport_tcp.c:3891
 #: src/transport/plugin_transport_tcp.c:3898
+#: src/transport/plugin_transport_xt.c:3899
+#: src/transport/plugin_transport_xt.c:3906
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7544,6 +7556,7 @@ msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2901
 #: src/transport/plugin_transport_udp.c:3623
+#: src/transport/plugin_transport_xu.c:2049
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7647,6 +7660,8 @@ msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:1547
 #: src/transport/plugin_transport_tcp.c:2873
+#: src/transport/plugin_transport_xt.c:1553
+#: src/transport/plugin_transport_xt.c:2879
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
@@ -7655,6 +7670,9 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1954
 #: src/transport/plugin_transport_tcp.c:3137
 #: src/transport/plugin_transport_tcp.c:4014
+#: src/transport/plugin_transport_xt.c:1736
+#: src/transport/plugin_transport_xt.c:1960
+#: src/transport/plugin_transport_xt.c:3143
 msgid "# TCP sessions active"
 msgstr ""
 
@@ -7664,39 +7682,54 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:2133
 #: src/transport/plugin_transport_tcp.c:2233
 #: src/transport/plugin_transport_tcp.c:2258
+#: src/transport/plugin_transport_xt.c:1778
+#: src/transport/plugin_transport_xt.c:1942
+#: src/transport/plugin_transport_xt.c:2066
+#: src/transport/plugin_transport_xt.c:2139
+#: src/transport/plugin_transport_xt.c:2239
+#: src/transport/plugin_transport_xt.c:2264
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:1775
+#: src/transport/plugin_transport_xt.c:1781
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_xt.c:2069
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:2137
+#: src/transport/plugin_transport_xt.c:2143
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:2535
+#: src/transport/plugin_transport_xt.c:2541
 msgid "# requests to create session with invalid address"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:2711
+#: src/transport/plugin_transport_xt.c:2717
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3203
+#: src/transport/plugin_transport_xt.c:3209
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3409
+#: src/transport/plugin_transport_xt.c:3415
 msgid "# bytes received via TCP"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3460
 #: src/transport/plugin_transport_tcp.c:3518
+#: src/transport/plugin_transport_xt.c:3466
+#: src/transport/plugin_transport_xt.c:3524
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr ""
@@ -7704,6 +7737,7 @@ msgstr ""
 "按任意键继续\n"
 
 #: src/transport/plugin_transport_tcp.c:3464
+#: src/transport/plugin_transport_xt.c:3470
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr ""
@@ -7711,22 +7745,27 @@ msgstr ""
 "按任意键继续\n"
 
 #: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_xt.c:3476
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3472
+#: src/transport/plugin_transport_xt.c:3478
 msgid "# TCP service suspended"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3512
+#: src/transport/plugin_transport_xt.c:3518
 msgid "# TCP service resumed"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3522
+#: src/transport/plugin_transport_xt.c:3528
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:3841
+#: src/transport/plugin_transport_xt.c:3849
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -7745,6 +7784,20 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
+#: src/transport/plugin_transport_udp_broadcasting.c:168
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:548
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:565
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
@@ -7765,6 +7818,7 @@ msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
 #: src/transport/plugin_transport_udp.c:3717
+#: src/transport/plugin_transport_xu.c:2143
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7775,15 +7829,19 @@ msgstr "打开日志文件“%s”失败:%s\n"
 
 #: src/transport/plugin_transport_udp.c:3879
 #: src/transport/plugin_transport_udp.c:3893
+#: src/transport/plugin_transport_xu.c:2301
+#: src/transport/plugin_transport_xu.c:2315
 msgid "must be in [0,65535]"
 msgstr ""
 
 #: src/transport/plugin_transport_udp.c:3925
+#: src/transport/plugin_transport_xu.c:2347
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
 #: src/transport/plugin_transport_udp.c:3952
+#: src/transport/plugin_transport_xu.c:2374
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "“%s”不可用。\n"
@@ -7793,20 +7851,6 @@ msgstr "“%s”不可用。\n"
 msgid "Failed to create UDP network sockets\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
 #: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
@@ -7879,6 +7923,56 @@ msgstr ""
 msgid "# sessions allocated"
 msgstr ""
 
+#: src/transport/plugin_transport_xt.c:4010
+#, c-format
+msgid "XT transport listening on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4014
+msgid "XT transport not listening on any port (client only)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4018
+#, c-format
+msgid "XT transport advertises itself as being on port %llu\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4022
+#, fuzzy
+msgid "# XT sessions active"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/transport/plugin_transport_xu.c:1237
+#, c-format
+msgid ""
+"XU could not transmit message to `%s': Network seems down, please check your "
+"network configuration\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:1251
+msgid ""
+"XU 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_xu.c:2125
+#: src/transport/plugin_transport_xu.c:2224
+#, fuzzy, c-format
+msgid "Failed to bind XU socket to %s: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/transport/plugin_transport_xu.c:2234
+#, fuzzy
+msgid "Failed to open XU sockets\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/transport/plugin_transport_xu.c:2398
+#, fuzzy
+msgid "Failed to create XU network sockets\n"
+msgstr "发送消息失败。\n"
+
 #: src/transport/tcp_connection_legacy.c:452
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
@@ -8955,8 +9049,8 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
 #: src/zonemaster/gnunet-service-zonemaster.c:838
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
diff --git a/src/my/Makefile.am b/src/my/Makefile.am
index 959085c5f..cead9a8b4 100644
--- a/src/my/Makefile.am
+++ b/src/my/Makefile.am
@@ -30,6 +30,9 @@ TESTS = \
  test_my
 endif
 
+EXTRA_DIST = \
+  test_my.conf
+
 check_PROGRAMS= \
  test_my
 
diff --git a/src/util/gnunet-service-resolver.c 
b/src/util/gnunet-service-resolver.c
index ccb592349..cc949873c 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -633,7 +633,7 @@ check_get (void *cls,
   }
   return GNUNET_OK;
 }
-  
+
 
 /**
  * Handle GET-message.
@@ -667,7 +667,7 @@ handle_get (void *cls,
     return;
   }
   ip = &msg[1];
-  
+
 #if !defined(GNUNET_CULL_LOGGING)
   {
     char buf[INET6_ADDRSTRLEN];
@@ -719,7 +719,7 @@ disconnect_cb (void *cls,
               void *internal_cls)
 {
   (void) cls;
-  
+
   GNUNET_assert (c == internal_cls);
 }
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

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